-diff -urNp linux-2.6.38.4/arch/alpha/include/asm/dma-mapping.h linux-2.6.38.4/arch/alpha/include/asm/dma-mapping.h
---- linux-2.6.38.4/arch/alpha/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/alpha/include/asm/dma-mapping.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/alpha/include/asm/dma-mapping.h linux-2.6.39/arch/alpha/include/asm/dma-mapping.h
+--- linux-2.6.39/arch/alpha/include/asm/dma-mapping.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/alpha/include/asm/dma-mapping.h 2011-05-22 19:36:30.000000000 -0400
@@ -3,9 +3,9 @@
#include <linux/dma-attrs.h>
{
return dma_ops;
}
-diff -urNp linux-2.6.38.4/arch/alpha/include/asm/elf.h linux-2.6.38.4/arch/alpha/include/asm/elf.h
---- linux-2.6.38.4/arch/alpha/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/alpha/include/asm/elf.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/alpha/include/asm/elf.h linux-2.6.39/arch/alpha/include/asm/elf.h
+--- linux-2.6.39/arch/alpha/include/asm/elf.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/alpha/include/asm/elf.h 2011-05-22 19:36:30.000000000 -0400
@@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
/* $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.38.4/arch/alpha/include/asm/pgtable.h linux-2.6.38.4/arch/alpha/include/asm/pgtable.h
---- linux-2.6.38.4/arch/alpha/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/alpha/include/asm/pgtable.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/alpha/include/asm/pgtable.h linux-2.6.39/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.39/arch/alpha/include/asm/pgtable.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/alpha/include/asm/pgtable.h 2011-05-22 19:36:30.000000000 -0400
@@ -101,6 +101,17 @@ struct vm_area_struct;
#define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
#define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
#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.38.4/arch/alpha/kernel/module.c linux-2.6.38.4/arch/alpha/kernel/module.c
---- linux-2.6.38.4/arch/alpha/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/alpha/kernel/module.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/alpha/kernel/core_apecs.c linux-2.6.39/arch/alpha/kernel/core_apecs.c
+--- linux-2.6.39/arch/alpha/kernel/core_apecs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/alpha/kernel/core_cia.c linux-2.6.39/arch/alpha/kernel/core_cia.c
+--- linux-2.6.39/arch/alpha/kernel/core_cia.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/alpha/kernel/core_irongate.c linux-2.6.39/arch/alpha/kernel/core_irongate.c
+--- linux-2.6.39/arch/alpha/kernel/core_irongate.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/alpha/kernel/core_lca.c linux-2.6.39/arch/alpha/kernel/core_lca.c
+--- linux-2.6.39/arch/alpha/kernel/core_lca.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/alpha/kernel/core_marvel.c linux-2.6.39/arch/alpha/kernel/core_marvel.c
+--- linux-2.6.39/arch/alpha/kernel/core_marvel.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/alpha/kernel/core_mcpcia.c linux-2.6.39/arch/alpha/kernel/core_mcpcia.c
+--- linux-2.6.39/arch/alpha/kernel/core_mcpcia.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/alpha/kernel/core_polaris.c linux-2.6.39/arch/alpha/kernel/core_polaris.c
+--- linux-2.6.39/arch/alpha/kernel/core_polaris.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/alpha/kernel/core_t2.c linux-2.6.39/arch/alpha/kernel/core_t2.c
+--- linux-2.6.39/arch/alpha/kernel/core_t2.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/alpha/kernel/core_titan.c linux-2.6.39/arch/alpha/kernel/core_titan.c
+--- linux-2.6.39/arch/alpha/kernel/core_titan.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/alpha/kernel/core_tsunami.c linux-2.6.39/arch/alpha/kernel/core_tsunami.c
+--- linux-2.6.39/arch/alpha/kernel/core_tsunami.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/alpha/kernel/core_wildfire.c linux-2.6.39/arch/alpha/kernel/core_wildfire.c
+--- linux-2.6.39/arch/alpha/kernel/core_wildfire.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/alpha/kernel/module.c linux-2.6.39/arch/alpha/kernel/module.c
+--- linux-2.6.39/arch/alpha/kernel/module.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/alpha/kernel/module.c 2011-05-22 19:36:30.000000000 -0400
@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
/* The small sections were sorted to the end of the segment.
got = sechdrs[me->arch.gotsecindex].sh_addr;
for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.38.4/arch/alpha/kernel/osf_sys.c linux-2.6.38.4/arch/alpha/kernel/osf_sys.c
---- linux-2.6.38.4/arch/alpha/kernel/osf_sys.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/alpha/kernel/osf_sys.c 2011-04-28 19:34:14.000000000 -0400
-@@ -1162,7 +1162,7 @@ arch_get_unmapped_area_1(unsigned long a
+diff -urNp linux-2.6.39/arch/alpha/kernel/osf_sys.c linux-2.6.39/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.39/arch/alpha/kernel/osf_sys.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/alpha/kernel/osf_sys.c 2011-05-22 19:36:30.000000000 -0400
+@@ -1142,7 +1142,7 @@ arch_get_unmapped_area_1(unsigned long a
/* At this point: (!vma || addr < vma->vm_end). */
if (limit - len < addr)
return -ENOMEM;
return addr;
addr = vma->vm_end;
vma = vma->vm_next;
-@@ -1198,6 +1198,10 @@ arch_get_unmapped_area(struct file *filp
+@@ -1178,6 +1178,10 @@ arch_get_unmapped_area(struct file *filp
merely specific addresses, but regions of memory -- perhaps
this feature should be incorporated into all ports? */
if (addr) {
addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
if (addr != (unsigned long) -ENOMEM)
-@@ -1205,8 +1209,8 @@ arch_get_unmapped_area(struct file *filp
+@@ -1185,8 +1189,8 @@ arch_get_unmapped_area(struct file *filp
}
/* Next, try allocating at TASK_UNMAPPED_BASE. */
if (addr != (unsigned long) -ENOMEM)
return addr;
-diff -urNp linux-2.6.38.4/arch/alpha/kernel/pci_iommu.c linux-2.6.38.4/arch/alpha/kernel/pci_iommu.c
---- linux-2.6.38.4/arch/alpha/kernel/pci_iommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/alpha/kernel/pci_iommu.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/alpha/kernel/pci_iommu.c linux-2.6.39/arch/alpha/kernel/pci_iommu.c
+--- linux-2.6.39/arch/alpha/kernel/pci_iommu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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 *dma_ops = &alpha_pci_ops;
+const struct dma_map_ops *dma_ops = &alpha_pci_ops;
EXPORT_SYMBOL(dma_ops);
-diff -urNp linux-2.6.38.4/arch/alpha/kernel/pci-noop.c linux-2.6.38.4/arch/alpha/kernel/pci-noop.c
---- linux-2.6.38.4/arch/alpha/kernel/pci-noop.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/alpha/kernel/pci-noop.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/alpha/kernel/pci-noop.c linux-2.6.39/arch/alpha/kernel/pci-noop.c
+--- linux-2.6.39/arch/alpha/kernel/pci-noop.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
}
EXPORT_SYMBOL(dma_ops);
void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
-diff -urNp linux-2.6.38.4/arch/alpha/mm/fault.c linux-2.6.38.4/arch/alpha/mm/fault.c
---- linux-2.6.38.4/arch/alpha/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/alpha/mm/fault.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/alpha/kernel/proto.h linux-2.6.39/arch/alpha/kernel/proto.h
+--- linux-2.6.39/arch/alpha/kernel/proto.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/alpha/kernel/proto.h 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/alpha/mm/fault.c linux-2.6.39/arch/alpha/mm/fault.c
+--- linux-2.6.39/arch/alpha/mm/fault.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/alpha/mm/fault.c 2011-05-22 19:36:30.000000000 -0400
@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
__reload_thread(pcb);
}
} else if (!cause) {
/* Allow reads even for write-only mappings */
if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-2.6.38.4/arch/arm/include/asm/elf.h linux-2.6.38.4/arch/arm/include/asm/elf.h
---- linux-2.6.38.4/arch/arm/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/arm/include/asm/elf.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/arm/common/it8152.c linux-2.6.39/arch/arm/common/it8152.c
+--- linux-2.6.39/arch/arm/common/it8152.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/arm/common/it8152.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/arm/common/via82c505.c linux-2.6.39/arch/arm/common/via82c505.c
+--- linux-2.6.39/arch/arm/common/via82c505.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/arm/include/asm/cacheflush.h linux-2.6.39/arch/arm/include/asm/cacheflush.h
+--- linux-2.6.39/arch/arm/include/asm/cacheflush.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/arm/include/asm/elf.h linux-2.6.39/arch/arm/include/asm/elf.h
+--- linux-2.6.39/arch/arm/include/asm/elf.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/arm/include/asm/elf.h 2011-05-22 19:36:30.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. */
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.38.4/arch/arm/include/asm/kmap_types.h linux-2.6.38.4/arch/arm/include/asm/kmap_types.h
---- linux-2.6.38.4/arch/arm/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/arm/include/asm/kmap_types.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/arm/include/asm/kmap_types.h linux-2.6.39/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.39/arch/arm/include/asm/kmap_types.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/arm/include/asm/kmap_types.h 2011-05-22 19:36:30.000000000 -0400
@@ -21,6 +21,7 @@ enum km_type {
KM_L1_CACHE,
KM_L2_CACHE,
KM_TYPE_NR
};
-diff -urNp linux-2.6.38.4/arch/arm/include/asm/uaccess.h linux-2.6.38.4/arch/arm/include/asm/uaccess.h
---- linux-2.6.38.4/arch/arm/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/arm/include/asm/uaccess.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/arm/include/asm/outercache.h linux-2.6.39/arch/arm/include/asm/outercache.h
+--- linux-2.6.39/arch/arm/include/asm/outercache.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/arm/include/asm/page.h linux-2.6.39/arch/arm/include/asm/page.h
+--- linux-2.6.39/arch/arm/include/asm/page.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/arm/include/asm/uaccess.h linux-2.6.39/arch/arm/include/asm/uaccess.h
+--- linux-2.6.39/arch/arm/include/asm/uaccess.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/arm/include/asm/uaccess.h 2011-05-22 19:36:30.000000000 -0400
@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
if (access_ok(VERIFY_WRITE, to, n))
n = __copy_to_user(to, from, n);
return n;
-diff -urNp linux-2.6.38.4/arch/arm/kernel/kgdb.c linux-2.6.38.4/arch/arm/kernel/kgdb.c
---- linux-2.6.38.4/arch/arm/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/arm/kernel/kgdb.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/arm/kernel/kgdb.c linux-2.6.39/arch/arm/kernel/kgdb.c
+--- linux-2.6.39/arch/arm/kernel/kgdb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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.
#ifndef __ARMEB__
.gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
#else /* ! __ARMEB__ */
-diff -urNp linux-2.6.38.4/arch/arm/kernel/process.c linux-2.6.38.4/arch/arm/kernel/process.c
---- linux-2.6.38.4/arch/arm/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/arm/kernel/process.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/arm/kernel/process.c linux-2.6.39/arch/arm/kernel/process.c
+--- linux-2.6.39/arch/arm/kernel/process.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/arm/kernel/process.c 2011-05-22 19:36:30.000000000 -0400
@@ -28,7 +28,6 @@
#include <linux/tick.h>
#include <linux/utsname.h>
#include <linux/hw_breakpoint.h>
#include <asm/cacheflush.h>
-@@ -477,12 +476,6 @@ unsigned long get_wchan(struct task_stru
+@@ -479,12 +478,6 @@ unsigned long get_wchan(struct task_stru
return 0;
}
#ifdef CONFIG_MMU
/*
* The vectors page is always readable from user space for the
-diff -urNp linux-2.6.38.4/arch/arm/mach-msm/last_radio_log.c linux-2.6.38.4/arch/arm/mach-msm/last_radio_log.c
---- linux-2.6.38.4/arch/arm/mach-msm/last_radio_log.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/arm/mach-msm/last_radio_log.c 2011-04-28 19:34:14.000000000 -0400
-@@ -47,7 +47,7 @@ static ssize_t last_radio_log_read(struc
- return count;
+diff -urNp linux-2.6.39/arch/arm/mach-cns3xxx/pcie.c linux-2.6.39/arch/arm/mach-cns3xxx/pcie.c
+--- linux-2.6.39/arch/arm/mach-cns3xxx/pcie.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/arm/mach-dove/pcie.c linux-2.6.39/arch/arm/mach-dove/pcie.c
+--- linux-2.6.39/arch/arm/mach-dove/pcie.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/arm/mach-dove/pcie.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/arm/mach-footbridge/dc21285.c linux-2.6.39/arch/arm/mach-footbridge/dc21285.c
+--- linux-2.6.39/arch/arm/mach-footbridge/dc21285.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/arm/mach-footbridge/dc21285.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/arm/mach-integrator/pci_v3.c linux-2.6.39/arch/arm/mach-integrator/pci_v3.c
+--- linux-2.6.39/arch/arm/mach-integrator/pci_v3.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/arm/mach-iop13xx/pci.c linux-2.6.39/arch/arm/mach-iop13xx/pci.c
+--- linux-2.6.39/arch/arm/mach-iop13xx/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/arm/mach-ixp2000/enp2611.c linux-2.6.39/arch/arm/mach-ixp2000/enp2611.c
+--- linux-2.6.39/arch/arm/mach-ixp2000/enp2611.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/arm/mach-ixp2000/pci.c linux-2.6.39/arch/arm/mach-ixp2000/pci.c
+--- linux-2.6.39/arch/arm/mach-ixp2000/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/arm/mach-ixp23xx/pci.c linux-2.6.39/arch/arm/mach-ixp23xx/pci.c
+--- linux-2.6.39/arch/arm/mach-ixp23xx/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/arm/mach-ixp4xx/common-pci.c linux-2.6.39/arch/arm/mach-ixp4xx/common-pci.c
+--- linux-2.6.39/arch/arm/mach-ixp4xx/common-pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/arm/mach-kirkwood/pcie.c linux-2.6.39/arch/arm/mach-kirkwood/pcie.c
+--- linux-2.6.39/arch/arm/mach-kirkwood/pcie.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/arm/mach-ks8695/pci.c linux-2.6.39/arch/arm/mach-ks8695/pci.c
+--- linux-2.6.39/arch/arm/mach-ks8695/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/arm/mach-mmp/clock.c linux-2.6.39/arch/arm/mach-mmp/clock.c
+--- linux-2.6.39/arch/arm/mach-mmp/clock.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/arm/mach-mmp/clock.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/arm/mach-msm/iommu.c linux-2.6.39/arch/arm/mach-msm/iommu.c
+--- linux-2.6.39/arch/arm/mach-msm/iommu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/arm/mach-msm/iommu.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/arm/mach-msm/last_radio_log.c linux-2.6.39/arch/arm/mach-msm/last_radio_log.c
+--- linux-2.6.39/arch/arm/mach-msm/last_radio_log.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/arm/mach-msm/last_radio_log.c 2011-05-22 19:36:30.000000000 -0400
+@@ -48,6 +48,7 @@ static ssize_t last_radio_log_read(struc
}
--static struct file_operations last_radio_log_fops = {
-+static struct file_operations last_radio_log_fops = { /* cannot be const, see msm_init_last_radio_log */
+ 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.38.4/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.38.4/arch/arm/mach-ux500/mbox-db5500.c
---- linux-2.6.38.4/arch/arm/mach-ux500/mbox-db5500.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/arm/mach-ux500/mbox-db5500.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/arm/mach-mv78xx0/pcie.c linux-2.6.39/arch/arm/mach-mv78xx0/pcie.c
+--- linux-2.6.39/arch/arm/mach-mv78xx0/pcie.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/arm/mach-orion5x/pci.c linux-2.6.39/arch/arm/mach-orion5x/pci.c
+--- linux-2.6.39/arch/arm/mach-orion5x/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/arm/mach-sa1100/pci-nanoengine.c linux-2.6.39/arch/arm/mach-sa1100/pci-nanoengine.c
+--- linux-2.6.39/arch/arm/mach-sa1100/pci-nanoengine.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/arm/mach-sa1100/pci-nanoengine.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/arm/mach-tegra/pcie.c linux-2.6.39/arch/arm/mach-tegra/pcie.c
+--- linux-2.6.39/arch/arm/mach-tegra/pcie.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.39/arch/arm/mach-ux500/mbox-db5500.c
+--- linux-2.6.39/arch/arm/mach-ux500/mbox-db5500.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/arm/mach-ux500/mbox-db5500.c 2011-05-22 19:41:32.000000000 -0400
@@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev
return sprintf(buf, "0x%X\n", mbox_value);
}
static int mbox_show(struct seq_file *s, void *data)
{
-diff -urNp linux-2.6.38.4/arch/arm/mm/fault.c linux-2.6.38.4/arch/arm/mm/fault.c
---- linux-2.6.38.4/arch/arm/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/arm/mm/fault.c 2011-04-28 19:34:14.000000000 -0400
-@@ -167,6 +167,13 @@ __do_user_fault(struct task_struct *tsk,
+diff -urNp linux-2.6.39/arch/arm/mach-versatile/pci.c linux-2.6.39/arch/arm/mach-versatile/pci.c
+--- linux-2.6.39/arch/arm/mach-versatile/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/arm/mm/fault.c linux-2.6.39/arch/arm/mm/fault.c
+--- linux-2.6.39/arch/arm/mm/fault.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/arm/mm/fault.c 2011-05-22 19:36:30.000000000 -0400
+@@ -182,6 +182,13 @@ __do_user_fault(struct task_struct *tsk,
}
#endif
tsk->thread.address = addr;
tsk->thread.error_code = fsr;
tsk->thread.trap_no = 14;
-@@ -364,6 +371,33 @@ do_page_fault(unsigned long addr, unsign
+@@ -379,6 +386,33 @@ do_page_fault(unsigned long addr, unsign
}
#endif /* CONFIG_MMU */
/*
* First Level Translation Fault Handler
*
-diff -urNp linux-2.6.38.4/arch/arm/mm/mmap.c linux-2.6.38.4/arch/arm/mm/mmap.c
---- linux-2.6.38.4/arch/arm/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/arm/mm/mmap.c 2011-04-28 19:34:14.000000000 -0400
-@@ -64,6 +64,10 @@ arch_get_unmapped_area(struct file *filp
+diff -urNp linux-2.6.39/arch/arm/mm/mmap.c linux-2.6.39/arch/arm/mm/mmap.c
+--- linux-2.6.39/arch/arm/mm/mmap.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/arm/mm/mmap.c 2011-05-22 19:36:30.000000000 -0400
+@@ -65,6 +65,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
if (addr) {
if (do_align)
addr = COLOUR_ALIGN(addr, pgoff);
-@@ -71,15 +75,14 @@ arch_get_unmapped_area(struct file *filp
+@@ -72,15 +76,14 @@ arch_get_unmapped_area(struct file *filp
addr = PAGE_ALIGN(addr);
vma = find_vma(mm, addr);
+ mm->cached_hole_size = 0;
}
/* 8 bits of randomness in 20 address space bits */
- if (current->flags & PF_RANDOMIZE)
-@@ -98,14 +101,14 @@ full_search:
+ if ((current->flags & PF_RANDOMIZE) &&
+@@ -100,14 +103,14 @@ full_search:
* Start a new search - just in case we missed
* some holes.
*/
/*
* Remember the place where we stopped the search:
*/
-diff -urNp linux-2.6.38.4/arch/avr32/include/asm/elf.h linux-2.6.38.4/arch/avr32/include/asm/elf.h
---- linux-2.6.38.4/arch/avr32/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/avr32/include/asm/elf.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/arm/plat-iop/pci.c linux-2.6.39/arch/arm/plat-iop/pci.c
+--- linux-2.6.39/arch/arm/plat-iop/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/arm/plat-iop/pci.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/avr32/include/asm/elf.h linux-2.6.39/arch/avr32/include/asm/elf.h
+--- linux-2.6.39/arch/avr32/include/asm/elf.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/avr32/include/asm/elf.h 2011-05-22 19:36:30.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. */
/* 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.38.4/arch/avr32/include/asm/kmap_types.h linux-2.6.38.4/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.38.4/arch/avr32/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/avr32/include/asm/kmap_types.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/avr32/include/asm/kmap_types.h linux-2.6.39/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.39/arch/avr32/include/asm/kmap_types.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/avr32/include/asm/kmap_types.h 2011-05-22 19:36:30.000000000 -0400
@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
D(11) KM_IRQ1,
D(12) KM_SOFTIRQ0,
};
#undef D
-diff -urNp linux-2.6.38.4/arch/avr32/mm/fault.c linux-2.6.38.4/arch/avr32/mm/fault.c
---- linux-2.6.38.4/arch/avr32/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/avr32/mm/fault.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/avr32/mm/fault.c linux-2.6.39/arch/avr32/mm/fault.c
+--- linux-2.6.39/arch/avr32/mm/fault.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/avr32/mm/fault.c 2011-05-22 19:36:30.000000000 -0400
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
int exception_trace = 1;
if (exception_trace && printk_ratelimit())
printk("%s%s[%d]: segfault at %08lx pc %08lx "
"sp %08lx ecr %lu\n",
-diff -urNp linux-2.6.38.4/arch/blackfin/kernel/kgdb.c linux-2.6.38.4/arch/blackfin/kernel/kgdb.c
---- linux-2.6.38.4/arch/blackfin/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/blackfin/kernel/kgdb.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/blackfin/kernel/kgdb.c linux-2.6.39/arch/blackfin/kernel/kgdb.c
+--- linux-2.6.39/arch/blackfin/kernel/kgdb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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},
- #ifdef CONFIG_SMP
- .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
-diff -urNp linux-2.6.38.4/arch/blackfin/mm/maccess.c linux-2.6.38.4/arch/blackfin/mm/maccess.c
---- linux-2.6.38.4/arch/blackfin/mm/maccess.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/blackfin/mm/maccess.c 2011-04-28 19:34:14.000000000 -0400
+ .flags = KGDB_HW_BREAKPOINT,
+ .set_hw_breakpoint = bfin_set_hw_break,
+diff -urNp linux-2.6.39/arch/blackfin/mm/maccess.c linux-2.6.39/arch/blackfin/mm/maccess.c
+--- linux-2.6.39/arch/blackfin/mm/maccess.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
}
{
unsigned long ldst = (unsigned long)dst;
int mem_type;
-diff -urNp linux-2.6.38.4/arch/frv/include/asm/kmap_types.h linux-2.6.38.4/arch/frv/include/asm/kmap_types.h
---- linux-2.6.38.4/arch/frv/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/frv/include/asm/kmap_types.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/frv/include/asm/kmap_types.h linux-2.6.39/arch/frv/include/asm/kmap_types.h
+--- linux-2.6.39/arch/frv/include/asm/kmap_types.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/frv/include/asm/kmap_types.h 2011-05-22 19:36:30.000000000 -0400
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
KM_TYPE_NR
};
-diff -urNp linux-2.6.38.4/arch/frv/mm/elf-fdpic.c linux-2.6.38.4/arch/frv/mm/elf-fdpic.c
---- linux-2.6.38.4/arch/frv/mm/elf-fdpic.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/frv/mm/elf-fdpic.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/frv/mb93090-mb00/pci-frv.h linux-2.6.39/arch/frv/mb93090-mb00/pci-frv.h
+--- linux-2.6.39/arch/frv/mb93090-mb00/pci-frv.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/frv/mb93090-mb00/pci-vdk.c linux-2.6.39/arch/frv/mb93090-mb00/pci-vdk.c
+--- linux-2.6.39/arch/frv/mb93090-mb00/pci-vdk.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/frv/mm/elf-fdpic.c linux-2.6.39/arch/frv/mm/elf-fdpic.c
+--- linux-2.6.39/arch/frv/mm/elf-fdpic.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/frv/mm/elf-fdpic.c 2011-05-22 19:36:30.000000000 -0400
@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
if (addr) {
addr = PAGE_ALIGN(addr);
goto success;
addr = vma->vm_end;
}
-diff -urNp linux-2.6.38.4/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.38.4/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.38.4/arch/ia64/hp/common/hwsw_iommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/hp/common/hwsw_iommu.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.39/arch/ia64/hp/common/hwsw_iommu.c
+--- linux-2.6.39/arch/ia64/hp/common/hwsw_iommu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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>
{
if (use_swiotlb(dev))
return &swiotlb_dma_ops;
-diff -urNp linux-2.6.38.4/arch/ia64/hp/common/sba_iommu.c linux-2.6.38.4/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.38.4/arch/ia64/hp/common/sba_iommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/hp/common/sba_iommu.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/ia64/hp/common/sba_iommu.c linux-2.6.39/arch/ia64/hp/common/sba_iommu.c
+--- linux-2.6.39/arch/ia64/hp/common/sba_iommu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
},
};
.alloc_coherent = sba_alloc_coherent,
.free_coherent = sba_free_coherent,
.map_page = sba_map_page,
-diff -urNp linux-2.6.38.4/arch/ia64/include/asm/dma-mapping.h linux-2.6.38.4/arch/ia64/include/asm/dma-mapping.h
---- linux-2.6.38.4/arch/ia64/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/include/asm/dma-mapping.h 2011-04-28 19:34:14.000000000 -0400
-@@ -12,7 +12,7 @@
+diff -urNp linux-2.6.39/arch/ia64/include/asm/dma-mapping.h linux-2.6.39/arch/ia64/include/asm/dma-mapping.h
+--- linux-2.6.39/arch/ia64/include/asm/dma-mapping.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/ia64/include/asm/dma-mapping.h 2011-05-22 19:36:30.000000000 -0400
+@@ -14,7 +14,7 @@
- #define ARCH_HAS_DMA_GET_REQUIRED_MASK
+ #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);
-@@ -24,7 +24,7 @@ extern void machvec_dma_sync_sg(struct d
+@@ -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)
{
void *caddr;
caddr = ops->alloc_coherent(dev, size, daddr, gfp);
-@@ -35,7 +35,7 @@ static inline void *dma_alloc_coherent(s
+@@ -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)
{
debug_dma_free_coherent(dev, size, caddr, daddr);
ops->free_coherent(dev, size, caddr, daddr);
}
-@@ -49,13 +49,13 @@ static inline void dma_free_coherent(str
+@@ -51,13 +51,13 @@ static inline void dma_free_coherent(str
static inline int dma_mapping_error(struct device *dev, dma_addr_t daddr)
{
return ops->dma_supported(dev, mask);
}
-diff -urNp linux-2.6.38.4/arch/ia64/include/asm/elf.h linux-2.6.38.4/arch/ia64/include/asm/elf.h
---- linux-2.6.38.4/arch/ia64/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/include/asm/elf.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/ia64/include/asm/elf.h linux-2.6.39/arch/ia64/include/asm/elf.h
+--- linux-2.6.39/arch/ia64/include/asm/elf.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/ia64/include/asm/elf.h 2011-05-22 19:36:30.000000000 -0400
@@ -42,6 +42,13 @@
*/
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
#define PT_IA_64_UNWIND 0x70000001
/* IA-64 relocations: */
-diff -urNp linux-2.6.38.4/arch/ia64/include/asm/machvec.h linux-2.6.38.4/arch/ia64/include/asm/machvec.h
---- linux-2.6.38.4/arch/ia64/include/asm/machvec.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/include/asm/machvec.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/ia64/include/asm/machvec.h linux-2.6.39/arch/ia64/include/asm/machvec.h
+--- linux-2.6.39/arch/ia64/include/asm/machvec.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
/*
* Define default versions so we can extend machvec for new platforms without having
-diff -urNp linux-2.6.38.4/arch/ia64/include/asm/pgtable.h linux-2.6.38.4/arch/ia64/include/asm/pgtable.h
---- linux-2.6.38.4/arch/ia64/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/include/asm/pgtable.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/ia64/include/asm/pgtable.h linux-2.6.39/arch/ia64/include/asm/pgtable.h
+--- linux-2.6.39/arch/ia64/include/asm/pgtable.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/ia64/include/asm/pgtable.h 2011-05-22 19:36:30.000000000 -0400
@@ -12,7 +12,7 @@
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
#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.38.4/arch/ia64/include/asm/spinlock.h linux-2.6.38.4/arch/ia64/include/asm/spinlock.h
---- linux-2.6.38.4/arch/ia64/include/asm/spinlock.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/include/asm/spinlock.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/ia64/include/asm/spinlock.h linux-2.6.39/arch/ia64/include/asm/spinlock.h
+--- linux-2.6.39/arch/ia64/include/asm/spinlock.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/ia64/include/asm/spinlock.h 2011-05-22 19:36:30.000000000 -0400
@@ -72,7 +72,7 @@ static __always_inline void __ticket_spi
unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
}
static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
-diff -urNp linux-2.6.38.4/arch/ia64/include/asm/uaccess.h linux-2.6.38.4/arch/ia64/include/asm/uaccess.h
---- linux-2.6.38.4/arch/ia64/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/include/asm/uaccess.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/ia64/include/asm/uaccess.h linux-2.6.39/arch/ia64/include/asm/uaccess.h
+--- linux-2.6.39/arch/ia64/include/asm/uaccess.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/ia64/include/asm/uaccess.h 2011-05-22 19:36:30.000000000 -0400
@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
const void *__cu_from = (from); \
long __cu_len = (n); \
__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
__cu_len; \
})
-diff -urNp linux-2.6.38.4/arch/ia64/kernel/dma-mapping.c linux-2.6.38.4/arch/ia64/kernel/dma-mapping.c
---- linux-2.6.38.4/arch/ia64/kernel/dma-mapping.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/kernel/dma-mapping.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/ia64/kernel/dma-mapping.c linux-2.6.39/arch/ia64/kernel/dma-mapping.c
+--- linux-2.6.39/arch/ia64/kernel/dma-mapping.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
{
return dma_ops;
}
-diff -urNp linux-2.6.38.4/arch/ia64/kernel/module.c linux-2.6.38.4/arch/ia64/kernel/module.c
---- linux-2.6.38.4/arch/ia64/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/kernel/module.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/ia64/kernel/module.c linux-2.6.39/arch/ia64/kernel/module.c
+--- linux-2.6.39/arch/ia64/kernel/module.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/ia64/kernel/module.c 2011-05-22 19:36:30.000000000 -0400
@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
void
module_free (struct module *mod, void *module_region)
mod->arch.gp = gp;
DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
}
-diff -urNp linux-2.6.38.4/arch/ia64/kernel/pci-dma.c linux-2.6.38.4/arch/ia64/kernel/pci-dma.c
---- linux-2.6.38.4/arch/ia64/kernel/pci-dma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/kernel/pci-dma.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/ia64/kernel/pci-dma.c linux-2.6.39/arch/ia64/kernel/pci-dma.c
+--- linux-2.6.39/arch/ia64/kernel/pci-dma.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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,
};
static int __init pci_iommu_init(void)
{
-diff -urNp linux-2.6.38.4/arch/ia64/kernel/pci-swiotlb.c linux-2.6.38.4/arch/ia64/kernel/pci-swiotlb.c
---- linux-2.6.38.4/arch/ia64/kernel/pci-swiotlb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/kernel/pci-swiotlb.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/ia64/kernel/pci-swiotlb.c linux-2.6.39/arch/ia64/kernel/pci-swiotlb.c
+--- linux-2.6.39/arch/ia64/kernel/pci-swiotlb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
}
.alloc_coherent = ia64_swiotlb_alloc_coherent,
.free_coherent = swiotlb_free_coherent,
.map_page = swiotlb_map_page,
-diff -urNp linux-2.6.38.4/arch/ia64/kernel/sys_ia64.c linux-2.6.38.4/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.38.4/arch/ia64/kernel/sys_ia64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/kernel/sys_ia64.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/ia64/kernel/sys_ia64.c linux-2.6.39/arch/ia64/kernel/sys_ia64.c
+--- linux-2.6.39/arch/ia64/kernel/sys_ia64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/ia64/kernel/sys_ia64.c 2011-05-22 19:36:30.000000000 -0400
@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
if (REGION_NUMBER(addr) == RGN_HPAGE)
addr = 0;
/* Remember the address where we stopped this search: */
mm->free_area_cache = addr + len;
return addr;
-diff -urNp linux-2.6.38.4/arch/ia64/kernel/vmlinux.lds.S linux-2.6.38.4/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.38.4/arch/ia64/kernel/vmlinux.lds.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/kernel/vmlinux.lds.S 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/ia64/kernel/vmlinux.lds.S linux-2.6.39/arch/ia64/kernel/vmlinux.lds.S
+--- linux-2.6.39/arch/ia64/kernel/vmlinux.lds.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/ia64/kernel/vmlinux.lds.S 2011-05-22 19:36:30.000000000 -0400
@@ -199,7 +199,7 @@ SECTIONS {
/* Per-cpu data: */
. = ALIGN(PERCPU_PAGE_SIZE);
- PERCPU_VADDR(PERCPU_ADDR, :percpu)
+ PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
- __phys_per_cpu_start = __per_cpu_load;
+ __phys_per_cpu_start = per_cpu_load;
/*
* ensure percpu data fits
* into percpu page size
-diff -urNp linux-2.6.38.4/arch/ia64/mm/fault.c linux-2.6.38.4/arch/ia64/mm/fault.c
---- linux-2.6.38.4/arch/ia64/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/mm/fault.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/ia64/mm/fault.c linux-2.6.39/arch/ia64/mm/fault.c
+--- linux-2.6.39/arch/ia64/mm/fault.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/ia64/mm/fault.c 2011-05-22 19:36:30.000000000 -0400
@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
return pte_present(pte);
}
/*
* 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.38.4/arch/ia64/mm/hugetlbpage.c linux-2.6.38.4/arch/ia64/mm/hugetlbpage.c
---- linux-2.6.38.4/arch/ia64/mm/hugetlbpage.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/mm/hugetlbpage.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/ia64/mm/hugetlbpage.c linux-2.6.39/arch/ia64/mm/hugetlbpage.c
+--- linux-2.6.39/arch/ia64/mm/hugetlbpage.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/ia64/mm/hugetlbpage.c 2011-05-22 19:36:30.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)
return addr;
addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
}
-diff -urNp linux-2.6.38.4/arch/ia64/mm/init.c linux-2.6.38.4/arch/ia64/mm/init.c
---- linux-2.6.38.4/arch/ia64/mm/init.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/mm/init.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/ia64/mm/init.c linux-2.6.39/arch/ia64/mm/init.c
+--- linux-2.6.39/arch/ia64/mm/init.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/ia64/mm/init.c 2011-05-22 19:36:30.000000000 -0400
@@ -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;
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
down_write(¤t->mm->mmap_sem);
if (insert_vm_struct(current->mm, vma)) {
-diff -urNp linux-2.6.38.4/arch/ia64/sn/pci/pci_dma.c linux-2.6.38.4/arch/ia64/sn/pci/pci_dma.c
---- linux-2.6.38.4/arch/ia64/sn/pci/pci_dma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/sn/pci/pci_dma.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/ia64/pci/pci.c linux-2.6.39/arch/ia64/pci/pci.c
+--- linux-2.6.39/arch/ia64/pci/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/ia64/pci/pci.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/ia64/sn/pci/pci_dma.c linux-2.6.39/arch/ia64/sn/pci/pci_dma.c
+--- linux-2.6.39/arch/ia64/sn/pci/pci_dma.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
}
.alloc_coherent = sn_dma_alloc_coherent,
.free_coherent = sn_dma_free_coherent,
.map_page = sn_dma_map_page,
-diff -urNp linux-2.6.38.4/arch/m32r/lib/usercopy.c linux-2.6.38.4/arch/m32r/lib/usercopy.c
---- linux-2.6.38.4/arch/m32r/lib/usercopy.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/m32r/lib/usercopy.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/m32r/lib/usercopy.c linux-2.6.39/arch/m32r/lib/usercopy.c
+--- linux-2.6.39/arch/m32r/lib/usercopy.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/m32r/lib/usercopy.c 2011-05-22 19:36:30.000000000 -0400
@@ -14,6 +14,9 @@
unsigned long
__generic_copy_to_user(void __user *to, const void *from, unsigned long n)
prefetchw(to);
if (access_ok(VERIFY_READ, from, n))
__copy_user_zeroing(to,from,n);
-diff -urNp linux-2.6.38.4/arch/microblaze/include/asm/device.h linux-2.6.38.4/arch/microblaze/include/asm/device.h
---- linux-2.6.38.4/arch/microblaze/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/microblaze/include/asm/device.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/microblaze/include/asm/device.h linux-2.6.39/arch/microblaze/include/asm/device.h
+--- linux-2.6.39/arch/microblaze/include/asm/device.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/microblaze/include/asm/device.h 2011-05-22 19:36:30.000000000 -0400
@@ -13,7 +13,7 @@ struct device_node;
struct dev_archdata {
void *dma_data;
};
-diff -urNp linux-2.6.38.4/arch/microblaze/include/asm/dma-mapping.h linux-2.6.38.4/arch/microblaze/include/asm/dma-mapping.h
---- linux-2.6.38.4/arch/microblaze/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/microblaze/include/asm/dma-mapping.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/microblaze/include/asm/dma-mapping.h linux-2.6.39/arch/microblaze/include/asm/dma-mapping.h
+--- linux-2.6.39/arch/microblaze/include/asm/dma-mapping.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/microblaze/include/asm/dma-mapping.h 2011-05-22 19:36:30.000000000 -0400
@@ -43,14 +43,14 @@ static inline unsigned long device_to_ma
return 0xfffffffful;
}
BUG_ON(!ops);
debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
-diff -urNp linux-2.6.38.4/arch/microblaze/include/asm/pci.h linux-2.6.38.4/arch/microblaze/include/asm/pci.h
---- linux-2.6.38.4/arch/microblaze/include/asm/pci.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/microblaze/include/asm/pci.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/microblaze/include/asm/pci.h linux-2.6.39/arch/microblaze/include/asm/pci.h
+--- linux-2.6.39/arch/microblaze/include/asm/pci.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/microblaze/include/asm/pci.h 2011-05-22 19:36:30.000000000 -0400
@@ -54,8 +54,8 @@ static inline void pcibios_penalize_isa_
}
#else /* CONFIG_PCI */
#define set_pci_dma_ops(d)
#define get_pci_dma_ops() NULL
-diff -urNp linux-2.6.38.4/arch/microblaze/kernel/dma.c linux-2.6.38.4/arch/microblaze/kernel/dma.c
---- linux-2.6.38.4/arch/microblaze/kernel/dma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/microblaze/kernel/dma.c 2011-04-28 19:34:14.000000000 -0400
-@@ -133,7 +133,7 @@ static inline void dma_direct_unmap_page
+diff -urNp linux-2.6.39/arch/microblaze/kernel/dma.c linux-2.6.39/arch/microblaze/kernel/dma.c
+--- linux-2.6.39/arch/microblaze/kernel/dma.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
}
.alloc_coherent = dma_direct_alloc_coherent,
.free_coherent = dma_direct_free_coherent,
.map_sg = dma_direct_map_sg,
-diff -urNp linux-2.6.38.4/arch/microblaze/kernel/kgdb.c linux-2.6.38.4/arch/microblaze/kernel/kgdb.c
---- linux-2.6.38.4/arch/microblaze/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/microblaze/kernel/kgdb.c 2011-04-28 19:34:14.000000000 -0400
-@@ -141,10 +141,11 @@ void kgdb_arch_exit(void)
+diff -urNp linux-2.6.39/arch/microblaze/kernel/kgdb.c linux-2.6.39/arch/microblaze/kernel/kgdb.c
+--- linux-2.6.39/arch/microblaze/kernel/kgdb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/microblaze/kernel/kgdb.c 2011-05-22 19:36:30.000000000 -0400
+@@ -141,7 +141,7 @@ void kgdb_arch_exit(void)
/*
* Global data
*/
#ifdef __MICROBLAZEEL__
.gdb_bpt_instr = {0x18, 0x00, 0x0c, 0xba}, /* brki r16, 0x18 */
#else
-+>>>>>>> master
- .gdb_bpt_instr = {0xba, 0x0c, 0x00, 0x18}, /* brki r16, 0x18 */
- #endif
+diff -urNp linux-2.6.39/arch/microblaze/pci/indirect_pci.c linux-2.6.39/arch/microblaze/pci/indirect_pci.c
+--- linux-2.6.39/arch/microblaze/pci/indirect_pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/microblaze/pci/indirect_pci.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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.38.4/arch/microblaze/pci/pci-common.c linux-2.6.38.4/arch/microblaze/pci/pci-common.c
---- linux-2.6.38.4/arch/microblaze/pci/pci-common.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/microblaze/pci/pci-common.c 2011-04-28 19:34:14.000000000 -0400
-@@ -47,14 +47,14 @@ resource_size_t isa_mem_base;
+diff -urNp linux-2.6.39/arch/microblaze/pci/pci-common.c linux-2.6.39/arch/microblaze/pci/pci-common.c
+--- linux-2.6.39/arch/microblaze/pci/pci-common.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
{
return pci_dma_ops;
}
-diff -urNp linux-2.6.38.4/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.38.4/arch/mips/cavium-octeon/dma-octeon.c
---- linux-2.6.38.4/arch/mips/cavium-octeon/dma-octeon.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/cavium-octeon/dma-octeon.c 2011-04-28 19:34:14.000000000 -0400
+@@ -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/arch/mips/alchemy/common/pci.c linux-2.6.39/arch/mips/alchemy/common/pci.c
+--- linux-2.6.39/arch/mips/alchemy/common/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.39/arch/mips/cavium-octeon/dma-octeon.c
+--- linux-2.6.39/arch/mips/cavium-octeon/dma-octeon.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
}
void __init octeon_pci_dma_init(void)
{
-diff -urNp linux-2.6.38.4/arch/mips/include/asm/device.h linux-2.6.38.4/arch/mips/include/asm/device.h
---- linux-2.6.38.4/arch/mips/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/include/asm/device.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/mips/cobalt/pci.c linux-2.6.39/arch/mips/cobalt/pci.c
+--- linux-2.6.39/arch/mips/cobalt/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/include/asm/device.h linux-2.6.39/arch/mips/include/asm/device.h
+--- linux-2.6.39/arch/mips/include/asm/device.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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 {
};
struct pdev_archdata {
-diff -urNp linux-2.6.38.4/arch/mips/include/asm/dma-mapping.h linux-2.6.38.4/arch/mips/include/asm/dma-mapping.h
---- linux-2.6.38.4/arch/mips/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/include/asm/dma-mapping.h 2011-04-28 19:34:14.000000000 -0400
-@@ -7,9 +7,9 @@
-
+diff -urNp linux-2.6.39/arch/mips/include/asm/dma-mapping.h linux-2.6.39/arch/mips/include/asm/dma-mapping.h
+--- linux-2.6.39/arch/mips/include/asm/dma-mapping.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/include/asm/dma-mapping.h 2011-05-22 19:36:30.000000000 -0400
+@@ -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;
{
if (dev && dev->archdata.dma_ops)
return dev->archdata.dma_ops;
-@@ -31,13 +31,13 @@ static inline void dma_mark_clean(void *
+@@ -33,13 +33,13 @@ static inline void dma_mark_clean(void *
static inline int dma_supported(struct device *dev, u64 mask)
{
return ops->mapping_error(dev, mask);
}
-@@ -59,7 +59,7 @@ static inline void *dma_alloc_coherent(s
+@@ -61,7 +61,7 @@ static inline void *dma_alloc_coherent(s
dma_addr_t *dma_handle, gfp_t gfp)
{
void *ret;
ret = ops->alloc_coherent(dev, size, dma_handle, gfp);
-@@ -71,7 +71,7 @@ static inline void *dma_alloc_coherent(s
+@@ -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)
{
ops->free_coherent(dev, size, vaddr, dma_handle);
-diff -urNp linux-2.6.38.4/arch/mips/include/asm/elf.h linux-2.6.38.4/arch/mips/include/asm/elf.h
---- linux-2.6.38.4/arch/mips/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/include/asm/elf.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/mips/include/asm/elf.h linux-2.6.39/arch/mips/include/asm/elf.h
+--- linux-2.6.39/arch/mips/include/asm/elf.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/include/asm/elf.h 2011-05-22 19:36:30.000000000 -0400
@@ -372,13 +372,16 @@ extern const char *__elf_platform;
#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
#endif
+#ifdef CONFIG_PAX_ASLR
-+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT_ADDR) ? 0x00400000UL : 0x00400000UL)
++#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
+
-+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
-+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
++#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
++#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
+#endif
+
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
-#define arch_randomize_brk arch_randomize_brk
-
#endif /* _ASM_ELF_H */
-diff -urNp linux-2.6.38.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h linux-2.6.38.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
---- linux-2.6.38.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h linux-2.6.39/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
+--- linux-2.6.39/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-05-22 19:36:30.000000000 -0400
@@ -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);
extern char *octeon_swiotlb;
#endif /* __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H */
-diff -urNp linux-2.6.38.4/arch/mips/include/asm/page.h linux-2.6.38.4/arch/mips/include/asm/page.h
---- linux-2.6.38.4/arch/mips/include/asm/page.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/include/asm/page.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/mips/include/asm/page.h linux-2.6.39/arch/mips/include/asm/page.h
+--- linux-2.6.39/arch/mips/include/asm/page.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/include/asm/page.h 2011-05-22 19:36:30.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;
#else
typedef struct { unsigned long long pte; } pte_t;
#define pte_val(x) ((x).pte)
-diff -urNp linux-2.6.38.4/arch/mips/include/asm/system.h linux-2.6.38.4/arch/mips/include/asm/system.h
---- linux-2.6.38.4/arch/mips/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/include/asm/system.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/mips/include/asm/pci/bridge.h linux-2.6.39/arch/mips/include/asm/pci/bridge.h
+--- linux-2.6.39/arch/mips/include/asm/pci/bridge.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/include/asm/pci/bridge.h 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/mips/include/asm/system.h linux-2.6.39/arch/mips/include/asm/system.h
+--- linux-2.6.39/arch/mips/include/asm/system.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/include/asm/system.h 2011-05-22 19:36:30.000000000 -0400
@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
*/
#define __ARCH_WANT_UNLOCKED_CTXSW
+#define arch_align_stack(x) ((x) & ~0xfUL)
#endif /* _ASM_SYSTEM_H */
-diff -urNp linux-2.6.38.4/arch/mips/kernel/binfmt_elfn32.c linux-2.6.38.4/arch/mips/kernel/binfmt_elfn32.c
---- linux-2.6.38.4/arch/mips/kernel/binfmt_elfn32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/kernel/binfmt_elfn32.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/mips/kernel/binfmt_elfn32.c linux-2.6.39/arch/mips/kernel/binfmt_elfn32.c
+--- linux-2.6.39/arch/mips/kernel/binfmt_elfn32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/kernel/binfmt_elfn32.c 2011-05-22 19:36:30.000000000 -0400
@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#undef ELF_ET_DYN_BASE
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
+#ifdef CONFIG_PAX_ASLR
-+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT_ADDR) ? 0x00400000UL : 0x00400000UL)
++#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
+
-+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
-+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
++#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
++#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
+#endif
+
#include <asm/processor.h>
#include <linux/module.h>
#include <linux/elfcore.h>
-diff -urNp linux-2.6.38.4/arch/mips/kernel/binfmt_elfo32.c linux-2.6.38.4/arch/mips/kernel/binfmt_elfo32.c
---- linux-2.6.38.4/arch/mips/kernel/binfmt_elfo32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/kernel/binfmt_elfo32.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/mips/kernel/binfmt_elfo32.c linux-2.6.39/arch/mips/kernel/binfmt_elfo32.c
+--- linux-2.6.39/arch/mips/kernel/binfmt_elfo32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/kernel/binfmt_elfo32.c 2011-05-22 19:36:30.000000000 -0400
@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#undef ELF_ET_DYN_BASE
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
+#ifdef CONFIG_PAX_ASLR
-+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT_ADDR) ? 0x00400000UL : 0x00400000UL)
++#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
+
-+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
-+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
++#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
++#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
+#endif
+
#include <asm/processor.h>
/*
-diff -urNp linux-2.6.38.4/arch/mips/kernel/kgdb.c linux-2.6.38.4/arch/mips/kernel/kgdb.c
---- linux-2.6.38.4/arch/mips/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/kernel/kgdb.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/mips/kernel/kgdb.c linux-2.6.39/arch/mips/kernel/kgdb.c
+--- linux-2.6.39/arch/mips/kernel/kgdb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/kernel/kgdb.c 2011-05-22 19:36:30.000000000 -0400
@@ -351,7 +351,7 @@ int kgdb_arch_handle_exception(int vecto
return -1;
}
/*
* We use kgdb_early_setup so that functions we need to call now don't
-diff -urNp linux-2.6.38.4/arch/mips/kernel/process.c linux-2.6.38.4/arch/mips/kernel/process.c
---- linux-2.6.38.4/arch/mips/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/kernel/process.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/mips/kernel/process.c linux-2.6.39/arch/mips/kernel/process.c
+--- linux-2.6.39/arch/mips/kernel/process.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/kernel/process.c 2011-05-22 19:36:30.000000000 -0400
@@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_stru
out:
return pc;
-
- return sp & ALMASK;
-}
-diff -urNp linux-2.6.38.4/arch/mips/kernel/syscall.c linux-2.6.38.4/arch/mips/kernel/syscall.c
---- linux-2.6.38.4/arch/mips/kernel/syscall.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/kernel/syscall.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/mips/kernel/syscall.c linux-2.6.39/arch/mips/kernel/syscall.c
+--- linux-2.6.39/arch/mips/kernel/syscall.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/kernel/syscall.c 2011-05-22 19:36:30.000000000 -0400
@@ -108,14 +108,18 @@ unsigned long arch_get_unmapped_area(str
do_color_align = 0;
if (filp || (flags & MAP_SHARED))
return addr;
addr = vmm->vm_end;
if (do_color_align)
-@@ -168,19 +172,6 @@ static inline unsigned long brk_rnd(void
- return rnd;
+@@ -154,33 +158,6 @@ void arch_pick_mmap_layout(struct mm_str
+ mm->unmap_area = arch_unmap_area;
}
+-static inline unsigned long brk_rnd(void)
+-{
+- unsigned long rnd = get_random_int();
+-
+- rnd = rnd << PAGE_SHIFT;
+- /* 8MB for 32bit, 256MB for 64bit */
+- if (TASK_IS_32BIT_ADDR)
+- rnd = rnd & 0x7ffffful;
+- else
+- rnd = rnd & 0xffffffful;
+-
+- return rnd;
+-}
+-
-unsigned long arch_randomize_brk(struct mm_struct *mm)
-{
- unsigned long base = mm->brk;
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.38.4/arch/mips/mm/dma-default.c linux-2.6.38.4/arch/mips/mm/dma-default.c
---- linux-2.6.38.4/arch/mips/mm/dma-default.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/mm/dma-default.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/mips/mm/dma-default.c linux-2.6.39/arch/mips/mm/dma-default.c
+--- linux-2.6.39/arch/mips/mm/dma-default.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
EXPORT_SYMBOL(mips_dma_map_ops);
#define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
-diff -urNp linux-2.6.38.4/arch/mips/mm/fault.c linux-2.6.38.4/arch/mips/mm/fault.c
---- linux-2.6.38.4/arch/mips/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/mm/fault.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/mips/mm/fault.c linux-2.6.39/arch/mips/mm/fault.c
+--- linux-2.6.39/arch/mips/mm/fault.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/mm/fault.c 2011-05-22 19:36:30.000000000 -0400
@@ -28,6 +28,23 @@
#include <asm/highmem.h> /* For VMALLOC_END */
#include <linux/kdebug.h>
/*
* 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.38.4/arch/parisc/include/asm/elf.h linux-2.6.38.4/arch/parisc/include/asm/elf.h
---- linux-2.6.38.4/arch/parisc/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/parisc/include/asm/elf.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/mips/mti-malta/malta-pci.c linux-2.6.39/arch/mips/mti-malta/malta-pci.c
+--- linux-2.6.39/arch/mips/mti-malta/malta-pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/nxp/pnx8550/common/pci.c linux-2.6.39/arch/mips/nxp/pnx8550/common/pci.c
+--- linux-2.6.39/arch/mips/nxp/pnx8550/common/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/nxp/pnx8550/common/pci.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/mips/pci/ops-au1000.c linux-2.6.39/arch/mips/pci/ops-au1000.c
+--- linux-2.6.39/arch/mips/pci/ops-au1000.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/ops-bcm63xx.c linux-2.6.39/arch/mips/pci/ops-bcm63xx.c
+--- linux-2.6.39/arch/mips/pci/ops-bcm63xx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/ops-bonito64.c linux-2.6.39/arch/mips/pci/ops-bonito64.c
+--- linux-2.6.39/arch/mips/pci/ops-bonito64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/ops-bridge.c linux-2.6.39/arch/mips/pci/ops-bridge.c
+--- linux-2.6.39/arch/mips/pci/ops-bridge.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/ops-emma2rh.c linux-2.6.39/arch/mips/pci/ops-emma2rh.c
+--- linux-2.6.39/arch/mips/pci/ops-emma2rh.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/ops-gt64xxx_pci0.c linux-2.6.39/arch/mips/pci/ops-gt64xxx_pci0.c
+--- linux-2.6.39/arch/mips/pci/ops-gt64xxx_pci0.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/ops-loongson2.c linux-2.6.39/arch/mips/pci/ops-loongson2.c
+--- linux-2.6.39/arch/mips/pci/ops-loongson2.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/ops-mace.c linux-2.6.39/arch/mips/pci/ops-mace.c
+--- linux-2.6.39/arch/mips/pci/ops-mace.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/pci/ops-mace.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/mips/pci/ops-msc.c linux-2.6.39/arch/mips/pci/ops-msc.c
+--- linux-2.6.39/arch/mips/pci/ops-msc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/pci/ops-msc.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/mips/pci/ops-nile4.c linux-2.6.39/arch/mips/pci/ops-nile4.c
+--- linux-2.6.39/arch/mips/pci/ops-nile4.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/pci/ops-nile4.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/mips/pci/ops-pmcmsp.c linux-2.6.39/arch/mips/pci/ops-pmcmsp.c
+--- linux-2.6.39/arch/mips/pci/ops-pmcmsp.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/ops-pnx8550.c linux-2.6.39/arch/mips/pci/ops-pnx8550.c
+--- linux-2.6.39/arch/mips/pci/ops-pnx8550.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/ops-rc32434.c linux-2.6.39/arch/mips/pci/ops-rc32434.c
+--- linux-2.6.39/arch/mips/pci/ops-rc32434.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/ops-sni.c linux-2.6.39/arch/mips/pci/ops-sni.c
+--- linux-2.6.39/arch/mips/pci/ops-sni.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/pci/ops-sni.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/mips/pci/ops-titan.c linux-2.6.39/arch/mips/pci/ops-titan.c
+--- linux-2.6.39/arch/mips/pci/ops-titan.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/pci/ops-titan.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/mips/pci/ops-titan-ht.c linux-2.6.39/arch/mips/pci/ops-titan-ht.c
+--- linux-2.6.39/arch/mips/pci/ops-titan-ht.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/ops-tx3927.c linux-2.6.39/arch/mips/pci/ops-tx3927.c
+--- linux-2.6.39/arch/mips/pci/ops-tx3927.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/ops-vr41xx.c linux-2.6.39/arch/mips/pci/ops-vr41xx.c
+--- linux-2.6.39/arch/mips/pci/ops-vr41xx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/pci-bcm1480.c linux-2.6.39/arch/mips/pci/pci-bcm1480.c
+--- linux-2.6.39/arch/mips/pci/pci-bcm1480.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/pci-bcm1480ht.c linux-2.6.39/arch/mips/pci/pci-bcm1480ht.c
+--- linux-2.6.39/arch/mips/pci/pci-bcm1480ht.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/pci-bcm63xx.h linux-2.6.39/arch/mips/pci/pci-bcm63xx.h
+--- linux-2.6.39/arch/mips/pci/pci-bcm63xx.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/pci-emma2rh.c linux-2.6.39/arch/mips/pci/pci-emma2rh.c
+--- linux-2.6.39/arch/mips/pci/pci-emma2rh.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/pcie-octeon.c linux-2.6.39/arch/mips/pci/pcie-octeon.c
+--- linux-2.6.39/arch/mips/pci/pcie-octeon.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/pci-ip27.c linux-2.6.39/arch/mips/pci/pci-ip27.c
+--- linux-2.6.39/arch/mips/pci/pci-ip27.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/pci/pci-ip27.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/mips/pci/pci-ip32.c linux-2.6.39/arch/mips/pci/pci-ip32.c
+--- linux-2.6.39/arch/mips/pci/pci-ip32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/pci/pci-ip32.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/mips/pci/pci-lasat.c linux-2.6.39/arch/mips/pci/pci-lasat.c
+--- linux-2.6.39/arch/mips/pci/pci-lasat.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/pci/pci-lasat.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/mips/pci/pci-octeon.c linux-2.6.39/arch/mips/pci/pci-octeon.c
+--- linux-2.6.39/arch/mips/pci/pci-octeon.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/pci-rc32434.c linux-2.6.39/arch/mips/pci/pci-rc32434.c
+--- linux-2.6.39/arch/mips/pci/pci-rc32434.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/pci-sb1250.c linux-2.6.39/arch/mips/pci/pci-sb1250.c
+--- linux-2.6.39/arch/mips/pci/pci-sb1250.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/pci-vr41xx.c linux-2.6.39/arch/mips/pci/pci-vr41xx.c
+--- linux-2.6.39/arch/mips/pci/pci-vr41xx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pci/pci-yosemite.c linux-2.6.39/arch/mips/pci/pci-yosemite.c
+--- linux-2.6.39/arch/mips/pci/pci-yosemite.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/pmc-sierra/yosemite/ht.c linux-2.6.39/arch/mips/pmc-sierra/yosemite/ht.c
+--- linux-2.6.39/arch/mips/pmc-sierra/yosemite/ht.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/mips/pmc-sierra/yosemite/ht.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/mips/pnx8550/common/pci.c linux-2.6.39/arch/mips/pnx8550/common/pci.c
+--- linux-2.6.39/arch/mips/pnx8550/common/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/sni/pcimt.c linux-2.6.39/arch/mips/sni/pcimt.c
+--- linux-2.6.39/arch/mips/sni/pcimt.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/sni/pcit.c linux-2.6.39/arch/mips/sni/pcit.c
+--- linux-2.6.39/arch/mips/sni/pcit.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mips/wrppmc/pci.c linux-2.6.39/arch/mips/wrppmc/pci.c
+--- linux-2.6.39/arch/mips/wrppmc/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mn10300/unit-asb2305/pci-asb2305.h linux-2.6.39/arch/mn10300/unit-asb2305/pci-asb2305.h
+--- linux-2.6.39/arch/mn10300/unit-asb2305/pci-asb2305.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/mn10300/unit-asb2305/pci.c linux-2.6.39/arch/mn10300/unit-asb2305/pci.c
+--- linux-2.6.39/arch/mn10300/unit-asb2305/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/parisc/include/asm/elf.h linux-2.6.39/arch/parisc/include/asm/elf.h
+--- linux-2.6.39/arch/parisc/include/asm/elf.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/parisc/include/asm/elf.h 2011-05-22 19:36:30.000000000 -0400
@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration..
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
/* 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.38.4/arch/parisc/include/asm/pgtable.h linux-2.6.38.4/arch/parisc/include/asm/pgtable.h
---- linux-2.6.38.4/arch/parisc/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/parisc/include/asm/pgtable.h 2011-04-28 19:34:14.000000000 -0400
-@@ -209,6 +209,17 @@ struct vm_area_struct;
+diff -urNp linux-2.6.39/arch/parisc/include/asm/pgtable.h linux-2.6.39/arch/parisc/include/asm/pgtable.h
+--- linux-2.6.39/arch/parisc/include/asm/pgtable.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/parisc/include/asm/pgtable.h 2011-05-22 19:36:30.000000000 -0400
+@@ -207,6 +207,17 @@ struct vm_area_struct;
#define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
#define PAGE_COPY PAGE_EXECREAD
#define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
#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.38.4/arch/parisc/kernel/module.c linux-2.6.38.4/arch/parisc/kernel/module.c
---- linux-2.6.38.4/arch/parisc/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/parisc/kernel/module.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/parisc/kernel/module.c linux-2.6.39/arch/parisc/kernel/module.c
+--- linux-2.6.39/arch/parisc/kernel/module.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/parisc/kernel/module.c 2011-05-22 19:36:30.000000000 -0400
@@ -96,16 +96,38 @@
/* three functions to determine where in the module core
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.38.4/arch/parisc/kernel/sys_parisc.c linux-2.6.38.4/arch/parisc/kernel/sys_parisc.c
---- linux-2.6.38.4/arch/parisc/kernel/sys_parisc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/parisc/kernel/sys_parisc.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/parisc/kernel/sys_parisc.c linux-2.6.39/arch/parisc/kernel/sys_parisc.c
+--- linux-2.6.39/arch/parisc/kernel/sys_parisc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/parisc/kernel/sys_parisc.c 2011-05-22 19:36:30.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)
if (filp) {
addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-2.6.38.4/arch/parisc/kernel/traps.c linux-2.6.38.4/arch/parisc/kernel/traps.c
---- linux-2.6.38.4/arch/parisc/kernel/traps.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/parisc/kernel/traps.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/parisc/kernel/traps.c linux-2.6.39/arch/parisc/kernel/traps.c
+--- linux-2.6.39/arch/parisc/kernel/traps.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/parisc/kernel/traps.c 2011-05-22 19:36:30.000000000 -0400
@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
down_read(¤t->mm->mmap_sem);
fault_address = regs->iaoq[0];
fault_space = regs->iasq[0];
-diff -urNp linux-2.6.38.4/arch/parisc/mm/fault.c linux-2.6.38.4/arch/parisc/mm/fault.c
---- linux-2.6.38.4/arch/parisc/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/parisc/mm/fault.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/parisc/mm/fault.c linux-2.6.39/arch/parisc/mm/fault.c
+--- linux-2.6.39/arch/parisc/mm/fault.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/parisc/mm/fault.c 2011-05-22 19:36:30.000000000 -0400
@@ -15,6 +15,7 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
/*
* If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/device.h linux-2.6.38.4/arch/powerpc/include/asm/device.h
---- linux-2.6.38.4/arch/powerpc/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/device.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/include/asm/device.h linux-2.6.39/arch/powerpc/include/asm/device.h
+--- linux-2.6.39/arch/powerpc/include/asm/device.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/include/asm/device.h 2011-05-22 19:36:30.000000000 -0400
@@ -17,7 +17,7 @@ struct device_node;
*/
struct dev_archdata {
/*
* When an iommu is in use, dma_data is used as a ptr to the base of the
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/dma-mapping.h linux-2.6.38.4/arch/powerpc/include/asm/dma-mapping.h
---- linux-2.6.38.4/arch/powerpc/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/dma-mapping.h 2011-04-28 19:34:14.000000000 -0400
-@@ -66,12 +66,13 @@ static inline unsigned long device_to_ma
+diff -urNp linux-2.6.39/arch/powerpc/include/asm/dma-mapping.h linux-2.6.39/arch/powerpc/include/asm/dma-mapping.h
+--- linux-2.6.39/arch/powerpc/include/asm/dma-mapping.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/include/asm/dma-mapping.h 2011-05-22 19:36:30.000000000 -0400
+@@ -67,12 +67,13 @@ static inline unsigned long device_to_ma
/*
* Available generic sets of operations
*/
{
/* 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
-@@ -84,7 +85,7 @@ static inline struct dma_map_ops *get_dm
+@@ -85,7 +86,7 @@ static inline struct dma_map_ops *get_dm
return dev->archdata.dma_ops;
}
{
dev->archdata.dma_ops = ops;
}
-@@ -118,7 +119,7 @@ static inline void set_dma_offset(struct
+@@ -119,7 +120,7 @@ static inline void set_dma_offset(struct
static inline int dma_supported(struct device *dev, u64 mask)
{
if (unlikely(dma_ops == NULL))
return 0;
-@@ -132,7 +133,7 @@ extern int dma_set_mask(struct device *d
+@@ -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)
{
void *cpu_addr;
BUG_ON(!dma_ops);
-@@ -147,7 +148,7 @@ static inline void *dma_alloc_coherent(s
+@@ -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)
{
BUG_ON(!dma_ops);
-@@ -158,7 +159,7 @@ static inline void dma_free_coherent(str
+@@ -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)
{
if (dma_ops->mapping_error)
return dma_ops->mapping_error(dev, dma_addr);
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/elf.h linux-2.6.38.4/arch/powerpc/include/asm/elf.h
---- linux-2.6.38.4/arch/powerpc/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/elf.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/include/asm/elf.h linux-2.6.39/arch/powerpc/include/asm/elf.h
+--- linux-2.6.39/arch/powerpc/include/asm/elf.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/include/asm/elf.h 2011-05-22 19:36:30.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. */
#endif /* __KERNEL__ */
/*
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/iommu.h linux-2.6.38.4/arch/powerpc/include/asm/iommu.h
---- linux-2.6.38.4/arch/powerpc/include/asm/iommu.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/iommu.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/include/asm/iommu.h linux-2.6.39/arch/powerpc/include/asm/iommu.h
+--- linux-2.6.39/arch/powerpc/include/asm/iommu.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
#ifdef CONFIG_PCI
extern void pci_iommu_init(void);
extern void pci_direct_iommu_init(void);
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/kmap_types.h linux-2.6.38.4/arch/powerpc/include/asm/kmap_types.h
---- linux-2.6.38.4/arch/powerpc/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/kmap_types.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/include/asm/kmap_types.h linux-2.6.39/arch/powerpc/include/asm/kmap_types.h
+--- linux-2.6.39/arch/powerpc/include/asm/kmap_types.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/include/asm/kmap_types.h 2011-05-22 19:36:30.000000000 -0400
@@ -27,6 +27,7 @@ enum km_type {
KM_PPC_SYNC_PAGE,
KM_PPC_SYNC_ICACHE,
KM_TYPE_NR
};
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/page_64.h linux-2.6.38.4/arch/powerpc/include/asm/page_64.h
---- linux-2.6.38.4/arch/powerpc/include/asm/page_64.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/page_64.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/include/asm/page_64.h linux-2.6.39/arch/powerpc/include/asm/page_64.h
+--- linux-2.6.39/arch/powerpc/include/asm/page_64.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/include/asm/page_64.h 2011-05-22 19:36:30.000000000 -0400
@@ -172,15 +172,18 @@ do { \
- * stack by default, so in the absense of a PT_GNU_STACK program header
+ * stack by default, so in the absence of a PT_GNU_STACK program header
* we turn execute permission off.
*/
-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
#include <asm-generic/getorder.h>
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/page.h linux-2.6.38.4/arch/powerpc/include/asm/page.h
---- linux-2.6.38.4/arch/powerpc/include/asm/page.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/page.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/include/asm/page.h linux-2.6.39/arch/powerpc/include/asm/page.h
+--- linux-2.6.39/arch/powerpc/include/asm/page.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/include/asm/page.h 2011-05-22 19:36:30.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.
#ifndef __ASSEMBLY__
#undef STRICT_MM_TYPECHECKS
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/pci.h linux-2.6.38.4/arch/powerpc/include/asm/pci.h
---- linux-2.6.38.4/arch/powerpc/include/asm/pci.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/pci.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/include/asm/pci.h linux-2.6.39/arch/powerpc/include/asm/pci.h
+--- linux-2.6.39/arch/powerpc/include/asm/pci.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
}
#else /* CONFIG_PCI */
#define set_pci_dma_ops(d)
#define get_pci_dma_ops() NULL
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/pgtable.h linux-2.6.38.4/arch/powerpc/include/asm/pgtable.h
---- linux-2.6.38.4/arch/powerpc/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/pgtable.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/include/asm/pgtable.h linux-2.6.39/arch/powerpc/include/asm/pgtable.h
+--- linux-2.6.39/arch/powerpc/include/asm/pgtable.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/include/asm/pgtable.h 2011-05-22 19:36:30.000000000 -0400
@@ -2,6 +2,7 @@
#define _ASM_POWERPC_PGTABLE_H
#ifdef __KERNEL__
#ifndef __ASSEMBLY__
#include <asm/processor.h> /* For TASK_SIZE */
#include <asm/mmu.h>
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/pte-hash32.h linux-2.6.38.4/arch/powerpc/include/asm/pte-hash32.h
---- linux-2.6.38.4/arch/powerpc/include/asm/pte-hash32.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/pte-hash32.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/include/asm/pte-hash32.h linux-2.6.39/arch/powerpc/include/asm/pte-hash32.h
+--- linux-2.6.39/arch/powerpc/include/asm/pte-hash32.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/include/asm/pte-hash32.h 2011-05-22 19:36:30.000000000 -0400
@@ -21,6 +21,7 @@
#define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
#define _PAGE_USER 0x004 /* usermode access allowed */
#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.38.4/arch/powerpc/include/asm/reg.h linux-2.6.38.4/arch/powerpc/include/asm/reg.h
---- linux-2.6.38.4/arch/powerpc/include/asm/reg.h 2011-04-18 17:27:13.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/reg.h 2011-04-28 19:34:14.000000000 -0400
-@@ -191,6 +191,7 @@
+diff -urNp linux-2.6.39/arch/powerpc/include/asm/reg.h linux-2.6.39/arch/powerpc/include/asm/reg.h
+--- linux-2.6.39/arch/powerpc/include/asm/reg.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/include/asm/reg.h 2011-05-22 19:36:30.000000000 -0400
+@@ -201,6 +201,7 @@
#define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
#define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
#define DSISR_NOHPTE 0x40000000 /* no translation found */
#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.38.4/arch/powerpc/include/asm/swiotlb.h linux-2.6.38.4/arch/powerpc/include/asm/swiotlb.h
---- linux-2.6.38.4/arch/powerpc/include/asm/swiotlb.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/swiotlb.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/include/asm/swiotlb.h linux-2.6.39/arch/powerpc/include/asm/swiotlb.h
+--- linux-2.6.39/arch/powerpc/include/asm/swiotlb.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/include/asm/swiotlb.h 2011-05-22 19:36:30.000000000 -0400
@@ -13,7 +13,7 @@
#include <linux/swiotlb.h>
static inline void dma_mark_clean(void *addr, size_t size) {}
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/system.h linux-2.6.38.4/arch/powerpc/include/asm/system.h
---- linux-2.6.38.4/arch/powerpc/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/system.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/include/asm/system.h linux-2.6.39/arch/powerpc/include/asm/system.h
+--- linux-2.6.39/arch/powerpc/include/asm/system.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/include/asm/system.h 2011-05-22 19:36:30.000000000 -0400
@@ -533,7 +533,7 @@ __cmpxchg_local(volatile void *ptr, unsi
#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
#endif
/* Used in very early kernel initialization. */
extern unsigned long reloc_offset(void);
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/uaccess.h linux-2.6.38.4/arch/powerpc/include/asm/uaccess.h
---- linux-2.6.38.4/arch/powerpc/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/uaccess.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/include/asm/uaccess.h linux-2.6.39/arch/powerpc/include/asm/uaccess.h
+--- linux-2.6.39/arch/powerpc/include/asm/uaccess.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/include/asm/uaccess.h 2011-05-22 19:36:30.000000000 -0400
@@ -13,6 +13,8 @@
#define VERIFY_READ 0
#define VERIFY_WRITE 1
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.38.4/arch/powerpc/kernel/dma.c linux-2.6.38.4/arch/powerpc/kernel/dma.c
---- linux-2.6.38.4/arch/powerpc/kernel/dma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/dma.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/kernel/dma.c linux-2.6.39/arch/powerpc/kernel/dma.c
+--- linux-2.6.39/arch/powerpc/kernel/dma.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/kernel/dma.c 2011-05-22 19:36:30.000000000 -0400
@@ -136,7 +136,7 @@ static inline void dma_direct_sync_singl
}
#endif
if (ppc_md.dma_set_mask)
return ppc_md.dma_set_mask(dev, dma_mask);
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/dma-iommu.c linux-2.6.38.4/arch/powerpc/kernel/dma-iommu.c
---- linux-2.6.38.4/arch/powerpc/kernel/dma-iommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/dma-iommu.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/kernel/dma-iommu.c linux-2.6.39/arch/powerpc/kernel/dma-iommu.c
+--- linux-2.6.39/arch/powerpc/kernel/dma-iommu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
}
.alloc_coherent = dma_iommu_alloc_coherent,
.free_coherent = dma_iommu_free_coherent,
.map_sg = dma_iommu_map_sg,
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.38.4/arch/powerpc/kernel/dma-swiotlb.c
---- linux-2.6.38.4/arch/powerpc/kernel/dma-swiotlb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/dma-swiotlb.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.39/arch/powerpc/kernel/dma-swiotlb.c
+--- linux-2.6.39/arch/powerpc/kernel/dma-swiotlb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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.
.alloc_coherent = dma_direct_alloc_coherent,
.free_coherent = dma_direct_free_coherent,
.map_sg = swiotlb_map_sg_attrs,
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/exceptions-64e.S linux-2.6.38.4/arch/powerpc/kernel/exceptions-64e.S
---- linux-2.6.38.4/arch/powerpc/kernel/exceptions-64e.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/exceptions-64e.S 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/kernel/exceptions-64e.S linux-2.6.39/arch/powerpc/kernel/exceptions-64e.S
+--- linux-2.6.39/arch/powerpc/kernel/exceptions-64e.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/kernel/exceptions-64e.S 2011-05-22 19:36:30.000000000 -0400
@@ -495,6 +495,7 @@ storage_fault_common:
std r14,_DAR(r1)
std r15,_DSISR(r1)
addi r3,r1,STACK_FRAME_OVERHEAD
ld r4,_DAR(r1)
bl .bad_page_fault
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/exceptions-64s.S linux-2.6.38.4/arch/powerpc/kernel/exceptions-64s.S
---- linux-2.6.38.4/arch/powerpc/kernel/exceptions-64s.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/exceptions-64s.S 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/kernel/exceptions-64s.S linux-2.6.39/arch/powerpc/kernel/exceptions-64s.S
+--- linux-2.6.39/arch/powerpc/kernel/exceptions-64s.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/kernel/exceptions-64s.S 2011-05-22 19:36:30.000000000 -0400
@@ -848,10 +848,10 @@ handle_page_fault:
11: ld r4,_DAR(r1)
ld r5,_DSISR(r1)
mr r5,r3
addi r3,r1,STACK_FRAME_OVERHEAD
lwz r4,_DAR(r1)
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/ibmebus.c linux-2.6.38.4/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.38.4/arch/powerpc/kernel/ibmebus.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/ibmebus.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/kernel/ibmebus.c linux-2.6.39/arch/powerpc/kernel/ibmebus.c
+--- linux-2.6.39/arch/powerpc/kernel/ibmebus.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
}
.alloc_coherent = ibmebus_alloc_coherent,
.free_coherent = ibmebus_free_coherent,
.map_sg = ibmebus_map_sg,
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/kgdb.c linux-2.6.38.4/arch/powerpc/kernel/kgdb.c
---- linux-2.6.38.4/arch/powerpc/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/kgdb.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/kernel/kgdb.c linux-2.6.39/arch/powerpc/kernel/kgdb.c
+--- linux-2.6.39/arch/powerpc/kernel/kgdb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
.gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
};
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/module_32.c linux-2.6.38.4/arch/powerpc/kernel/module_32.c
---- linux-2.6.38.4/arch/powerpc/kernel/module_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/module_32.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/kernel/module_32.c linux-2.6.39/arch/powerpc/kernel/module_32.c
+--- linux-2.6.39/arch/powerpc/kernel/module_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/kernel/module_32.c 2011-05-22 19:36:30.000000000 -0400
@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
me->arch.core_plt_section = i;
}
/* Find this entry, or if that fails, the next avail. entry */
while (entry->jump[0]) {
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/module.c linux-2.6.38.4/arch/powerpc/kernel/module.c
---- linux-2.6.38.4/arch/powerpc/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/module.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/kernel/module.c linux-2.6.39/arch/powerpc/kernel/module.c
+--- linux-2.6.39/arch/powerpc/kernel/module.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/kernel/module.c 2011-05-22 19:36:30.000000000 -0400
@@ -31,11 +31,24 @@
LIST_HEAD(module_bug_list);
static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
const Elf_Shdr *sechdrs,
const char *name)
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/pci-common.c linux-2.6.38.4/arch/powerpc/kernel/pci-common.c
---- linux-2.6.38.4/arch/powerpc/kernel/pci-common.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/pci-common.c 2011-04-28 19:34:14.000000000 -0400
-@@ -52,14 +52,14 @@ resource_size_t isa_mem_base;
+diff -urNp linux-2.6.39/arch/powerpc/kernel/pci-common.c linux-2.6.39/arch/powerpc/kernel/pci-common.c
+--- linux-2.6.39/arch/powerpc/kernel/pci-common.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
{
return pci_dma_ops;
}
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/process.c linux-2.6.38.4/arch/powerpc/kernel/process.c
---- linux-2.6.38.4/arch/powerpc/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/process.c 2011-04-28 19:34:14.000000000 -0400
+@@ -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/arch/powerpc/kernel/process.c linux-2.6.39/arch/powerpc/kernel/process.c
+--- linux-2.6.39/arch/powerpc/kernel/process.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/kernel/process.c 2011-05-22 19:41:32.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
-
- return ret;
-}
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/signal_32.c linux-2.6.38.4/arch/powerpc/kernel/signal_32.c
---- linux-2.6.38.4/arch/powerpc/kernel/signal_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/signal_32.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/kernel/rtas_pci.c linux-2.6.39/arch/powerpc/kernel/rtas_pci.c
+--- linux-2.6.39/arch/powerpc/kernel/rtas_pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/powerpc/kernel/signal_32.c linux-2.6.39/arch/powerpc/kernel/signal_32.c
+--- linux-2.6.39/arch/powerpc/kernel/signal_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/kernel/signal_32.c 2011-05-22 19:36:30.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;
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.38.4/arch/powerpc/kernel/signal_64.c linux-2.6.38.4/arch/powerpc/kernel/signal_64.c
---- linux-2.6.38.4/arch/powerpc/kernel/signal_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/signal_64.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/kernel/signal_64.c linux-2.6.39/arch/powerpc/kernel/signal_64.c
+--- linux-2.6.39/arch/powerpc/kernel/signal_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/kernel/signal_64.c 2011-05-22 19:36:30.000000000 -0400
@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
current->thread.fpscr.val = 0;
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.38.4/arch/powerpc/kernel/vdso.c linux-2.6.38.4/arch/powerpc/kernel/vdso.c
---- linux-2.6.38.4/arch/powerpc/kernel/vdso.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/vdso.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/kernel/vdso.c linux-2.6.39/arch/powerpc/kernel/vdso.c
+--- linux-2.6.39/arch/powerpc/kernel/vdso.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/kernel/vdso.c 2011-05-22 19:36:30.000000000 -0400
@@ -36,6 +36,7 @@
#include <asm/firmware.h>
#include <asm/vdso.h>
if (IS_ERR_VALUE(vdso_base)) {
rc = vdso_base;
goto fail_mmapsem;
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/vio.c linux-2.6.38.4/arch/powerpc/kernel/vio.c
---- linux-2.6.38.4/arch/powerpc/kernel/vio.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/vio.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/kernel/vio.c linux-2.6.39/arch/powerpc/kernel/vio.c
+--- linux-2.6.39/arch/powerpc/kernel/vio.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/kernel/vio.c 2011-05-22 19:36:30.000000000 -0400
@@ -605,11 +605,12 @@ static int vio_dma_iommu_dma_supported(s
return dma_iommu_ops.dma_supported(dev, mask);
}
.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.38.4/arch/powerpc/lib/usercopy_64.c linux-2.6.38.4/arch/powerpc/lib/usercopy_64.c
---- linux-2.6.38.4/arch/powerpc/lib/usercopy_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/lib/usercopy_64.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/lib/usercopy_64.c linux-2.6.39/arch/powerpc/lib/usercopy_64.c
+--- linux-2.6.39/arch/powerpc/lib/usercopy_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/lib/usercopy_64.c 2011-05-22 19:36:30.000000000 -0400
@@ -9,22 +9,6 @@
#include <linux/module.h>
#include <asm/uaccess.h>
-EXPORT_SYMBOL(copy_to_user);
EXPORT_SYMBOL(copy_in_user);
-diff -urNp linux-2.6.38.4/arch/powerpc/mm/fault.c linux-2.6.38.4/arch/powerpc/mm/fault.c
---- linux-2.6.38.4/arch/powerpc/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/mm/fault.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/mm/fault.c linux-2.6.39/arch/powerpc/mm/fault.c
+--- linux-2.6.39/arch/powerpc/mm/fault.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/mm/fault.c 2011-05-22 19:36:30.000000000 -0400
@@ -31,6 +31,10 @@
#include <linux/kdebug.h>
#include <linux/perf_event.h>
_exception(SIGSEGV, regs, code, address);
return 0;
}
-diff -urNp linux-2.6.38.4/arch/powerpc/mm/mmap_64.c linux-2.6.38.4/arch/powerpc/mm/mmap_64.c
---- linux-2.6.38.4/arch/powerpc/mm/mmap_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/mm/mmap_64.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/mm/mmap_64.c linux-2.6.39/arch/powerpc/mm/mmap_64.c
+--- linux-2.6.39/arch/powerpc/mm/mmap_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/mm/mmap_64.c 2011-05-22 19:36:30.000000000 -0400
@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.38.4/arch/powerpc/mm/slice.c linux-2.6.38.4/arch/powerpc/mm/slice.c
---- linux-2.6.38.4/arch/powerpc/mm/slice.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/mm/slice.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/mm/slice.c linux-2.6.39/arch/powerpc/mm/slice.c
+--- linux-2.6.39/arch/powerpc/mm/slice.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/mm/slice.c 2011-05-22 19:36:30.000000000 -0400
@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
if ((mm->task_size - len) < addr)
return 0;
/* If hint, make sure it matches our alignment restrictions */
if (!fixed && addr) {
addr = _ALIGN_UP(addr, 1ul << pshift);
-diff -urNp linux-2.6.38.4/arch/powerpc/platforms/cell/iommu.c linux-2.6.38.4/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.38.4/arch/powerpc/platforms/cell/iommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/platforms/cell/iommu.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/platforms/52xx/efika.c linux-2.6.39/arch/powerpc/platforms/52xx/efika.c
+--- linux-2.6.39/arch/powerpc/platforms/52xx/efika.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/platforms/52xx/efika.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/powerpc/platforms/cell/celleb_pci.c linux-2.6.39/arch/powerpc/platforms/cell/celleb_pci.c
+--- linux-2.6.39/arch/powerpc/platforms/cell/celleb_pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/platforms/cell/celleb_pci.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/powerpc/platforms/cell/celleb_scc_epci.c linux-2.6.39/arch/powerpc/platforms/cell/celleb_scc_epci.c
+--- linux-2.6.39/arch/powerpc/platforms/cell/celleb_scc_epci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/powerpc/platforms/cell/celleb_scc_pciex.c linux-2.6.39/arch/powerpc/platforms/cell/celleb_scc_pciex.c
+--- linux-2.6.39/arch/powerpc/platforms/cell/celleb_scc_pciex.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/platforms/cell/celleb_scc_pciex.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/powerpc/platforms/cell/iommu.c linux-2.6.39/arch/powerpc/platforms/cell/iommu.c
+--- linux-2.6.39/arch/powerpc/platforms/cell/iommu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/platforms/cell/iommu.c 2011-05-22 19:36:30.000000000 -0400
@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
.alloc_coherent = dma_fixed_alloc_coherent,
.free_coherent = dma_fixed_free_coherent,
.map_sg = dma_fixed_map_sg,
-diff -urNp linux-2.6.38.4/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.38.4/arch/powerpc/platforms/ps3/system-bus.c
---- linux-2.6.38.4/arch/powerpc/platforms/ps3/system-bus.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/platforms/ps3/system-bus.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/powerpc/platforms/chrp/pci.c linux-2.6.39/arch/powerpc/platforms/chrp/pci.c
+--- linux-2.6.39/arch/powerpc/platforms/chrp/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/powerpc/platforms/iseries/pci.c linux-2.6.39/arch/powerpc/platforms/iseries/pci.c
+--- linux-2.6.39/arch/powerpc/platforms/iseries/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/powerpc/platforms/maple/pci.c linux-2.6.39/arch/powerpc/platforms/maple/pci.c
+--- linux-2.6.39/arch/powerpc/platforms/maple/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/platforms/maple/pci.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/powerpc/platforms/pasemi/pci.c linux-2.6.39/arch/powerpc/platforms/pasemi/pci.c
+--- linux-2.6.39/arch/powerpc/platforms/pasemi/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/platforms/pasemi/pci.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/powerpc/platforms/powermac/pci.c linux-2.6.39/arch/powerpc/platforms/powermac/pci.c
+--- linux-2.6.39/arch/powerpc/platforms/powermac/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/platforms/powermac/pci.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.39/arch/powerpc/platforms/ps3/system-bus.c
+--- linux-2.6.39/arch/powerpc/platforms/ps3/system-bus.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
}
.alloc_coherent = ps3_alloc_coherent,
.free_coherent = ps3_free_coherent,
.map_sg = ps3_ioc0_map_sg,
-diff -urNp linux-2.6.38.4/arch/powerpc/sysdev/ppc4xx_cpm.c linux-2.6.38.4/arch/powerpc/sysdev/ppc4xx_cpm.c
---- linux-2.6.38.4/arch/powerpc/sysdev/ppc4xx_cpm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/sysdev/ppc4xx_cpm.c 2011-04-28 19:34:14.000000000 -0400
-@@ -240,7 +240,7 @@ static int cpm_suspend_enter(suspend_sta
- return 0;
+diff -urNp linux-2.6.39/arch/powerpc/sysdev/fsl_pci.c linux-2.6.39/arch/powerpc/sysdev/fsl_pci.c
+--- linux-2.6.39/arch/powerpc/sysdev/fsl_pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/powerpc/sysdev/indirect_pci.c linux-2.6.39/arch/powerpc/sysdev/indirect_pci.c
+--- linux-2.6.39/arch/powerpc/sysdev/indirect_pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/powerpc/sysdev/indirect_pci.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/powerpc/sysdev/ppc4xx_pci.c linux-2.6.39/arch/powerpc/sysdev/ppc4xx_pci.c
+--- linux-2.6.39/arch/powerpc/sysdev/ppc4xx_pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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 platform_suspend_ops cpm_suspend_ops = {
-+static const struct platform_suspend_ops cpm_suspend_ops = {
- .valid = cpm_suspend_valid,
- .enter = cpm_suspend_enter,
+-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/arch/powerpc/sysdev/tsi108_pci.c linux-2.6.39/arch/powerpc/sysdev/tsi108_pci.c
+--- linux-2.6.39/arch/powerpc/sysdev/tsi108_pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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.38.4/arch/s390/include/asm/elf.h linux-2.6.38.4/arch/s390/include/asm/elf.h
---- linux-2.6.38.4/arch/s390/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/s390/include/asm/elf.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/s390/include/asm/elf.h linux-2.6.39/arch/s390/include/asm/elf.h
+--- linux-2.6.39/arch/s390/include/asm/elf.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/s390/include/asm/elf.h 2011-05-22 19:36:30.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. */
-#define arch_randomize_brk arch_randomize_brk
-
#endif
-diff -urNp linux-2.6.38.4/arch/s390/include/asm/system.h linux-2.6.38.4/arch/s390/include/asm/system.h
---- linux-2.6.38.4/arch/s390/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/s390/include/asm/system.h 2011-04-28 19:34:14.000000000 -0400
-@@ -449,7 +449,7 @@ extern void (*_machine_restart)(char *co
+diff -urNp linux-2.6.39/arch/s390/include/asm/system.h linux-2.6.39/arch/s390/include/asm/system.h
+--- linux-2.6.39/arch/s390/include/asm/system.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/s390/include/asm/system.h 2011-05-22 19:36:30.000000000 -0400
+@@ -255,7 +255,7 @@ extern void (*_machine_restart)(char *co
extern void (*_machine_halt)(void);
extern void (*_machine_power_off)(void);
static inline int tprot(unsigned long addr)
{
-diff -urNp linux-2.6.38.4/arch/s390/include/asm/uaccess.h linux-2.6.38.4/arch/s390/include/asm/uaccess.h
---- linux-2.6.38.4/arch/s390/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/s390/include/asm/uaccess.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/s390/include/asm/uaccess.h linux-2.6.39/arch/s390/include/asm/uaccess.h
+--- linux-2.6.39/arch/s390/include/asm/uaccess.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/s390/include/asm/uaccess.h 2011-05-22 19:36:30.000000000 -0400
@@ -234,6 +234,10 @@ static inline unsigned long __must_check
copy_to_user(void __user *to, const void *from, unsigned long n)
{
if (unlikely(sz != -1 && sz < n)) {
copy_from_user_overflow();
return n;
-diff -urNp linux-2.6.38.4/arch/s390/Kconfig linux-2.6.38.4/arch/s390/Kconfig
---- linux-2.6.38.4/arch/s390/Kconfig 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/s390/Kconfig 2011-04-28 19:34:14.000000000 -0400
-@@ -233,11 +233,9 @@ config S390_EXEC_PROTECT
+diff -urNp linux-2.6.39/arch/s390/Kconfig linux-2.6.39/arch/s390/Kconfig
+--- linux-2.6.39/arch/s390/Kconfig 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/s390/Kconfig 2011-05-22 19:36:30.000000000 -0400
+@@ -234,11 +234,9 @@ config S390_EXEC_PROTECT
prompt "Data execute protection"
help
This option allows to enable a buffer overflow protection for user
comment "Code generation options"
-diff -urNp linux-2.6.38.4/arch/s390/kernel/module.c linux-2.6.38.4/arch/s390/kernel/module.c
---- linux-2.6.38.4/arch/s390/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/s390/kernel/module.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/s390/kernel/module.c linux-2.6.39/arch/s390/kernel/module.c
+--- linux-2.6.39/arch/s390/kernel/module.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/s390/kernel/module.c 2011-05-22 19:36:30.000000000 -0400
@@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
/* Increase core size by size of got & plt and set start
rela->r_addend - loc;
if (r_type == R_390_GOTPC)
*(unsigned int *) loc = val;
-diff -urNp linux-2.6.38.4/arch/s390/kernel/process.c linux-2.6.38.4/arch/s390/kernel/process.c
---- linux-2.6.38.4/arch/s390/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/s390/kernel/process.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/s390/kernel/process.c linux-2.6.39/arch/s390/kernel/process.c
+--- linux-2.6.39/arch/s390/kernel/process.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/s390/kernel/process.c 2011-05-22 19:36:30.000000000 -0400
@@ -334,39 +334,3 @@ unsigned long get_wchan(struct task_stru
}
return 0;
- return base;
- return ret;
-}
-diff -urNp linux-2.6.38.4/arch/s390/kernel/setup.c linux-2.6.38.4/arch/s390/kernel/setup.c
---- linux-2.6.38.4/arch/s390/kernel/setup.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/s390/kernel/setup.c 2011-04-28 19:34:14.000000000 -0400
-@@ -281,7 +281,7 @@ static int __init early_parse_mem(char *
+diff -urNp linux-2.6.39/arch/s390/kernel/setup.c linux-2.6.39/arch/s390/kernel/setup.c
+--- linux-2.6.39/arch/s390/kernel/setup.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/s390/kernel/setup.c 2011-05-22 19:36:30.000000000 -0400
+@@ -271,7 +271,7 @@ static int __init early_parse_mem(char *
}
early_param("mem", early_parse_mem);
EXPORT_SYMBOL_GPL(user_mode);
static int set_amode_and_uaccess(unsigned long user_amode,
-@@ -310,17 +310,6 @@ static int set_amode_and_uaccess(unsigne
+@@ -300,17 +300,6 @@ static int set_amode_and_uaccess(unsigne
}
}
static int __init early_parse_user_mode(char *p)
{
if (p && strcmp(p, "primary") == 0)
-@@ -337,20 +326,6 @@ static int __init early_parse_user_mode(
+@@ -327,20 +316,6 @@ static int __init early_parse_user_mode(
}
early_param("user_mode", early_parse_user_mode);
static void setup_addressing_mode(void)
{
if (user_mode == SECONDARY_SPACE_MODE) {
-diff -urNp linux-2.6.38.4/arch/s390/mm/maccess.c linux-2.6.38.4/arch/s390/mm/maccess.c
---- linux-2.6.38.4/arch/s390/mm/maccess.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/s390/mm/maccess.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/s390/mm/maccess.c linux-2.6.39/arch/s390/mm/maccess.c
+--- linux-2.6.39/arch/s390/mm/maccess.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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 copied = 0;
-diff -urNp linux-2.6.38.4/arch/s390/mm/mmap.c linux-2.6.38.4/arch/s390/mm/mmap.c
---- linux-2.6.38.4/arch/s390/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/s390/mm/mmap.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/s390/mm/mmap.c linux-2.6.39/arch/s390/mm/mmap.c
+--- linux-2.6.39/arch/s390/mm/mmap.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/s390/mm/mmap.c 2011-05-22 19:36:30.000000000 -0400
@@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
mm->get_unmapped_area = s390_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.38.4/arch/score/include/asm/system.h linux-2.6.38.4/arch/score/include/asm/system.h
---- linux-2.6.38.4/arch/score/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/score/include/asm/system.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/score/include/asm/system.h linux-2.6.39/arch/score/include/asm/system.h
+--- linux-2.6.39/arch/score/include/asm/system.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/score/include/asm/system.h 2011-05-22 19:36:30.000000000 -0400
@@ -17,7 +17,7 @@ do { \
#define finish_arch_switch(prev) do {} while (0)
#define mb() barrier()
#define rmb() barrier()
-diff -urNp linux-2.6.38.4/arch/score/kernel/process.c linux-2.6.38.4/arch/score/kernel/process.c
---- linux-2.6.38.4/arch/score/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/score/kernel/process.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/score/kernel/process.c linux-2.6.39/arch/score/kernel/process.c
+--- linux-2.6.39/arch/score/kernel/process.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/score/kernel/process.c 2011-05-22 19:36:30.000000000 -0400
@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
return task_pt_regs(task)->cp0_epc;
-{
- return sp;
-}
-diff -urNp linux-2.6.38.4/arch/sh/include/asm/dma-mapping.h linux-2.6.38.4/arch/sh/include/asm/dma-mapping.h
---- linux-2.6.38.4/arch/sh/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sh/include/asm/dma-mapping.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sh/drivers/pci/ops-dreamcast.c linux-2.6.39/arch/sh/drivers/pci/ops-dreamcast.c
+--- linux-2.6.39/arch/sh/drivers/pci/ops-dreamcast.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sh/drivers/pci/ops-dreamcast.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/sh/drivers/pci/ops-sh4.c linux-2.6.39/arch/sh/drivers/pci/ops-sh4.c
+--- linux-2.6.39/arch/sh/drivers/pci/ops-sh4.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/sh/drivers/pci/ops-sh5.c linux-2.6.39/arch/sh/drivers/pci/ops-sh5.c
+--- linux-2.6.39/arch/sh/drivers/pci/ops-sh5.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/sh/drivers/pci/ops-sh7786.c linux-2.6.39/arch/sh/drivers/pci/ops-sh7786.c
+--- linux-2.6.39/arch/sh/drivers/pci/ops-sh7786.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/sh/drivers/pci/pcie-sh7786.c linux-2.6.39/arch/sh/drivers/pci/pcie-sh7786.c
+--- linux-2.6.39/arch/sh/drivers/pci/pcie-sh7786.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/sh/drivers/pci/pci-sh4.h linux-2.6.39/arch/sh/drivers/pci/pci-sh4.h
+--- linux-2.6.39/arch/sh/drivers/pci/pci-sh4.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/sh/drivers/pci/pci-sh5.h linux-2.6.39/arch/sh/drivers/pci/pci-sh5.h
+--- linux-2.6.39/arch/sh/drivers/pci/pci-sh5.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/sh/include/asm/dma-mapping.h linux-2.6.39/arch/sh/include/asm/dma-mapping.h
+--- linux-2.6.39/arch/sh/include/asm/dma-mapping.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
if (dma_release_from_coherent(dev, get_order(size), vaddr))
return;
-diff -urNp linux-2.6.38.4/arch/sh/kernel/dma-nommu.c linux-2.6.38.4/arch/sh/kernel/dma-nommu.c
---- linux-2.6.38.4/arch/sh/kernel/dma-nommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sh/kernel/dma-nommu.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sh/kernel/dma-nommu.c linux-2.6.39/arch/sh/kernel/dma-nommu.c
+--- linux-2.6.39/arch/sh/kernel/dma-nommu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
.alloc_coherent = dma_generic_alloc_coherent,
.free_coherent = dma_generic_free_coherent,
.map_page = nommu_map_page,
-diff -urNp linux-2.6.38.4/arch/sh/kernel/kgdb.c linux-2.6.38.4/arch/sh/kernel/kgdb.c
---- linux-2.6.38.4/arch/sh/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sh/kernel/kgdb.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sh/kernel/kgdb.c linux-2.6.39/arch/sh/kernel/kgdb.c
+--- linux-2.6.39/arch/sh/kernel/kgdb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
}
/* Breakpoint instruction: trapa #0x3c */
#ifdef CONFIG_CPU_LITTLE_ENDIAN
.gdb_bpt_instr = { 0x3c, 0xc3 },
-diff -urNp linux-2.6.38.4/arch/sh/mm/consistent.c linux-2.6.38.4/arch/sh/mm/consistent.c
---- linux-2.6.38.4/arch/sh/mm/consistent.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sh/mm/consistent.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sh/mm/consistent.c linux-2.6.39/arch/sh/mm/consistent.c
+--- linux-2.6.39/arch/sh/mm/consistent.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sh/mm/consistent.c 2011-05-22 19:36:30.000000000 -0400
@@ -22,7 +22,7 @@
#define PREALLOC_DMA_DEBUG_ENTRIES 4096
EXPORT_SYMBOL(dma_ops);
static int __init dma_init(void)
-diff -urNp linux-2.6.38.4/arch/sh/mm/mmap.c linux-2.6.38.4/arch/sh/mm/mmap.c
---- linux-2.6.38.4/arch/sh/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sh/mm/mmap.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sh/mm/mmap.c linux-2.6.39/arch/sh/mm/mmap.c
+--- linux-2.6.39/arch/sh/mm/mmap.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sh/mm/mmap.c 2011-05-22 19:36:30.000000000 -0400
@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
addr = PAGE_ALIGN(addr);
bottomup:
/*
-diff -urNp linux-2.6.38.4/arch/sparc/include/asm/atomic_64.h linux-2.6.38.4/arch/sparc/include/asm/atomic_64.h
---- linux-2.6.38.4/arch/sparc/include/asm/atomic_64.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/include/asm/atomic_64.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/include/asm/atomic_64.h linux-2.6.39/arch/sparc/include/asm/atomic_64.h
+--- linux-2.6.39/arch/sparc/include/asm/atomic_64.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/include/asm/atomic_64.h 2011-05-22 19:36:30.000000000 -0400
@@ -14,18 +14,40 @@
#define ATOMIC64_INIT(i) { (i) }
}
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.38.4/arch/sparc/include/asm/dma-mapping.h linux-2.6.38.4/arch/sparc/include/asm/dma-mapping.h
---- linux-2.6.38.4/arch/sparc/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/include/asm/dma-mapping.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/include/asm/cache.h linux-2.6.39/arch/sparc/include/asm/cache.h
+--- linux-2.6.39/arch/sparc/include/asm/cache.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/include/asm/cache.h 2011-05-22 19:36:30.000000000 -0400
+@@ -10,7 +10,7 @@
+ #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
+
+ #define L1_CACHE_SHIFT 5
+-#define L1_CACHE_BYTES 32
++#define L1_CACHE_BYTES 32U
+
+ #ifdef CONFIG_SPARC32
+ #define SMP_CACHE_BYTES_SHIFT 5
+diff -urNp linux-2.6.39/arch/sparc/include/asm/dma-mapping.h linux-2.6.39/arch/sparc/include/asm/dma-mapping.h
+--- linux-2.6.39/arch/sparc/include/asm/dma-mapping.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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)
debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
ops->free_coherent(dev, size, cpu_addr, dma_handle);
-diff -urNp linux-2.6.38.4/arch/sparc/include/asm/elf_32.h linux-2.6.38.4/arch/sparc/include/asm/elf_32.h
---- linux-2.6.38.4/arch/sparc/include/asm/elf_32.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/include/asm/elf_32.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/include/asm/elf_32.h linux-2.6.39/arch/sparc/include/asm/elf_32.h
+--- linux-2.6.39/arch/sparc/include/asm/elf_32.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/include/asm/elf_32.h 2011-05-22 19:36:30.000000000 -0400
@@ -114,6 +114,13 @@ typedef struct {
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
/* 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.38.4/arch/sparc/include/asm/elf_64.h linux-2.6.38.4/arch/sparc/include/asm/elf_64.h
---- linux-2.6.38.4/arch/sparc/include/asm/elf_64.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/include/asm/elf_64.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/include/asm/elf_64.h linux-2.6.39/arch/sparc/include/asm/elf_64.h
+--- linux-2.6.39/arch/sparc/include/asm/elf_64.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/include/asm/elf_64.h 2011-05-22 19:36:30.000000000 -0400
@@ -162,6 +162,12 @@ typedef struct {
#define ELF_ET_DYN_BASE 0x0000010000000000UL
#define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
/* This yields a mask that user programs can use to figure out what
instruction set this cpu supports. */
-diff -urNp linux-2.6.38.4/arch/sparc/include/asm/pgtable_32.h linux-2.6.38.4/arch/sparc/include/asm/pgtable_32.h
---- linux-2.6.38.4/arch/sparc/include/asm/pgtable_32.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/include/asm/pgtable_32.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/include/asm/pgtable_32.h linux-2.6.39/arch/sparc/include/asm/pgtable_32.h
+--- linux-2.6.39/arch/sparc/include/asm/pgtable_32.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/include/asm/pgtable_32.h 2011-05-22 19:36:30.000000000 -0400
@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
BTFIXUPDEF_INT(page_none)
BTFIXUPDEF_INT(page_copy)
extern unsigned long page_kernel;
#ifdef MODULE
-diff -urNp linux-2.6.38.4/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.38.4/arch/sparc/include/asm/pgtsrmmu.h
---- linux-2.6.38.4/arch/sparc/include/asm/pgtsrmmu.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/include/asm/pgtsrmmu.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.39/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-2.6.39/arch/sparc/include/asm/pgtsrmmu.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/include/asm/pgtsrmmu.h 2011-05-22 19:36:30.000000000 -0400
@@ -115,6 +115,13 @@
SRMMU_EXEC | SRMMU_REF)
#define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
#define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
SRMMU_DIRTY | SRMMU_REF)
-diff -urNp linux-2.6.38.4/arch/sparc/include/asm/spinlock_64.h linux-2.6.38.4/arch/sparc/include/asm/spinlock_64.h
---- linux-2.6.38.4/arch/sparc/include/asm/spinlock_64.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/include/asm/spinlock_64.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/include/asm/spinlock_64.h linux-2.6.39/arch/sparc/include/asm/spinlock_64.h
+--- linux-2.6.39/arch/sparc/include/asm/spinlock_64.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/include/asm/spinlock_64.h 2011-05-22 19:36:30.000000000 -0400
@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(
/* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
{
unsigned long mask, tmp1, tmp2, result;
-diff -urNp linux-2.6.38.4/arch/sparc/include/asm/uaccess_32.h linux-2.6.38.4/arch/sparc/include/asm/uaccess_32.h
---- linux-2.6.38.4/arch/sparc/include/asm/uaccess_32.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/include/asm/uaccess_32.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/include/asm/uaccess_32.h linux-2.6.39/arch/sparc/include/asm/uaccess_32.h
+--- linux-2.6.39/arch/sparc/include/asm/uaccess_32.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/include/asm/uaccess_32.h 2011-05-22 19:36:30.000000000 -0400
@@ -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)
return __copy_user((__force void __user *) to, from, n);
}
-diff -urNp linux-2.6.38.4/arch/sparc/include/asm/uaccess_64.h linux-2.6.38.4/arch/sparc/include/asm/uaccess_64.h
---- linux-2.6.38.4/arch/sparc/include/asm/uaccess_64.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/include/asm/uaccess_64.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/include/asm/uaccess_64.h linux-2.6.39/arch/sparc/include/asm/uaccess_64.h
+--- linux-2.6.39/arch/sparc/include/asm/uaccess_64.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/include/asm/uaccess_64.h 2011-05-22 19:36:30.000000000 -0400
@@ -10,6 +10,7 @@
#include <linux/compiler.h>
#include <linux/string.h>
if (unlikely(ret))
ret = copy_to_user_fixup(to, from, size);
return ret;
-diff -urNp linux-2.6.38.4/arch/sparc/include/asm/uaccess.h linux-2.6.38.4/arch/sparc/include/asm/uaccess.h
---- linux-2.6.38.4/arch/sparc/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/include/asm/uaccess.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/include/asm/uaccess.h linux-2.6.39/arch/sparc/include/asm/uaccess.h
+--- linux-2.6.39/arch/sparc/include/asm/uaccess.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/include/asm/uaccess.h 2011-05-22 19:36:30.000000000 -0400
@@ -1,5 +1,13 @@
#ifndef ___ASM_SPARC_UACCESS_H
#define ___ASM_SPARC_UACCESS_H
#if defined(__sparc__) && defined(__arch64__)
#include <asm/uaccess_64.h>
#else
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/iommu.c linux-2.6.38.4/arch/sparc/kernel/iommu.c
---- linux-2.6.38.4/arch/sparc/kernel/iommu.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/iommu.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/kernel/iommu.c linux-2.6.39/arch/sparc/kernel/iommu.c
+--- linux-2.6.39/arch/sparc/kernel/iommu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/kernel/iommu.c 2011-05-22 19:36:30.000000000 -0400
@@ -824,7 +824,7 @@ static void dma_4u_sync_sg_for_cpu(struc
spin_unlock_irqrestore(&iommu->lock, flags);
}
EXPORT_SYMBOL(dma_ops);
extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/ioport.c linux-2.6.38.4/arch/sparc/kernel/ioport.c
---- linux-2.6.38.4/arch/sparc/kernel/ioport.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/ioport.c 2011-04-28 19:34:14.000000000 -0400
-@@ -397,7 +397,7 @@ static void sbus_sync_sg_for_device(stru
+diff -urNp linux-2.6.39/arch/sparc/kernel/ioport.c linux-2.6.39/arch/sparc/kernel/ioport.c
+--- linux-2.6.39/arch/sparc/kernel/ioport.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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();
}
.alloc_coherent = sbus_alloc_coherent,
.free_coherent = sbus_free_coherent,
.map_page = sbus_map_page,
-@@ -408,7 +408,7 @@ struct dma_map_ops sbus_dma_ops = {
- .sync_sg_for_device = sbus_sync_sg_for_device,
- };
-
--struct dma_map_ops *dma_ops = &sbus_dma_ops;
-+const struct dma_map_ops *dma_ops = &sbus_dma_ops;
- EXPORT_SYMBOL(dma_ops);
-
- static int __init sparc_register_ioport(void)
-@@ -645,7 +645,7 @@ static void pci32_sync_sg_for_device(str
+@@ -653,7 +653,7 @@ static void pci32_sync_sg_for_device(str
}
}
.alloc_coherent = pci32_alloc_coherent,
.free_coherent = pci32_free_coherent,
.map_page = pci32_map_page,
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/kgdb_32.c linux-2.6.38.4/arch/sparc/kernel/kgdb_32.c
---- linux-2.6.38.4/arch/sparc/kernel/kgdb_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/kgdb_32.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/kernel/kgdb_32.c linux-2.6.39/arch/sparc/kernel/kgdb_32.c
+--- linux-2.6.39/arch/sparc/kernel/kgdb_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
}
/* Breakpoint instruction: ta 0x7d */
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
};
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/kgdb_64.c linux-2.6.38.4/arch/sparc/kernel/kgdb_64.c
---- linux-2.6.38.4/arch/sparc/kernel/kgdb_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/kgdb_64.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/kernel/kgdb_64.c linux-2.6.39/arch/sparc/kernel/kgdb_64.c
+--- linux-2.6.39/arch/sparc/kernel/kgdb_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
}
/* Breakpoint instruction: ta 0x72 */
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
};
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/Makefile linux-2.6.38.4/arch/sparc/kernel/Makefile
---- linux-2.6.38.4/arch/sparc/kernel/Makefile 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/Makefile 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/kernel/Makefile linux-2.6.39/arch/sparc/kernel/Makefile
+--- linux-2.6.39/arch/sparc/kernel/Makefile 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/kernel/Makefile 2011-05-22 19:36:30.000000000 -0400
@@ -3,7 +3,7 @@
#
extra-y := head_$(BITS).o
extra-y += init_task.o
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/pci_sun4v.c linux-2.6.38.4/arch/sparc/kernel/pci_sun4v.c
---- linux-2.6.38.4/arch/sparc/kernel/pci_sun4v.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/pci_sun4v.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/kernel/pcic.c linux-2.6.39/arch/sparc/kernel/pcic.c
+--- linux-2.6.39/arch/sparc/kernel/pcic.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/kernel/pcic.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/sparc/kernel/pci_common.c linux-2.6.39/arch/sparc/kernel/pci_common.c
+--- linux-2.6.39/arch/sparc/kernel/pci_common.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/sparc/kernel/pci_impl.h linux-2.6.39/arch/sparc/kernel/pci_impl.h
+--- linux-2.6.39/arch/sparc/kernel/pci_impl.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/sparc/kernel/pci_sun4v.c linux-2.6.39/arch/sparc/kernel/pci_sun4v.c
+--- linux-2.6.39/arch/sparc/kernel/pci_sun4v.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
}
.alloc_coherent = dma_4v_alloc_coherent,
.free_coherent = dma_4v_free_coherent,
.map_page = dma_4v_map_page,
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/process_32.c linux-2.6.38.4/arch/sparc/kernel/process_32.c
---- linux-2.6.38.4/arch/sparc/kernel/process_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/process_32.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/kernel/process_32.c linux-2.6.39/arch/sparc/kernel/process_32.c
+--- linux-2.6.39/arch/sparc/kernel/process_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/kernel/process_32.c 2011-05-22 19:41:32.000000000 -0400
@@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp)
rw->ins[4], rw->ins[5],
rw->ins[6],
fp = rw->ins[6];
} while (++count < 16);
printk("\n");
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/process_64.c linux-2.6.38.4/arch/sparc/kernel/process_64.c
---- linux-2.6.38.4/arch/sparc/kernel/process_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/process_64.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/kernel/process_64.c linux-2.6.39/arch/sparc/kernel/process_64.c
+--- linux-2.6.39/arch/sparc/kernel/process_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/kernel/process_64.c 2011-05-22 19:41:32.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]);
(void *) gp->tpc,
(void *) gp->o7,
(void *) gp->i7,
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/sys_sparc_32.c linux-2.6.38.4/arch/sparc/kernel/sys_sparc_32.c
---- linux-2.6.38.4/arch/sparc/kernel/sys_sparc_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/sys_sparc_32.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/kernel/sys_sparc_32.c linux-2.6.39/arch/sparc/kernel/sys_sparc_32.c
+--- linux-2.6.39/arch/sparc/kernel/sys_sparc_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/kernel/sys_sparc_32.c 2011-05-22 19:36:30.000000000 -0400
@@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str
if (ARCH_SUN4C && len > 0x20000000)
return -ENOMEM;
return addr;
addr = vmm->vm_end;
if (flags & MAP_SHARED)
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.4/arch/sparc/kernel/sys_sparc_64.c
---- linux-2.6.38.4/arch/sparc/kernel/sys_sparc_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/sys_sparc_64.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/kernel/sys_sparc_64.c linux-2.6.39/arch/sparc/kernel/sys_sparc_64.c
+--- linux-2.6.39/arch/sparc/kernel/sys_sparc_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/kernel/sys_sparc_64.c 2011-05-22 19:36:30.000000000 -0400
@@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str
/* We do not accept a shared mapping if it would violate
* cache aliasing constraints.
bottomup:
/*
-@@ -385,6 +385,12 @@ void arch_pick_mmap_layout(struct mm_str
+@@ -390,6 +390,12 @@ void arch_pick_mmap_layout(struct mm_str
gap == RLIM_INFINITY ||
sysctl_legacy_va_layout) {
mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
mm->get_unmapped_area = arch_get_unmapped_area;
mm->unmap_area = arch_unmap_area;
} else {
-@@ -397,6 +403,12 @@ void arch_pick_mmap_layout(struct mm_str
+@@ -402,6 +408,12 @@ void arch_pick_mmap_layout(struct mm_str
gap = (task_size / 6 * 5);
mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/traps_32.c linux-2.6.38.4/arch/sparc/kernel/traps_32.c
---- linux-2.6.38.4/arch/sparc/kernel/traps_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/traps_32.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/kernel/traps_32.c linux-2.6.39/arch/sparc/kernel/traps_32.c
+--- linux-2.6.39/arch/sparc/kernel/traps_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/kernel/traps_32.c 2011-05-22 19:41:32.000000000 -0400
@@ -76,7 +76,7 @@ void die_if_kernel(char *str, struct pt_
count++ < 30 &&
(((unsigned long) rw) >= PAGE_OFFSET) &&
(void *) rw->ins[7]);
rw = (struct reg_window32 *)rw->ins[6];
}
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/traps_64.c linux-2.6.38.4/arch/sparc/kernel/traps_64.c
---- linux-2.6.38.4/arch/sparc/kernel/traps_64.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/traps_64.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/kernel/traps_64.c linux-2.6.39/arch/sparc/kernel/traps_64.c
+--- linux-2.6.39/arch/sparc/kernel/traps_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/kernel/traps_64.c 2011-05-22 19:41:32.000000000 -0400
@@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_
i + 1,
p->trapstack[i].tstate, p->trapstack[i].tpc,
(void *) rw->ins[7]);
rw = kernel_stack_up(rw);
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/unaligned_64.c linux-2.6.38.4/arch/sparc/kernel/unaligned_64.c
---- linux-2.6.38.4/arch/sparc/kernel/unaligned_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/unaligned_64.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/kernel/unaligned_64.c linux-2.6.39/arch/sparc/kernel/unaligned_64.c
+--- linux-2.6.39/arch/sparc/kernel/unaligned_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/kernel/unaligned_64.c 2011-05-22 19:41:32.000000000 -0400
@@ -278,7 +278,7 @@ static void log_unaligned(struct pt_regs
static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
regs->tpc, (void *) regs->tpc);
}
}
-diff -urNp linux-2.6.38.4/arch/sparc/lib/atomic_64.S linux-2.6.38.4/arch/sparc/lib/atomic_64.S
---- linux-2.6.38.4/arch/sparc/lib/atomic_64.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/lib/atomic_64.S 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/lib/atomic_64.S linux-2.6.39/arch/sparc/lib/atomic_64.S
+--- linux-2.6.39/arch/sparc/lib/atomic_64.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/lib/atomic_64.S 2011-05-22 19:36:30.000000000 -0400
@@ -18,7 +18,12 @@
atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
casx [%o1], %g1, %g7
cmp %g1, %g7
bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
-diff -urNp linux-2.6.38.4/arch/sparc/lib/ksyms.c linux-2.6.38.4/arch/sparc/lib/ksyms.c
---- linux-2.6.38.4/arch/sparc/lib/ksyms.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/lib/ksyms.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/lib/ksyms.c linux-2.6.39/arch/sparc/lib/ksyms.c
+--- linux-2.6.39/arch/sparc/lib/ksyms.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/lib/ksyms.c 2011-05-22 19:36:30.000000000 -0400
@@ -142,12 +142,17 @@ EXPORT_SYMBOL(__downgrade_write);
/* Atomic counter implementation. */
EXPORT_SYMBOL(atomic64_sub_ret);
/* Atomic bit operations. */
-diff -urNp linux-2.6.38.4/arch/sparc/Makefile linux-2.6.38.4/arch/sparc/Makefile
---- linux-2.6.38.4/arch/sparc/Makefile 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/Makefile 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/lib/Makefile linux-2.6.39/arch/sparc/lib/Makefile
+--- linux-2.6.39/arch/sparc/lib/Makefile 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/lib/Makefile 2011-05-22 19:36:30.000000000 -0400
+@@ -2,7 +2,7 @@
+ #
+
+ asflags-y := -ansi -DST_DIV0=0x02
+-ccflags-y := -Werror
++#ccflags-y := -Werror
+
+ 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/arch/sparc/Makefile linux-2.6.39/arch/sparc/Makefile
+--- linux-2.6.39/arch/sparc/Makefile 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/Makefile 2011-05-22 19:41:32.000000000 -0400
@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
# Export what is needed by arch/sparc/boot/Makefile
export VMLINUX_INIT VMLINUX_MAIN
VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
VMLINUX_MAIN += $(drivers-y) $(net-y)
-diff -urNp linux-2.6.38.4/arch/sparc/mm/fault_32.c linux-2.6.38.4/arch/sparc/mm/fault_32.c
---- linux-2.6.38.4/arch/sparc/mm/fault_32.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/mm/fault_32.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/mm/fault_32.c linux-2.6.39/arch/sparc/mm/fault_32.c
+--- linux-2.6.39/arch/sparc/mm/fault_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/mm/fault_32.c 2011-05-22 19:36:30.000000000 -0400
@@ -22,6 +22,9 @@
#include <linux/interrupt.h>
#include <linux/module.h>
/* Allow reads even for write-only mappings */
if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
goto bad_area;
-diff -urNp linux-2.6.38.4/arch/sparc/mm/fault_64.c linux-2.6.38.4/arch/sparc/mm/fault_64.c
---- linux-2.6.38.4/arch/sparc/mm/fault_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/mm/fault_64.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/mm/fault_64.c linux-2.6.39/arch/sparc/mm/fault_64.c
+--- linux-2.6.39/arch/sparc/mm/fault_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/mm/fault_64.c 2011-05-22 19:41:32.000000000 -0400
@@ -21,6 +21,9 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
/* 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.38.4/arch/sparc/mm/hugetlbpage.c linux-2.6.38.4/arch/sparc/mm/hugetlbpage.c
---- linux-2.6.38.4/arch/sparc/mm/hugetlbpage.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/mm/hugetlbpage.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/mm/hugetlbpage.c linux-2.6.39/arch/sparc/mm/hugetlbpage.c
+--- linux-2.6.39/arch/sparc/mm/hugetlbpage.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/mm/hugetlbpage.c 2011-05-22 19:36:30.000000000 -0400
@@ -68,7 +68,7 @@ full_search:
}
return -ENOMEM;
return addr;
}
if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-2.6.38.4/arch/sparc/mm/init_32.c linux-2.6.38.4/arch/sparc/mm/init_32.c
---- linux-2.6.38.4/arch/sparc/mm/init_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/mm/init_32.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/mm/init_32.c linux-2.6.39/arch/sparc/mm/init_32.c
+--- linux-2.6.39/arch/sparc/mm/init_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/mm/init_32.c 2011-05-22 19:36:30.000000000 -0400
@@ -318,6 +318,9 @@ extern void device_scan(void);
pgprot_t PAGE_SHARED __read_mostly;
EXPORT_SYMBOL(PAGE_SHARED);
protection_map[12] = PAGE_READONLY;
protection_map[13] = PAGE_READONLY;
protection_map[14] = PAGE_SHARED;
-diff -urNp linux-2.6.38.4/arch/sparc/mm/Makefile linux-2.6.38.4/arch/sparc/mm/Makefile
---- linux-2.6.38.4/arch/sparc/mm/Makefile 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/mm/Makefile 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/mm/Makefile linux-2.6.39/arch/sparc/mm/Makefile
+--- linux-2.6.39/arch/sparc/mm/Makefile 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/mm/Makefile 2011-05-22 19:36:30.000000000 -0400
@@ -2,7 +2,7 @@
#
obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
obj-y += fault_$(BITS).o
-diff -urNp linux-2.6.38.4/arch/sparc/mm/srmmu.c linux-2.6.38.4/arch/sparc/mm/srmmu.c
---- linux-2.6.38.4/arch/sparc/mm/srmmu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/mm/srmmu.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/sparc/mm/srmmu.c linux-2.6.39/arch/sparc/mm/srmmu.c
+--- linux-2.6.39/arch/sparc/mm/srmmu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/sparc/mm/srmmu.c 2011-05-22 19:36:30.000000000 -0400
@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
-diff -urNp linux-2.6.38.4/arch/um/include/asm/kmap_types.h linux-2.6.38.4/arch/um/include/asm/kmap_types.h
---- linux-2.6.38.4/arch/um/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/um/include/asm/kmap_types.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/tile/kernel/pci.c linux-2.6.39/arch/tile/kernel/pci.c
+--- linux-2.6.39/arch/tile/kernel/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/tile/kernel/pci.c 2011-05-22 19:36:30.000000000 -0400
+@@ -60,7 +60,7 @@ int __write_once tile_plx_gen1;
+ static struct pci_controller controllers[TILE_NUM_PCIE];
+ static int num_controllers;
+
+-static struct pci_ops tile_cfg_ops;
++static const struct pci_ops tile_cfg_ops;
+
+
+ /*
+@@ -564,7 +564,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/arch/um/include/asm/kmap_types.h linux-2.6.39/arch/um/include/asm/kmap_types.h
+--- linux-2.6.39/arch/um/include/asm/kmap_types.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/um/include/asm/kmap_types.h 2011-05-22 19:36:30.000000000 -0400
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
KM_TYPE_NR
};
-diff -urNp linux-2.6.38.4/arch/um/include/asm/page.h linux-2.6.38.4/arch/um/include/asm/page.h
---- linux-2.6.38.4/arch/um/include/asm/page.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/um/include/asm/page.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/um/include/asm/page.h linux-2.6.39/arch/um/include/asm/page.h
+--- linux-2.6.39/arch/um/include/asm/page.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/um/include/asm/page.h 2011-05-22 19:36:30.000000000 -0400
@@ -14,6 +14,9 @@
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
#ifndef __ASSEMBLY__
struct page;
-diff -urNp linux-2.6.38.4/arch/um/kernel/process.c linux-2.6.38.4/arch/um/kernel/process.c
---- linux-2.6.38.4/arch/um/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/um/kernel/process.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/um/kernel/process.c linux-2.6.39/arch/um/kernel/process.c
+--- linux-2.6.39/arch/um/kernel/process.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/um/kernel/process.c 2011-05-22 19:36:30.000000000 -0400
@@ -404,22 +404,6 @@ int singlestepping(void * t)
return 2;
}
unsigned long get_wchan(struct task_struct *p)
{
unsigned long stack_page, sp, ip;
-diff -urNp linux-2.6.38.4/arch/um/sys-i386/syscalls.c linux-2.6.38.4/arch/um/sys-i386/syscalls.c
---- linux-2.6.38.4/arch/um/sys-i386/syscalls.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/um/sys-i386/syscalls.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/um/sys-i386/syscalls.c linux-2.6.39/arch/um/sys-i386/syscalls.c
+--- linux-2.6.39/arch/um/sys-i386/syscalls.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/um/sys-i386/syscalls.c 2011-05-22 19:36:30.000000000 -0400
@@ -11,6 +11,21 @@
#include "asm/uaccess.h"
#include "asm/unistd.h"
/*
* The prototype on i386 is:
*
-diff -urNp linux-2.6.38.4/arch/x86/boot/bitops.h linux-2.6.38.4/arch/x86/boot/bitops.h
---- linux-2.6.38.4/arch/x86/boot/bitops.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/bitops.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/unicore32/kernel/pci.c linux-2.6.39/arch/unicore32/kernel/pci.c
+--- linux-2.6.39/arch/unicore32/kernel/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/arch/x86/boot/bitops.h linux-2.6.39/arch/x86/boot/bitops.h
+--- linux-2.6.39/arch/x86/boot/bitops.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/boot/bitops.h 2011-05-22 19:36:30.000000000 -0400
@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
u8 v;
const u32 *p = (const u32 *)addr;
}
#endif /* BOOT_BITOPS_H */
-diff -urNp linux-2.6.38.4/arch/x86/boot/boot.h linux-2.6.38.4/arch/x86/boot/boot.h
---- linux-2.6.38.4/arch/x86/boot/boot.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/boot.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/boot/boot.h linux-2.6.39/arch/x86/boot/boot.h
+--- linux-2.6.39/arch/x86/boot/boot.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/boot/boot.h 2011-05-22 19:36:30.000000000 -0400
@@ -85,7 +85,7 @@ static inline void io_delay(void)
static inline u16 ds(void)
{
: "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
return diff;
}
-diff -urNp linux-2.6.38.4/arch/x86/boot/compressed/head_32.S linux-2.6.38.4/arch/x86/boot/compressed/head_32.S
---- linux-2.6.38.4/arch/x86/boot/compressed/head_32.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/compressed/head_32.S 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/boot/compressed/head_32.S linux-2.6.39/arch/x86/boot/compressed/head_32.S
+--- linux-2.6.39/arch/x86/boot/compressed/head_32.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/boot/compressed/head_32.S 2011-05-22 19:36:30.000000000 -0400
@@ -76,7 +76,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
jmp 1b
2:
-diff -urNp linux-2.6.38.4/arch/x86/boot/compressed/head_64.S linux-2.6.38.4/arch/x86/boot/compressed/head_64.S
---- linux-2.6.38.4/arch/x86/boot/compressed/head_64.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/compressed/head_64.S 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/boot/compressed/head_64.S linux-2.6.39/arch/x86/boot/compressed/head_64.S
+--- linux-2.6.39/arch/x86/boot/compressed/head_64.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/boot/compressed/head_64.S 2011-05-22 19:36:30.000000000 -0400
@@ -91,7 +91,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
#endif
/* Target address to relocate to for decompression */
-diff -urNp linux-2.6.38.4/arch/x86/boot/compressed/misc.c linux-2.6.38.4/arch/x86/boot/compressed/misc.c
---- linux-2.6.38.4/arch/x86/boot/compressed/misc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/compressed/misc.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/boot/compressed/misc.c linux-2.6.39/arch/x86/boot/compressed/misc.c
+--- linux-2.6.39/arch/x86/boot/compressed/misc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/boot/compressed/misc.c 2011-05-22 19:36:30.000000000 -0400
@@ -310,7 +310,7 @@ static void parse_elf(void *output)
case PT_LOAD:
#ifdef CONFIG_RELOCATABLE
error("Wrong destination address");
#endif
-diff -urNp linux-2.6.38.4/arch/x86/boot/compressed/relocs.c linux-2.6.38.4/arch/x86/boot/compressed/relocs.c
---- linux-2.6.38.4/arch/x86/boot/compressed/relocs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/compressed/relocs.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/boot/compressed/relocs.c linux-2.6.39/arch/x86/boot/compressed/relocs.c
+--- linux-2.6.39/arch/x86/boot/compressed/relocs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/boot/compressed/relocs.c 2011-05-22 19:36:30.000000000 -0400
@@ -13,8 +13,11 @@
static void die(char *fmt, ...);
read_shdrs(fp);
read_strtabs(fp);
read_symtabs(fp);
-diff -urNp linux-2.6.38.4/arch/x86/boot/cpucheck.c linux-2.6.38.4/arch/x86/boot/cpucheck.c
---- linux-2.6.38.4/arch/x86/boot/cpucheck.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/cpucheck.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/boot/cpucheck.c linux-2.6.39/arch/x86/boot/cpucheck.c
+--- linux-2.6.39/arch/x86/boot/cpucheck.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/boot/cpucheck.c 2011-05-22 19:36:30.000000000 -0400
@@ -74,7 +74,7 @@ static int has_fpu(void)
u16 fcw = -1, fsw = -1;
u32 cr0;
err = check_flags();
}
-diff -urNp linux-2.6.38.4/arch/x86/boot/header.S linux-2.6.38.4/arch/x86/boot/header.S
---- linux-2.6.38.4/arch/x86/boot/header.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/header.S 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/boot/header.S linux-2.6.39/arch/x86/boot/header.S
+--- linux-2.6.39/arch/x86/boot/header.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/boot/header.S 2011-05-22 19:36:30.000000000 -0400
@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
# single linked list of
# struct setup_data
#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.38.4/arch/x86/boot/memory.c linux-2.6.38.4/arch/x86/boot/memory.c
---- linux-2.6.38.4/arch/x86/boot/memory.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/memory.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/boot/memory.c linux-2.6.39/arch/x86/boot/memory.c
+--- linux-2.6.39/arch/x86/boot/memory.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/boot/memory.c 2011-05-22 19:36:30.000000000 -0400
@@ -19,7 +19,7 @@
static int detect_memory_e820(void)
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.38.4/arch/x86/boot/video.c linux-2.6.38.4/arch/x86/boot/video.c
---- linux-2.6.38.4/arch/x86/boot/video.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/video.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/boot/video.c linux-2.6.39/arch/x86/boot/video.c
+--- linux-2.6.39/arch/x86/boot/video.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/boot/video.c 2011-05-22 19:36:30.000000000 -0400
@@ -96,7 +96,7 @@ static void store_mode_params(void)
static unsigned int get_entry(void)
{
int key;
unsigned int v;
-diff -urNp linux-2.6.38.4/arch/x86/boot/video-vesa.c linux-2.6.38.4/arch/x86/boot/video-vesa.c
---- linux-2.6.38.4/arch/x86/boot/video-vesa.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/video-vesa.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/boot/video-vesa.c linux-2.6.39/arch/x86/boot/video-vesa.c
+--- linux-2.6.39/arch/x86/boot/video-vesa.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/boot/video-vesa.c 2011-05-22 19:36:30.000000000 -0400
@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
boot_params.screen_info.vesapm_seg = oreg.es;
}
/*
-diff -urNp linux-2.6.38.4/arch/x86/ia32/ia32_aout.c linux-2.6.38.4/arch/x86/ia32/ia32_aout.c
---- linux-2.6.38.4/arch/x86/ia32/ia32_aout.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/ia32/ia32_aout.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/ia32/ia32_aout.c linux-2.6.39/arch/x86/ia32/ia32_aout.c
+--- linux-2.6.39/arch/x86/ia32/ia32_aout.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/ia32/ia32_aout.c 2011-05-22 19:41:32.000000000 -0400
@@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st
unsigned long dump_start, dump_size;
struct user32 dump;
fs = get_fs();
set_fs(KERNEL_DS);
has_dumped = 1;
-diff -urNp linux-2.6.38.4/arch/x86/ia32/ia32entry.S linux-2.6.38.4/arch/x86/ia32/ia32entry.S
---- linux-2.6.38.4/arch/x86/ia32/ia32entry.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/ia32/ia32entry.S 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/ia32/ia32entry.S linux-2.6.39/arch/x86/ia32/ia32entry.S
+--- linux-2.6.39/arch/x86/ia32/ia32entry.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/ia32/ia32entry.S 2011-05-23 17:16:01.000000000 -0400
@@ -13,6 +13,7 @@
#include <asm/thread_info.h>
#include <asm/segment.h>
#include <linux/linkage.h>
/* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
-@@ -93,6 +94,28 @@ ENTRY(native_irq_enable_sysexit)
+@@ -95,6 +96,32 @@ ENTRY(native_irq_enable_sysexit)
ENDPROC(native_irq_enable_sysexit)
#endif
+ call pax_exit_kernel_user
+#endif
+#ifdef CONFIG_PAX_RANDKSTACK
-+ push %rax
++ pushq %rax
+ call pax_randomize_kstack
-+ pop %rax
++ popq %rax
+#endif
+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
-+ push %rax
+ call pax_erase_kstack
-+ pop %rax
++#endif
++ .endm
++
++ .macro pax_erase_kstack
++#ifdef CONFIG_PAX_MEMORY_STACKLEAK
++ call pax_erase_kstack
+#endif
+ .endm
+
/*
* 32bit SYSENTER instruction entry.
*
-@@ -119,7 +142,7 @@ ENTRY(ia32_sysenter_target)
+@@ -121,7 +148,7 @@ ENTRY(ia32_sysenter_target)
CFI_REGISTER rsp,rbp
SWAPGS_UNSAFE_STACK
movq PER_CPU_VAR(kernel_stack), %rsp
/*
* No need to follow this irqs on/off section: the syscall
* disabled irqs, here we enable it straight after entry:
-@@ -135,7 +158,8 @@ ENTRY(ia32_sysenter_target)
- pushfq
- CFI_ADJUST_CFA_OFFSET 8
+@@ -134,7 +161,8 @@ ENTRY(ia32_sysenter_target)
+ CFI_REL_OFFSET rsp,0
+ pushfq_cfi
/*CFI_REL_OFFSET rflags,0*/
- movl 8*3-THREAD_SIZE+TI_sysenter_return(%rsp), %r10d
+ GET_THREAD_INFO(%r10)
+ movl TI_sysenter_return(%r10), %r10d
CFI_REGISTER rip,r10
- pushq $__USER32_CS
- CFI_ADJUST_CFA_OFFSET 8
-@@ -150,6 +174,12 @@ ENTRY(ia32_sysenter_target)
+ pushq_cfi $__USER32_CS
+ /*CFI_REL_OFFSET cs,0*/
+@@ -146,6 +174,12 @@ ENTRY(ia32_sysenter_target)
SAVE_ARGS 0,0,1
/* no need to do an access_ok check here because rbp has been
32bit zero extended */
1: movl (%rbp),%ebp
.section __ex_table,"a"
.quad 1b,ia32_badarg
-@@ -172,6 +202,7 @@ sysenter_dispatch:
+@@ -168,6 +202,7 @@ sysenter_dispatch:
testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
jnz sysexit_audit
sysexit_from_sys_call:
andl $~TS_COMPAT,TI_status(%r10)
/* clear IF, that popfq doesn't enable interrupts early */
andl $~0x200,EFLAGS-R11(%rsp)
-@@ -283,19 +314,24 @@ ENDPROC(ia32_sysenter_target)
+@@ -194,6 +229,9 @@ sysexit_from_sys_call:
+ movl %eax,%esi /* 2nd arg: syscall number */
+ movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
+ call audit_syscall_entry
++
++ pax_erase_kstack
++
+ movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
+ cmpq $(IA32_NR_syscalls-1),%rax
+ ja ia32_badsys
+@@ -246,6 +284,9 @@ sysenter_tracesys:
+ movq $-ENOSYS,RAX(%rsp)/* ptrace can change this for a bad syscall */
+ movq %rsp,%rdi /* &pt_regs -> arg1 */
+ call syscall_trace_enter
++
++ pax_erase_kstack
++
+ LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
+ RESTORE_REST
+ cmpq $(IA32_NR_syscalls-1),%rax
+@@ -277,19 +318,24 @@ ENDPROC(ia32_sysenter_target)
ENTRY(ia32_cstar_target)
CFI_STARTPROC32 simple
CFI_SIGNAL_FRAME
movl %eax,%eax /* zero extension */
movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
movq %rcx,RIP-ARGOFFSET(%rsp)
-@@ -311,6 +347,12 @@ ENTRY(ia32_cstar_target)
+@@ -305,6 +351,12 @@ ENTRY(ia32_cstar_target)
/* no need to do an access_ok check here because r8 has been
32bit zero extended */
/* hardware stack frame is complete now */
1: movl (%r8),%r9d
.section __ex_table,"a"
.quad 1b,ia32_badarg
-@@ -323,7 +365,7 @@ ENTRY(ia32_cstar_target)
- cmpq $IA32_NR_syscalls-1,%rax
- ja ia32_badsys
- cstar_do_call:
-- IA32_ARG_FIXUP 1
-+ IA32_ARG_FIXUP 0
- cstar_dispatch:
- call *ia32_sys_call_table(,%rax,8)
- movq %rax,RAX-ARGOFFSET(%rsp)
-@@ -333,6 +375,7 @@ cstar_dispatch:
+@@ -327,6 +379,7 @@ cstar_dispatch:
testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
jnz sysretl_audit
sysretl_from_sys_call:
andl $~TS_COMPAT,TI_status(%r10)
RESTORE_ARGS 1,-ARG_SKIP,1,1,1
movl RIP-ARGOFFSET(%rsp),%ecx
-@@ -415,6 +458,7 @@ ENTRY(ia32_syscall)
+@@ -364,6 +417,9 @@ cstar_tracesys:
+ movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
+ movq %rsp,%rdi /* &pt_regs -> arg1 */
+ call syscall_trace_enter
++
++ pax_erase_kstack
++
+ LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */
+ RESTORE_REST
+ xchgl %ebp,%r9d
+@@ -409,6 +465,7 @@ ENTRY(ia32_syscall)
CFI_REL_OFFSET rip,RIP-RIP
PARAVIRT_ADJUST_EXCEPTION_FRAME
SWAPGS
/*
* No need to follow this irqs on/off section: the syscall
* disabled irqs and here we enable it straight after entry:
-diff -urNp linux-2.6.38.4/arch/x86/ia32/ia32_signal.c linux-2.6.38.4/arch/x86/ia32/ia32_signal.c
---- linux-2.6.38.4/arch/x86/ia32/ia32_signal.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/ia32/ia32_signal.c 2011-04-28 19:34:14.000000000 -0400
+@@ -441,6 +498,9 @@ ia32_tracesys:
+ movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
+ movq %rsp,%rdi /* &pt_regs -> arg1 */
+ call syscall_trace_enter
++
++ pax_erase_kstack
++
+ 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/arch/x86/ia32/ia32_signal.c linux-2.6.39/arch/x86/ia32/ia32_signal.c
+--- linux-2.6.39/arch/x86/ia32/ia32_signal.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/ia32/ia32_signal.c 2011-05-22 19:36:30.000000000 -0400
@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
sp -= frame_size;
/* Align the stack pointer according to the i386 ABI,
} put_user_catch(err);
if (err)
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/alternative.h linux-2.6.38.4/arch/x86/include/asm/alternative.h
---- linux-2.6.38.4/arch/x86/include/asm/alternative.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/alternative.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/alternative.h linux-2.6.39/arch/x86/include/asm/alternative.h
+--- linux-2.6.39/arch/x86/include/asm/alternative.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/alternative.h 2011-05-22 19:36:30.000000000 -0400
@@ -94,7 +94,7 @@ static inline int alternatives_text_rese
".section .discard,\"aw\",@progbits\n" \
" .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \
"663:\n\t" newinstr "\n664:\n" /* replacement */ \
".previous"
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/apm.h linux-2.6.38.4/arch/x86/include/asm/apm.h
---- linux-2.6.38.4/arch/x86/include/asm/apm.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/apm.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/apm.h linux-2.6.39/arch/x86/include/asm/apm.h
+--- linux-2.6.39/arch/x86/include/asm/apm.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/apm.h 2011-05-22 19:36:30.000000000 -0400
@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
__asm__ __volatile__(APM_DO_ZERO_SEGS
"pushl %%edi\n\t"
"setc %%bl\n\t"
"popl %%ebp\n\t"
"popl %%edi\n\t"
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h
---- linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/atomic64_32.h linux-2.6.39/arch/x86/include/asm/atomic64_32.h
+--- linux-2.6.39/arch/x86/include/asm/atomic64_32.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/atomic64_32.h 2011-05-22 19:36:30.000000000 -0400
@@ -12,6 +12,14 @@ typedef struct {
u64 __aligned(8) counter;
} atomic64_t;
#define ATOMIC64_INIT(val) { (val) }
#ifdef CONFIG_X86_CMPXCHG64
-@@ -77,6 +85,24 @@ static inline void atomic64_set(atomic64
+@@ -38,6 +46,21 @@ static inline long long atomic64_cmpxchg
+ }
+
+ /**
++ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
++ * @p: pointer to type atomic64_unchecked_t
++ * @o: expected value
++ * @n: new value
++ *
++ * Atomically sets @v to @n if it was equal to @o and returns
++ * the old value.
++ */
++
++static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
++{
++ return cmpxchg64(&v->counter, o, n);
++}
++
++/**
+ * atomic64_xchg - xchg atomic64 variable
+ * @v: pointer to type atomic64_t
+ * @n: value to assign
+@@ -77,6 +100,24 @@ static inline void atomic64_set(atomic64
}
/**
* atomic64_read - read atomic64 variable
* @v: pointer to type atomic64_t
*
-@@ -93,6 +119,22 @@ static inline long long atomic64_read(at
+@@ -93,6 +134,22 @@ static inline long long atomic64_read(at
}
/**
* atomic64_add_return - add and return
* @i: integer value to add
* @v: pointer to type atomic64_t
-@@ -131,6 +173,17 @@ static inline long long atomic64_inc_ret
+@@ -108,6 +165,22 @@ static inline long long atomic64_add_ret
+ return i;
+ }
+
++/**
++ * atomic64_add_return_unchecked - add and return
++ * @i: integer value to add
++ * @v: pointer to type atomic64_unchecked_t
++ *
++ * Atomically adds @i to @v and returns @i + *@v
++ */
++static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
++{
++ asm volatile(ATOMIC64_ALTERNATIVE(add_return_unchecked)
++ : "+A" (i), "+c" (v)
++ : : "memory"
++ );
++ return i;
++}
++
+ /*
+ * Other variants with different arithmetic operators:
+ */
+@@ -131,6 +204,17 @@ static inline long long atomic64_inc_ret
return a;
}
static inline long long atomic64_dec_return(atomic64_t *v)
{
long long a;
-@@ -159,6 +212,22 @@ static inline long long atomic64_add(lon
+@@ -159,6 +243,22 @@ static inline long long atomic64_add(lon
}
/**
* atomic64_sub - subtract the atomic64 variable
* @i: integer value to subtract
* @v: pointer to type atomic64_t
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/atomic64_64.h linux-2.6.38.4/arch/x86/include/asm/atomic64_64.h
---- linux-2.6.38.4/arch/x86/include/asm/atomic64_64.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/atomic64_64.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/atomic64_64.h linux-2.6.39/arch/x86/include/asm/atomic64_64.h
+--- linux-2.6.39/arch/x86/include/asm/atomic64_64.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/atomic64_64.h 2011-05-22 19:36:30.000000000 -0400
@@ -18,7 +18,19 @@
*/
static inline long atomic64_read(const atomic64_t *v)
#define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
-@@ -206,17 +380,30 @@ static inline long atomic64_xchg(atomic6
+@@ -190,6 +364,11 @@ static inline long atomic64_cmpxchg(atom
+ return cmpxchg(&v->counter, old, new);
+ }
+
++static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
++{
++ return cmpxchg(&v->counter, old, new);
++}
++
+ static inline long atomic64_xchg(atomic64_t *v, long new)
+ {
+ return xchg(&v->counter, new);
+@@ -206,17 +385,30 @@ static inline long atomic64_xchg(atomic6
*/
static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
{
}
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/atomic.h linux-2.6.38.4/arch/x86/include/asm/atomic.h
---- linux-2.6.38.4/arch/x86/include/asm/atomic.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/atomic.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/atomic.h linux-2.6.39/arch/x86/include/asm/atomic.h
+--- linux-2.6.39/arch/x86/include/asm/atomic.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/atomic.h 2011-05-22 19:36:30.000000000 -0400
@@ -22,7 +22,18 @@
*/
static inline int atomic_read(const atomic_t *v)
/*
* atomic_dec_if_positive - decrement by 1 if old value positive
* @v: pointer of type atomic_t
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/bitops.h linux-2.6.38.4/arch/x86/include/asm/bitops.h
---- linux-2.6.38.4/arch/x86/include/asm/bitops.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/bitops.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/bitops.h linux-2.6.39/arch/x86/include/asm/bitops.h
+--- linux-2.6.39/arch/x86/include/asm/bitops.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/bitops.h 2011-05-22 19:36:30.000000000 -0400
@@ -38,7 +38,7 @@
* a mask operation on a byte.
*/
#define CONST_MASK(nr) (1 << ((nr) & 7))
/**
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/boot.h linux-2.6.38.4/arch/x86/include/asm/boot.h
---- linux-2.6.38.4/arch/x86/include/asm/boot.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/boot.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/boot.h linux-2.6.39/arch/x86/include/asm/boot.h
+--- linux-2.6.39/arch/x86/include/asm/boot.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/boot.h 2011-05-22 19:36:30.000000000 -0400
@@ -11,10 +11,15 @@
#include <asm/pgtable_types.h>
/* Minimum kernel alignment, as a power of two */
#ifdef CONFIG_X86_64
#define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/cacheflush.h linux-2.6.38.4/arch/x86/include/asm/cacheflush.h
---- linux-2.6.38.4/arch/x86/include/asm/cacheflush.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/cacheflush.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/cacheflush.h linux-2.6.39/arch/x86/include/asm/cacheflush.h
+--- linux-2.6.39/arch/x86/include/asm/cacheflush.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/cacheflush.h 2011-05-22 19:36:30.000000000 -0400
@@ -26,7 +26,7 @@ static inline unsigned long get_page_mem
unsigned long pg_flags = pg->flags & _PGMT_MASK;
else if (pg_flags == _PGMT_WC)
return _PAGE_CACHE_WC;
else if (pg_flags == _PGMT_UC_MINUS)
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/cache.h linux-2.6.38.4/arch/x86/include/asm/cache.h
---- linux-2.6.38.4/arch/x86/include/asm/cache.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/cache.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/cache.h linux-2.6.39/arch/x86/include/asm/cache.h
+--- linux-2.6.39/arch/x86/include/asm/cache.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/cache.h 2011-05-22 19:36:30.000000000 -0400
@@ -5,12 +5,13 @@
/* L1 cache line size */
#ifdef CONFIG_X86_VSMP
#ifdef CONFIG_SMP
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/checksum_32.h linux-2.6.38.4/arch/x86/include/asm/checksum_32.h
---- linux-2.6.38.4/arch/x86/include/asm/checksum_32.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/checksum_32.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/checksum_32.h linux-2.6.39/arch/x86/include/asm/checksum_32.h
+--- linux-2.6.39/arch/x86/include/asm/checksum_32.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/checksum_32.h 2011-05-22 19:36:30.000000000 -0400
@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
int len, __wsum sum,
int *src_err_ptr, int *dst_err_ptr);
len, sum, NULL, err_ptr);
if (len)
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/cpufeature.h linux-2.6.38.4/arch/x86/include/asm/cpufeature.h
---- linux-2.6.38.4/arch/x86/include/asm/cpufeature.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/cpufeature.h 2011-04-28 19:34:14.000000000 -0400
-@@ -349,7 +349,7 @@ static __always_inline __pure bool __sta
+diff -urNp linux-2.6.39/arch/x86/include/asm/cpufeature.h linux-2.6.39/arch/x86/include/asm/cpufeature.h
+--- linux-2.6.39/arch/x86/include/asm/cpufeature.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/cpufeature.h 2011-05-22 19:36:30.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 */
".previous\n"
"3: movb $1,%0\n"
"4:\n"
".previous\n"
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/desc_defs.h linux-2.6.38.4/arch/x86/include/asm/desc_defs.h
---- linux-2.6.38.4/arch/x86/include/asm/desc_defs.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/desc_defs.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/desc_defs.h linux-2.6.39/arch/x86/include/asm/desc_defs.h
+--- linux-2.6.39/arch/x86/include/asm/desc_defs.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/desc_defs.h 2011-05-22 19:36:30.000000000 -0400
@@ -31,6 +31,12 @@ struct desc_struct {
unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
};
} __attribute__((packed));
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/desc.h linux-2.6.38.4/arch/x86/include/asm/desc.h
---- linux-2.6.38.4/arch/x86/include/asm/desc.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/desc.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/desc.h linux-2.6.39/arch/x86/include/asm/desc.h
+--- linux-2.6.39/arch/x86/include/asm/desc.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/desc.h 2011-05-22 19:36:30.000000000 -0400
@@ -4,6 +4,7 @@
#include <asm/desc_defs.h>
#include <asm/ldt.h>
+#endif
+
#endif /* _ASM_X86_DESC_H */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/device.h linux-2.6.38.4/arch/x86/include/asm/device.h
---- linux-2.6.38.4/arch/x86/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/device.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/device.h linux-2.6.39/arch/x86/include/asm/device.h
+--- linux-2.6.39/arch/x86/include/asm/device.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
#endif
#if defined(CONFIG_DMAR) || defined(CONFIG_AMD_IOMMU)
void *iommu; /* hook for IOMMU specific extension */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/dma-mapping.h linux-2.6.38.4/arch/x86/include/asm/dma-mapping.h
---- linux-2.6.38.4/arch/x86/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/dma-mapping.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/dma-mapping.h linux-2.6.39/arch/x86/include/asm/dma-mapping.h
+--- linux-2.6.39/arch/x86/include/asm/dma-mapping.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/dma-mapping.h 2011-05-22 19:36:30.000000000 -0400
@@ -26,9 +26,9 @@ extern int iommu_merge;
extern struct device x86_dma_fallback_dev;
extern int panic_on_overflow;
WARN_ON(irqs_disabled()); /* for portability */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/e820.h linux-2.6.38.4/arch/x86/include/asm/e820.h
---- linux-2.6.38.4/arch/x86/include/asm/e820.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/e820.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/e820.h linux-2.6.39/arch/x86/include/asm/e820.h
+--- linux-2.6.39/arch/x86/include/asm/e820.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/e820.h 2011-05-22 19:36:30.000000000 -0400
@@ -69,7 +69,7 @@ struct e820map {
#define ISA_START_ADDRESS 0xa0000
#define ISA_END_ADDRESS 0x100000
#define BIOS_END 0x00100000
#define BIOS_ROM_BASE 0xffe00000
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/elf.h linux-2.6.38.4/arch/x86/include/asm/elf.h
---- linux-2.6.38.4/arch/x86/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/elf.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/elf.h linux-2.6.39/arch/x86/include/asm/elf.h
+--- linux-2.6.39/arch/x86/include/asm/elf.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/elf.h 2011-05-22 19:36:30.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. */
-#define arch_randomize_brk arch_randomize_brk
-
#endif /* _ASM_X86_ELF_H */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/futex.h linux-2.6.38.4/arch/x86/include/asm/futex.h
---- linux-2.6.38.4/arch/x86/include/asm/futex.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/futex.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/emergency-restart.h linux-2.6.39/arch/x86/include/asm/emergency-restart.h
+--- linux-2.6.39/arch/x86/include/asm/emergency-restart.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/emergency-restart.h 2011-05-22 19:36:30.000000000 -0400
+@@ -15,6 +15,6 @@ enum reboot_type {
+
+ extern enum reboot_type reboot_type;
+
+-extern void machine_emergency_restart(void);
++extern void machine_emergency_restart(void) __noreturn;
+
+ #endif /* _ASM_X86_EMERGENCY_RESTART_H */
+diff -urNp linux-2.6.39/arch/x86/include/asm/futex.h linux-2.6.39/arch/x86/include/asm/futex.h
+--- linux-2.6.39/arch/x86/include/asm/futex.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/futex.h 2011-05-22 19:36:30.000000000 -0400
@@ -12,16 +12,18 @@
#include <asm/system.h>
asm volatile("1:\tmovl %2, %0\n" \
"\tmovl\t%0, %3\n" \
"\t" insn "\n" \
-@@ -34,10 +36,10 @@
+@@ -34,7 +36,7 @@
_ASM_EXTABLE(1b, 4b) \
_ASM_EXTABLE(2b, 4b) \
: "=&a" (oldval), "=&r" (ret), \
+ "+m" (*(u32 *)____m(uaddr)), "=&r" (tem) \
: "r" (oparg), "i" (-EFAULT), "1" (0))
--static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
-+static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
- {
- int op = (encoded_op >> 28) & 7;
- int cmp = (encoded_op >> 24) & 15;
+ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
@@ -61,10 +63,10 @@ static inline int futex_atomic_op_inuser
switch (op) {
uaddr, oparg);
break;
case FUTEX_OP_OR:
-@@ -109,7 +111,7 @@ static inline int futex_atomic_op_inuser
- return ret;
- }
-
--static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval,
-+static inline int futex_atomic_cmpxchg_inatomic(u32 __user *uaddr, int oldval,
- int newval)
- {
-
-@@ -119,16 +121,16 @@ static inline int futex_atomic_cmpxchg_i
- return -ENOSYS;
- #endif
-
-- if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
-+ if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
+@@ -123,13 +125,13 @@ static inline int futex_atomic_cmpxchg_i
+ if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
return -EFAULT;
-- asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n"
-+ asm volatile("1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %1\n"
+- asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n"
++ asm volatile("1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"
"2:\t.section .fixup, \"ax\"\n"
- "3:\tmov %2, %0\n"
+ "3:\tmov %3, %0\n"
"\tjmp 2b\n"
"\t.previous\n"
_ASM_EXTABLE(1b, 3b)
-- : "=a" (oldval), "+m" (*uaddr)
-+ : "=a" (oldval), "+m" (*(u32 *)____m(uaddr))
- : "i" (-EFAULT), "r" (newval), "0" (oldval)
+- : "+r" (ret), "=a" (oldval), "+m" (*uaddr)
++ : "+r" (ret), "=a" (oldval), "+m" (*(u32 *)____m(uaddr))
+ : "i" (-EFAULT), "r" (newval), "1" (oldval)
: "memory"
);
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/hw_irq.h linux-2.6.38.4/arch/x86/include/asm/hw_irq.h
---- linux-2.6.38.4/arch/x86/include/asm/hw_irq.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/hw_irq.h 2011-04-28 19:57:25.000000000 -0400
-@@ -113,8 +113,8 @@ extern void setup_ioapic_dest(void);
+diff -urNp linux-2.6.39/arch/x86/include/asm/hw_irq.h linux-2.6.39/arch/x86/include/asm/hw_irq.h
+--- linux-2.6.39/arch/x86/include/asm/hw_irq.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/hw_irq.h 2011-05-22 19:36:30.000000000 -0400
+@@ -137,8 +137,8 @@ extern void setup_ioapic_dest(void);
extern void enable_IO_APIC(void);
/* Statistics */
/* EISA */
extern void eisa_set_level_irq(unsigned int irq);
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/i387.h linux-2.6.38.4/arch/x86/include/asm/i387.h
---- linux-2.6.38.4/arch/x86/include/asm/i387.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/i387.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/i387.h linux-2.6.39/arch/x86/include/asm/i387.h
+--- linux-2.6.39/arch/x86/include/asm/i387.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/i387.h 2011-05-22 19:36:30.000000000 -0400
@@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc
{
int err;
/*
* These must be called with preempt disabled
-@@ -237,7 +242,7 @@ static inline void fpu_save_init(struct
- } else if (use_fxsr()) {
- fpu_fxsave(fpu);
- } else {
-- asm volatile("fsave %[fx]; fwait"
-+ asm volatile("fnsave %[fx]; fwait"
- : [fx] "=m" (fpu->state->fsave));
- return;
- }
@@ -312,7 +317,7 @@ static inline void kernel_fpu_begin(void
struct thread_info *me = current_thread_info();
preempt_disable();
else
clts();
}
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/io.h linux-2.6.38.4/arch/x86/include/asm/io.h
---- linux-2.6.38.4/arch/x86/include/asm/io.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/io.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/io.h linux-2.6.39/arch/x86/include/asm/io.h
+--- linux-2.6.39/arch/x86/include/asm/io.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/io.h 2011-05-22 19:36:30.000000000 -0400
@@ -216,6 +216,17 @@ extern void set_iounmap_nonlazy(void);
#include <linux/vmalloc.h>
/*
* Convert a virtual cached pointer to an uncached pointer
*/
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/iommu.h linux-2.6.38.4/arch/x86/include/asm/iommu.h
---- linux-2.6.38.4/arch/x86/include/asm/iommu.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/iommu.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/iommu.h linux-2.6.39/arch/x86/include/asm/iommu.h
+--- linux-2.6.39/arch/x86/include/asm/iommu.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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 int force_iommu, no_iommu;
extern int iommu_detected;
extern int iommu_pass_through;
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/irqflags.h linux-2.6.38.4/arch/x86/include/asm/irqflags.h
---- linux-2.6.38.4/arch/x86/include/asm/irqflags.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/irqflags.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/irqflags.h linux-2.6.39/arch/x86/include/asm/irqflags.h
+--- linux-2.6.39/arch/x86/include/asm/irqflags.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/irqflags.h 2011-05-22 19:36:30.000000000 -0400
@@ -140,6 +140,11 @@ static inline unsigned long arch_local_i
sti; \
sysexit
#else
#define INTERRUPT_RETURN iret
#define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/kprobes.h linux-2.6.38.4/arch/x86/include/asm/kprobes.h
---- linux-2.6.38.4/arch/x86/include/asm/kprobes.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/kprobes.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/kprobes.h linux-2.6.39/arch/x86/include/asm/kprobes.h
+--- linux-2.6.39/arch/x86/include/asm/kprobes.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/kprobes.h 2011-05-22 19:36:30.000000000 -0400
@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
#define RELATIVEJUMP_SIZE 5
#define RELATIVECALL_OPCODE 0xe8
#define flush_insn_slot(p) do { } while (0)
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/kvm_host.h linux-2.6.38.4/arch/x86/include/asm/kvm_host.h
---- linux-2.6.38.4/arch/x86/include/asm/kvm_host.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/kvm_host.h 2011-04-28 19:57:25.000000000 -0400
-@@ -423,7 +423,7 @@ struct kvm_arch {
+diff -urNp linux-2.6.39/arch/x86/include/asm/kvm_host.h linux-2.6.39/arch/x86/include/asm/kvm_host.h
+--- linux-2.6.39/arch/x86/include/asm/kvm_host.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/kvm_host.h 2011-05-22 19:36:30.000000000 -0400
+@@ -419,7 +419,7 @@ struct kvm_arch {
unsigned int n_used_mmu_pages;
unsigned int n_requested_mmu_pages;
unsigned int n_max_mmu_pages;
struct hlist_head mmu_page_hash[KVM_NUM_MMU_PAGES];
/*
* Hash table of struct kvm_mmu_page.
-@@ -603,7 +603,7 @@ struct kvm_arch_async_pf {
+@@ -599,7 +599,7 @@ struct kvm_arch_async_pf {
bool direct_map;
};
int kvm_mmu_module_init(void);
void kvm_mmu_module_exit(void);
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/local.h linux-2.6.38.4/arch/x86/include/asm/local.h
---- linux-2.6.38.4/arch/x86/include/asm/local.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/local.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/local.h linux-2.6.39/arch/x86/include/asm/local.h
+--- linux-2.6.39/arch/x86/include/asm/local.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/local.h 2011-05-22 19:36:30.000000000 -0400
@@ -18,26 +18,58 @@ typedef struct {
static inline void local_inc(local_t *l)
: "+r" (i), "+m" (l->a.counter)
: : "memory");
return i + __i;
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/mce.h linux-2.6.38.4/arch/x86/include/asm/mce.h
---- linux-2.6.38.4/arch/x86/include/asm/mce.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/mce.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/mce.h linux-2.6.39/arch/x86/include/asm/mce.h
+--- linux-2.6.39/arch/x86/include/asm/mce.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
/*
* Exception handler
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/microcode.h linux-2.6.38.4/arch/x86/include/asm/microcode.h
---- linux-2.6.38.4/arch/x86/include/asm/microcode.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/microcode.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/microcode.h linux-2.6.39/arch/x86/include/asm/microcode.h
+--- linux-2.6.39/arch/x86/include/asm/microcode.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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 };
{
return NULL;
}
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/mman.h linux-2.6.38.4/arch/x86/include/asm/mman.h
---- linux-2.6.38.4/arch/x86/include/asm/mman.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/mman.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/mman.h linux-2.6.39/arch/x86/include/asm/mman.h
+--- linux-2.6.39/arch/x86/include/asm/mman.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/mman.h 2011-05-22 19:36:30.000000000 -0400
@@ -5,4 +5,14 @@
#include <asm-generic/mman.h>
+#endif
+
#endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/mmu_context.h linux-2.6.38.4/arch/x86/include/asm/mmu_context.h
---- linux-2.6.38.4/arch/x86/include/asm/mmu_context.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/mmu_context.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/mmu_context.h linux-2.6.39/arch/x86/include/asm/mmu_context.h
+--- linux-2.6.39/arch/x86/include/asm/mmu_context.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/mmu_context.h 2011-05-22 19:36:30.000000000 -0400
@@ -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)
}
#define activate_mm(prev, next) \
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/mmu.h linux-2.6.38.4/arch/x86/include/asm/mmu.h
---- linux-2.6.38.4/arch/x86/include/asm/mmu.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/mmu.h 2011-04-28 19:34:14.000000000 -0400
-@@ -9,10 +9,23 @@
+diff -urNp linux-2.6.39/arch/x86/include/asm/mmu.h linux-2.6.39/arch/x86/include/asm/mmu.h
+--- linux-2.6.39/arch/x86/include/asm/mmu.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/mmu.h 2011-05-22 19:36:30.000000000 -0400
+@@ -9,10 +9,22 @@
* we put the segment information here.
*/
typedef struct {
+
+#endif
+#endif
-+
- } mm_context_t;
- #ifdef CONFIG_SMP
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/module.h linux-2.6.38.4/arch/x86/include/asm/module.h
---- linux-2.6.38.4/arch/x86/include/asm/module.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/module.h 2011-04-28 19:34:14.000000000 -0400
+ #ifdef CONFIG_X86_64
+ /* True if mm supports a task running in 32 bit compatibility mode. */
+diff -urNp linux-2.6.39/arch/x86/include/asm/module.h linux-2.6.39/arch/x86/include/asm/module.h
+--- linux-2.6.39/arch/x86/include/asm/module.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/module.h 2011-05-22 19:41:32.000000000 -0400
@@ -5,6 +5,7 @@
#ifdef CONFIG_X86_64
+#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.38.4/arch/x86/include/asm/page_64_types.h linux-2.6.38.4/arch/x86/include/asm/page_64_types.h
---- linux-2.6.38.4/arch/x86/include/asm/page_64_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/page_64_types.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/page_64_types.h linux-2.6.39/arch/x86/include/asm/page_64_types.h
+--- linux-2.6.39/arch/x86/include/asm/page_64_types.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/page_64_types.h 2011-05-22 19:36:30.000000000 -0400
@@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
/* duplicated to the one in bootmem.h */
extern unsigned long __phys_addr(unsigned long);
#define __phys_reloc_hide(x) (x)
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/paravirt.h linux-2.6.38.4/arch/x86/include/asm/paravirt.h
---- linux-2.6.38.4/arch/x86/include/asm/paravirt.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/paravirt.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/paravirt.h linux-2.6.39/arch/x86/include/asm/paravirt.h
+--- linux-2.6.39/arch/x86/include/asm/paravirt.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/paravirt.h 2011-05-22 19:36:30.000000000 -0400
@@ -739,6 +739,21 @@ static inline void __set_fixmap(unsigned
pv_mmu_ops.set_fixmap(idx, phys, flags);
}
#endif /* CONFIG_X86_32 */
#endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/paravirt_types.h linux-2.6.38.4/arch/x86/include/asm/paravirt_types.h
---- linux-2.6.38.4/arch/x86/include/asm/paravirt_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/paravirt_types.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/paravirt_types.h linux-2.6.39/arch/x86/include/asm/paravirt_types.h
+--- linux-2.6.39/arch/x86/include/asm/paravirt_types.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/paravirt_types.h 2011-05-22 19:36:30.000000000 -0400
@@ -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,
};
struct arch_spinlock;
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/pci_x86.h linux-2.6.38.4/arch/x86/include/asm/pci_x86.h
---- linux-2.6.38.4/arch/x86/include/asm/pci_x86.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/pci_x86.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/pci_x86.h linux-2.6.39/arch/x86/include/asm/pci_x86.h
+--- linux-2.6.39/arch/x86/include/asm/pci_x86.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
extern bool port_cf9_safe;
/* arch_initcall level */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgalloc.h linux-2.6.38.4/arch/x86/include/asm/pgalloc.h
---- linux-2.6.38.4/arch/x86/include/asm/pgalloc.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/pgalloc.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/pgalloc.h linux-2.6.39/arch/x86/include/asm/pgalloc.h
+--- linux-2.6.39/arch/x86/include/asm/pgalloc.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/pgalloc.h 2011-05-22 19:36:30.000000000 -0400
@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
pmd_t *pmd, pte_t *pte)
{
set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
}
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable-2level.h linux-2.6.38.4/arch/x86/include/asm/pgtable-2level.h
---- linux-2.6.38.4/arch/x86/include/asm/pgtable-2level.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/pgtable-2level.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/pgtable-2level.h linux-2.6.39/arch/x86/include/asm/pgtable-2level.h
+--- linux-2.6.39/arch/x86/include/asm/pgtable-2level.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/pgtable-2level.h 2011-05-22 19:36:30.000000000 -0400
@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
}
static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_32.h linux-2.6.38.4/arch/x86/include/asm/pgtable_32.h
---- linux-2.6.38.4/arch/x86/include/asm/pgtable_32.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/pgtable_32.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/pgtable_32.h linux-2.6.39/arch/x86/include/asm/pgtable_32.h
+--- linux-2.6.39/arch/x86/include/asm/pgtable_32.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/pgtable_32.h 2011-05-22 19:36:30.000000000 -0400
@@ -25,9 +25,6 @@
struct mm_struct;
struct vm_area_struct;
/*
* kern_addr_valid() is (1) for FLATMEM and (0) for
* SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_32_types.h linux-2.6.38.4/arch/x86/include/asm/pgtable_32_types.h
---- linux-2.6.38.4/arch/x86/include/asm/pgtable_32_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/pgtable_32_types.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/pgtable_32_types.h linux-2.6.39/arch/x86/include/asm/pgtable_32_types.h
+--- linux-2.6.39/arch/x86/include/asm/pgtable_32_types.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/pgtable_32_types.h 2011-05-22 19:36:30.000000000 -0400
@@ -8,7 +8,7 @@
*/
#ifdef CONFIG_X86_PAE
#define MODULES_VADDR VMALLOC_START
#define MODULES_END VMALLOC_END
#define MODULES_LEN (MODULES_VADDR - MODULES_END)
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable-3level.h linux-2.6.38.4/arch/x86/include/asm/pgtable-3level.h
---- linux-2.6.38.4/arch/x86/include/asm/pgtable-3level.h 2011-04-18 17:27:13.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/pgtable-3level.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/pgtable-3level.h linux-2.6.39/arch/x86/include/asm/pgtable-3level.h
+--- linux-2.6.39/arch/x86/include/asm/pgtable-3level.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/pgtable-3level.h 2011-05-22 19:36:30.000000000 -0400
@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
}
/*
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_64.h linux-2.6.38.4/arch/x86/include/asm/pgtable_64.h
---- linux-2.6.38.4/arch/x86/include/asm/pgtable_64.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/pgtable_64.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/pgtable_64.h linux-2.6.39/arch/x86/include/asm/pgtable_64.h
+--- linux-2.6.39/arch/x86/include/asm/pgtable_64.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/pgtable_64.h 2011-05-22 19:36:30.000000000 -0400
@@ -16,10 +16,13 @@
extern pud_t level3_kernel_pgt[512];
}
static inline void native_pgd_clear(pgd_t *pgd)
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_64_types.h linux-2.6.38.4/arch/x86/include/asm/pgtable_64_types.h
---- linux-2.6.38.4/arch/x86/include/asm/pgtable_64_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/pgtable_64_types.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/pgtable_64_types.h linux-2.6.39/arch/x86/include/asm/pgtable_64_types.h
+--- linux-2.6.39/arch/x86/include/asm/pgtable_64_types.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/pgtable_64_types.h 2011-05-22 19:36:30.000000000 -0400
@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
#define MODULES_VADDR _AC(0xffffffffa0000000, UL)
#define MODULES_END _AC(0xffffffffff000000, UL)
+#define ktva_ktla(addr) (addr)
#endif /* _ASM_X86_PGTABLE_64_DEFS_H */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable.h linux-2.6.38.4/arch/x86/include/asm/pgtable.h
---- linux-2.6.38.4/arch/x86/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/pgtable.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/pgtable.h linux-2.6.39/arch/x86/include/asm/pgtable.h
+--- linux-2.6.39/arch/x86/include/asm/pgtable.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/pgtable.h 2011-05-22 19:36:30.000000000 -0400
@@ -81,12 +81,51 @@ extern struct mm_struct *pgd_page_get_mm
#define arch_end_context_switch(prev) do {} while(0)
#include <asm-generic/pgtable.h>
#endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_types.h linux-2.6.38.4/arch/x86/include/asm/pgtable_types.h
---- linux-2.6.38.4/arch/x86/include/asm/pgtable_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/pgtable_types.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/pgtable_types.h linux-2.6.39/arch/x86/include/asm/pgtable_types.h
+--- linux-2.6.39/arch/x86/include/asm/pgtable_types.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/pgtable_types.h 2011-05-22 19:36:30.000000000 -0400
@@ -16,13 +16,12 @@
#define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
#define _PAGE_BIT_PAT 7 /* on 4KB pages */
#define pgprot_writecombine pgprot_writecombine
extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/processor.h linux-2.6.38.4/arch/x86/include/asm/processor.h
---- linux-2.6.38.4/arch/x86/include/asm/processor.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/processor.h 2011-04-28 19:34:14.000000000 -0400
-@@ -270,7 +270,7 @@ struct tss_struct {
+diff -urNp linux-2.6.39/arch/x86/include/asm/processor.h linux-2.6.39/arch/x86/include/asm/processor.h
+--- linux-2.6.39/arch/x86/include/asm/processor.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/processor.h 2011-05-22 19:36:30.000000000 -0400
+@@ -266,7 +266,7 @@ struct tss_struct {
} ____cacheline_aligned;
/*
* Save the original ist values for checking stack pointers during debugging
-@@ -864,8 +864,15 @@ static inline void spin_lock_prefetch(co
+@@ -860,11 +860,18 @@ static inline void spin_lock_prefetch(co
*/
#define TASK_SIZE PAGE_OFFSET
#define TASK_SIZE_MAX TASK_SIZE
+#define STACK_TOP_MAX TASK_SIZE
#define INIT_THREAD { \
- .sp0 = sizeof(init_stack) + (long)&init_stack, \
-@@ -882,7 +889,7 @@ static inline void spin_lock_prefetch(co
+- .sp0 = sizeof(init_stack) + (long)&init_stack, \
++ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
+ .vm86_info = NULL, \
+ .sysenter_cs = __KERNEL_CS, \
+ .io_bitmap_ptr = NULL, \
+@@ -878,7 +885,7 @@ static inline void spin_lock_prefetch(co
*/
#define INIT_TSS { \
.x86_tss = { \
.ss0 = __KERNEL_DS, \
.ss1 = __KERNEL_CS, \
.io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
-@@ -893,11 +900,7 @@ static inline void spin_lock_prefetch(co
+@@ -889,11 +896,7 @@ static inline void spin_lock_prefetch(co
extern unsigned long thread_saved_pc(struct task_struct *tsk);
#define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
/*
* The below -8 is to reserve 8 bytes on top of the ring0 stack.
-@@ -912,7 +915,7 @@ extern unsigned long thread_saved_pc(str
+@@ -908,7 +911,7 @@ extern unsigned long thread_saved_pc(str
#define task_pt_regs(task) \
({ \
struct pt_regs *__regs__; \
__regs__ - 1; \
})
-@@ -922,13 +925,13 @@ extern unsigned long thread_saved_pc(str
+@@ -918,13 +921,13 @@ extern unsigned long thread_saved_pc(str
/*
* User space process size. 47bits minus one guard page.
*/
#define TASK_SIZE (test_thread_flag(TIF_IA32) ? \
IA32_PAGE_OFFSET : TASK_SIZE_MAX)
-@@ -965,6 +968,10 @@ extern void start_thread(struct pt_regs
+@@ -935,11 +938,11 @@ extern unsigned long thread_saved_pc(str
+ #define STACK_TOP_MAX TASK_SIZE_MAX
+
+ #define INIT_THREAD { \
+- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
++ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
+ }
+
+ #define INIT_TSS { \
+- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
++ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
+ }
+
+ /*
+@@ -961,6 +964,10 @@ extern void start_thread(struct pt_regs
*/
#define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
#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.38.4/arch/x86/include/asm/ptrace.h linux-2.6.38.4/arch/x86/include/asm/ptrace.h
---- linux-2.6.38.4/arch/x86/include/asm/ptrace.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/ptrace.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/ptrace.h linux-2.6.39/arch/x86/include/asm/ptrace.h
+--- linux-2.6.39/arch/x86/include/asm/ptrace.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/ptrace.h 2011-05-22 19:36:30.000000000 -0400
@@ -152,28 +152,29 @@ static inline unsigned long regs_return_
}
#endif
}
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/reboot.h linux-2.6.38.4/arch/x86/include/asm/reboot.h
---- linux-2.6.38.4/arch/x86/include/asm/reboot.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/reboot.h 2011-04-28 19:34:14.000000000 -0400
-@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
+diff -urNp linux-2.6.39/arch/x86/include/asm/reboot.h linux-2.6.39/arch/x86/include/asm/reboot.h
+--- linux-2.6.39/arch/x86/include/asm/reboot.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/reboot.h 2011-05-22 19:36:30.000000000 -0400
+@@ -6,19 +6,19 @@
+ struct pt_regs;
+
+ struct machine_ops {
+- void (*restart)(char *cmd);
+- void (*halt)(void);
+- void (*power_off)(void);
++ void (* __noreturn restart)(char *cmd);
++ void (* __noreturn halt)(void);
++ void (* __noreturn power_off)(void);
+ void (*shutdown)(void);
+ void (*crash_shutdown)(struct pt_regs *);
+- void (*emergency_restart)(void);
++ void (* __noreturn emergency_restart)(void);
+ };
+
+ extern struct machine_ops machine_ops;
void native_machine_crash_shutdown(struct pt_regs *regs);
void native_machine_shutdown(void);
--void machine_real_restart(const unsigned char *code, int length);
-+void machine_real_restart(const unsigned char *code, unsigned int length);
-
- typedef void (*nmi_shootdown_cb)(int, struct die_args*);
- void nmi_shootdown_cpus(nmi_shootdown_cb callback);
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/rwsem.h linux-2.6.38.4/arch/x86/include/asm/rwsem.h
---- linux-2.6.38.4/arch/x86/include/asm/rwsem.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/rwsem.h 2011-04-28 19:34:14.000000000 -0400
-@@ -118,6 +118,14 @@ static inline void __down_read(struct rw
+-void machine_real_restart(unsigned int type);
++void machine_real_restart(unsigned int type) __noreturn;
+ /* These must match dispatch_table in reboot_32.S */
+ #define MRR_BIOS 0
+ #define MRR_APM 1
+diff -urNp linux-2.6.39/arch/x86/include/asm/rwsem.h linux-2.6.39/arch/x86/include/asm/rwsem.h
+--- linux-2.6.39/arch/x86/include/asm/rwsem.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/rwsem.h 2011-05-22 19:36:30.000000000 -0400
+@@ -64,6 +64,14 @@ static inline void __down_read(struct rw
{
asm volatile("# beginning down_read\n\t"
LOCK_PREFIX _ASM_INC "(%1)\n\t"
/* adds 0x00000001 */
" jns 1f\n"
" call call_rwsem_down_read_failed\n"
-@@ -139,6 +147,14 @@ static inline int __down_read_trylock(st
+@@ -85,6 +93,14 @@ static inline int __down_read_trylock(st
"1:\n\t"
" mov %1,%2\n\t"
" add %3,%2\n\t"
" jle 2f\n\t"
LOCK_PREFIX " cmpxchg %2,%0\n\t"
" jnz 1b\n\t"
-@@ -158,6 +174,14 @@ static inline void __down_write_nested(s
- rwsem_count_t tmp;
+@@ -104,6 +120,14 @@ static inline void __down_write_nested(s
+ long tmp;
asm volatile("# beginning down_write\n\t"
LOCK_PREFIX " xadd %1,(%2)\n\t"
+
/* adds 0xffff0001, returns the old value */
" test %1,%1\n\t"
/* was the count 0 before? */
-@@ -196,6 +220,14 @@ static inline void __up_read(struct rw_s
- rwsem_count_t tmp;
+@@ -141,6 +165,14 @@ static inline void __up_read(struct rw_s
+ long tmp;
asm volatile("# beginning __up_read\n\t"
LOCK_PREFIX " xadd %1,(%2)\n\t"
+
/* subtracts 1, returns the old value */
" jns 1f\n\t"
" call call_rwsem_wake\n" /* expects old value in %edx */
-@@ -214,6 +246,14 @@ static inline void __up_write(struct rw_
- rwsem_count_t tmp;
+@@ -159,6 +191,14 @@ static inline void __up_write(struct rw_
+ long tmp;
asm volatile("# beginning __up_write\n\t"
LOCK_PREFIX " xadd %1,(%2)\n\t"
+
/* subtracts 0xffff0001, returns the old value */
" jns 1f\n\t"
" call call_rwsem_wake\n" /* expects old value in %edx */
-@@ -231,6 +271,14 @@ static inline void __downgrade_write(str
+@@ -176,6 +216,14 @@ static inline void __downgrade_write(str
{
asm volatile("# beginning __downgrade_write\n\t"
LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
/*
* transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
* 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
-@@ -250,7 +298,15 @@ static inline void __downgrade_write(str
- static inline void rwsem_atomic_add(rwsem_count_t delta,
- struct rw_semaphore *sem)
+@@ -194,7 +242,15 @@ static inline void __downgrade_write(str
+ */
+ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
{
- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
: "+m" (sem->count)
: "er" (delta));
}
-@@ -263,7 +319,15 @@ static inline rwsem_count_t rwsem_atomic
+@@ -206,7 +262,15 @@ static inline long rwsem_atomic_update(l
{
- rwsem_count_t tmp = delta;
+ long tmp = delta;
- asm volatile(LOCK_PREFIX "xadd %0,%1"
+ asm volatile(LOCK_PREFIX "xadd %0,%1\n"
: "+r" (tmp), "+m" (sem->count)
: : "memory");
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/segment.h linux-2.6.38.4/arch/x86/include/asm/segment.h
---- linux-2.6.38.4/arch/x86/include/asm/segment.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/segment.h 2011-04-28 19:34:14.000000000 -0400
-@@ -62,8 +62,8 @@
+diff -urNp linux-2.6.39/arch/x86/include/asm/segment.h linux-2.6.39/arch/x86/include/asm/segment.h
+--- linux-2.6.39/arch/x86/include/asm/segment.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/segment.h 2011-05-22 19:36:30.000000000 -0400
+@@ -64,8 +64,8 @@
* 26 - ESPFIX small SS
* 27 - per-cpu [ offset to per-cpu data area ]
* 28 - stack_canary-20 [ for stack protector ]
* 31 - TSS for double fault handler
*/
#define GDT_ENTRY_TLS_MIN 6
-@@ -77,6 +77,8 @@
+@@ -79,6 +79,8 @@
#define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
#define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
#define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
-@@ -102,6 +104,12 @@
+@@ -104,6 +106,12 @@
#define __KERNEL_STACK_CANARY 0
#endif
#define GDT_ENTRY_DOUBLEFAULT_TSS 31
/*
-@@ -139,7 +147,7 @@
+@@ -141,7 +149,7 @@
*/
/* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
#else
-@@ -163,6 +171,8 @@
+@@ -165,6 +173,8 @@
#define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS * 8 + 3)
#define __USER32_DS __USER_DS
#define GDT_ENTRY_TSS 8 /* needs two entries */
#define GDT_ENTRY_LDT 10 /* needs two entries */
#define GDT_ENTRY_TLS_MIN 12
-@@ -183,6 +193,7 @@
+@@ -185,6 +195,7 @@
#endif
#define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
#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.38.4/arch/x86/include/asm/smp.h linux-2.6.38.4/arch/x86/include/asm/smp.h
---- linux-2.6.38.4/arch/x86/include/asm/smp.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/smp.h 2011-04-28 19:34:14.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);
+diff -urNp linux-2.6.39/arch/x86/include/asm/smp.h linux-2.6.39/arch/x86/include/asm/smp.h
+--- linux-2.6.39/arch/x86/include/asm/smp.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/smp.h 2011-05-22 19:36:30.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);
DECLARE_PER_CPU(u16, cpu_llc_id);
-DECLARE_PER_CPU(int, cpu_number);
+DECLARE_PER_CPU(unsigned int, cpu_number);
static inline struct cpumask *cpu_sibling_mask(int cpu)
{
-@@ -172,14 +172,8 @@ extern unsigned disabled_cpus __cpuinitd
+@@ -192,14 +192,8 @@ extern unsigned disabled_cpus __cpuinitd
extern int safe_smp_processor_id(void);
#elif defined(CONFIG_X86_64_SMP)
#define safe_smp_processor_id() smp_processor_id()
#endif
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/spinlock.h linux-2.6.38.4/arch/x86/include/asm/spinlock.h
---- linux-2.6.38.4/arch/x86/include/asm/spinlock.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/spinlock.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/spinlock.h linux-2.6.39/arch/x86/include/asm/spinlock.h
+--- linux-2.6.39/arch/x86/include/asm/spinlock.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/spinlock.h 2011-05-22 19:36:30.000000000 -0400
@@ -249,6 +249,14 @@ static inline int arch_write_can_lock(ar
static inline void arch_read_lock(arch_rwlock_t *rw)
{
: "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
}
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/stackprotector.h linux-2.6.38.4/arch/x86/include/asm/stackprotector.h
---- linux-2.6.38.4/arch/x86/include/asm/stackprotector.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/stackprotector.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/stackprotector.h linux-2.6.39/arch/x86/include/asm/stackprotector.h
+--- linux-2.6.39/arch/x86/include/asm/stackprotector.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/stackprotector.h 2011-05-22 19:36:30.000000000 -0400
@@ -113,7 +113,7 @@ static inline void setup_stack_canary_se
static inline void load_stack_canary_segment(void)
asm volatile ("mov %0, %%gs" : : "r" (0));
#endif
}
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/stacktrace.h linux-2.6.38.4/arch/x86/include/asm/stacktrace.h
---- linux-2.6.38.4/arch/x86/include/asm/stacktrace.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/stacktrace.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/stacktrace.h linux-2.6.39/arch/x86/include/asm/stacktrace.h
+--- linux-2.6.39/arch/x86/include/asm/stacktrace.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/stacktrace.h 2011-05-22 19:36:30.000000000 -0400
@@ -11,28 +11,20 @@
extern int kstack_depth_to_print;
};
void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/system.h linux-2.6.38.4/arch/x86/include/asm/system.h
---- linux-2.6.38.4/arch/x86/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/system.h 2011-04-28 19:34:14.000000000 -0400
-@@ -131,7 +131,7 @@ do { \
+diff -urNp linux-2.6.39/arch/x86/include/asm/system.h linux-2.6.39/arch/x86/include/asm/system.h
+--- linux-2.6.39/arch/x86/include/asm/system.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/system.h 2011-05-22 19:36:30.000000000 -0400
+@@ -129,7 +129,7 @@ do { \
"call __switch_to\n\t" \
"movq "__percpu_arg([current_task])",%%rsi\n\t" \
__switch_canary \
"movq %%rax,%%rdi\n\t" \
"testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
"jnz ret_from_fork\n\t" \
-@@ -142,7 +142,7 @@ do { \
+@@ -140,7 +140,7 @@ do { \
[threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
[ti_flags] "i" (offsetof(struct thread_info, flags)), \
[_tif_fork] "i" (_TIF_FORK), \
[current_task] "m" (current_task) \
__switch_canary_iparam \
: "memory", "cc" __EXTRA_CLOBBER)
-@@ -202,7 +202,7 @@ static inline unsigned long get_limit(un
+@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un
{
unsigned long __limit;
asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
}
static inline void native_clts(void)
-@@ -342,7 +342,7 @@ void enable_hlt(void);
+@@ -340,12 +340,12 @@ void enable_hlt(void);
void cpu_idle_wait(void);
extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
void default_idle(void);
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/thread_info.h linux-2.6.38.4/arch/x86/include/asm/thread_info.h
---- linux-2.6.38.4/arch/x86/include/asm/thread_info.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/thread_info.h 2011-04-28 19:34:14.000000000 -0400
+
+-void stop_this_cpu(void *dummy);
++void stop_this_cpu(void *dummy) __noreturn;
+
+ /*
+ * Force strict CPU ordering.
+diff -urNp linux-2.6.39/arch/x86/include/asm/thread_info.h linux-2.6.39/arch/x86/include/asm/thread_info.h
+--- linux-2.6.39/arch/x86/include/asm/thread_info.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/thread_info.h 2011-05-22 19:36:30.000000000 -0400
@@ -10,6 +10,7 @@
#include <linux/compiler.h>
#include <asm/page.h>
struct exec_domain *exec_domain; /* execution domain */
__u32 flags; /* low level flags */
__u32 status; /* thread synchronous flags */
-@@ -34,18 +34,11 @@ struct thread_info {
+@@ -34,18 +34,12 @@ struct thread_info {
mm_segment_t addr_limit;
struct restart_block restart_block;
void __user *sysenter_return;
- */
- __u8 supervisor_stack[0];
-#endif
++ unsigned long lowest_stack;
int uaccess_err;
};
.exec_domain = &default_exec_domain, \
.flags = 0, \
.cpu = 0, \
-@@ -56,7 +49,7 @@ struct thread_info {
+@@ -56,7 +50,7 @@ struct thread_info {
}, \
}
-#define init_thread_info (init_thread_union.thread_info)
-+#define init_thread_info (init_task.tinfo)
++#define init_thread_info (init_thread_union.stack)
#define init_stack (init_thread_union.stack)
#else /* !__ASSEMBLY__ */
-@@ -164,6 +157,23 @@ struct thread_info {
- #define alloc_thread_info(tsk) \
- ((struct thread_info *)__get_free_pages(THREAD_FLAGS, THREAD_ORDER))
+@@ -170,6 +164,23 @@ struct thread_info {
+ ret; \
+ })
+#ifdef __ASSEMBLY__
+/* how to get the thread information struct from ASM */
#ifdef CONFIG_X86_32
#define STACK_WARN (THREAD_SIZE/8)
-@@ -174,35 +184,13 @@ struct thread_info {
+@@ -180,35 +191,13 @@ struct thread_info {
*/
#ifndef __ASSEMBLY__
/*
* macros/functions for gaining access to the thread information structure
* preempt_count needs to be 1 initially, until the scheduler is functional.
-@@ -210,21 +198,6 @@ static inline struct thread_info *curren
+@@ -216,21 +205,8 @@ static inline struct thread_info *curren
#ifndef __ASSEMBLY__
DECLARE_PER_CPU(unsigned long, kernel_stack);
- movq PER_CPU_VAR(kernel_stack),reg ; \
- subq $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg
-
++/* how to get the current stack pointer from C */
++register unsigned long current_stack_pointer asm("rsp") __used;
#endif
#endif /* !X86_32 */
-@@ -260,5 +233,16 @@ extern void arch_task_cache_init(void);
+@@ -266,5 +242,16 @@ extern void arch_task_cache_init(void);
extern void free_thread_info(struct thread_info *ti);
extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
#define arch_task_cache_init arch_task_cache_init
+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
+
+#define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
-+extern struct task_struct *alloc_task_struct(void);
++extern struct task_struct *alloc_task_struct_node(int node);
+extern void free_task_struct(struct task_struct *);
+
#endif
#endif /* _ASM_X86_THREAD_INFO_H */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/uaccess_32.h linux-2.6.38.4/arch/x86/include/asm/uaccess_32.h
---- linux-2.6.38.4/arch/x86/include/asm/uaccess_32.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/uaccess_32.h 2011-04-28 19:34:14.000000000 -0400
-@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
+diff -urNp linux-2.6.39/arch/x86/include/asm/uaccess_32.h linux-2.6.39/arch/x86/include/asm/uaccess_32.h
+--- linux-2.6.39/arch/x86/include/asm/uaccess_32.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/uaccess_32.h 2011-05-22 19:36:30.000000000 -0400
+@@ -44,6 +44,11 @@ unsigned long __must_check __copy_from_u
static __always_inline unsigned long __must_check
__copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
{
++ pax_track_stack();
++
+ if ((long)n < 0)
+ return n;
+
if (__builtin_constant_p(n)) {
unsigned long ret;
-@@ -62,6 +65,8 @@ __copy_to_user_inatomic(void __user *to,
+@@ -62,6 +67,8 @@ __copy_to_user_inatomic(void __user *to,
return ret;
}
}
return __copy_to_user_ll(to, from, n);
}
-@@ -89,6 +94,9 @@ __copy_to_user(void __user *to, const vo
+@@ -83,12 +90,16 @@ static __always_inline unsigned long __m
+ __copy_to_user(void __user *to, const void *from, unsigned long n)
+ {
+ might_fault();
++
+ return __copy_to_user_inatomic(to, from, n);
+ }
+
static __always_inline unsigned long
__copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
{
/* Avoid zeroing the tail if the copy fails..
* If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
* but as the zeroing behaviour is only significant when n is not
-@@ -138,6 +146,10 @@ static __always_inline unsigned long
+@@ -138,6 +149,12 @@ static __always_inline unsigned long
__copy_from_user(void *to, const void __user *from, unsigned long n)
{
might_fault();
+
++ pax_track_stack();
++
+ if ((long)n < 0)
+ return n;
+
if (__builtin_constant_p(n)) {
unsigned long ret;
-@@ -153,6 +165,8 @@ __copy_from_user(void *to, const void __
+@@ -153,6 +170,8 @@ __copy_from_user(void *to, const void __
return ret;
}
}
return __copy_from_user_ll(to, from, n);
}
-@@ -160,6 +174,10 @@ static __always_inline unsigned long __c
+@@ -160,6 +179,10 @@ static __always_inline unsigned long __c
const void __user *from, unsigned long n)
{
might_fault();
if (__builtin_constant_p(n)) {
unsigned long ret;
-@@ -182,15 +200,19 @@ static __always_inline unsigned long
+@@ -182,15 +205,19 @@ static __always_inline unsigned long
__copy_from_user_inatomic_nocache(void *to, const void __user *from,
unsigned long n)
{
extern void copy_from_user_overflow(void)
#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
-@@ -200,17 +222,61 @@ extern void copy_from_user_overflow(void
+@@ -200,17 +227,61 @@ extern void copy_from_user_overflow(void
#endif
;
return n;
}
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/uaccess_64.h linux-2.6.38.4/arch/x86/include/asm/uaccess_64.h
---- linux-2.6.38.4/arch/x86/include/asm/uaccess_64.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/uaccess_64.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/uaccess_64.h linux-2.6.39/arch/x86/include/asm/uaccess_64.h
+--- linux-2.6.39/arch/x86/include/asm/uaccess_64.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/uaccess_64.h 2011-05-22 19:36:30.000000000 -0400
@@ -11,6 +11,9 @@
#include <asm/alternative.h>
#include <asm/cpufeature.h>
return n;
}
-@@ -65,110 +68,194 @@ int copy_to_user(void __user *dst, const
+@@ -65,110 +68,198 @@ int copy_to_user(void __user *dst, const
{
might_fault();
- if (!__builtin_constant_p(size))
- return copy_user_generic(dst, (__force void *)src, size);
+
++ pax_track_stack();
++
+ if ((int)size < 0)
+ return size;
+
might_fault();
- if (!__builtin_constant_p(size))
+
++ pax_track_stack();
++
+ if ((int)size < 0)
+ return size;
+
ret, "b", "b", "=q", 1);
if (likely(!ret))
__put_user_asm(tmp, (u8 __user *)dst,
-@@ -177,7 +264,7 @@ int __copy_in_user(void __user *dst, con
+@@ -177,7 +268,7 @@ int __copy_in_user(void __user *dst, con
}
case 2: {
u16 tmp;
ret, "w", "w", "=r", 2);
if (likely(!ret))
__put_user_asm(tmp, (u16 __user *)dst,
-@@ -187,7 +274,7 @@ int __copy_in_user(void __user *dst, con
+@@ -187,7 +278,7 @@ int __copy_in_user(void __user *dst, con
case 4: {
u32 tmp;
ret, "l", "k", "=r", 4);
if (likely(!ret))
__put_user_asm(tmp, (u32 __user *)dst,
-@@ -196,7 +283,7 @@ int __copy_in_user(void __user *dst, con
+@@ -196,7 +287,7 @@ int __copy_in_user(void __user *dst, con
}
case 8: {
u64 tmp;
ret, "q", "", "=r", 8);
if (likely(!ret))
__put_user_asm(tmp, (u64 __user *)dst,
-@@ -204,8 +291,16 @@ int __copy_in_user(void __user *dst, con
+@@ -204,8 +295,16 @@ int __copy_in_user(void __user *dst, con
return ret;
}
default:
}
}
-@@ -222,33 +317,70 @@ __must_check unsigned long __clear_user(
+@@ -222,33 +321,72 @@ __must_check unsigned long __clear_user(
static __must_check __always_inline int
__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
{
++ pax_track_stack();
++
+ if ((int)size < 0)
+ return size;
+
copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
#endif /* _ASM_X86_UACCESS_64_H */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/uaccess.h linux-2.6.38.4/arch/x86/include/asm/uaccess.h
---- linux-2.6.38.4/arch/x86/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/uaccess.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/uaccess.h linux-2.6.39/arch/x86/include/asm/uaccess.h
+--- linux-2.6.39/arch/x86/include/asm/uaccess.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/uaccess.h 2011-05-22 19:36:30.000000000 -0400
@@ -8,12 +8,15 @@
#include <linux/thread_info.h>
#include <linux/prefetch.h>
#ifdef CONFIG_X86_32
# include "uaccess_32.h"
#else
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/vgtod.h linux-2.6.38.4/arch/x86/include/asm/vgtod.h
---- linux-2.6.38.4/arch/x86/include/asm/vgtod.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/vgtod.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/vgtod.h linux-2.6.39/arch/x86/include/asm/vgtod.h
+--- linux-2.6.39/arch/x86/include/asm/vgtod.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/vgtod.h 2011-05-22 19:36:30.000000000 -0400
@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
int sysctl_enabled;
struct timezone sys_tz;
cycle_t (*vread)(void);
cycle_t cycle_last;
cycle_t mask;
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/vsyscall.h linux-2.6.38.4/arch/x86/include/asm/vsyscall.h
---- linux-2.6.38.4/arch/x86/include/asm/vsyscall.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/vsyscall.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/vsyscall.h linux-2.6.39/arch/x86/include/asm/vsyscall.h
+--- linux-2.6.39/arch/x86/include/asm/vsyscall.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/vsyscall.h 2011-05-22 19:36:30.000000000 -0400
@@ -15,9 +15,10 @@ enum vsyscall_num {
#ifdef __KERNEL__
#endif /* __KERNEL__ */
#endif /* _ASM_X86_VSYSCALL_H */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/xsave.h linux-2.6.38.4/arch/x86/include/asm/xsave.h
---- linux-2.6.38.4/arch/x86/include/asm/xsave.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/xsave.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/include/asm/xen/pci.h linux-2.6.39/arch/x86/include/asm/xen/pci.h
+--- linux-2.6.39/arch/x86/include/asm/xen/pci.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
+ };
+
+-extern struct xen_pci_frontend_ops *xen_pci_frontend;
++extern const struct xen_pci_frontend_ops *xen_pci_frontend;
+
+ static inline int xen_pci_frontend_enable_msi(struct pci_dev *dev,
+ int vectors[])
+diff -urNp linux-2.6.39/arch/x86/include/asm/xsave.h linux-2.6.39/arch/x86/include/asm/xsave.h
+--- linux-2.6.39/arch/x86/include/asm/xsave.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/include/asm/xsave.h 2011-05-22 19:36:30.000000000 -0400
@@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav
{
int err;
__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
"2:\n"
".section .fixup,\"ax\"\n"
-diff -urNp linux-2.6.38.4/arch/x86/Kconfig linux-2.6.38.4/arch/x86/Kconfig
---- linux-2.6.38.4/arch/x86/Kconfig 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/Kconfig 2011-04-28 19:34:14.000000000 -0400
-@@ -223,7 +223,7 @@ config X86_TRAMPOLINE
+diff -urNp linux-2.6.39/arch/x86/Kconfig linux-2.6.39/arch/x86/Kconfig
+--- linux-2.6.39/arch/x86/Kconfig 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/Kconfig 2011-05-22 19:41:32.000000000 -0400
+@@ -224,7 +224,7 @@ config X86_HT
config X86_32_LAZY_GS
def_bool y
config ARCH_HWEIGHT_CFLAGS
string
-@@ -1019,7 +1019,7 @@ choice
+@@ -1022,7 +1022,7 @@ choice
config NOHIGHMEM
bool "off"
---help---
Linux can use up to 64 Gigabytes of physical memory on x86 systems.
However, the address space of 32-bit x86 processors is only 4
-@@ -1056,7 +1056,7 @@ config NOHIGHMEM
+@@ -1059,7 +1059,7 @@ config NOHIGHMEM
config HIGHMEM4G
bool "4GB"
---help---
Select this if you have a 32-bit processor and between 1 and 4
gigabytes of physical RAM.
-@@ -1110,7 +1110,7 @@ config PAGE_OFFSET
+@@ -1113,7 +1113,7 @@ config PAGE_OFFSET
hex
default 0xB0000000 if VMSPLIT_3G_OPT
default 0x80000000 if VMSPLIT_2G
default 0x40000000 if VMSPLIT_1G
default 0xC0000000
depends on X86_32
-@@ -1454,7 +1454,7 @@ config ARCH_USES_PG_UNCACHED
+@@ -1457,7 +1457,7 @@ config ARCH_USES_PG_UNCACHED
config EFI
bool "EFI runtime service support"
---help---
This enables the kernel to use EFI runtime services that are
available (such as the EFI variable services).
-@@ -1484,6 +1484,7 @@ config SECCOMP
+@@ -1487,6 +1487,7 @@ config SECCOMP
config CC_STACKPROTECTOR
bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
---help---
This option turns on the -fstack-protector GCC feature. This
feature puts, at the beginning of functions, a canary value on
-@@ -1541,6 +1542,7 @@ config KEXEC_JUMP
+@@ -1544,6 +1545,7 @@ config KEXEC_JUMP
config PHYSICAL_START
hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP)
default "0x1000000"
---help---
This gives the physical address where the kernel is loaded.
-@@ -1604,6 +1606,7 @@ config X86_NEED_RELOCS
+@@ -1607,6 +1609,7 @@ config X86_NEED_RELOCS
config PHYSICAL_ALIGN
hex "Alignment value to which kernel should be aligned" if X86_32
default "0x1000000"
range 0x2000 0x1000000
---help---
This value puts the alignment restrictions on physical address
-@@ -1635,9 +1638,10 @@ config HOTPLUG_CPU
+@@ -1638,9 +1641,10 @@ config HOTPLUG_CPU
Say N if you want to disable CPU hotplug.
config COMPAT_VDSO
---help---
Map the 32-bit VDSO to the predictable old-style address too.
-diff -urNp linux-2.6.38.4/arch/x86/Kconfig.cpu linux-2.6.38.4/arch/x86/Kconfig.cpu
---- linux-2.6.38.4/arch/x86/Kconfig.cpu 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/Kconfig.cpu 2011-04-28 19:34:14.000000000 -0400
-@@ -339,7 +339,7 @@ config X86_PPRO_FENCE
+diff -urNp linux-2.6.39/arch/x86/Kconfig.cpu linux-2.6.39/arch/x86/Kconfig.cpu
+--- linux-2.6.39/arch/x86/Kconfig.cpu 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/Kconfig.cpu 2011-05-22 19:36:30.000000000 -0400
+@@ -334,7 +334,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
def_bool y
config X86_INVD_BUG
def_bool y
-@@ -363,7 +363,7 @@ config X86_POPAD_OK
+@@ -358,7 +358,7 @@ config X86_POPAD_OK
config X86_ALIGNMENT_16
def_bool y
config X86_INTEL_USERCOPY
def_bool y
-@@ -409,7 +409,7 @@ config X86_CMPXCHG64
+@@ -404,7 +404,7 @@ config X86_CMPXCHG64
# generates cmov.
config X86_CMOV
def_bool y
config X86_MINIMUM_CPU_FAMILY
int
-diff -urNp linux-2.6.38.4/arch/x86/Kconfig.debug linux-2.6.38.4/arch/x86/Kconfig.debug
---- linux-2.6.38.4/arch/x86/Kconfig.debug 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/Kconfig.debug 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/Kconfig.debug linux-2.6.39/arch/x86/Kconfig.debug
+--- linux-2.6.39/arch/x86/Kconfig.debug 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/Kconfig.debug 2011-05-22 19:36:30.000000000 -0400
@@ -101,7 +101,7 @@ config X86_PTDUMP
config DEBUG_RODATA
bool "Write protect kernel read-only data structures"
---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.38.4/arch/x86/kernel/acpi/sleep.c linux-2.6.38.4/arch/x86/kernel/acpi/sleep.c
---- linux-2.6.38.4/arch/x86/kernel/acpi/sleep.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/acpi/sleep.c 2011-04-28 19:34:14.000000000 -0400
-@@ -18,7 +18,7 @@
- #include "realmode/wakeup.h"
- #include "sleep.h"
-
--unsigned long acpi_wakeup_address;
-+unsigned long acpi_wakeup_address = 0x2000;
- unsigned long acpi_realmode_flags;
-
- /* address in low memory of the wakeup routine. */
-@@ -99,8 +99,12 @@ int acpi_save_state_mem(void)
- header->trampoline_segment = setup_trampoline() >> 4;
+diff -urNp linux-2.6.39/arch/x86/kernel/acpi/sleep.c linux-2.6.39/arch/x86/kernel/acpi/sleep.c
+--- linux-2.6.39/arch/x86/kernel/acpi/sleep.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/acpi/sleep.c 2011-05-22 19:36:30.000000000 -0400
+@@ -88,8 +88,12 @@ int acpi_suspend_lowlevel(void)
+ header->trampoline_segment = trampoline_address() >> 4;
#ifdef CONFIG_SMP
stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
+
initial_gs = per_cpu_offset(smp_processor_id());
#endif
initial_code = (unsigned long)wakeup_long64;
-diff -urNp linux-2.6.38.4/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.38.4/arch/x86/kernel/acpi/wakeup_32.S
---- linux-2.6.38.4/arch/x86/kernel/acpi/wakeup_32.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/acpi/wakeup_32.S 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.39/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-2.6.39/arch/x86/kernel/acpi/wakeup_32.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/acpi/wakeup_32.S 2011-05-22 19:36:30.000000000 -0400
@@ -30,13 +30,11 @@ wakeup_pmode_return:
# and restore the stack ... but you need gdt for this to work
movl saved_context_esp, %esp
bogus_magic:
jmp bogus_magic
-diff -urNp linux-2.6.38.4/arch/x86/kernel/alternative.c linux-2.6.38.4/arch/x86/kernel/alternative.c
---- linux-2.6.38.4/arch/x86/kernel/alternative.c 2011-04-18 17:27:13.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/alternative.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/alternative.c linux-2.6.39/arch/x86/kernel/alternative.c
+--- linux-2.6.39/arch/x86/kernel/alternative.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/alternative.c 2011-05-22 19:36:30.000000000 -0400
@@ -248,7 +248,7 @@ static void alternatives_smp_lock(const
if (!*poff || ptr < text || ptr >= text_end)
continue;
#endif
void __init arch_init_ideal_nop5(void)
-diff -urNp linux-2.6.38.4/arch/x86/kernel/amd_iommu.c linux-2.6.38.4/arch/x86/kernel/amd_iommu.c
---- linux-2.6.38.4/arch/x86/kernel/amd_iommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/amd_iommu.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/amd_iommu.c linux-2.6.39/arch/x86/kernel/amd_iommu.c
+--- linux-2.6.39/arch/x86/kernel/amd_iommu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/amd_iommu.c 2011-05-22 19:36:30.000000000 -0400
+@@ -48,7 +48,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
@@ -2286,7 +2286,7 @@ static void prealloc_protection_domains(
}
}
.alloc_coherent = alloc_coherent,
.free_coherent = free_coherent,
.map_page = map_page,
-diff -urNp linux-2.6.38.4/arch/x86/kernel/apic/apic.c linux-2.6.38.4/arch/x86/kernel/apic/apic.c
---- linux-2.6.38.4/arch/x86/kernel/apic/apic.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/apic/apic.c 2011-04-28 19:57:25.000000000 -0400
-@@ -1819,7 +1819,7 @@ void smp_error_interrupt(struct pt_regs
+@@ -2582,7 +2582,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/arch/x86/kernel/apic/apic.c linux-2.6.39/arch/x86/kernel/apic/apic.c
+--- linux-2.6.39/arch/x86/kernel/apic/apic.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/apic/apic.c 2011-05-22 19:36:30.000000000 -0400
+@@ -1821,7 +1821,7 @@ void smp_error_interrupt(struct pt_regs
apic_write(APIC_ESR, 0);
v1 = apic_read(APIC_ESR);
ack_APIC_irq();
/*
* Here is what the APIC error bits mean:
-diff -urNp linux-2.6.38.4/arch/x86/kernel/apic/io_apic.c linux-2.6.38.4/arch/x86/kernel/apic/io_apic.c
---- linux-2.6.38.4/arch/x86/kernel/apic/io_apic.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/apic/io_apic.c 2011-04-28 19:57:25.000000000 -0400
-@@ -617,7 +617,7 @@ struct IO_APIC_route_entry **alloc_ioapi
+@@ -2204,6 +2204,8 @@ static int __cpuinit apic_cluster_num(vo
+ u16 *bios_cpu_apicid;
+ DECLARE_BITMAP(clustermap, NUM_APIC_CLUSTERS);
+
++ pax_track_stack();
++
+ bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid);
+ bitmap_zero(clustermap, NUM_APIC_CLUSTERS);
+
+diff -urNp linux-2.6.39/arch/x86/kernel/apic/io_apic.c linux-2.6.39/arch/x86/kernel/apic/io_apic.c
+--- linux-2.6.39/arch/x86/kernel/apic/io_apic.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/apic/io_apic.c 2011-05-22 19:36:30.000000000 -0400
+@@ -623,7 +623,7 @@ struct IO_APIC_route_entry **alloc_ioapi
ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
GFP_KERNEL);
if (!ioapic_entries)
for (apic = 0; apic < nr_ioapics; apic++) {
ioapic_entries[apic] =
-@@ -634,7 +634,7 @@ nomem:
+@@ -640,7 +640,7 @@ nomem:
kfree(ioapic_entries[apic]);
kfree(ioapic_entries);
}
/*
-@@ -1044,7 +1044,7 @@ int IO_APIC_get_PCI_irq_vector(int bus,
+@@ -1040,7 +1040,7 @@ int IO_APIC_get_PCI_irq_vector(int bus,
}
EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
{
/* Used to the online set of cpus does not change
* during assign_irq_vector.
-@@ -1052,7 +1052,7 @@ void lock_vector_lock(void)
+@@ -1048,7 +1048,7 @@ void lock_vector_lock(void)
raw_spin_lock(&vector_lock);
}
{
raw_spin_unlock(&vector_lock);
}
-@@ -2409,7 +2409,7 @@ static void ack_apic_edge(struct irq_dat
+@@ -2379,7 +2379,7 @@ static void ack_apic_edge(struct irq_dat
ack_APIC_irq();
}
/*
* IO-APIC versions below 0x20 don't support EOI register.
-@@ -2517,7 +2517,7 @@ static void ack_apic_level(struct irq_da
+@@ -2487,7 +2487,7 @@ static void ack_apic_level(struct irq_da
* at the cpu.
*/
if (!(v & (1 << (i & 0x1f)))) {
eoi_ioapic_irq(irq, cfg);
}
-diff -urNp linux-2.6.38.4/arch/x86/kernel/apm_32.c linux-2.6.38.4/arch/x86/kernel/apm_32.c
---- linux-2.6.38.4/arch/x86/kernel/apm_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/apm_32.c 2011-04-28 19:34:14.000000000 -0400
-@@ -410,7 +410,7 @@ static DEFINE_MUTEX(apm_mutex);
+diff -urNp linux-2.6.39/arch/x86/kernel/apm_32.c linux-2.6.39/arch/x86/kernel/apm_32.c
+--- linux-2.6.39/arch/x86/kernel/apm_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/apm_32.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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.
*/
(unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
static const char driver_version[] = "1.16ac"; /* no spaces */
-@@ -588,7 +588,10 @@ static long __apm_bios_call(void *_call)
+@@ -590,7 +590,10 @@ static long __apm_bios_call(void *_call)
BUG_ON(cpu != 0);
gdt = get_cpu_gdt_table(cpu);
save_desc_40 = gdt[0x40 / 8];
apm_irq_save(flags);
APM_DO_SAVE_SEGS;
-@@ -597,7 +600,11 @@ static long __apm_bios_call(void *_call)
+@@ -599,7 +602,11 @@ static long __apm_bios_call(void *_call)
&call->esi);
APM_DO_RESTORE_SEGS;
apm_irq_restore(flags);
put_cpu();
return call->eax & 0xff;
-@@ -664,7 +671,10 @@ static long __apm_bios_call_simple(void
+@@ -666,7 +673,10 @@ static long __apm_bios_call_simple(void
BUG_ON(cpu != 0);
gdt = get_cpu_gdt_table(cpu);
save_desc_40 = gdt[0x40 / 8];
apm_irq_save(flags);
APM_DO_SAVE_SEGS;
-@@ -672,7 +682,11 @@ static long __apm_bios_call_simple(void
+@@ -674,7 +684,11 @@ static long __apm_bios_call_simple(void
&call->eax);
APM_DO_RESTORE_SEGS;
apm_irq_restore(flags);
put_cpu();
return error;
}
-@@ -975,7 +989,7 @@ recalc:
-
- static void apm_power_off(void)
- {
-- unsigned char po_bios_call[] = {
-+ const unsigned char po_bios_call[] = {
- 0xb8, 0x00, 0x10, /* movw $0x1000,ax */
- 0x8e, 0xd0, /* movw ax,ss */
- 0xbc, 0x00, 0xf0, /* movw $0xf000,sp */
-@@ -2356,12 +2370,15 @@ static int __init apm_init(void)
+@@ -2351,12 +2365,15 @@ static int __init apm_init(void)
* code to that CPU.
*/
gdt = get_cpu_gdt_table(0);
proc_create("apm", 0, NULL, &apm_file_ops);
-diff -urNp linux-2.6.38.4/arch/x86/kernel/asm-offsets_32.c linux-2.6.38.4/arch/x86/kernel/asm-offsets_32.c
---- linux-2.6.38.4/arch/x86/kernel/asm-offsets_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/asm-offsets_32.c 2011-04-28 19:34:14.000000000 -0400
-@@ -51,7 +51,6 @@ void foo(void)
- OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id);
+diff -urNp linux-2.6.39/arch/x86/kernel/asm-offsets_64.c linux-2.6.39/arch/x86/kernel/asm-offsets_64.c
+--- linux-2.6.39/arch/x86/kernel/asm-offsets_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/asm-offsets_64.c 2011-05-22 19:36:30.000000000 -0400
+@@ -69,6 +69,7 @@ int main(void)
+ BLANK();
+ #undef ENTRY
+
++ DEFINE(TSS_size, sizeof(struct tss_struct));
+ OFFSET(TSS_ist, tss_struct, x86_tss.ist);
BLANK();
-- OFFSET(TI_task, thread_info, task);
- OFFSET(TI_exec_domain, thread_info, exec_domain);
- OFFSET(TI_flags, thread_info, flags);
+diff -urNp linux-2.6.39/arch/x86/kernel/asm-offsets.c linux-2.6.39/arch/x86/kernel/asm-offsets.c
+--- linux-2.6.39/arch/x86/kernel/asm-offsets.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/asm-offsets.c 2011-05-22 19:36:30.000000000 -0400
+@@ -33,6 +33,8 @@ void common(void) {
OFFSET(TI_status, thread_info, status);
-@@ -113,6 +112,11 @@ void foo(void)
- OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
- OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
- OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
-+
-+#ifdef CONFIG_PAX_KERNEXEC
-+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
-+#endif
-+
- #endif
+ OFFSET(TI_addr_limit, thread_info, addr_limit);
+ OFFSET(TI_preempt_count, thread_info, preempt_count);
++ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
++ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
- #ifdef CONFIG_XEN
-diff -urNp linux-2.6.38.4/arch/x86/kernel/asm-offsets_64.c linux-2.6.38.4/arch/x86/kernel/asm-offsets_64.c
---- linux-2.6.38.4/arch/x86/kernel/asm-offsets_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/asm-offsets_64.c 2011-04-30 11:45:06.000000000 -0400
-@@ -63,6 +63,18 @@ int main(void)
+ BLANK();
+ OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
+@@ -53,8 +55,24 @@ void common(void) {
OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
- OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
+ OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
+
+#ifdef CONFIG_PAX_KERNEXEC
-+ OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
+#endif
+
+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
+ OFFSET(PV_MMU_set_pgd, pv_mmu_ops, set_pgd);
-+#endif
-+
#endif
-
-@@ -115,6 +127,7 @@ int main(void)
- ENTRY(cr8);
- BLANK();
- #undef ENTRY
-+ DEFINE(TSS_size, sizeof(struct tss_struct));
- DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
- BLANK();
- DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
-@@ -130,6 +143,7 @@ int main(void)
-
- BLANK();
- DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
++#endif
++
++ BLANK();
++ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
++ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
++
#ifdef CONFIG_XEN
BLANK();
OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
-diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/amd.c linux-2.6.38.4/arch/x86/kernel/cpu/amd.c
---- linux-2.6.38.4/arch/x86/kernel/cpu/amd.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/cpu/amd.c 2011-04-28 19:34:14.000000000 -0400
-@@ -624,7 +624,7 @@ static unsigned int __cpuinit amd_size_c
+diff -urNp linux-2.6.39/arch/x86/kernel/cpu/amd.c linux-2.6.39/arch/x86/kernel/cpu/amd.c
+--- linux-2.6.39/arch/x86/kernel/cpu/amd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/cpu/amd.c 2011-05-22 19:36:30.000000000 -0400
+@@ -641,7 +641,7 @@ static unsigned int __cpuinit amd_size_c
unsigned int size)
{
/* AMD errata T13 (order #21922) */
/* Duron Rev A0 */
if (c->x86_model == 3 && c->x86_mask == 0)
size = 64;
-diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/common.c linux-2.6.38.4/arch/x86/kernel/cpu/common.c
---- linux-2.6.38.4/arch/x86/kernel/cpu/common.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/cpu/common.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/cpu/common.c linux-2.6.39/arch/x86/kernel/cpu/common.c
+--- linux-2.6.39/arch/x86/kernel/cpu/common.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/cpu/common.c 2011-05-22 19:36:30.000000000 -0400
@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
DEFINE_PER_CPU(unsigned long, kernel_stack) =
- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
-+ (unsigned long)&init_thread_union - 8 + THREAD_SIZE;
++ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
EXPORT_PER_CPU_SYMBOL(kernel_stack);
DEFINE_PER_CPU(char *, irq_stack_ptr) =
struct thread_struct *thread = &curr->thread;
if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/intel.c linux-2.6.38.4/arch/x86/kernel/cpu/intel.c
---- linux-2.6.38.4/arch/x86/kernel/cpu/intel.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/cpu/intel.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/cpu/intel.c linux-2.6.39/arch/x86/kernel/cpu/intel.c
+--- linux-2.6.39/arch/x86/kernel/cpu/intel.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/cpu/intel.c 2011-05-22 19:36:30.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.
load_idt(&idt_descr);
}
#endif
-diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/Makefile linux-2.6.38.4/arch/x86/kernel/cpu/Makefile
---- linux-2.6.38.4/arch/x86/kernel/cpu/Makefile 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/cpu/Makefile 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/cpu/Makefile linux-2.6.39/arch/x86/kernel/cpu/Makefile
+--- linux-2.6.39/arch/x86/kernel/cpu/Makefile 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/cpu/Makefile 2011-05-22 19:36:30.000000000 -0400
@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
CFLAGS_REMOVE_perf_event.o = -pg
endif
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.38.4/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38.4/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-2.6.38.4/arch/x86/kernel/cpu/mcheck/mce.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/cpu/mcheck/mce.c 2011-04-28 19:57:25.000000000 -0400
-@@ -45,6 +45,7 @@
+diff -urNp linux-2.6.39/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.39/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-2.6.39/arch/x86/kernel/cpu/mcheck/mce.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/cpu/mcheck/mce.c 2011-05-22 19:36:30.000000000 -0400
+@@ -46,6 +46,7 @@
#include <asm/ipi.h>
#include <asm/mce.h>
#include <asm/msr.h>
#include "mce-internal.h"
-@@ -219,7 +220,7 @@ static void print_mce(struct mce *m)
+@@ -220,7 +221,7 @@ static void print_mce(struct mce *m)
!(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
m->cs, m->ip);
print_symbol("{%s}", m->ip);
pr_cont("\n");
}
-@@ -243,10 +244,10 @@ static void print_mce(struct mce *m)
+@@ -244,10 +245,10 @@ static void print_mce(struct mce *m)
#define PANIC_TIMEOUT 5 /* 5 seconds */
/* Panic in progress. Enable interrupts and wait for final IPI */
static void wait_for_panic(void)
-@@ -270,7 +271,7 @@ static void mce_panic(char *msg, struct
+@@ -271,7 +272,7 @@ static void mce_panic(char *msg, struct
/*
* Make sure only one CPU runs in machine check panic
*/
wait_for_panic();
barrier();
-@@ -278,7 +279,7 @@ static void mce_panic(char *msg, struct
+@@ -279,7 +280,7 @@ static void mce_panic(char *msg, struct
console_verbose();
} else {
/* Don't log too much for fake panic */
return;
}
/* First print corrected ones that are still unlogged */
-@@ -646,7 +647,7 @@ static int mce_timed_out(u64 *t)
+@@ -647,7 +648,7 @@ static int mce_timed_out(u64 *t)
* might have been modified by someone else.
*/
rmb();
wait_for_panic();
if (!monarch_timeout)
goto out;
-@@ -1460,14 +1461,14 @@ void __cpuinit mcheck_cpu_init(struct cp
+@@ -1461,14 +1462,14 @@ void __cpuinit mcheck_cpu_init(struct cp
*/
static DEFINE_SPINLOCK(mce_state_lock);
spin_unlock(&mce_state_lock);
return -EBUSY;
-@@ -1475,7 +1476,7 @@ static int mce_open(struct inode *inode,
+@@ -1476,7 +1477,7 @@ static int mce_open(struct inode *inode,
if (file->f_flags & O_EXCL)
open_exclu = 1;
spin_unlock(&mce_state_lock);
-@@ -1486,7 +1487,7 @@ static int mce_release(struct inode *ino
+@@ -1487,7 +1488,7 @@ static int mce_release(struct inode *ino
{
spin_lock(&mce_state_lock);
open_exclu = 0;
spin_unlock(&mce_state_lock);
-@@ -1658,8 +1659,7 @@ static long mce_ioctl(struct file *f, un
- }
- }
-
--/* Modified in mce-inject.c, so not static or const */
--struct file_operations mce_chrdev_ops = {
-+struct file_operations mce_chrdev_ops = { /* Modified in mce-inject.c, so not static or const */
- .open = mce_open,
- .release = mce_release,
- .read = mce_read,
-@@ -2171,7 +2171,7 @@ struct dentry *mce_get_debugfs_dir(void)
+@@ -2174,7 +2175,7 @@ struct dentry *mce_get_debugfs_dir(void)
static void mce_reset(void)
{
cpu_missing = 0;
atomic_set(&mce_executing, 0);
atomic_set(&mce_callin, 0);
atomic_set(&global_nwo, 0);
-diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/main.c
---- linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/main.c 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/main.c 2011-04-28 19:34:14.000000000 -0400
-@@ -61,7 +61,7 @@ static DEFINE_MUTEX(mtrr_mutex);
+diff -urNp linux-2.6.39/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.39/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-2.6.39/arch/x86/kernel/cpu/mtrr/main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/cpu/mtrr/main.c 2011-05-22 19:36:30.000000000 -0400
+@@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
u64 size_or_mask, size_and_mask;
static bool mtrr_aps_delayed_init;
const struct mtrr_ops *mtrr_if;
-diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.39/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-2.6.39/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-05-22 19:36:30.000000000 -0400
@@ -12,19 +12,19 @@
extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
};
extern int generic_get_free_region(unsigned long base, unsigned long size,
-diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/perf_event.c linux-2.6.38.4/arch/x86/kernel/cpu/perf_event.c
---- linux-2.6.38.4/arch/x86/kernel/cpu/perf_event.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/cpu/perf_event.c 2011-04-28 19:34:14.000000000 -0400
-@@ -1781,7 +1781,7 @@ perf_callchain_user(struct perf_callchai
+diff -urNp linux-2.6.39/arch/x86/kernel/cpu/perf_event.c linux-2.6.39/arch/x86/kernel/cpu/perf_event.c
+--- linux-2.6.39/arch/x86/kernel/cpu/perf_event.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/cpu/perf_event.c 2011-05-22 19:36:30.000000000 -0400
+@@ -774,6 +774,8 @@ static int x86_schedule_events(struct cp
+ int i, j, w, wmax, num = 0;
+ struct hw_perf_event *hwc;
+
++ pax_track_stack();
++
+ bitmap_zero(used_mask, X86_PMC_IDX_MAX);
+
+ for (i = 0; i < n; i++) {
+@@ -1878,7 +1880,7 @@ perf_callchain_user(struct perf_callchai
break;
perf_callchain_store(entry, frame.return_address);
}
}
-diff -urNp linux-2.6.38.4/arch/x86/kernel/crash.c linux-2.6.38.4/arch/x86/kernel/crash.c
---- linux-2.6.38.4/arch/x86/kernel/crash.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/crash.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/crash.c linux-2.6.39/arch/x86/kernel/crash.c
+--- linux-2.6.39/arch/x86/kernel/crash.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/crash.c 2011-05-22 19:36:30.000000000 -0400
@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu,
regs = args->regs;
crash_fixup_ss_esp(&fixed_regs, regs);
regs = &fixed_regs;
}
-diff -urNp linux-2.6.38.4/arch/x86/kernel/doublefault_32.c linux-2.6.38.4/arch/x86/kernel/doublefault_32.c
---- linux-2.6.38.4/arch/x86/kernel/doublefault_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/doublefault_32.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/doublefault_32.c linux-2.6.39/arch/x86/kernel/doublefault_32.c
+--- linux-2.6.39/arch/x86/kernel/doublefault_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/doublefault_32.c 2011-05-22 19:36:30.000000000 -0400
@@ -11,7 +11,7 @@
#define DOUBLEFAULT_STACKSIZE (1024)
.fs = __KERNEL_PERCPU,
.__cr3 = __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-2.6.38.4/arch/x86/kernel/dumpstack_32.c linux-2.6.38.4/arch/x86/kernel/dumpstack_32.c
---- linux-2.6.38.4/arch/x86/kernel/dumpstack_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/dumpstack_32.c 2011-04-28 19:34:14.000000000 -0400
-@@ -37,15 +37,12 @@ void dump_trace(struct task_struct *task
+diff -urNp linux-2.6.39/arch/x86/kernel/dumpstack_32.c linux-2.6.39/arch/x86/kernel/dumpstack_32.c
+--- linux-2.6.39/arch/x86/kernel/dumpstack_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/dumpstack_32.c 2011-05-22 19:36:30.000000000 -0400
+@@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task
+ bp = stack_frame(task, regs);
- bp = stack_frame(task, regs);
for (;;) {
- struct thread_info *context;
+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
-+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
- context = (struct thread_info *)
- ((unsigned long)stack & (~(THREAD_SIZE - 1)));
- bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph);
--
++ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
+
- stack = (unsigned long *)context->previous_esp;
- if (!stack)
+ if (stack_start == task_stack_page(task))
if (ops->stack(data, "IRQ") < 0)
break;
touch_nmi_watchdog();
-@@ -95,21 +92,22 @@ void show_registers(struct pt_regs *regs
+@@ -96,21 +94,22 @@ void show_registers(struct pt_regs *regs
* When in-kernel, we also print out the stack and code at the
* time of the fault..
*/
+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(smp_processor_id())[(0xffff & regs->cs) >> 3]);
printk(KERN_EMERG "Stack:\n");
- show_stack_log_lvl(NULL, regs, ®s->sp, KERN_EMERG);
+ show_stack_log_lvl(NULL, regs, ®s->sp, 0, KERN_EMERG);
printk(KERN_EMERG "Code: ");
code_len = code_len - code_prologue + 1;
}
for (i = 0; i < code_len; i++, ip++) {
-@@ -118,7 +116,7 @@ void show_registers(struct pt_regs *regs
+@@ -119,7 +118,7 @@ void show_registers(struct pt_regs *regs
printk(" Bad EIP value.");
break;
}
printk("<%02x> ", c);
else
printk("%02x ", c);
-@@ -131,6 +129,7 @@ int is_valid_bugaddr(unsigned long ip)
+@@ -132,6 +131,7 @@ int is_valid_bugaddr(unsigned long ip)
{
unsigned short ud2;
if (ip < PAGE_OFFSET)
return 0;
if (probe_kernel_address((unsigned short *)ip, ud2))
-diff -urNp linux-2.6.38.4/arch/x86/kernel/dumpstack_64.c linux-2.6.38.4/arch/x86/kernel/dumpstack_64.c
---- linux-2.6.38.4/arch/x86/kernel/dumpstack_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/dumpstack_64.c 2011-04-28 19:34:14.000000000 -0400
-@@ -147,10 +147,10 @@ void dump_trace(struct task_struct *task
+diff -urNp linux-2.6.39/arch/x86/kernel/dumpstack_64.c linux-2.6.39/arch/x86/kernel/dumpstack_64.c
+--- linux-2.6.39/arch/x86/kernel/dumpstack_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/dumpstack_64.c 2011-05-22 19:36:30.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);
unsigned used = 0;
- struct thread_info *tinfo;
int graph = 0;
unsigned long dummy;
- unsigned long bp;
+ void *stack_start;
if (!task)
put_cpu();
}
EXPORT_SYMBOL(dump_trace);
-diff -urNp linux-2.6.38.4/arch/x86/kernel/dumpstack.c linux-2.6.38.4/arch/x86/kernel/dumpstack.c
---- linux-2.6.38.4/arch/x86/kernel/dumpstack.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/dumpstack.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/dumpstack.c linux-2.6.39/arch/x86/kernel/dumpstack.c
+--- linux-2.6.39/arch/x86/kernel/dumpstack.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/dumpstack.c 2011-05-22 19:41:32.000000000 -0400
@@ -2,6 +2,9 @@
* Copyright (C) 1991, 1992 Linus Torvalds
* Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
#include <linux/kallsyms.h>
#include <linux/kprobes.h>
#include <linux/uaccess.h>
-@@ -27,7 +30,7 @@ static int die_counter;
-
- void printk_address(unsigned long address, int reliable)
- {
-- printk(" [<%p>] %s%pS\n", (void *) address,
-+ printk(" [<%p>] %s%pA\n", (void *) address,
- reliable ? "" : "? ", (void *) address);
- }
-
@@ -35,9 +38,8 @@ void printk_address(unsigned long addres
static void
print_ftrace_graph_addr(unsigned long addr, void *data,
}
return (unsigned long)frame;
-@@ -200,7 +200,7 @@ void dump_stack(void)
- unsigned long stack;
+@@ -202,7 +202,7 @@ void dump_stack(void)
+ bp = stack_frame(current, NULL);
printk("Pid: %d, comm: %.20s %s %s %.*s\n",
- current->pid, current->comm, print_tainted(),
+ task_pid_nr(current), current->comm, print_tainted(),
init_utsname()->release,
(int)strcspn(init_utsname()->version, " "),
init_utsname()->version);
-@@ -236,6 +236,8 @@ unsigned __kprobes long oops_begin(void)
+@@ -238,6 +238,8 @@ unsigned __kprobes long oops_begin(void)
}
EXPORT_SYMBOL_GPL(oops_begin);
void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
{
if (regs && kexec_should_crash(current))
-@@ -257,7 +259,10 @@ void __kprobes oops_end(unsigned long fl
+@@ -259,7 +261,10 @@ void __kprobes oops_end(unsigned long fl
panic("Fatal exception in interrupt");
if (panic_on_oops)
panic("Fatal exception");
}
int __kprobes __die(const char *str, struct pt_regs *regs, long err)
-@@ -284,7 +289,7 @@ int __kprobes __die(const char *str, str
+@@ -286,7 +291,7 @@ int __kprobes __die(const char *str, str
show_registers(regs);
#ifdef CONFIG_X86_32
sp = regs->sp;
ss = regs->ss & 0xffff;
} else {
-@@ -312,7 +317,7 @@ void die(const char *str, struct pt_regs
+@@ -314,7 +319,7 @@ void die(const char *str, struct pt_regs
unsigned long flags = oops_begin();
int sig = SIGSEGV;
report_bug(regs->ip, regs);
if (__die(str, regs, err))
-diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/kernel/entry_32.S
---- linux-2.6.38.4/arch/x86/kernel/entry_32.S 2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/entry_32.S 2011-04-30 11:45:06.000000000 -0400
-@@ -183,13 +183,130 @@
+diff -urNp linux-2.6.39/arch/x86/kernel/early_printk.c linux-2.6.39/arch/x86/kernel/early_printk.c
+--- linux-2.6.39/arch/x86/kernel/early_printk.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/early_printk.c 2011-05-22 19:36:30.000000000 -0400
+@@ -7,6 +7,7 @@
+ #include <linux/pci_regs.h>
+ #include <linux/pci_ids.h>
+ #include <linux/errno.h>
++#include <linux/sched.h>
+ #include <asm/io.h>
+ #include <asm/processor.h>
+ #include <asm/fcntl.h>
+@@ -179,6 +180,8 @@ asmlinkage void early_printk(const char
+ int n;
+ va_list ap;
+
++ pax_track_stack();
++
+ va_start(ap, fmt);
+ n = vscnprintf(buf, sizeof(buf), fmt, ap);
+ early_console->write(early_console, buf, n);
+diff -urNp linux-2.6.39/arch/x86/kernel/entry_32.S linux-2.6.39/arch/x86/kernel/entry_32.S
+--- linux-2.6.39/arch/x86/kernel/entry_32.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/entry_32.S 2011-05-23 17:07:00.000000000 -0400
+@@ -185,13 +185,146 @@
/*CFI_REL_OFFSET gs, PT_GS*/
.endm
.macro SET_KERNEL_GS reg
+#ifdef CONFIG_PAX_KERNEXEC
+ENTRY(pax_enter_kernel)
+#ifdef CONFIG_PARAVIRT
-+ push %eax; push %ecx
++ pushl %eax
++ pushl %ecx
+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
+ mov %eax, %esi
+#else
+#endif
+3:
+#ifdef CONFIG_PARAVIRT
-+ pop %ecx; pop %eax
++ popl %ecx
++ popl %eax
+#endif
+ ret
+ENDPROC(pax_enter_kernel)
+
+ENTRY(pax_exit_kernel)
+#ifdef CONFIG_PARAVIRT
-+ push %eax; push %ecx
++ pushl %eax
++ pushl %ecx
+#endif
+ mov %cs, %esi
+ cmp $__KERNEXEC_KERNEL_CS, %esi
+#endif
+2:
+#ifdef CONFIG_PARAVIRT
-+ pop %ecx; pop %eax
++ popl %ecx
++ popl %eax
+#endif
+ ret
+ENDPROC(pax_exit_kernel)
+.endm
+
+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
++/*
++ * ebp: thread_info
++ * ecx, edx: can be clobbered
++ */
+ENTRY(pax_erase_kstack)
-+ push %edi
++ pushl %edi
++ pushl %eax
+
-+ mov %esp, %edi
++ mov TI_lowest_stack(%ebp), %edi
+ mov $-0xBEEF, %eax
+ std
-+1:
-+ mov %edi, %ecx
++
++1: mov %edi, %ecx
+ and $THREAD_SIZE_asm - 1, %ecx
+ shr $2, %ecx
+ repne scasl
+ jecxz 2f
-+ sub $16, %ecx
++
++ cmp $2*16, %ecx
+ jc 2f
-+ mov $16, %ecx
++
++ mov $2*16, %ecx
+ repe scasl
+ jecxz 2f
+ jne 1b
-+2:
-+ cld
++
++2: cld
+ mov %esp, %ecx
+ sub %edi, %ecx
+ shr $2, %ecx
+ rep stosl
+
-+ pop %edi
++ mov TI_task_thread_sp0(%ebp), %edi
++ sub $128, %edi
++ mov %edi, TI_lowest_stack(%ebp)
++
++ popl %eax
++ popl %edi
+ ret
+ENDPROC(pax_erase_kstack)
+#endif
cld
PUSH_GS
pushl_cfi %fs
-@@ -212,7 +329,7 @@
+@@ -214,7 +347,7 @@
CFI_REL_OFFSET ecx, 0
pushl_cfi %ebx
CFI_REL_OFFSET ebx, 0
movl %edx, %ds
movl %edx, %es
movl $(__KERNEL_PERCPU), %edx
-@@ -220,6 +337,15 @@
+@@ -222,6 +355,15 @@
SET_KERNEL_GS %edx
.endm
.macro RESTORE_INT_REGS
popl_cfi %ebx
CFI_RESTORE ebx
-@@ -330,7 +456,15 @@ check_userspace:
+@@ -332,7 +474,15 @@ check_userspace:
movb PT_CS(%esp), %al
andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax
cmpl $USER_RPL, %eax
ENTRY(resume_userspace)
LOCKDEP_SYS_EXIT
-@@ -392,23 +526,34 @@ sysenter_past_esp:
+@@ -344,7 +494,7 @@ ENTRY(resume_userspace)
+ andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
+ # int/exception return?
+ jne work_pending
+- jmp restore_all
++ jmp restore_all_pax
+ END(ret_from_exception)
+
+ #ifdef CONFIG_PREEMPT
+@@ -394,23 +544,34 @@ sysenter_past_esp:
/*CFI_REL_OFFSET cs, 0*/
/*
* Push current_thread_info()->sysenter_return to the stack.
- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
- * pushed above; +8 corresponds to copy_thread's esp0 setting.
*/
-- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE_asm+8+4*4)(%esp)
+- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
+ pushl_cfi $0
CFI_REL_OFFSET eip, 0
movl %ebp,PT_EBP(%esp)
.section __ex_table,"a"
.align 4
-@@ -431,12 +576,27 @@ sysenter_do_call:
+@@ -433,12 +594,23 @@ sysenter_do_call:
testl $_TIF_ALLWORK_MASK, %ecx
jne sysexit_audit
sysenter_exit:
+ popl_cfi %eax
+#endif
+
-+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
-+ pushl_cfi %eax
-+ call pax_erase_kstack
-+ popl_cfi %eax
-+#endif
++ pax_erase_kstack
+
/* if something modifies registers it must also disable sysexit */
movl PT_EIP(%esp), %edx
PTGS_TO_GS
ENABLE_INTERRUPTS_SYSEXIT
-@@ -479,11 +639,17 @@ sysexit_audit:
+@@ -455,6 +627,9 @@ sysenter_audit:
+ movl %eax,%edx /* 2nd arg: syscall number */
+ movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
+ call audit_syscall_entry
++
++ pax_erase_kstack
++
+ pushl_cfi %ebx
+ movl PT_EAX(%esp),%eax /* reload syscall number */
+ jmp sysenter_do_call
+@@ -481,11 +656,17 @@ sysexit_audit:
CFI_ENDPROC
.pushsection .fixup,"ax"
.popsection
PTGS_TO_GS_EX
ENDPROC(ia32_sysenter_target)
-@@ -516,6 +682,14 @@ syscall_exit:
+@@ -518,6 +699,14 @@ syscall_exit:
testl $_TIF_ALLWORK_MASK, %ecx # current->work
jne syscall_exit_work
++restore_all_pax:
++
+#ifdef CONFIG_PAX_RANDKSTACK
+ call pax_randomize_kstack
+#endif
+
-+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
+ pax_erase_kstack
-+#endif
+
restore_all:
TRACE_IRQS_IRET
restore_all_notrace:
-@@ -575,14 +749,21 @@ ldt_ss:
+@@ -577,14 +766,21 @@ ldt_ss:
* compensating for the offset by changing to the ESPFIX segment with
* a base address that matches for the difference.
*/
pushl_cfi $__ESPFIX_SS
pushl_cfi %eax /* new kernel esp */
/* Disable interrupts, but do not irqtrace this section: we
-@@ -617,23 +798,17 @@ work_resched:
+@@ -613,29 +809,23 @@ work_resched:
+ movl TI_flags(%ebp), %ecx
+ andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
+ # than syscall tracing?
+- jz restore_all
++ jz restore_all_pax
+ testb $_TIF_NEED_RESCHED, %cl
+ jnz work_resched
work_notifysig: # deal with pending signals and
# notify-resume requests
#endif
xorl %edx, %edx
call do_notify_resume
-@@ -668,6 +843,10 @@ END(syscall_exit_work)
+@@ -648,6 +838,9 @@ syscall_trace_entry:
+ movl $-ENOSYS,PT_EAX(%esp)
+ movl %esp, %eax
+ call syscall_trace_enter
++
++ pax_erase_kstack
++
+ /* What it returned is what we'll actually use. */
+ cmpl $(nr_syscalls), %eax
+ jnae syscall_call
+@@ -670,6 +863,10 @@ END(syscall_exit_work)
RING0_INT_FRAME # can't unwind into user space anyway
syscall_fault:
GET_THREAD_INFO(%ebp)
movl $-EFAULT,PT_EAX(%esp)
jmp resume_userspace
-@@ -750,6 +929,36 @@ ptregs_clone:
+@@ -752,6 +949,36 @@ ptregs_clone:
CFI_ENDPROC
ENDPROC(ptregs_clone)
.macro FIXUP_ESPFIX_STACK
/*
* Switch back for ESPFIX stack to the normal zerobased stack
-@@ -759,8 +968,15 @@ ENDPROC(ptregs_clone)
+@@ -761,8 +988,15 @@ ENDPROC(ptregs_clone)
* normal stack and adjusts ESP with the matching offset.
*/
/* fixup the stack */
shl $16, %eax
addl %esp, %eax /* the adjusted stack pointer */
pushl_cfi $__KERNEL_DS
-@@ -1211,7 +1427,6 @@ return_to_handler:
+@@ -1213,7 +1447,6 @@ return_to_handler:
jmp *%ecx
#endif
#include "syscall_table_32.S"
syscall_table_size=(.-sys_call_table)
-@@ -1257,9 +1472,12 @@ error_code:
+@@ -1259,9 +1492,12 @@ error_code:
movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
REG_TO_PTGS %ecx
SET_KERNEL_GS %ecx
TRACE_IRQS_OFF
movl %esp,%eax # pt_regs pointer
call *%edi
-@@ -1344,6 +1562,9 @@ nmi_stack_correct:
+@@ -1346,6 +1582,9 @@ nmi_stack_correct:
xorl %edx,%edx # zero error code
movl %esp,%eax # pt_regs pointer
call do_nmi
jmp restore_all_notrace
CFI_ENDPROC
-@@ -1380,6 +1601,9 @@ nmi_espfix_stack:
+@@ -1382,6 +1621,9 @@ nmi_espfix_stack:
FIXUP_ESPFIX_STACK # %eax == %esp
xorl %edx,%edx # zero error code
call do_nmi
RESTORE_REGS
lss 12+4(%esp), %esp # back to espfix stack
CFI_ADJUST_CFA_OFFSET -24
-diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/kernel/entry_64.S
---- linux-2.6.38.4/arch/x86/kernel/entry_64.S 2011-04-18 17:27:13.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/entry_64.S 2011-04-30 11:45:06.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/entry_64.S linux-2.6.39/arch/x86/kernel/entry_64.S
+--- linux-2.6.39/arch/x86/kernel/entry_64.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/entry_64.S 2011-05-23 17:10:49.000000000 -0400
@@ -53,6 +53,7 @@
#include <asm/paravirt.h>
#include <asm/ftrace.h>
/* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
#include <linux/elf-em.h>
-@@ -174,6 +175,242 @@ ENTRY(native_usergs_sysret64)
+@@ -176,6 +177,259 @@ ENTRY(native_usergs_sysret64)
ENDPROC(native_usergs_sysret64)
#endif /* CONFIG_PARAVIRT */
+ 1234: .quad \off; .word \sel
+ .popsection
+#else
-+ push $\sel
-+ push $\off
++ pushq $\sel
++ pushq $\off
+ lretq
+#endif
+ .endm
+
+#ifdef CONFIG_PAX_KERNEXEC
+ENTRY(pax_enter_kernel)
-+ push %rdi
++ pushq %rdi
+
+#ifdef CONFIG_PARAVIRT
+ PV_SAVE_REGS(CLBR_RDI)
+ PV_RESTORE_REGS(CLBR_RDI)
+#endif
+
-+ pop %rdi
++ popq %rdi
+ retq
+ENDPROC(pax_enter_kernel)
+
+ENTRY(pax_exit_kernel)
-+ push %rdi
++ pushq %rdi
+
+#ifdef CONFIG_PARAVIRT
+ PV_SAVE_REGS(CLBR_RDI)
+ PV_RESTORE_REGS(CLBR_RDI);
+#endif
+
-+ pop %rdi
++ popq %rdi
+ retq
+ENDPROC(pax_exit_kernel)
+#endif
+ pop %rax
+#endif
+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
-+ push %rax
+ call pax_erase_kstack
-+ pop %rax
+#endif
+ .endm
+
-+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
-+ENTRY(pax_erase_kstack)
-+ push %rdi
-+
-+ mov %rsp, %rdi
-+ mov $-0xBEEF, %rax
-+ std
-+1:
-+ mov %rdi, %rcx
-+ and $THREAD_SIZE_asm - 1, %rcx
-+ shr $3, %rcx
-+ repne scasq
-+ jecxz 2f
-+ sub $8, %rcx
-+ jc 2f
-+ mov $8, %rcx
-+ repe scasq
-+ jecxz 2f
-+ jne 1b
-+2:
-+ cld
-+ mov %rsp, %rcx
-+ sub %rdi, %rcx
-+ shr $3, %rcx
-+ rep stosq
-+
-+ pop %rdi
-+ ret
-+ENDPROC(pax_erase_kstack)
-+#endif
-+
+#ifdef CONFIG_PAX_MEMORY_UDEREF
+ENTRY(pax_enter_kernel_user)
-+ push %rdi
-+ push %rbx
++ pushq %rdi
++ pushq %rbx
+
+#ifdef CONFIG_PARAVIRT
+ PV_SAVE_REGS(CLBR_RDI)
+ sub phys_base(%rip),%rbx
+
+#ifdef CONFIG_PARAVIRT
-+ push %rdi
++ pushq %rdi
+ cmpl $0, pv_info+PARAVIRT_enabled
+ jz 1f
+ i = 0
+ .endr
+
+#ifdef CONFIG_PARAVIRT
-+2: pop %rdi
++2: popq %rdi
+#endif
+ SET_RDI_INTO_CR3
+
+ PV_RESTORE_REGS(CLBR_RDI)
+#endif
+
-+ pop %rbx
-+ pop %rdi
++ popq %rbx
++ popq %rdi
+ retq
+ENDPROC(pax_enter_kernel_user)
+
+ push %rdi
+
+#ifdef CONFIG_PARAVIRT
-+ push %rbx
++ pushq %rbx
+ PV_SAVE_REGS(CLBR_RDI)
+#endif
+
+
+#ifdef CONFIG_PARAVIRT
+2: PV_RESTORE_REGS(CLBR_RDI)
-+ pop %rbx
++ popq %rbx
+#endif
+
-+ pop %rdi
++ popq %rdi
+ retq
+ENDPROC(pax_exit_kernel_user)
++#endif
++
++ .macro pax_erase_kstack
++#ifdef CONFIG_PAX_MEMORY_STACKLEAK
++ call pax_erase_kstack
++#endif
++ .endm
++
++#ifdef CONFIG_PAX_MEMORY_STACKLEAK
++/*
++ * r10: thread_info
++ * rcx, rdx: can be clobbered
++ */
++ENTRY(pax_erase_kstack)
++ pushq %rdi
++ pushq %rax
++
++ GET_THREAD_INFO(%r10)
++ mov TI_lowest_stack(%r10), %rdi
++ mov $-0xBEEF, %rax
++ std
++
++1: mov %edi, %ecx
++ and $THREAD_SIZE_asm - 1, %ecx
++ shr $3, %ecx
++ repne scasq
++ jecxz 2f
++
++ cmp $2*8, %ecx
++ jc 2f
++
++ mov $2*8, %ecx
++ repe scasq
++ jecxz 2f
++ jne 1b
++
++2: cld
++ mov %esp, %ecx
++ sub %edi, %ecx
++ shr $3, %ecx
++ rep stosq
++
++ mov TI_task_thread_sp0(%r10), %rdi
++ sub $256, %rdi
++ mov %rdi, TI_lowest_stack(%r10)
++
++ popq %rax
++ popq %rdi
++ ret
++ENDPROC(pax_erase_kstack)
+#endif
.macro TRACE_IRQS_IRETQ offset=ARGOFFSET
#ifdef CONFIG_TRACE_IRQFLAGS
-@@ -316,7 +553,7 @@ ENTRY(save_args)
+@@ -318,7 +572,7 @@ ENTRY(save_args)
leaq -RBP+8(%rsp),%rdi /* arg1 for handler */
movq_cfi rbp, 8 /* push %rbp */
leaq 8(%rsp), %rbp /* mov %rsp, %ebp */
je 1f
SWAPGS
/*
-@@ -407,7 +644,7 @@ ENTRY(ret_from_fork)
+@@ -409,7 +663,7 @@ ENTRY(ret_from_fork)
RESTORE_REST
je int_ret_from_sys_call
testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
-@@ -453,7 +690,7 @@ END(ret_from_fork)
+@@ -455,7 +709,7 @@ END(ret_from_fork)
ENTRY(system_call)
CFI_STARTPROC simple
CFI_SIGNAL_FRAME
CFI_REGISTER rip,rcx
/*CFI_REGISTER rflags,r11*/
SWAPGS_UNSAFE_STACK
-@@ -466,12 +703,13 @@ ENTRY(system_call_after_swapgs)
+@@ -468,12 +722,13 @@ ENTRY(system_call_after_swapgs)
movq %rsp,PER_CPU_VAR(old_rsp)
movq PER_CPU_VAR(kernel_stack),%rsp
movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
movq %rcx,RIP-ARGOFFSET(%rsp)
CFI_REL_OFFSET rip,RIP-ARGOFFSET
-@@ -500,6 +738,7 @@ sysret_check:
+@@ -502,6 +757,7 @@ sysret_check:
andl %edi,%edx
jnz sysret_careful
CFI_REMEMBER_STATE
/*
* sysretq will re-enable interrupts:
*/
-@@ -609,7 +848,7 @@ tracesys:
+@@ -560,6 +816,9 @@ auditsys:
+ movq %rax,%rsi /* 2nd arg: syscall number */
+ movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
+ call audit_syscall_entry
++
++ pax_erase_kstack
++
+ LOAD_ARGS 0 /* reload call-clobbered registers */
+ jmp system_call_fastpath
+
+@@ -590,6 +849,9 @@ tracesys:
+ FIXUP_TOP_OF_STACK %rdi
+ movq %rsp,%rdi
+ call syscall_trace_enter
++
++ pax_erase_kstack
++
+ /*
+ * Reload arg registers from stack in case ptrace changed them.
+ * We don't reload %rax because syscall_trace_enter() returned
+@@ -611,7 +873,7 @@ tracesys:
GLOBAL(int_ret_from_sys_call)
DISABLE_INTERRUPTS(CLBR_NONE)
TRACE_IRQS_OFF
je retint_restore_args
movl $_TIF_ALLWORK_MASK,%edi
/* edi: mask to check */
-@@ -791,6 +1030,16 @@ END(interrupt)
+@@ -793,6 +1055,16 @@ END(interrupt)
CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
call save_args
PARTIAL_FRAME 0
call \func
.endm
-@@ -823,7 +1072,7 @@ ret_from_intr:
+@@ -825,7 +1097,7 @@ ret_from_intr:
CFI_ADJUST_CFA_OFFSET -8
exit_intr:
GET_THREAD_INFO(%rcx)
je retint_kernel
/* Interrupt came from user space */
-@@ -845,12 +1094,14 @@ retint_swapgs: /* return to user-space
+@@ -847,12 +1119,14 @@ retint_swapgs: /* return to user-space
* The iretq could re-enable interrupts:
*/
DISABLE_INTERRUPTS(CLBR_ANY)
/*
* The iretq could re-enable interrupts:
*/
-@@ -1022,6 +1273,16 @@ ENTRY(\sym)
+@@ -1027,6 +1301,16 @@ ENTRY(\sym)
CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call error_entry
DEFAULT_FRAME 0
movq %rsp,%rdi /* pt_regs pointer */
xorl %esi,%esi /* no error code */
call \do_sym
-@@ -1039,6 +1300,16 @@ ENTRY(\sym)
+@@ -1044,6 +1328,16 @@ ENTRY(\sym)
CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call save_paranoid
TRACE_IRQS_OFF
movq %rsp,%rdi /* pt_regs pointer */
xorl %esi,%esi /* no error code */
call \do_sym
-@@ -1047,7 +1318,7 @@ ENTRY(\sym)
+@@ -1052,7 +1346,7 @@ ENTRY(\sym)
END(\sym)
.endm
.macro paranoidzeroentry_ist sym do_sym ist
ENTRY(\sym)
INTR_FRAME
-@@ -1057,8 +1328,24 @@ ENTRY(\sym)
+@@ -1062,8 +1356,24 @@ ENTRY(\sym)
CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call save_paranoid
TRACE_IRQS_OFF
subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
call \do_sym
addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
-@@ -1075,6 +1362,16 @@ ENTRY(\sym)
+@@ -1080,6 +1390,16 @@ ENTRY(\sym)
CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call error_entry
DEFAULT_FRAME 0
movq %rsp,%rdi /* pt_regs pointer */
movq ORIG_RAX(%rsp),%rsi /* get error code */
movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
-@@ -1094,6 +1391,16 @@ ENTRY(\sym)
+@@ -1099,6 +1419,16 @@ ENTRY(\sym)
call save_paranoid
DEFAULT_FRAME 0
TRACE_IRQS_OFF
movq %rsp,%rdi /* pt_regs pointer */
movq ORIG_RAX(%rsp),%rsi /* get error code */
movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
-@@ -1356,14 +1663,27 @@ ENTRY(paranoid_exit)
+@@ -1361,14 +1691,27 @@ ENTRY(paranoid_exit)
TRACE_IRQS_OFF
testl %ebx,%ebx /* swapgs needed? */
jnz paranoid_restore
TRACE_IRQS_IRETQ 0
RESTORE_ALL 8
jmp irq_return
-@@ -1421,7 +1741,7 @@ ENTRY(error_entry)
+@@ -1426,7 +1769,7 @@ ENTRY(error_entry)
movq_cfi r14, R14+8
movq_cfi r15, R15+8
xorl %ebx,%ebx
je error_kernelspace
error_swapgs:
SWAPGS
-@@ -1485,6 +1805,16 @@ ENTRY(nmi)
+@@ -1490,6 +1833,16 @@ ENTRY(nmi)
CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call save_paranoid
DEFAULT_FRAME 0
/* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
movq %rsp,%rdi
movq $-1,%rsi
-@@ -1495,11 +1825,25 @@ ENTRY(nmi)
+@@ -1500,11 +1853,25 @@ ENTRY(nmi)
DISABLE_INTERRUPTS(CLBR_NONE)
testl %ebx,%ebx /* swapgs needed? */
jnz nmi_restore
RESTORE_ALL 8
jmp irq_return
nmi_userspace:
-diff -urNp linux-2.6.38.4/arch/x86/kernel/ftrace.c linux-2.6.38.4/arch/x86/kernel/ftrace.c
---- linux-2.6.38.4/arch/x86/kernel/ftrace.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/ftrace.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/ftrace.c linux-2.6.39/arch/x86/kernel/ftrace.c
+--- linux-2.6.39/arch/x86/kernel/ftrace.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/ftrace.c 2011-05-22 19:36:30.000000000 -0400
@@ -126,7 +126,7 @@ static void *mod_code_ip; /* holds the
static void *mod_code_newcode; /* holds the text to write to the IP */
if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
return -EFAULT;
-diff -urNp linux-2.6.38.4/arch/x86/kernel/head32.c linux-2.6.38.4/arch/x86/kernel/head32.c
---- linux-2.6.38.4/arch/x86/kernel/head32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/head32.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/head32.c linux-2.6.39/arch/x86/kernel/head32.c
+--- linux-2.6.39/arch/x86/kernel/head32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/head32.c 2011-05-22 19:36:30.000000000 -0400
@@ -19,6 +19,7 @@
#include <asm/io_apic.h>
#include <asm/bios_ebda.h>
static void __init i386_default_early_setup(void)
{
-@@ -43,7 +44,7 @@ void __init i386_start_kernel(void)
- memblock_x86_reserve_range(PAGE_SIZE, PAGE_SIZE + PAGE_SIZE, "EX TRAMPOLINE");
- #endif
+@@ -34,7 +35,7 @@ void __init i386_start_kernel(void)
+ {
+ memblock_init();
- memblock_x86_reserve_range(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
+ memblock_x86_reserve_range(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop), "TEXT DATA BSS");
#ifdef CONFIG_BLK_DEV_INITRD
/* Reserve INITRD */
-diff -urNp linux-2.6.38.4/arch/x86/kernel/head_32.S linux-2.6.38.4/arch/x86/kernel/head_32.S
---- linux-2.6.38.4/arch/x86/kernel/head_32.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/head_32.S 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/head_32.S linux-2.6.39/arch/x86/kernel/head_32.S
+--- linux-2.6.39/arch/x86/kernel/head_32.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/head_32.S 2011-05-22 19:36:30.000000000 -0400
@@ -25,6 +25,12 @@
/* Physical address */
#define pa(X) ((X) - __PAGE_OFFSET)
- .long lguest_entry /* lguest hypervisor */
- .long xen_entry /* Xen hypervisor */
- .long default_entry /* Moorestown MID */
-+ .long pa(default_entry) /* normal x86/PC */
-+ .long pa(lguest_entry) /* lguest hypervisor */
-+ .long pa(xen_entry) /* Xen hypervisor */
-+ .long pa(default_entry) /* Moorestown MID */
++ .long ta(default_entry) /* normal x86/PC */
++ .long ta(lguest_entry) /* lguest hypervisor */
++ .long ta(xen_entry) /* Xen hypervisor */
++ .long ta(default_entry) /* Moorestown MID */
num_subarch_entries = (. - subarch_entries) / 4
.previous
#else
* BSS section
*/
-__PAGE_ALIGNED_BSS
-- .align PAGE_SIZE_asm
+- .align PAGE_SIZE
#ifdef CONFIG_X86_PAE
+.section .initial_pg_pmd,"a",@progbits
initial_pg_pmd:
#ifdef CONFIG_X86_PAE
-__PAGE_ALIGNED_DATA
- /* Page-aligned for the benefit of paravirt? */
-- .align PAGE_SIZE_asm
+- .align PAGE_SIZE
+.section .initial_page_table,"a",@progbits
ENTRY(initial_page_table)
.long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
@@ -663,18 +758,27 @@ ENTRY(initial_page_table)
# error "Kernel PMDs should be 1, 2 or 3"
# endif
- .align PAGE_SIZE_asm /* needs to be page-sized too */
+ .align PAGE_SIZE /* needs to be page-sized too */
+
+#ifdef CONFIG_PAX_PER_CPU_PGD
+ENTRY(cpu_pgd)
+ /* 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.38.4/arch/x86/kernel/head_64.S linux-2.6.38.4/arch/x86/kernel/head_64.S
---- linux-2.6.38.4/arch/x86/kernel/head_64.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/head_64.S 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/head_64.S linux-2.6.39/arch/x86/kernel/head_64.S
+--- linux-2.6.39/arch/x86/kernel/head_64.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/head_64.S 2011-05-22 19:36:30.000000000 -0400
@@ -19,6 +19,7 @@
#include <asm/cache.h>
#include <asm/processor-flags.h>
/*
* Fixup the kernel text+data virtual addresses. Note that
-@@ -161,8 +153,8 @@ ENTRY(secondary_startup_64)
+@@ -160,8 +152,8 @@ ENTRY(secondary_startup_64)
* after the boot processor executes this code.
*/
movq %rax, %cr4
/* Setup early boot stage 4 level pagetables. */
-@@ -184,9 +176,14 @@ ENTRY(secondary_startup_64)
+@@ -183,9 +175,14 @@ ENTRY(secondary_startup_64)
movl $MSR_EFER, %ecx
rdmsr
btsl $_EFER_SCE, %eax /* Enable System Call */
1: wrmsr /* Make changes effective */
/* Setup cr0 */
-@@ -270,7 +267,7 @@ ENTRY(secondary_startup_64)
+@@ -269,7 +266,7 @@ ENTRY(secondary_startup_64)
bad_address:
jmp bad_address
#ifdef CONFIG_EARLY_PRINTK
.globl early_idt_handlers
early_idt_handlers:
-@@ -315,18 +312,23 @@ ENTRY(early_idt_handler)
+@@ -314,18 +311,23 @@ ENTRY(early_idt_handler)
#endif /* EARLY_PRINTK */
1: hlt
jmp 1b
#define NEXT_PAGE(name) \
.balign PAGE_SIZE; \
ENTRY(name)
-@@ -339,7 +341,6 @@ ENTRY(name)
+@@ -338,7 +340,6 @@ ENTRY(name)
i = i + 1 ; \
.endr
/*
* This default setting generates an ident mapping at address 0x100000
* and a mapping for the kernel that precisely maps virtual address
-@@ -350,13 +351,36 @@ NEXT_PAGE(init_level4_pgt)
+@@ -349,13 +350,36 @@ NEXT_PAGE(init_level4_pgt)
.quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
.org init_level4_pgt + L4_PAGE_OFFSET*8, 0
.quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
NEXT_PAGE(level3_kernel_pgt)
.fill L3_START_KERNEL,8,0
-@@ -364,20 +388,23 @@ NEXT_PAGE(level3_kernel_pgt)
+@@ -363,20 +387,23 @@ NEXT_PAGE(level3_kernel_pgt)
.quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
.quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
NEXT_PAGE(level2_kernel_pgt)
/*
-@@ -390,33 +417,55 @@ NEXT_PAGE(level2_kernel_pgt)
+@@ -389,33 +416,55 @@ NEXT_PAGE(level2_kernel_pgt)
* If you want to increase this then increase MODULES_VADDR
* too.)
*/
__PAGE_ALIGNED_BSS
.align PAGE_SIZE
-diff -urNp linux-2.6.38.4/arch/x86/kernel/i386_ksyms_32.c linux-2.6.38.4/arch/x86/kernel/i386_ksyms_32.c
---- linux-2.6.38.4/arch/x86/kernel/i386_ksyms_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/i386_ksyms_32.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/i386_ksyms_32.c linux-2.6.39/arch/x86/kernel/i386_ksyms_32.c
+--- linux-2.6.39/arch/x86/kernel/i386_ksyms_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/i386_ksyms_32.c 2011-05-22 19:36:30.000000000 -0400
@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
EXPORT_SYMBOL(cmpxchg8b_emu);
#endif
+#ifdef CONFIG_PAX_KERNEXEC
+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
+#endif
-diff -urNp linux-2.6.38.4/arch/x86/kernel/i8259.c linux-2.6.38.4/arch/x86/kernel/i8259.c
---- linux-2.6.38.4/arch/x86/kernel/i8259.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/i8259.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/i8259.c linux-2.6.39/arch/x86/kernel/i8259.c
+--- linux-2.6.39/arch/x86/kernel/i8259.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/i8259.c 2011-05-22 19:36:30.000000000 -0400
@@ -210,7 +210,7 @@ spurious_8259A_irq:
"spurious 8259A interrupt: IRQ%d.\n", irq);
spurious_irq_mask |= irqmask;
/*
* Theoretically we do not have to handle this IRQ,
* but in Linux this does not cause problems and is
-diff -urNp linux-2.6.38.4/arch/x86/kernel/init_task.c linux-2.6.38.4/arch/x86/kernel/init_task.c
---- linux-2.6.38.4/arch/x86/kernel/init_task.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/init_task.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/init_task.c linux-2.6.39/arch/x86/kernel/init_task.c
+--- linux-2.6.39/arch/x86/kernel/init_task.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/init_task.c 2011-05-22 19:36:30.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..
-
+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.38.4/arch/x86/kernel/ioport.c linux-2.6.38.4/arch/x86/kernel/ioport.c
---- linux-2.6.38.4/arch/x86/kernel/ioport.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/ioport.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/ioport.c linux-2.6.39/arch/x86/kernel/ioport.c
+--- linux-2.6.39/arch/x86/kernel/ioport.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/ioport.c 2011-05-22 19:41:32.000000000 -0400
@@ -6,6 +6,7 @@
#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/types.h>
#include <linux/ioport.h>
-@@ -41,6 +42,12 @@ asmlinkage long sys_ioperm(unsigned long
+@@ -28,6 +29,12 @@ asmlinkage long sys_ioperm(unsigned long
if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
return -EINVAL;
if (turn_on && !capable(CAP_SYS_RAWIO))
return -EPERM;
-@@ -67,7 +74,7 @@ asmlinkage long sys_ioperm(unsigned long
+@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long
* because the ->io_bitmap_max value must match the bitmap
* contents:
*/
- tss = &per_cpu(init_tss, get_cpu());
+ tss = init_tss + get_cpu();
- set_bitmap(t->io_bitmap_ptr, from, num, !turn_on);
-
-@@ -112,6 +119,12 @@ long sys_iopl(unsigned int level, struct
+ if (turn_on)
+ bitmap_clear(t->io_bitmap_ptr, from, num);
+@@ -102,6 +109,12 @@ long sys_iopl(unsigned int level, struct
return -EINVAL;
/* Trying to gain more privileges? */
if (level > old) {
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
}
-diff -urNp linux-2.6.38.4/arch/x86/kernel/irq_32.c linux-2.6.38.4/arch/x86/kernel/irq_32.c
---- linux-2.6.38.4/arch/x86/kernel/irq_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/irq_32.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/irq_32.c linux-2.6.39/arch/x86/kernel/irq_32.c
+--- linux-2.6.39/arch/x86/kernel/irq_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/irq_32.c 2011-05-22 19:36:30.000000000 -0400
@@ -36,7 +36,7 @@ static int check_stack_overflow(void)
__asm__ __volatile__("andl %%esp,%0" :
"=r" (sp) : "0" (THREAD_SIZE - 1));
+#endif
+
/*
- * Shouldnt happen, we returned above if in_interrupt():
+ * Shouldn't happen, we returned above if in_interrupt():
*/
-diff -urNp linux-2.6.38.4/arch/x86/kernel/irq.c linux-2.6.38.4/arch/x86/kernel/irq.c
---- linux-2.6.38.4/arch/x86/kernel/irq.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/irq.c 2011-04-28 19:57:25.000000000 -0400
-@@ -16,7 +16,7 @@
+diff -urNp linux-2.6.39/arch/x86/kernel/irq.c linux-2.6.39/arch/x86/kernel/irq.c
+--- linux-2.6.39/arch/x86/kernel/irq.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/irq.c 2011-05-22 19:36:30.000000000 -0400
+@@ -17,7 +17,7 @@
#include <asm/mce.h>
#include <asm/hw_irq.h>
/* Function pointer for generic interrupt vector handling */
void (*x86_platform_ipi_callback)(void) = NULL;
-@@ -115,9 +115,9 @@ static int show_other_interrupts(struct
+@@ -116,9 +116,9 @@ int arch_show_interrupts(struct seq_file
seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
seq_printf(p, " Machine check polls\n");
#endif
#endif
return 0;
}
-@@ -210,10 +210,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
+@@ -158,10 +158,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
u64 arch_irq_stat(void)
{
#endif
return sum;
}
-diff -urNp linux-2.6.38.4/arch/x86/kernel/kgdb.c linux-2.6.38.4/arch/x86/kernel/kgdb.c
---- linux-2.6.38.4/arch/x86/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/kgdb.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/kgdb.c linux-2.6.39/arch/x86/kernel/kgdb.c
+--- linux-2.6.39/arch/x86/kernel/kgdb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/kgdb.c 2011-05-22 19:36:30.000000000 -0400
@@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem,
- switch (regno) {
#ifdef CONFIG_X86_32
+ switch (regno) {
case GDB_SS:
- if (!user_mode_vm(regs))
+ if (!user_mode(regs))
raw_smp_processor_id());
}
-@@ -543,7 +543,7 @@ static int __kgdb_notify(struct die_args
- break;
+@@ -534,7 +534,7 @@ static int __kgdb_notify(struct die_args
+ return NOTIFY_DONE;
case DIE_DEBUG:
- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
if (user_mode(regs))
return single_step_cont(regs, args);
break;
-@@ -719,7 +719,7 @@ void kgdb_arch_set_pc(struct pt_regs *re
+@@ -710,7 +710,7 @@ void kgdb_arch_set_pc(struct pt_regs *re
regs->ip = ip;
}
/* Breakpoint instruction: */
.gdb_bpt_instr = { 0xcc },
.flags = KGDB_HW_BREAKPOINT,
-diff -urNp linux-2.6.38.4/arch/x86/kernel/kprobes.c linux-2.6.38.4/arch/x86/kernel/kprobes.c
---- linux-2.6.38.4/arch/x86/kernel/kprobes.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/kprobes.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/kprobes.c linux-2.6.39/arch/x86/kernel/kprobes.c
+--- linux-2.6.39/arch/x86/kernel/kprobes.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/kprobes.c 2011-05-22 19:36:30.000000000 -0400
@@ -115,8 +115,11 @@ static void __kprobes __synthesize_relat
} __attribute__((packed)) *insn;
return ret;
switch (val) {
-@@ -1372,7 +1379,7 @@ int __kprobes arch_prepare_optimized_kpr
+@@ -1381,7 +1388,7 @@ int __kprobes arch_prepare_optimized_kpr
* Verify if the address gap is in 2GB range, because this uses
* a relative jump.
*/
if (abs(rel) > 0x7fffffff)
return -ERANGE;
-@@ -1393,11 +1400,11 @@ int __kprobes arch_prepare_optimized_kpr
+@@ -1402,11 +1409,11 @@ int __kprobes arch_prepare_optimized_kpr
synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
/* Set probe function call */
flush_icache_range((unsigned long) buf,
(unsigned long) buf + TMPL_END_IDX +
-@@ -1419,7 +1426,7 @@ static void __kprobes setup_optimize_kpr
+@@ -1428,7 +1435,7 @@ static void __kprobes setup_optimize_kpr
((long)op->kp.addr + RELATIVEJUMP_SIZE));
/* Backup instructions which will be replaced by jump address */
RELATIVE_ADDR_SIZE);
insn_buf[0] = RELATIVEJUMP_OPCODE;
-diff -urNp linux-2.6.38.4/arch/x86/kernel/ldt.c linux-2.6.38.4/arch/x86/kernel/ldt.c
---- linux-2.6.38.4/arch/x86/kernel/ldt.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/ldt.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/ldt.c linux-2.6.39/arch/x86/kernel/ldt.c
+--- linux-2.6.39/arch/x86/kernel/ldt.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/ldt.c 2011-05-22 19:36:30.000000000 -0400
@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i
if (reload) {
#ifdef CONFIG_SMP
fill_ldt(&ldt, &ldt_info);
if (oldmode)
ldt.avl = 0;
-diff -urNp linux-2.6.38.4/arch/x86/kernel/machine_kexec_32.c linux-2.6.38.4/arch/x86/kernel/machine_kexec_32.c
---- linux-2.6.38.4/arch/x86/kernel/machine_kexec_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/machine_kexec_32.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/machine_kexec_32.c linux-2.6.39/arch/x86/kernel/machine_kexec_32.c
+--- linux-2.6.39/arch/x86/kernel/machine_kexec_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/machine_kexec_32.c 2011-05-22 19:36:30.000000000 -0400
@@ -27,7 +27,7 @@
#include <asm/cacheflush.h>
#include <asm/debugreg.h>
relocate_kernel_ptr = control_page;
page_list[PA_CONTROL_PAGE] = __pa(control_page);
-diff -urNp linux-2.6.38.4/arch/x86/kernel/microcode_amd.c linux-2.6.38.4/arch/x86/kernel/microcode_amd.c
---- linux-2.6.38.4/arch/x86/kernel/microcode_amd.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/microcode_amd.c 2011-04-28 19:34:14.000000000 -0400
-@@ -317,7 +317,7 @@ static void microcode_fini_cpu_amd(int c
+diff -urNp linux-2.6.39/arch/x86/kernel/microcode_amd.c linux-2.6.39/arch/x86/kernel/microcode_amd.c
+--- linux-2.6.39/arch/x86/kernel/microcode_amd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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_fw,
+ .request_microcode_fw = request_microcode_amd,
.collect_cpu_info = collect_cpu_info_amd,
-@@ -325,7 +325,7 @@ static struct microcode_ops microcode_am
+@@ -347,7 +347,7 @@ static struct microcode_ops microcode_am
.microcode_fini_cpu = microcode_fini_cpu_amd,
};
{
return µcode_amd_ops;
}
-diff -urNp linux-2.6.38.4/arch/x86/kernel/microcode_core.c linux-2.6.38.4/arch/x86/kernel/microcode_core.c
---- linux-2.6.38.4/arch/x86/kernel/microcode_core.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/microcode_core.c 2011-04-28 19:34:14.000000000 -0400
-@@ -92,7 +92,7 @@ MODULE_LICENSE("GPL");
+diff -urNp linux-2.6.39/arch/x86/kernel/microcode_core.c linux-2.6.39/arch/x86/kernel/microcode_core.c
+--- linux-2.6.39/arch/x86/kernel/microcode_core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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"
/*
* Synchronization.
-diff -urNp linux-2.6.38.4/arch/x86/kernel/microcode_intel.c linux-2.6.38.4/arch/x86/kernel/microcode_intel.c
---- linux-2.6.38.4/arch/x86/kernel/microcode_intel.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/microcode_intel.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/microcode_intel.c linux-2.6.39/arch/x86/kernel/microcode_intel.c
+--- linux-2.6.39/arch/x86/kernel/microcode_intel.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/microcode_intel.c 2011-05-22 19:36:30.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)
{
return µcode_intel_ops;
}
-diff -urNp linux-2.6.38.4/arch/x86/kernel/module.c linux-2.6.38.4/arch/x86/kernel/module.c
---- linux-2.6.38.4/arch/x86/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/module.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/module.c linux-2.6.39/arch/x86/kernel/module.c
+--- linux-2.6.39/arch/x86/kernel/module.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/module.c 2011-05-22 19:36:30.000000000 -0400
@@ -35,21 +35,66 @@
#define DEBUGP(fmt...)
#endif
#if 0
if ((s64)val != *(s32 *)loc)
goto overflow;
-diff -urNp linux-2.6.38.4/arch/x86/kernel/paravirt.c linux-2.6.38.4/arch/x86/kernel/paravirt.c
---- linux-2.6.38.4/arch/x86/kernel/paravirt.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/paravirt.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/paravirt.c linux-2.6.39/arch/x86/kernel/paravirt.c
+--- linux-2.6.39/arch/x86/kernel/paravirt.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/paravirt.c 2011-05-22 19:36:30.000000000 -0400
@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
* corresponding structure. */
static void *get_call_destination(u8 type)
.pv_init_ops = pv_init_ops,
.pv_time_ops = pv_time_ops,
.pv_cpu_ops = pv_cpu_ops,
-@@ -145,14 +145,14 @@ unsigned paravirt_patch_default(u8 type,
+@@ -133,6 +133,9 @@ static void *get_call_destination(u8 typ
+ .pv_lock_ops = pv_lock_ops,
+ #endif
+ };
++
++ pax_track_stack();
++
+ return *((void **)&tmpl + type);
+ }
+
+@@ -145,14 +148,14 @@ 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));
ret = paravirt_patch_ident_64(insnbuf, len);
else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
-@@ -178,7 +178,7 @@ unsigned paravirt_patch_insns(void *insn
+@@ -178,7 +181,7 @@ unsigned paravirt_patch_insns(void *insn
if (insn_len > len || start == NULL)
insn_len = len;
else
return insn_len;
}
-@@ -294,22 +294,22 @@ void arch_flush_lazy_mmu_mode(void)
+@@ -294,22 +297,22 @@ void arch_flush_lazy_mmu_mode(void)
preempt_enable();
}
.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 +321,7 @@ struct pv_irq_ops pv_irq_ops = {
+@@ -321,7 +324,7 @@ struct pv_irq_ops pv_irq_ops = {
#endif
};
.cpuid = native_cpuid,
.get_debugreg = native_get_debugreg,
.set_debugreg = native_set_debugreg,
-@@ -382,7 +382,7 @@ struct pv_cpu_ops pv_cpu_ops = {
+@@ -382,7 +385,7 @@ struct pv_cpu_ops pv_cpu_ops = {
.end_context_switch = paravirt_nop,
};
#ifdef CONFIG_X86_LOCAL_APIC
.startup_ipi_hook = paravirt_nop,
#endif
-@@ -396,7 +396,7 @@ struct pv_apic_ops pv_apic_ops = {
+@@ -396,7 +399,7 @@ struct pv_apic_ops pv_apic_ops = {
#define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
#endif
.read_cr2 = native_read_cr2,
.write_cr2 = native_write_cr2,
-@@ -465,6 +465,12 @@ struct pv_mmu_ops pv_mmu_ops = {
+@@ -465,6 +468,12 @@ struct pv_mmu_ops pv_mmu_ops = {
},
.set_fixmap = native_set_fixmap,
};
EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-2.6.38.4/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.38.4/arch/x86/kernel/paravirt-spinlocks.c
---- linux-2.6.38.4/arch/x86/kernel/paravirt-spinlocks.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/paravirt-spinlocks.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.39/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-2.6.39/arch/x86/kernel/paravirt-spinlocks.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/paravirt-spinlocks.c 2011-05-22 19:36:30.000000000 -0400
@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t
arch_spin_lock(lock);
}
#ifdef CONFIG_SMP
.spin_is_locked = __ticket_spin_is_locked,
.spin_is_contended = __ticket_spin_is_contended,
-diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-calgary_64.c linux-2.6.38.4/arch/x86/kernel/pci-calgary_64.c
---- linux-2.6.38.4/arch/x86/kernel/pci-calgary_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/pci-calgary_64.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/pci-calgary_64.c linux-2.6.39/arch/x86/kernel/pci-calgary_64.c
+--- linux-2.6.39/arch/x86/kernel/pci-calgary_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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));
}
.alloc_coherent = calgary_alloc_coherent,
.free_coherent = calgary_free_coherent,
.map_sg = calgary_map_sg,
-diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-dma.c linux-2.6.38.4/arch/x86/kernel/pci-dma.c
---- linux-2.6.38.4/arch/x86/kernel/pci-dma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/pci-dma.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/pci-dma.c linux-2.6.39/arch/x86/kernel/pci-dma.c
+--- linux-2.6.39/arch/x86/kernel/pci-dma.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/pci-dma.c 2011-05-22 19:36:30.000000000 -0400
@@ -16,7 +16,7 @@
static int forbid_dac __read_mostly;
#ifdef CONFIG_PCI
if (mask > 0xffffffff && forbid_dac > 0) {
-diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-gart_64.c linux-2.6.38.4/arch/x86/kernel/pci-gart_64.c
---- linux-2.6.38.4/arch/x86/kernel/pci-gart_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/pci-gart_64.c 2011-04-28 19:34:14.000000000 -0400
-@@ -706,7 +706,7 @@ static __init int init_amd_gatt(struct a
+diff -urNp linux-2.6.39/arch/x86/kernel/pci-gart_64.c linux-2.6.39/arch/x86/kernel/pci-gart_64.c
+--- linux-2.6.39/arch/x86/kernel/pci-gart_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
}
.map_sg = gart_map_sg,
.unmap_sg = gart_unmap_sg,
.map_page = gart_map_page,
-diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-nommu.c linux-2.6.38.4/arch/x86/kernel/pci-nommu.c
---- linux-2.6.38.4/arch/x86/kernel/pci-nommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/pci-nommu.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/pci-iommu_table.c linux-2.6.39/arch/x86/kernel/pci-iommu_table.c
+--- linux-2.6.39/arch/x86/kernel/pci-iommu_table.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/pci-iommu_table.c 2011-05-22 19:36:30.000000000 -0400
+@@ -2,7 +2,7 @@
+ #include <asm/iommu_table.h>
+ #include <linux/string.h>
+ #include <linux/kallsyms.h>
+-
++#include <linux/sched.h>
+
+ #define DEBUG 1
+
+@@ -53,6 +53,8 @@ void __init check_iommu_entries(struct i
+ char sym_p[KSYM_SYMBOL_LEN];
+ char sym_q[KSYM_SYMBOL_LEN];
+
++ pax_track_stack();
++
+ /* Simple cyclic dependency checker. */
+ for (p = start; p < finish; p++) {
+ q = find_dependents_of(start, finish, p);
+diff -urNp linux-2.6.39/arch/x86/kernel/pci-nommu.c linux-2.6.39/arch/x86/kernel/pci-nommu.c
+--- linux-2.6.39/arch/x86/kernel/pci-nommu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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();
}
.alloc_coherent = dma_generic_alloc_coherent,
.free_coherent = nommu_free_coherent,
.map_sg = nommu_map_sg,
-diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-swiotlb.c linux-2.6.38.4/arch/x86/kernel/pci-swiotlb.c
---- linux-2.6.38.4/arch/x86/kernel/pci-swiotlb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/pci-swiotlb.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/pci-swiotlb.c linux-2.6.39/arch/x86/kernel/pci-swiotlb.c
+--- linux-2.6.39/arch/x86/kernel/pci-swiotlb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
}
.mapping_error = swiotlb_dma_mapping_error,
.alloc_coherent = x86_swiotlb_alloc_coherent,
.free_coherent = swiotlb_free_coherent,
-diff -urNp linux-2.6.38.4/arch/x86/kernel/process_32.c linux-2.6.38.4/arch/x86/kernel/process_32.c
---- linux-2.6.38.4/arch/x86/kernel/process_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/process_32.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/process_32.c linux-2.6.39/arch/x86/kernel/process_32.c
+--- linux-2.6.39/arch/x86/kernel/process_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/process_32.c 2011-05-22 19:36:30.000000000 -0400
@@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __as
unsigned long thread_saved_pc(struct task_struct *tsk)
{
show_regs_common();
-@@ -196,7 +196,7 @@ int copy_thread(unsigned long clone_flag
+@@ -196,13 +196,14 @@ int copy_thread(unsigned long clone_flag
struct task_struct *tsk;
int err;
*childregs = *regs;
childregs->ax = 0;
childregs->sp = sp;
-@@ -293,7 +293,7 @@ __switch_to(struct task_struct *prev_p,
+
+ p->thread.sp = (unsigned long) childregs;
+ p->thread.sp0 = (unsigned long) (childregs+1);
++ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
+
+ p->thread.ip = (unsigned long) ret_from_fork;
+
+@@ -293,7 +294,7 @@ __switch_to(struct task_struct *prev_p,
struct thread_struct *prev = &prev_p->thread,
*next = &next_p->thread;
int cpu = smp_processor_id();
bool preload_fpu;
/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
-@@ -328,6 +328,10 @@ __switch_to(struct task_struct *prev_p,
+@@ -328,6 +329,10 @@ __switch_to(struct task_struct *prev_p,
*/
lazy_save_gs(prev->gs);
/*
* Load the per-thread Thread-Local Storage descriptor.
*/
-@@ -363,6 +367,9 @@ __switch_to(struct task_struct *prev_p,
+@@ -363,6 +368,9 @@ __switch_to(struct task_struct *prev_p,
*/
arch_end_context_switch(next_p);
if (preload_fpu)
__math_state_restore();
-@@ -372,8 +379,6 @@ __switch_to(struct task_struct *prev_p,
+@@ -372,8 +380,6 @@ __switch_to(struct task_struct *prev_p,
if (prev->gs | next->gs)
lazy_load_gs(next->gs);
return prev_p;
}
-@@ -403,4 +408,3 @@ unsigned long get_wchan(struct task_stru
+@@ -403,4 +409,3 @@ unsigned long get_wchan(struct task_stru
} while (count++ < 16);
return 0;
}
-
-diff -urNp linux-2.6.38.4/arch/x86/kernel/process_64.c linux-2.6.38.4/arch/x86/kernel/process_64.c
---- linux-2.6.38.4/arch/x86/kernel/process_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/process_64.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/process_64.c linux-2.6.39/arch/x86/kernel/process_64.c
+--- linux-2.6.39/arch/x86/kernel/process_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/process_64.c 2011-05-22 19:36:30.000000000 -0400
@@ -87,7 +87,7 @@ static void __exit_idle(void)
void exit_idle(void)
{
- childregs = ((struct pt_regs *)
- (THREAD_SIZE + task_stack_page(p))) - 1;
-+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
++ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 16;
*childregs = *regs;
childregs->ax = 0;
-@@ -376,7 +375,7 @@ __switch_to(struct task_struct *prev_p,
+@@ -273,6 +272,7 @@ int copy_thread(unsigned long clone_flag
+ p->thread.sp = (unsigned long) childregs;
+ p->thread.sp0 = (unsigned long) (childregs+1);
+ p->thread.usersp = me->thread.usersp;
++ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
+
+ set_tsk_thread_flag(p, TIF_FORK);
+
+@@ -376,7 +376,7 @@ __switch_to(struct task_struct *prev_p,
struct thread_struct *prev = &prev_p->thread;
struct thread_struct *next = &next_p->thread;
int cpu = smp_processor_id();
unsigned fsindex, gsindex;
bool preload_fpu;
-@@ -472,10 +471,9 @@ __switch_to(struct task_struct *prev_p,
+@@ -472,10 +472,9 @@ __switch_to(struct task_struct *prev_p,
prev->usersp = percpu_read(old_rsp);
percpu_write(old_rsp, next->usersp);
percpu_write(current_task, next_p);
/*
* Now maybe reload the debug registers and handle I/O bitmaps
-@@ -529,12 +527,11 @@ unsigned long get_wchan(struct task_stru
+@@ -537,12 +536,11 @@ unsigned long get_wchan(struct task_stru
if (!p || p == current || p->state == TASK_RUNNING)
return 0;
stack = (unsigned long)task_stack_page(p);
- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
-+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-8-sizeof(u64))
++ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
return 0;
fp = *(u64 *)(p->thread.sp);
do {
- if (fp < (unsigned long)stack ||
- fp >= (unsigned long)stack+THREAD_SIZE)
-+ if (fp < stack || fp > stack+THREAD_SIZE-8-sizeof(u64))
++ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
return 0;
ip = *(u64 *)(fp+8);
if (!in_sched_functions(ip))
-diff -urNp linux-2.6.38.4/arch/x86/kernel/process.c linux-2.6.38.4/arch/x86/kernel/process.c
---- linux-2.6.38.4/arch/x86/kernel/process.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/process.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/process.c linux-2.6.39/arch/x86/kernel/process.c
+--- linux-2.6.39/arch/x86/kernel/process.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/process.c 2011-05-22 19:36:30.000000000 -0400
@@ -48,16 +48,33 @@ void free_thread_xstate(struct task_stru
void free_thread_info(struct thread_info *ti)
+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
+}
+
-+struct task_struct *alloc_task_struct(void)
++struct task_struct *alloc_task_struct_node(int node)
+{
-+ return kmem_cache_alloc(task_struct_cachep, GFP_KERNEL);
++ return kmem_cache_alloc_node(task_struct_cachep, GFP_KERNEL, node);
+}
+
+void free_task_struct(struct task_struct *task)
init_utsname()->release,
(int)strcspn(init_utsname()->version, " "),
init_utsname()->version);
-@@ -123,6 +140,9 @@ void flush_thread(void)
+@@ -120,6 +137,9 @@ void flush_thread(void)
{
struct task_struct *tsk = current;
flush_ptrace_hw_breakpoint(tsk);
memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
/*
-@@ -285,10 +305,10 @@ int kernel_thread(int (*fn)(void *), voi
+@@ -282,10 +302,10 @@ int kernel_thread(int (*fn)(void *), voi
regs.di = (unsigned long) arg;
#ifdef CONFIG_X86_32
#else
regs.ss = __KERNEL_DS;
#endif
-@@ -668,16 +688,31 @@ static int __init idle_setup(char *str)
+@@ -401,7 +421,7 @@ void default_idle(void)
+ EXPORT_SYMBOL(default_idle);
+ #endif
+
+-void stop_this_cpu(void *dummy)
++__noreturn void stop_this_cpu(void *dummy)
+ {
+ local_irq_disable();
+ /*
+@@ -665,16 +685,34 @@ static int __init idle_setup(char *str)
}
early_param("idle", idle_setup);
+
+ /* P4 seems to return a 0 LSB, ignore it */
+#ifdef CONFIG_MPENTIUM4
-+ time &= 0x1EUL;
++ time &= 0x3EUL;
+ time <<= 2;
-+#else
++#elif defined(CONFIG_X86_64)
+ time &= 0xFUL;
++ time <<= 4;
++#else
++ time &= 0x1FUL;
+ time <<= 3;
+#endif
+
+#endif
+}
+#endif
-diff -urNp linux-2.6.38.4/arch/x86/kernel/ptrace.c linux-2.6.38.4/arch/x86/kernel/ptrace.c
---- linux-2.6.38.4/arch/x86/kernel/ptrace.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/ptrace.c 2011-04-28 19:34:14.000000000 -0400
-@@ -805,7 +805,7 @@ long arch_ptrace(struct task_struct *chi
+diff -urNp linux-2.6.39/arch/x86/kernel/ptrace.c linux-2.6.39/arch/x86/kernel/ptrace.c
+--- linux-2.6.39/arch/x86/kernel/ptrace.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/ptrace.c 2011-05-22 19:36:30.000000000 -0400
+@@ -821,7 +821,7 @@ long arch_ptrace(struct task_struct *chi
unsigned long addr, unsigned long data)
{
int ret;
switch (request) {
/* read the word at location addr in the USER area. */
-@@ -890,14 +890,14 @@ long arch_ptrace(struct task_struct *chi
+@@ -906,14 +906,14 @@ long arch_ptrace(struct task_struct *chi
if ((int) addr < 0)
return -EIO;
ret = do_get_thread_area(child, addr,
break;
#endif
-@@ -1314,7 +1314,7 @@ static void fill_sigtrap_info(struct tas
+@@ -1330,7 +1330,7 @@ static void fill_sigtrap_info(struct tas
memset(info, 0, sizeof(*info));
info->si_signo = SIGTRAP;
info->si_code = si_code;
}
void user_single_step_siginfo(struct task_struct *tsk,
-@@ -1347,7 +1347,7 @@ void send_sigtrap(struct task_struct *ts
+@@ -1363,7 +1363,7 @@ void send_sigtrap(struct task_struct *ts
* We must return the syscall number to actually look up in the table.
* This can be -1L to skip running any syscall at all.
*/
{
long ret = 0;
-@@ -1392,7 +1392,7 @@ asmregparm long syscall_trace_enter(stru
+@@ -1408,7 +1408,7 @@ asmregparm long syscall_trace_enter(stru
return ret ?: regs->orig_ax;
}
{
bool step;
-diff -urNp linux-2.6.38.4/arch/x86/kernel/reboot.c linux-2.6.38.4/arch/x86/kernel/reboot.c
---- linux-2.6.38.4/arch/x86/kernel/reboot.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/reboot.c 2011-04-28 19:34:14.000000000 -0400
-@@ -34,7 +34,7 @@ void (*pm_power_off)(void);
+diff -urNp linux-2.6.39/arch/x86/kernel/pvclock.c linux-2.6.39/arch/x86/kernel/pvclock.c
+--- linux-2.6.39/arch/x86/kernel/pvclock.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/pvclock.c 2011-05-22 19:36:30.000000000 -0400
+@@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvc
+ return pv_tsc_khz;
+ }
+
+-static atomic64_t last_value = ATOMIC64_INIT(0);
++static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
+
+ void pvclock_resume(void)
+ {
+- atomic64_set(&last_value, 0);
++ atomic64_set_unchecked(&last_value, 0);
+ }
+
+ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
+@@ -121,11 +121,11 @@ cycle_t pvclock_clocksource_read(struct
+ * updating at the same time, and one of them could be slightly behind,
+ * making the assumption that last_value always go forward fail to hold.
+ */
+- last = atomic64_read(&last_value);
++ last = atomic64_read_unchecked(&last_value);
+ do {
+ if (ret < last)
+ return last;
+- last = atomic64_cmpxchg(&last_value, last, ret);
++ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
+ } while (unlikely(last != ret));
+
+ return ret;
+diff -urNp linux-2.6.39/arch/x86/kernel/reboot.c linux-2.6.39/arch/x86/kernel/reboot.c
+--- linux-2.6.39/arch/x86/kernel/reboot.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/reboot.c 2011-05-23 17:07:00.000000000 -0400
+@@ -35,7 +35,7 @@ void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);
static const struct desc_ptr no_idt = {};
enum reboot_type reboot_type = BOOT_KBD;
int reboot_force;
-@@ -309,12 +309,12 @@ core_initcall(reboot_init);
- controller to pulse the CPU reset line, which is more thorough, but
- doesn't work with at least one type of 486 motherboard. It is easy
- to stop this code working; hence the copious comments. */
--static const unsigned long long
--real_mode_gdt_entries [3] =
-+static struct desc_struct
-+real_mode_gdt_entries [3] __read_only =
- {
-- 0x0000000000000000ULL, /* Null descriptor */
-- 0x00009b000000ffffULL, /* 16-bit real-mode 64k code at 0x00000000 */
-- 0x000093000100ffffULL /* 16-bit real-mode 64k data at 0x00000100 */
-+ GDT_ENTRY_INIT(0, 0, 0), /* Null descriptor */
-+ GDT_ENTRY_INIT(0x9b, 0, 0xffff), /* 16-bit real-mode 64k code at 0x00000000 */
-+ GDT_ENTRY_INIT(0x93, 0x100, 0xffff) /* 16-bit real-mode 64k data at 0x00000100 */
- };
-
- static const struct desc_ptr
-@@ -363,7 +363,7 @@ static const unsigned char jump_to_bios
- * specified by the code and length parameters.
- * We assume that length will aways be less that 100!
- */
--void machine_real_restart(const unsigned char *code, int length)
-+void machine_real_restart(const unsigned char *code, unsigned int length)
+@@ -307,13 +307,17 @@ core_initcall(reboot_init);
+ extern const unsigned char machine_real_restart_asm[];
+ extern const u64 machine_real_restart_gdt[3];
+
+-void machine_real_restart(unsigned int type)
++__noreturn void machine_real_restart(unsigned int type)
{
+ void *restart_va;
+ unsigned long restart_pa;
+- void (*restart_lowmem)(unsigned int);
++ void (* __noreturn restart_lowmem)(unsigned int);
+ u64 *lowmem_gdt;
+
++#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
++ struct desc_struct *gdt;
++#endif
++
local_irq_disable();
-@@ -390,16 +390,15 @@ void machine_real_restart(const unsigned
+ /* Write zero to CMOS register number 0x0f, which the BIOS POST
+@@ -339,14 +343,14 @@ void machine_real_restart(unsigned int t
boot)". This seems like a fairly standard thing that gets set by
REBOOT.COM programs, and the previous reset routine did this
too. */
- *((unsigned short *)0x472) = reboot_mode;
+ *(unsigned short *)(__va(0x472)) = reboot_mode;
- /* For the switch to real mode, copy some code to low memory. It has
- to be in the first 64k because it is running in 16-bit mode, and it
- has to have the same physical and virtual address, because it turns
- off paging. Copy it near the end of the first page, out of the way
- of BIOS variables. */
-- memcpy((void *)(0x1000 - sizeof(real_mode_switch) - 100),
-- real_mode_switch, sizeof (real_mode_switch));
-- memcpy((void *)(0x1000 - 100), code, length);
-+ memcpy(__va(0x1000 - sizeof (real_mode_switch) - 100), real_mode_switch, sizeof (real_mode_switch));
-+ memcpy(__va(0x1000 - 100), code, length);
-
- /* Set up the IDT for real mode. */
- load_idt(&real_mode_idt);
-diff -urNp linux-2.6.38.4/arch/x86/kernel/setup.c linux-2.6.38.4/arch/x86/kernel/setup.c
---- linux-2.6.38.4/arch/x86/kernel/setup.c 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/setup.c 2011-04-28 19:34:14.000000000 -0400
-@@ -654,7 +654,7 @@ static void __init trim_bios_range(void)
+ /* Patch the GDT in the low memory trampoline */
+ lowmem_gdt = TRAMPOLINE_SYM(machine_real_restart_gdt);
+
+ restart_va = TRAMPOLINE_SYM(machine_real_restart_asm);
+ restart_pa = virt_to_phys(restart_va);
+- restart_lowmem = (void (*)(unsigned int))restart_pa;
++ restart_lowmem = (void *)restart_pa;
+
+ /* GDT[0]: GDT self-pointer */
+ lowmem_gdt[0] =
+@@ -357,7 +361,33 @@ void machine_real_restart(unsigned int t
+ GDT_ENTRY(0x009b, restart_pa, 0xffff);
+
+ /* Jump to the identity-mapped low memory code */
++
++#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
++ gdt = get_cpu_gdt_table(smp_processor_id());
++ pax_open_kernel();
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
++ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
++ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
++#endif
++#ifdef CONFIG_PAX_KERNEXEC
++ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
++ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
++ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
++ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
++ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
++ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
++#endif
++ pax_close_kernel();
++#endif
++
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++ asm volatile("push %0; push %1; lret\n" : : "i" (__KERNEL_CS), "rm" (restart_lowmem), "a" (type));
++ unreachable();
++#else
+ restart_lowmem(type);
++#endif
++
+ }
+ #ifdef CONFIG_APM_MODULE
+ EXPORT_SYMBOL(machine_real_restart);
+@@ -478,7 +508,7 @@ void __attribute__((weak)) mach_reboot_f
+ {
+ }
+
+-static void native_machine_emergency_restart(void)
++__noreturn static void native_machine_emergency_restart(void)
+ {
+ int i;
+
+@@ -593,13 +623,13 @@ void native_machine_shutdown(void)
+ #endif
+ }
+
+-static void __machine_emergency_restart(int emergency)
++static __noreturn void __machine_emergency_restart(int emergency)
+ {
+ reboot_emergency = emergency;
+ machine_ops.emergency_restart();
+ }
+
+-static void native_machine_restart(char *__unused)
++static __noreturn void native_machine_restart(char *__unused)
+ {
+ printk("machine restart\n");
+
+@@ -608,7 +638,7 @@ static void native_machine_restart(char
+ __machine_emergency_restart(0);
+ }
+
+-static void native_machine_halt(void)
++static __noreturn void native_machine_halt(void)
+ {
+ /* stop other cpus and apics */
+ machine_shutdown();
+@@ -619,7 +649,7 @@ static void native_machine_halt(void)
+ stop_this_cpu(NULL);
+ }
+
+-static void native_machine_power_off(void)
++__noreturn static void native_machine_power_off(void)
+ {
+ if (pm_power_off) {
+ if (!reboot_force)
+@@ -628,6 +658,7 @@ static void native_machine_power_off(voi
+ }
+ /* a fallback in case there is no PM info available */
+ tboot_shutdown(TB_SHUTDOWN_HALT);
++ unreachable();
+ }
+
+ struct machine_ops machine_ops = {
+diff -urNp linux-2.6.39/arch/x86/kernel/setup.c linux-2.6.39/arch/x86/kernel/setup.c
+--- linux-2.6.39/arch/x86/kernel/setup.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/setup.c 2011-05-22 19:36:30.000000000 -0400
+@@ -650,7 +650,7 @@ static void __init trim_bios_range(void)
* area (640->1Mb) as ram even though it is not.
* take them out.
*/
sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
}
-@@ -790,14 +790,14 @@ void __init setup_arch(char **cmdline_p)
+@@ -775,14 +775,14 @@ void __init setup_arch(char **cmdline_p)
if (!boot_params.hdr.root_flags)
root_mountflags &= ~MS_RDONLY;
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.38.4/arch/x86/kernel/setup_percpu.c linux-2.6.38.4/arch/x86/kernel/setup_percpu.c
---- linux-2.6.38.4/arch/x86/kernel/setup_percpu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/setup_percpu.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/setup_percpu.c linux-2.6.39/arch/x86/kernel/setup_percpu.c
+--- linux-2.6.39/arch/x86/kernel/setup_percpu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/setup_percpu.c 2011-05-22 19:36:30.000000000 -0400
@@ -21,19 +21,17 @@
#include <asm/cpu.h>
#include <asm/stackprotector.h>
per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
per_cpu(cpu_number, cpu) = cpu;
-@@ -243,6 +246,12 @@ void __init setup_per_cpu_areas(void)
+@@ -247,6 +250,12 @@ void __init setup_per_cpu_areas(void)
+ */
set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
#endif
- #endif
+#ifdef CONFIG_CC_STACKPROTECTOR
+#ifdef CONFIG_x86_32
+ if (cpu == boot_cpu_id)
/*
* 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.38.4/arch/x86/kernel/signal.c linux-2.6.38.4/arch/x86/kernel/signal.c
---- linux-2.6.38.4/arch/x86/kernel/signal.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/signal.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/signal.c linux-2.6.39/arch/x86/kernel/signal.c
+--- linux-2.6.39/arch/x86/kernel/signal.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/signal.c 2011-05-23 17:07:00.000000000 -0400
@@ -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.
} put_user_catch(err);
if (err)
-@@ -780,7 +783,7 @@ static void do_signal(struct pt_regs *re
+@@ -773,6 +776,8 @@ static void do_signal(struct pt_regs *re
+ int signr;
+ sigset_t *oldset;
+
++ pax_track_stack();
++
+ /*
+ * We want the common case to go fast, which is why we may in certain
+ * cases get here from kernel mode. Just return without doing anything
+@@ -780,7 +785,7 @@ static void do_signal(struct pt_regs *re
* X86_32: vm86 regs switched out by assembly code before reaching
* here, so testing against kernel CS suffices.
*/
return;
if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-diff -urNp linux-2.6.38.4/arch/x86/kernel/smpboot.c linux-2.6.38.4/arch/x86/kernel/smpboot.c
---- linux-2.6.38.4/arch/x86/kernel/smpboot.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/smpboot.c 2011-04-28 19:34:14.000000000 -0400
-@@ -773,17 +773,20 @@ static int __cpuinit do_boot_cpu(int api
+diff -urNp linux-2.6.39/arch/x86/kernel/smpboot.c linux-2.6.39/arch/x86/kernel/smpboot.c
+--- linux-2.6.39/arch/x86/kernel/smpboot.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/smpboot.c 2011-05-22 19:36:30.000000000 -0400
+@@ -696,17 +696,20 @@ static int __cpuinit do_boot_cpu(int api
set_idle_for_cpu(cpu, c_idle.idle);
do_rest:
per_cpu(current_task, cpu) = c_idle.idle;
- per_cpu(kernel_stack, cpu) =
- (unsigned long)task_stack_page(c_idle.idle) -
- KERNEL_STACK_OFFSET + THREAD_SIZE;
-+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(c_idle.idle) - 8 + THREAD_SIZE;
++ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(c_idle.idle) - 16 + THREAD_SIZE;
#endif
+
+ pax_open_kernel();
initial_code = (unsigned long)start_secondary;
stack_start = c_idle.idle->thread.sp;
-@@ -923,6 +926,12 @@ int __cpuinit native_cpu_up(unsigned int
+@@ -848,6 +851,12 @@ int __cpuinit native_cpu_up(unsigned int
per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
err = do_boot_cpu(apicid, cpu);
if (err) {
pr_debug("do_boot_cpu failed %d\n", err);
-diff -urNp linux-2.6.38.4/arch/x86/kernel/step.c linux-2.6.38.4/arch/x86/kernel/step.c
---- linux-2.6.38.4/arch/x86/kernel/step.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/step.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/step.c linux-2.6.39/arch/x86/kernel/step.c
+--- linux-2.6.39/arch/x86/kernel/step.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/step.c 2011-05-22 19:36:30.000000000 -0400
@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
struct desc_struct *desc;
unsigned long base;
/* 32-bit mode: register increment */
return 0;
/* 64-bit mode: REX prefix */
-diff -urNp linux-2.6.38.4/arch/x86/kernel/syscall_table_32.S linux-2.6.38.4/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.38.4/arch/x86/kernel/syscall_table_32.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/syscall_table_32.S 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/syscall_table_32.S linux-2.6.39/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.39/arch/x86/kernel/syscall_table_32.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/syscall_table_32.S 2011-05-22 19:36:30.000000000 -0400
@@ -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.38.4/arch/x86/kernel/sys_i386_32.c linux-2.6.38.4/arch/x86/kernel/sys_i386_32.c
---- linux-2.6.38.4/arch/x86/kernel/sys_i386_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/sys_i386_32.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/sys_i386_32.c linux-2.6.39/arch/x86/kernel/sys_i386_32.c
+--- linux-2.6.39/arch/x86/kernel/sys_i386_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/sys_i386_32.c 2011-05-22 19:36:30.000000000 -0400
@@ -24,17 +24,224 @@
#include <asm/syscalls.h>
+
+ return addr;
}
-diff -urNp linux-2.6.38.4/arch/x86/kernel/sys_x86_64.c linux-2.6.38.4/arch/x86/kernel/sys_x86_64.c
---- linux-2.6.38.4/arch/x86/kernel/sys_x86_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/sys_x86_64.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/sys_x86_64.c linux-2.6.39/arch/x86/kernel/sys_x86_64.c
+--- linux-2.6.39/arch/x86/kernel/sys_x86_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/sys_x86_64.c 2011-05-22 19:36:30.000000000 -0400
@@ -32,8 +32,8 @@ out:
return error;
}
mm->cached_hole_size = ~0UL;
return addr;
-diff -urNp linux-2.6.38.4/arch/x86/kernel/tboot.c linux-2.6.38.4/arch/x86/kernel/tboot.c
---- linux-2.6.38.4/arch/x86/kernel/tboot.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/tboot.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/tboot.c linux-2.6.39/arch/x86/kernel/tboot.c
+--- linux-2.6.39/arch/x86/kernel/tboot.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/tboot.c 2011-05-22 19:36:30.000000000 -0400
+@@ -218,7 +218,7 @@ static int tboot_setup_sleep(void)
+
+ void tboot_shutdown(u32 shutdown_type)
+ {
+- void (*shutdown)(void);
++ void (* __noreturn shutdown)(void);
+
+ if (!tboot_enabled())
+ return;
+@@ -240,7 +240,7 @@ void tboot_shutdown(u32 shutdown_type)
+
+ switch_to_tboot_pt();
+
+- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
++ shutdown = (void *)tboot->shutdown_entry;
+ shutdown();
+
+ /* should not reach here */
@@ -297,7 +297,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1
tboot_shutdown(acpi_shutdown_map[sleep_state]);
}
register_hotcpu_notifier(&tboot_cpu_notifier);
return 0;
}
-diff -urNp linux-2.6.38.4/arch/x86/kernel/time.c linux-2.6.38.4/arch/x86/kernel/time.c
---- linux-2.6.38.4/arch/x86/kernel/time.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/time.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/time.c linux-2.6.39/arch/x86/kernel/time.c
+--- linux-2.6.39/arch/x86/kernel/time.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/time.c 2011-05-22 19:36:30.000000000 -0400
@@ -22,17 +22,13 @@
#include <asm/hpet.h>
#include <asm/time.h>
}
return pc;
}
-diff -urNp linux-2.6.38.4/arch/x86/kernel/tls.c linux-2.6.38.4/arch/x86/kernel/tls.c
---- linux-2.6.38.4/arch/x86/kernel/tls.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/tls.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/tls.c linux-2.6.39/arch/x86/kernel/tls.c
+--- linux-2.6.39/arch/x86/kernel/tls.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/tls.c 2011-05-22 19:36:30.000000000 -0400
@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
return -EINVAL;
set_tls_desc(p, idx, &info, 1);
return 0;
-diff -urNp linux-2.6.38.4/arch/x86/kernel/trampoline_32.S linux-2.6.38.4/arch/x86/kernel/trampoline_32.S
---- linux-2.6.38.4/arch/x86/kernel/trampoline_32.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/trampoline_32.S 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/trampoline_32.S linux-2.6.39/arch/x86/kernel/trampoline_32.S
+--- linux-2.6.39/arch/x86/kernel/trampoline_32.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/trampoline_32.S 2011-05-22 19:36:30.000000000 -0400
@@ -32,6 +32,12 @@
#include <asm/segment.h>
#include <asm/page_types.h>
+#define ta(X) ((X) - __PAGE_OFFSET)
+#endif
+
- /* We can free up trampoline after bootup if cpu hotplug is not supported. */
- __CPUINITRODATA
- .code16
-@@ -60,7 +66,7 @@ r_base = .
+ #ifdef CONFIG_SMP
+
+ .section ".x86_trampoline","a"
+@@ -62,7 +68,7 @@ r_base = .
inc %ax # protected mode (PE) bit
lmsw %ax # into protected mode
# flush prefetch and jump to startup_32_smp in arch/i386/kernel/head.S
# 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.38.4/arch/x86/kernel/trampoline_64.S linux-2.6.38.4/arch/x86/kernel/trampoline_64.S
---- linux-2.6.38.4/arch/x86/kernel/trampoline_64.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/trampoline_64.S 2011-04-28 19:34:14.000000000 -0400
-@@ -91,7 +91,7 @@ startup_32:
+diff -urNp linux-2.6.39/arch/x86/kernel/trampoline_64.S linux-2.6.39/arch/x86/kernel/trampoline_64.S
+--- linux-2.6.39/arch/x86/kernel/trampoline_64.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/trampoline_64.S 2011-05-22 19:36:30.000000000 -0400
+@@ -90,7 +90,7 @@ startup_32:
movl $__KERNEL_DS, %eax # Initialize the %ds segment register
movl %eax, %ds
.long tgdt - r_base
.short 0
.quad 0x00cf9b000000ffff # __KERNEL32_CS
-diff -urNp linux-2.6.38.4/arch/x86/kernel/traps.c linux-2.6.38.4/arch/x86/kernel/traps.c
---- linux-2.6.38.4/arch/x86/kernel/traps.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/traps.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/traps.c linux-2.6.39/arch/x86/kernel/traps.c
+--- linux-2.6.39/arch/x86/kernel/traps.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/traps.c 2011-05-22 19:36:30.000000000 -0400
@@ -70,12 +70,6 @@ asmlinkage int system_call(void);
/* Do we ignore FPU interrupts ? */
if (!tsk_used_math(tsk)) {
local_irq_enable();
-diff -urNp linux-2.6.38.4/arch/x86/kernel/vm86_32.c linux-2.6.38.4/arch/x86/kernel/vm86_32.c
---- linux-2.6.38.4/arch/x86/kernel/vm86_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/vm86_32.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/vm86_32.c linux-2.6.39/arch/x86/kernel/vm86_32.c
+--- linux-2.6.39/arch/x86/kernel/vm86_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/vm86_32.c 2011-05-22 19:41:32.000000000 -0400
@@ -41,6 +41,7 @@
#include <linux/ptrace.h>
#include <linux/audit.h>
if (get_user(segoffs, intr_ptr))
goto cannot_handle;
if ((segoffs >> 16) == BIOSSEG)
-diff -urNp linux-2.6.38.4/arch/x86/kernel/vmlinux.lds.S linux-2.6.38.4/arch/x86/kernel/vmlinux.lds.S
---- linux-2.6.38.4/arch/x86/kernel/vmlinux.lds.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/vmlinux.lds.S 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/vmlinux.lds.S linux-2.6.39/arch/x86/kernel/vmlinux.lds.S
+--- linux-2.6.39/arch/x86/kernel/vmlinux.lds.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/vmlinux.lds.S 2011-05-22 19:36:30.000000000 -0400
@@ -26,6 +26,13 @@
#include <asm/page_types.h>
#include <asm/cache.h>
HEAD_TEXT
#ifdef CONFIG_X86_32
. = ALIGN(PAGE_SIZE);
-@@ -108,13 +128,47 @@ SECTIONS
+@@ -109,13 +129,47 @@ SECTIONS
IRQENTRY_TEXT
*(.fixup)
*(.gnu.warning)
#if defined(CONFIG_DEBUG_RODATA)
/* .text should occupy whole number of pages */
-@@ -126,16 +180,20 @@ SECTIONS
+@@ -127,16 +181,20 @@ SECTIONS
/* Data */
.data : AT(ADDR(.data) - LOAD_OFFSET) {
PAGE_ALIGNED_DATA(PAGE_SIZE)
-@@ -144,6 +202,8 @@ SECTIONS
+@@ -145,6 +203,8 @@ SECTIONS
DATA_DATA
CONSTRUCTORS
/* rarely changed data like cpu maps */
READ_MOSTLY_DATA(INTERNODE_CACHE_BYTES)
-@@ -198,12 +258,6 @@ SECTIONS
+@@ -199,12 +259,6 @@ SECTIONS
}
vgetcpu_mode = VVIRT(.vgetcpu_mode);
.vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) {
*(.vsyscall_3)
}
-@@ -219,12 +273,19 @@ SECTIONS
+@@ -220,12 +274,19 @@ SECTIONS
#endif /* CONFIG_X86_64 */
/* Init code and data - will be freed after init */
/*
* percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
* output PHDR, so the next output section - .init.text - should
-@@ -233,12 +294,27 @@ SECTIONS
- PERCPU_VADDR(0, :percpu)
+@@ -234,12 +295,27 @@ SECTIONS
+ PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
#endif
- INIT_TEXT_SECTION(PAGE_SIZE)
+ . = ALIGN(PAGE_SIZE);
+ INIT_DATA_SECTION(16) :init
- .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
- __x86_cpu_dev_start = .;
-@@ -292,19 +368,12 @@ SECTIONS
- __iommu_table_end = .;
+ /*
+ * Code and data for a variety of lowlevel trampolines, to be
+@@ -306,19 +382,12 @@ SECTIONS
}
+
. = ALIGN(8);
- /*
- * .exit.text is discard at runtime, not link time, to deal with
-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
+#ifndef CONFIG_SMP
- PERCPU(THREAD_SIZE)
+ PERCPU(INTERNODE_CACHE_BYTES, PAGE_SIZE)
#endif
-@@ -323,16 +392,10 @@ SECTIONS
+@@ -337,16 +406,10 @@ SECTIONS
.smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
__smp_locks = .;
*(.smp_locks)
/* BSS */
. = ALIGN(PAGE_SIZE);
.bss : AT(ADDR(.bss) - LOAD_OFFSET) {
-@@ -348,6 +411,7 @@ SECTIONS
+@@ -362,6 +425,7 @@ SECTIONS
__brk_base = .;
. += 64 * 1024; /* 64k alignment slop space */
*(.brk_reservation) /* areas brk users have reserved */
__brk_limit = .;
}
-@@ -374,13 +438,12 @@ SECTIONS
+@@ -388,13 +452,12 @@ SECTIONS
* for the boot processor.
*/
#define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
"kernel image bigger than KERNEL_IMAGE_SIZE");
#ifdef CONFIG_SMP
-diff -urNp linux-2.6.38.4/arch/x86/kernel/vsyscall_64.c linux-2.6.38.4/arch/x86/kernel/vsyscall_64.c
---- linux-2.6.38.4/arch/x86/kernel/vsyscall_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/vsyscall_64.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/vsyscall_64.c linux-2.6.39/arch/x86/kernel/vsyscall_64.c
+--- linux-2.6.39/arch/x86/kernel/vsyscall_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/vsyscall_64.c 2011-05-22 19:36:30.000000000 -0400
@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
p = tcache->blob[1];
} else if (__vgetcpu_mode == VGETCPU_RDTSCP) {
/* Load per CPU data from RDTSCP */
-diff -urNp linux-2.6.38.4/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.38.4/arch/x86/kernel/x8664_ksyms_64.c
---- linux-2.6.38.4/arch/x86/kernel/x8664_ksyms_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/x8664_ksyms_64.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.39/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-2.6.39/arch/x86/kernel/x8664_ksyms_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/x8664_ksyms_64.c 2011-05-22 19:36:30.000000000 -0400
@@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
EXPORT_SYMBOL(copy_user_generic_string);
EXPORT_SYMBOL(copy_user_generic_unrolled);
EXPORT_SYMBOL(copy_page);
EXPORT_SYMBOL(clear_page);
-diff -urNp linux-2.6.38.4/arch/x86/kernel/xsave.c linux-2.6.38.4/arch/x86/kernel/xsave.c
---- linux-2.6.38.4/arch/x86/kernel/xsave.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/xsave.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kernel/xsave.c linux-2.6.39/arch/x86/kernel/xsave.c
+--- linux-2.6.39/arch/x86/kernel/xsave.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kernel/xsave.c 2011-05-22 19:36:30.000000000 -0400
@@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_
fx_sw_user->xstate_size > fx_sw_user->extended_size)
return -EINVAL;
buf);
if (unlikely(err)) {
/*
-diff -urNp linux-2.6.38.4/arch/x86/kvm/emulate.c linux-2.6.38.4/arch/x86/kvm/emulate.c
---- linux-2.6.38.4/arch/x86/kvm/emulate.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kvm/emulate.c 2011-04-28 19:34:14.000000000 -0400
-@@ -88,7 +88,7 @@
+diff -urNp linux-2.6.39/arch/x86/kvm/emulate.c linux-2.6.39/arch/x86/kvm/emulate.c
+--- linux-2.6.39/arch/x86/kvm/emulate.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kvm/emulate.c 2011-05-22 19:36:30.000000000 -0400
+@@ -89,7 +89,7 @@
#define Src2ImmByte (2<<29)
#define Src2One (3<<29)
#define Src2Imm (4<<29)
#define X2(x...) x, x
#define X3(x...) X2(x), x
-@@ -189,6 +189,7 @@ struct group_dual {
+@@ -190,6 +190,7 @@ struct group_dual {
#define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix, _dsttype) \
do { \
__asm__ __volatile__ ( \
_PRE_EFLAGS("0", "4", "2") \
_op _suffix " %"_x"3,%1; " \
-@@ -202,8 +203,6 @@ struct group_dual {
+@@ -203,8 +204,6 @@ struct group_dual {
/* Raw emulation: instruction has two explicit operands. */
#define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy) \
do { \
switch ((_dst).bytes) { \
case 2: \
____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w",u16);\
-@@ -219,7 +218,6 @@ struct group_dual {
+@@ -220,7 +219,6 @@ struct group_dual {
#define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
do { \
switch ((_dst).bytes) { \
case 1: \
____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \
-diff -urNp linux-2.6.38.4/arch/x86/kvm/lapic.c linux-2.6.38.4/arch/x86/kvm/lapic.c
---- linux-2.6.38.4/arch/x86/kvm/lapic.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kvm/lapic.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kvm/lapic.c linux-2.6.39/arch/x86/kvm/lapic.c
+--- linux-2.6.39/arch/x86/kvm/lapic.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kvm/lapic.c 2011-05-22 19:36:30.000000000 -0400
@@ -53,7 +53,7 @@
#define APIC_BUS_CYCLE_NS 1
#define APIC_LVT_NUM 6
/* 14 is the version for Xeon and Pentium 8.4.8*/
-diff -urNp linux-2.6.38.4/arch/x86/kvm/mmu.c linux-2.6.38.4/arch/x86/kvm/mmu.c
---- linux-2.6.38.4/arch/x86/kvm/mmu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kvm/mmu.c 2011-04-28 19:57:25.000000000 -0400
-@@ -3271,7 +3271,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
+diff -urNp linux-2.6.39/arch/x86/kvm/mmu.c linux-2.6.39/arch/x86/kvm/mmu.c
+--- linux-2.6.39/arch/x86/kvm/mmu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kvm/mmu.c 2011-05-22 19:36:30.000000000 -0400
+@@ -3240,7 +3240,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes);
/*
* Assume that the pte write on a page table of the same type
-@@ -3305,7 +3305,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
+@@ -3275,7 +3275,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
+ smp_rmb();
- mmu_guess_page_from_pte_write(vcpu, gpa, gentry);
spin_lock(&vcpu->kvm->mmu_lock);
- if (atomic_read(&vcpu->kvm->arch.invlpg_counter) != invlpg_counter)
+ if (atomic_read_unchecked(&vcpu->kvm->arch.invlpg_counter) != invlpg_counter)
gentry = 0;
- kvm_mmu_access_page(vcpu, gfn);
kvm_mmu_free_some_pages(vcpu);
-diff -urNp linux-2.6.38.4/arch/x86/kvm/paging_tmpl.h linux-2.6.38.4/arch/x86/kvm/paging_tmpl.h
---- linux-2.6.38.4/arch/x86/kvm/paging_tmpl.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kvm/paging_tmpl.h 2011-04-28 19:57:25.000000000 -0400
-@@ -674,7 +674,7 @@ static void FNAME(invlpg)(struct kvm_vcp
+ ++vcpu->kvm->stat.mmu_pte_write;
+diff -urNp linux-2.6.39/arch/x86/kvm/paging_tmpl.h linux-2.6.39/arch/x86/kvm/paging_tmpl.h
+--- linux-2.6.39/arch/x86/kvm/paging_tmpl.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kvm/paging_tmpl.h 2011-05-22 19:36:30.000000000 -0400
+@@ -552,6 +552,8 @@ static int FNAME(page_fault)(struct kvm_
+ unsigned long mmu_seq;
+ bool map_writable;
+
++ pax_track_stack();
++
+ pgprintk("%s: addr %lx err %x\n", __func__, addr, error_code);
+
+ r = mmu_topup_memory_caches(vcpu);
+@@ -672,7 +674,7 @@ static void FNAME(invlpg)(struct kvm_vcp
if (need_flush)
kvm_flush_remote_tlbs(vcpu->kvm);
spin_unlock(&vcpu->kvm->mmu_lock);
-diff -urNp linux-2.6.38.4/arch/x86/kvm/svm.c linux-2.6.38.4/arch/x86/kvm/svm.c
---- linux-2.6.38.4/arch/x86/kvm/svm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kvm/svm.c 2011-04-28 19:57:25.000000000 -0400
-@@ -3273,7 +3273,11 @@ static void reload_tss(struct kvm_vcpu *
+diff -urNp linux-2.6.39/arch/x86/kvm/svm.c linux-2.6.39/arch/x86/kvm/svm.c
+--- linux-2.6.39/arch/x86/kvm/svm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kvm/svm.c 2011-05-22 19:36:30.000000000 -0400
+@@ -3278,7 +3278,11 @@ static void reload_tss(struct kvm_vcpu *
int cpu = raw_smp_processor_id();
struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
load_TR_desc();
}
-@@ -3643,6 +3647,10 @@ static void svm_vcpu_run(struct kvm_vcpu
- loadsegment(fs, svm->host.fs);
+@@ -3656,6 +3660,10 @@ static void svm_vcpu_run(struct kvm_vcpu
+ #endif
#endif
+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
reload_tss(vcpu);
local_irq_disable();
-@@ -3850,7 +3858,7 @@ static void svm_fpu_deactivate(struct kv
+@@ -3871,7 +3879,7 @@ static void svm_fpu_deactivate(struct kv
update_cr0_intercept(svm);
}
.cpu_has_kvm_support = has_svm,
.disabled_by_bios = is_disabled,
.hardware_setup = svm_hardware_setup,
-diff -urNp linux-2.6.38.4/arch/x86/kvm/vmx.c linux-2.6.38.4/arch/x86/kvm/vmx.c
---- linux-2.6.38.4/arch/x86/kvm/vmx.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kvm/vmx.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/kvm/vmx.c linux-2.6.39/arch/x86/kvm/vmx.c
+--- linux-2.6.39/arch/x86/kvm/vmx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kvm/vmx.c 2011-05-22 19:36:30.000000000 -0400
@@ -725,7 +725,11 @@ static void reload_tss(void)
struct desc_struct *descs;
load_TR_desc();
}
-@@ -1642,8 +1646,11 @@ static __init int hardware_setup(void)
+@@ -1648,8 +1652,11 @@ static __init int hardware_setup(void)
if (!cpu_has_vmx_flexpriority())
flexpriority_enabled = 0;
if (enable_ept && !cpu_has_vmx_ept_2m_page())
kvm_disable_largepages();
-@@ -2640,7 +2647,7 @@ static int vmx_vcpu_setup(struct vcpu_vm
+@@ -2693,7 +2700,7 @@ static int vmx_vcpu_setup(struct vcpu_vm
vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return));
vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0);
vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0);
vmcs_write64(VM_EXIT_MSR_LOAD_ADDR, __pa(vmx->msr_autoload.host));
-@@ -4031,6 +4038,12 @@ static void vmx_vcpu_run(struct kvm_vcpu
+@@ -4068,6 +4075,12 @@ static void __noclone vmx_vcpu_run(struc
"jmp .Lkvm_vmx_return \n\t"
".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
".Lkvm_vmx_return: "
+#endif
+
/* Save guest registers, load host registers, keep flags */
- "xchg %0, (%%"R"sp) \n\t"
- "mov %%"R"ax, %c[rax](%0) \n\t"
-@@ -4077,6 +4090,11 @@ static void vmx_vcpu_run(struct kvm_vcpu
- [r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])),
+ "mov %0, %c[wordsize](%%"R"sp) \n\t"
+ "pop %0 \n\t"
+@@ -4116,6 +4129,11 @@ static void __noclone vmx_vcpu_run(struc
#endif
- [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2))
+ [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
+ [wordsize]"i"(sizeof(ulong))
+
+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
+ ,[cs]"i"(__KERNEL_CS)
: "cc", "memory"
, R"ax", R"bx", R"di", R"si"
#ifdef CONFIG_X86_64
-@@ -4091,7 +4109,16 @@ static void vmx_vcpu_run(struct kvm_vcpu
+@@ -4130,7 +4148,16 @@ static void __noclone vmx_vcpu_run(struc
vmx->idt_vectoring_info = vmcs_read32(IDT_VECTORING_INFO_FIELD);
vmx->launched = 1;
vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
-@@ -4326,7 +4353,7 @@ static void vmx_set_supported_cpuid(u32
+@@ -4368,7 +4395,7 @@ static void vmx_set_supported_cpuid(u32
{
}
.cpu_has_kvm_support = cpu_has_kvm_support,
.disabled_by_bios = vmx_disabled_by_bios,
.hardware_setup = hardware_setup,
-diff -urNp linux-2.6.38.4/arch/x86/kvm/x86.c linux-2.6.38.4/arch/x86/kvm/x86.c
---- linux-2.6.38.4/arch/x86/kvm/x86.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kvm/x86.c 2011-04-28 19:34:14.000000000 -0400
-@@ -93,7 +93,7 @@ static void update_cr8_intercept(struct
+diff -urNp linux-2.6.39/arch/x86/kvm/x86.c linux-2.6.39/arch/x86/kvm/x86.c
+--- linux-2.6.39/arch/x86/kvm/x86.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/kvm/x86.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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);
EXPORT_SYMBOL_GPL(kvm_x86_ops);
int ignore_msrs = 0;
-@@ -2023,6 +2023,8 @@ long kvm_arch_dev_ioctl(struct file *fil
+@@ -2050,6 +2050,8 @@ long kvm_arch_dev_ioctl(struct file *fil
if (n < msr_list.nmsrs)
goto out;
r = -EFAULT;
if (copy_to_user(user_msr_list->indices, &msrs_to_save,
num_msrs_to_save * sizeof(u32)))
goto out;
-@@ -2190,15 +2192,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(str
+@@ -2217,15 +2219,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(str
struct kvm_cpuid2 *cpuid,
struct kvm_cpuid_entry2 __user *entries)
{
vcpu->arch.cpuid_nent = cpuid->nent;
kvm_apic_set_version(vcpu);
kvm_x86_ops->cpuid_update(vcpu);
-@@ -2213,15 +2220,19 @@ static int kvm_vcpu_ioctl_get_cpuid2(str
+@@ -2240,15 +2247,19 @@ static int kvm_vcpu_ioctl_get_cpuid2(str
struct kvm_cpuid2 *cpuid,
struct kvm_cpuid_entry2 __user *entries)
{
return 0;
out:
-@@ -2499,7 +2510,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
+@@ -2526,7 +2537,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
struct kvm_interrupt *irq)
{
return -EINVAL;
if (irqchip_in_kernel(vcpu->kvm))
return -ENXIO;
-@@ -4687,10 +4698,10 @@ void kvm_after_handle_nmi(struct kvm_vcp
+@@ -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
}
EXPORT_SYMBOL_GPL(kvm_after_handle_nmi);
if (kvm_x86_ops) {
printk(KERN_ERR "kvm: already loaded the other module\n");
-diff -urNp linux-2.6.38.4/arch/x86/lib/atomic64_32.c linux-2.6.38.4/arch/x86/lib/atomic64_32.c
---- linux-2.6.38.4/arch/x86/lib/atomic64_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/atomic64_32.c 2011-04-28 19:57:25.000000000 -0400
-@@ -8,6 +8,8 @@
+diff -urNp linux-2.6.39/arch/x86/lib/atomic64_32.c linux-2.6.39/arch/x86/lib/atomic64_32.c
+--- linux-2.6.39/arch/x86/lib/atomic64_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/lib/atomic64_32.c 2011-05-22 19:36:30.000000000 -0400
+@@ -8,18 +8,30 @@
long long atomic64_read_cx8(long long, const atomic64_t *v);
EXPORT_SYMBOL(atomic64_read_cx8);
+EXPORT_SYMBOL(atomic64_read_unchecked_cx8);
long long atomic64_set_cx8(long long, const atomic64_t *v);
EXPORT_SYMBOL(atomic64_set_cx8);
++long long atomic64_set_unchecked_cx8(long long, const atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_set_unchecked_cx8);
long long atomic64_xchg_cx8(long long, unsigned high);
-@@ -18,6 +20,8 @@ long long atomic64_sub_return_cx8(long l
+ EXPORT_SYMBOL(atomic64_xchg_cx8);
+ long long atomic64_add_return_cx8(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_add_return_cx8);
++long long atomic64_add_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_add_return_unchecked_cx8);
+ long long atomic64_sub_return_cx8(long long a, atomic64_t *v);
EXPORT_SYMBOL(atomic64_sub_return_cx8);
++long long atomic64_sub_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_sub_return_unchecked_cx8);
long long atomic64_inc_return_cx8(long long a, atomic64_t *v);
EXPORT_SYMBOL(atomic64_inc_return_cx8);
+long long atomic64_inc_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
+EXPORT_SYMBOL(atomic64_inc_return_unchecked_cx8);
long long atomic64_dec_return_cx8(long long a, atomic64_t *v);
EXPORT_SYMBOL(atomic64_dec_return_cx8);
++long long atomic64_dec_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_dec_return_unchecked_cx8);
long long atomic64_dec_if_positive_cx8(atomic64_t *v);
-diff -urNp linux-2.6.38.4/arch/x86/lib/atomic64_cx8_32.S linux-2.6.38.4/arch/x86/lib/atomic64_cx8_32.S
---- linux-2.6.38.4/arch/x86/lib/atomic64_cx8_32.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/atomic64_cx8_32.S 2011-04-28 19:57:25.000000000 -0400
-@@ -41,6 +41,14 @@ ENTRY(atomic64_read_cx8)
+ EXPORT_SYMBOL(atomic64_dec_if_positive_cx8);
+ int atomic64_inc_not_zero_cx8(atomic64_t *v);
+@@ -30,26 +42,46 @@ EXPORT_SYMBOL(atomic64_add_unless_cx8);
+ #ifndef CONFIG_X86_CMPXCHG64
+ long long atomic64_read_386(long long, const atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_read_386);
++long long atomic64_read_unchecked_386(long long, const atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_read_unchecked_386);
+ long long atomic64_set_386(long long, const atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_set_386);
++long long atomic64_set_unchecked_386(long long, const atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_set_unchecked_386);
+ long long atomic64_xchg_386(long long, unsigned high);
+ EXPORT_SYMBOL(atomic64_xchg_386);
+ long long atomic64_add_return_386(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_add_return_386);
++long long atomic64_add_return_unchecked_386(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_add_return_unchecked_386);
+ long long atomic64_sub_return_386(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_sub_return_386);
++long long atomic64_sub_return_unchecked_386(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_sub_return_unchecked_386);
+ long long atomic64_inc_return_386(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_inc_return_386);
++long long atomic64_inc_return_unchecked_386(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_inc_return_unchecked_386);
+ long long atomic64_dec_return_386(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_dec_return_386);
++long long atomic64_dec_return_unchecked_386(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_dec_return_unchecked_386);
+ long long atomic64_add_386(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_add_386);
++long long atomic64_add_unchecked_386(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_add_unchecked_386);
+ long long atomic64_sub_386(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_sub_386);
++long long atomic64_sub_unchecked_386(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_sub_unchecked_386);
+ long long atomic64_inc_386(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_inc_386);
++long long atomic64_inc_unchecked_386(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_inc_unchecked_386);
+ long long atomic64_dec_386(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_dec_386);
++long long atomic64_dec_unchecked_386(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_dec_unchecked_386);
+ long long atomic64_dec_if_positive_386(atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_dec_if_positive_386);
+ int atomic64_inc_not_zero_386(atomic64_t *v);
+diff -urNp linux-2.6.39/arch/x86/lib/atomic64_386_32.S linux-2.6.39/arch/x86/lib/atomic64_386_32.S
+--- linux-2.6.39/arch/x86/lib/atomic64_386_32.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/lib/atomic64_386_32.S 2011-05-22 19:36:30.000000000 -0400
+@@ -48,6 +48,10 @@ BEGIN(read)
+ movl (v), %eax
+ movl 4(v), %edx
+ RET_ENDP
++BEGIN(read_unchecked)
++ movl (v), %eax
++ movl 4(v), %edx
++RET_ENDP
+ #undef v
+
+ #define v %esi
+@@ -55,6 +59,10 @@ BEGIN(set)
+ movl %ebx, (v)
+ movl %ecx, 4(v)
+ RET_ENDP
++BEGIN(set_unchecked)
++ movl %ebx, (v)
++ movl %ecx, 4(v)
++RET_ENDP
+ #undef v
+
+ #define v %esi
+@@ -70,6 +78,20 @@ RET_ENDP
+ BEGIN(add)
+ addl %eax, (v)
+ adcl %edx, 4(v)
++
++#ifdef CONFIG_PAX_REFCOUNT
++ jno 0f
++ subl %eax, (v)
++ sbbl %edx, 4(v)
++ int $4
++0:
++ _ASM_EXTABLE(0b, 0b)
++#endif
++
++RET_ENDP
++BEGIN(add_unchecked)
++ addl %eax, (v)
++ adcl %edx, 4(v)
+ RET_ENDP
+ #undef v
+
+@@ -77,6 +99,24 @@ RET_ENDP
+ BEGIN(add_return)
+ addl (v), %eax
+ adcl 4(v), %edx
++
++#ifdef CONFIG_PAX_REFCOUNT
++ into
++1234:
++ _ASM_EXTABLE(1234b, 2f)
++#endif
++
++ movl %eax, (v)
++ movl %edx, 4(v)
++
++#ifdef CONFIG_PAX_REFCOUNT
++2:
++#endif
++
++RET_ENDP
++BEGIN(add_return_unchecked)
++ addl (v), %eax
++ adcl 4(v), %edx
+ movl %eax, (v)
+ movl %edx, 4(v)
+ RET_ENDP
+@@ -86,6 +126,20 @@ RET_ENDP
+ BEGIN(sub)
+ subl %eax, (v)
+ sbbl %edx, 4(v)
++
++#ifdef CONFIG_PAX_REFCOUNT
++ jno 0f
++ addl %eax, (v)
++ adcl %edx, 4(v)
++ int $4
++0:
++ _ASM_EXTABLE(0b, 0b)
++#endif
++
++RET_ENDP
++BEGIN(sub_unchecked)
++ subl %eax, (v)
++ sbbl %edx, 4(v)
+ RET_ENDP
+ #undef v
+
+@@ -96,6 +150,27 @@ BEGIN(sub_return)
+ sbbl $0, %edx
+ addl (v), %eax
+ adcl 4(v), %edx
++
++#ifdef CONFIG_PAX_REFCOUNT
++ into
++1234:
++ _ASM_EXTABLE(1234b, 2f)
++#endif
++
++ movl %eax, (v)
++ movl %edx, 4(v)
++
++#ifdef CONFIG_PAX_REFCOUNT
++2:
++#endif
++
++RET_ENDP
++BEGIN(sub_return_unchecked)
++ negl %edx
++ negl %eax
++ sbbl $0, %edx
++ addl (v), %eax
++ adcl 4(v), %edx
+ movl %eax, (v)
+ movl %edx, 4(v)
+ RET_ENDP
+@@ -105,6 +180,20 @@ RET_ENDP
+ BEGIN(inc)
+ addl $1, (v)
+ adcl $0, 4(v)
++
++#ifdef CONFIG_PAX_REFCOUNT
++ jno 0f
++ subl $1, (v)
++ sbbl $0, 4(v)
++ int $4
++0:
++ _ASM_EXTABLE(0b, 0b)
++#endif
++
++RET_ENDP
++BEGIN(inc_unchecked)
++ addl $1, (v)
++ adcl $0, 4(v)
+ RET_ENDP
+ #undef v
+
+@@ -114,6 +203,26 @@ BEGIN(inc_return)
+ movl 4(v), %edx
+ addl $1, %eax
+ adcl $0, %edx
++
++#ifdef CONFIG_PAX_REFCOUNT
++ into
++1234:
++ _ASM_EXTABLE(1234b, 2f)
++#endif
++
++ movl %eax, (v)
++ movl %edx, 4(v)
++
++#ifdef CONFIG_PAX_REFCOUNT
++2:
++#endif
++
++RET_ENDP
++BEGIN(inc_return_unchecked)
++ movl (v), %eax
++ movl 4(v), %edx
++ addl $1, %eax
++ adcl $0, %edx
+ movl %eax, (v)
+ movl %edx, 4(v)
+ RET_ENDP
+@@ -123,6 +232,20 @@ RET_ENDP
+ BEGIN(dec)
+ subl $1, (v)
+ sbbl $0, 4(v)
++
++#ifdef CONFIG_PAX_REFCOUNT
++ jno 0f
++ addl $1, (v)
++ adcl $0, 4(v)
++ int $4
++0:
++ _ASM_EXTABLE(0b, 0b)
++#endif
++
++RET_ENDP
++BEGIN(dec_unchecked)
++ subl $1, (v)
++ sbbl $0, 4(v)
+ RET_ENDP
+ #undef v
+
+@@ -132,6 +255,26 @@ BEGIN(dec_return)
+ movl 4(v), %edx
+ subl $1, %eax
+ sbbl $0, %edx
++
++#ifdef CONFIG_PAX_REFCOUNT
++ into
++1234:
++ _ASM_EXTABLE(1234b, 2f)
++#endif
++
++ movl %eax, (v)
++ movl %edx, 4(v)
++
++#ifdef CONFIG_PAX_REFCOUNT
++2:
++#endif
++
++RET_ENDP
++BEGIN(dec_return_unchecked)
++ movl (v), %eax
++ movl 4(v), %edx
++ subl $1, %eax
++ sbbl $0, %edx
+ movl %eax, (v)
+ movl %edx, 4(v)
+ RET_ENDP
+@@ -143,6 +286,13 @@ BEGIN(add_unless)
+ adcl %edx, %edi
+ addl (v), %eax
+ adcl 4(v), %edx
++
++#ifdef CONFIG_PAX_REFCOUNT
++ into
++1234:
++ _ASM_EXTABLE(1234b, 2f)
++#endif
++
+ cmpl %eax, %esi
+ je 3f
+ 1:
+@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
+ 1:
+ addl $1, %eax
+ adcl $0, %edx
++
++#ifdef CONFIG_PAX_REFCOUNT
++ into
++1234:
++ _ASM_EXTABLE(1234b, 2f)
++#endif
++
+ movl %eax, (v)
+ movl %edx, 4(v)
+ movl $1, %eax
+@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
+ movl 4(v), %edx
+ subl $1, %eax
+ sbbl $0, %edx
++
++#ifdef CONFIG_PAX_REFCOUNT
++ into
++1234:
++ _ASM_EXTABLE(1234b, 1f)
++#endif
++
+ js 1f
+ movl %eax, (v)
+ movl %edx, 4(v)
+diff -urNp linux-2.6.39/arch/x86/lib/atomic64_cx8_32.S linux-2.6.39/arch/x86/lib/atomic64_cx8_32.S
+--- linux-2.6.39/arch/x86/lib/atomic64_cx8_32.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/lib/atomic64_cx8_32.S 2011-05-22 19:36:30.000000000 -0400
+@@ -39,6 +39,14 @@ ENTRY(atomic64_read_cx8)
CFI_ENDPROC
ENDPROC(atomic64_read_cx8)
+ read64 %ecx
+ ret
+ CFI_ENDPROC
-+ENDPROC(atomic64_read_cx8)
++ENDPROC(atomic64_read_unchecked_cx8)
+
ENTRY(atomic64_set_cx8)
CFI_STARTPROC
-@@ -68,8 +76,8 @@ ENTRY(atomic64_xchg_cx8)
+@@ -52,6 +60,19 @@ ENTRY(atomic64_set_cx8)
+ CFI_ENDPROC
+ ENDPROC(atomic64_set_cx8)
+
++ENTRY(atomic64_set_unchecked_cx8)
++ CFI_STARTPROC
++
++1:
++/* we don't need LOCK_PREFIX since aligned 64-bit writes
++ * are atomic on 586 and newer */
++ cmpxchg8b (%esi)
++ jne 1b
++
++ ret
++ CFI_ENDPROC
++ENDPROC(atomic64_set_unchecked_cx8)
++
+ ENTRY(atomic64_xchg_cx8)
+ CFI_STARTPROC
+
+@@ -66,8 +87,8 @@ ENTRY(atomic64_xchg_cx8)
CFI_ENDPROC
ENDPROC(atomic64_xchg_cx8)
CFI_STARTPROC
SAVE ebp
SAVE ebx
-@@ -86,13 +94,27 @@ ENTRY(atomic64_\func\()_return_cx8)
+@@ -84,27 +105,43 @@ ENTRY(atomic64_\func\()_return_cx8)
movl %edx, %ecx
\ins\()l %esi, %ebx
\insc\()l %edi, %ecx
RESTORE edi
RESTORE esi
RESTORE ebx
-@@ -104,9 +126,10 @@ ENDPROC(atomic64_\func\()_return_cx8)
+ RESTORE ebp
+ ret
+ CFI_ENDPROC
+-ENDPROC(atomic64_\func\()_return_cx8)
++ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
+ .endm
addsub_return add add adc
addsub_return sub sub sbb
+addsub_return add add adc _unchecked
++addsub_return sub sub sbb _unchecked
-.macro incdec_return func ins insc
-ENTRY(atomic64_\func\()_return_cx8)
CFI_STARTPROC
SAVE ebx
-@@ -116,13 +139,28 @@ ENTRY(atomic64_\func\()_return_cx8)
+@@ -114,21 +151,38 @@ ENTRY(atomic64_\func\()_return_cx8)
movl %edx, %ecx
\ins\()l $1, %ebx
\insc\()l $0, %ecx
RESTORE ebx
ret
CFI_ENDPROC
-@@ -131,6 +169,7 @@ ENDPROC(atomic64_\func\()_return_cx8)
+-ENDPROC(atomic64_\func\()_return_cx8)
++ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
+ .endm
incdec_return inc add adc
incdec_return dec sub sbb
+incdec_return inc add adc _unchecked
++incdec_return dec sub sbb _unchecked
ENTRY(atomic64_dec_if_positive_cx8)
CFI_STARTPROC
-@@ -176,6 +215,13 @@ ENTRY(atomic64_add_unless_cx8)
+@@ -140,6 +194,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
+ movl %edx, %ecx
+ subl $1, %ebx
+ sbb $0, %ecx
++
++#ifdef CONFIG_PAX_REFCOUNT
++ into
++1234:
++ _ASM_EXTABLE(1234b, 2f)
++#endif
++
+ js 2f
+ LOCK_PREFIX
+ cmpxchg8b (%esi)
+@@ -174,6 +235,13 @@ ENTRY(atomic64_add_unless_cx8)
movl %edx, %ecx
addl %esi, %ebx
adcl %edi, %ecx
+#ifdef CONFIG_PAX_REFCOUNT
+ into
+1234:
-+ _ASM_EXTABLE(1234b, 1234b)
++ _ASM_EXTABLE(1234b, 3f)
+#endif
+
LOCK_PREFIX
cmpxchg8b (%ebp)
jne 1b
-@@ -208,6 +254,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
+@@ -206,6 +274,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
movl %edx, %ecx
addl $1, %ebx
adcl $0, %ecx
+#ifdef CONFIG_PAX_REFCOUNT
+ into
+1234:
-+ _ASM_EXTABLE(1234b, 1234b)
++ _ASM_EXTABLE(1234b, 3f)
+#endif
+
LOCK_PREFIX
cmpxchg8b (%esi)
jne 1b
-diff -urNp linux-2.6.38.4/arch/x86/lib/checksum_32.S linux-2.6.38.4/arch/x86/lib/checksum_32.S
---- linux-2.6.38.4/arch/x86/lib/checksum_32.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/checksum_32.S 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/lib/checksum_32.S linux-2.6.39/arch/x86/lib/checksum_32.S
+--- linux-2.6.39/arch/x86/lib/checksum_32.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/lib/checksum_32.S 2011-05-22 19:36:30.000000000 -0400
@@ -28,7 +28,8 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
/*
* computes a partial checksum, e.g. for TCP/UDP fragments
*/
-@@ -304,9 +305,28 @@ unsigned int csum_partial_copy_generic (
+@@ -296,9 +297,24 @@ unsigned int csum_partial_copy_generic (
#define ARGBASE 16
#define FP 12
CFI_STARTPROC
+
+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ pushl %gs
-+ CFI_ADJUST_CFA_OFFSET 4
-+ popl %es
-+ CFI_ADJUST_CFA_OFFSET -4
++ pushl_cfi %gs
++ popl_cfi %es
+ jmp csum_partial_copy_generic
+#endif
+
+ENTRY(csum_partial_copy_generic_from_user)
+
+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ pushl %gs
-+ CFI_ADJUST_CFA_OFFSET 4
-+ popl %ds
-+ CFI_ADJUST_CFA_OFFSET -4
++ pushl_cfi %gs
++ popl_cfi %ds
+#endif
+
+ENTRY(csum_partial_copy_generic)
subl $4,%esp
CFI_ADJUST_CFA_OFFSET 4
- pushl %edi
-@@ -331,7 +351,7 @@ ENTRY(csum_partial_copy_generic)
+ pushl_cfi %edi
+@@ -320,7 +336,7 @@ ENTRY(csum_partial_copy_generic)
jmp 4f
SRC(1: movw (%esi), %bx )
addl $2, %esi
addl $2, %edi
addw %bx, %ax
adcl $0, %eax
-@@ -343,30 +363,30 @@ DST( movw %bx, (%edi) )
+@@ -332,30 +348,30 @@ DST( movw %bx, (%edi) )
SRC(1: movl (%esi), %ebx )
SRC( movl 4(%esi), %edx )
adcl %ebx, %eax
lea 32(%esi), %esi
lea 32(%edi), %edi
-@@ -380,7 +400,7 @@ DST( movl %edx, 28(%edi) )
+@@ -369,7 +385,7 @@ DST( movl %edx, 28(%edi) )
shrl $2, %edx # This clears CF
SRC(3: movl (%esi), %ebx )
adcl %ebx, %eax
lea 4(%esi), %esi
lea 4(%edi), %edi
dec %edx
-@@ -392,12 +412,12 @@ DST( movl %ebx, (%edi) )
+@@ -381,12 +397,12 @@ DST( movl %ebx, (%edi) )
jb 5f
SRC( movw (%esi), %cx )
leal 2(%esi), %esi
6: addl %ecx, %eax
adcl $0, %eax
7:
-@@ -408,7 +428,7 @@ DST( movb %cl, (%edi) )
+@@ -397,7 +413,7 @@ DST( movb %cl, (%edi) )
6001:
movl ARGBASE+20(%esp), %ebx # src_err_ptr
# zero the complete destination - computing the rest
# is too much work
-@@ -421,11 +441,19 @@ DST( movb %cl, (%edi) )
+@@ -410,11 +426,15 @@ DST( movb %cl, (%edi) )
6002:
movl ARGBASE+24(%esp), %ebx # dst_err_ptr
.previous
-+ pushl %ss
-+ CFI_ADJUST_CFA_OFFSET 4
-+ popl %ds
-+ CFI_ADJUST_CFA_OFFSET -4
-+ pushl %ss
-+ CFI_ADJUST_CFA_OFFSET 4
-+ popl %es
-+ CFI_ADJUST_CFA_OFFSET -4
- popl %ebx
- CFI_ADJUST_CFA_OFFSET -4
++ pushl_cfi %ss
++ popl_cfi %ds
++ pushl_cfi %ss
++ popl_cfi %es
+ popl_cfi %ebx
CFI_RESTORE ebx
-@@ -439,26 +467,47 @@ DST( movb %cl, (%edi) )
- CFI_ADJUST_CFA_OFFSET -4
+ popl_cfi %esi
+@@ -424,26 +444,43 @@ DST( movb %cl, (%edi) )
+ popl_cfi %ecx # equivalent to addl $4,%esp
ret
CFI_ENDPROC
-ENDPROC(csum_partial_copy_generic)
CFI_STARTPROC
+
+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ pushl %gs
-+ CFI_ADJUST_CFA_OFFSET 4
-+ popl %es
-+ CFI_ADJUST_CFA_OFFSET -4
++ pushl_cfi %gs
++ popl_cfi %es
+ jmp csum_partial_copy_generic
+#endif
+
+ENTRY(csum_partial_copy_generic_from_user)
+
+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ pushl %gs
-+ CFI_ADJUST_CFA_OFFSET 4
-+ popl %ds
-+ CFI_ADJUST_CFA_OFFSET -4
++ pushl_cfi %gs
++ popl_cfi %ds
+#endif
+
+ENTRY(csum_partial_copy_generic)
- pushl %ebx
- CFI_ADJUST_CFA_OFFSET 4
+ pushl_cfi %ebx
CFI_REL_OFFSET ebx, 0
-@@ -482,7 +531,7 @@ ENTRY(csum_partial_copy_generic)
+ pushl_cfi %edi
+@@ -464,7 +501,7 @@ ENTRY(csum_partial_copy_generic)
subl %ebx, %edi
lea -1(%esi),%edx
andl $-32,%edx
testl %esi, %esi
jmp *%ebx
1: addl $64,%esi
-@@ -503,19 +552,19 @@ ENTRY(csum_partial_copy_generic)
+@@ -485,19 +522,19 @@ ENTRY(csum_partial_copy_generic)
jb 5f
SRC( movw (%esi), %dx )
leal 2(%esi), %esi
# zero the complete destination (computing the rest is too much work)
movl ARGBASE+8(%esp),%edi # dst
movl ARGBASE+12(%esp),%ecx # len
-@@ -523,10 +572,21 @@ DST( movb %dl, (%edi) )
+@@ -505,10 +542,17 @@ DST( movb %dl, (%edi) )
rep; stosb
jmp 7b
6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
.previous
+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ pushl %ss
-+ CFI_ADJUST_CFA_OFFSET 4
-+ popl %ds
-+ CFI_ADJUST_CFA_OFFSET -4
-+ pushl %ss
-+ CFI_ADJUST_CFA_OFFSET 4
-+ popl %es
-+ CFI_ADJUST_CFA_OFFSET -4
++ pushl_cfi %ss
++ popl_cfi %ds
++ pushl_cfi %ss
++ popl_cfi %es
+#endif
+
- popl %esi
- CFI_ADJUST_CFA_OFFSET -4
+ popl_cfi %esi
CFI_RESTORE esi
-@@ -538,7 +598,7 @@ DST( movb %dl, (%edi) )
+ popl_cfi %edi
+@@ -517,7 +561,7 @@ DST( movb %dl, (%edi) )
CFI_RESTORE ebx
ret
CFI_ENDPROC
#undef ROUND
#undef ROUND1
-diff -urNp linux-2.6.38.4/arch/x86/lib/clear_page_64.S linux-2.6.38.4/arch/x86/lib/clear_page_64.S
---- linux-2.6.38.4/arch/x86/lib/clear_page_64.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/clear_page_64.S 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/lib/clear_page_64.S linux-2.6.39/arch/x86/lib/clear_page_64.S
+--- linux-2.6.39/arch/x86/lib/clear_page_64.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/lib/clear_page_64.S 2011-05-22 19:36:30.000000000 -0400
@@ -43,7 +43,7 @@ ENDPROC(clear_page)
#include <asm/cpufeature.h>
1: .byte 0xeb /* jmp <disp8> */
.byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
2:
-diff -urNp linux-2.6.38.4/arch/x86/lib/copy_page_64.S linux-2.6.38.4/arch/x86/lib/copy_page_64.S
---- linux-2.6.38.4/arch/x86/lib/copy_page_64.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/copy_page_64.S 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/lib/copy_page_64.S linux-2.6.39/arch/x86/lib/copy_page_64.S
+--- linux-2.6.39/arch/x86/lib/copy_page_64.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/lib/copy_page_64.S 2011-05-22 19:36:30.000000000 -0400
@@ -104,7 +104,7 @@ ENDPROC(copy_page)
#include <asm/cpufeature.h>
1: .byte 0xeb /* jmp <disp8> */
.byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
2:
-diff -urNp linux-2.6.38.4/arch/x86/lib/copy_user_64.S linux-2.6.38.4/arch/x86/lib/copy_user_64.S
---- linux-2.6.38.4/arch/x86/lib/copy_user_64.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/copy_user_64.S 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/lib/copy_user_64.S linux-2.6.39/arch/x86/lib/copy_user_64.S
+--- linux-2.6.39/arch/x86/lib/copy_user_64.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/lib/copy_user_64.S 2011-05-22 19:36:30.000000000 -0400
@@ -15,13 +15,14 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
movl %edx,%ecx
xorl %eax,%eax
rep
-diff -urNp linux-2.6.38.4/arch/x86/lib/copy_user_nocache_64.S linux-2.6.38.4/arch/x86/lib/copy_user_nocache_64.S
---- linux-2.6.38.4/arch/x86/lib/copy_user_nocache_64.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/copy_user_nocache_64.S 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/lib/copy_user_nocache_64.S linux-2.6.39/arch/x86/lib/copy_user_nocache_64.S
+--- linux-2.6.39/arch/x86/lib/copy_user_nocache_64.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/lib/copy_user_nocache_64.S 2011-05-22 19:36:30.000000000 -0400
@@ -14,6 +14,7 @@
#include <asm/current.h>
#include <asm/asm-offsets.h>
cmpl $8,%edx
jb 20f /* less then 8 bytes, go to byte copy loop */
ALIGN_DESTINATION
-diff -urNp linux-2.6.38.4/arch/x86/lib/csum-wrappers_64.c linux-2.6.38.4/arch/x86/lib/csum-wrappers_64.c
---- linux-2.6.38.4/arch/x86/lib/csum-wrappers_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/csum-wrappers_64.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/lib/csum-wrappers_64.c linux-2.6.39/arch/x86/lib/csum-wrappers_64.c
+--- linux-2.6.39/arch/x86/lib/csum-wrappers_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/lib/csum-wrappers_64.c 2011-05-22 19:36:30.000000000 -0400
@@ -52,6 +52,12 @@ csum_partial_copy_from_user(const void _
len -= 2;
}
return csum_partial_copy_generic(src, (void __force *)dst,
len, isum, NULL, errp);
}
-diff -urNp linux-2.6.38.4/arch/x86/lib/getuser.S linux-2.6.38.4/arch/x86/lib/getuser.S
---- linux-2.6.38.4/arch/x86/lib/getuser.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/getuser.S 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/lib/getuser.S linux-2.6.39/arch/x86/lib/getuser.S
+--- linux-2.6.39/arch/x86/lib/getuser.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/lib/getuser.S 2011-05-22 19:36:30.000000000 -0400
@@ -33,14 +33,35 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
4: movq -7(%_ASM_AX),%_ASM_DX
xor %eax,%eax
ret
-diff -urNp linux-2.6.38.4/arch/x86/lib/insn.c linux-2.6.38.4/arch/x86/lib/insn.c
---- linux-2.6.38.4/arch/x86/lib/insn.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/insn.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/lib/insn.c linux-2.6.39/arch/x86/lib/insn.c
+--- linux-2.6.39/arch/x86/lib/insn.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/lib/insn.c 2011-05-22 19:36:30.000000000 -0400
@@ -21,6 +21,11 @@
#include <linux/string.h>
#include <asm/inat.h>
insn->x86_64 = x86_64 ? 1 : 0;
insn->opnd_bytes = 4;
if (x86_64)
-diff -urNp linux-2.6.38.4/arch/x86/lib/mmx_32.c linux-2.6.38.4/arch/x86/lib/mmx_32.c
---- linux-2.6.38.4/arch/x86/lib/mmx_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/mmx_32.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/lib/mmx_32.c linux-2.6.39/arch/x86/lib/mmx_32.c
+--- linux-2.6.39/arch/x86/lib/mmx_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/lib/mmx_32.c 2011-05-22 19:36:30.000000000 -0400
@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
{
void *p;
from += 64;
to += 64;
-diff -urNp linux-2.6.38.4/arch/x86/lib/putuser.S linux-2.6.38.4/arch/x86/lib/putuser.S
---- linux-2.6.38.4/arch/x86/lib/putuser.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/putuser.S 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/lib/putuser.S linux-2.6.39/arch/x86/lib/putuser.S
+--- linux-2.6.39/arch/x86/lib/putuser.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/lib/putuser.S 2011-05-22 19:36:30.000000000 -0400
@@ -15,7 +15,8 @@
#include <asm/thread_info.h>
#include <asm/errno.h>
#endif
xor %eax,%eax
EXIT
-diff -urNp linux-2.6.38.4/arch/x86/lib/usercopy_32.c linux-2.6.38.4/arch/x86/lib/usercopy_32.c
---- linux-2.6.38.4/arch/x86/lib/usercopy_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/usercopy_32.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/lib/usercopy_32.c linux-2.6.39/arch/x86/lib/usercopy_32.c
+--- linux-2.6.39/arch/x86/lib/usercopy_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/lib/usercopy_32.c 2011-05-22 19:36:30.000000000 -0400
@@ -43,7 +43,7 @@ do { \
__asm__ __volatile__( \
" testl %1,%1\n" \
+}
+EXPORT_SYMBOL(set_fs);
+#endif
-diff -urNp linux-2.6.38.4/arch/x86/lib/usercopy_64.c linux-2.6.38.4/arch/x86/lib/usercopy_64.c
---- linux-2.6.38.4/arch/x86/lib/usercopy_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/usercopy_64.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/lib/usercopy_64.c linux-2.6.39/arch/x86/lib/usercopy_64.c
+--- linux-2.6.39/arch/x86/lib/usercopy_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/lib/usercopy_64.c 2011-05-22 19:36:30.000000000 -0400
@@ -42,6 +42,12 @@ long
__strncpy_from_user(char *dst, const char __user *src, long count)
{
}
EXPORT_SYMBOL(copy_in_user);
-diff -urNp linux-2.6.38.4/arch/x86/Makefile linux-2.6.38.4/arch/x86/Makefile
---- linux-2.6.38.4/arch/x86/Makefile 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/Makefile 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/Makefile linux-2.6.39/arch/x86/Makefile
+--- linux-2.6.39/arch/x86/Makefile 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/Makefile 2011-05-22 19:36:30.000000000 -0400
@@ -195,3 +195,12 @@ define archhelp
echo ' FDARGS="..." arguments for the booted kernel'
echo ' FDINITRD=file initrd for the booted kernel'
+
+archprepare:
+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff -urNp linux-2.6.38.4/arch/x86/mm/extable.c linux-2.6.38.4/arch/x86/mm/extable.c
---- linux-2.6.38.4/arch/x86/mm/extable.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/extable.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/mm/extable.c linux-2.6.39/arch/x86/mm/extable.c
+--- linux-2.6.39/arch/x86/mm/extable.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/extable.c 2011-05-22 19:36:30.000000000 -0400
@@ -1,14 +1,71 @@
#include <linux/module.h>
#include <linux/spinlock.h>
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.38.4/arch/x86/mm/fault.c linux-2.6.38.4/arch/x86/mm/fault.c
---- linux-2.6.38.4/arch/x86/mm/fault.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/fault.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/mm/fault.c linux-2.6.39/arch/x86/mm/fault.c
+--- linux-2.6.39/arch/x86/mm/fault.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/fault.c 2011-05-22 20:33:41.000000000 -0400
@@ -12,10 +12,18 @@
#include <linux/mmiotrace.h> /* kmmio_handler, ... */
#include <linux/perf_event.h> /* perf_sw_event */
+ if (address < PAX_USER_SHADOW_BASE) {
+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
+ printk(KERN_ERR "PAX: faulting IP: %pA\n", (void *)regs->ip);
-+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, KERN_ERR);
++ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
+ } else
+ address -= PAX_USER_SHADOW_BASE;
+ }
+
+ return ret ? -EFAULT : 0;
+}
-diff -urNp linux-2.6.38.4/arch/x86/mm/gup.c linux-2.6.38.4/arch/x86/mm/gup.c
---- linux-2.6.38.4/arch/x86/mm/gup.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/gup.c 2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/mm/gup.c linux-2.6.39/arch/x86/mm/gup.c
+--- linux-2.6.39/arch/x86/mm/gup.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/gup.c 2011-05-22 19:36:30.000000000 -0400
@@ -263,7 +263,7 @@ int __get_user_pages_fast(unsigned long
addr = start;
len = (unsigned long) nr_pages << PAGE_SHIFT;
(void __user *)start, len)))
return 0;
-diff -urNp linux-2.6.38.4/arch/x86/mm/highmem_32.c linux-2.6.38.4/arch/x86/mm/highmem_32.c
---- linux-2.6.38.4/arch/x86/mm/highmem_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/highmem_32.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/mm/highmem_32.c linux-2.6.39/arch/x86/mm/highmem_32.c
+--- linux-2.6.39/arch/x86/mm/highmem_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/highmem_32.c 2011-05-22 19:36:30.000000000 -0400
@@ -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);
return (void *)vaddr;
}
-diff -urNp linux-2.6.38.4/arch/x86/mm/hugetlbpage.c linux-2.6.38.4/arch/x86/mm/hugetlbpage.c
---- linux-2.6.38.4/arch/x86/mm/hugetlbpage.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/hugetlbpage.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/mm/hugetlbpage.c linux-2.6.39/arch/x86/mm/hugetlbpage.c
+--- linux-2.6.39/arch/x86/mm/hugetlbpage.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/hugetlbpage.c 2011-05-22 19:36:30.000000000 -0400
@@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
if (mm->free_area_cache < len)
goto fail;
- /* either no address requested or cant fit in requested address hole */
+ /* either no address requested or can't fit in requested address hole */
- addr = (mm->free_area_cache - len) & huge_page_mask(h);
+ addr = (mm->free_area_cache - len);
do {
return addr;
}
if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-2.6.38.4/arch/x86/mm/init_32.c linux-2.6.38.4/arch/x86/mm/init_32.c
---- linux-2.6.38.4/arch/x86/mm/init_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/init_32.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/mm/init_32.c linux-2.6.39/arch/x86/mm/init_32.c
+--- linux-2.6.39/arch/x86/mm/init_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/init_32.c 2011-05-22 19:36:30.000000000 -0400
@@ -74,36 +74,6 @@ static __init void *alloc_low_page(void)
}
EXPORT_SYMBOL_GPL(__supported_pte_mask);
/* user-defined highmem size */
-@@ -755,6 +754,12 @@ void __init mem_init(void)
+@@ -754,6 +753,12 @@ void __init mem_init(void)
pci_iommu_alloc();
#ifdef CONFIG_FLATMEM
BUG_ON(!mem_map);
#endif
-@@ -772,7 +777,7 @@ void __init mem_init(void)
+@@ -771,7 +776,7 @@ void __init mem_init(void)
set_highmem_pages_init();
codesize = (unsigned long) &_etext - (unsigned long) &_text;
initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
-@@ -813,10 +818,10 @@ void __init mem_init(void)
+@@ -812,10 +817,10 @@ void __init mem_init(void)
((unsigned long)&__init_end -
(unsigned long)&__init_begin) >> 10,
((unsigned long)&_etext - (unsigned long)&_text) >> 10);
/*
-@@ -894,6 +899,7 @@ void set_kernel_text_rw(void)
+@@ -893,6 +898,7 @@ void set_kernel_text_rw(void)
if (!kernel_set_to_readonly)
return;
pr_debug("Set kernel text: %lx - %lx for read write\n",
start, start+size);
-@@ -908,6 +914,7 @@ void set_kernel_text_ro(void)
+@@ -907,6 +913,7 @@ void set_kernel_text_ro(void)
if (!kernel_set_to_readonly)
return;
pr_debug("Set kernel text: %lx - %lx for read only\n",
start, start+size);
-@@ -936,6 +943,7 @@ void mark_rodata_ro(void)
+@@ -935,6 +942,7 @@ void mark_rodata_ro(void)
unsigned long start = PFN_ALIGN(_text);
unsigned long size = PFN_ALIGN(_etext) - start;
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.38.4/arch/x86/mm/init_64.c linux-2.6.38.4/arch/x86/mm/init_64.c
---- linux-2.6.38.4/arch/x86/mm/init_64.c 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/init_64.c 2011-04-28 19:34:15.000000000 -0400
-@@ -72,7 +72,7 @@ early_param("gbpages", parse_direct_gbpa
+diff -urNp linux-2.6.39/arch/x86/mm/init_64.c linux-2.6.39/arch/x86/mm/init_64.c
+--- linux-2.6.39/arch/x86/mm/init_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/init_64.c 2011-05-22 19:36:30.000000000 -0400
+@@ -74,7 +74,7 @@ early_param("gbpages", parse_direct_gbpa
* around without checking the pgd every time.
*/
EXPORT_SYMBOL_GPL(__supported_pte_mask);
int force_personality32;
-@@ -105,12 +105,22 @@ void sync_global_pgds(unsigned long star
+@@ -107,12 +107,22 @@ void sync_global_pgds(unsigned long star
for (address = start; address <= end; address += PGDIR_SIZE) {
const pgd_t *pgd_ref = pgd_offset_k(address);
list_for_each_entry(page, &pgd_list, lru) {
pgd_t *pgd;
spinlock_t *pgt_lock;
-@@ -119,6 +129,7 @@ void sync_global_pgds(unsigned long star
+@@ -121,6 +131,7 @@ void sync_global_pgds(unsigned long star
/* the pgt_lock only for Xen */
pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
spin_lock(pgt_lock);
if (pgd_none(*pgd))
set_pgd(pgd, *pgd_ref);
-@@ -126,7 +137,10 @@ void sync_global_pgds(unsigned long star
+@@ -128,7 +139,10 @@ void sync_global_pgds(unsigned long star
BUG_ON(pgd_page_vaddr(*pgd)
!= pgd_page_vaddr(*pgd_ref));
}
spin_unlock(&pgd_lock);
}
-@@ -200,7 +214,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,
+@@ -202,7 +216,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,
pmd = fill_pmd(pud, vaddr);
pte = fill_pte(pmd, vaddr);
/*
* It's enough to flush this one mapping.
-@@ -259,14 +275,12 @@ static void __init __init_extra_mapping(
+@@ -261,14 +277,12 @@ static void __init __init_extra_mapping(
pgd = pgd_offset_k((unsigned long)__va(phys));
if (pgd_none(*pgd)) {
pud = (pud_t *) spp_getpage();
}
pmd = pmd_offset(pud, phys);
BUG_ON(!pmd_none(*pmd));
-@@ -706,6 +720,12 @@ void __init mem_init(void)
+@@ -698,6 +712,12 @@ void __init mem_init(void)
pci_iommu_alloc();
/* clear_bss() already clear the empty_zero_page */
reservedpages = 0;
-@@ -866,8 +886,8 @@ int kern_addr_valid(unsigned long addr)
+@@ -858,8 +878,8 @@ int kern_addr_valid(unsigned long addr)
static struct vm_area_struct gate_vma = {
.vm_start = VSYSCALL_START,
.vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
+ .vm_flags = VM_READ
};
- struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
-@@ -901,7 +921,7 @@ int in_gate_area_no_task(unsigned long a
+ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
+@@ -893,7 +913,7 @@ int in_gate_area_no_mm(unsigned long add
const char *arch_vma_name(struct vm_area_struct *vma)
{
return "[vdso]";
if (vma == &gate_vma)
return "[vsyscall]";
-diff -urNp linux-2.6.38.4/arch/x86/mm/init.c linux-2.6.38.4/arch/x86/mm/init.c
---- linux-2.6.38.4/arch/x86/mm/init.c 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/init.c 2011-04-28 19:34:15.000000000 -0400
-@@ -72,11 +72,7 @@ static void __init find_early_table_spac
- * cause a hotspot and fill up ZONE_DMA. The page tables
- * need roughly 0.5KB per GB.
- */
--#ifdef CONFIG_X86_32
-- start = 0x7000;
--#else
-- start = 0x8000;
--#endif
-+ start = 0x100000;
- base = memblock_find_in_range(start, max_pfn_mapped<<PAGE_SHIFT,
- tables, PAGE_SIZE);
- if (base == MEMBLOCK_ERROR)
-@@ -323,7 +319,16 @@ unsigned long __init_refok init_memory_m
+diff -urNp linux-2.6.39/arch/x86/mm/init.c linux-2.6.39/arch/x86/mm/init.c
+--- linux-2.6.39/arch/x86/mm/init.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/init.c 2011-05-23 19:01:08.000000000 -0400
+@@ -33,7 +33,7 @@ int direct_gbpages
+ static void __init find_early_table_space(unsigned long end, int use_pse,
+ int use_gbpages)
+ {
+- unsigned long puds, pmds, ptes, tables, start = 0, good_end = end;
++ unsigned long puds, pmds, ptes, tables, start = 0x100000, good_end = end;
+ phys_addr_t base;
+
+ puds = (end + PUD_SIZE - 1) >> PUD_SHIFT;
+@@ -315,12 +315,25 @@ unsigned long __init_refok init_memory_m
*/
int devmem_is_allowed(unsigned long pagenr)
{
+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
+ return 1;
+#endif
++#else
++ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
++ return 0;
+#endif
+
+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
return 1;
if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
return 0;
-@@ -383,6 +388,86 @@ void free_init_pages(char *what, unsigne
+ if (!page_is_ram(pagenr))
+ return 1;
++
+ return 0;
+ }
+
+@@ -375,6 +388,86 @@ void free_init_pages(char *what, unsigne
void free_initmem(void)
{
free_init_pages("unused kernel memory",
(unsigned long)(&__init_begin),
(unsigned long)(&__init_end));
-diff -urNp linux-2.6.38.4/arch/x86/mm/iomap_32.c linux-2.6.38.4/arch/x86/mm/iomap_32.c
---- linux-2.6.38.4/arch/x86/mm/iomap_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/iomap_32.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/mm/iomap_32.c linux-2.6.39/arch/x86/mm/iomap_32.c
+--- linux-2.6.39/arch/x86/mm/iomap_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/iomap_32.c 2011-05-22 19:36:30.000000000 -0400
@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long
type = kmap_atomic_idx_push();
idx = type + KM_TYPE_NR * smp_processor_id();
arch_flush_lazy_mmu_mode();
return (void *)vaddr;
-diff -urNp linux-2.6.38.4/arch/x86/mm/ioremap.c linux-2.6.38.4/arch/x86/mm/ioremap.c
---- linux-2.6.38.4/arch/x86/mm/ioremap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/ioremap.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/mm/ioremap.c linux-2.6.39/arch/x86/mm/ioremap.c
+--- linux-2.6.39/arch/x86/mm/ioremap.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/ioremap.c 2011-05-22 19:36:30.000000000 -0400
@@ -104,7 +104,7 @@ static void __iomem *__ioremap_caller(re
for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
int is_ram = page_is_ram(pfn);
/*
* The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-2.6.38.4/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.38.4/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-2.6.38.4/arch/x86/mm/kmemcheck/kmemcheck.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/kmemcheck/kmemcheck.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.39/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-2.6.39/arch/x86/mm/kmemcheck/kmemcheck.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/kmemcheck/kmemcheck.c 2011-05-22 19:36:30.000000000 -0400
@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
* memory (e.g. tracked pages)? For now, we need this to avoid
* invoking kmemcheck for PnP BIOS calls.
return false;
pte = kmemcheck_pte_lookup(address);
-diff -urNp linux-2.6.38.4/arch/x86/mm/mmap.c linux-2.6.38.4/arch/x86/mm/mmap.c
---- linux-2.6.38.4/arch/x86/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/mmap.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/mm/mmap.c linux-2.6.39/arch/x86/mm/mmap.c
+--- linux-2.6.39/arch/x86/mm/mmap.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/mmap.c 2011-05-22 19:36:30.000000000 -0400
@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
* Leave an at least ~128 MB hole with possible stack randomization.
*/
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.38.4/arch/x86/mm/mmio-mod.c linux-2.6.38.4/arch/x86/mm/mmio-mod.c
---- linux-2.6.38.4/arch/x86/mm/mmio-mod.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/mmio-mod.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/mm/mmio-mod.c linux-2.6.39/arch/x86/mm/mmio-mod.c
+--- linux-2.6.39/arch/x86/mm/mmio-mod.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/mmio-mod.c 2011-05-22 19:36:30.000000000 -0400
@@ -235,7 +235,7 @@ static void post(struct kmmio_probe *p,
static void ioremap_trace_core(resource_size_t offset, unsigned long size,
void __iomem *addr)
};
map.map_id = trace->id;
-diff -urNp linux-2.6.38.4/arch/x86/mm/numa_32.c linux-2.6.38.4/arch/x86/mm/numa_32.c
---- linux-2.6.38.4/arch/x86/mm/numa_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/numa_32.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/mm/numa_32.c linux-2.6.39/arch/x86/mm/numa_32.c
+--- linux-2.6.39/arch/x86/mm/numa_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/numa_32.c 2011-05-22 19:36:30.000000000 -0400
@@ -99,7 +99,6 @@ unsigned long node_memmap_size_bytes(int
}
#endif
extern unsigned long highend_pfn, highstart_pfn;
#define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
-diff -urNp linux-2.6.38.4/arch/x86/mm/pageattr.c linux-2.6.38.4/arch/x86/mm/pageattr.c
---- linux-2.6.38.4/arch/x86/mm/pageattr.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/pageattr.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/mm/pageattr.c linux-2.6.39/arch/x86/mm/pageattr.c
+--- linux-2.6.39/arch/x86/mm/pageattr.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/pageattr.c 2011-05-22 19:36:30.000000000 -0400
@@ -261,7 +261,7 @@ static inline pgprot_t static_protection
*/
#ifdef CONFIG_PCI_BIOS
}
static int
-diff -urNp linux-2.6.38.4/arch/x86/mm/pageattr-test.c linux-2.6.38.4/arch/x86/mm/pageattr-test.c
---- linux-2.6.38.4/arch/x86/mm/pageattr-test.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/pageattr-test.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/mm/pageattr-test.c linux-2.6.39/arch/x86/mm/pageattr-test.c
+--- linux-2.6.39/arch/x86/mm/pageattr-test.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/pageattr-test.c 2011-05-22 19:36:30.000000000 -0400
@@ -36,7 +36,7 @@ enum {
static int pte_testbit(pte_t pte)
}
struct split_state {
-diff -urNp linux-2.6.38.4/arch/x86/mm/pat.c linux-2.6.38.4/arch/x86/mm/pat.c
---- linux-2.6.38.4/arch/x86/mm/pat.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/pat.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/mm/pat.c linux-2.6.39/arch/x86/mm/pat.c
+--- linux-2.6.39/arch/x86/mm/pat.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/pat.c 2011-05-22 19:36:30.000000000 -0400
@@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
if (!entry) {
cattr_name(want_flags),
(unsigned long long)paddr,
(unsigned long long)(paddr + size),
-diff -urNp linux-2.6.38.4/arch/x86/mm/pgtable_32.c linux-2.6.38.4/arch/x86/mm/pgtable_32.c
---- linux-2.6.38.4/arch/x86/mm/pgtable_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/pgtable_32.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/mm/pgtable_32.c linux-2.6.39/arch/x86/mm/pgtable_32.c
+--- linux-2.6.39/arch/x86/mm/pgtable_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/pgtable_32.c 2011-05-22 19:36:30.000000000 -0400
@@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr,
return;
}
/*
* It's enough to flush this one mapping.
-diff -urNp linux-2.6.38.4/arch/x86/mm/pgtable.c linux-2.6.38.4/arch/x86/mm/pgtable.c
---- linux-2.6.38.4/arch/x86/mm/pgtable.c 2011-04-18 17:27:13.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/pgtable.c 2011-04-28 19:34:15.000000000 -0400
-@@ -84,9 +84,58 @@ static inline void pgd_list_del(pgd_t *p
+diff -urNp linux-2.6.39/arch/x86/mm/pgtable.c linux-2.6.39/arch/x86/mm/pgtable.c
+--- linux-2.6.39/arch/x86/mm/pgtable.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/pgtable.c 2011-05-22 19:36:30.000000000 -0400
+@@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *p
list_del(&page->lru);
}
+#else
+ *dst++ = *src++;
+#endif
-+
+
+}
+#endif
+
-+#ifdef CONFIG_PAX_PER_CPU_PGD
-+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
-+static inline void pgd_dtor(pgd_t *pgd) {}
+#ifdef CONFIG_X86_64
+#define pxd_t pud_t
+#define pyd_t pgd_t
+#define pyd_offset(mm ,address) pud_offset((mm), (address))
+#define PYD_SIZE PUD_SIZE
+#endif
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
++static inline void pgd_dtor(pgd_t *pgd) {}
+#else
-+#define pxd_t pmd_t
-+#define pyd_t pud_t
-+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
-+#define pxd_free(mm, pmd) pmd_free((mm), (pmd))
-+#define pyd_populate(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
-+#define pyd_offset(mm ,address) pud_offset((mm), (address))
-+#define PYD_SIZE PUD_SIZE
-
static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
{
-@@ -128,6 +177,7 @@ static void pgd_dtor(pgd_t *pgd)
+ BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
+@@ -128,6 +170,7 @@ static void pgd_dtor(pgd_t *pgd)
pgd_list_del(pgd);
spin_unlock(&pgd_lock);
}
/*
* List of all pgd's needed for non-PAE so it can invalidate entries
-@@ -140,7 +190,7 @@ static void pgd_dtor(pgd_t *pgd)
+@@ -140,7 +183,7 @@ static void pgd_dtor(pgd_t *pgd)
* -- wli
*/
/*
* In PAE mode, we need to do a cr3 reload (=tlb flush) when
* updating the top-level pagetable entries to guarantee the
-@@ -152,7 +202,7 @@ static void pgd_dtor(pgd_t *pgd)
+@@ -152,7 +195,7 @@ static void pgd_dtor(pgd_t *pgd)
* not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
* and initialize the kernel pmds here.
*/
void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
{
-@@ -170,36 +220,38 @@ void pud_populate(struct mm_struct *mm,
+@@ -170,36 +213,38 @@ void pud_populate(struct mm_struct *mm,
*/
flush_tlb_mm(mm);
}
return -ENOMEM;
}
-@@ -212,51 +264,55 @@ static int preallocate_pmds(pmd_t *pmds[
+@@ -212,51 +257,55 @@ static int preallocate_pmds(pmd_t *pmds[
* preallocate which never got a corresponding vma will need to be
* freed manually.
*/
pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
-@@ -265,11 +321,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -265,11 +314,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
mm->pgd = pgd;
/*
* Make sure that pre-populating the pmds is atomic with
-@@ -279,14 +335,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -279,14 +328,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
spin_lock(&pgd_lock);
pgd_ctor(mm, pgd);
out_free_pgd:
free_page((unsigned long)pgd);
out:
-@@ -295,7 +351,7 @@ out:
+@@ -295,7 +344,7 @@ out:
void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{
pgd_dtor(pgd);
paravirt_pgd_free(mm, pgd);
free_page((unsigned long)pgd);
-diff -urNp linux-2.6.38.4/arch/x86/mm/setup_nx.c linux-2.6.38.4/arch/x86/mm/setup_nx.c
---- linux-2.6.38.4/arch/x86/mm/setup_nx.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/setup_nx.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/mm/setup_nx.c linux-2.6.39/arch/x86/mm/setup_nx.c
+--- linux-2.6.39/arch/x86/mm/setup_nx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/setup_nx.c 2011-05-22 19:36:30.000000000 -0400
@@ -5,8 +5,10 @@
#include <asm/pgtable.h>
#include <asm/proto.h>
__supported_pte_mask &= ~_PAGE_NX;
}
-diff -urNp linux-2.6.38.4/arch/x86/mm/tlb.c linux-2.6.38.4/arch/x86/mm/tlb.c
---- linux-2.6.38.4/arch/x86/mm/tlb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/tlb.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/mm/tlb.c linux-2.6.39/arch/x86/mm/tlb.c
+--- linux-2.6.39/arch/x86/mm/tlb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/mm/tlb.c 2011-05-22 19:36:30.000000000 -0400
@@ -65,7 +65,11 @@ void leave_mm(int cpu)
BUG();
cpumask_clear_cpu(cpu,
}
EXPORT_SYMBOL_GPL(leave_mm);
-diff -urNp linux-2.6.38.4/arch/x86/oprofile/backtrace.c linux-2.6.38.4/arch/x86/oprofile/backtrace.c
---- linux-2.6.38.4/arch/x86/oprofile/backtrace.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/oprofile/backtrace.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/oprofile/backtrace.c linux-2.6.39/arch/x86/oprofile/backtrace.c
+--- linux-2.6.39/arch/x86/oprofile/backtrace.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/oprofile/backtrace.c 2011-05-22 19:36:30.000000000 -0400
@@ -57,7 +57,7 @@ dump_user_backtrace_32(struct stack_fram
struct stack_frame_ia32 *fp;
+ if (!user_mode(regs)) {
unsigned long stack = kernel_stack_pointer(regs);
if (depth)
- dump_trace(NULL, regs, (unsigned long *)stack,
-diff -urNp linux-2.6.38.4/arch/x86/oprofile/op_model_p4.c linux-2.6.38.4/arch/x86/oprofile/op_model_p4.c
---- linux-2.6.38.4/arch/x86/oprofile/op_model_p4.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/oprofile/op_model_p4.c 2011-04-28 19:34:15.000000000 -0400
-@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
- #endif
- }
-
--static int inline addr_increment(void)
-+static inline int addr_increment(void)
- {
- #ifdef CONFIG_SMP
- return smp_num_siblings == 2 ? 2 : 1;
-diff -urNp linux-2.6.38.4/arch/x86/pci/ce4100.c linux-2.6.38.4/arch/x86/pci/ce4100.c
---- linux-2.6.38.4/arch/x86/pci/ce4100.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/pci/ce4100.c 2011-04-28 19:34:15.000000000 -0400
+ dump_trace(NULL, regs, (unsigned long *)stack, 0,
+diff -urNp linux-2.6.39/arch/x86/pci/ce4100.c linux-2.6.39/arch/x86/pci/ce4100.c
+--- linux-2.6.39/arch/x86/pci/ce4100.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
}
.read = ce4100_conf_read,
.write = ce4100_conf_write,
};
-diff -urNp linux-2.6.38.4/arch/x86/pci/common.c linux-2.6.38.4/arch/x86/pci/common.c
---- linux-2.6.38.4/arch/x86/pci/common.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/pci/common.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/pci/common.c linux-2.6.39/arch/x86/pci/common.c
+--- linux-2.6.39/arch/x86/pci/common.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn,
int reg, int len, u32 *val)
-diff -urNp linux-2.6.38.4/arch/x86/pci/direct.c linux-2.6.38.4/arch/x86/pci/direct.c
---- linux-2.6.38.4/arch/x86/pci/direct.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/pci/direct.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/pci/direct.c linux-2.6.39/arch/x86/pci/direct.c
+--- linux-2.6.39/arch/x86/pci/direct.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
{
u32 x = 0;
int year, devfn;
-diff -urNp linux-2.6.38.4/arch/x86/pci/fixup.c linux-2.6.38.4/arch/x86/pci/fixup.c
---- linux-2.6.38.4/arch/x86/pci/fixup.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/pci/fixup.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/pci/fixup.c linux-2.6.39/arch/x86/pci/fixup.c
+--- linux-2.6.39/arch/x86/pci/fixup.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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.38.4/arch/x86/pci/mmconfig_32.c linux-2.6.38.4/arch/x86/pci/mmconfig_32.c
---- linux-2.6.38.4/arch/x86/pci/mmconfig_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/pci/mmconfig_32.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/pci/mmconfig_32.c linux-2.6.39/arch/x86/pci/mmconfig_32.c
+--- linux-2.6.39/arch/x86/pci/mmconfig_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
}
.read = pci_mmcfg_read,
.write = pci_mmcfg_write,
};
-diff -urNp linux-2.6.38.4/arch/x86/pci/mmconfig_64.c linux-2.6.38.4/arch/x86/pci/mmconfig_64.c
---- linux-2.6.38.4/arch/x86/pci/mmconfig_64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/pci/mmconfig_64.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/pci/mmconfig_64.c linux-2.6.39/arch/x86/pci/mmconfig_64.c
+--- linux-2.6.39/arch/x86/pci/mmconfig_64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
}
.read = pci_mmcfg_read,
.write = pci_mmcfg_write,
};
-diff -urNp linux-2.6.38.4/arch/x86/pci/numaq_32.c linux-2.6.38.4/arch/x86/pci/numaq_32.c
---- linux-2.6.38.4/arch/x86/pci/numaq_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/pci/numaq_32.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/pci/mrst.c linux-2.6.39/arch/x86/pci/mrst.c
+--- linux-2.6.39/arch/x86/pci/mrst.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/pci/mrst.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/x86/pci/numaq_32.c linux-2.6.39/arch/x86/pci/numaq_32.c
+--- linux-2.6.39/arch/x86/pci/numaq_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/pci/numaq_32.c 2011-05-22 19:36:30.000000000 -0400
@@ -108,7 +108,7 @@ static int pci_conf1_mq_write(unsigned i
#undef PCI_CONF1_MQ_ADDRESS
.read = pci_conf1_mq_read,
.write = pci_conf1_mq_write
};
-diff -urNp linux-2.6.38.4/arch/x86/pci/olpc.c linux-2.6.38.4/arch/x86/pci/olpc.c
---- linux-2.6.38.4/arch/x86/pci/olpc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/pci/olpc.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/pci/olpc.c linux-2.6.39/arch/x86/pci/olpc.c
+--- linux-2.6.39/arch/x86/pci/olpc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/pci/olpc.c 2011-05-22 19:36:30.000000000 -0400
@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
return 0;
}
.read = pci_olpc_read,
.write = pci_olpc_write,
};
-diff -urNp linux-2.6.38.4/arch/x86/pci/pcbios.c linux-2.6.38.4/arch/x86/pci/pcbios.c
---- linux-2.6.38.4/arch/x86/pci/pcbios.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/pci/pcbios.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/pci/pcbios.c linux-2.6.39/arch/x86/pci/pcbios.c
+--- linux-2.6.39/arch/x86/pci/pcbios.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/pci/pcbios.c 2011-05-22 19:36:30.000000000 -0400
@@ -79,50 +79,93 @@ union bios32 {
static struct {
unsigned long address;
return !(ret & 0xff00);
}
EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff -urNp linux-2.6.38.4/arch/x86/platform/efi/efi_32.c linux-2.6.38.4/arch/x86/platform/efi/efi_32.c
---- linux-2.6.38.4/arch/x86/platform/efi/efi_32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/platform/efi/efi_32.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/pci/xen.c linux-2.6.39/arch/x86/pci/xen.c
+--- linux-2.6.39/arch/x86/pci/xen.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/pci/xen.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/arch/x86/platform/efi/efi_32.c linux-2.6.39/arch/x86/platform/efi/efi_32.c
+--- linux-2.6.39/arch/x86/platform/efi/efi_32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/platform/efi/efi_32.c 2011-05-22 19:36:30.000000000 -0400
@@ -38,70 +38,37 @@
*/
/*
* After the lock is released, the original page table is restored.
-diff -urNp linux-2.6.38.4/arch/x86/platform/efi/efi_stub_32.S linux-2.6.38.4/arch/x86/platform/efi/efi_stub_32.S
---- linux-2.6.38.4/arch/x86/platform/efi/efi_stub_32.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/platform/efi/efi_stub_32.S 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/platform/efi/efi_stub_32.S linux-2.6.39/arch/x86/platform/efi/efi_stub_32.S
+--- linux-2.6.39/arch/x86/platform/efi/efi_stub_32.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/platform/efi/efi_stub_32.S 2011-05-22 19:36:30.000000000 -0400
@@ -6,6 +6,7 @@
*/
saved_return_addr:
.long 0
efi_rt_function_ptr:
-diff -urNp linux-2.6.38.4/arch/x86/power/cpu.c linux-2.6.38.4/arch/x86/power/cpu.c
---- linux-2.6.38.4/arch/x86/power/cpu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/power/cpu.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/platform/olpc/olpc_dt.c linux-2.6.39/arch/x86/platform/olpc/olpc_dt.c
+--- linux-2.6.39/arch/x86/platform/olpc/olpc_dt.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
+ }
+
+-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/arch/x86/platform/uv/tlb_uv.c linux-2.6.39/arch/x86/platform/uv/tlb_uv.c
+--- linux-2.6.39/arch/x86/platform/uv/tlb_uv.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/platform/uv/tlb_uv.c 2011-05-22 19:36:30.000000000 -0400
+@@ -342,6 +342,8 @@ static void uv_reset_with_ipi(struct bau
+ cpumask_t mask;
+ struct reset_args reset_args;
+
++ pax_track_stack();
++
+ reset_args.sender = sender;
+
+ cpus_clear(mask);
+diff -urNp linux-2.6.39/arch/x86/power/cpu.c linux-2.6.39/arch/x86/power/cpu.c
+--- linux-2.6.39/arch/x86/power/cpu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/power/cpu.c 2011-05-22 19:36:30.000000000 -0400
@@ -130,7 +130,7 @@ static void do_fpu_end(void)
static void fix_processor_context(void)
{
syscall_init(); /* This sets MSR_*STAR and related */
#endif
-diff -urNp linux-2.6.38.4/arch/x86/vdso/Makefile linux-2.6.38.4/arch/x86/vdso/Makefile
---- linux-2.6.38.4/arch/x86/vdso/Makefile 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/vdso/Makefile 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/vdso/Makefile linux-2.6.39/arch/x86/vdso/Makefile
+--- linux-2.6.39/arch/x86/vdso/Makefile 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/vdso/Makefile 2011-05-22 19:36:30.000000000 -0400
@@ -123,7 +123,7 @@ quiet_cmd_vdso = VDSO $@
-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
GCOV_PROFILE := n
#
-diff -urNp linux-2.6.38.4/arch/x86/vdso/vclock_gettime.c linux-2.6.38.4/arch/x86/vdso/vclock_gettime.c
---- linux-2.6.38.4/arch/x86/vdso/vclock_gettime.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/vdso/vclock_gettime.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/vdso/vclock_gettime.c linux-2.6.39/arch/x86/vdso/vclock_gettime.c
+--- linux-2.6.39/arch/x86/vdso/vclock_gettime.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/vdso/vclock_gettime.c 2011-05-22 19:36:30.000000000 -0400
@@ -22,24 +22,48 @@
#include <asm/hpet.h>
#include <asm/unistd.h>
}
int gettimeofday(struct timeval *, struct timezone *)
__attribute__((weak, alias("__vdso_gettimeofday")));
-diff -urNp linux-2.6.38.4/arch/x86/vdso/vdso32-setup.c linux-2.6.38.4/arch/x86/vdso/vdso32-setup.c
---- linux-2.6.38.4/arch/x86/vdso/vdso32-setup.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/vdso/vdso32-setup.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/vdso/vdso32-setup.c linux-2.6.39/arch/x86/vdso/vdso32-setup.c
+--- linux-2.6.39/arch/x86/vdso/vdso32-setup.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/vdso/vdso32-setup.c 2011-05-22 19:36:30.000000000 -0400
@@ -25,6 +25,7 @@
#include <asm/tlbflush.h>
#include <asm/vdso.h>
return NULL;
}
-@@ -422,7 +429,7 @@ struct vm_area_struct *get_gate_vma(stru
- struct mm_struct *mm = tsk->mm;
-
- /* Check to see if this task was created in compat vdso mode */
+@@ -423,7 +430,7 @@ struct vm_area_struct *get_gate_vma(stru
+ * Check to see if the corresponding task was created in compat vdso
+ * mode.
+ */
- if (mm && mm->context.vdso == (void *)VDSO_HIGH_BASE)
+ if (mm && mm->context.vdso == VDSO_HIGH_BASE)
return &gate_vma;
return NULL;
}
-diff -urNp linux-2.6.38.4/arch/x86/vdso/vdso.lds.S linux-2.6.38.4/arch/x86/vdso/vdso.lds.S
---- linux-2.6.38.4/arch/x86/vdso/vdso.lds.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/vdso/vdso.lds.S 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/vdso/vdso.lds.S linux-2.6.39/arch/x86/vdso/vdso.lds.S
+--- linux-2.6.39/arch/x86/vdso/vdso.lds.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/vdso/vdso.lds.S 2011-05-22 19:36:30.000000000 -0400
@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
#define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
#include "vextern.h"
+VEXTERN(fallback_time)
+VEXTERN(getcpu)
+#undef VEXTERN
-diff -urNp linux-2.6.38.4/arch/x86/vdso/vextern.h linux-2.6.38.4/arch/x86/vdso/vextern.h
---- linux-2.6.38.4/arch/x86/vdso/vextern.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/vdso/vextern.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/vdso/vextern.h linux-2.6.39/arch/x86/vdso/vextern.h
+--- linux-2.6.39/arch/x86/vdso/vextern.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/vdso/vextern.h 2011-05-22 19:36:30.000000000 -0400
@@ -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. */
-VEXTERN(jiffies)
VEXTERN(vgetcpu_mode)
VEXTERN(vsyscall_gtod_data)
-diff -urNp linux-2.6.38.4/arch/x86/vdso/vma.c linux-2.6.38.4/arch/x86/vdso/vma.c
---- linux-2.6.38.4/arch/x86/vdso/vma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/vdso/vma.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/vdso/vma.c linux-2.6.39/arch/x86/vdso/vma.c
+--- linux-2.6.39/arch/x86/vdso/vma.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/vdso/vma.c 2011-05-22 19:36:30.000000000 -0400
@@ -58,7 +58,7 @@ static int __init init_vdso_vars(void)
if (!vbase)
goto oom;
- return 0;
-}
-__setup("vdso=", vdso_setup);
-diff -urNp linux-2.6.38.4/arch/x86/xen/enlighten.c linux-2.6.38.4/arch/x86/xen/enlighten.c
---- linux-2.6.38.4/arch/x86/xen/enlighten.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/xen/enlighten.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/xen/enlighten.c linux-2.6.39/arch/x86/xen/enlighten.c
+--- linux-2.6.39/arch/x86/xen/enlighten.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/xen/enlighten.c 2011-05-22 19:36:30.000000000 -0400
@@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
struct shared_info xen_dummy_shared_info;
RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
__read_mostly int xen_have_vector_callback;
EXPORT_SYMBOL_GPL(xen_have_vector_callback);
-@@ -1134,7 +1132,17 @@ asmlinkage void __init xen_start_kernel(
+@@ -1010,7 +1008,7 @@ static const struct pv_apic_ops xen_apic
+ #endif
+ };
+
+-static void xen_reboot(int reason)
++static __noreturn void xen_reboot(int reason)
+ {
+ struct sched_shutdown r = { .reason = reason };
+
+@@ -1018,17 +1016,17 @@ static void xen_reboot(int reason)
+ BUG();
+ }
+
+-static void xen_restart(char *msg)
++static __noreturn void xen_restart(char *msg)
+ {
+ xen_reboot(SHUTDOWN_reboot);
+ }
+
+-static void xen_emergency_restart(void)
++static __noreturn void xen_emergency_restart(void)
+ {
+ xen_reboot(SHUTDOWN_reboot);
+ }
+
+-static void xen_machine_halt(void)
++static __noreturn void xen_machine_halt(void)
+ {
+ xen_reboot(SHUTDOWN_poweroff);
+ }
+@@ -1127,7 +1125,17 @@ asmlinkage void __init xen_start_kernel(
__userpte_alloc_gfp &= ~__GFP_HIGHMEM;
/* Work out if we support NX */
xen_setup_features();
-@@ -1165,13 +1173,6 @@ asmlinkage void __init xen_start_kernel(
+@@ -1158,13 +1166,6 @@ asmlinkage void __init xen_start_kernel(
machine_ops = xen_machine_ops;
xen_smp_init();
#ifdef CONFIG_ACPI_NUMA
-diff -urNp linux-2.6.38.4/arch/x86/xen/mmu.c linux-2.6.38.4/arch/x86/xen/mmu.c
---- linux-2.6.38.4/arch/x86/xen/mmu.c 2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/xen/mmu.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1721,6 +1721,8 @@ __init pgd_t *xen_setup_kernel_pagetable
+diff -urNp linux-2.6.39/arch/x86/xen/mmu.c linux-2.6.39/arch/x86/xen/mmu.c
+--- linux-2.6.39/arch/x86/xen/mmu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/xen/mmu.c 2011-05-22 19:36:30.000000000 -0400
+@@ -1791,6 +1791,8 @@ __init pgd_t *xen_setup_kernel_pagetable
convert_pfn_mfn(init_level4_pgt);
convert_pfn_mfn(level3_ident_pgt);
convert_pfn_mfn(level3_kernel_pgt);
l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
-@@ -1739,7 +1741,10 @@ __init pgd_t *xen_setup_kernel_pagetable
+@@ -1809,7 +1811,10 @@ __init pgd_t *xen_setup_kernel_pagetable
set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
-diff -urNp linux-2.6.38.4/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.38.4/arch/x86/xen/pci-swiotlb-xen.c
---- linux-2.6.38.4/arch/x86/xen/pci-swiotlb-xen.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/xen/pci-swiotlb-xen.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.39/arch/x86/xen/pci-swiotlb-xen.c
+--- linux-2.6.39/arch/x86/xen/pci-swiotlb-xen.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/xen/pci-swiotlb-xen.c 2011-05-22 19:36:30.000000000 -0400
@@ -10,7 +10,7 @@
int xen_swiotlb __read_mostly;
.mapping_error = xen_swiotlb_dma_mapping_error,
.alloc_coherent = xen_swiotlb_alloc_coherent,
.free_coherent = xen_swiotlb_free_coherent,
-diff -urNp linux-2.6.38.4/arch/x86/xen/smp.c linux-2.6.38.4/arch/x86/xen/smp.c
---- linux-2.6.38.4/arch/x86/xen/smp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/xen/smp.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/xen/smp.c linux-2.6.39/arch/x86/xen/smp.c
+--- linux-2.6.39/arch/x86/xen/smp.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/xen/smp.c 2011-05-22 19:36:30.000000000 -0400
@@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_
{
BUG_ON(smp_processor_id() != 0);
- per_cpu(kernel_stack, cpu) =
- (unsigned long)task_stack_page(idle) -
- KERNEL_STACK_OFFSET + THREAD_SIZE;
-+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 8 + THREAD_SIZE;
++ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
#endif
xen_setup_runstate_info(cpu);
xen_setup_timer(cpu);
-diff -urNp linux-2.6.38.4/arch/x86/xen/xen-asm_32.S linux-2.6.38.4/arch/x86/xen/xen-asm_32.S
---- linux-2.6.38.4/arch/x86/xen/xen-asm_32.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/xen/xen-asm_32.S 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/xen/xen-asm_32.S linux-2.6.39/arch/x86/xen/xen-asm_32.S
+--- linux-2.6.39/arch/x86/xen/xen-asm_32.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/xen/xen-asm_32.S 2011-05-22 19:36:30.000000000 -0400
@@ -83,14 +83,14 @@ ENTRY(xen_iret)
ESP_OFFSET=4 # bytes pushed onto stack
#else
movl xen_vcpu, %eax
#endif
-diff -urNp linux-2.6.38.4/arch/x86/xen/xen-head.S linux-2.6.38.4/arch/x86/xen/xen-head.S
---- linux-2.6.38.4/arch/x86/xen/xen-head.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/xen/xen-head.S 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/xen/xen-head.S linux-2.6.39/arch/x86/xen/xen-head.S
+--- linux-2.6.39/arch/x86/xen/xen-head.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/xen/xen-head.S 2011-05-22 19:36:30.000000000 -0400
@@ -19,6 +19,17 @@ ENTRY(startup_xen)
#ifdef CONFIG_X86_32
mov %esi,xen_start_info
#else
mov %rsi,xen_start_info
mov $init_thread_union+THREAD_SIZE,%rsp
-diff -urNp linux-2.6.38.4/arch/x86/xen/xen-ops.h linux-2.6.38.4/arch/x86/xen/xen-ops.h
---- linux-2.6.38.4/arch/x86/xen/xen-ops.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/xen/xen-ops.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/arch/x86/xen/xen-ops.h linux-2.6.39/arch/x86/xen/xen-ops.h
+--- linux-2.6.39/arch/x86/xen/xen-ops.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/arch/x86/xen/xen-ops.h 2011-05-22 19:36:30.000000000 -0400
@@ -10,8 +10,6 @@
extern const char xen_hypervisor_callback[];
extern const char xen_failsafe_callback[];
struct trap_info;
void xen_copy_trap_info(struct trap_info *traps);
-diff -urNp linux-2.6.38.4/block/blk-iopoll.c linux-2.6.38.4/block/blk-iopoll.c
---- linux-2.6.38.4/block/blk-iopoll.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/block/blk-iopoll.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/block/blk-iopoll.c linux-2.6.39/block/blk-iopoll.c
+--- linux-2.6.39/block/blk-iopoll.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/block/blk-iopoll.c 2011-05-22 19:36:30.000000000 -0400
@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
}
EXPORT_SYMBOL(blk_iopoll_complete);
{
struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
int rearm = 0, budget = blk_iopoll_budget;
-diff -urNp linux-2.6.38.4/block/blk-map.c linux-2.6.38.4/block/blk-map.c
---- linux-2.6.38.4/block/blk-map.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/block/blk-map.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/block/blk-map.c linux-2.6.39/block/blk-map.c
+--- linux-2.6.39/block/blk-map.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/block/blk-map.c 2011-05-22 19:36:30.000000000 -0400
@@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue
if (!len || !kbuf)
return -EINVAL;
if (do_copy)
bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
else
-diff -urNp linux-2.6.38.4/block/blk-softirq.c linux-2.6.38.4/block/blk-softirq.c
---- linux-2.6.38.4/block/blk-softirq.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/block/blk-softirq.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/block/blk-softirq.c linux-2.6.39/block/blk-softirq.c
+--- linux-2.6.39/block/blk-softirq.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/block/blk-softirq.c 2011-05-22 19:36:30.000000000 -0400
@@ -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.
{
struct list_head *cpu_list, local_list;
-diff -urNp linux-2.6.38.4/block/bsg.c linux-2.6.38.4/block/bsg.c
---- linux-2.6.38.4/block/bsg.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/block/bsg.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/block/bsg.c linux-2.6.39/block/bsg.c
+--- linux-2.6.39/block/bsg.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/block/bsg.c 2011-05-22 19:36:30.000000000 -0400
@@ -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)
if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
if (blk_verify_command(rq->cmd, has_write_perm))
return -EPERM;
-diff -urNp linux-2.6.38.4/block/scsi_ioctl.c linux-2.6.38.4/block/scsi_ioctl.c
---- linux-2.6.38.4/block/scsi_ioctl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/block/scsi_ioctl.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/block/scsi_ioctl.c linux-2.6.39/block/scsi_ioctl.c
+--- linux-2.6.39/block/scsi_ioctl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/block/scsi_ioctl.c 2011-05-22 19:36:30.000000000 -0400
@@ -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)
if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
goto error;
-diff -urNp linux-2.6.38.4/Documentation/dontdiff linux-2.6.38.4/Documentation/dontdiff
---- linux-2.6.38.4/Documentation/dontdiff 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/Documentation/dontdiff 2011-04-28 19:34:15.000000000 -0400
-@@ -3,6 +3,7 @@
+diff -urNp linux-2.6.39/crypto/serpent.c linux-2.6.39/crypto/serpent.c
+--- linux-2.6.39/crypto/serpent.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/crypto/serpent.c 2011-05-22 19:36:30.000000000 -0400
+@@ -224,6 +224,8 @@ static int serpent_setkey(struct crypto_
+ u32 r0,r1,r2,r3,r4;
+ int i;
+
++ pax_track_stack();
++
+ /* Copy key, add padding */
+
+ for (i = 0; i < keylen; ++i)
+diff -urNp linux-2.6.39/Documentation/dontdiff linux-2.6.39/Documentation/dontdiff
+--- linux-2.6.39/Documentation/dontdiff 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/Documentation/dontdiff 2011-05-22 19:36:30.000000000 -0400
+@@ -1,13 +1,16 @@
+ *.a
+ *.aux
*.bin
++*.cis
*.cpio
*.csp
+*.dbg
*.dsp
*.dvi
*.elf
-@@ -38,8 +39,10 @@
+ *.eps
+ *.fw
++*.gcno
+ *.gen.S
+ *.gif
+ *.grep
+@@ -38,8 +41,10 @@
*.tab.h
*.tex
*.ver
*_vga16.c
*~
*.9
-@@ -49,11 +52,16 @@
+@@ -49,11 +54,16 @@
53c700_d.h
CVS
ChangeSet
SCCS
System.map*
TAGS
-@@ -82,6 +90,8 @@ bvmlinux
+@@ -80,8 +90,11 @@ btfixupprep
+ build
+ bvmlinux
bzImage*
++capability_names.h
capflags.c
classlist.h*
+clut_vga16.c
comp*.log
compile.h*
conf
-@@ -106,16 +116,19 @@ fore200e_mkfirm
+@@ -106,16 +119,19 @@ fore200e_mkfirm
fore200e_pca_fw.c*
gconf
gen-devlist
initramfs_data.cpio.gz
initramfs_list
int16.c
-@@ -125,7 +138,6 @@ int32.c
+@@ -125,7 +141,6 @@ int32.c
int4.c
int8.c
kallsyms
keywords.c
ksym.c*
ksym.h*
-@@ -149,7 +161,9 @@ mkboot
+@@ -149,7 +164,9 @@ mkboot
mkbugboot
mkcpustr
mkdep
mktables
mktree
modpost
-@@ -165,6 +179,7 @@ parse.h
+@@ -165,6 +182,7 @@ parse.h
patches*
pca200e.bin
pca200e_ecd.bin2
piggy.gz
piggyback
piggy.S
-@@ -180,6 +195,7 @@ r600_reg_safe.h
+@@ -180,7 +198,9 @@ r600_reg_safe.h
raid6altivec*.c
raid6int*.c
raid6tables.c
+regdb.c
relocs
++rlim_names.h
rn50_reg_safe.h
rs600_reg_safe.h
-@@ -189,6 +205,7 @@ setup
+ rv515_reg_safe.h
+@@ -189,6 +209,7 @@ setup
setup.bin
setup.elf
sImage
sm_tbl*
split-include
syscalltab.h
-@@ -213,13 +230,17 @@ version.h*
+@@ -213,13 +234,17 @@ version.h*
vmlinux
vmlinux-*
vmlinux.aout
wakeup.bin
wakeup.elf
wakeup.lds
-diff -urNp linux-2.6.38.4/Documentation/filesystems/sysfs.txt linux-2.6.38.4/Documentation/filesystems/sysfs.txt
---- linux-2.6.38.4/Documentation/filesystems/sysfs.txt 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/Documentation/filesystems/sysfs.txt 2011-04-28 19:34:15.000000000 -0400
-@@ -123,8 +123,8 @@ set of sysfs operations for forwarding r
+diff -urNp linux-2.6.39/Documentation/filesystems/configfs/configfs_example_macros.c linux-2.6.39/Documentation/filesystems/configfs/configfs_example_macros.c
+--- linux-2.6.39/Documentation/filesystems/configfs/configfs_example_macros.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/Documentation/filesystems/sysfs.txt linux-2.6.39/Documentation/filesystems/sysfs.txt
+--- linux-2.6.39/Documentation/filesystems/sysfs.txt 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/Documentation/filesystems/sysfs.txt 2011-05-22 19:36:30.000000000 -0400
+@@ -125,8 +125,8 @@ set of sysfs operations for forwarding r
show and store methods of the attribute owners.
struct sysfs_ops {
};
[ Subsystems should have already defined a struct kobj_type as a
-diff -urNp linux-2.6.38.4/Documentation/kernel-parameters.txt linux-2.6.38.4/Documentation/kernel-parameters.txt
---- linux-2.6.38.4/Documentation/kernel-parameters.txt 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/Documentation/kernel-parameters.txt 2011-04-28 19:34:15.000000000 -0400
-@@ -1853,6 +1853,13 @@ bytes respectively. Such letter suffixes
+diff -urNp linux-2.6.39/Documentation/kernel-parameters.txt linux-2.6.39/Documentation/kernel-parameters.txt
+--- linux-2.6.39/Documentation/kernel-parameters.txt 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/Documentation/kernel-parameters.txt 2011-05-22 19:36:30.000000000 -0400
+@@ -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.
pcbit= [HW,ISDN]
pcd. [PARIDE]
-diff -urNp linux-2.6.38.4/drivers/acpi/apei/cper.c linux-2.6.38.4/drivers/acpi/apei/cper.c
---- linux-2.6.38.4/drivers/acpi/apei/cper.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/acpi/apei/cper.c 2011-04-28 19:57:25.000000000 -0400
-@@ -37,12 +37,12 @@
+diff -urNp linux-2.6.39/drivers/acpi/acpi_ipmi.c linux-2.6.39/drivers/acpi/acpi_ipmi.c
+--- linux-2.6.39/drivers/acpi/acpi_ipmi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/acpi/acpi_ipmi.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/drivers/acpi/apei/cper.c linux-2.6.39/drivers/acpi/apei/cper.c
+--- linux-2.6.39/drivers/acpi/apei/cper.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/acpi/apei/cper.c 2011-05-22 19:36:30.000000000 -0400
+@@ -38,12 +38,12 @@
*/
u64 cper_next_record_id(void)
{
}
EXPORT_SYMBOL_GPL(cper_next_record_id);
-diff -urNp linux-2.6.38.4/drivers/acpi/battery.c linux-2.6.38.4/drivers/acpi/battery.c
---- linux-2.6.38.4/drivers/acpi/battery.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/acpi/battery.c 2011-04-28 19:34:15.000000000 -0400
-@@ -862,7 +862,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
+diff -urNp linux-2.6.39/drivers/acpi/battery.c linux-2.6.39/drivers/acpi/battery.c
+--- linux-2.6.39/drivers/acpi/battery.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/acpi/battery.c 2011-05-22 19:36:30.000000000 -0400
+@@ -864,7 +864,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
}
static struct battery_file {
mode_t mode;
const char *name;
} acpi_battery_file[] = {
-diff -urNp linux-2.6.38.4/drivers/acpi/dock.c linux-2.6.38.4/drivers/acpi/dock.c
---- linux-2.6.38.4/drivers/acpi/dock.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/acpi/dock.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/acpi/dock.c linux-2.6.39/drivers/acpi/dock.c
+--- linux-2.6.39/drivers/acpi/dock.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/acpi/dock.c 2011-05-22 19:36:30.000000000 -0400
@@ -77,7 +77,7 @@ struct dock_dependent_device {
struct list_head list;
struct list_head hotplug_list;
void *context)
{
struct dock_dependent_device *dd;
-diff -urNp linux-2.6.38.4/drivers/acpi/ec_sys.c linux-2.6.38.4/drivers/acpi/ec_sys.c
---- linux-2.6.38.4/drivers/acpi/ec_sys.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/acpi/ec_sys.c 2011-04-28 19:34:15.000000000 -0400
-@@ -96,7 +96,7 @@ static ssize_t acpi_ec_write_io(struct f
+diff -urNp linux-2.6.39/drivers/acpi/ec_sys.c linux-2.6.39/drivers/acpi/ec_sys.c
+--- linux-2.6.39/drivers/acpi/ec_sys.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
}
.owner = THIS_MODULE,
.open = acpi_ec_open_io,
.read = acpi_ec_read_io,
-diff -urNp linux-2.6.38.4/drivers/acpi/power_meter.c linux-2.6.38.4/drivers/acpi/power_meter.c
---- linux-2.6.38.4/drivers/acpi/power_meter.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/acpi/power_meter.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/acpi/fan.c linux-2.6.39/drivers/acpi/fan.c
+--- linux-2.6.39/drivers/acpi/fan.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/acpi/fan.c 2011-05-22 19:36:30.000000000 -0400
+@@ -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/drivers/acpi/power_meter.c linux-2.6.39/drivers/acpi/power_meter.c
+--- linux-2.6.39/drivers/acpi/power_meter.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/acpi/power_meter.c 2011-05-22 19:36:30.000000000 -0400
@@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d
return res;
mutex_lock(&resource->lock);
resource->trip[attr->index - 7] = temp;
-diff -urNp linux-2.6.38.4/drivers/acpi/proc.c linux-2.6.38.4/drivers/acpi/proc.c
---- linux-2.6.38.4/drivers/acpi/proc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/acpi/proc.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/acpi/proc.c linux-2.6.39/drivers/acpi/proc.c
+--- linux-2.6.39/drivers/acpi/proc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/acpi/proc.c 2011-05-22 19:36:30.000000000 -0400
@@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct f
size_t count, loff_t * ppos)
{
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.38.4/drivers/acpi/processor_driver.c linux-2.6.38.4/drivers/acpi/processor_driver.c
---- linux-2.6.38.4/drivers/acpi/processor_driver.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/acpi/processor_driver.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/acpi/processor_driver.c linux-2.6.39/drivers/acpi/processor_driver.c
+--- linux-2.6.39/drivers/acpi/processor_driver.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/acpi/processor_driver.c 2011-05-22 19:36:30.000000000 -0400
@@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add(
return 0;
#endif
/*
* Buggy BIOS check
-diff -urNp linux-2.6.38.4/drivers/acpi/processor_idle.c linux-2.6.38.4/drivers/acpi/processor_idle.c
---- linux-2.6.38.4/drivers/acpi/processor_idle.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/acpi/processor_idle.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/acpi/processor_idle.c linux-2.6.39/drivers/acpi/processor_idle.c
+--- linux-2.6.39/drivers/acpi/processor_idle.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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")},
};
-diff -urNp linux-2.6.38.4/drivers/ata/acard-ahci.c linux-2.6.38.4/drivers/ata/acard-ahci.c
---- linux-2.6.38.4/drivers/ata/acard-ahci.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/acard-ahci.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/acpi/processor_thermal.c linux-2.6.39/drivers/acpi/processor_thermal.c
+--- linux-2.6.39/drivers/acpi/processor_thermal.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/acpi/sysfs.c linux-2.6.39/drivers/acpi/sysfs.c
+--- linux-2.6.39/drivers/acpi/sysfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/acpi/thermal.c linux-2.6.39/drivers/acpi/thermal.c
+--- linux-2.6.39/drivers/acpi/thermal.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/acpi/video.c linux-2.6.39/drivers/acpi/video.c
+--- linux-2.6.39/drivers/acpi/video.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/ata/acard-ahci.c linux-2.6.39/drivers/ata/acard-ahci.c
+--- linux-2.6.39/drivers/ata/acard-ahci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/acard-ahci.c 2011-05-22 19:36:30.000000000 -0400
@@ -87,7 +87,7 @@ static struct scsi_host_template acard_a
AHCI_SHT("acard-ahci"),
};
.inherits = &ahci_ops,
.qc_prep = acard_ahci_qc_prep,
.qc_fill_rtf = acard_ahci_qc_fill_rtf,
-diff -urNp linux-2.6.38.4/drivers/ata/ahci.c linux-2.6.38.4/drivers/ata/ahci.c
---- linux-2.6.38.4/drivers/ata/ahci.c 2011-04-18 17:27:13.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/ahci.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/ahci.c linux-2.6.39/drivers/ata/ahci.c
+--- linux-2.6.39/drivers/ata/ahci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/ahci.c 2011-05-22 19:36:30.000000000 -0400
@@ -94,17 +94,17 @@ static struct scsi_host_template ahci_sh
AHCI_SHT("ahci"),
};
.inherits = &ahci_ops,
.softreset = ahci_sb600_softreset,
.pmp_softreset = ahci_sb600_softreset,
-diff -urNp linux-2.6.38.4/drivers/ata/ahci.h linux-2.6.38.4/drivers/ata/ahci.h
---- linux-2.6.38.4/drivers/ata/ahci.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/ahci.h 2011-04-28 19:34:15.000000000 -0400
-@@ -309,7 +309,7 @@ extern struct device_attribute *ahci_sde
+diff -urNp linux-2.6.39/drivers/ata/ahci.h linux-2.6.39/drivers/ata/ahci.h
+--- linux-2.6.39/drivers/ata/ahci.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/ahci.h 2011-05-22 19:36:30.000000000 -0400
+@@ -311,7 +311,7 @@ extern struct device_attribute *ahci_sde
.shost_attrs = ahci_shost_attrs, \
.sdev_attrs = ahci_sdev_attrs
void ahci_fill_cmd_slot(struct ahci_port_priv *pp, unsigned int tag,
u32 opts);
-diff -urNp linux-2.6.38.4/drivers/ata/ata_generic.c linux-2.6.38.4/drivers/ata/ata_generic.c
---- linux-2.6.38.4/drivers/ata/ata_generic.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/ata_generic.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/ata_generic.c linux-2.6.39/drivers/ata/ata_generic.c
+--- linux-2.6.39/drivers/ata/ata_generic.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/ata_generic.c 2011-05-22 19:36:30.000000000 -0400
@@ -101,7 +101,7 @@ static struct scsi_host_template generic
ATA_BMDMA_SHT(DRV_NAME),
};
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_unknown,
.set_mode = generic_set_mode,
-diff -urNp linux-2.6.38.4/drivers/ata/ata_piix.c linux-2.6.38.4/drivers/ata/ata_piix.c
---- linux-2.6.38.4/drivers/ata/ata_piix.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/ata_piix.c 2011-04-28 19:34:15.000000000 -0400
-@@ -327,12 +327,12 @@ static struct scsi_host_template piix_sh
+diff -urNp linux-2.6.39/drivers/ata/ata_piix.c linux-2.6.39/drivers/ata/ata_piix.c
+--- linux-2.6.39/drivers/ata/ata_piix.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &piix_sata_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = piix_set_piomode,
-@@ -340,12 +340,12 @@ static struct ata_port_operations piix_p
+@@ -348,12 +348,12 @@ static struct ata_port_operations piix_p
.prereset = piix_pata_prereset,
};
.inherits = &piix_pata_ops,
.cable_detect = ich_pata_cable_detect,
.set_dmamode = ich_set_dmamode,
-@@ -361,7 +361,7 @@ static struct scsi_host_template piix_si
+@@ -369,7 +369,7 @@ static struct scsi_host_template piix_si
.shost_attrs = piix_sidpr_shost_attrs,
};
.inherits = &piix_sata_ops,
.hardreset = sata_std_hardreset,
.scr_read = piix_sidpr_scr_read,
-diff -urNp linux-2.6.38.4/drivers/ata/libahci.c linux-2.6.38.4/drivers/ata/libahci.c
---- linux-2.6.38.4/drivers/ata/libahci.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/libahci.c 2011-04-28 19:34:15.000000000 -0400
-@@ -137,7 +137,7 @@ struct device_attribute *ahci_sdev_attrs
+diff -urNp linux-2.6.39/drivers/ata/libahci.c linux-2.6.39/drivers/ata/libahci.c
+--- linux-2.6.39/drivers/ata/libahci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
.inherits = &sata_pmp_port_ops,
.qc_defer = ahci_pmp_qc_defer,
-diff -urNp linux-2.6.38.4/drivers/ata/libata-acpi.c linux-2.6.38.4/drivers/ata/libata-acpi.c
---- linux-2.6.38.4/drivers/ata/libata-acpi.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/libata-acpi.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/libata-acpi.c linux-2.6.39/drivers/ata/libata-acpi.c
+--- linux-2.6.39/drivers/ata/libata-acpi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/libata-acpi.c 2011-05-22 19:36:30.000000000 -0400
@@ -218,12 +218,12 @@ static void ata_acpi_dev_uevent(acpi_han
ata_acpi_uevent(dev->link->ap, dev, event);
}
.handler = ata_acpi_ap_notify_dock,
.uevent = ata_acpi_ap_uevent,
};
-diff -urNp linux-2.6.38.4/drivers/ata/libata-core.c linux-2.6.38.4/drivers/ata/libata-core.c
---- linux-2.6.38.4/drivers/ata/libata-core.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/libata-core.c 2011-04-28 19:34:15.000000000 -0400
-@@ -4746,7 +4746,7 @@ void ata_qc_free(struct ata_queued_cmd *
+diff -urNp linux-2.6.39/drivers/ata/libata-core.c linux-2.6.39/drivers/ata/libata-core.c
+--- linux-2.6.39/drivers/ata/libata-core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/libata-core.c 2011-05-22 19:36:30.000000000 -0400
+@@ -4747,7 +4747,7 @@ void ata_qc_free(struct ata_queued_cmd *
struct ata_port *ap;
unsigned int tag;
ap = qc->ap;
qc->flags = 0;
-@@ -4762,7 +4762,7 @@ void __ata_qc_complete(struct ata_queued
+@@ -4763,7 +4763,7 @@ void __ata_qc_complete(struct ata_queued
struct ata_port *ap;
struct ata_link *link;
WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
ap = qc->ap;
link = qc->dev->link;
-@@ -5755,7 +5755,7 @@ static void ata_host_stop(struct device
+@@ -5756,7 +5756,7 @@ static void ata_host_stop(struct device
* LOCKING:
* None.
*/
{
static DEFINE_SPINLOCK(lock);
const struct ata_port_operations *cur;
-@@ -5767,6 +5767,7 @@ static void ata_finalize_port_ops(struct
+@@ -5768,6 +5768,7 @@ static void ata_finalize_port_ops(struct
return;
spin_lock(&lock);
for (cur = ops->inherits; cur; cur = cur->inherits) {
void **inherit = (void **)cur;
-@@ -5780,8 +5781,9 @@ static void ata_finalize_port_ops(struct
+@@ -5781,8 +5782,9 @@ static void ata_finalize_port_ops(struct
if (IS_ERR(*pp))
*pp = NULL;
spin_unlock(&lock);
}
-@@ -5878,7 +5880,7 @@ int ata_host_start(struct ata_host *host
+@@ -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,
{
spin_lock_init(&host->lock);
mutex_init(&host->eh_mutex);
-@@ -6584,7 +6586,7 @@ static void ata_dummy_error_handler(stru
+@@ -6583,7 +6585,7 @@ static void ata_dummy_error_handler(stru
/* truly dummy */
}
.qc_prep = ata_noop_qc_prep,
.qc_issue = ata_dummy_qc_issue,
.error_handler = ata_dummy_error_handler,
-diff -urNp linux-2.6.38.4/drivers/ata/libata-eh.c linux-2.6.38.4/drivers/ata/libata-eh.c
---- linux-2.6.38.4/drivers/ata/libata-eh.c 2011-04-18 17:27:13.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/libata-eh.c 2011-04-28 19:34:15.000000000 -0400
-@@ -3880,7 +3880,7 @@ void ata_do_eh(struct ata_port *ap, ata_
+diff -urNp linux-2.6.39/drivers/ata/libata-eh.c linux-2.6.39/drivers/ata/libata-eh.c
+--- linux-2.6.39/drivers/ata/libata-eh.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/libata-eh.c 2011-05-22 19:36:30.000000000 -0400
+@@ -2518,6 +2518,8 @@ void ata_eh_report(struct ata_port *ap)
+ {
+ struct ata_link *link;
+
++ pax_track_stack();
++
+ 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)
{
ata_reset_fn_t hardreset = ops->hardreset;
/* ignore built-in hardreset if SCR access is not available */
-diff -urNp linux-2.6.38.4/drivers/ata/libata-pmp.c linux-2.6.38.4/drivers/ata/libata-pmp.c
---- linux-2.6.38.4/drivers/ata/libata-pmp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/libata-pmp.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/libata-pmp.c linux-2.6.39/drivers/ata/libata-pmp.c
+--- linux-2.6.39/drivers/ata/libata-pmp.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/libata-pmp.c 2011-05-22 19:36:30.000000000 -0400
@@ -912,7 +912,7 @@ static int sata_pmp_handle_link_fail(str
*/
static int sata_pmp_eh_recover(struct ata_port *ap)
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.38.4/drivers/ata/pata_acpi.c linux-2.6.38.4/drivers/ata/pata_acpi.c
---- linux-2.6.38.4/drivers/ata/pata_acpi.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_acpi.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_acpi.c linux-2.6.39/drivers/ata/pata_acpi.c
+--- linux-2.6.39/drivers/ata/pata_acpi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_acpi.c 2011-05-22 19:36:30.000000000 -0400
@@ -216,7 +216,7 @@ static struct scsi_host_template pacpi_s
ATA_BMDMA_SHT(DRV_NAME),
};
.inherits = &ata_bmdma_port_ops,
.qc_issue = pacpi_qc_issue,
.cable_detect = pacpi_cable_detect,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_ali.c linux-2.6.38.4/drivers/ata/pata_ali.c
---- linux-2.6.38.4/drivers/ata/pata_ali.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_ali.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_ali.c linux-2.6.39/drivers/ata/pata_ali.c
+--- linux-2.6.39/drivers/ata/pata_ali.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
*/
.inherits = &ali_dma_base_ops,
.check_atapi_dma = ali_check_atapi_dma,
.dev_config = ali_warn_atapi_dma,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_amd.c linux-2.6.38.4/drivers/ata/pata_amd.c
---- linux-2.6.38.4/drivers/ata/pata_amd.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_amd.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_amd.c linux-2.6.39/drivers/ata/pata_amd.c
+--- linux-2.6.39/drivers/ata/pata_amd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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,
};
.inherits = &nv_base_port_ops,
.set_piomode = nv133_set_piomode,
.set_dmamode = nv133_set_dmamode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_artop.c linux-2.6.38.4/drivers/ata/pata_artop.c
---- linux-2.6.38.4/drivers/ata/pata_artop.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_artop.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_arasan_cf.c linux-2.6.39/drivers/ata/pata_arasan_cf.c
+--- linux-2.6.39/drivers/ata/pata_arasan_cf.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_arasan_cf.c 2011-05-22 19:36:31.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;
++ pax_close_kernel();
+ ap->pio_mask = 0;
+ }
+ if (pdata->quirk & CF_BROKEN_MWDMA)
+diff -urNp linux-2.6.39/drivers/ata/pata_artop.c linux-2.6.39/drivers/ata/pata_artop.c
+--- linux-2.6.39/drivers/ata/pata_artop.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_artop.c 2011-05-22 19:36:31.000000000 -0400
@@ -312,7 +312,7 @@ static struct scsi_host_template artop_s
ATA_BMDMA_SHT(DRV_NAME),
};
.inherits = &ata_bmdma_port_ops,
.cable_detect = artop6260_cable_detect,
.set_piomode = artop6260_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_at32.c linux-2.6.38.4/drivers/ata/pata_at32.c
---- linux-2.6.38.4/drivers/ata/pata_at32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_at32.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_at32.c linux-2.6.39/drivers/ata/pata_at32.c
+--- linux-2.6.39/drivers/ata/pata_at32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_at32.c 2011-05-22 19:36:31.000000000 -0400
@@ -173,7 +173,7 @@ static struct scsi_host_template at32_sh
ATA_PIO_SHT(DRV_NAME),
};
.inherits = &ata_sff_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = pata_at32_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_at91.c linux-2.6.38.4/drivers/ata/pata_at91.c
---- linux-2.6.38.4/drivers/ata/pata_at91.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_at91.c 2011-04-28 19:34:15.000000000 -0400
-@@ -196,7 +196,7 @@ static struct scsi_host_template pata_at
+diff -urNp linux-2.6.39/drivers/ata/pata_at91.c linux-2.6.39/drivers/ata/pata_at91.c
+--- linux-2.6.39/drivers/ata/pata_at91.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_at91.c 2011-05-22 19:36:31.000000000 -0400
+@@ -212,7 +212,7 @@ static struct scsi_host_template pata_at
ATA_PIO_SHT(DRV_NAME),
};
.inherits = &ata_sff_port_ops,
.sff_data_xfer = pata_at91_data_xfer_noirq,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_atiixp.c linux-2.6.38.4/drivers/ata/pata_atiixp.c
---- linux-2.6.38.4/drivers/ata/pata_atiixp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_atiixp.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_atiixp.c linux-2.6.39/drivers/ata/pata_atiixp.c
+--- linux-2.6.39/drivers/ata/pata_atiixp.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_atiixp.c 2011-05-22 19:36:31.000000000 -0400
@@ -214,7 +214,7 @@ static struct scsi_host_template atiixp_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
.inherits = &ata_bmdma_port_ops,
.qc_prep = ata_bmdma_dumb_qc_prep,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_atp867x.c linux-2.6.38.4/drivers/ata/pata_atp867x.c
---- linux-2.6.38.4/drivers/ata/pata_atp867x.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_atp867x.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_atp867x.c linux-2.6.39/drivers/ata/pata_atp867x.c
+--- linux-2.6.39/drivers/ata/pata_atp867x.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_bmdma_port_ops,
.cable_detect = atp867x_cable_detect,
.set_piomode = atp867x_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_bf54x.c linux-2.6.38.4/drivers/ata/pata_bf54x.c
---- linux-2.6.38.4/drivers/ata/pata_bf54x.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_bf54x.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_bf54x.c linux-2.6.39/drivers/ata/pata_bf54x.c
+--- linux-2.6.39/drivers/ata/pata_bf54x.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_bf54x.c 2011-05-22 19:36:31.000000000 -0400
@@ -1420,7 +1420,7 @@ static struct scsi_host_template bfin_sh
.dma_boundary = ATA_DMA_BOUNDARY,
};
.inherits = &ata_bmdma_port_ops,
.set_piomode = bfin_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_cmd640.c linux-2.6.38.4/drivers/ata/pata_cmd640.c
---- linux-2.6.38.4/drivers/ata/pata_cmd640.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_cmd640.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_cmd640.c linux-2.6.39/drivers/ata/pata_cmd640.c
+--- linux-2.6.39/drivers/ata/pata_cmd640.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_cmd640.c 2011-05-22 19:36:31.000000000 -0400
@@ -176,7 +176,7 @@ static struct scsi_host_template cmd640_
ATA_PIO_SHT(DRV_NAME),
};
.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.38.4/drivers/ata/pata_cmd64x.c linux-2.6.38.4/drivers/ata/pata_cmd64x.c
---- linux-2.6.38.4/drivers/ata/pata_cmd64x.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_cmd64x.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_cmd64x.c linux-2.6.39/drivers/ata/pata_cmd64x.c
+--- linux-2.6.39/drivers/ata/pata_cmd64x.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_cmd64x.c 2011-05-22 19:36:31.000000000 -0400
@@ -268,18 +268,18 @@ static const struct ata_port_operations
.set_dmamode = cmd64x_set_dmamode,
};
.inherits = &cmd64x_base_ops,
.bmdma_stop = cmd648_bmdma_stop,
.cable_detect = cmd648_cable_detect,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_cs5520.c linux-2.6.38.4/drivers/ata/pata_cs5520.c
---- linux-2.6.38.4/drivers/ata/pata_cs5520.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_cs5520.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_cs5520.c linux-2.6.39/drivers/ata/pata_cs5520.c
+--- linux-2.6.39/drivers/ata/pata_cs5520.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_cs5520.c 2011-05-22 19:36:31.000000000 -0400
@@ -108,7 +108,7 @@ static struct scsi_host_template cs5520_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
.inherits = &ata_bmdma_port_ops,
.qc_prep = ata_bmdma_dumb_qc_prep,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_cs5530.c linux-2.6.38.4/drivers/ata/pata_cs5530.c
---- linux-2.6.38.4/drivers/ata/pata_cs5530.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_cs5530.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_cs5530.c linux-2.6.39/drivers/ata/pata_cs5530.c
+--- linux-2.6.39/drivers/ata/pata_cs5530.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_cs5530.c 2011-05-22 19:36:31.000000000 -0400
@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
.inherits = &ata_bmdma_port_ops,
.qc_prep = ata_bmdma_dumb_qc_prep,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_cs5535.c linux-2.6.38.4/drivers/ata/pata_cs5535.c
---- linux-2.6.38.4/drivers/ata/pata_cs5535.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_cs5535.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_cs5535.c linux-2.6.39/drivers/ata/pata_cs5535.c
+--- linux-2.6.39/drivers/ata/pata_cs5535.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_cs5535.c 2011-05-22 19:36:31.000000000 -0400
@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
ATA_BMDMA_SHT(DRV_NAME),
};
.inherits = &ata_bmdma_port_ops,
.cable_detect = cs5535_cable_detect,
.set_piomode = cs5535_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_cs5536.c linux-2.6.38.4/drivers/ata/pata_cs5536.c
---- linux-2.6.38.4/drivers/ata/pata_cs5536.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_cs5536.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_cs5536.c linux-2.6.39/drivers/ata/pata_cs5536.c
+--- linux-2.6.39/drivers/ata/pata_cs5536.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_cs5536.c 2011-05-22 19:36:31.000000000 -0400
@@ -233,7 +233,7 @@ static struct scsi_host_template cs5536_
ATA_BMDMA_SHT(DRV_NAME),
};
.inherits = &ata_bmdma32_port_ops,
.cable_detect = cs5536_cable_detect,
.set_piomode = cs5536_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_cypress.c linux-2.6.38.4/drivers/ata/pata_cypress.c
---- linux-2.6.38.4/drivers/ata/pata_cypress.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_cypress.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_cypress.c linux-2.6.39/drivers/ata/pata_cypress.c
+--- linux-2.6.39/drivers/ata/pata_cypress.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = cy82c693_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_efar.c linux-2.6.38.4/drivers/ata/pata_efar.c
---- linux-2.6.38.4/drivers/ata/pata_efar.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_efar.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_efar.c linux-2.6.39/drivers/ata/pata_efar.c
+--- linux-2.6.39/drivers/ata/pata_efar.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_efar.c 2011-05-22 19:36:31.000000000 -0400
@@ -238,7 +238,7 @@ static struct scsi_host_template efar_sh
ATA_BMDMA_SHT(DRV_NAME),
};
.inherits = &ata_bmdma_port_ops,
.cable_detect = efar_cable_detect,
.set_piomode = efar_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_hpt366.c linux-2.6.38.4/drivers/ata/pata_hpt366.c
---- linux-2.6.38.4/drivers/ata/pata_hpt366.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_hpt366.c 2011-04-28 19:34:15.000000000 -0400
-@@ -275,7 +275,7 @@ static struct scsi_host_template hpt36x_
+diff -urNp linux-2.6.39/drivers/ata/pata_hpt366.c linux-2.6.39/drivers/ata/pata_hpt366.c
+--- linux-2.6.39/drivers/ata/pata_hpt366.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_hpt366.c 2011-05-22 19:36:31.000000000 -0400
+@@ -276,7 +276,7 @@ static struct scsi_host_template hpt36x_
* Configuration for HPT366/68
*/
.inherits = &ata_bmdma_port_ops,
.cable_detect = hpt36x_cable_detect,
.mode_filter = hpt366_filter,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_hpt37x.c linux-2.6.38.4/drivers/ata/pata_hpt37x.c
---- linux-2.6.38.4/drivers/ata/pata_hpt37x.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_hpt37x.c 2011-04-28 19:34:15.000000000 -0400
-@@ -587,7 +587,7 @@ static struct scsi_host_template hpt37x_
+diff -urNp linux-2.6.39/drivers/ata/pata_hpt37x.c linux-2.6.39/drivers/ata/pata_hpt37x.c
+--- linux-2.6.39/drivers/ata/pata_hpt37x.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_hpt37x.c 2011-05-22 19:36:31.000000000 -0400
+@@ -589,7 +589,7 @@ static struct scsi_host_template hpt37x_
* Configuration for HPT370
*/
.inherits = &ata_bmdma_port_ops,
.bmdma_stop = hpt370_bmdma_stop,
-@@ -603,7 +603,7 @@ static struct ata_port_operations hpt370
+@@ -605,7 +605,7 @@ static struct ata_port_operations hpt370
* Configuration for HPT370A. Close to 370 but less filters
*/
.inherits = &hpt370_port_ops,
.mode_filter = hpt370a_filter,
};
-@@ -613,7 +613,7 @@ static struct ata_port_operations hpt370
+@@ -615,7 +615,7 @@ static struct ata_port_operations hpt370
* mode setting functionality.
*/
.inherits = &ata_bmdma_port_ops,
.bmdma_stop = hpt37x_bmdma_stop,
-@@ -629,7 +629,7 @@ static struct ata_port_operations hpt302
+@@ -631,7 +631,7 @@ static struct ata_port_operations hpt302
* but we have a mode filter.
*/
.inherits = &hpt302_port_ops,
.mode_filter = hpt372_filter,
};
-@@ -639,7 +639,7 @@ static struct ata_port_operations hpt372
+@@ -641,7 +641,7 @@ static struct ata_port_operations hpt372
* but we have a different cable detection procedure for function 1.
*/
.inherits = &hpt372_port_ops,
.cable_detect = hpt374_fn1_cable_detect,
};
-diff -urNp linux-2.6.38.4/drivers/ata/pata_hpt3x2n.c linux-2.6.38.4/drivers/ata/pata_hpt3x2n.c
---- linux-2.6.38.4/drivers/ata/pata_hpt3x2n.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_hpt3x2n.c 2011-04-28 19:34:15.000000000 -0400
-@@ -348,7 +348,7 @@ static struct scsi_host_template hpt3x2n
+diff -urNp linux-2.6.39/drivers/ata/pata_hpt3x2n.c linux-2.6.39/drivers/ata/pata_hpt3x2n.c
+--- linux-2.6.39/drivers/ata/pata_hpt3x2n.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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.
*/
.inherits = &ata_bmdma_port_ops,
.bmdma_stop = hpt3x2n_bmdma_stop,
-@@ -366,7 +366,7 @@ static struct ata_port_operations hpt3xx
+@@ -368,7 +368,7 @@ static struct ata_port_operations hpt3xx
* Configuration for HPT372N. Same as 302N/371N but we have a mode filter.
*/
.inherits = &hpt3xxn_port_ops,
.mode_filter = &hpt372n_filter,
};
-diff -urNp linux-2.6.38.4/drivers/ata/pata_hpt3x3.c linux-2.6.38.4/drivers/ata/pata_hpt3x3.c
---- linux-2.6.38.4/drivers/ata/pata_hpt3x3.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_hpt3x3.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_hpt3x3.c linux-2.6.39/drivers/ata/pata_hpt3x3.c
+--- linux-2.6.39/drivers/ata/pata_hpt3x3.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_hpt3x3.c 2011-05-22 19:36:31.000000000 -0400
@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
ATA_BMDMA_SHT(DRV_NAME),
};
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = hpt3x3_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_icside.c linux-2.6.38.4/drivers/ata/pata_icside.c
---- linux-2.6.38.4/drivers/ata/pata_icside.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_icside.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_icside.c linux-2.6.39/drivers/ata/pata_icside.c
+--- linux-2.6.39/drivers/ata/pata_icside.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_icside.c 2011-05-22 19:36:31.000000000 -0400
@@ -320,7 +320,7 @@ static void pata_icside_postreset(struct
}
}
.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.38.4/drivers/ata/pata_isapnp.c linux-2.6.38.4/drivers/ata/pata_isapnp.c
---- linux-2.6.38.4/drivers/ata/pata_isapnp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_isapnp.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_isapnp.c linux-2.6.39/drivers/ata/pata_isapnp.c
+--- linux-2.6.39/drivers/ata/pata_isapnp.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_isapnp.c 2011-05-22 19:36:31.000000000 -0400
@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
ATA_PIO_SHT(DRV_NAME),
};
.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.38.4/drivers/ata/pata_it8213.c linux-2.6.38.4/drivers/ata/pata_it8213.c
---- linux-2.6.38.4/drivers/ata/pata_it8213.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_it8213.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_it8213.c linux-2.6.39/drivers/ata/pata_it8213.c
+--- linux-2.6.39/drivers/ata/pata_it8213.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_it8213.c 2011-05-22 19:36:31.000000000 -0400
@@ -233,7 +233,7 @@ static struct scsi_host_template it8213_
};
.inherits = &ata_bmdma_port_ops,
.cable_detect = it8213_cable_detect,
.set_piomode = it8213_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_it821x.c linux-2.6.38.4/drivers/ata/pata_it821x.c
---- linux-2.6.38.4/drivers/ata/pata_it821x.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_it821x.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_it821x.c linux-2.6.39/drivers/ata/pata_it821x.c
+--- linux-2.6.39/drivers/ata/pata_it821x.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_it821x.c 2011-05-22 19:36:31.000000000 -0400
@@ -801,7 +801,7 @@ static struct scsi_host_template it821x_
ATA_BMDMA_SHT(DRV_NAME),
};
.inherits = &ata_bmdma_port_ops,
.check_atapi_dma= it821x_check_atapi_dma,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_ixp4xx_cf.c linux-2.6.38.4/drivers/ata/pata_ixp4xx_cf.c
---- linux-2.6.38.4/drivers/ata/pata_ixp4xx_cf.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_ixp4xx_cf.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_ixp4xx_cf.c linux-2.6.39/drivers/ata/pata_ixp4xx_cf.c
+--- linux-2.6.39/drivers/ata/pata_ixp4xx_cf.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_sff_port_ops,
.sff_data_xfer = ixp4xx_mmio_data_xfer,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_jmicron.c linux-2.6.38.4/drivers/ata/pata_jmicron.c
---- linux-2.6.38.4/drivers/ata/pata_jmicron.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_jmicron.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_jmicron.c linux-2.6.39/drivers/ata/pata_jmicron.c
+--- linux-2.6.39/drivers/ata/pata_jmicron.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_bmdma_port_ops,
.prereset = jmicron_pre_reset,
};
-diff -urNp linux-2.6.38.4/drivers/ata/pata_legacy.c linux-2.6.38.4/drivers/ata/pata_legacy.c
---- linux-2.6.38.4/drivers/ata/pata_legacy.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_legacy.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_legacy.c linux-2.6.39/drivers/ata/pata_legacy.c
+--- linux-2.6.39/drivers/ata/pata_legacy.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_legacy.c 2011-05-22 19:36:31.000000000 -0400
@@ -116,7 +116,7 @@ struct legacy_probe {
struct legacy_controller {
struct legacy_data *ld = &legacy_data[probe->slot];
struct ata_host *host = NULL;
struct ata_port *ap;
-diff -urNp linux-2.6.38.4/drivers/ata/pata_macio.c linux-2.6.38.4/drivers/ata/pata_macio.c
---- linux-2.6.38.4/drivers/ata/pata_macio.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_macio.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_macio.c linux-2.6.39/drivers/ata/pata_macio.c
+--- linux-2.6.39/drivers/ata/pata_macio.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_macio.c 2011-05-22 19:36:31.000000000 -0400
@@ -918,9 +918,8 @@ static struct scsi_host_template pata_ma
.slave_configure = pata_macio_slave_config,
};
.freeze = pata_macio_freeze,
.set_piomode = pata_macio_set_timings,
.set_dmamode = pata_macio_set_timings,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_marvell.c linux-2.6.38.4/drivers/ata/pata_marvell.c
---- linux-2.6.38.4/drivers/ata/pata_marvell.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_marvell.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_marvell.c linux-2.6.39/drivers/ata/pata_marvell.c
+--- linux-2.6.39/drivers/ata/pata_marvell.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_bmdma_port_ops,
.cable_detect = marvell_cable_detect,
.prereset = marvell_pre_reset,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_mpc52xx.c linux-2.6.38.4/drivers/ata/pata_mpc52xx.c
---- linux-2.6.38.4/drivers/ata/pata_mpc52xx.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_mpc52xx.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_mpc52xx.c linux-2.6.39/drivers/ata/pata_mpc52xx.c
+--- linux-2.6.39/drivers/ata/pata_mpc52xx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_bmdma_port_ops,
.sff_dev_select = mpc52xx_ata_dev_select,
.set_piomode = mpc52xx_ata_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_mpiix.c linux-2.6.38.4/drivers/ata/pata_mpiix.c
---- linux-2.6.38.4/drivers/ata/pata_mpiix.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_mpiix.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_mpiix.c linux-2.6.39/drivers/ata/pata_mpiix.c
+--- linux-2.6.39/drivers/ata/pata_mpiix.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_mpiix.c 2011-05-22 19:36:31.000000000 -0400
@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
ATA_PIO_SHT(DRV_NAME),
};
.inherits = &ata_sff_port_ops,
.qc_issue = mpiix_qc_issue,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_netcell.c linux-2.6.38.4/drivers/ata/pata_netcell.c
---- linux-2.6.38.4/drivers/ata/pata_netcell.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_netcell.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_netcell.c linux-2.6.39/drivers/ata/pata_netcell.c
+--- linux-2.6.39/drivers/ata/pata_netcell.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_80wire,
.read_id = netcell_read_id,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_ninja32.c linux-2.6.38.4/drivers/ata/pata_ninja32.c
---- linux-2.6.38.4/drivers/ata/pata_ninja32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_ninja32.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_ninja32.c linux-2.6.39/drivers/ata/pata_ninja32.c
+--- linux-2.6.39/drivers/ata/pata_ninja32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_bmdma_port_ops,
.sff_dev_select = ninja32_dev_select,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_ns87410.c linux-2.6.38.4/drivers/ata/pata_ns87410.c
---- linux-2.6.38.4/drivers/ata/pata_ns87410.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_ns87410.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_ns87410.c linux-2.6.39/drivers/ata/pata_ns87410.c
+--- linux-2.6.39/drivers/ata/pata_ns87410.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_sff_port_ops,
.qc_issue = ns87410_qc_issue,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_ns87415.c linux-2.6.38.4/drivers/ata/pata_ns87415.c
---- linux-2.6.38.4/drivers/ata/pata_ns87415.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_ns87415.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_ns87415.c linux-2.6.39/drivers/ata/pata_ns87415.c
+--- linux-2.6.39/drivers/ata/pata_ns87415.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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 */
.inherits = &ns87415_pata_ops,
.sff_tf_read = ns87560_tf_read,
.sff_check_status = ns87560_check_status,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_octeon_cf.c linux-2.6.38.4/drivers/ata/pata_octeon_cf.c
---- linux-2.6.38.4/drivers/ata/pata_octeon_cf.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_octeon_cf.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_octeon_cf.c linux-2.6.39/drivers/ata/pata_octeon_cf.c
+--- linux-2.6.39/drivers/ata/pata_octeon_cf.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
}
.inherits = &ata_sff_port_ops,
.check_atapi_dma = octeon_cf_check_atapi_dma,
.qc_prep = ata_noop_qc_prep,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_oldpiix.c linux-2.6.38.4/drivers/ata/pata_oldpiix.c
---- linux-2.6.38.4/drivers/ata/pata_oldpiix.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_oldpiix.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_oldpiix.c linux-2.6.39/drivers/ata/pata_oldpiix.c
+--- linux-2.6.39/drivers/ata/pata_oldpiix.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_bmdma_port_ops,
.qc_issue = oldpiix_qc_issue,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_opti.c linux-2.6.38.4/drivers/ata/pata_opti.c
---- linux-2.6.38.4/drivers/ata/pata_opti.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_opti.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_opti.c linux-2.6.39/drivers/ata/pata_opti.c
+--- linux-2.6.39/drivers/ata/pata_opti.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_opti.c 2011-05-22 19:36:31.000000000 -0400
@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
ATA_PIO_SHT(DRV_NAME),
};
.inherits = &ata_sff_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = opti_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_optidma.c linux-2.6.38.4/drivers/ata/pata_optidma.c
---- linux-2.6.38.4/drivers/ata/pata_optidma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_optidma.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_optidma.c linux-2.6.39/drivers/ata/pata_optidma.c
+--- linux-2.6.39/drivers/ata/pata_optidma.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &optidma_port_ops,
.set_piomode = optiplus_set_pio_mode,
.set_dmamode = optiplus_set_dma_mode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_palmld.c linux-2.6.38.4/drivers/ata/pata_palmld.c
---- linux-2.6.38.4/drivers/ata/pata_palmld.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_palmld.c 2011-04-28 19:34:15.000000000 -0400
-@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
+diff -urNp linux-2.6.39/drivers/ata/pata_palmld.c linux-2.6.39/drivers/ata/pata_palmld.c
+--- linux-2.6.39/drivers/ata/pata_palmld.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_palmld.c 2011-05-22 19:36:31.000000000 -0400
+@@ -42,7 +42,7 @@ static struct scsi_host_template palmld_
ATA_PIO_SHT(DRV_NAME),
};
.inherits = &ata_sff_port_ops,
.sff_data_xfer = ata_sff_data_xfer_noirq,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_pcmcia.c linux-2.6.38.4/drivers/ata/pata_pcmcia.c
---- linux-2.6.38.4/drivers/ata/pata_pcmcia.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_pcmcia.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_pcmcia.c linux-2.6.39/drivers/ata/pata_pcmcia.c
+--- linux-2.6.39/drivers/ata/pata_pcmcia.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_pcmcia.c 2011-05-22 19:36:31.000000000 -0400
@@ -151,14 +151,14 @@ static struct scsi_host_template pcmcia_
ATA_PIO_SHT(DRV_NAME),
};
/* 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.38.4/drivers/ata/pata_pdc2027x.c linux-2.6.38.4/drivers/ata/pata_pdc2027x.c
---- linux-2.6.38.4/drivers/ata/pata_pdc2027x.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_pdc2027x.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_pdc2027x.c linux-2.6.39/drivers/ata/pata_pdc2027x.c
+--- linux-2.6.39/drivers/ata/pata_pdc2027x.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &pdc2027x_pata100_ops,
.mode_filter = pdc2027x_mode_filter,
.set_piomode = pdc2027x_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_pdc202xx_old.c linux-2.6.38.4/drivers/ata/pata_pdc202xx_old.c
---- linux-2.6.38.4/drivers/ata/pata_pdc202xx_old.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_pdc202xx_old.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_pdc202xx_old.c linux-2.6.39/drivers/ata/pata_pdc202xx_old.c
+--- linux-2.6.39/drivers/ata/pata_pdc202xx_old.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &pdc2024x_port_ops,
.check_atapi_dma = pdc2026x_check_atapi_dma,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_piccolo.c linux-2.6.38.4/drivers/ata/pata_piccolo.c
---- linux-2.6.38.4/drivers/ata/pata_piccolo.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_piccolo.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_piccolo.c linux-2.6.39/drivers/ata/pata_piccolo.c
+--- linux-2.6.39/drivers/ata/pata_piccolo.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_unknown,
.set_piomode = tosh_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_platform.c linux-2.6.38.4/drivers/ata/pata_platform.c
---- linux-2.6.38.4/drivers/ata/pata_platform.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_platform.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_platform.c linux-2.6.39/drivers/ata/pata_platform.c
+--- linux-2.6.39/drivers/ata/pata_platform.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_sff_port_ops,
.sff_data_xfer = ata_sff_data_xfer_noirq,
.cable_detect = ata_cable_unknown,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_pxa.c linux-2.6.38.4/drivers/ata/pata_pxa.c
---- linux-2.6.38.4/drivers/ata/pata_pxa.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_pxa.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_pxa.c linux-2.6.39/drivers/ata/pata_pxa.c
+--- linux-2.6.39/drivers/ata/pata_pxa.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_qdi.c linux-2.6.38.4/drivers/ata/pata_qdi.c
---- linux-2.6.38.4/drivers/ata/pata_qdi.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_qdi.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_qdi.c linux-2.6.39/drivers/ata/pata_qdi.c
+--- linux-2.6.39/drivers/ata/pata_qdi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &qdi6500_port_ops,
.set_piomode = qdi6580_set_piomode,
};
-diff -urNp linux-2.6.38.4/drivers/ata/pata_radisys.c linux-2.6.38.4/drivers/ata/pata_radisys.c
---- linux-2.6.38.4/drivers/ata/pata_radisys.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_radisys.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_radisys.c linux-2.6.39/drivers/ata/pata_radisys.c
+--- linux-2.6.39/drivers/ata/pata_radisys.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_bmdma_port_ops,
.qc_issue = radisys_qc_issue,
.cable_detect = ata_cable_unknown,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_rb532_cf.c linux-2.6.38.4/drivers/ata/pata_rb532_cf.c
---- linux-2.6.38.4/drivers/ata/pata_rb532_cf.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_rb532_cf.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_rb532_cf.c linux-2.6.39/drivers/ata/pata_rb532_cf.c
+--- linux-2.6.39/drivers/ata/pata_rb532_cf.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
}
.inherits = &ata_sff_port_ops,
.sff_data_xfer = ata_sff_data_xfer32,
};
-diff -urNp linux-2.6.38.4/drivers/ata/pata_rdc.c linux-2.6.38.4/drivers/ata/pata_rdc.c
---- linux-2.6.38.4/drivers/ata/pata_rdc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_rdc.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_rdc.c linux-2.6.39/drivers/ata/pata_rdc.c
+--- linux-2.6.39/drivers/ata/pata_rdc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
}
.inherits = &ata_bmdma32_port_ops,
.cable_detect = rdc_pata_cable_detect,
.set_piomode = rdc_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_rz1000.c linux-2.6.38.4/drivers/ata/pata_rz1000.c
---- linux-2.6.38.4/drivers/ata/pata_rz1000.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_rz1000.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_rz1000.c linux-2.6.39/drivers/ata/pata_rz1000.c
+--- linux-2.6.39/drivers/ata/pata_rz1000.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_rz1000.c 2011-05-22 19:36:31.000000000 -0400
@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
ATA_PIO_SHT(DRV_NAME),
};
.inherits = &ata_sff_port_ops,
.cable_detect = ata_cable_40wire,
.set_mode = rz1000_set_mode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_samsung_cf.c linux-2.6.38.4/drivers/ata/pata_samsung_cf.c
---- linux-2.6.38.4/drivers/ata/pata_samsung_cf.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_samsung_cf.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_samsung_cf.c linux-2.6.39/drivers/ata/pata_samsung_cf.c
+--- linux-2.6.39/drivers/ata/pata_samsung_cf.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_sff_port_ops,
.set_piomode = pata_s3c_set_piomode,
};
-diff -urNp linux-2.6.38.4/drivers/ata/pata_sc1200.c linux-2.6.38.4/drivers/ata/pata_sc1200.c
---- linux-2.6.38.4/drivers/ata/pata_sc1200.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_sc1200.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_sc1200.c linux-2.6.39/drivers/ata/pata_sc1200.c
+--- linux-2.6.39/drivers/ata/pata_sc1200.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_sc1200.c 2011-05-22 19:36:31.000000000 -0400
@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
.inherits = &ata_bmdma_port_ops,
.qc_prep = ata_bmdma_dumb_qc_prep,
.qc_issue = sc1200_qc_issue,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_scc.c linux-2.6.38.4/drivers/ata/pata_scc.c
---- linux-2.6.38.4/drivers/ata/pata_scc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_scc.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_scc.c linux-2.6.39/drivers/ata/pata_scc.c
+--- linux-2.6.39/drivers/ata/pata_scc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_bmdma_port_ops,
.set_piomode = scc_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_sch.c linux-2.6.38.4/drivers/ata/pata_sch.c
---- linux-2.6.38.4/drivers/ata/pata_sch.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_sch.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_sch.c linux-2.6.39/drivers/ata/pata_sch.c
+--- linux-2.6.39/drivers/ata/pata_sch.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_unknown,
.set_piomode = sch_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_serverworks.c linux-2.6.38.4/drivers/ata/pata_serverworks.c
---- linux-2.6.38.4/drivers/ata/pata_serverworks.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_serverworks.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_serverworks.c linux-2.6.39/drivers/ata/pata_serverworks.c
+--- linux-2.6.39/drivers/ata/pata_serverworks.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &serverworks_osb4_port_ops,
.mode_filter = serverworks_csb_filter,
};
-diff -urNp linux-2.6.38.4/drivers/ata/pata_sil680.c linux-2.6.38.4/drivers/ata/pata_sil680.c
---- linux-2.6.38.4/drivers/ata/pata_sil680.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_sil680.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_sil680.c linux-2.6.39/drivers/ata/pata_sil680.c
+--- linux-2.6.39/drivers/ata/pata_sil680.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/pata_sil680.c 2011-05-22 19:36:31.000000000 -0400
@@ -225,8 +225,7 @@ static struct scsi_host_template sil680_
ATA_BMDMA_SHT(DRV_NAME),
};
.inherits = &ata_bmdma32_port_ops,
.sff_exec_command = sil680_sff_exec_command,
.sff_irq_check = sil680_sff_irq_check,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_sis.c linux-2.6.38.4/drivers/ata/pata_sis.c
---- linux-2.6.38.4/drivers/ata/pata_sis.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_sis.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_sis.c linux-2.6.39/drivers/ata/pata_sis.c
+--- linux-2.6.39/drivers/ata/pata_sis.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &sis_base_ops,
.set_piomode = sis_old_set_piomode,
.set_dmamode = sis_old_set_dmamode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_sl82c105.c linux-2.6.38.4/drivers/ata/pata_sl82c105.c
---- linux-2.6.38.4/drivers/ata/pata_sl82c105.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_sl82c105.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_sl82c105.c linux-2.6.39/drivers/ata/pata_sl82c105.c
+--- linux-2.6.39/drivers/ata/pata_sl82c105.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_bmdma_port_ops,
.qc_defer = sl82c105_qc_defer,
.bmdma_start = sl82c105_bmdma_start,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_triflex.c linux-2.6.38.4/drivers/ata/pata_triflex.c
---- linux-2.6.38.4/drivers/ata/pata_triflex.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_triflex.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_triflex.c linux-2.6.39/drivers/ata/pata_triflex.c
+--- linux-2.6.39/drivers/ata/pata_triflex.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_bmdma_port_ops,
.bmdma_start = triflex_bmdma_start,
.bmdma_stop = triflex_bmdma_stop,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_via.c linux-2.6.38.4/drivers/ata/pata_via.c
---- linux-2.6.38.4/drivers/ata/pata_via.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_via.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pata_via.c linux-2.6.39/drivers/ata/pata_via.c
+--- linux-2.6.39/drivers/ata/pata_via.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &via_port_ops,
.sff_data_xfer = ata_sff_data_xfer_noirq,
};
-diff -urNp linux-2.6.38.4/drivers/ata/pdc_adma.c linux-2.6.38.4/drivers/ata/pdc_adma.c
---- linux-2.6.38.4/drivers/ata/pdc_adma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pdc_adma.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/pdc_adma.c linux-2.6.39/drivers/ata/pdc_adma.c
+--- linux-2.6.39/drivers/ata/pdc_adma.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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,
};
.inherits = &ata_sff_port_ops,
.lost_interrupt = ATA_OP_NULL,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_dwc_460ex.c linux-2.6.38.4/drivers/ata/sata_dwc_460ex.c
---- linux-2.6.38.4/drivers/ata/sata_dwc_460ex.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_dwc_460ex.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1560,7 +1560,7 @@ static struct scsi_host_template sata_dw
+diff -urNp linux-2.6.39/drivers/ata/sata_dwc_460ex.c linux-2.6.39/drivers/ata/sata_dwc_460ex.c
+--- linux-2.6.39/drivers/ata/sata_dwc_460ex.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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,
};
.inherits = &ata_sff_port_ops,
.error_handler = sata_dwc_error_handler,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_fsl.c linux-2.6.38.4/drivers/ata/sata_fsl.c
---- linux-2.6.38.4/drivers/ata/sata_fsl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_fsl.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
+diff -urNp linux-2.6.39/drivers/ata/sata_fsl.c linux-2.6.39/drivers/ata/sata_fsl.c
+--- linux-2.6.39/drivers/ata/sata_fsl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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,
};
.inherits = &sata_pmp_port_ops,
.qc_defer = ata_std_qc_defer,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_inic162x.c linux-2.6.38.4/drivers/ata/sata_inic162x.c
---- linux-2.6.38.4/drivers/ata/sata_inic162x.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_inic162x.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/sata_inic162x.c linux-2.6.39/drivers/ata/sata_inic162x.c
+--- linux-2.6.39/drivers/ata/sata_inic162x.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
}
.inherits = &sata_port_ops,
.check_atapi_dma = inic_check_atapi_dma,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_mv.c linux-2.6.38.4/drivers/ata/sata_mv.c
---- linux-2.6.38.4/drivers/ata/sata_mv.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_mv.c 2011-04-28 19:34:15.000000000 -0400
-@@ -663,7 +663,7 @@ static struct scsi_host_template mv6_sht
+diff -urNp linux-2.6.39/drivers/ata/sata_mv.c linux-2.6.39/drivers/ata/sata_mv.c
+--- linux-2.6.39/drivers/ata/sata_mv.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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,
};
.inherits = &ata_sff_port_ops,
.lost_interrupt = ATA_OP_NULL,
-@@ -683,7 +683,7 @@ static struct ata_port_operations mv5_op
+@@ -682,7 +682,7 @@ static struct ata_port_operations mv5_op
.port_stop = mv_port_stop,
};
.inherits = &ata_bmdma_port_ops,
.lost_interrupt = ATA_OP_NULL,
-@@ -717,7 +717,7 @@ static struct ata_port_operations mv6_op
+@@ -716,7 +716,7 @@ static struct ata_port_operations mv6_op
.port_stop = mv_port_stop,
};
.inherits = &mv6_ops,
.dev_config = ATA_OP_NULL,
.qc_prep = mv_qc_prep_iie,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_nv.c linux-2.6.38.4/drivers/ata/sata_nv.c
---- linux-2.6.38.4/drivers/ata/sata_nv.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_nv.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/sata_nv.c linux-2.6.39/drivers/ata/sata_nv.c
+--- linux-2.6.39/drivers/ata/sata_nv.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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.
.inherits = &nv_generic_ops,
.qc_defer = ata_std_qc_defer,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_promise.c linux-2.6.38.4/drivers/ata/sata_promise.c
---- linux-2.6.38.4/drivers/ata/sata_promise.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_promise.c 2011-04-28 19:34:15.000000000 -0400
-@@ -196,7 +196,7 @@ static const struct ata_port_operations
+diff -urNp linux-2.6.39/drivers/ata/sata_promise.c linux-2.6.39/drivers/ata/sata_promise.c
+--- linux-2.6.39/drivers/ata/sata_promise.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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,
};
.inherits = &pdc_common_ops,
.cable_detect = pdc_sata_cable_detect,
.freeze = pdc_sata_freeze,
-@@ -209,14 +209,14 @@ static struct ata_port_operations pdc_sa
+@@ -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. */
.inherits = &pdc_common_ops,
.cable_detect = pdc_pata_cable_detect,
.freeze = pdc_freeze,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_qstor.c linux-2.6.38.4/drivers/ata/sata_qstor.c
---- linux-2.6.38.4/drivers/ata/sata_qstor.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_qstor.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/sata_qstor.c linux-2.6.39/drivers/ata/sata_qstor.c
+--- linux-2.6.39/drivers/ata/sata_qstor.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/sata_qstor.c 2011-05-22 19:36:31.000000000 -0400
@@ -131,7 +131,7 @@ static struct scsi_host_template qs_ata_
.dma_boundary = QS_DMA_BOUNDARY,
};
.inherits = &ata_sff_port_ops,
.check_atapi_dma = qs_check_atapi_dma,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_sil24.c linux-2.6.38.4/drivers/ata/sata_sil24.c
---- linux-2.6.38.4/drivers/ata/sata_sil24.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_sil24.c 2011-04-28 19:34:15.000000000 -0400
-@@ -389,7 +389,7 @@ static struct scsi_host_template sil24_s
+diff -urNp linux-2.6.39/drivers/ata/sata_sil24.c linux-2.6.39/drivers/ata/sata_sil24.c
+--- linux-2.6.39/drivers/ata/sata_sil24.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/sata_sil24.c 2011-05-22 19:36:31.000000000 -0400
+@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
.dma_boundary = ATA_DMA_BOUNDARY,
};
.inherits = &sata_pmp_port_ops,
.qc_defer = sil24_qc_defer,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_sil.c linux-2.6.38.4/drivers/ata/sata_sil.c
---- linux-2.6.38.4/drivers/ata/sata_sil.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_sil.c 2011-04-28 19:34:15.000000000 -0400
-@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
+diff -urNp linux-2.6.39/drivers/ata/sata_sil.c linux-2.6.39/drivers/ata/sata_sil.c
+--- linux-2.6.39/drivers/ata/sata_sil.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
};
.inherits = &ata_bmdma32_port_ops,
.dev_config = sil_dev_config,
.set_mode = sil_set_mode,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_sis.c linux-2.6.38.4/drivers/ata/sata_sis.c
---- linux-2.6.38.4/drivers/ata/sata_sis.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_sis.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/sata_sis.c linux-2.6.39/drivers/ata/sata_sis.c
+--- linux-2.6.39/drivers/ata/sata_sis.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_bmdma_port_ops,
.scr_read = sis_scr_read,
.scr_write = sis_scr_write,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_svw.c linux-2.6.38.4/drivers/ata/sata_svw.c
---- linux-2.6.38.4/drivers/ata/sata_svw.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_svw.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/sata_svw.c linux-2.6.39/drivers/ata/sata_svw.c
+--- linux-2.6.39/drivers/ata/sata_svw.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/sata_svw.c 2011-05-22 19:36:31.000000000 -0400
@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
};
.inherits = &ata_bmdma_port_ops,
.sff_tf_load = k2_sata_tf_load,
.sff_tf_read = k2_sata_tf_read,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_sx4.c linux-2.6.38.4/drivers/ata/sata_sx4.c
---- linux-2.6.38.4/drivers/ata/sata_sx4.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_sx4.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/sata_sx4.c linux-2.6.39/drivers/ata/sata_sx4.c
+--- linux-2.6.39/drivers/ata/sata_sx4.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/sata_sx4.c 2011-05-22 19:36:31.000000000 -0400
@@ -249,7 +249,7 @@ static struct scsi_host_template pdc_sat
};
.inherits = &ata_sff_port_ops,
.check_atapi_dma = pdc_check_atapi_dma,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_uli.c linux-2.6.38.4/drivers/ata/sata_uli.c
---- linux-2.6.38.4/drivers/ata/sata_uli.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_uli.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/sata_uli.c linux-2.6.39/drivers/ata/sata_uli.c
+--- linux-2.6.39/drivers/ata/sata_uli.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_bmdma_port_ops,
.scr_read = uli_scr_read,
.scr_write = uli_scr_write,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_via.c linux-2.6.38.4/drivers/ata/sata_via.c
---- linux-2.6.38.4/drivers/ata/sata_via.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_via.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/sata_via.c linux-2.6.39/drivers/ata/sata_via.c
+--- linux-2.6.39/drivers/ata/sata_via.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &svia_base_ops,
.hardreset = sata_std_hardreset,
.scr_read = vt8251_scr_read,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_vsc.c linux-2.6.38.4/drivers/ata/sata_vsc.c
---- linux-2.6.38.4/drivers/ata/sata_vsc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_vsc.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ata/sata_vsc.c linux-2.6.39/drivers/ata/sata_vsc.c
+--- linux-2.6.39/drivers/ata/sata_vsc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ata/sata_vsc.c 2011-05-22 19:36:31.000000000 -0400
@@ -300,7 +300,7 @@ static struct scsi_host_template vsc_sat
};
.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.38.4/drivers/atm/adummy.c linux-2.6.38.4/drivers/atm/adummy.c
---- linux-2.6.38.4/drivers/atm/adummy.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/adummy.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/atm/adummy.c linux-2.6.39/drivers/atm/adummy.c
+--- linux-2.6.39/drivers/atm/adummy.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/atm/adummy.c 2011-05-22 19:36:31.000000000 -0400
@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct
vcc->pop(vcc, skb);
else
return 0;
}
-diff -urNp linux-2.6.38.4/drivers/atm/ambassador.c linux-2.6.38.4/drivers/atm/ambassador.c
---- linux-2.6.38.4/drivers/atm/ambassador.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/ambassador.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/atm/ambassador.c linux-2.6.39/drivers/atm/ambassador.c
+--- linux-2.6.39/drivers/atm/ambassador.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/atm/ambassador.c 2011-05-22 19:36:31.000000000 -0400
@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev,
PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
- atomic_inc(&atm_vcc->stats->rx);
+ atomic_inc_unchecked(&atm_vcc->stats->rx);
__net_timestamp(skb);
- // end of our responsability
+ // end of our responsibility
atm_vcc->push (atm_vcc, skb);
@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev,
} else {
return -ENOMEM; // ?
}
-diff -urNp linux-2.6.38.4/drivers/atm/atmtcp.c linux-2.6.38.4/drivers/atm/atmtcp.c
---- linux-2.6.38.4/drivers/atm/atmtcp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/atmtcp.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/atm/atmtcp.c linux-2.6.39/drivers/atm/atmtcp.c
+--- linux-2.6.39/drivers/atm/atmtcp.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/atm/atmtcp.c 2011-05-22 19:36:31.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);
done:
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb(skb);
-diff -urNp linux-2.6.38.4/drivers/atm/eni.c linux-2.6.38.4/drivers/atm/eni.c
---- linux-2.6.38.4/drivers/atm/eni.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/eni.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/atm/eni.c linux-2.6.39/drivers/atm/eni.c
+--- linux-2.6.39/drivers/atm/eni.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/atm/eni.c 2011-05-22 19:36:31.000000000 -0400
@@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
vcc->dev->number);
wake_up(&eni_dev->tx_wait);
dma_complete++;
}
-diff -urNp linux-2.6.38.4/drivers/atm/firestream.c linux-2.6.38.4/drivers/atm/firestream.c
---- linux-2.6.38.4/drivers/atm/firestream.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/firestream.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/atm/firestream.c linux-2.6.39/drivers/atm/firestream.c
+--- linux-2.6.39/drivers/atm/firestream.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/atm/firestream.c 2011-05-22 19:36:31.000000000 -0400
@@ -749,7 +749,7 @@ static void process_txdone_queue (struct
}
}
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.38.4/drivers/atm/fore200e.c linux-2.6.38.4/drivers/atm/fore200e.c
---- linux-2.6.38.4/drivers/atm/fore200e.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/fore200e.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/atm/fore200e.c linux-2.6.39/drivers/atm/fore200e.c
+--- linux-2.6.39/drivers/atm/fore200e.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/atm/fore200e.c 2011-05-22 19:36:31.000000000 -0400
@@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200
#endif
/* check error condition */
fore200e->tx_sat++;
DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
-diff -urNp linux-2.6.38.4/drivers/atm/he.c linux-2.6.38.4/drivers/atm/he.c
---- linux-2.6.38.4/drivers/atm/he.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/he.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/atm/he.c linux-2.6.39/drivers/atm/he.c
+--- linux-2.6.39/drivers/atm/he.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/atm/he.c 2011-05-22 19:36:31.000000000 -0400
@@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i
if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
return 0;
}
-diff -urNp linux-2.6.38.4/drivers/atm/horizon.c linux-2.6.38.4/drivers/atm/horizon.c
---- linux-2.6.38.4/drivers/atm/horizon.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/horizon.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/atm/horizon.c linux-2.6.39/drivers/atm/horizon.c
+--- linux-2.6.39/drivers/atm/horizon.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/atm/horizon.c 2011-05-22 19:36:31.000000000 -0400
@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev,
{
struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
- atomic_inc(&vcc->stats->rx);
+ atomic_inc_unchecked(&vcc->stats->rx);
__net_timestamp(skb);
- // end of our responsability
+ // end of our responsibility
vcc->push (vcc, skb);
@@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const
dev->tx_iovec = NULL;
// free the skb
hrz_kfree_skb (skb);
-diff -urNp linux-2.6.38.4/drivers/atm/idt77252.c linux-2.6.38.4/drivers/atm/idt77252.c
---- linux-2.6.38.4/drivers/atm/idt77252.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/idt77252.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/atm/idt77252.c linux-2.6.39/drivers/atm/idt77252.c
+--- linux-2.6.39/drivers/atm/idt77252.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/atm/idt77252.c 2011-05-22 19:36:31.000000000 -0400
@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str
else
dev_kfree_skb(skb);
return -ENOMEM;
}
atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
-diff -urNp linux-2.6.38.4/drivers/atm/iphase.c linux-2.6.38.4/drivers/atm/iphase.c
---- linux-2.6.38.4/drivers/atm/iphase.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/iphase.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/atm/iphase.c linux-2.6.39/drivers/atm/iphase.c
+--- linux-2.6.39/drivers/atm/iphase.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/atm/iphase.c 2011-05-22 19:36:31.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))
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.38.4/drivers/atm/lanai.c linux-2.6.38.4/drivers/atm/lanai.c
---- linux-2.6.38.4/drivers/atm/lanai.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/lanai.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/atm/lanai.c linux-2.6.39/drivers/atm/lanai.c
+--- linux-2.6.39/drivers/atm/lanai.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/atm/lanai.c 2011-05-22 19:36:31.000000000 -0400
@@ -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);
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.38.4/drivers/atm/nicstar.c linux-2.6.38.4/drivers/atm/nicstar.c
---- linux-2.6.38.4/drivers/atm/nicstar.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/nicstar.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/atm/nicstar.c linux-2.6.39/drivers/atm/nicstar.c
+--- linux-2.6.39/drivers/atm/nicstar.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/atm/nicstar.c 2011-05-22 19:36:31.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",
}
}
-diff -urNp linux-2.6.38.4/drivers/atm/solos-pci.c linux-2.6.38.4/drivers/atm/solos-pci.c
---- linux-2.6.38.4/drivers/atm/solos-pci.c 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/solos-pci.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/atm/solos-pci.c linux-2.6.39/drivers/atm/solos-pci.c
+--- linux-2.6.39/drivers/atm/solos-pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/atm/solos-pci.c 2011-05-22 19:36:31.000000000 -0400
@@ -715,7 +715,7 @@ void solos_bh(unsigned long card_arg)
}
atm_charge(vcc, skb->truesize);
break;
case PKT_STATUS:
-@@ -1009,7 +1009,7 @@ static uint32_t fpga_tx(struct solos_car
+@@ -900,6 +900,8 @@ static int print_buffer(struct sk_buff *
+ char msg[500];
+ char item[10];
+
++ pax_track_stack();
++
+ len = buf->len;
+ for (i = 0; i < len; i++){
+ if(i % 8 == 0)
+@@ -1009,7 +1011,7 @@ static uint32_t fpga_tx(struct solos_car
vcc = SKB_CB(oldskb)->vcc;
if (vcc) {
solos_pop(vcc, oldskb);
} else
dev_kfree_skb_irq(oldskb);
-diff -urNp linux-2.6.38.4/drivers/atm/suni.c linux-2.6.38.4/drivers/atm/suni.c
---- linux-2.6.38.4/drivers/atm/suni.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/suni.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/atm/suni.c linux-2.6.39/drivers/atm/suni.c
+--- linux-2.6.39/drivers/atm/suni.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/atm/suni.c 2011-05-22 19:36:31.000000000 -0400
@@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
static void suni_hz(unsigned long from_timer)
-diff -urNp linux-2.6.38.4/drivers/atm/uPD98402.c linux-2.6.38.4/drivers/atm/uPD98402.c
---- linux-2.6.38.4/drivers/atm/uPD98402.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/uPD98402.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/atm/uPD98402.c linux-2.6.39/drivers/atm/uPD98402.c
+--- linux-2.6.39/drivers/atm/uPD98402.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/atm/uPD98402.c 2011-05-22 19:36:31.000000000 -0400
@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d
struct sonet_stats tmp;
int error = 0;
return 0;
}
-diff -urNp linux-2.6.38.4/drivers/atm/zatm.c linux-2.6.38.4/drivers/atm/zatm.c
---- linux-2.6.38.4/drivers/atm/zatm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/zatm.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/atm/zatm.c linux-2.6.39/drivers/atm/zatm.c
+--- linux-2.6.39/drivers/atm/zatm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/atm/zatm.c 2011-05-22 19:36:31.000000000 -0400
@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
}
if (!size) {
wake_up(&zatm_vcc->tx_wait);
}
-diff -urNp linux-2.6.38.4/drivers/base/power/wakeup.c linux-2.6.38.4/drivers/base/power/wakeup.c
---- linux-2.6.38.4/drivers/base/power/wakeup.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/base/power/wakeup.c 2011-04-28 19:57:25.000000000 -0400
-@@ -25,7 +25,7 @@
- bool events_check_enabled;
-
- /* The counter of registered wakeup events. */
--static atomic_t event_count = ATOMIC_INIT(0);
-+static atomic_unchecked_t event_count = ATOMIC_INIT(0);
- /* A preserved old value of event_count. */
- static unsigned int saved_count;
- /* The counter of wakeup events being processed. */
-@@ -399,7 +399,7 @@ static void wakeup_source_deactivate(str
- * pm_save_wakeup_count() don't see the old value of event_count and
- * events_in_progress equal to zero at the same time.
- */
-- atomic_inc(&event_count);
-+ atomic_inc_unchecked(&event_count);
- smp_mb__before_atomic_dec();
- atomic_dec(&events_in_progress);
- }
-@@ -556,7 +556,7 @@ bool pm_wakeup_pending(void)
+diff -urNp linux-2.6.39/drivers/base/iommu.c linux-2.6.39/drivers/base/iommu.c
+--- linux-2.6.39/drivers/base/iommu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/base/iommu.c 2011-05-22 19:36:31.000000000 -0400
+@@ -23,9 +23,8 @@
+ #include <linux/errno.h>
+ #include <linux/iommu.h>
- spin_lock_irqsave(&events_lock, flags);
- if (events_check_enabled) {
-- ret = ((unsigned int)atomic_read(&event_count) != saved_count)
-+ ret = ((unsigned int)atomic_read_unchecked(&event_count) != saved_count)
- || atomic_read(&events_in_progress);
- events_check_enabled = !ret;
- }
-@@ -590,7 +590,7 @@ bool pm_get_wakeup_count(unsigned int *c
- }
+-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/drivers/base/power/generic_ops.c linux-2.6.39/drivers/base/power/generic_ops.c
+--- linux-2.6.39/drivers/base/power/generic_ops.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/base/power/wakeup.c linux-2.6.39/drivers/base/power/wakeup.c
+--- linux-2.6.39/drivers/base/power/wakeup.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/base/power/wakeup.c 2011-05-22 19:36:31.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.
+ */
+-static atomic_t combined_event_count = ATOMIC_INIT(0);
++static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
- ret = !atomic_read(&events_in_progress);
-- *count = atomic_read(&event_count);
-+ *count = atomic_read_unchecked(&event_count);
- return ret;
+ #define IN_PROGRESS_BITS (sizeof(int) * 4)
+ #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
+
+ static void split_counters(unsigned int *cnt, unsigned int *inpr)
+ {
+- unsigned int comb = atomic_read(&combined_event_count);
++ unsigned int comb = atomic_read_unchecked(&combined_event_count);
+
+ *cnt = (comb >> IN_PROGRESS_BITS);
+ *inpr = comb & MAX_IN_PROGRESS;
+@@ -351,7 +351,7 @@ static void wakeup_source_activate(struc
+ ws->last_time = ktime_get();
+
+ /* Increment the counter of events in progress. */
+- atomic_inc(&combined_event_count);
++ atomic_inc_unchecked(&combined_event_count);
}
-@@ -608,7 +608,7 @@ bool pm_save_wakeup_count(unsigned int c
- bool ret = false;
+ /**
+@@ -441,7 +441,7 @@ static void wakeup_source_deactivate(str
+ * Increment the counter of registered wakeup events and decrement the
+ * couter of wakeup events in progress simultaneously.
+ */
+- atomic_add(MAX_IN_PROGRESS, &combined_event_count);
++ atomic_add_unchecked(MAX_IN_PROGRESS, &combined_event_count);
+ }
- spin_lock_irq(&events_lock);
-- if (count == (unsigned int)atomic_read(&event_count)
-+ if (count == (unsigned int)atomic_read_unchecked(&event_count)
- && !atomic_read(&events_in_progress)) {
- saved_count = count;
- events_check_enabled = true;
-diff -urNp linux-2.6.38.4/drivers/block/cciss.c linux-2.6.38.4/drivers/block/cciss.c
---- linux-2.6.38.4/drivers/block/cciss.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/block/cciss.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1112,6 +1112,8 @@ static int cciss_ioctl32_passthru(struct
+ /**
+diff -urNp linux-2.6.39/drivers/block/cciss.c linux-2.6.39/drivers/block/cciss.c
+--- linux-2.6.39/drivers/block/cciss.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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},
+@@ -1151,6 +1151,8 @@ static int cciss_ioctl32_passthru(struct
int err;
u32 cp;
err = 0;
err |=
copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
-diff -urNp linux-2.6.38.4/drivers/block/drbd/drbd_int.h linux-2.6.38.4/drivers/block/drbd/drbd_int.h
---- linux-2.6.38.4/drivers/block/drbd/drbd_int.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/block/drbd/drbd_int.h 2011-04-28 19:57:25.000000000 -0400
-@@ -742,7 +742,7 @@ struct drbd_request;
+diff -urNp linux-2.6.39/drivers/block/cciss.h linux-2.6.39/drivers/block/cciss.h
+--- linux-2.6.39/drivers/block/cciss.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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,
+ };
+
+-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,
+ };
+
+-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. */
+ };
+
+diff -urNp linux-2.6.39/drivers/block/cpqarray.c linux-2.6.39/drivers/block/cpqarray.c
+--- linux-2.6.39/drivers/block/cpqarray.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/block/cpqarray.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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 },
+@@ -911,6 +911,8 @@ static void do_ida_request(struct reques
+ struct scatterlist tmp_sg[SG_MAX];
+ int i, dir, seg;
+
++ pax_track_stack();
++
+ queue_next:
+ creq = blk_peek_request(q);
+ if (!creq)
+diff -urNp linux-2.6.39/drivers/block/cpqarray.h linux-2.6.39/drivers/block/cpqarray.h
+--- linux-2.6.39/drivers/block/cpqarray.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/block/cpqarray.h 2011-05-22 19:36:31.000000000 -0400
+@@ -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;
+ };
+
+ struct ctlr_info {
+diff -urNp linux-2.6.39/drivers/block/DAC960.c linux-2.6.39/drivers/block/DAC960.c
+--- linux-2.6.39/drivers/block/DAC960.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/block/DAC960.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1980,6 +1980,8 @@ static bool DAC960_V1_ReadDeviceConfigur
+ unsigned long flags;
+ int Channel, TargetID;
+
++ pax_track_stack();
++
+ 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/drivers/block/drbd/drbd_int.h linux-2.6.39/drivers/block/drbd/drbd_int.h
+--- linux-2.6.39/drivers/block/drbd/drbd_int.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/block/drbd/drbd_int.h 2011-05-22 19:36:31.000000000 -0400
+@@ -736,7 +736,7 @@ struct drbd_request;
struct drbd_epoch {
struct list_head list;
unsigned int barrier_nr;
atomic_t active; /* increased on every req. added, and dec on every finished. */
unsigned long flags;
};
-@@ -1083,7 +1083,7 @@ struct drbd_conf {
+@@ -1108,7 +1108,7 @@ struct drbd_conf {
void *int_dig_in;
void *int_dig_vv;
wait_queue_head_t seq_wait;
unsigned int peer_seq;
spinlock_t peer_seq_lock;
unsigned int minor;
-diff -urNp linux-2.6.38.4/drivers/block/drbd/drbd_main.c linux-2.6.38.4/drivers/block/drbd/drbd_main.c
---- linux-2.6.38.4/drivers/block/drbd/drbd_main.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/block/drbd/drbd_main.c 2011-04-28 19:57:25.000000000 -0400
-@@ -2217,7 +2217,7 @@ static int _drbd_send_ack(struct drbd_co
+diff -urNp linux-2.6.39/drivers/block/drbd/drbd_main.c linux-2.6.39/drivers/block/drbd/drbd_main.c
+--- linux-2.6.39/drivers/block/drbd/drbd_main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/block/drbd/drbd_main.c 2011-05-22 19:36:31.000000000 -0400
+@@ -2387,7 +2387,7 @@ static int _drbd_send_ack(struct drbd_co
p.sector = sector;
p.block_id = block_id;
p.blksize = blksize;
+ p.seq_num = cpu_to_be32(atomic_add_return_unchecked(1, &mdev->packet_seq));
if (!mdev->meta.socket || mdev->state.conn < C_CONNECTED)
- return FALSE;
-@@ -2517,7 +2517,7 @@ int drbd_send_dblock(struct drbd_conf *m
+ return false;
+@@ -2686,7 +2686,7 @@ int drbd_send_dblock(struct drbd_conf *m
p.sector = cpu_to_be64(req->sector);
p.block_id = (unsigned long)req;
p.seq_num = cpu_to_be32(req->seq_num =
dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw);
-@@ -2795,7 +2795,7 @@ void drbd_init_set_defaults(struct drbd_
+@@ -2971,7 +2971,7 @@ void drbd_init_set_defaults(struct drbd_
atomic_set(&mdev->unacked_cnt, 0);
atomic_set(&mdev->local_cnt, 0);
atomic_set(&mdev->net_cnt, 0);
atomic_set(&mdev->pp_in_use, 0);
atomic_set(&mdev->pp_in_use_by_net, 0);
atomic_set(&mdev->rs_sect_in, 0);
-@@ -2866,8 +2866,8 @@ void drbd_mdev_cleanup(struct drbd_conf
+@@ -3051,8 +3051,8 @@ void drbd_mdev_cleanup(struct drbd_conf
mdev->receiver.t_state);
/* no need to lock it, I'm the only thread alive */
mdev->al_writ_cnt =
mdev->bm_writ_cnt =
mdev->read_cnt =
-diff -urNp linux-2.6.38.4/drivers/block/drbd/drbd_nl.c linux-2.6.38.4/drivers/block/drbd/drbd_nl.c
---- linux-2.6.38.4/drivers/block/drbd/drbd_nl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/block/drbd/drbd_nl.c 2011-04-28 19:57:25.000000000 -0400
-@@ -2238,7 +2238,7 @@ static void drbd_connector_callback(stru
+diff -urNp linux-2.6.39/drivers/block/drbd/drbd_nl.c linux-2.6.39/drivers/block/drbd/drbd_nl.c
+--- linux-2.6.39/drivers/block/drbd/drbd_nl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/block/drbd/drbd_nl.c 2011-05-22 19:36:31.000000000 -0400
+@@ -2298,7 +2298,7 @@ static void drbd_connector_callback(stru
module_put(THIS_MODULE);
}
static unsigned short *
__tl_add_blob(unsigned short *tl, enum drbd_tags tag, const void *data,
-@@ -2309,7 +2309,7 @@ void drbd_bcast_state(struct drbd_conf *
+@@ -2369,7 +2369,7 @@ void drbd_bcast_state(struct drbd_conf *
cn_reply->id.idx = CN_IDX_DRBD;
cn_reply->id.val = CN_VAL_DRBD;
cn_reply->ack = 0; /* not used here. */
cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
(int)((char *)tl - (char *)reply->tag_list);
-@@ -2341,7 +2341,7 @@ void drbd_bcast_ev_helper(struct drbd_co
+@@ -2401,7 +2401,7 @@ void drbd_bcast_ev_helper(struct drbd_co
cn_reply->id.idx = CN_IDX_DRBD;
cn_reply->id.val = CN_VAL_DRBD;
cn_reply->ack = 0; /* not used here. */
cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
(int)((char *)tl - (char *)reply->tag_list);
-@@ -2416,7 +2416,7 @@ void drbd_bcast_ee(struct drbd_conf *mde
+@@ -2479,7 +2479,7 @@ void drbd_bcast_ee(struct drbd_conf *mde
cn_reply->id.idx = CN_IDX_DRBD;
cn_reply->id.val = CN_VAL_DRBD;
cn_reply->ack = 0; // not used here.
cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
(int)((char*)tl - (char*)reply->tag_list);
-@@ -2455,7 +2455,7 @@ void drbd_bcast_sync_progress(struct drb
+@@ -2518,7 +2518,7 @@ void drbd_bcast_sync_progress(struct drb
cn_reply->id.idx = CN_IDX_DRBD;
cn_reply->id.val = CN_VAL_DRBD;
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.38.4/drivers/block/drbd/drbd_receiver.c linux-2.6.38.4/drivers/block/drbd/drbd_receiver.c
---- linux-2.6.38.4/drivers/block/drbd/drbd_receiver.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/block/drbd/drbd_receiver.c 2011-04-28 19:57:25.000000000 -0400
-@@ -907,7 +907,7 @@ retry:
+diff -urNp linux-2.6.39/drivers/block/drbd/drbd_receiver.c linux-2.6.39/drivers/block/drbd/drbd_receiver.c
+--- linux-2.6.39/drivers/block/drbd/drbd_receiver.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/block/drbd/drbd_receiver.c 2011-05-22 19:36:31.000000000 -0400
+@@ -894,7 +894,7 @@ retry:
sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
mdev->peer_seq = 0;
drbd_thread_start(&mdev->asender);
-@@ -1001,7 +1001,7 @@ static enum finish_epoch drbd_may_finish
+@@ -990,7 +990,7 @@ static enum finish_epoch drbd_may_finish
do {
next_epoch = NULL;
switch (ev & ~EV_CLEANUP) {
case EV_PUT:
-@@ -1036,7 +1036,7 @@ static enum finish_epoch drbd_may_finish
+@@ -1025,7 +1025,7 @@ static enum finish_epoch drbd_may_finish
rv = FE_DESTROYED;
} else {
epoch->flags = 0;
/* atomic_set(&epoch->active, 0); is already zero */
if (rv == FE_STILL_LIVE)
rv = FE_RECYCLED;
-@@ -1197,14 +1197,14 @@ static int receive_Barrier(struct drbd_c
+@@ -1196,14 +1196,14 @@ static int receive_Barrier(struct drbd_c
drbd_wait_ee_list_empty(mdev, &mdev->active_ee);
drbd_flush(mdev);
D_ASSERT(atomic_read(&epoch->active) == 0);
D_ASSERT(epoch->flags == 0);
-@@ -1216,11 +1216,11 @@ static int receive_Barrier(struct drbd_c
+@@ -1215,11 +1215,11 @@ static int receive_Barrier(struct drbd_c
}
epoch->flags = 0;
list_add(&epoch->list, &mdev->current_epoch->list);
mdev->current_epoch = epoch;
mdev->epochs++;
-@@ -1663,7 +1663,7 @@ static int receive_Data(struct drbd_conf
+@@ -1668,7 +1668,7 @@ static int receive_Data(struct drbd_conf
spin_unlock(&mdev->peer_seq_lock);
drbd_send_ack_dp(mdev, P_NEG_ACK, p, data_size);
return drbd_drain_block(mdev, data_size);
}
-@@ -1683,7 +1683,7 @@ static int receive_Data(struct drbd_conf
+@@ -1694,7 +1694,7 @@ static int receive_Data(struct drbd_conf
spin_lock(&mdev->epoch_lock);
e->epoch = mdev->current_epoch;
atomic_inc(&e->epoch->active);
spin_unlock(&mdev->epoch_lock);
-@@ -1866,7 +1866,7 @@ static int receive_Data(struct drbd_conf
- out_interrupted:
- /* yes, the epoch_size now is imbalanced.
- * but we drop the connection anyways, so we don't have a chance to
-- * receive a barrier... atomic_inc(&mdev->epoch_size); */
-+ * receive a barrier... atomic_inc_unchecked(&mdev->epoch_size); */
- put_ldev(mdev);
- drbd_free_ee(mdev, e);
- return FALSE;
-@@ -3821,7 +3821,7 @@ static void drbd_disconnect(struct drbd_
+@@ -3905,7 +3905,7 @@ static void drbd_disconnect(struct drbd_
D_ASSERT(list_empty(&mdev->done_ee));
/* ok, no more ee's on the fly, it is safe to reset the epoch_size */
D_ASSERT(list_empty(&mdev->current_epoch->list));
}
-diff -urNp linux-2.6.38.4/drivers/char/agp/frontend.c linux-2.6.38.4/drivers/char/agp/frontend.c
---- linux-2.6.38.4/drivers/char/agp/frontend.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/agp/frontend.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/block/nbd.c linux-2.6.39/drivers/block/nbd.c
+--- linux-2.6.39/drivers/block/nbd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/block/nbd.c 2011-05-22 19:36:31.000000000 -0400
+@@ -157,6 +157,8 @@ static int sock_xmit(struct nbd_device *
+ struct kvec iov;
+ sigset_t blocked, oldset;
+
++ pax_track_stack();
++
+ if (unlikely(!sock)) {
+ printk(KERN_ERR "%s: Attempted %s on closed socket in sock_xmit\n",
+ lo->disk->disk_name, (send ? "send" : "recv"));
+@@ -571,6 +573,8 @@ static void do_nbd_request(struct reques
+ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo,
+ unsigned int cmd, unsigned long arg)
+ {
++ pax_track_stack();
++
+ switch (cmd) {
+ case NBD_DISCONNECT: {
+ struct request sreq;
+diff -urNp linux-2.6.39/drivers/block/smart1,2.h linux-2.6.39/drivers/block/smart1,2.h
+--- linux-2.6.39/drivers/block/smart1,2.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/block/smart1,2.h 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/block/xsysace.c linux-2.6.39/drivers/block/xsysace.c
+--- linux-2.6.39/drivers/block/xsysace.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/block/xsysace.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/char/agp/frontend.c linux-2.6.39/drivers/char/agp/frontend.c
+--- linux-2.6.39/drivers/char/agp/frontend.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/char/agp/frontend.c 2011-05-22 19:36:31.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;
return -EFAULT;
client = agp_find_client_by_pid(reserve.pid);
-diff -urNp linux-2.6.38.4/drivers/char/agp/generic.c linux-2.6.38.4/drivers/char/agp/generic.c
---- linux-2.6.38.4/drivers/char/agp/generic.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/agp/generic.c 2011-04-28 19:34:15.000000000 -0400
-@@ -115,6 +115,9 @@ static struct agp_memory *agp_create_use
- struct agp_memory *new;
- unsigned long alloc_size = num_agp_pages*sizeof(struct page *);
-
-+ if (INT_MAX/sizeof(struct page *) < num_agp_pages)
-+ return NULL;
-+
- new = kzalloc(sizeof(struct agp_memory), GFP_KERNEL);
- if (new == NULL)
- return NULL;
-@@ -234,11 +237,14 @@ struct agp_memory *agp_allocate_memory(s
- int scratch_pages;
- struct agp_memory *new;
- size_t i;
-+ int cur_memory;
-
- if (!bridge)
- return NULL;
-
-- if ((atomic_read(&bridge->current_memory_agp) + page_count) > bridge->max_memory_agp)
-+ cur_memory = atomic_read(&bridge->current_memory_agp);
-+ if ((cur_memory + page_count > bridge->max_memory_agp) ||
-+ (cur_memory + page_count < page_count))
- return NULL;
-
- if (type >= AGP_USER_TYPES) {
-@@ -1089,8 +1095,8 @@ int agp_generic_insert_memory(struct agp
- return -EINVAL;
- }
-
-- /* AK: could wrap */
-- if ((pg_start + mem->page_count) > num_entries)
-+ if (((pg_start + mem->page_count) > num_entries) ||
-+ ((pg_start + mem->page_count) < pg_start))
- return -EINVAL;
-
- j = pg_start;
-@@ -1124,7 +1130,7 @@ int agp_generic_remove_memory(struct agp
- {
- size_t i;
- struct agp_bridge_data *bridge;
-- int mask_type;
-+ int mask_type, num_entries;
-
- bridge = mem->bridge;
- if (!bridge)
-@@ -1136,6 +1142,11 @@ int agp_generic_remove_memory(struct agp
- if (type != mem->type)
- return -EINVAL;
-
-+ num_entries = agp_num_entries();
-+ if (((pg_start + mem->page_count) > num_entries) ||
-+ ((pg_start + mem->page_count) < pg_start))
-+ return -EINVAL;
-+
- mask_type = bridge->driver->agp_type_to_mask_type(bridge, type);
- if (mask_type != 0) {
- /* The generic routines know nothing of memory types */
-diff -urNp linux-2.6.38.4/drivers/char/briq_panel.c linux-2.6.38.4/drivers/char/briq_panel.c
---- linux-2.6.38.4/drivers/char/briq_panel.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/briq_panel.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/char/briq_panel.c linux-2.6.39/drivers/char/briq_panel.c
+--- linux-2.6.39/drivers/char/briq_panel.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/char/briq_panel.c 2011-05-22 19:41:32.000000000 -0400
@@ -9,6 +9,7 @@
#include <linux/types.h>
#include <linux/errno.h>
return len;
}
-diff -urNp linux-2.6.38.4/drivers/char/genrtc.c linux-2.6.38.4/drivers/char/genrtc.c
---- linux-2.6.38.4/drivers/char/genrtc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/genrtc.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/char/genrtc.c linux-2.6.39/drivers/char/genrtc.c
+--- linux-2.6.39/drivers/char/genrtc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/char/genrtc.c 2011-05-22 19:41:32.000000000 -0400
@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *fi
switch (cmd) {
if (get_rtc_pll(&pll))
return -EINVAL;
else
-diff -urNp linux-2.6.38.4/drivers/char/hpet.c linux-2.6.38.4/drivers/char/hpet.c
---- linux-2.6.38.4/drivers/char/hpet.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/hpet.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/char/hpet.c linux-2.6.39/drivers/char/hpet.c
+--- linux-2.6.39/drivers/char/hpet.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/char/hpet.c 2011-05-22 19:36:31.000000000 -0400
@@ -553,7 +553,7 @@ static inline unsigned long hpet_time_di
}
struct hpet_info *info)
{
struct hpet_timer __iomem *timer;
-diff -urNp linux-2.6.38.4/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.38.4/drivers/char/ipmi/ipmi_msghandler.c
---- linux-2.6.38.4/drivers/char/ipmi/ipmi_msghandler.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/ipmi/ipmi_msghandler.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/char/ipmi/ipmi_devintf.c linux-2.6.39/drivers/char/ipmi/ipmi_devintf.c
+--- linux-2.6.39/drivers/char/ipmi/ipmi_devintf.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.39/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-2.6.39/drivers/char/ipmi/ipmi_msghandler.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/char/ipmi/ipmi_msghandler.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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. */
@@ -414,7 +414,7 @@ struct ipmi_smi {
struct proc_dir_entry *proc_dir;
char proc_dir_name[10];
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);
intf->proc_dir = NULL;
-diff -urNp linux-2.6.38.4/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.38.4/drivers/char/ipmi/ipmi_si_intf.c
---- linux-2.6.38.4/drivers/char/ipmi/ipmi_si_intf.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/ipmi/ipmi_si_intf.c 2011-04-28 19:34:15.000000000 -0400
-@@ -285,7 +285,7 @@ struct smi_info {
+@@ -4196,6 +4196,8 @@ static void send_panic_events(char *str)
+ struct ipmi_smi_msg smi_msg;
+ struct ipmi_recv_msg recv_msg;
+
++ pax_track_stack();
++
+ 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/drivers/char/ipmi/ipmi_poweroff.c linux-2.6.39/drivers/char/ipmi/ipmi_poweroff.c
+--- linux-2.6.39/drivers/char/ipmi/ipmi_poweroff.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.39/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-2.6.39/drivers/char/ipmi/ipmi_si_intf.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/char/ipmi/ipmi_si_intf.c 2011-05-22 19:36:31.000000000 -0400
+@@ -276,7 +276,7 @@ struct smi_info {
unsigned char slave_addr;
/* Counters and things for the proc filesystem. */
struct task_struct *thread;
-@@ -294,9 +294,9 @@ struct smi_info {
+@@ -285,9 +285,9 @@ struct smi_info {
};
#define smi_inc_stat(smi, stat) \
#define SI_MAX_PARMS 4
-@@ -3202,7 +3202,7 @@ static int try_smi_init(struct smi_info
+@@ -3198,7 +3198,7 @@ static int try_smi_init(struct smi_info
atomic_set(&new_smi->req_events, 0);
new_smi->run_to_completion = 0;
for (i = 0; i < SI_NUM_STATS; i++)
new_smi->interrupt_disabled = 1;
atomic_set(&new_smi->stop_operation, 0);
-diff -urNp linux-2.6.38.4/drivers/char/istallion.c linux-2.6.38.4/drivers/char/istallion.c
---- linux-2.6.38.4/drivers/char/istallion.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/istallion.c 2011-04-28 19:34:15.000000000 -0400
-@@ -186,7 +186,6 @@ static struct ktermios stli_deftermios
- * re-used for each stats call.
- */
- static comstats_t stli_comstats;
--static combrd_t stli_brdstats;
- static struct asystats stli_cdkstats;
+diff -urNp linux-2.6.39/drivers/char/ipmi/ipmi_watchdog.c linux-2.6.39/drivers/char/ipmi/ipmi_watchdog.c
+--- linux-2.6.39/drivers/char/ipmi/ipmi_watchdog.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
+ }
- /*****************************************************************************/
-@@ -4005,6 +4004,7 @@ static int stli_getbrdstats(combrd_t __u
- {
- struct stlibrd *brdp;
- unsigned int i;
-+ combrd_t stli_brdstats;
+-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;
+ }
- if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t)))
- return -EFAULT;
-diff -urNp linux-2.6.38.4/drivers/char/Kconfig linux-2.6.38.4/drivers/char/Kconfig
---- linux-2.6.38.4/drivers/char/Kconfig 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/Kconfig 2011-04-28 19:34:15.000000000 -0400
-@@ -90,7 +90,8 @@ config VT_HW_CONSOLE_BINDING
+-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/drivers/char/Kconfig linux-2.6.39/drivers/char/Kconfig
+--- linux-2.6.39/drivers/char/Kconfig 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/char/Kconfig 2011-05-22 19:41:37.000000000 -0400
+@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
config DEVKMEM
bool "/dev/kmem virtual device support"
help
Say Y here if you want to support the /dev/kmem device. The
/dev/kmem device is rarely used, but can be used for certain
-@@ -1132,6 +1133,7 @@ config DEVPORT
+@@ -596,6 +597,7 @@ config DEVPORT
bool
depends on !M68K
depends on ISA || PCI
default y
source "drivers/s390/char/Kconfig"
-diff -urNp linux-2.6.38.4/drivers/char/mem.c linux-2.6.38.4/drivers/char/mem.c
---- linux-2.6.38.4/drivers/char/mem.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/mem.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/char/mem.c linux-2.6.39/drivers/char/mem.c
+--- linux-2.6.39/drivers/char/mem.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/char/mem.c 2011-05-22 19:41:37.000000000 -0400
@@ -18,6 +18,7 @@
#include <linux/raw.h>
#include <linux/tty.h>
static inline unsigned long size_inside_page(unsigned long start,
unsigned long size)
{
-@@ -68,9 +73,13 @@ static inline int range_is_allowed(unsig
+@@ -65,9 +70,13 @@ static inline int range_is_allowed(unsig
while (cursor < to) {
if (!devmem_is_allowed(pfn)) {
return 0;
}
cursor += PAGE_SIZE;
-@@ -78,6 +87,11 @@ static inline int range_is_allowed(unsig
+@@ -75,6 +84,11 @@ static inline int range_is_allowed(unsig
}
return 1;
}
#else
static inline int range_is_allowed(unsigned long pfn, unsigned long size)
{
-@@ -120,6 +134,7 @@ static ssize_t read_mem(struct file *fil
+@@ -117,6 +131,7 @@ static ssize_t read_mem(struct file *fil
while (count > 0) {
unsigned long remaining;
sz = size_inside_page(p, count);
-@@ -135,7 +150,23 @@ static ssize_t read_mem(struct file *fil
+@@ -132,7 +147,23 @@ static ssize_t read_mem(struct file *fil
if (!ptr)
return -EFAULT;
unxlate_dev_mem_ptr(p, ptr);
if (remaining)
return -EFAULT;
-@@ -398,9 +429,8 @@ static ssize_t read_kmem(struct file *fi
+@@ -395,9 +426,8 @@ static ssize_t read_kmem(struct file *fi
size_t count, loff_t *ppos)
{
unsigned long p = *ppos;
read = 0;
if (p < (unsigned long) high_memory) {
-@@ -422,6 +452,8 @@ static ssize_t read_kmem(struct file *fi
+@@ -419,6 +449,8 @@ static ssize_t read_kmem(struct file *fi
}
#endif
while (low_count > 0) {
sz = size_inside_page(p, low_count);
/*
-@@ -431,7 +463,22 @@ static ssize_t read_kmem(struct file *fi
+@@ -428,7 +460,22 @@ static ssize_t read_kmem(struct file *fi
*/
kbuf = xlate_dev_kmem_ptr((char *)p);
return -EFAULT;
buf += sz;
p += sz;
-@@ -857,6 +904,9 @@ static const struct memdev {
+@@ -854,6 +901,9 @@ static const struct memdev {
#ifdef CONFIG_CRASH_DUMP
[12] = { "oldmem", 0, &oldmem_fops, NULL },
#endif
};
static int memory_open(struct inode *inode, struct file *filp)
-diff -urNp linux-2.6.38.4/drivers/char/nvram.c linux-2.6.38.4/drivers/char/nvram.c
---- linux-2.6.38.4/drivers/char/nvram.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/nvram.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/char/mmtimer.c linux-2.6.39/drivers/char/mmtimer.c
+--- linux-2.6.39/drivers/char/mmtimer.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/char/nvram.c linux-2.6.39/drivers/char/nvram.c
+--- linux-2.6.39/drivers/char/nvram.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/char/nvram.c 2011-05-22 19:36:31.000000000 -0400
@@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f
spin_unlock_irq(&rtc_lock);
return -EFAULT;
*ppos = i;
-diff -urNp linux-2.6.38.4/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.4/drivers/char/pcmcia/ipwireless/tty.c
---- linux-2.6.38.4/drivers/char/pcmcia/ipwireless/tty.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/pcmcia/ipwireless/tty.c 2011-04-28 19:34:15.000000000 -0400
-@@ -29,6 +29,7 @@
- #include <linux/tty_driver.h>
- #include <linux/tty_flip.h>
- #include <linux/uaccess.h>
-+#include <asm/local.h>
-
- #include "tty.h"
- #include "network.h"
-@@ -51,7 +52,7 @@ struct ipw_tty {
- int tty_type;
- struct ipw_network *network;
- struct tty_struct *linux_tty;
-- int open_count;
-+ local_t open_count;
- unsigned int control_lines;
- struct mutex ipw_tty_mutex;
- int tx_bytes_queued;
-@@ -127,10 +128,10 @@ static int ipw_open(struct tty_struct *l
- mutex_unlock(&tty->ipw_tty_mutex);
- return -ENODEV;
- }
-- if (tty->open_count == 0)
-+ if (local_read(&tty->open_count) == 0)
- tty->tx_bytes_queued = 0;
-
-- tty->open_count++;
-+ local_inc(&tty->open_count);
-
- tty->linux_tty = linux_tty;
- linux_tty->driver_data = tty;
-@@ -146,9 +147,7 @@ static int ipw_open(struct tty_struct *l
-
- static void do_ipw_close(struct ipw_tty *tty)
- {
-- tty->open_count--;
--
-- if (tty->open_count == 0) {
-+ if (local_dec_return(&tty->open_count) == 0) {
- struct tty_struct *linux_tty = tty->linux_tty;
-
- if (linux_tty != NULL) {
-@@ -169,7 +168,7 @@ static void ipw_hangup(struct tty_struct
- return;
-
- mutex_lock(&tty->ipw_tty_mutex);
-- if (tty->open_count == 0) {
-+ if (local_read(&tty->open_count) == 0) {
- mutex_unlock(&tty->ipw_tty_mutex);
- return;
- }
-@@ -198,7 +197,7 @@ void ipwireless_tty_received(struct ipw_
- return;
- }
-
-- if (!tty->open_count) {
-+ if (!local_read(&tty->open_count)) {
- mutex_unlock(&tty->ipw_tty_mutex);
- return;
- }
-@@ -240,7 +239,7 @@ static int ipw_write(struct tty_struct *
- return -ENODEV;
-
- mutex_lock(&tty->ipw_tty_mutex);
-- if (!tty->open_count) {
-+ if (!local_read(&tty->open_count)) {
- mutex_unlock(&tty->ipw_tty_mutex);
- return -EINVAL;
- }
-@@ -280,7 +279,7 @@ static int ipw_write_room(struct tty_str
- if (!tty)
- return -ENODEV;
-
-- if (!tty->open_count)
-+ if (!local_read(&tty->open_count))
- return -EINVAL;
-
- room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
-@@ -322,7 +321,7 @@ static int ipw_chars_in_buffer(struct tt
- if (!tty)
- return 0;
-
-- if (!tty->open_count)
-+ if (!local_read(&tty->open_count))
- return 0;
-
- return tty->tx_bytes_queued;
-@@ -403,7 +402,7 @@ static int ipw_tiocmget(struct tty_struc
- if (!tty)
- return -ENODEV;
-
-- if (!tty->open_count)
-+ if (!local_read(&tty->open_count))
- return -EINVAL;
-
- return get_control_lines(tty);
-@@ -419,7 +418,7 @@ ipw_tiocmset(struct tty_struct *linux_tt
- if (!tty)
- return -ENODEV;
-
-- if (!tty->open_count)
-+ if (!local_read(&tty->open_count))
- return -EINVAL;
-
- return set_control_lines(tty, set, clear);
-@@ -433,7 +432,7 @@ static int ipw_ioctl(struct tty_struct *
- if (!tty)
- return -ENODEV;
-
-- if (!tty->open_count)
-+ if (!local_read(&tty->open_count))
- return -EINVAL;
-
- /* FIXME: Exactly how is the tty object locked here .. */
-@@ -582,7 +581,7 @@ void ipwireless_tty_free(struct ipw_tty
- against a parallel ioctl etc */
- mutex_lock(&ttyj->ipw_tty_mutex);
- }
-- while (ttyj->open_count)
-+ while (local_read(&ttyj->open_count))
- do_ipw_close(ttyj);
- ipwireless_disassociate_network_ttys(network,
- ttyj->channel_idx);
-diff -urNp linux-2.6.38.4/drivers/char/random.c linux-2.6.38.4/drivers/char/random.c
---- linux-2.6.38.4/drivers/char/random.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/random.c 2011-04-28 19:34:15.000000000 -0400
-@@ -254,8 +254,13 @@
+diff -urNp linux-2.6.39/drivers/char/random.c linux-2.6.39/drivers/char/random.c
+--- linux-2.6.39/drivers/char/random.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/char/random.c 2011-05-22 19:41:37.000000000 -0400
+@@ -261,8 +261,13 @@
/*
* Configuration information
*/
#define SEC_XFER_SIZE 512
#define EXTRACT_SIZE 10
-@@ -293,10 +298,17 @@ static struct poolinfo {
+@@ -300,10 +305,17 @@ static struct poolinfo {
int poolwords;
int tap1, tap2, tap3, tap4, tap5;
} poolinfo_table[] = {
#if 0
/* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
{ 2048, 1638, 1231, 819, 411, 1 },
-@@ -902,7 +914,7 @@ static ssize_t extract_entropy_user(stru
+@@ -909,7 +921,7 @@ static ssize_t extract_entropy_user(stru
extract_buf(r, tmp);
i = min_t(int, nbytes, EXTRACT_SIZE);
ret = -EFAULT;
break;
}
-@@ -1207,7 +1219,7 @@ EXPORT_SYMBOL(generate_random_uuid);
+@@ -1214,7 +1226,7 @@ EXPORT_SYMBOL(generate_random_uuid);
#include <linux/sysctl.h>
static int min_read_thresh = 8, min_write_thresh;
static int max_write_thresh = INPUT_POOL_WORDS * 32;
static char sysctl_bootid[16];
-diff -urNp linux-2.6.38.4/drivers/char/sonypi.c linux-2.6.38.4/drivers/char/sonypi.c
---- linux-2.6.38.4/drivers/char/sonypi.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/sonypi.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/char/sonypi.c linux-2.6.39/drivers/char/sonypi.c
+--- linux-2.6.39/drivers/char/sonypi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/char/sonypi.c 2011-05-22 19:36:31.000000000 -0400
@@ -55,6 +55,7 @@
#include <asm/uaccess.h>
#include <asm/io.h>
mutex_unlock(&sonypi_device.lock);
return 0;
-diff -urNp linux-2.6.38.4/drivers/char/tpm/tpm_bios.c linux-2.6.38.4/drivers/char/tpm/tpm_bios.c
---- linux-2.6.38.4/drivers/char/tpm/tpm_bios.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/tpm/tpm_bios.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/char/tpm/tpm_bios.c linux-2.6.39/drivers/char/tpm/tpm_bios.c
+--- linux-2.6.39/drivers/char/tpm/tpm_bios.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/char/tpm/tpm_bios.c 2011-05-22 19:36:31.000000000 -0400
@@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start
event = addr;
memcpy(log->bios_event_log, virt, len);
-diff -urNp linux-2.6.38.4/drivers/char/tpm/tpm.c linux-2.6.38.4/drivers/char/tpm/tpm.c
---- linux-2.6.38.4/drivers/char/tpm/tpm.c 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/tpm/tpm.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/char/tpm/tpm.c linux-2.6.39/drivers/char/tpm/tpm.c
+--- linux-2.6.39/drivers/char/tpm/tpm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/char/tpm/tpm.c 2011-05-22 19:36:31.000000000 -0400
@@ -411,7 +411,7 @@ static ssize_t tpm_transmit(struct tpm_c
chip->vendor.req_complete_val)
goto out_recv;
dev_err(chip->dev, "Operation Canceled\n");
rc = -ECANCELED;
goto out;
-diff -urNp linux-2.6.38.4/drivers/cpuidle/sysfs.c linux-2.6.38.4/drivers/cpuidle/sysfs.c
---- linux-2.6.38.4/drivers/cpuidle/sysfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/cpuidle/sysfs.c 2011-04-28 19:34:15.000000000 -0400
-@@ -300,7 +300,7 @@ static struct kobj_type ktype_state_cpui
- .release = cpuidle_state_sysfs_release,
+@@ -844,6 +844,8 @@ ssize_t tpm_show_pubek(struct device *de
+
+ struct tpm_chip *chip = dev_get_drvdata(dev);
+
++ pax_track_stack();
++
+ 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/drivers/char/ttyprintk.c linux-2.6.39/drivers/char/ttyprintk.c
+--- linux-2.6.39/drivers/char/ttyprintk.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/char/ttyprintk.c 2011-05-22 19:36:31.000000000 -0400
+@@ -170,7 +170,7 @@ static const struct tty_operations ttypr
+ .ioctl = tpk_ioctl,
};
--static void inline cpuidle_free_state_kobj(struct cpuidle_device *device, int i)
-+static inline void cpuidle_free_state_kobj(struct cpuidle_device *device, int i)
- {
- kobject_put(&device->kobjs[i]->kobj);
- wait_for_completion(&device->kobjs[i]->kobj_unregister);
-diff -urNp linux-2.6.38.4/drivers/edac/edac_mc_sysfs.c linux-2.6.38.4/drivers/edac/edac_mc_sysfs.c
---- linux-2.6.38.4/drivers/edac/edac_mc_sysfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/edac/edac_mc_sysfs.c 2011-04-28 19:34:15.000000000 -0400
-@@ -761,7 +761,7 @@ static void edac_inst_grp_release(struct
+-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/drivers/char/xilinx_hwicap/xilinx_hwicap.c linux-2.6.39/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+--- linux-2.6.39/drivers/char/xilinx_hwicap/xilinx_hwicap.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/crypto/hifn_795x.c linux-2.6.39/drivers/crypto/hifn_795x.c
+--- linux-2.6.39/drivers/crypto/hifn_795x.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/crypto/hifn_795x.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device
+ 0xCA, 0x34, 0x2B, 0x2E};
+ struct scatterlist sg;
+
++ pax_track_stack();
++
+ memset(src, 0, sizeof(src));
+ memset(ctx.key, 0, sizeof(ctx.key));
+
+diff -urNp linux-2.6.39/drivers/crypto/padlock-aes.c linux-2.6.39/drivers/crypto/padlock-aes.c
+--- linux-2.6.39/drivers/crypto/padlock-aes.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/crypto/padlock-aes.c 2011-05-22 19:36:31.000000000 -0400
+@@ -109,6 +109,8 @@ static int aes_set_key(struct crypto_tfm
+ struct crypto_aes_ctx gen_aes;
+ int cpu;
+
++ pax_track_stack();
++
+ if (key_len % 8) {
+ *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
+ return -EINVAL;
+diff -urNp linux-2.6.39/drivers/dca/dca-core.c linux-2.6.39/drivers/dca/dca-core.c
+--- linux-2.6.39/drivers/dca/dca-core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/dma/ioat/dca.c linux-2.6.39/drivers/dma/ioat/dca.c
+--- linux-2.6.39/drivers/dma/ioat/dca.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/edac/amd64_edac.h linux-2.6.39/drivers/edac/amd64_edac.h
+--- linux-2.6.39/drivers/edac/amd64_edac.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/edac/amd64_edac.h 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/edac/edac_mc_sysfs.c linux-2.6.39/drivers/edac/edac_mc_sysfs.c
+--- linux-2.6.39/drivers/edac/edac_mc_sysfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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 */
.show = inst_grp_show,
.store = inst_grp_store
};
-diff -urNp linux-2.6.38.4/drivers/edac/edac_pci_sysfs.c linux-2.6.38.4/drivers/edac/edac_pci_sysfs.c
---- linux-2.6.38.4/drivers/edac/edac_pci_sysfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/edac/edac_pci_sysfs.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/edac/edac_pci_sysfs.c linux-2.6.39/drivers/edac/edac_pci_sysfs.c
+--- linux-2.6.39/drivers/edac/edac_pci_sysfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/edac/edac_pci_sysfs.c 2011-05-22 19:36:31.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 */
panic("EDAC: PCI Parity Error");
}
}
-diff -urNp linux-2.6.38.4/drivers/firewire/core-cdev.c linux-2.6.38.4/drivers/firewire/core-cdev.c
---- linux-2.6.38.4/drivers/firewire/core-cdev.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/firewire/core-cdev.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1329,8 +1329,7 @@ static int init_iso_resource(struct clie
+diff -urNp linux-2.6.39/drivers/firewire/core-cdev.c linux-2.6.39/drivers/firewire/core-cdev.c
+--- linux-2.6.39/drivers/firewire/core-cdev.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/firewire/core-cdev.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1312,8 +1312,7 @@ static int init_iso_resource(struct clie
int ret;
if ((request->channels == 0 && request->bandwidth == 0) ||
return -EINVAL;
r = kmalloc(sizeof(*r), GFP_KERNEL);
-diff -urNp linux-2.6.38.4/drivers/firmware/dmi_scan.c linux-2.6.38.4/drivers/firmware/dmi_scan.c
---- linux-2.6.38.4/drivers/firmware/dmi_scan.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/firmware/dmi_scan.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/firewire/core-transaction.c linux-2.6.39/drivers/firewire/core-transaction.c
+--- linux-2.6.39/drivers/firewire/core-transaction.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/firewire/core-transaction.c 2011-05-22 19:36:31.000000000 -0400
+@@ -36,6 +36,7 @@
+ #include <linux/string.h>
+ #include <linux/timer.h>
+ #include <linux/types.h>
++#include <linux/sched.h>
+
+ #include <asm/byteorder.h>
+
+@@ -420,6 +421,8 @@ int fw_run_transaction(struct fw_card *c
+ struct transaction_callback_data d;
+ struct fw_transaction t;
+
++ pax_track_stack();
++
+ init_timer_on_stack(&t.split_timeout_timer);
+ init_completion(&d.done);
+ d.payload = payload;
+diff -urNp linux-2.6.39/drivers/firmware/dmi_scan.c linux-2.6.39/drivers/firmware/dmi_scan.c
+--- linux-2.6.39/drivers/firmware/dmi_scan.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/firmware/dmi_scan.c 2011-05-22 19:36:31.000000000 -0400
@@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
}
}
p = dmi_ioremap(0xF0000, 0x10000);
if (p == NULL)
goto error;
-diff -urNp linux-2.6.38.4/drivers/gpio/vr41xx_giu.c linux-2.6.38.4/drivers/gpio/vr41xx_giu.c
---- linux-2.6.38.4/drivers/gpio/vr41xx_giu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpio/vr41xx_giu.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpio/vr41xx_giu.c linux-2.6.39/drivers/gpio/vr41xx_giu.c
+--- linux-2.6.39/drivers/gpio/vr41xx_giu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpio/vr41xx_giu.c 2011-05-22 19:36:31.000000000 -0400
@@ -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);
return -EINVAL;
}
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.38.4/drivers/gpu/drm/drm_crtc_helper.c
---- linux-2.6.38.4/drivers/gpu/drm/drm_crtc_helper.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/drm_crtc_helper.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.39/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-2.6.39/drivers/gpu/drm/drm_crtc_helper.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/drm_crtc_helper.c 2011-05-22 19:36:31.000000000 -0400
@@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d
struct drm_crtc *tmp;
int crtc_mask = 1;
dev = crtc->dev;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_drv.c linux-2.6.38.4/drivers/gpu/drm/drm_drv.c
---- linux-2.6.38.4/drivers/gpu/drm/drm_drv.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/drm_drv.c 2011-04-28 19:34:15.000000000 -0400
-@@ -425,7 +425,7 @@ long drm_ioctl(struct file *filp,
+@@ -343,6 +343,8 @@ bool drm_crtc_helper_set_mode(struct drm
+ struct drm_encoder *encoder;
+ bool ret = true;
+
++ pax_track_stack();
++
+ crtc->enabled = drm_helper_crtc_in_use(crtc);
+ if (!crtc->enabled)
+ return true;
+diff -urNp linux-2.6.39/drivers/gpu/drm/drm_drv.c linux-2.6.39/drivers/gpu/drm/drm_drv.c
+--- linux-2.6.39/drivers/gpu/drm/drm_drv.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/drm_drv.c 2011-05-22 19:36:31.000000000 -0400
+@@ -386,7 +386,7 @@ long drm_ioctl(struct file *filp,
dev = file_priv->minor->dev;
atomic_inc(&dev->ioctl_count);
++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.38.4/drivers/gpu/drm/drm_fops.c linux-2.6.38.4/drivers/gpu/drm/drm_fops.c
---- linux-2.6.38.4/drivers/gpu/drm/drm_fops.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/drm_fops.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/drm_fops.c linux-2.6.39/drivers/gpu/drm/drm_fops.c
+--- linux-2.6.39/drivers/gpu/drm/drm_fops.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/drm_fops.c 2011-05-22 19:36:31.000000000 -0400
@@ -70,7 +70,7 @@ static int drm_setup(struct drm_device *
}
if (atomic_read(&dev->ioctl_count)) {
DRM_ERROR("Device busy: %d\n",
atomic_read(&dev->ioctl_count));
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_global.c linux-2.6.38.4/drivers/gpu/drm/drm_global.c
---- linux-2.6.38.4/drivers/gpu/drm/drm_global.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/drm_global.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/drm_global.c linux-2.6.39/drivers/gpu/drm/drm_global.c
+--- linux-2.6.39/drivers/gpu/drm/drm_global.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/drm_global.c 2011-05-22 19:36:31.000000000 -0400
@@ -36,7 +36,7 @@
struct drm_global_item {
struct mutex mutex;
ref->release(ref);
item->object = NULL;
}
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_info.c linux-2.6.38.4/drivers/gpu/drm/drm_info.c
---- linux-2.6.38.4/drivers/gpu/drm/drm_info.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/drm_info.c 2011-04-28 19:34:15.000000000 -0400
-@@ -86,10 +86,14 @@ int drm_vm_info(struct seq_file *m, void
+diff -urNp linux-2.6.39/drivers/gpu/drm/drm_info.c linux-2.6.39/drivers/gpu/drm/drm_info.c
+--- linux-2.6.39/drivers/gpu/drm/drm_info.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/drm_info.c 2011-05-22 19:41:37.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;
const char *type;
int i;
-@@ -100,7 +104,7 @@ int drm_vm_info(struct seq_file *m, void
+@@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void
map = r_list->map;
if (!map)
continue;
type = "??";
else
type = types[map->type];
-@@ -301,7 +305,11 @@ int drm_vma_info(struct seq_file *m, voi
+@@ -290,7 +294,11 @@ int drm_vma_info(struct seq_file *m, voi
vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
vma->vm_flags & VM_LOCKED ? 'l' : '-',
vma->vm_flags & VM_IO ? 'i' : '-',
#if defined(__i386__)
pgprot = pgprot_val(vma->vm_page_prot);
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_ioctl.c linux-2.6.38.4/drivers/gpu/drm/drm_ioctl.c
---- linux-2.6.38.4/drivers/gpu/drm/drm_ioctl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/drm_ioctl.c 2011-04-28 19:34:15.000000000 -0400
-@@ -353,7 +353,7 @@ int drm_getstats(struct drm_device *dev,
+diff -urNp linux-2.6.39/drivers/gpu/drm/drm_ioctl.c linux-2.6.39/drivers/gpu/drm/drm_ioctl.c
+--- linux-2.6.39/drivers/gpu/drm/drm_ioctl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/drm_ioctl.c 2011-05-22 19:36:31.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);
else
stats->data[i].type = dev->types[i];
}
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_lock.c linux-2.6.38.4/drivers/gpu/drm/drm_lock.c
---- linux-2.6.38.4/drivers/gpu/drm/drm_lock.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/drm_lock.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/drm_lock.c linux-2.6.39/drivers/gpu/drm/drm_lock.c
+--- linux-2.6.39/drivers/gpu/drm/drm_lock.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/drm_lock.c 2011-05-22 19:36:31.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;
if (drm_lock_free(&master->lock, lock->context)) {
/* FIXME: Should really bail out here. */
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i810/i810_dma.c linux-2.6.38.4/drivers/gpu/drm/i810/i810_dma.c
---- linux-2.6.38.4/drivers/gpu/drm/i810/i810_dma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i810/i810_dma.c 2011-04-28 19:34:15.000000000 -0400
-@@ -953,8 +953,8 @@ static int i810_dma_vertex(struct drm_de
+diff -urNp linux-2.6.39/drivers/gpu/drm/i810/i810_dma.c linux-2.6.39/drivers/gpu/drm/i810/i810_dma.c
+--- linux-2.6.39/drivers/gpu/drm/i810/i810_dma.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/i810/i810_dma.c 2011-05-22 19:36:31.000000000 -0400
+@@ -950,8 +950,8 @@ static int i810_dma_vertex(struct drm_de
dma->buflist[vertex->idx],
vertex->discard, vertex->used);
sarea_priv->last_enqueue = dev_priv->counter - 1;
sarea_priv->last_dispatch = (int)hw_status[5];
-@@ -1114,8 +1114,8 @@ static int i810_dma_mc(struct drm_device
+@@ -1111,8 +1111,8 @@ static int i810_dma_mc(struct drm_device
i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
mc->last_render);
sarea_priv->last_enqueue = dev_priv->counter - 1;
sarea_priv->last_dispatch = (int)hw_status[5];
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i810/i810_drv.h linux-2.6.38.4/drivers/gpu/drm/i810/i810_drv.h
---- linux-2.6.38.4/drivers/gpu/drm/i810/i810_drv.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i810/i810_drv.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/i810/i810_drv.h linux-2.6.39/drivers/gpu/drm/i810/i810_drv.h
+--- linux-2.6.39/drivers/gpu/drm/i810/i810_drv.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/i810/i810_drv.h 2011-05-22 19:36:31.000000000 -0400
@@ -108,8 +108,8 @@ typedef struct drm_i810_private {
int page_flipping;
int front_offset;
} drm_i810_private_t;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i830/i830_drv.h linux-2.6.38.4/drivers/gpu/drm/i830/i830_drv.h
---- linux-2.6.38.4/drivers/gpu/drm/i830/i830_drv.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i830/i830_drv.h 2011-04-28 19:57:25.000000000 -0400
-@@ -115,8 +115,8 @@ typedef struct drm_i830_private {
- int page_flipping;
-
- wait_queue_head_t irq_queue;
-- atomic_t irq_received;
-- atomic_t irq_emitted;
-+ atomic_unchecked_t irq_received;
-+ atomic_unchecked_t irq_emitted;
-
- int use_mi_batchbuffer_start;
-
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i830/i830_irq.c linux-2.6.38.4/drivers/gpu/drm/i830/i830_irq.c
---- linux-2.6.38.4/drivers/gpu/drm/i830/i830_irq.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i830/i830_irq.c 2011-04-28 19:57:25.000000000 -0400
-@@ -47,7 +47,7 @@ irqreturn_t i830_driver_irq_handler(DRM_
-
- I830_WRITE16(I830REG_INT_IDENTITY_R, temp);
-
-- atomic_inc(&dev_priv->irq_received);
-+ atomic_inc_unchecked(&dev_priv->irq_received);
- wake_up_interruptible(&dev_priv->irq_queue);
-
- return IRQ_HANDLED;
-@@ -60,14 +60,14 @@ static int i830_emit_irq(struct drm_devi
-
- DRM_DEBUG("%s\n", __func__);
-
-- atomic_inc(&dev_priv->irq_emitted);
-+ atomic_inc_unchecked(&dev_priv->irq_emitted);
-
- BEGIN_LP_RING(2);
- OUT_RING(0);
- OUT_RING(GFX_OP_USER_INTERRUPT);
- ADVANCE_LP_RING();
-
-- return atomic_read(&dev_priv->irq_emitted);
-+ return atomic_read_unchecked(&dev_priv->irq_emitted);
- }
-
- static int i830_wait_irq(struct drm_device *dev, int irq_nr)
-@@ -79,7 +79,7 @@ static int i830_wait_irq(struct drm_devi
-
- DRM_DEBUG("%s\n", __func__);
-
-- if (atomic_read(&dev_priv->irq_received) >= irq_nr)
-+ if (atomic_read_unchecked(&dev_priv->irq_received) >= irq_nr)
- return 0;
-
- dev_priv->sarea_priv->perf_boxes |= I830_BOX_WAIT;
-@@ -88,7 +88,7 @@ static int i830_wait_irq(struct drm_devi
-
- for (;;) {
- __set_current_state(TASK_INTERRUPTIBLE);
-- if (atomic_read(&dev_priv->irq_received) >= irq_nr)
-+ if (atomic_read_unchecked(&dev_priv->irq_received) >= irq_nr)
- break;
- if ((signed)(end - jiffies) <= 0) {
- DRM_ERROR("timeout iir %x imr %x ier %x hwstam %x\n",
-@@ -163,8 +163,8 @@ void i830_driver_irq_preinstall(struct d
- I830_WRITE16(I830REG_HWSTAM, 0xffff);
- I830_WRITE16(I830REG_INT_MASK_R, 0x0);
- I830_WRITE16(I830REG_INT_ENABLE_R, 0x0);
-- atomic_set(&dev_priv->irq_received, 0);
-- atomic_set(&dev_priv->irq_emitted, 0);
-+ atomic_set_unchecked(&dev_priv->irq_received, 0);
-+ atomic_set_unchecked(&dev_priv->irq_emitted, 0);
- init_waitqueue_head(&dev_priv->irq_queue);
- }
-
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7017.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7017.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7017.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.39/drivers/gpu/drm/i915/dvo_ch7017.c
+--- linux-2.6.39/drivers/gpu/drm/i915/dvo_ch7017.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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_
}
}
.init = ch7017_init,
.detect = ch7017_detect,
.mode_valid = ch7017_mode_valid,
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7xxx.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.39/drivers/gpu/drm/i915/dvo_ch7xxx.c
+--- linux-2.6.39/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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_
}
}
.init = ch7xxx_init,
.detect = ch7xxx_detect,
.mode_valid = ch7xxx_mode_valid,
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo.h linux-2.6.38.4/drivers/gpu/drm/i915/dvo.h
---- linux-2.6.38.4/drivers/gpu/drm/i915/dvo.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/i915/dvo.h linux-2.6.39/drivers/gpu/drm/i915/dvo.h
+--- linux-2.6.39/drivers/gpu/drm/i915/dvo.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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.
+extern const struct intel_dvo_dev_ops ch7017_ops;
#endif /* _INTEL_DVO_H */
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ivch.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ivch.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ivch.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.39/drivers/gpu/drm/i915/dvo_ivch.c
+--- linux-2.6.39/drivers/gpu/drm/i915/dvo_ivch.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
}
}
.init = ivch_init,
.dpms = ivch_dpms,
.mode_valid = ivch_mode_valid,
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.38.4/drivers/gpu/drm/i915/dvo_sil164.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_sil164.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo_sil164.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.39/drivers/gpu/drm/i915/dvo_sil164.c
+--- linux-2.6.39/drivers/gpu/drm/i915/dvo_sil164.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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_
}
}
.init = sil164_init,
.detect = sil164_detect,
.mode_valid = sil164_mode_valid,
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.38.4/drivers/gpu/drm/i915/dvo_tfp410.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_tfp410.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo_tfp410.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.39/drivers/gpu/drm/i915/dvo_tfp410.c
+--- linux-2.6.39/drivers/gpu/drm/i915/dvo_tfp410.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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_
}
}
.init = tfp410_init,
.detect = tfp410_detect,
.mode_valid = tfp410_mode_valid,
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.38.4/drivers/gpu/drm/i915/i915_debugfs.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/i915_debugfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/i915_debugfs.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.39/drivers/gpu/drm/i915/i915_debugfs.c
+--- linux-2.6.39/drivers/gpu/drm/i915/i915_debugfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/i915/i915_debugfs.c 2011-05-22 19:36:31.000000000 -0400
@@ -496,7 +496,7 @@ static int i915_interrupt_info(struct se
I915_READ(GTIMR));
}
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.38.4/drivers/gpu/drm/i915/i915_dma.c linux-2.6.38.4/drivers/gpu/drm/i915/i915_dma.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/i915_dma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/i915_dma.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1159,7 +1159,7 @@ static bool i915_switcheroo_can_switch(s
+diff -urNp linux-2.6.39/drivers/gpu/drm/i915/i915_dma.c linux-2.6.39/drivers/gpu/drm/i915/i915_dma.c
+--- linux-2.6.39/drivers/gpu/drm/i915/i915_dma.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/i915/i915_dma.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1171,7 +1171,7 @@ static bool i915_switcheroo_can_switch(s
bool can_switch;
spin_lock(&dev->count_lock);
spin_unlock(&dev->count_lock);
return can_switch;
}
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.c linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.c 2011-04-28 19:34:15.000000000 -0400
-@@ -673,7 +673,7 @@ static const struct dev_pm_ops i915_pm_o
+diff -urNp linux-2.6.39/drivers/gpu/drm/i915/i915_drv.c linux-2.6.39/drivers/gpu/drm/i915/i915_drv.c
+--- linux-2.6.39/drivers/gpu/drm/i915/i915_drv.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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,
};
.fault = i915_gem_fault,
.open = drm_gem_vm_open,
.close = drm_gem_vm_close,
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.h linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.h
---- linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.h 2011-04-28 19:57:25.000000000 -0400
-@@ -288,7 +288,7 @@ typedef struct drm_i915_private {
+diff -urNp linux-2.6.39/drivers/gpu/drm/i915/i915_drv.h linux-2.6.39/drivers/gpu/drm/i915/i915_drv.h
+--- linux-2.6.39/drivers/gpu/drm/i915/i915_drv.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/i915/i915_drv.h 2011-05-22 19:36:31.000000000 -0400
+@@ -287,7 +287,7 @@ typedef struct drm_i915_private {
int current_page;
int page_flipping;
- atomic_t irq_received;
+ atomic_unchecked_t irq_received;
- u32 trace_irq_seqno;
/* protects the irq masks */
-@@ -843,7 +843,7 @@ struct drm_i915_gem_object {
+ spinlock_t irq_lock;
+@@ -848,7 +848,7 @@ struct drm_i915_gem_object {
* will be page flipped away on the next vblank. When it
* reaches 0, dev_priv->pending_flip_queue will be woken up.
*/
};
#define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)
-@@ -1229,7 +1229,7 @@ extern int intel_setup_gmbus(struct drm_
+@@ -1232,7 +1232,7 @@ extern int intel_setup_gmbus(struct drm_
extern void intel_teardown_gmbus(struct drm_device *dev);
extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
{
return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
}
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-2.6.38.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-04-28 19:57:25.000000000 -0400
-@@ -904,7 +904,7 @@ i915_gem_execbuffer_wait_for_flips(struc
- flips = 0;
- list_for_each_entry(obj, objects, exec_list) {
- if (obj->base.write_domain)
-- flips |= atomic_read(&obj->pending_flip);
-+ flips |= atomic_read_unchecked(&obj->pending_flip);
- }
- if (flips) {
- int plane, flip_mask, ret;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_irq.c linux-2.6.38.4/drivers/gpu/drm/i915/i915_irq.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/i915_irq.c 2011-04-18 17:27:13.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/i915_irq.c 2011-04-28 19:57:25.000000000 -0400
-@@ -1106,7 +1106,7 @@ irqreturn_t i915_driver_irq_handler(DRM_
- int irq_received;
- int ret = IRQ_NONE;
+diff -urNp linux-2.6.39/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-2.6.39/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+--- linux-2.6.39/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-05-22 19:36:31.000000000 -0400
+@@ -192,7 +192,7 @@ i915_gem_object_set_to_gpu_domain(struct
+ i915_gem_release_mmap(obj);
+
+ if (obj->base.pending_write_domain)
+- cd->flips |= atomic_read(&obj->pending_flip);
++ cd->flips |= atomic_read_unchecked(&obj->pending_flip);
+
+ /* The actual obj->write_domain will be updated with
+ * pending_write_domain after we emit the accumulated flush for all
+diff -urNp linux-2.6.39/drivers/gpu/drm/i915/i915_irq.c linux-2.6.39/drivers/gpu/drm/i915/i915_irq.c
+--- linux-2.6.39/drivers/gpu/drm/i915/i915_irq.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/i915/i915_irq.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1101,7 +1101,7 @@ irqreturn_t i915_driver_irq_handler(DRM_
+ int ret = IRQ_NONE, pipe;
+ bool blc_event = false;
- atomic_inc(&dev_priv->irq_received);
+ atomic_inc_unchecked(&dev_priv->irq_received);
if (HAS_PCH_SPLIT(dev))
return ironlake_irq_handler(dev);
-@@ -1684,7 +1684,7 @@ void i915_driver_irq_preinstall(struct d
- {
+@@ -1655,7 +1655,7 @@ void i915_driver_irq_preinstall(struct d
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+ int pipe;
- atomic_set(&dev_priv->irq_received, 0);
+ atomic_set_unchecked(&dev_priv->irq_received, 0);
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.38.4/drivers/gpu/drm/i915/intel_display.c linux-2.6.38.4/drivers/gpu/drm/i915/intel_display.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/intel_display.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/intel_display.c 2011-04-28 19:57:25.000000000 -0400
-@@ -1631,7 +1631,7 @@ intel_pipe_set_base(struct drm_crtc *crt
+diff -urNp linux-2.6.39/drivers/gpu/drm/i915/intel_display.c linux-2.6.39/drivers/gpu/drm/i915/intel_display.c
+--- linux-2.6.39/drivers/gpu/drm/i915/intel_display.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/i915/intel_display.c 2011-05-22 19:36:31.000000000 -0400
+@@ -2244,7 +2244,7 @@ intel_pipe_set_base(struct drm_crtc *crt
wait_event(dev_priv->pending_flip_queue,
atomic_read(&dev_priv->mm.wedged) ||
/* Big Hammer, we also need to ensure that any pending
* MI_WAIT_FOR_EVENT inside a user batch buffer on the
-@@ -2042,7 +2042,7 @@ static void intel_crtc_wait_for_pending_
+@@ -2712,7 +2712,7 @@ static void intel_crtc_wait_for_pending_
obj = to_intel_framebuffer(crtc->fb)->obj;
dev_priv = crtc->dev->dev_private;
wait_event(dev_priv->pending_flip_queue,
}
static bool intel_crtc_driving_pch(struct drm_crtc *crtc)
-@@ -5428,7 +5428,7 @@ static void do_intel_finish_page_flip(st
+@@ -6016,7 +6016,7 @@ static void do_intel_finish_page_flip(st
atomic_clear_mask(1 << intel_crtc->plane,
&obj->pending_flip.counter);
wake_up(&dev_priv->pending_flip_queue);
schedule_work(&work->work);
-@@ -5557,7 +5557,7 @@ static int intel_crtc_page_flip(struct d
+@@ -6145,7 +6145,7 @@ static int intel_crtc_page_flip(struct d
/* Block clients from rendering to the new back buffer until
* the flip occurs and the object is no longer visible.
*/
switch (INTEL_INFO(dev)->gen) {
case 2:
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/mga/mga_drv.h linux-2.6.38.4/drivers/gpu/drm/mga/mga_drv.h
---- linux-2.6.38.4/drivers/gpu/drm/mga/mga_drv.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/mga/mga_drv.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/mga/mga_drv.h linux-2.6.39/drivers/gpu/drm/mga/mga_drv.h
+--- linux-2.6.39/drivers/gpu/drm/mga/mga_drv.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/mga/mga_drv.h 2011-05-22 19:36:31.000000000 -0400
@@ -120,9 +120,9 @@ typedef struct drm_mga_private {
u32 clear_cmd;
u32 maccess;
u32 next_fence_to_post;
unsigned int fb_cpp;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/mga/mga_irq.c linux-2.6.38.4/drivers/gpu/drm/mga/mga_irq.c
---- linux-2.6.38.4/drivers/gpu/drm/mga/mga_irq.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/mga/mga_irq.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/mga/mga_irq.c linux-2.6.39/drivers/gpu/drm/mga/mga_irq.c
+--- linux-2.6.39/drivers/gpu/drm/mga/mga_irq.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/mga/mga_irq.c 2011-05-22 19:36:31.000000000 -0400
@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de
if (crtc != 0)
return 0;
- *sequence) <= (1 << 23)));
*sequence = cur_fence;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_drv.h linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_drv.h
---- linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-04-28 19:57:25.000000000 -0400
-@@ -226,7 +226,7 @@ struct nouveau_channel {
+diff -urNp linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_acpi.c linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_acpi.c
+--- linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_acpi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_acpi.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/gpu/drm/nouveau/nouveau_drv.h linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_drv.h
+--- linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-05-23 17:07:00.000000000 -0400
+@@ -228,7 +228,7 @@ struct nouveau_channel {
struct list_head pending;
uint32_t sequence;
uint32_t sequence_ack;
} fence;
/* DMA push buffer */
-@@ -661,7 +661,7 @@ struct drm_nouveau_private {
+@@ -520,8 +520,8 @@ struct nouveau_vram_engine {
+
+ struct nouveau_engine {
+ struct nouveau_instmem_engine instmem;
+- struct nouveau_mc_engine mc;
+- struct nouveau_timer_engine timer;
++ struct nouveau_mc_engine mc;
++ struct nouveau_timer_engine timer;
+ struct nouveau_fb_engine fb;
+ struct nouveau_pgraph_engine graph;
+ struct nouveau_fifo_engine fifo;
+@@ -529,7 +529,7 @@ struct nouveau_engine {
+ struct nouveau_gpio_engine gpio;
+ struct nouveau_pm_engine pm;
+ struct nouveau_crypt_engine crypt;
+- struct nouveau_vram_engine vram;
++ struct nouveau_vram_engine vram;
+ };
+
+ struct nouveau_pll_vals {
+@@ -662,7 +662,7 @@ struct drm_nouveau_private {
struct drm_global_reference mem_global_ref;
struct ttm_bo_global_ref bo_global_ref;
struct ttm_bo_device bdev;
} ttm;
struct {
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_fence.c linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_fence.c
---- linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-04-28 19:57:25.000000000 -0400
-@@ -83,7 +83,7 @@ nouveau_fence_update(struct nouveau_chan
+diff -urNp linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_fence.c linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_fence.c
+--- linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-05-22 19:36:31.000000000 -0400
+@@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_chan
if (USE_REFCNT(dev))
sequence = nvchan_rd32(chan, 0x48);
else
if (chan->fence.sequence_ack == sequence)
goto out;
-@@ -490,7 +490,7 @@ nouveau_fence_channel_init(struct nouvea
-
+@@ -553,7 +553,7 @@ nouveau_fence_channel_init(struct nouvea
+ out_initialised:
INIT_LIST_HEAD(&chan->fence.pending);
spin_lock_init(&chan->fence.lock);
- atomic_set(&chan->fence.last_sequence_irq, 0);
+ atomic_set_unchecked(&chan->fence.last_sequence_irq, 0);
-
return 0;
}
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_gem.c linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_gem.c
---- linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-04-28 19:57:25.000000000 -0400
-@@ -241,7 +241,7 @@ validate_init(struct nouveau_channel *ch
+
+diff -urNp linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_gem.c linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_gem.c
+--- linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-05-22 19:36:31.000000000 -0400
+@@ -249,7 +249,7 @@ validate_init(struct nouveau_channel *ch
int trycnt = 0;
int ret, i;
retry:
if (++trycnt > 100000) {
NV_ERROR(dev, "%s failed and gave up.\n", __func__);
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_state.c
---- linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_state.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_state.c 2011-04-28 19:34:15.000000000 -0400
-@@ -621,7 +621,7 @@ static bool nouveau_switcheroo_can_switc
+diff -urNp linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_state.c
+--- linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_state.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/nouveau/nouveau_state.c 2011-05-22 19:36:31.000000000 -0400
+@@ -583,7 +583,7 @@ static bool nouveau_switcheroo_can_switc
bool can_switch;
spin_lock(&dev->count_lock);
spin_unlock(&dev->count_lock);
return can_switch;
}
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/nouveau/nv04_graph.c linux-2.6.38.4/drivers/gpu/drm/nouveau/nv04_graph.c
---- linux-2.6.38.4/drivers/gpu/drm/nouveau/nv04_graph.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/nouveau/nv04_graph.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/nouveau/nv04_graph.c linux-2.6.39/drivers/gpu/drm/nouveau/nv04_graph.c
+--- linux-2.6.39/drivers/gpu/drm/nouveau/nv04_graph.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/nouveau/nv04_graph.c 2011-05-22 19:36:31.000000000 -0400
@@ -552,7 +552,7 @@ static int
nv04_graph_mthd_set_ref(struct nouveau_channel *chan,
u32 class, u32 mthd, u32 data)
return 0;
}
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/r128/r128_cce.c linux-2.6.38.4/drivers/gpu/drm/r128/r128_cce.c
---- linux-2.6.38.4/drivers/gpu/drm/r128/r128_cce.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/r128/r128_cce.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/r128/r128_cce.c linux-2.6.39/drivers/gpu/drm/r128/r128_cce.c
+--- linux-2.6.39/drivers/gpu/drm/r128/r128_cce.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/r128/r128_cce.c 2011-05-22 19:36:31.000000000 -0400
@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d
/* GH: Simple idle check.
/* 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.38.4/drivers/gpu/drm/r128/r128_drv.h linux-2.6.38.4/drivers/gpu/drm/r128/r128_drv.h
---- linux-2.6.38.4/drivers/gpu/drm/r128/r128_drv.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/r128/r128_drv.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/r128/r128_drv.h linux-2.6.39/drivers/gpu/drm/r128/r128_drv.h
+--- linux-2.6.39/drivers/gpu/drm/r128/r128_drv.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/r128/r128_drv.h 2011-05-22 19:36:31.000000000 -0400
@@ -90,14 +90,14 @@ typedef struct drm_r128_private {
int is_pci;
unsigned long cce_buffers_offset;
u32 color_fmt;
unsigned int front_offset;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/r128/r128_irq.c linux-2.6.38.4/drivers/gpu/drm/r128/r128_irq.c
---- linux-2.6.38.4/drivers/gpu/drm/r128/r128_irq.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/r128/r128_irq.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/r128/r128_irq.c linux-2.6.39/drivers/gpu/drm/r128/r128_irq.c
+--- linux-2.6.39/drivers/gpu/drm/r128/r128_irq.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/r128/r128_irq.c 2011-05-22 19:36:31.000000000 -0400
@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d
if (crtc != 0)
return 0;
drm_handle_vblank(dev, 0);
return IRQ_HANDLED;
}
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/r128/r128_state.c linux-2.6.38.4/drivers/gpu/drm/r128/r128_state.c
---- linux-2.6.38.4/drivers/gpu/drm/r128/r128_state.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/r128/r128_state.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/r128/r128_state.c linux-2.6.39/drivers/gpu/drm/r128/r128_state.c
+--- linux-2.6.39/drivers/gpu/drm/r128/r128_state.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/r128/r128_state.c 2011-05-22 19:36:31.000000000 -0400
@@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_priv
static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
}
#endif
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.38.4/drivers/gpu/drm/radeon/mkregtable.c
---- linux-2.6.38.4/drivers/gpu/drm/radeon/mkregtable.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/radeon/mkregtable.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/atom.c linux-2.6.39/drivers/gpu/drm/radeon/atom.c
+--- linux-2.6.39/drivers/gpu/drm/radeon/atom.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/radeon/atom.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1245,6 +1245,8 @@ struct atom_context *atom_parse(struct c
+ char name[512];
+ int i;
+
++ pax_track_stack();
++
+ ctx->card = card;
+ ctx->bios = bios;
+
+diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.39/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-2.6.39/drivers/gpu/drm/radeon/mkregtable.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/radeon/mkregtable.c 2011-05-22 19:36:31.000000000 -0400
@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
regex_t mask_rex;
regmatch_t match[4];
if (regcomp
(&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_device.c
---- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_device.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_device.c 2011-04-28 19:34:15.000000000 -0400
-@@ -673,7 +673,7 @@ static bool radeon_switcheroo_can_switch
+diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.39/drivers/gpu/drm/radeon/radeon_atombios.c
+--- linux-2.6.39/drivers/gpu/drm/radeon/radeon_atombios.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/radeon/radeon_atombios.c 2011-05-22 19:36:31.000000000 -0400
+@@ -545,6 +545,8 @@ bool radeon_get_atom_connector_info_from
+ struct radeon_gpio_rec gpio;
+ struct radeon_hpd hpd;
+
++ pax_track_stack();
++
+ if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset))
+ return false;
+
+diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/radeon_atpx_handler.c linux-2.6.39/drivers/gpu/drm/radeon/radeon_atpx_handler.c
+--- linux-2.6.39/drivers/gpu/drm/radeon/radeon_atpx_handler.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/radeon/radeon_atpx_handler.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.39/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-2.6.39/drivers/gpu/drm/radeon/radeon_device.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/radeon/radeon_device.c 2011-05-22 19:36:31.000000000 -0400
+@@ -674,7 +674,7 @@ static bool radeon_switcheroo_can_switch
bool can_switch;
spin_lock(&dev->count_lock);
spin_unlock(&dev->count_lock);
return can_switch;
}
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_drv.h
---- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_drv.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_drv.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.39/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-2.6.39/drivers/gpu/drm/radeon/radeon_display.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/radeon/radeon_display.c 2011-05-22 19:36:31.000000000 -0400
+@@ -934,6 +934,8 @@ void radeon_compute_pll_legacy(struct ra
+ uint32_t post_div;
+ u32 pll_out_min, pll_out_max;
+
++ pax_track_stack();
++
+ 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/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.39/drivers/gpu/drm/radeon/radeon_drv.h
+--- linux-2.6.39/drivers/gpu/drm/radeon/radeon_drv.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/radeon/radeon_drv.h 2011-05-22 19:36:31.000000000 -0400
@@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
/* SW interrupt */
int vblank_crtc;
uint32_t irq_enable_reg;
uint32_t r500_disp_irq_reg;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_fence.c
---- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_fence.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_fence.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.39/drivers/gpu/drm/radeon/radeon_fence.c
+--- linux-2.6.39/drivers/gpu/drm/radeon/radeon_fence.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/radeon/radeon_fence.c 2011-05-22 19:36:31.000000000 -0400
@@ -49,7 +49,7 @@ int radeon_fence_emit(struct radeon_devi
write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
return 0;
if (!rdev->cp.ready) {
/* FIXME: cp is not running assume everythings is done right
* away
-@@ -354,7 +354,7 @@ int radeon_fence_driver_init(struct rade
+@@ -352,7 +352,7 @@ int radeon_fence_driver_init(struct rade
return r;
}
WREG32(rdev->fence_drv.scratch_reg, 0);
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.38.4/drivers/gpu/drm/radeon/radeon.h linux-2.6.38.4/drivers/gpu/drm/radeon/radeon.h
---- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/radeon.h linux-2.6.39/drivers/gpu/drm/radeon/radeon.h
+--- linux-2.6.39/drivers/gpu/drm/radeon/radeon.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/radeon/radeon.h 2011-05-22 19:36:31.000000000 -0400
@@ -189,7 +189,7 @@ extern int sumo_get_temp(struct radeon_d
*/
struct radeon_fence_driver {
uint32_t last_seq;
unsigned long last_jiffies;
unsigned long last_timeout;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ioc32.c
---- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.39/drivers/gpu/drm/radeon/radeon_ioc32.c
+--- linux-2.6.39/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-05-22 19:36:31.000000000 -0400
@@ -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))
&request->value))
return -EFAULT;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_irq.c
---- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_irq.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_irq.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.39/drivers/gpu/drm/radeon/radeon_irq.c
+--- linux-2.6.39/drivers/gpu/drm/radeon/radeon_irq.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/radeon/radeon_irq.c 2011-05-22 19:36:31.000000000 -0400
@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de
unsigned int ret;
RING_LOCALS;
DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
dev->max_vblank_count = 0x001fffff;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_state.c
---- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_state.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_state.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.39/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-2.6.39/drivers/gpu/drm/radeon/radeon_state.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/radeon/radeon_state.c 2011-05-22 19:36:31.000000000 -0400
@@ -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;
DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ttm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ttm.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.39/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-2.6.39/drivers/gpu/drm/radeon/radeon_ttm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/radeon/radeon_ttm.c 2011-05-22 19:36:31.000000000 -0400
@@ -603,8 +603,9 @@ void radeon_ttm_set_active_vram_size(str
man->size = size >> PAGE_SHIFT;
}
vma->vm_ops = &radeon_ttm_vm_ops;
return 0;
}
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/rs690.c linux-2.6.38.4/drivers/gpu/drm/radeon/rs690.c
---- linux-2.6.38.4/drivers/gpu/drm/radeon/rs690.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/radeon/rs690.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/radeon/rs690.c linux-2.6.39/drivers/gpu/drm/radeon/rs690.c
+--- linux-2.6.39/drivers/gpu/drm/radeon/rs690.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/radeon/rs690.c 2011-05-22 19:36:31.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)
} else {
if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
rdev->pm.k8_bandwidth.full)
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_bo_vm.c
---- linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.39/drivers/gpu/drm/ttm/ttm_bo_vm.c
+--- linux-2.6.39/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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 const struct vm_operations_struct ttm_bo_vm_ops = {
.fault = ttm_bo_vm_fault,
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_page_alloc.c
---- linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-04-28 19:57:25.000000000 -0400
-@@ -396,9 +396,9 @@ static int ttm_pool_get_num_unused_pages
+diff -urNp linux-2.6.39/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-2.6.39/drivers/gpu/drm/ttm/ttm_page_alloc.c
+--- linux-2.6.39/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-05-22 19:36:31.000000000 -0400
+@@ -397,9 +397,9 @@ static int ttm_pool_get_num_unused_pages
*/
static int ttm_pool_mm_shrink(struct shrinker *shrink, int shrink_pages, gfp_t gfp_mask)
{
struct ttm_page_pool *pool;
pool_offset = pool_offset % NUM_POOLS;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/via/via_drv.h linux-2.6.38.4/drivers/gpu/drm/via/via_drv.h
---- linux-2.6.38.4/drivers/gpu/drm/via/via_drv.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/via/via_drv.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/via/via_drv.h linux-2.6.39/drivers/gpu/drm/via/via_drv.h
+--- linux-2.6.39/drivers/gpu/drm/via/via_drv.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/via/via_drv.h 2011-05-22 19:36:31.000000000 -0400
@@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
typedef uint32_t maskarray_t[5];
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.38.4/drivers/gpu/drm/via/via_irq.c linux-2.6.38.4/drivers/gpu/drm/via/via_irq.c
---- linux-2.6.38.4/drivers/gpu/drm/via/via_irq.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/via/via_irq.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/via/via_irq.c linux-2.6.39/drivers/gpu/drm/via/via_irq.c
+--- linux-2.6.39/drivers/gpu/drm/via/via_irq.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/via/via_irq.c 2011-05-22 19:36:31.000000000 -0400
@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de
if (crtc != 0)
return 0;
irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
case VIA_IRQ_ABSOLUTE:
break;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
---- linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+--- linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-05-22 19:36:31.000000000 -0400
@@ -240,7 +240,7 @@ struct vmw_private {
* Fencing and IRQs.
*/
wait_queue_head_t fence_queue;
wait_queue_head_t fifo_queue;
atomic_t fence_queue_waiters;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
---- linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+--- linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-05-22 19:36:31.000000000 -0400
@@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev
while (!vmw_lag_lt(queue, us)) {
spin_lock(&queue->lock);
else {
fence = list_first_entry(&queue->head,
struct vmw_fence, head);
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
---- linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+--- linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-05-22 19:36:31.000000000 -0400
@@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *de
(unsigned int) min,
(unsigned int) fifo->capabilities);
.fault = vmw_fifo_vm_fault,
.open = NULL,
.close = NULL
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
---- linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
+--- linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-05-22 19:36:31.000000000 -0400
@@ -100,7 +100,7 @@ bool vmw_fence_signaled(struct vmw_priva
* emitted. Then the fence is stale and signaled.
*/
ret = 0;
for (;;) {
-diff -urNp linux-2.6.38.4/drivers/hid/hid-core.c linux-2.6.38.4/drivers/hid/hid-core.c
---- linux-2.6.38.4/drivers/hid/hid-core.c 2011-04-18 17:27:14.000000000 -0400
-+++ linux-2.6.38.4/drivers/hid/hid-core.c 2011-04-28 19:57:25.000000000 -0400
-@@ -1846,7 +1846,7 @@ static bool hid_ignore(struct hid_device
+diff -urNp linux-2.6.39/drivers/gpu/vga/vga_switcheroo.c linux-2.6.39/drivers/gpu/vga/vga_switcheroo.c
+--- linux-2.6.39/drivers/gpu/vga/vga_switcheroo.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/hid/hid-core.c linux-2.6.39/drivers/hid/hid-core.c
+--- linux-2.6.39/drivers/hid/hid-core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/hid/hid-core.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1888,7 +1888,7 @@ static bool hid_ignore(struct hid_device
int hid_add_device(struct hid_device *hdev)
{
int ret;
if (WARN_ON(hdev->status & HID_STAT_ADDED))
-@@ -1861,7 +1861,7 @@ int hid_add_device(struct hid_device *hd
+@@ -1903,7 +1903,7 @@ int hid_add_device(struct hid_device *hd
/* XXX hack, any other cleaner solution after the driver core
* is converted to allow more than 20 bytes as the device name? */
dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
hid_debug_register(hdev, dev_name(&hdev->dev));
ret = device_add(&hdev->dev);
-diff -urNp linux-2.6.38.4/drivers/hid/usbhid/hiddev.c linux-2.6.38.4/drivers/hid/usbhid/hiddev.c
---- linux-2.6.38.4/drivers/hid/usbhid/hiddev.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/hid/usbhid/hiddev.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/hid/hid-picolcd.c linux-2.6.39/drivers/hid/hid-picolcd.c
+--- linux-2.6.39/drivers/hid/hid-picolcd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/hid/hid-picolcd.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/hid/usbhid/hiddev.c linux-2.6.39/drivers/hid/usbhid/hiddev.c
+--- linux-2.6.39/drivers/hid/usbhid/hiddev.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/hid/usbhid/hiddev.c 2011-05-22 19:36:31.000000000 -0400
@@ -613,7 +613,7 @@ static long hiddev_ioctl(struct file *fi
break;
break;
for (i = 0; i < hid->maxcollection; i++)
-diff -urNp linux-2.6.38.4/drivers/hwmon/lis3lv02d.c linux-2.6.38.4/drivers/hwmon/lis3lv02d.c
---- linux-2.6.38.4/drivers/hwmon/lis3lv02d.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/hwmon/lis3lv02d.c 2011-04-28 19:57:25.000000000 -0400
-@@ -436,7 +436,7 @@ static irqreturn_t lis302dl_interrupt(in
- * the lid is closed. This leads to interrupts as soon as a little move
- * is done.
- */
-- atomic_inc(&lis3_dev.count);
-+ atomic_inc_unchecked(&lis3_dev.count);
-
- wake_up_interruptible(&lis3_dev.misc_wait);
- kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN);
-@@ -519,7 +519,7 @@ static int lis3lv02d_misc_open(struct in
- if (lis3_dev.pm_dev)
- pm_runtime_get_sync(lis3_dev.pm_dev);
-
-- atomic_set(&lis3_dev.count, 0);
-+ atomic_set_unchecked(&lis3_dev.count, 0);
- return 0;
- }
-
-@@ -546,7 +546,7 @@ static ssize_t lis3lv02d_misc_read(struc
- add_wait_queue(&lis3_dev.misc_wait, &wait);
- while (true) {
- set_current_state(TASK_INTERRUPTIBLE);
-- data = atomic_xchg(&lis3_dev.count, 0);
-+ data = atomic_xchg_unchecked(&lis3_dev.count, 0);
- if (data)
- break;
+diff -urNp linux-2.6.39/drivers/hwmon/ibmaem.c linux-2.6.39/drivers/hwmon/ibmaem.c
+--- linux-2.6.39/drivers/hwmon/ibmaem.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/hwmon/ibmaem.c 2011-05-22 19:36:31.000000000 -0400
+@@ -238,7 +238,7 @@ struct aem_read_sensor_resp {
+ struct aem_driver_data {
+ struct list_head aem_devices;
+ struct ipmi_smi_watcher bmc_events;
+- struct ipmi_user_hndl ipmi_hndlrs;
++ const struct ipmi_user_hndl ipmi_hndlrs;
+ };
-@@ -584,7 +584,7 @@ out:
- static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
- {
- poll_wait(file, &lis3_dev.misc_wait, wait);
-- if (atomic_read(&lis3_dev.count))
-+ if (atomic_read_unchecked(&lis3_dev.count))
- return POLLIN | POLLRDNORM;
- return 0;
- }
-diff -urNp linux-2.6.38.4/drivers/hwmon/lis3lv02d.h linux-2.6.38.4/drivers/hwmon/lis3lv02d.h
---- linux-2.6.38.4/drivers/hwmon/lis3lv02d.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/hwmon/lis3lv02d.h 2011-04-28 19:57:25.000000000 -0400
-@@ -265,7 +265,7 @@ struct lis3lv02d {
- struct input_polled_dev *idev; /* input device */
- struct platform_device *pdev; /* platform device */
- struct regulator_bulk_data regulators[2];
-- atomic_t count; /* interrupt count after last read */
-+ atomic_unchecked_t count; /* interrupt count after last read */
- union axis_conversion ac; /* hw -> logical axis */
- int mapped_btns[3];
+ static void aem_register_bmc(int iface, struct device *dev);
+diff -urNp linux-2.6.39/drivers/hwmon/ibmpex.c linux-2.6.39/drivers/hwmon/ibmpex.c
+--- linux-2.6.39/drivers/hwmon/ibmpex.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/hwmon/ibmpex.c 2011-05-22 19:36:31.000000000 -0400
+@@ -110,7 +110,7 @@ struct ibmpex_bmc_data {
+ struct ibmpex_driver_data {
+ struct list_head bmc_data;
+ struct ipmi_smi_watcher bmc_events;
+- struct ipmi_user_hndl ipmi_hndlrs;
++ const struct ipmi_user_hndl ipmi_hndlrs;
+ };
-diff -urNp linux-2.6.38.4/drivers/hwmon/sht15.c linux-2.6.38.4/drivers/hwmon/sht15.c
---- linux-2.6.38.4/drivers/hwmon/sht15.c 2011-04-18 17:27:14.000000000 -0400
-+++ linux-2.6.38.4/drivers/hwmon/sht15.c 2011-04-28 19:57:25.000000000 -0400
+ static struct ibmpex_driver_data driver_data = {
+diff -urNp linux-2.6.39/drivers/hwmon/sht15.c linux-2.6.39/drivers/hwmon/sht15.c
+--- linux-2.6.39/drivers/hwmon/sht15.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/hwmon/sht15.c 2011-05-22 19:36:31.000000000 -0400
@@ -113,7 +113,7 @@ struct sht15_data {
int supply_uV;
int supply_uV_valid;
enable_irq(gpio_to_irq(data->pdata->gpio_data));
if (gpio_get_value(data->pdata->gpio_data) == 0) {
disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
- /* Only relevant if the interrupt hasn't occured. */
+ /* Only relevant if the interrupt hasn't occurred. */
- if (!atomic_read(&data->interrupt_handled))
+ if (!atomic_read_unchecked(&data->interrupt_handled))
schedule_work(&data->read_work);
- atomic_set(&data->interrupt_handled, 0);
+ atomic_set_unchecked(&data->interrupt_handled, 0);
enable_irq(gpio_to_irq(data->pdata->gpio_data));
- /* If still not occured or another handler has been scheduled */
+ /* If still not occurred or another handler has been scheduled */
if (gpio_get_value(data->pdata->gpio_data)
- || atomic_read(&data->interrupt_handled))
+ || atomic_read_unchecked(&data->interrupt_handled))
return;
}
/* Read the data back from the device */
-diff -urNp linux-2.6.38.4/drivers/hwmon/w83791d.c linux-2.6.38.4/drivers/hwmon/w83791d.c
---- linux-2.6.38.4/drivers/hwmon/w83791d.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/hwmon/w83791d.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/hwmon/w83791d.c linux-2.6.39/drivers/hwmon/w83791d.c
+--- linux-2.6.39/drivers/hwmon/w83791d.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/hwmon/w83791d.c 2011-05-22 19:36:31.000000000 -0400
@@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_cli
struct i2c_board_info *info);
static int w83791d_remove(struct i2c_client *client);
static struct w83791d_data *w83791d_update_device(struct device *dev);
#ifdef DEBUG
-diff -urNp linux-2.6.38.4/drivers/ide/ide-cd.c linux-2.6.38.4/drivers/ide/ide-cd.c
---- linux-2.6.38.4/drivers/ide/ide-cd.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ide/ide-cd.c 2011-04-28 19:34:15.000000000 -0400
-@@ -776,7 +776,7 @@ static void cdrom_do_block_pc(ide_drive_
+diff -urNp linux-2.6.39/drivers/i2c/busses/i2c-at91.c linux-2.6.39/drivers/i2c/busses/i2c-at91.c
+--- linux-2.6.39/drivers/i2c/busses/i2c-at91.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/i2c/busses/i2c-bfin-twi.c linux-2.6.39/drivers/i2c/busses/i2c-bfin-twi.c
+--- linux-2.6.39/drivers/i2c/busses/i2c-bfin-twi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/i2c/busses/i2c-davinci.c linux-2.6.39/drivers/i2c/busses/i2c-davinci.c
+--- linux-2.6.39/drivers/i2c/busses/i2c-davinci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/i2c/busses/i2c-designware.c linux-2.6.39/drivers/i2c/busses/i2c-designware.c
+--- linux-2.6.39/drivers/i2c/busses/i2c-designware.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/i2c/busses/i2c-designware.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/i2c/busses/i2c-eg20t.c linux-2.6.39/drivers/i2c/busses/i2c-eg20t.c
+--- linux-2.6.39/drivers/i2c/busses/i2c-eg20t.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/i2c/busses/i2c-imx.c linux-2.6.39/drivers/i2c/busses/i2c-imx.c
+--- linux-2.6.39/drivers/i2c/busses/i2c-imx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/i2c/busses/i2c-intel-mid.c linux-2.6.39/drivers/i2c/busses/i2c-intel-mid.c
+--- linux-2.6.39/drivers/i2c/busses/i2c-intel-mid.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/i2c/busses/i2c-intel-mid.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/i2c/busses/i2c-nforce2.c linux-2.6.39/drivers/i2c/busses/i2c-nforce2.c
+--- linux-2.6.39/drivers/i2c/busses/i2c-nforce2.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/i2c/busses/i2c-pmcmsp.c linux-2.6.39/drivers/i2c/busses/i2c-pmcmsp.c
+--- linux-2.6.39/drivers/i2c/busses/i2c-pmcmsp.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/i2c/busses/i2c-pnx.c linux-2.6.39/drivers/i2c/busses/i2c-pnx.c
+--- linux-2.6.39/drivers/i2c/busses/i2c-pnx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/i2c/busses/i2c-puv3.c linux-2.6.39/drivers/i2c/busses/i2c-puv3.c
+--- linux-2.6.39/drivers/i2c/busses/i2c-puv3.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/i2c/busses/i2c-s6000.c linux-2.6.39/drivers/i2c/busses/i2c-s6000.c
+--- linux-2.6.39/drivers/i2c/busses/i2c-s6000.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
+ }
+
+-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/drivers/i2c/busses/i2c-sh_mobile.c linux-2.6.39/drivers/i2c/busses/i2c-sh_mobile.c
+--- linux-2.6.39/drivers/i2c/busses/i2c-sh_mobile.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/i2c/busses/i2c-sh_mobile.c 2011-05-22 19:36:31.000000000 -0400
+@@ -529,7 +529,7 @@ static u32 sh_mobile_i2c_func(struct i2c
+ return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
+ }
+
+-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/drivers/ide/ide-cd.c linux-2.6.39/drivers/ide/ide-cd.c
+--- linux-2.6.39/drivers/ide/ide-cd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ide/ide-cd.c 2011-05-22 19:36:31.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
|| blk_rq_bytes(rq) & q->dma_pad_mask
drive->dma = 0;
}
}
-diff -urNp linux-2.6.38.4/drivers/infiniband/core/cm.c linux-2.6.38.4/drivers/infiniband/core/cm.c
---- linux-2.6.38.4/drivers/infiniband/core/cm.c 2011-04-18 17:27:14.000000000 -0400
-+++ linux-2.6.38.4/drivers/infiniband/core/cm.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/ide/ide-floppy.c linux-2.6.39/drivers/ide/ide-floppy.c
+--- linux-2.6.39/drivers/ide/ide-floppy.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ide/ide-floppy.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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;
+
++ pax_track_stack();
++
+ ide_debug_log(IDE_DBG_FUNC, "enter");
+
+ drive->bios_cyl = 0;
+diff -urNp linux-2.6.39/drivers/ide/it821x.c linux-2.6.39/drivers/ide/it821x.c
+--- linux-2.6.39/drivers/ide/it821x.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/ide/setup-pci.c linux-2.6.39/drivers/ide/setup-pci.c
+--- linux-2.6.39/drivers/ide/setup-pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/ide/setup-pci.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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 };
+
++ pax_track_stack();
++
+ 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/drivers/ide/trm290.c linux-2.6.39/drivers/ide/trm290.c
+--- linux-2.6.39/drivers/ide/trm290.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/infiniband/core/cm.c linux-2.6.39/drivers/infiniband/core/cm.c
+--- linux-2.6.39/drivers/infiniband/core/cm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/infiniband/core/cm.c 2011-05-22 19:36:31.000000000 -0400
@@ -113,7 +113,7 @@ static char const counter_group_names[CM
struct cm_counter_group {
counter[CM_RTU_COUNTER]);
goto out;
}
-@@ -2111,7 +2111,7 @@ static int cm_dreq_handler(struct cm_wor
+@@ -2115,7 +2115,7 @@ static int cm_dreq_handler(struct cm_wor
cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
dreq_msg->local_comm_id);
if (!cm_id_priv) {
counter[CM_DREQ_COUNTER]);
cm_issue_drep(work->port, work->mad_recv_wc);
return -EINVAL;
-@@ -2132,7 +2132,7 @@ static int cm_dreq_handler(struct cm_wor
+@@ -2140,7 +2140,7 @@ static int cm_dreq_handler(struct cm_wor
case IB_CM_MRA_REP_RCVD:
break;
case IB_CM_TIMEWAIT:
counter[CM_DREQ_COUNTER]);
if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
goto unlock;
-@@ -2146,7 +2146,7 @@ static int cm_dreq_handler(struct cm_wor
+@@ -2154,7 +2154,7 @@ static int cm_dreq_handler(struct cm_wor
cm_free_msg(msg);
goto deref;
case IB_CM_DREQ_RCVD:
counter[CM_DREQ_COUNTER]);
goto unlock;
default:
-@@ -2504,7 +2504,7 @@ static int cm_mra_handler(struct cm_work
+@@ -2521,7 +2521,7 @@ static int cm_mra_handler(struct cm_work
ib_modify_mad(cm_id_priv->av.port->mad_agent,
cm_id_priv->msg, timeout)) {
if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
counter_group[CM_RECV_DUPLICATES].
counter[CM_MRA_COUNTER]);
goto out;
-@@ -2513,7 +2513,7 @@ static int cm_mra_handler(struct cm_work
+@@ -2530,7 +2530,7 @@ static int cm_mra_handler(struct cm_work
break;
case IB_CM_MRA_REQ_RCVD:
case IB_CM_MRA_REP_RCVD:
counter[CM_MRA_COUNTER]);
/* fall through */
default:
-@@ -2675,7 +2675,7 @@ static int cm_lap_handler(struct cm_work
+@@ -2692,7 +2692,7 @@ static int cm_lap_handler(struct cm_work
case IB_CM_LAP_IDLE:
break;
case IB_CM_MRA_LAP_SENT:
counter[CM_LAP_COUNTER]);
if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
goto unlock;
-@@ -2691,7 +2691,7 @@ static int cm_lap_handler(struct cm_work
+@@ -2708,7 +2708,7 @@ static int cm_lap_handler(struct cm_work
cm_free_msg(msg);
goto deref;
case IB_CM_LAP_RCVD:
counter[CM_LAP_COUNTER]);
goto unlock;
default:
-@@ -2975,7 +2975,7 @@ static int cm_sidr_req_handler(struct cm
+@@ -2992,7 +2992,7 @@ static int cm_sidr_req_handler(struct cm
cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
if (cur_cm_id_priv) {
spin_unlock_irq(&cm.lock);
counter[CM_SIDR_REQ_COUNTER]);
goto out; /* Duplicate message. */
}
-@@ -3187,10 +3187,10 @@ static void cm_send_handler(struct ib_ma
+@@ -3204,10 +3204,10 @@ static void cm_send_handler(struct ib_ma
if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
msg->retries = 1;
&port->counter_group[CM_XMIT_RETRIES].
counter[attr_index]);
-@@ -3400,7 +3400,7 @@ static void cm_recv_handler(struct ib_ma
+@@ -3417,7 +3417,7 @@ static void cm_recv_handler(struct ib_ma
}
attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
counter[attr_id - CM_ATTR_ID_OFFSET]);
work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
-@@ -3598,7 +3598,7 @@ static ssize_t cm_show_counter(struct ko
+@@ -3615,7 +3615,7 @@ static ssize_t cm_show_counter(struct ko
cm_attr = container_of(attr, struct cm_counter_attribute, attr);
return sprintf(buf, "%ld\n",
}
static const struct sysfs_ops cm_counter_ops = {
-diff -urNp linux-2.6.38.4/drivers/infiniband/core/fmr_pool.c linux-2.6.38.4/drivers/infiniband/core/fmr_pool.c
---- linux-2.6.38.4/drivers/infiniband/core/fmr_pool.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/infiniband/core/fmr_pool.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/infiniband/core/fmr_pool.c linux-2.6.39/drivers/infiniband/core/fmr_pool.c
+--- linux-2.6.39/drivers/infiniband/core/fmr_pool.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/infiniband/core/fmr_pool.c 2011-05-22 19:36:31.000000000 -0400
@@ -97,8 +97,8 @@ struct ib_fmr_pool {
struct task_struct *thread;
wake_up_process(pool->thread);
}
}
-diff -urNp linux-2.6.38.4/drivers/infiniband/hw/cxgb4/mem.c linux-2.6.38.4/drivers/infiniband/hw/cxgb4/mem.c
---- linux-2.6.38.4/drivers/infiniband/hw/cxgb4/mem.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/infiniband/hw/cxgb4/mem.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/infiniband/hw/cxgb4/mem.c linux-2.6.39/drivers/infiniband/hw/cxgb4/mem.c
+--- linux-2.6.39/drivers/infiniband/hw/cxgb4/mem.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/infiniband/hw/cxgb4/mem.c 2011-05-22 19:36:31.000000000 -0400
@@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_r
int err;
struct fw_ri_tpte tpt;
}
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.38.4/drivers/infiniband/hw/nes/nes.c linux-2.6.38.4/drivers/infiniband/hw/nes/nes.c
---- linux-2.6.38.4/drivers/infiniband/hw/nes/nes.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/infiniband/hw/nes/nes.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/infiniband/hw/ipath/ipath_dma.c linux-2.6.39/drivers/infiniband/hw/ipath/ipath_dma.c
+--- linux-2.6.39/drivers/infiniband/hw/ipath/ipath_dma.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/infiniband/hw/ipath/ipath_fs.c linux-2.6.39/drivers/infiniband/hw/ipath/ipath_fs.c
+--- linux-2.6.39/drivers/infiniband/hw/ipath/ipath_fs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/infiniband/hw/ipath/ipath_fs.c 2011-05-22 19:36:31.000000000 -0400
+@@ -113,6 +113,8 @@ static ssize_t atomic_counters_read(stru
+ struct infinipath_counters counters;
+ struct ipath_devdata *dd;
+
++ pax_track_stack();
++
+ dd = file->f_path.dentry->d_inode->i_private;
+ dd->ipath_f_read_counters(dd, &counters);
+
+diff -urNp linux-2.6.39/drivers/infiniband/hw/ipath/ipath_rc.c linux-2.6.39/drivers/infiniband/hw/ipath/ipath_rc.c
+--- linux-2.6.39/drivers/infiniband/hw/ipath/ipath_rc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/infiniband/hw/ipath/ipath_rc.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *de
+ struct ib_atomic_eth *ateth;
+ struct ipath_ack_entry *e;
+ u64 vaddr;
+- atomic64_t *maddr;
++ atomic64_unchecked_t *maddr;
+ u64 sdata;
+ u32 rkey;
+ u8 next;
+@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *de
+ IB_ACCESS_REMOTE_ATOMIC)))
+ goto nack_acc_unlck;
+ /* Perform atomic OP and save result. */
+- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
++ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
+ sdata = be64_to_cpu(ateth->swap_data);
+ e = &qp->s_ack_queue[qp->r_head_ack_queue];
+ e->atomic_data = (opcode == OP(FETCH_ADD)) ?
+- (u64) atomic64_add_return(sdata, maddr) - sdata :
++ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
+ (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
+ be64_to_cpu(ateth->compare_data),
+ sdata);
+diff -urNp linux-2.6.39/drivers/infiniband/hw/ipath/ipath_ruc.c linux-2.6.39/drivers/infiniband/hw/ipath/ipath_ruc.c
+--- linux-2.6.39/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-05-22 19:36:31.000000000 -0400
+@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ip
+ unsigned long flags;
+ struct ib_wc wc;
+ u64 sdata;
+- atomic64_t *maddr;
++ atomic64_unchecked_t *maddr;
+ enum ib_wc_status send_status;
+
+ /*
+@@ -382,11 +382,11 @@ again:
+ IB_ACCESS_REMOTE_ATOMIC)))
+ goto acc_err;
+ /* Perform atomic OP and save result. */
+- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
++ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
+ sdata = wqe->wr.wr.atomic.compare_add;
+ *(u64 *) sqp->s_sge.sge.vaddr =
+ (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
+- (u64) atomic64_add_return(sdata, maddr) - sdata :
++ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
+ (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
+ sdata, wqe->wr.wr.atomic.swap);
+ goto send_comp;
+diff -urNp linux-2.6.39/drivers/infiniband/hw/ipath/ipath_verbs.h linux-2.6.39/drivers/infiniband/hw/ipath/ipath_verbs.h
+--- linux-2.6.39/drivers/infiniband/hw/ipath/ipath_verbs.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/infiniband/hw/ipath/ipath_verbs.h 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/infiniband/hw/nes/nes.c linux-2.6.39/drivers/infiniband/hw/nes/nes.c
+--- linux-2.6.39/drivers/infiniband/hw/nes/nes.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/infiniband/hw/nes/nes.c 2011-05-22 19:36:31.000000000 -0400
@@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi
LIST_HEAD(nes_adapter_list);
static LIST_HEAD(nes_dev_list);
static unsigned int ee_flsh_adapter;
static unsigned int sysfs_nonidx_addr;
-@@ -274,7 +274,7 @@ static void nes_cqp_rem_ref_callback(str
+@@ -275,7 +275,7 @@ static void nes_cqp_rem_ref_callback(str
struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
struct nes_adapter *nesadapter = nesdev->nesadapter;
/* Free the control structures */
-diff -urNp linux-2.6.38.4/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.4/drivers/infiniband/hw/nes/nes_cm.c
---- linux-2.6.38.4/drivers/infiniband/hw/nes/nes_cm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/infiniband/hw/nes/nes_cm.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.39/drivers/infiniband/hw/nes/nes_cm.c
+--- linux-2.6.39/drivers/infiniband/hw/nes/nes_cm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/infiniband/hw/nes/nes_cm.c 2011-05-22 19:36:31.000000000 -0400
@@ -68,14 +68,14 @@ u32 cm_packets_dropped;
u32 cm_packets_retrans;
u32 cm_packets_created;
} else {
spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
}
-@@ -1242,7 +1242,7 @@ static struct nes_cm_node *make_cm_node(
+@@ -1240,7 +1240,7 @@ static struct nes_cm_node *make_cm_node(
cm_node->rem_mac);
add_hte_node(cm_core, cm_node);
return cm_node;
}
-@@ -1300,7 +1300,7 @@ static int rem_ref_cm_node(struct nes_cm
+@@ -1298,7 +1298,7 @@ static int rem_ref_cm_node(struct nes_cm
}
atomic_dec(&cm_core->node_cnt);
nesqp = cm_node->nesqp;
if (nesqp) {
nesqp->cm_node = NULL;
-@@ -1367,7 +1367,7 @@ static int process_options(struct nes_cm
+@@ -1365,7 +1365,7 @@ static int process_options(struct nes_cm
static void drop_packet(struct sk_buff *skb)
{
dev_kfree_skb_any(skb);
}
-@@ -1430,7 +1430,7 @@ static void handle_rst_pkt(struct nes_cm
+@@ -1428,7 +1428,7 @@ static void handle_rst_pkt(struct nes_cm
{
int reset = 0; /* whether to send reset in case of err.. */
nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
" refcnt=%d\n", cm_node, cm_node->state,
atomic_read(&cm_node->ref_count));
-@@ -2059,7 +2059,7 @@ static struct nes_cm_node *mini_cm_conne
+@@ -2057,7 +2057,7 @@ static struct nes_cm_node *mini_cm_conne
rem_ref_cm_node(cm_node->cm_core, cm_node);
return NULL;
}
loopbackremotenode->loopbackpartner = cm_node;
loopbackremotenode->tcp_cntxt.rcv_wscale =
NES_CM_DEFAULT_RCV_WND_SCALE;
-@@ -2334,7 +2334,7 @@ static int mini_cm_recv_pkt(struct nes_c
+@@ -2332,7 +2332,7 @@ static int mini_cm_recv_pkt(struct nes_c
add_ref_cm_node(cm_node);
} else if (cm_node->state == NES_CM_STATE_TSA) {
rem_ref_cm_node(cm_core, cm_node);
dev_kfree_skb_any(skb);
break;
}
-@@ -2640,7 +2640,7 @@ static int nes_cm_disconn_true(struct ne
+@@ -2638,7 +2638,7 @@ static int nes_cm_disconn_true(struct ne
if ((cm_id) && (cm_id->event_handler)) {
if (issue_disconn) {
cm_event.event = IW_CM_EVENT_DISCONNECT;
cm_event.status = disconn_status;
cm_event.local_addr = cm_id->local_addr;
-@@ -2662,7 +2662,7 @@ static int nes_cm_disconn_true(struct ne
+@@ -2660,7 +2660,7 @@ static int nes_cm_disconn_true(struct ne
}
if (issue_close) {
nes_disconnect(nesqp, 1);
cm_id->provider_data = nesqp;
-@@ -2793,7 +2793,7 @@ int nes_accept(struct iw_cm_id *cm_id, s
+@@ -2791,7 +2791,7 @@ int nes_accept(struct iw_cm_id *cm_id, s
nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
netdev_refcnt_read(nesvnic->netdev));
-@@ -3003,7 +3003,7 @@ int nes_reject(struct iw_cm_id *cm_id, c
+@@ -3001,7 +3001,7 @@ int nes_reject(struct iw_cm_id *cm_id, c
struct nes_cm_core *cm_core;
cm_node = (struct nes_cm_node *) cm_id->provider_data;
loopback = cm_node->loopbackpartner;
cm_core = cm_node->cm_core;
-@@ -3069,7 +3069,7 @@ int nes_connect(struct iw_cm_id *cm_id,
+@@ -3067,7 +3067,7 @@ int nes_connect(struct iw_cm_id *cm_id,
ntohl(cm_id->local_addr.sin_addr.s_addr),
ntohs(cm_id->local_addr.sin_port));
nesqp->active_conn = 1;
/* cache the cm_id in the qp */
-@@ -3175,7 +3175,7 @@ int nes_create_listen(struct iw_cm_id *c
+@@ -3173,7 +3173,7 @@ int nes_create_listen(struct iw_cm_id *c
g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
return err;
}
}
cm_id->add_ref(cm_id);
-@@ -3280,7 +3280,7 @@ static void cm_event_connected(struct ne
+@@ -3278,7 +3278,7 @@ static void cm_event_connected(struct ne
if (nesqp->destroyed) {
return;
}
nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
" local port 0x%04X. jiffies = %lu.\n",
nesqp->hwqp.qp_id,
-@@ -3495,7 +3495,7 @@ static void cm_event_reset(struct nes_cm
+@@ -3493,7 +3493,7 @@ static void cm_event_reset(struct nes_cm
cm_id->add_ref(cm_id);
ret = cm_id->event_handler(cm_id, &cm_event);
cm_event.event = IW_CM_EVENT_CLOSE;
cm_event.status = IW_CM_EVENT_STATUS_OK;
cm_event.provider_data = cm_id->provider_data;
-@@ -3531,7 +3531,7 @@ static void cm_event_mpa_req(struct nes_
+@@ -3529,7 +3529,7 @@ static void cm_event_mpa_req(struct nes_
return;
cm_id = cm_node->cm_id;
nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
cm_node, cm_id, jiffies);
-@@ -3569,7 +3569,7 @@ static void cm_event_mpa_reject(struct n
+@@ -3567,7 +3567,7 @@ static void cm_event_mpa_reject(struct n
return;
cm_id = cm_node->cm_id;
nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
cm_node, cm_id, jiffies);
-diff -urNp linux-2.6.38.4/drivers/infiniband/hw/nes/nes.h linux-2.6.38.4/drivers/infiniband/hw/nes/nes.h
---- linux-2.6.38.4/drivers/infiniband/hw/nes/nes.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/infiniband/hw/nes/nes.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/infiniband/hw/nes/nes.h linux-2.6.39/drivers/infiniband/hw/nes/nes.h
+--- linux-2.6.39/drivers/infiniband/hw/nes/nes.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/infiniband/hw/nes/nes.h 2011-05-22 19:36:31.000000000 -0400
@@ -175,17 +175,17 @@ extern unsigned int nes_debug_level;
extern unsigned int wqm_quanta;
extern struct list_head nes_adapter_list;
extern u32 int_mod_timer_init;
extern u32 int_mod_cq_depth_256;
-diff -urNp linux-2.6.38.4/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.38.4/drivers/infiniband/hw/nes/nes_nic.c
---- linux-2.6.38.4/drivers/infiniband/hw/nes/nes_nic.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/infiniband/hw/nes/nes_nic.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.39/drivers/infiniband/hw/nes/nes_nic.c
+--- linux-2.6.39/drivers/infiniband/hw/nes/nes_nic.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/infiniband/hw/nes/nes_nic.c 2011-05-22 19:36:31.000000000 -0400
@@ -1302,31 +1302,31 @@ static void nes_netdev_get_ethtool_stats
target_stat_values[++index] = mh_detected;
target_stat_values[++index] = mh_pauses_sent;
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.38.4/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.38.4/drivers/infiniband/hw/nes/nes_verbs.c
---- linux-2.6.38.4/drivers/infiniband/hw/nes/nes_verbs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/infiniband/hw/nes/nes_verbs.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.39/drivers/infiniband/hw/nes/nes_verbs.c
+--- linux-2.6.39/drivers/infiniband/hw/nes/nes_verbs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/infiniband/hw/nes/nes_verbs.c 2011-05-22 19:36:31.000000000 -0400
@@ -46,9 +46,9 @@
#include <rdma/ib_umem.h>
nesqp->destroyed = 1;
/* Blow away the connection if it exists. */
-diff -urNp linux-2.6.38.4/drivers/infiniband/hw/qib/qib.h linux-2.6.38.4/drivers/infiniband/hw/qib/qib.h
---- linux-2.6.38.4/drivers/infiniband/hw/qib/qib.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/infiniband/hw/qib/qib.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/infiniband/hw/qib/qib.h linux-2.6.39/drivers/infiniband/hw/qib/qib.h
+--- linux-2.6.39/drivers/infiniband/hw/qib/qib.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/infiniband/hw/qib/qib.h 2011-05-22 19:36:31.000000000 -0400
@@ -51,6 +51,7 @@
#include <linux/completion.h>
#include <linux/kref.h>
#include "qib_common.h"
#include "qib_verbs.h"
-diff -urNp linux-2.6.38.4/drivers/input/gameport/gameport.c linux-2.6.38.4/drivers/input/gameport/gameport.c
---- linux-2.6.38.4/drivers/input/gameport/gameport.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/input/gameport/gameport.c 2011-04-28 19:57:25.000000000 -0400
+@@ -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/drivers/infiniband/hw/qib/qib_mmap.c linux-2.6.39/drivers/infiniband/hw/qib/qib_mmap.c
+--- linux-2.6.39/drivers/infiniband/hw/qib/qib_mmap.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/infiniband/hw/qib/qib_pcie.c linux-2.6.39/drivers/infiniband/hw/qib/qib_pcie.c
+--- linux-2.6.39/drivers/infiniband/hw/qib/qib_pcie.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/input/gameport/gameport.c linux-2.6.39/drivers/input/gameport/gameport.c
+--- linux-2.6.39/drivers/input/gameport/gameport.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/input/gameport/gameport.c 2011-05-22 19:36:31.000000000 -0400
@@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys);
*/
static void gameport_init_port(struct gameport *gameport)
gameport->dev.bus = &gameport_bus;
gameport->dev.release = gameport_release_port;
if (gameport->parent)
-diff -urNp linux-2.6.38.4/drivers/input/input.c linux-2.6.38.4/drivers/input/input.c
---- linux-2.6.38.4/drivers/input/input.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/input/input.c 2011-04-28 19:57:25.000000000 -0400
-@@ -1820,7 +1820,7 @@ static void input_cleanse_bitmasks(struc
+diff -urNp linux-2.6.39/drivers/input/input.c linux-2.6.39/drivers/input/input.c
+--- linux-2.6.39/drivers/input/input.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/input/input.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1815,7 +1815,7 @@ static void input_cleanse_bitmasks(struc
*/
int input_register_device(struct input_dev *dev)
{
struct input_handler *handler;
const char *path;
int error;
-@@ -1853,7 +1853,7 @@ int input_register_device(struct input_d
- dev->setkeycode_new = input_default_setkeycode;
+@@ -1852,7 +1852,7 @@ int input_register_device(struct input_d
+ dev->setkeycode = input_default_setkeycode;
dev_set_name(&dev->dev, "input%ld",
- (unsigned long) atomic_inc_return(&input_no) - 1);
error = device_add(&dev->dev);
if (error)
-diff -urNp linux-2.6.38.4/drivers/input/joystick/xpad.c linux-2.6.38.4/drivers/input/joystick/xpad.c
---- linux-2.6.38.4/drivers/input/joystick/xpad.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/input/joystick/xpad.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/input/joystick/sidewinder.c linux-2.6.39/drivers/input/joystick/sidewinder.c
+--- linux-2.6.39/drivers/input/joystick/sidewinder.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/input/joystick/sidewinder.c 2011-05-22 19:36:31.000000000 -0400
+@@ -30,6 +30,7 @@
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+ #include <linux/slab.h>
++#include <linux/sched.h>
+ #include <linux/init.h>
+ #include <linux/input.h>
+ #include <linux/gameport.h>
+@@ -428,6 +429,8 @@ static int sw_read(struct sw *sw)
+ unsigned char buf[SW_LENGTH];
+ int i;
+
++ pax_track_stack();
++
+ 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/drivers/input/joystick/xpad.c linux-2.6.39/drivers/input/joystick/xpad.c
+--- linux-2.6.39/drivers/input/joystick/xpad.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/input/joystick/xpad.c 2011-05-22 19:36:31.000000000 -0400
@@ -689,7 +689,7 @@ static void xpad_led_set(struct led_clas
static int xpad_led_probe(struct usb_xpad *xpad)
snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
led->xpad = xpad;
-diff -urNp linux-2.6.38.4/drivers/input/mousedev.c linux-2.6.38.4/drivers/input/mousedev.c
---- linux-2.6.38.4/drivers/input/mousedev.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/input/mousedev.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/input/mousedev.c linux-2.6.39/drivers/input/mousedev.c
+--- linux-2.6.39/drivers/input/mousedev.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/input/mousedev.c 2011-05-22 19:36:31.000000000 -0400
@@ -764,7 +764,7 @@ static ssize_t mousedev_read(struct file
spin_unlock_irq(&client->packet_lock);
return -EFAULT;
return count;
-diff -urNp linux-2.6.38.4/drivers/input/serio/serio.c linux-2.6.38.4/drivers/input/serio/serio.c
---- linux-2.6.38.4/drivers/input/serio/serio.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/input/serio/serio.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/input/serio/serio.c linux-2.6.39/drivers/input/serio/serio.c
+--- linux-2.6.39/drivers/input/serio/serio.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/input/serio/serio.c 2011-05-22 19:36:31.000000000 -0400
@@ -497,7 +497,7 @@ static void serio_release_port(struct de
*/
static void serio_init_port(struct serio *serio)
serio->dev.bus = &serio_bus;
serio->dev.release = serio_release_port;
serio->dev.groups = serio_device_attr_groups;
-diff -urNp linux-2.6.38.4/drivers/isdn/capi/capi.c linux-2.6.38.4/drivers/isdn/capi/capi.c
---- linux-2.6.38.4/drivers/isdn/capi/capi.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/isdn/capi/capi.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/isdn/capi/capi.c linux-2.6.39/drivers/isdn/capi/capi.c
+--- linux-2.6.39/drivers/isdn/capi/capi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/isdn/capi/capi.c 2011-05-22 19:36:31.000000000 -0400
@@ -89,8 +89,8 @@ struct capiminor {
struct capi20_appl *ap;
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.38.4/drivers/isdn/gigaset/common.c linux-2.6.38.4/drivers/isdn/gigaset/common.c
---- linux-2.6.38.4/drivers/isdn/gigaset/common.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/isdn/gigaset/common.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/isdn/gigaset/common.c linux-2.6.39/drivers/isdn/gigaset/common.c
+--- linux-2.6.39/drivers/isdn/gigaset/common.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/isdn/gigaset/common.c 2011-05-22 19:36:31.000000000 -0400
@@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct
cs->commands_pending = 0;
cs->cur_at_seq = 0;
cs->dev = NULL;
cs->tty = NULL;
cs->tty_dev = NULL;
-diff -urNp linux-2.6.38.4/drivers/isdn/gigaset/gigaset.h linux-2.6.38.4/drivers/isdn/gigaset/gigaset.h
---- linux-2.6.38.4/drivers/isdn/gigaset/gigaset.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/isdn/gigaset/gigaset.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/isdn/gigaset/gigaset.h linux-2.6.39/drivers/isdn/gigaset/gigaset.h
+--- linux-2.6.39/drivers/isdn/gigaset/gigaset.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/isdn/gigaset/gigaset.h 2011-05-22 19:36:31.000000000 -0400
@@ -35,6 +35,7 @@
#include <linux/tty_driver.h>
#include <linux/list.h>
struct tty_struct *tty;
struct tasklet_struct if_wake_tasklet;
unsigned control_state;
-diff -urNp linux-2.6.38.4/drivers/isdn/gigaset/interface.c linux-2.6.38.4/drivers/isdn/gigaset/interface.c
---- linux-2.6.38.4/drivers/isdn/gigaset/interface.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/isdn/gigaset/interface.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/isdn/gigaset/interface.c linux-2.6.39/drivers/isdn/gigaset/interface.c
+--- linux-2.6.39/drivers/isdn/gigaset/interface.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/isdn/gigaset/interface.c 2011-05-22 19:36:31.000000000 -0400
@@ -160,9 +160,7 @@ static int if_open(struct tty_struct *tt
return -ERESTARTSYS;
tty->driver_data = cs;
dev_warn(cs->dev, "%s: device not opened\n", __func__);
goto out;
}
-diff -urNp linux-2.6.38.4/drivers/isdn/hardware/avm/b1.c linux-2.6.38.4/drivers/isdn/hardware/avm/b1.c
---- linux-2.6.38.4/drivers/isdn/hardware/avm/b1.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/isdn/hardware/avm/b1.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/isdn/hardware/avm/b1.c linux-2.6.39/drivers/isdn/hardware/avm/b1.c
+--- linux-2.6.39/drivers/isdn/hardware/avm/b1.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/isdn/hardware/avm/b1.c 2011-05-22 19:36:31.000000000 -0400
@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo
}
if (left) {
return -EFAULT;
} else {
memcpy(buf, dp, left);
-diff -urNp linux-2.6.38.4/drivers/isdn/icn/icn.c linux-2.6.38.4/drivers/isdn/icn/icn.c
---- linux-2.6.38.4/drivers/isdn/icn/icn.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/isdn/icn/icn.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/isdn/hardware/eicon/capidtmf.c linux-2.6.39/drivers/isdn/hardware/eicon/capidtmf.c
+--- linux-2.6.39/drivers/isdn/hardware/eicon/capidtmf.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/isdn/hardware/eicon/capidtmf.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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];
+
++ pax_track_stack();
+
+ if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE)
+ {
+diff -urNp linux-2.6.39/drivers/isdn/hardware/eicon/capifunc.c linux-2.6.39/drivers/isdn/hardware/eicon/capifunc.c
+--- linux-2.6.39/drivers/isdn/hardware/eicon/capifunc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/isdn/hardware/eicon/capifunc.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void)
+ IDI_SYNC_REQ req;
+ DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
+
++ pax_track_stack();
++
+ DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
+
+ for (x = 0; x < MAX_DESCRIPTORS; x++) {
+diff -urNp linux-2.6.39/drivers/isdn/hardware/eicon/diddfunc.c linux-2.6.39/drivers/isdn/hardware/eicon/diddfunc.c
+--- linux-2.6.39/drivers/isdn/hardware/eicon/diddfunc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/isdn/hardware/eicon/diddfunc.c 2011-05-22 19:36:31.000000000 -0400
+@@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_di
+ IDI_SYNC_REQ req;
+ DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
+
++ pax_track_stack();
++
+ DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
+
+ for (x = 0; x < MAX_DESCRIPTORS; x++) {
+diff -urNp linux-2.6.39/drivers/isdn/hardware/eicon/divasfunc.c linux-2.6.39/drivers/isdn/hardware/eicon/divasfunc.c
+--- linux-2.6.39/drivers/isdn/hardware/eicon/divasfunc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/isdn/hardware/eicon/divasfunc.c 2011-05-22 19:36:31.000000000 -0400
+@@ -161,6 +161,8 @@ static int DIVA_INIT_FUNCTION connect_di
+ IDI_SYNC_REQ req;
+ DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
+
++ pax_track_stack();
++
+ DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
+
+ for (x = 0; x < MAX_DESCRIPTORS; x++) {
+diff -urNp linux-2.6.39/drivers/isdn/hardware/eicon/idifunc.c linux-2.6.39/drivers/isdn/hardware/eicon/idifunc.c
+--- linux-2.6.39/drivers/isdn/hardware/eicon/idifunc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/isdn/hardware/eicon/idifunc.c 2011-05-22 19:36:31.000000000 -0400
+@@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_di
+ IDI_SYNC_REQ req;
+ DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
+
++ pax_track_stack();
++
+ DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
+
+ for (x = 0; x < MAX_DESCRIPTORS; x++) {
+diff -urNp linux-2.6.39/drivers/isdn/hardware/eicon/message.c linux-2.6.39/drivers/isdn/hardware/eicon/message.c
+--- linux-2.6.39/drivers/isdn/hardware/eicon/message.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/isdn/hardware/eicon/message.c 2011-05-22 19:36:31.000000000 -0400
+@@ -4889,6 +4889,8 @@ static void sig_ind(PLCI *plci)
+ dword d;
+ word w;
+
++ pax_track_stack();
++
+ a = plci->adapter;
+ Id = ((word)plci->Id<<8)|a->Id;
+ PUT_WORD(&SS_Ind[4],0x0000);
+@@ -7484,6 +7486,8 @@ static word add_b1(PLCI *plci, API_PARSE
+ word j, n, w;
+ dword d;
+
++ pax_track_stack();
++
+
+ for(i=0;i<8;i++) bp_parms[i].length = 0;
+ for(i=0;i<2;i++) global_config[i].length = 0;
+@@ -7958,6 +7962,8 @@ static word add_b23(PLCI *plci, API_PARS
+ const byte llc3[] = {4,3,2,2,6,6,0};
+ const byte header[] = {0,2,3,3,0,0,0};
+
++ pax_track_stack();
++
+ for(i=0;i<8;i++) bp_parms[i].length = 0;
+ for(i=0;i<6;i++) b2_config_parms[i].length = 0;
+ for(i=0;i<5;i++) b3_config_parms[i].length = 0;
+@@ -14760,6 +14766,8 @@ static void group_optimization(DIVA_CAPI
+ word appl_number_group_type[MAX_APPL];
+ PLCI *auxplci;
+
++ pax_track_stack();
++
+ 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/drivers/isdn/hardware/eicon/mntfunc.c linux-2.6.39/drivers/isdn/hardware/eicon/mntfunc.c
+--- linux-2.6.39/drivers/isdn/hardware/eicon/mntfunc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/isdn/hardware/eicon/mntfunc.c 2011-05-22 19:36:31.000000000 -0400
+@@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_di
+ IDI_SYNC_REQ req;
+ DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
+
++ pax_track_stack();
++
+ DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
+
+ for (x = 0; x < MAX_DESCRIPTORS; x++) {
+diff -urNp linux-2.6.39/drivers/isdn/i4l/isdn_common.c linux-2.6.39/drivers/isdn/i4l/isdn_common.c
+--- linux-2.6.39/drivers/isdn/i4l/isdn_common.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/isdn/i4l/isdn_common.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1292,6 +1292,8 @@ isdn_ioctl(struct file *file, uint cmd,
+ } iocpar;
+ void __user *argp = (void __user *)arg;
+
++ pax_track_stack();
++
+ #define name iocpar.name
+ #define bname iocpar.bname
+ #define iocts iocpar.iocts
+diff -urNp linux-2.6.39/drivers/isdn/i4l/isdn_net.c linux-2.6.39/drivers/isdn/i4l/isdn_net.c
+--- linux-2.6.39/drivers/isdn/i4l/isdn_net.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/isdn/i4l/isdn_x25iface.c linux-2.6.39/drivers/isdn/i4l/isdn_x25iface.c
+--- linux-2.6.39/drivers/isdn/i4l/isdn_x25iface.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/isdn/i4l/isdn_x25iface.h linux-2.6.39/drivers/isdn/i4l/isdn_x25iface.h
+--- linux-2.6.39/drivers/isdn/i4l/isdn_x25iface.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/isdn/icn/icn.c linux-2.6.39/drivers/isdn/icn/icn.c
+--- linux-2.6.39/drivers/isdn/icn/icn.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/isdn/icn/icn.c 2011-05-22 19:36:31.000000000 -0400
@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len
if (count > len)
count = len;
return -EFAULT;
} else
memcpy(msg, buf, count);
-diff -urNp linux-2.6.38.4/drivers/lguest/core.c linux-2.6.38.4/drivers/lguest/core.c
---- linux-2.6.38.4/drivers/lguest/core.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/lguest/core.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/lguest/core.c linux-2.6.39/drivers/lguest/core.c
+--- linux-2.6.39/drivers/lguest/core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/lguest/core.c 2011-05-22 19:36:31.000000000 -0400
@@ -92,9 +92,17 @@ static __init int map_switcher(void)
* it's worked so far. The end address needs +1 because __get_vm_area
* allocates an extra guard page, so we need space for that.
end_switcher_text - start_switcher_text);
printk(KERN_INFO "lguest: mapped switcher at %p\n",
-diff -urNp linux-2.6.38.4/drivers/lguest/x86/core.c linux-2.6.38.4/drivers/lguest/x86/core.c
---- linux-2.6.38.4/drivers/lguest/x86/core.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/lguest/x86/core.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/lguest/lguest_device.c linux-2.6.39/drivers/lguest/lguest_device.c
+--- linux-2.6.39/drivers/lguest/lguest_device.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/lguest/x86/core.c linux-2.6.39/drivers/lguest/x86/core.c
+--- linux-2.6.39/drivers/lguest/x86/core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/lguest/x86/core.c 2011-05-22 19:36:31.000000000 -0400
@@ -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)
lguest_entry.segment = LGUEST_CS;
/*
-diff -urNp linux-2.6.38.4/drivers/lguest/x86/switcher_32.S linux-2.6.38.4/drivers/lguest/x86/switcher_32.S
---- linux-2.6.38.4/drivers/lguest/x86/switcher_32.S 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/lguest/x86/switcher_32.S 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/lguest/x86/switcher_32.S linux-2.6.39/drivers/lguest/x86/switcher_32.S
+--- linux-2.6.39/drivers/lguest/x86/switcher_32.S 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/lguest/x86/switcher_32.S 2011-05-22 19:36:31.000000000 -0400
@@ -87,6 +87,7 @@
#include <asm/page.h>
#include <asm/segment.h>
// Every interrupt can come to us here
// But we must truly tell each apart.
-diff -urNp linux-2.6.38.4/drivers/md/dm.c linux-2.6.38.4/drivers/md/dm.c
---- linux-2.6.38.4/drivers/md/dm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/md/dm.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/md/dm.c linux-2.6.39/drivers/md/dm.c
+--- linux-2.6.39/drivers/md/dm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/md/dm.c 2011-05-22 19:36:31.000000000 -0400
@@ -162,9 +162,9 @@ struct mapped_device {
/*
* Event handling.
struct list_head uevent_list;
spinlock_t uevent_lock; /* Protect access to uevent_list */
-@@ -1855,8 +1855,8 @@ static struct mapped_device *alloc_dev(i
+@@ -1836,8 +1836,8 @@ static struct mapped_device *alloc_dev(i
rwlock_init(&md->map_lock);
atomic_set(&md->holders, 1);
atomic_set(&md->open_count, 0);
INIT_LIST_HEAD(&md->uevent_list);
spin_lock_init(&md->uevent_lock);
-@@ -1990,7 +1990,7 @@ static void event_callback(void *context
+@@ -1971,7 +1971,7 @@ static void event_callback(void *context
dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
wake_up(&md->eventq);
}
-@@ -2569,18 +2569,18 @@ int dm_kobject_uevent(struct mapped_devi
+@@ -2547,18 +2547,18 @@ int dm_kobject_uevent(struct mapped_devi
uint32_t dm_next_uevent_seq(struct mapped_device *md)
{
}
void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
-diff -urNp linux-2.6.38.4/drivers/md/dm-ioctl.c linux-2.6.38.4/drivers/md/dm-ioctl.c
---- linux-2.6.38.4/drivers/md/dm-ioctl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/md/dm-ioctl.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1541,7 +1541,7 @@ static int validate_params(uint cmd, str
+diff -urNp linux-2.6.39/drivers/md/dm-crypt.c linux-2.6.39/drivers/md/dm-crypt.c
+--- linux-2.6.39/drivers/md/dm-crypt.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/md/dm-ioctl.c linux-2.6.39/drivers/md/dm-ioctl.c
+--- linux-2.6.39/drivers/md/dm-ioctl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/md/dm-ioctl.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1551,7 +1551,7 @@ static int validate_params(uint cmd, str
cmd == DM_LIST_VERSIONS_CMD)
return 0;
if (!*param->name) {
DMWARN("name not supplied when creating device");
return -EINVAL;
-diff -urNp linux-2.6.38.4/drivers/md/dm-raid1.c linux-2.6.38.4/drivers/md/dm-raid1.c
---- linux-2.6.38.4/drivers/md/dm-raid1.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/md/dm-raid1.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/md/dm-raid1.c linux-2.6.39/drivers/md/dm-raid1.c
+--- linux-2.6.39/drivers/md/dm-raid1.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/md/dm-raid1.c 2011-05-22 19:36:31.000000000 -0400
@@ -42,7 +42,7 @@ enum dm_raid1_error {
struct mirror {
m = NULL;
if (likely(m))
-@@ -941,7 +941,7 @@ static int get_mirror(struct mirror_set
+@@ -939,7 +939,7 @@ static int get_mirror(struct mirror_set
}
ms->mirror[mirror].ms = ms;
ms->mirror[mirror].error_type = 0;
ms->mirror[mirror].offset = offset;
-@@ -1349,7 +1349,7 @@ static void mirror_resume(struct dm_targ
+@@ -1347,7 +1347,7 @@ static void mirror_resume(struct dm_targ
*/
static char device_status_char(struct mirror *m)
{
return 'A';
return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
-diff -urNp linux-2.6.38.4/drivers/md/dm-stripe.c linux-2.6.38.4/drivers/md/dm-stripe.c
---- linux-2.6.38.4/drivers/md/dm-stripe.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/md/dm-stripe.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/md/dm-stripe.c linux-2.6.39/drivers/md/dm-stripe.c
+--- linux-2.6.39/drivers/md/dm-stripe.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/md/dm-stripe.c 2011-05-22 19:36:31.000000000 -0400
@@ -20,7 +20,7 @@ struct stripe {
struct dm_dev *dev;
sector_t physical_start;
DM_IO_ERROR_THRESHOLD)
schedule_work(&sc->trigger_event);
}
-diff -urNp linux-2.6.38.4/drivers/md/dm-table.c linux-2.6.38.4/drivers/md/dm-table.c
---- linux-2.6.38.4/drivers/md/dm-table.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/md/dm-table.c 2011-04-28 19:34:15.000000000 -0400
-@@ -372,7 +372,7 @@ static int device_area_is_invalid(struct
+diff -urNp linux-2.6.39/drivers/md/dm-table.c linux-2.6.39/drivers/md/dm-table.c
+--- linux-2.6.39/drivers/md/dm-table.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/md/dm-table.c 2011-05-22 19:36:31.000000000 -0400
+@@ -373,7 +373,7 @@ static int device_area_is_invalid(struct
if (!dev_size)
return 0;
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.38.4/drivers/md/md.c linux-2.6.38.4/drivers/md/md.c
---- linux-2.6.38.4/drivers/md/md.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/md/md.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/md/md.c linux-2.6.39/drivers/md/md.c
+--- linux-2.6.39/drivers/md/md.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/md/md.c 2011-05-22 19:36:31.000000000 -0400
@@ -226,10 +226,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
* start build, activate spare
*/
wake_up(&md_event_waiters);
}
-@@ -1443,7 +1443,7 @@ static int super_1_load(mdk_rdev_t *rdev
+@@ -1454,7 +1454,7 @@ static int super_1_load(mdk_rdev_t *rdev
rdev->preferred_minor = 0xffff;
rdev->data_offset = le64_to_cpu(sb->data_offset);
rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
-@@ -1621,7 +1621,7 @@ static void super_1_sync(mddev_t *mddev,
+@@ -1632,7 +1632,7 @@ static void super_1_sync(mddev_t *mddev,
else
sb->resync_offset = cpu_to_le64(0);
sb->raid_disks = cpu_to_le32(mddev->raid_disks);
sb->size = cpu_to_le64(mddev->dev_sectors);
-@@ -2403,7 +2403,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_sho
+@@ -2414,7 +2414,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_sho
static ssize_t
errors_show(mdk_rdev_t *rdev, char *page)
{
}
static ssize_t
-@@ -2412,7 +2412,7 @@ errors_store(mdk_rdev_t *rdev, const cha
+@@ -2423,7 +2423,7 @@ errors_store(mdk_rdev_t *rdev, const cha
char *e;
unsigned long n = simple_strtoul(buf, &e, 10);
if (*buf && (*e == 0 || *e == '\n')) {
return len;
}
return -EINVAL;
-@@ -2768,8 +2768,8 @@ void md_rdev_init(mdk_rdev_t *rdev)
+@@ -2779,8 +2779,8 @@ void md_rdev_init(mdk_rdev_t *rdev)
rdev->last_read_error.tv_sec = 0;
rdev->last_read_error.tv_nsec = 0;
atomic_set(&rdev->nr_pending, 0);
INIT_LIST_HEAD(&rdev->same_set);
init_waitqueue_head(&rdev->blocked_wait);
-@@ -6373,7 +6373,7 @@ static int md_seq_show(struct seq_file *
+@@ -6383,7 +6383,7 @@ static int md_seq_show(struct seq_file *
spin_unlock(&pers_lock);
seq_printf(seq, "\n");
return 0;
}
if (v == (void*)2) {
-@@ -6462,7 +6462,7 @@ static int md_seq_show(struct seq_file *
+@@ -6472,7 +6472,7 @@ static int md_seq_show(struct seq_file *
chunk_kb ? "KB" : "B");
if (bitmap->file) {
seq_printf(seq, ", file: ");
}
seq_printf(seq, "\n");
-@@ -6496,7 +6496,7 @@ static int md_seq_open(struct inode *ino
+@@ -6506,7 +6506,7 @@ static int md_seq_open(struct inode *ino
else {
struct seq_file *p = file->private_data;
p->private = mi;
}
return error;
}
-@@ -6512,7 +6512,7 @@ static unsigned int mdstat_poll(struct f
+@@ -6522,7 +6522,7 @@ static unsigned int mdstat_poll(struct f
/* always allow read */
mask = POLLIN | POLLRDNORM;
mask |= POLLERR | POLLPRI;
return mask;
}
-@@ -6556,7 +6556,7 @@ static int is_mddev_idle(mddev_t *mddev,
+@@ -6566,7 +6566,7 @@ static int is_mddev_idle(mddev_t *mddev,
struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
(int)part_stat_read(&disk->part0, sectors[1]) -
/* 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.38.4/drivers/md/md.h linux-2.6.38.4/drivers/md/md.h
---- linux-2.6.38.4/drivers/md/md.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/md/md.h 2011-04-28 19:57:25.000000000 -0400
-@@ -117,13 +117,13 @@ struct mdk_rdev_s
+diff -urNp linux-2.6.39/drivers/md/md.h linux-2.6.39/drivers/md/md.h
+--- linux-2.6.39/drivers/md/md.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/md/md.h 2011-05-22 19:36:31.000000000 -0400
+@@ -97,13 +97,13 @@ struct mdk_rdev_s
* only maintained for arrays that
* support hot removal
*/
* for reporting to userspace and storing
* in superblock.
*/
-@@ -360,7 +360,7 @@ static inline void rdev_dec_pending(mdk_
+@@ -342,7 +342,7 @@ static inline void rdev_dec_pending(mdk_
static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
{
}
struct mdk_personality
-diff -urNp linux-2.6.38.4/drivers/md/raid10.c linux-2.6.38.4/drivers/md/raid10.c
---- linux-2.6.38.4/drivers/md/raid10.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/md/raid10.c 2011-04-28 19:57:25.000000000 -0400
-@@ -1258,7 +1258,7 @@ static void end_sync_read(struct bio *bi
+diff -urNp linux-2.6.39/drivers/md/raid10.c linux-2.6.39/drivers/md/raid10.c
+--- linux-2.6.39/drivers/md/raid10.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/md/raid10.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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);
else {
&conf->mirrors[d].rdev->corrected_errors);
if (!test_bit(MD_RECOVERY_SYNC, &conf->mddev->recovery))
md_error(r10_bio->mddev,
-@@ -1466,7 +1466,7 @@ static void check_decay_read_errors(mdde
+@@ -1417,7 +1417,7 @@ static void check_decay_read_errors(mdde
{
struct timespec cur_time_mon;
unsigned long hours_since_last;
ktime_get_ts(&cur_time_mon);
-@@ -1488,9 +1488,9 @@ static void check_decay_read_errors(mdde
+@@ -1439,9 +1439,9 @@ static void check_decay_read_errors(mdde
* overflowing the shift of read_errors by hours_since_last.
*/
if (hours_since_last >= 8 * sizeof(read_errors))
}
/*
-@@ -1525,8 +1525,8 @@ static void fix_read_error(conf_t *conf,
+@@ -1476,8 +1476,8 @@ static void fix_read_error(conf_t *conf,
}
check_decay_read_errors(mddev, rdev);
if (cur_read_error_count > max_read_errors) {
rcu_read_unlock();
printk(KERN_NOTICE
-@@ -1599,7 +1599,7 @@ static void fix_read_error(conf_t *conf,
+@@ -1550,7 +1550,7 @@ static void fix_read_error(conf_t *conf,
test_bit(In_sync, &rdev->flags)) {
atomic_inc(&rdev->nr_pending);
rcu_read_unlock();
if (sync_page_io(rdev,
r10_bio->devs[sl].addr +
sect,
-diff -urNp linux-2.6.38.4/drivers/md/raid1.c linux-2.6.38.4/drivers/md/raid1.c
---- linux-2.6.38.4/drivers/md/raid1.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/md/raid1.c 2011-04-28 19:57:25.000000000 -0400
-@@ -1392,7 +1392,7 @@ static void sync_request_write(mddev_t *
+diff -urNp linux-2.6.39/drivers/md/raid1.c linux-2.6.39/drivers/md/raid1.c
+--- linux-2.6.39/drivers/md/raid1.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/md/raid1.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1342,7 +1342,7 @@ static void sync_request_write(mddev_t *
if (r1_bio->bios[d]->bi_end_io != end_sync_read)
continue;
rdev = conf->mirrors[d].rdev;
if (sync_page_io(rdev,
sect,
s<<9,
-@@ -1538,7 +1538,7 @@ static void fix_read_error(conf_t *conf,
+@@ -1488,7 +1488,7 @@ static void fix_read_error(conf_t *conf,
/* Well, this device is dead */
md_error(mddev, rdev);
else {
printk(KERN_INFO
"md/raid1:%s: read error corrected "
"(%d sectors at %llu on %s)\n",
-diff -urNp linux-2.6.38.4/drivers/md/raid5.c linux-2.6.38.4/drivers/md/raid5.c
---- linux-2.6.38.4/drivers/md/raid5.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/md/raid5.c 2011-04-28 19:57:25.000000000 -0400
-@@ -555,7 +555,7 @@ static void ops_run_io(struct stripe_hea
+diff -urNp linux-2.6.39/drivers/md/raid5.c linux-2.6.39/drivers/md/raid5.c
+--- linux-2.6.39/drivers/md/raid5.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/md/raid5.c 2011-05-22 19:36:31.000000000 -0400
+@@ -550,7 +550,7 @@ static void ops_run_io(struct stripe_hea
bi->bi_next = NULL;
if (rw == WRITE &&
test_bit(R5_ReWrite, &sh->dev[i].flags))
&rdev->corrected_errors);
generic_make_request(bi);
} else {
-@@ -1602,15 +1602,15 @@ static void raid5_end_read_request(struc
+@@ -1596,15 +1596,15 @@ static void raid5_end_read_request(struc
clear_bit(R5_ReadError, &sh->dev[i].flags);
clear_bit(R5_ReWrite, &sh->dev[i].flags);
}
if (conf->mddev->degraded >= conf->max_degraded)
printk_rl(KERN_WARNING
"md/raid:%s: read error not correctable "
-@@ -1628,7 +1628,7 @@ static void raid5_end_read_request(struc
+@@ -1622,7 +1622,7 @@ static void raid5_end_read_request(struc
(unsigned long long)(sh->sector
+ rdev->data_offset),
bdn);
> conf->max_nr_stripes)
printk(KERN_WARNING
"md/raid:%s: Too many read errors, failing device %s.\n",
-diff -urNp linux-2.6.38.4/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.38.4/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-2.6.38.4/drivers/media/dvb/dvb-core/dvbdev.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/media/dvb/dvb-core/dvbdev.c 2011-04-28 19:34:15.000000000 -0400
+@@ -1947,6 +1947,7 @@ static sector_t compute_blocknr(struct s
+ sector_t r_sector;
+ struct stripe_head sh2;
+
++ pax_track_stack();
+
+ chunk_offset = sector_div(new_sector, sectors_per_chunk);
+ stripe = new_sector;
+diff -urNp linux-2.6.39/drivers/media/common/saa7146_hlp.c linux-2.6.39/drivers/media/common/saa7146_hlp.c
+--- linux-2.6.39/drivers/media/common/saa7146_hlp.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/common/saa7146_hlp.c 2011-05-22 19:36:31.000000000 -0400
+@@ -353,6 +353,8 @@ static void calculate_clipping_registers
+
+ int x[32], y[32], w[32], h[32];
+
++ pax_track_stack();
++
+ /* clear out memory */
+ memset(&line_list[0], 0x00, sizeof(u32)*32);
+ memset(&pixel_list[0], 0x00, sizeof(u32)*32);
+diff -urNp linux-2.6.39/drivers/media/common/saa7146_vbi.c linux-2.6.39/drivers/media/common/saa7146_vbi.c
+--- linux-2.6.39/drivers/media/common/saa7146_vbi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/common/saa7146_vbi.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/media/common/saa7146_video.c linux-2.6.39/drivers/media/common/saa7146_video.c
+--- linux-2.6.39/drivers/media/common/saa7146_video.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/media/dvb/dm1105/dm1105.c linux-2.6.39/drivers/media/dvb/dm1105/dm1105.c
+--- linux-2.6.39/drivers/media/dvb/dm1105/dm1105.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-2.6.39/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+--- linux-2.6.39/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-05-22 19:36:31.000000000 -0400
+@@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(stru
+ u8 buf[HOST_LINK_BUF_SIZE];
+ int i;
+
++ pax_track_stack();
++
+ dprintk("%s\n", __func__);
+
+ /* check if we have space for a link buf in the rx_buffer */
+@@ -1285,6 +1287,8 @@ static ssize_t dvb_ca_en50221_io_write(s
+ unsigned long timeout;
+ int written;
+
++ pax_track_stack();
++
+ 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/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.39/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-2.6.39/drivers/media/dvb/dvb-core/dvbdev.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/dvb/dvb-core/dvbdev.c 2011-05-22 19:36:31.000000000 -0400
@@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapt
const struct dvb_device *template, void *priv, int type)
{
struct device *clsdev;
int minor;
int id;
-diff -urNp linux-2.6.38.4/drivers/media/radio/radio-cadet.c linux-2.6.38.4/drivers/media/radio/radio-cadet.c
---- linux-2.6.38.4/drivers/media/radio/radio-cadet.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/media/radio/radio-cadet.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2.6.39/drivers/media/dvb/dvb-usb/dib0700_core.c
+--- linux-2.6.39/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-05-22 19:36:31.000000000 -0400
+@@ -391,6 +391,8 @@ int dib0700_download_firmware(struct usb
+
+ u8 buf[260];
+
++ pax_track_stack();
++
+ 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/drivers/media/dvb/dvb-usb/lmedm04.c linux-2.6.39/drivers/media/dvb/dvb-usb/lmedm04.c
+--- linux-2.6.39/drivers/media/dvb/dvb-usb/lmedm04.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/dvb/dvb-usb/lmedm04.c 2011-05-22 19:36:31.000000000 -0400
+@@ -663,6 +663,7 @@ static int lme2510_download_firmware(str
+ packet_size = 0x31;
+ len_in = 1;
+
++ pax_track_stack();
+
+ info("FRM Starting Firmware Download");
+
+@@ -715,6 +716,8 @@ static void lme_coldreset(struct usb_dev
+ int ret = 0, len_in;
+ u8 data[512] = {0};
+
++ pax_track_stack();
++
+ data[0] = 0x0a;
+ len_in = 1;
+ info("FRM Firmware Cold Reset");
+diff -urNp linux-2.6.39/drivers/media/dvb/frontends/dib7000p.c linux-2.6.39/drivers/media/dvb/frontends/dib7000p.c
+--- linux-2.6.39/drivers/media/dvb/frontends/dib7000p.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/dvb/frontends/dib7000p.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1913,7 +1913,7 @@ static u32 dib7000p_i2c_func(struct i2c_
+ 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/drivers/media/dvb/frontends/dib9000.c linux-2.6.39/drivers/media/dvb/frontends/dib9000.c
+--- linux-2.6.39/drivers/media/dvb/frontends/dib9000.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/dvb/frontends/dib9000.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1649,12 +1649,12 @@ static u32 dib9000_i2c_func(struct i2c_a
+ 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/drivers/media/dvb/frontends/dibx000_common.c linux-2.6.39/drivers/media/dvb/frontends/dibx000_common.c
+--- linux-2.6.39/drivers/media/dvb/frontends/dibx000_common.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/dvb/frontends/dibx000_common.c 2011-05-22 19:36:31.000000000 -0400
+@@ -212,12 +212,12 @@ static int dibx000_i2c_master_xfer_gpio3
+ 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,
+ };
+@@ -270,7 +270,7 @@ static int dibx000_i2c_gated_gpio67_xfer
+ return i2c_transfer(mst->i2c_adap, m, 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,
+ };
+@@ -301,7 +301,7 @@ static int dibx000_i2c_gated_tuner_xfer(
+ return i2c_transfer(mst->i2c_adap, m, 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,
+ };
+@@ -354,7 +354,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/drivers/media/dvb/frontends/mb86a16.c linux-2.6.39/drivers/media/dvb/frontends/mb86a16.c
+--- linux-2.6.39/drivers/media/dvb/frontends/mb86a16.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/dvb/frontends/mb86a16.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1060,6 +1060,8 @@ static int mb86a16_set_fe(struct mb86a16
+ int ret = -1;
+ int sync;
+
++ pax_track_stack();
++
+ dprintk(verbose, MB86A16_INFO, 1, "freq=%d Mhz, symbrt=%d Ksps", state->frequency, state->srate);
+
+ fcp = 3000;
+diff -urNp linux-2.6.39/drivers/media/dvb/frontends/or51211.c linux-2.6.39/drivers/media/dvb/frontends/or51211.c
+--- linux-2.6.39/drivers/media/dvb/frontends/or51211.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/dvb/frontends/or51211.c 2011-05-22 19:36:31.000000000 -0400
+@@ -113,6 +113,8 @@ static int or51211_load_firmware (struct
+ u8 tudata[585];
+ int i;
+
++ pax_track_stack();
++
+ dprintk("Firmware is %zd bytes\n",fw->size);
+
+ /* Get eprom data */
+diff -urNp linux-2.6.39/drivers/media/dvb/frontends/s5h1420.c linux-2.6.39/drivers/media/dvb/frontends/s5h1420.c
+--- linux-2.6.39/drivers/media/dvb/frontends/s5h1420.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/dvb/frontends/s5h1420.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/media/dvb/mantis/mantis_i2c.c linux-2.6.39/drivers/media/dvb/mantis/mantis_i2c.c
+--- linux-2.6.39/drivers/media/dvb/mantis/mantis_i2c.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/dvb/mantis/mantis_i2c.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/media/dvb/ttusb-dec/ttusb_dec.c linux-2.6.39/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+--- linux-2.6.39/drivers/media/dvb/ttusb-dec/ttusb_dec.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/media/radio/radio-cadet.c linux-2.6.39/drivers/media/radio/radio-cadet.c
+--- linux-2.6.39/drivers/media/radio/radio-cadet.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/radio/radio-cadet.c 2011-05-22 19:36:31.000000000 -0400
@@ -349,7 +349,7 @@ static ssize_t cadet_read(struct file *f
readbuf[i++] = dev->rdsbuf[dev->rdsout++];
mutex_unlock(&dev->lock);
return -EFAULT;
return i;
}
-diff -urNp linux-2.6.38.4/drivers/media/rc/ir-lirc-codec.c linux-2.6.38.4/drivers/media/rc/ir-lirc-codec.c
---- linux-2.6.38.4/drivers/media/rc/ir-lirc-codec.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/media/rc/ir-lirc-codec.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/media/radio/radio-si4713.c linux-2.6.39/drivers/media/radio/radio-si4713.c
+--- linux-2.6.39/drivers/media/radio/radio-si4713.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/radio/radio-si4713.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/media/rc/ir-lirc-codec.c linux-2.6.39/drivers/media/rc/ir-lirc-codec.c
+--- linux-2.6.39/drivers/media/rc/ir-lirc-codec.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
}
.owner = THIS_MODULE,
.write = ir_lirc_transmit_ir,
.unlocked_ioctl = ir_lirc_ioctl,
-diff -urNp linux-2.6.38.4/drivers/media/rc/lirc_dev.c linux-2.6.38.4/drivers/media/rc/lirc_dev.c
---- linux-2.6.38.4/drivers/media/rc/lirc_dev.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/media/rc/lirc_dev.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/media/rc/lirc_dev.c linux-2.6.39/drivers/media/rc/lirc_dev.c
+--- linux-2.6.39/drivers/media/rc/lirc_dev.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/rc/lirc_dev.c 2011-05-22 19:36:31.000000000 -0400
@@ -151,7 +151,7 @@ static int lirc_thread(void *irctl)
}
.owner = THIS_MODULE,
.read = lirc_dev_fop_read,
.write = lirc_dev_fop_write,
-diff -urNp linux-2.6.38.4/drivers/media/rc/rc-main.c linux-2.6.38.4/drivers/media/rc/rc-main.c
---- linux-2.6.38.4/drivers/media/rc/rc-main.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/media/rc/rc-main.c 2011-04-28 19:57:25.000000000 -0400
-@@ -994,7 +994,7 @@ EXPORT_SYMBOL_GPL(rc_free_device);
+diff -urNp linux-2.6.39/drivers/media/rc/rc-main.c linux-2.6.39/drivers/media/rc/rc-main.c
+--- linux-2.6.39/drivers/media/rc/rc-main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/rc/rc-main.c 2011-05-22 19:36:31.000000000 -0400
+@@ -996,7 +996,7 @@ EXPORT_SYMBOL_GPL(rc_free_device);
int rc_register_device(struct rc_dev *dev)
{
struct rc_map *rc_map;
const char *path;
int rc;
-@@ -1017,7 +1017,7 @@ int rc_register_device(struct rc_dev *de
+@@ -1019,7 +1019,7 @@ int rc_register_device(struct rc_dev *de
if (dev->close)
dev->input_dev->close = ir_close;
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.38.4/drivers/media/video/cx18/cx18-driver.c linux-2.6.38.4/drivers/media/video/cx18/cx18-driver.c
---- linux-2.6.38.4/drivers/media/video/cx18/cx18-driver.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/media/video/cx18/cx18-driver.c 2011-04-28 19:57:25.000000000 -0400
-@@ -60,7 +60,7 @@ static struct pci_device_id cx18_pci_tbl
+diff -urNp linux-2.6.39/drivers/media/video/au0828/au0828.h linux-2.6.39/drivers/media/video/au0828/au0828.h
+--- linux-2.6.39/drivers/media/video/au0828/au0828.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/au0828/au0828.h 2011-05-22 19:36:31.000000000 -0400
+@@ -191,7 +191,7 @@ struct au0828_dev {
+
+ /* I2C */
+ struct i2c_adapter i2c_adap;
+- struct i2c_algorithm i2c_algo;
++ struct i2c_algorithm i2c_algo;
+ struct i2c_client i2c_client;
+ u32 i2c_rc;
+
+diff -urNp linux-2.6.39/drivers/media/video/cafe_ccic.c linux-2.6.39/drivers/media/video/cafe_ccic.c
+--- linux-2.6.39/drivers/media/video/cafe_ccic.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/media/video/cx18/cx18-alsa-pcm.c linux-2.6.39/drivers/media/video/cx18/cx18-alsa-pcm.c
+--- linux-2.6.39/drivers/media/video/cx18/cx18-alsa-pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/cx18/cx18-alsa-pcm.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/media/video/cx18/cx18-driver.c linux-2.6.39/drivers/media/video/cx18/cx18-driver.c
+--- linux-2.6.39/drivers/media/video/cx18/cx18-driver.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/cx18/cx18-driver.c 2011-05-22 19:36:31.000000000 -0400
+@@ -61,7 +61,7 @@ static struct pci_device_id cx18_pci_tbl
MODULE_DEVICE_TABLE(pci, cx18_pci_tbl);
/* Parameter declarations */
static int cardtype[CX18_MAX_CARDS];
-@@ -884,7 +884,7 @@ static int __devinit cx18_probe(struct p
+@@ -327,6 +327,8 @@ void cx18_read_eeprom(struct cx18 *cx, s
+ struct i2c_client c;
+ u8 eedata[256];
+
++ pax_track_stack();
++
+ memset(&c, 0, sizeof(c));
+ strlcpy(c.name, "cx18 tveeprom tmp", sizeof(c.name));
+ c.adapter = &cx->i2c_adap[0];
+@@ -892,7 +894,7 @@ static int __devinit cx18_probe(struct p
struct cx18 *cx;
/* FIXME - module parameter arrays constrain max instances */
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.38.4/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.38.4/drivers/media/video/ivtv/ivtv-driver.c
---- linux-2.6.38.4/drivers/media/video/ivtv/ivtv-driver.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/media/video/ivtv/ivtv-driver.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/media/video/cx231xx/cx231xx-audio.c linux-2.6.39/drivers/media/video/cx231xx/cx231xx-audio.c
+--- linux-2.6.39/drivers/media/video/cx231xx/cx231xx-audio.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/cx231xx/cx231xx-audio.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/media/video/cx231xx/cx231xx-i2c.c linux-2.6.39/drivers/media/video/cx231xx/cx231xx-i2c.c
+--- linux-2.6.39/drivers/media/video/cx231xx/cx231xx-i2c.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/cx231xx/cx231xx-i2c.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/media/video/cx23885/cx23885-input.c linux-2.6.39/drivers/media/video/cx23885/cx23885-input.c
+--- linux-2.6.39/drivers/media/video/cx23885/cx23885-input.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/cx23885/cx23885-input.c 2011-05-22 19:36:31.000000000 -0400
+@@ -53,6 +53,8 @@ static void cx23885_input_process_measur
+ bool handle = false;
+ struct ir_raw_event ir_core_event[64];
+
++ pax_track_stack();
++
+ do {
+ num = 0;
+ v4l2_subdev_call(dev->sd_ir, ir, rx_read, (u8 *) ir_core_event,
+diff -urNp linux-2.6.39/drivers/media/video/cx88/cx88-alsa.c linux-2.6.39/drivers/media/video/cx88/cx88-alsa.c
+--- linux-2.6.39/drivers/media/video/cx88/cx88-alsa.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/media/video/davinci/ccdc_hw_device.h linux-2.6.39/drivers/media/video/davinci/ccdc_hw_device.h
+--- linux-2.6.39/drivers/media/video/davinci/ccdc_hw_device.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/davinci/ccdc_hw_device.h 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/media/video/davinci/vpss.c linux-2.6.39/drivers/media/video/davinci/vpss.c
+--- linux-2.6.39/drivers/media/video/davinci/vpss.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/davinci/vpss.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/media/video/em28xx/em28xx-audio.c linux-2.6.39/drivers/media/video/em28xx/em28xx-audio.c
+--- linux-2.6.39/drivers/media/video/em28xx/em28xx-audio.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/em28xx/em28xx-audio.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/media/video/em28xx/em28xx-i2c.c linux-2.6.39/drivers/media/video/em28xx/em28xx-i2c.c
+--- linux-2.6.39/drivers/media/video/em28xx/em28xx-i2c.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/media/video/hdpvr/hdpvr-i2c.c linux-2.6.39/drivers/media/video/hdpvr/hdpvr-i2c.c
+--- linux-2.6.39/drivers/media/video/hdpvr/hdpvr-i2c.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/hdpvr/hdpvr-i2c.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/media/video/imx074.c linux-2.6.39/drivers/media/video/imx074.c
+--- linux-2.6.39/drivers/media/video/imx074.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.39/drivers/media/video/ivtv/ivtv-driver.c
+--- linux-2.6.39/drivers/media/video/ivtv/ivtv-driver.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/ivtv/ivtv-driver.c 2011-05-22 19:36:31.000000000 -0400
@@ -80,7 +80,7 @@ static struct pci_device_id ivtv_pci_tbl
MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
/* Parameter declarations */
static int cardtype[IVTV_MAX_CARDS];
-diff -urNp linux-2.6.38.4/drivers/media/video/omap24xxcam.c linux-2.6.38.4/drivers/media/video/omap24xxcam.c
---- linux-2.6.38.4/drivers/media/video/omap24xxcam.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/media/video/omap24xxcam.c 2011-04-28 19:57:25.000000000 -0400
-@@ -402,7 +402,7 @@ static void omap24xxcam_vbq_complete(str
+diff -urNp linux-2.6.39/drivers/media/video/mt9m001.c linux-2.6.39/drivers/media/video/mt9m001.c
+--- linux-2.6.39/drivers/media/video/mt9m001.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/media/video/mt9t031.c linux-2.6.39/drivers/media/video/mt9t031.c
+--- linux-2.6.39/drivers/media/video/mt9t031.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/media/video/mt9v022.c linux-2.6.39/drivers/media/video/mt9v022.c
+--- linux-2.6.39/drivers/media/video/mt9v022.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/media/video/mx2_camera.c linux-2.6.39/drivers/media/video/mx2_camera.c
+--- linux-2.6.39/drivers/media/video/mx2_camera.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/media/video/omap24xxcam.c linux-2.6.39/drivers/media/video/omap24xxcam.c
+--- linux-2.6.39/drivers/media/video/omap24xxcam.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/omap24xxcam.c 2011-05-22 19:36:31.000000000 -0400
+@@ -403,7 +403,7 @@ static void omap24xxcam_vbq_complete(str
spin_unlock_irqrestore(&cam->core_enable_disable_lock, flags);
do_gettimeofday(&vb->ts);
if (csr & csr_error) {
vb->state = VIDEOBUF_ERROR;
if (!atomic_read(&fh->cam->in_reset)) {
-diff -urNp linux-2.6.38.4/drivers/media/video/omap24xxcam.h linux-2.6.38.4/drivers/media/video/omap24xxcam.h
---- linux-2.6.38.4/drivers/media/video/omap24xxcam.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/media/video/omap24xxcam.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/media/video/omap24xxcam.h linux-2.6.39/drivers/media/video/omap24xxcam.h
+--- linux-2.6.39/drivers/media/video/omap24xxcam.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/omap24xxcam.h 2011-05-22 19:36:31.000000000 -0400
@@ -533,7 +533,7 @@ struct omap24xxcam_fh {
spinlock_t vbq_lock; /* spinlock for the videobuf queue */
struct videobuf_queue vbq;
/* accessing cam here doesn't need serialisation: it's constant */
struct omap24xxcam_device *cam;
};
-diff -urNp linux-2.6.38.4/drivers/media/video/v4l2-device.c linux-2.6.38.4/drivers/media/video/v4l2-device.c
---- linux-2.6.38.4/drivers/media/video/v4l2-device.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/media/video/v4l2-device.c 2011-04-28 19:57:25.000000000 -0400
-@@ -55,9 +55,9 @@ int v4l2_device_register(struct device *
- EXPORT_SYMBOL_GPL(v4l2_device_register);
+diff -urNp linux-2.6.39/drivers/media/video/omap3isp/isp.h linux-2.6.39/drivers/media/video/omap3isp/isp.h
+--- linux-2.6.39/drivers/media/video/omap3isp/isp.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/omap3isp/isp.h 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/media/video/ov2640.c linux-2.6.39/drivers/media/video/ov2640.c
+--- linux-2.6.39/drivers/media/video/ov2640.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/media/video/ov772x.c linux-2.6.39/drivers/media/video/ov772x.c
+--- linux-2.6.39/drivers/media/video/ov772x.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-2.6.39/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
+--- linux-2.6.39/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-05-22 19:36:31.000000000 -0400
+@@ -120,6 +120,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw
+ u8 *eeprom;
+ struct tveeprom tvdata;
+
++ pax_track_stack();
++
+ memset(&tvdata,0,sizeof(tvdata));
+
+ eeprom = pvr2_eeprom_fetch(hdw);
+diff -urNp linux-2.6.39/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c linux-2.6.39/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+--- linux-2.6.39/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/media/video/rj54n1cb0c.c linux-2.6.39/drivers/media/video/rj54n1cb0c.c
+--- linux-2.6.39/drivers/media/video/rj54n1cb0c.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/media/video/s5p-fimc/fimc-capture.c linux-2.6.39/drivers/media/video/s5p-fimc/fimc-capture.c
+--- linux-2.6.39/drivers/media/video/s5p-fimc/fimc-capture.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/s5p-fimc/fimc-capture.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/media/video/s5p-fimc/fimc-core.c linux-2.6.39/drivers/media/video/s5p-fimc/fimc-core.c
+--- linux-2.6.39/drivers/media/video/s5p-fimc/fimc-core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/s5p-fimc/fimc-core.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/media/video/saa7134/saa6752hs.c linux-2.6.39/drivers/media/video/saa7134/saa6752hs.c
+--- linux-2.6.39/drivers/media/video/saa7134/saa6752hs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/saa7134/saa6752hs.c 2011-05-22 19:36:31.000000000 -0400
+@@ -682,6 +682,8 @@ static int saa6752hs_init(struct v4l2_su
+ unsigned char localPAT[256];
+ unsigned char localPMT[256];
+
++ pax_track_stack();
++
+ /* 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/drivers/media/video/saa7134/saa7134-alsa.c linux-2.6.39/drivers/media/video/saa7134/saa7134-alsa.c
+--- linux-2.6.39/drivers/media/video/saa7134/saa7134-alsa.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/media/video/saa7164/saa7164-cmd.c linux-2.6.39/drivers/media/video/saa7164/saa7164-cmd.c
+--- linux-2.6.39/drivers/media/video/saa7164/saa7164-cmd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/saa7164/saa7164-cmd.c 2011-05-22 19:36:31.000000000 -0400
+@@ -88,6 +88,8 @@ int saa7164_irq_dequeue(struct saa7164_d
+ u8 tmp[512];
+ dprintk(DBGLVL_CMD, "%s()\n", __func__);
+
++ pax_track_stack();
++
+ /* While any outstand message on the bus exists... */
+ do {
+
+@@ -141,6 +143,8 @@ int saa7164_cmd_dequeue(struct saa7164_d
+ u8 tmp[512];
+ dprintk(DBGLVL_CMD, "%s()\n", __func__);
+
++ pax_track_stack();
++
+ while (loop) {
+
+ struct tmComResInfo tRsp = { 0, 0, 0, 0, 0, 0 };
+diff -urNp linux-2.6.39/drivers/media/video/sh_mobile_csi2.c linux-2.6.39/drivers/media/video/sh_mobile_csi2.c
+--- linux-2.6.39/drivers/media/video/sh_mobile_csi2.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
+ }
+
+-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,
+ };
+
+-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/drivers/media/video/soc_camera_platform.c linux-2.6.39/drivers/media/video/soc_camera_platform.c
+--- linux-2.6.39/drivers/media/video/soc_camera_platform.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/soc_camera_platform.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/media/video/tlg2300/pd-alsa.c linux-2.6.39/drivers/media/video/tlg2300/pd-alsa.c
+--- linux-2.6.39/drivers/media/video/tlg2300/pd-alsa.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/tlg2300/pd-alsa.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/media/video/tw9910.c linux-2.6.39/drivers/media/video/tw9910.c
+--- linux-2.6.39/drivers/media/video/tw9910.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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 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/drivers/media/video/usbvision/usbvision-core.c linux-2.6.39/drivers/media/video/usbvision/usbvision-core.c
+--- linux-2.6.39/drivers/media/video/usbvision/usbvision-core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/usbvision/usbvision-core.c 2011-05-22 19:36:31.000000000 -0400
+@@ -799,6 +799,8 @@ static enum parse_state usbvision_parse_
+ unsigned char rv, gv, bv;
+ static unsigned char *Y, *U, *V;
+
++ pax_track_stack();
++
+ 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/drivers/media/video/usbvision/usbvision-i2c.c linux-2.6.39/drivers/media/video/usbvision/usbvision-i2c.c
+--- linux-2.6.39/drivers/media/video/usbvision/usbvision-i2c.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/media/video/v4l2-device.c linux-2.6.39/drivers/media/video/v4l2-device.c
+--- linux-2.6.39/drivers/media/video/v4l2-device.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/v4l2-device.c 2011-05-22 19:36:31.000000000 -0400
+@@ -71,9 +71,9 @@ int v4l2_device_put(struct v4l2_device *
+ EXPORT_SYMBOL_GPL(v4l2_device_put);
int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
- atomic_t *instance)
int len = strlen(basename);
if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
-diff -urNp linux-2.6.38.4/drivers/message/fusion/mptbase.c linux-2.6.38.4/drivers/message/fusion/mptbase.c
---- linux-2.6.38.4/drivers/message/fusion/mptbase.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/message/fusion/mptbase.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/media/video/videobuf-dma-sg.c linux-2.6.39/drivers/media/video/videobuf-dma-sg.c
+--- linux-2.6.39/drivers/media/video/videobuf-dma-sg.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/media/video/videobuf-dma-sg.c 2011-05-22 19:36:31.000000000 -0400
+@@ -606,6 +606,8 @@ void *videobuf_sg_alloc(size_t size)
+ {
+ struct videobuf_queue q;
+
++ pax_track_stack();
++
+ /* Required to make generic handler to call __videobuf_alloc */
+ q.int_ops = &sg_ops;
+
+diff -urNp linux-2.6.39/drivers/message/fusion/mptbase.c linux-2.6.39/drivers/message/fusion/mptbase.c
+--- linux-2.6.39/drivers/message/fusion/mptbase.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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)
@@ -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);
/*
* Rounding UP to nearest 4-kB boundary here...
*/
-diff -urNp linux-2.6.38.4/drivers/message/fusion/mptsas.c linux-2.6.38.4/drivers/message/fusion/mptsas.c
---- linux-2.6.38.4/drivers/message/fusion/mptsas.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/message/fusion/mptsas.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/message/fusion/mptbase.h linux-2.6.39/drivers/message/fusion/mptbase.h
+--- linux-2.6.39/drivers/message/fusion/mptbase.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/message/fusion/mptctl.c linux-2.6.39/drivers/message/fusion/mptctl.c
+--- linux-2.6.39/drivers/message/fusion/mptctl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/message/fusion/mptsas.c linux-2.6.39/drivers/message/fusion/mptsas.c
+--- linux-2.6.39/drivers/message/fusion/mptsas.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/message/fusion/mptsas.c 2011-05-22 19:36:31.000000000 -0400
@@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin
return 0;
}
static inline struct sas_port *
mptsas_get_port(struct mptsas_phyinfo *phy_info)
{
-diff -urNp linux-2.6.38.4/drivers/message/fusion/mptscsih.c linux-2.6.38.4/drivers/message/fusion/mptscsih.c
---- linux-2.6.38.4/drivers/message/fusion/mptscsih.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/message/fusion/mptscsih.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/message/fusion/mptscsih.c linux-2.6.39/drivers/message/fusion/mptscsih.c
+--- linux-2.6.39/drivers/message/fusion/mptscsih.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/message/fusion/mptscsih.c 2011-05-22 19:36:31.000000000 -0400
@@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost)
h = shost_priv(SChost);
return h->info_kbuf;
}
-diff -urNp linux-2.6.38.4/drivers/message/i2o/i2o_proc.c linux-2.6.38.4/drivers/message/i2o/i2o_proc.c
---- linux-2.6.38.4/drivers/message/i2o/i2o_proc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/message/i2o/i2o_proc.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/message/i2o/i2o_config.c linux-2.6.39/drivers/message/i2o/i2o_config.c
+--- linux-2.6.39/drivers/message/i2o/i2o_config.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/message/i2o/i2o_config.c 2011-05-22 19:36:31.000000000 -0400
+@@ -781,6 +781,8 @@ static int i2o_cfg_passthru(unsigned lon
+ struct i2o_message *msg;
+ unsigned int iop;
+
++ pax_track_stack();
++
+ if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg))
+ return -EFAULT;
+
+diff -urNp linux-2.6.39/drivers/message/i2o/i2o_proc.c linux-2.6.39/drivers/message/i2o/i2o_proc.c
+--- linux-2.6.39/drivers/message/i2o/i2o_proc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/message/i2o/i2o_proc.c 2011-05-22 19:36:31.000000000 -0400
@@ -255,13 +255,6 @@ static char *scsi_devices[] = {
"Array Controller Device"
};
return 0;
}
-diff -urNp linux-2.6.38.4/drivers/message/i2o/iop.c linux-2.6.38.4/drivers/message/i2o/iop.c
---- linux-2.6.38.4/drivers/message/i2o/iop.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/message/i2o/iop.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/message/i2o/iop.c linux-2.6.39/drivers/message/i2o/iop.c
+--- linux-2.6.39/drivers/message/i2o/iop.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/message/i2o/iop.c 2011-05-22 19:36:31.000000000 -0400
@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro
spin_lock_irqsave(&c->context_list_lock, flags);
INIT_LIST_HEAD(&c->context_list);
#endif
-diff -urNp linux-2.6.38.4/drivers/mfd/janz-cmodio.c linux-2.6.38.4/drivers/mfd/janz-cmodio.c
---- linux-2.6.38.4/drivers/mfd/janz-cmodio.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/mfd/janz-cmodio.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/mfd/ab3100-core.c linux-2.6.39/drivers/mfd/ab3100-core.c
+--- linux-2.6.39/drivers/mfd/ab3100-core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mfd/ab3100-core.c 2011-05-22 19:36:31.000000000 -0400
+@@ -385,7 +385,7 @@ static int ab3100_event_registers_startu
+ return 0;
+ }
+
+-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/drivers/mfd/ab3550-core.c linux-2.6.39/drivers/mfd/ab3550-core.c
+--- linux-2.6.39/drivers/mfd/ab3550-core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mfd/ab3550-core.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/mfd/ab8500-core.c linux-2.6.39/drivers/mfd/ab8500-core.c
+--- linux-2.6.39/drivers/mfd/ab8500-core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mfd/ab8500-core.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/mfd/abx500-core.c linux-2.6.39/drivers/mfd/abx500-core.c
+--- linux-2.6.39/drivers/mfd/abx500-core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mfd/abx500-core.c 2011-05-22 19:36:31.000000000 -0400
+@@ -18,7 +18,7 @@ struct abx500_device_entry {
+ 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/drivers/mfd/janz-cmodio.c linux-2.6.39/drivers/mfd/janz-cmodio.c
+--- linux-2.6.39/drivers/mfd/janz-cmodio.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mfd/janz-cmodio.c 2011-05-22 19:36:31.000000000 -0400
@@ -13,6 +13,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/interrupt.h>
-diff -urNp linux-2.6.38.4/drivers/misc/kgdbts.c linux-2.6.38.4/drivers/misc/kgdbts.c
---- linux-2.6.38.4/drivers/misc/kgdbts.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/misc/kgdbts.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/mfd/mcp-sa11x0.c linux-2.6.39/drivers/mfd/mcp-sa11x0.c
+--- linux-2.6.39/drivers/mfd/mcp-sa11x0.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mfd/mcp-sa11x0.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/mfd/wm8350-i2c.c linux-2.6.39/drivers/mfd/wm8350-i2c.c
+--- linux-2.6.39/drivers/mfd/wm8350-i2c.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mfd/wm8350-i2c.c 2011-05-22 19:36:31.000000000 -0400
+@@ -44,6 +44,8 @@ static int wm8350_i2c_write_device(struc
+ u8 msg[(WM8350_MAX_REGISTER << 1) + 1];
+ int ret;
+
++ pax_track_stack();
++
+ if (bytes > ((WM8350_MAX_REGISTER << 1) + 1))
+ return -EINVAL;
+
+diff -urNp linux-2.6.39/drivers/misc/enclosure.c linux-2.6.39/drivers/misc/enclosure.c
+--- linux-2.6.39/drivers/misc/enclosure.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/misc/enclosure.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/misc/kgdbts.c linux-2.6.39/drivers/misc/kgdbts.c
+--- linux-2.6.39/drivers/misc/kgdbts.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/misc/kgdbts.c 2011-05-22 19:36:31.000000000 -0400
@@ -118,7 +118,7 @@
} while (0)
#define MAX_CONFIG_LEN 40
.name = "kgdbts",
.read_char = kgdbts_get_char,
.write_char = kgdbts_put_char,
-diff -urNp linux-2.6.38.4/drivers/misc/sgi-gru/gruhandles.c linux-2.6.38.4/drivers/misc/sgi-gru/gruhandles.c
---- linux-2.6.38.4/drivers/misc/sgi-gru/gruhandles.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/misc/sgi-gru/gruhandles.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/misc/lis3lv02d/lis3lv02d.c linux-2.6.39/drivers/misc/lis3lv02d/lis3lv02d.c
+--- linux-2.6.39/drivers/misc/lis3lv02d/lis3lv02d.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/misc/lis3lv02d/lis3lv02d.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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.
+ */
+- atomic_inc(&lis3_dev.count);
++ atomic_inc_unchecked(&lis3_dev.count);
+
+ wake_up_interruptible(&lis3_dev.misc_wait);
+ kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN);
+@@ -518,7 +518,7 @@ static int lis3lv02d_misc_open(struct in
+ if (lis3_dev.pm_dev)
+ pm_runtime_get_sync(lis3_dev.pm_dev);
+
+- atomic_set(&lis3_dev.count, 0);
++ atomic_set_unchecked(&lis3_dev.count, 0);
+ return 0;
+ }
+
+@@ -545,7 +545,7 @@ static ssize_t lis3lv02d_misc_read(struc
+ add_wait_queue(&lis3_dev.misc_wait, &wait);
+ while (true) {
+ set_current_state(TASK_INTERRUPTIBLE);
+- data = atomic_xchg(&lis3_dev.count, 0);
++ data = atomic_xchg_unchecked(&lis3_dev.count, 0);
+ if (data)
+ break;
+
+@@ -583,7 +583,7 @@ out:
+ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
+ {
+ poll_wait(file, &lis3_dev.misc_wait, wait);
+- if (atomic_read(&lis3_dev.count))
++ if (atomic_read_unchecked(&lis3_dev.count))
+ return POLLIN | POLLRDNORM;
+ return 0;
+ }
+diff -urNp linux-2.6.39/drivers/misc/lis3lv02d/lis3lv02d.h linux-2.6.39/drivers/misc/lis3lv02d/lis3lv02d.h
+--- linux-2.6.39/drivers/misc/lis3lv02d/lis3lv02d.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/misc/lis3lv02d/lis3lv02d.h 2011-05-22 19:36:31.000000000 -0400
+@@ -265,7 +265,7 @@ struct lis3lv02d {
+ struct input_polled_dev *idev; /* input device */
+ struct platform_device *pdev; /* platform device */
+ struct regulator_bulk_data regulators[2];
+- atomic_t count; /* interrupt count after last read */
++ atomic_unchecked_t count; /* interrupt count after last read */
+ union axis_conversion ac; /* hw -> logical axis */
+ int mapped_btns[3];
+
+diff -urNp linux-2.6.39/drivers/misc/sgi-gru/gruhandles.c linux-2.6.39/drivers/misc/sgi-gru/gruhandles.c
+--- linux-2.6.39/drivers/misc/sgi-gru/gruhandles.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/misc/sgi-gru/gruhandles.c 2011-05-22 19:36:31.000000000 -0400
@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op
unsigned long nsec;
if (mcs_op_statistics[op].max < nsec)
mcs_op_statistics[op].max = nsec;
}
-diff -urNp linux-2.6.38.4/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.38.4/drivers/misc/sgi-gru/gruprocfs.c
---- linux-2.6.38.4/drivers/misc/sgi-gru/gruprocfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/misc/sgi-gru/gruprocfs.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.39/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-2.6.39/drivers/misc/sgi-gru/gruprocfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/misc/sgi-gru/gruprocfs.c 2011-05-22 19:36:31.000000000 -0400
@@ -32,9 +32,9 @@
#define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
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.38.4/drivers/misc/sgi-gru/grutables.h linux-2.6.38.4/drivers/misc/sgi-gru/grutables.h
---- linux-2.6.38.4/drivers/misc/sgi-gru/grutables.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/misc/sgi-gru/grutables.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/misc/sgi-gru/grutables.h linux-2.6.39/drivers/misc/sgi-gru/grutables.h
+--- linux-2.6.39/drivers/misc/sgi-gru/grutables.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/misc/sgi-gru/grutables.h 2011-05-22 19:36:31.000000000 -0400
@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
* GRU statistics.
*/
} while (0)
#ifdef CONFIG_SGI_GRU_DEBUG
-diff -urNp linux-2.6.38.4/drivers/mtd/devices/doc2000.c linux-2.6.38.4/drivers/mtd/devices/doc2000.c
---- linux-2.6.38.4/drivers/mtd/devices/doc2000.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/mtd/devices/doc2000.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/misc/sgi-xp/xpc_sn2.c linux-2.6.39/drivers/misc/sgi-xp/xpc_sn2.c
+--- linux-2.6.39/drivers/misc/sgi-xp/xpc_sn2.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/misc/sgi-xp/xpc_uv.c linux-2.6.39/drivers/misc/sgi-xp/xpc_uv.c
+--- linux-2.6.39/drivers/misc/sgi-xp/xpc_uv.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/misc/spear13xx_pcie_gadget.c linux-2.6.39/drivers/misc/spear13xx_pcie_gadget.c
+--- linux-2.6.39/drivers/misc/spear13xx_pcie_gadget.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/mmc/host/davinci_mmc.c linux-2.6.39/drivers/mmc/host/davinci_mmc.c
+--- linux-2.6.39/drivers/mmc/host/davinci_mmc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/mmc/host/dw_mmc.c linux-2.6.39/drivers/mmc/host/dw_mmc.c
+--- linux-2.6.39/drivers/mmc/host/dw_mmc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mmc/host/dw_mmc.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/mmc/host/s3cmci.c linux-2.6.39/drivers/mmc/host/s3cmci.c
+--- linux-2.6.39/drivers/mmc/host/s3cmci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mmc/host/s3cmci.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/mmc/host/sdhci-cns3xxx.c linux-2.6.39/drivers/mmc/host/sdhci-cns3xxx.c
+--- linux-2.6.39/drivers/mmc/host/sdhci-cns3xxx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/mmc/host/sdhci-dove.c linux-2.6.39/drivers/mmc/host/sdhci-dove.c
+--- linux-2.6.39/drivers/mmc/host/sdhci-dove.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/mmc/host/sdhci-esdhc-imx.c linux-2.6.39/drivers/mmc/host/sdhci-esdhc-imx.c
+--- linux-2.6.39/drivers/mmc/host/sdhci-esdhc-imx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mmc/host/sdhci-esdhc-imx.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/mmc/host/sdhci-of.h linux-2.6.39/drivers/mmc/host/sdhci-of.h
+--- linux-2.6.39/drivers/mmc/host/sdhci-of.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/mmc/host/sdhci-pci.c linux-2.6.39/drivers/mmc/host/sdhci-pci.c
+--- linux-2.6.39/drivers/mmc/host/sdhci-pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/mmc/host/sdhci-pltfm.c linux-2.6.39/drivers/mmc/host/sdhci-pltfm.c
+--- linux-2.6.39/drivers/mmc/host/sdhci-pltfm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/mmc/host/sdhci-pxa.c linux-2.6.39/drivers/mmc/host/sdhci-pxa.c
+--- linux-2.6.39/drivers/mmc/host/sdhci-pxa.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/mmc/host/sdhci-s3c.c linux-2.6.39/drivers/mmc/host/sdhci-s3c.c
+--- linux-2.6.39/drivers/mmc/host/sdhci-s3c.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/mmc/host/sdhci-spear.c linux-2.6.39/drivers/mmc/host/sdhci-spear.c
+--- linux-2.6.39/drivers/mmc/host/sdhci-spear.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/mmc/host/sdhci-tegra.c linux-2.6.39/drivers/mmc/host/sdhci-tegra.c
+--- linux-2.6.39/drivers/mmc/host/sdhci-tegra.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/mmc/host/sdricoh_cs.c linux-2.6.39/drivers/mmc/host/sdricoh_cs.c
+--- linux-2.6.39/drivers/mmc/host/sdricoh_cs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/mmc/host/sh_mmcif.c linux-2.6.39/drivers/mmc/host/sh_mmcif.c
+--- linux-2.6.39/drivers/mmc/host/sh_mmcif.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.39/drivers/mtd/chips/cfi_cmdset_0001.c
+--- linux-2.6.39/drivers/mtd/chips/cfi_cmdset_0001.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mtd/chips/cfi_cmdset_0001.c 2011-05-22 19:36:31.000000000 -0400
+@@ -757,6 +757,8 @@ static int chip_ready (struct map_info *
+ struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
+ unsigned long timeo = jiffies + HZ;
+
++ pax_track_stack();
++
+ /* Prevent setting state FL_SYNCING for chip in suspended state. */
+ if (mode == FL_SYNCING && chip->oldstate != FL_READY)
+ goto sleep;
+@@ -1657,6 +1659,8 @@ static int __xipram do_write_buffer(stru
+ unsigned long initial_adr;
+ int initial_len = len;
+
++ pax_track_stack();
++
+ wbufsize = cfi_interleave(cfi) << cfi->cfiq->MaxBufWriteSize;
+ adr += chip->start;
+ initial_adr = adr;
+@@ -1875,6 +1879,8 @@ static int __xipram do_erase_oneblock(st
+ int retries = 3;
+ int ret;
+
++ pax_track_stack();
++
+ adr += chip->start;
+
+ retry:
+diff -urNp linux-2.6.39/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.39/drivers/mtd/chips/cfi_cmdset_0020.c
+--- linux-2.6.39/drivers/mtd/chips/cfi_cmdset_0020.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mtd/chips/cfi_cmdset_0020.c 2011-05-22 19:36:31.000000000 -0400
+@@ -255,6 +255,8 @@ static inline int do_read_onechip(struct
+ unsigned long cmd_addr;
+ struct cfi_private *cfi = map->fldrv_priv;
+
++ pax_track_stack();
++
+ adr += chip->start;
+
+ /* Ensure cmd read/writes are aligned. */
+@@ -428,6 +430,8 @@ static inline int do_write_buffer(struct
+ DECLARE_WAITQUEUE(wait, current);
+ int wbufsize, z;
+
++ pax_track_stack();
++
+ /* M58LW064A requires bus alignment for buffer wriets -- saw */
+ if (adr & (map_bankwidth(map)-1))
+ return -EINVAL;
+@@ -742,6 +746,8 @@ static inline int do_erase_oneblock(stru
+ DECLARE_WAITQUEUE(wait, current);
+ int ret = 0;
+
++ pax_track_stack();
++
+ adr += chip->start;
+
+ /* Let's determine this according to the interleave only once */
+@@ -1047,6 +1053,8 @@ static inline int do_lock_oneblock(struc
+ unsigned long timeo = jiffies + HZ;
+ DECLARE_WAITQUEUE(wait, current);
+
++ pax_track_stack();
++
+ adr += chip->start;
+
+ /* Let's determine this according to the interleave only once */
+@@ -1196,6 +1204,8 @@ static inline int do_unlock_oneblock(str
+ unsigned long timeo = jiffies + HZ;
+ DECLARE_WAITQUEUE(wait, current);
+
++ pax_track_stack();
++
+ adr += chip->start;
+
+ /* Let's determine this according to the interleave only once */
+diff -urNp linux-2.6.39/drivers/mtd/devices/doc2000.c linux-2.6.39/drivers/mtd/devices/doc2000.c
+--- linux-2.6.39/drivers/mtd/devices/doc2000.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mtd/devices/doc2000.c 2011-05-22 19:36:31.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 */
printk(KERN_WARNING
"ECC needs a full sector write (adr: %lx size %lx)\n",
(long) to, (long) len);
-diff -urNp linux-2.6.38.4/drivers/mtd/devices/doc2001.c linux-2.6.38.4/drivers/mtd/devices/doc2001.c
---- linux-2.6.38.4/drivers/mtd/devices/doc2001.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/mtd/devices/doc2001.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/mtd/devices/doc2001.c linux-2.6.39/drivers/mtd/devices/doc2001.c
+--- linux-2.6.39/drivers/mtd/devices/doc2001.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mtd/devices/doc2001.c 2011-05-22 19:36:31.000000000 -0400
@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
struct Nand *mychip = &this->chips[from >> (this->chipshift)];
return -EINVAL;
/* Don't allow a single read to cross a 512-byte block boundary */
-diff -urNp linux-2.6.38.4/drivers/mtd/nand/denali.c linux-2.6.38.4/drivers/mtd/nand/denali.c
---- linux-2.6.38.4/drivers/mtd/nand/denali.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/mtd/nand/denali.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/mtd/ftl.c linux-2.6.39/drivers/mtd/ftl.c
+--- linux-2.6.39/drivers/mtd/ftl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mtd/ftl.c 2011-05-22 19:36:31.000000000 -0400
+@@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t *
+ loff_t offset;
+ uint16_t srcunitswap = cpu_to_le16(srcunit);
+
++ pax_track_stack();
++
+ 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/drivers/mtd/inftlcore.c linux-2.6.39/drivers/mtd/inftlcore.c
+--- linux-2.6.39/drivers/mtd/inftlcore.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mtd/inftlcore.c 2011-05-22 19:36:31.000000000 -0400
+@@ -259,6 +259,8 @@ static u16 INFTL_foldchain(struct INFTLr
+ struct inftl_oob oob;
+ size_t retlen;
+
++ pax_track_stack();
++
+ DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d,"
+ "pending=%d)\n", inftl, thisVUC, pendingblock);
+
+diff -urNp linux-2.6.39/drivers/mtd/inftlmount.c linux-2.6.39/drivers/mtd/inftlmount.c
+--- linux-2.6.39/drivers/mtd/inftlmount.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mtd/inftlmount.c 2011-05-22 19:36:31.000000000 -0400
+@@ -53,6 +53,8 @@ static int find_boot_record(struct INFTL
+ struct INFTLPartition *ip;
+ size_t retlen;
+
++ pax_track_stack();
++
+ DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=%p)\n", inftl);
+
+ /*
+diff -urNp linux-2.6.39/drivers/mtd/lpddr/qinfo_probe.c linux-2.6.39/drivers/mtd/lpddr/qinfo_probe.c
+--- linux-2.6.39/drivers/mtd/lpddr/qinfo_probe.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mtd/lpddr/qinfo_probe.c 2011-05-22 19:36:31.000000000 -0400
+@@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map
+ {
+ map_word pfow_val[4];
+
++ pax_track_stack();
++
+ /* 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/drivers/mtd/mtdchar.c linux-2.6.39/drivers/mtd/mtdchar.c
+--- linux-2.6.39/drivers/mtd/mtdchar.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mtd/mtdchar.c 2011-05-22 19:36:31.000000000 -0400
+@@ -560,6 +560,8 @@ static int mtd_ioctl(struct file *file,
+ u_long size;
+ struct mtd_info_user info;
+
++ pax_track_stack();
++
+ DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n");
+
+ size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;
+diff -urNp linux-2.6.39/drivers/mtd/nand/denali.c linux-2.6.39/drivers/mtd/nand/denali.c
+--- linux-2.6.39/drivers/mtd/nand/denali.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mtd/nand/denali.c 2011-05-22 19:36:31.000000000 -0400
@@ -25,6 +25,7 @@
#include <linux/pci.h>
#include <linux/mtd/mtd.h>
#include "denali.h"
-diff -urNp linux-2.6.38.4/drivers/mtd/ubi/build.c linux-2.6.38.4/drivers/mtd/ubi/build.c
---- linux-2.6.38.4/drivers/mtd/ubi/build.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/mtd/ubi/build.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1285,7 +1285,7 @@ module_exit(ubi_exit);
+diff -urNp linux-2.6.39/drivers/mtd/nftlcore.c linux-2.6.39/drivers/mtd/nftlcore.c
+--- linux-2.6.39/drivers/mtd/nftlcore.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mtd/nftlcore.c 2011-05-22 19:36:31.000000000 -0400
+@@ -264,6 +264,8 @@ static u16 NFTL_foldchain (struct NFTLre
+ int inplace = 1;
+ size_t retlen;
+
++ pax_track_stack();
++
+ memset(BlockMap, 0xff, sizeof(BlockMap));
+ memset(BlockFreeFound, 0, sizeof(BlockFreeFound));
+
+diff -urNp linux-2.6.39/drivers/mtd/nftlmount.c linux-2.6.39/drivers/mtd/nftlmount.c
+--- linux-2.6.39/drivers/mtd/nftlmount.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mtd/nftlmount.c 2011-05-22 19:36:31.000000000 -0400
+@@ -24,6 +24,7 @@
+ #include <asm/errno.h>
+ #include <linux/delay.h>
+ #include <linux/slab.h>
++#include <linux/sched.h>
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/nand.h>
+ #include <linux/mtd/nftl.h>
+@@ -45,6 +46,8 @@ static int find_boot_record(struct NFTLr
+ struct mtd_info *mtd = nftl->mbd.mtd;
+ unsigned int i;
+
++ pax_track_stack();
++
+ /* 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/drivers/mtd/ubi/build.c linux-2.6.39/drivers/mtd/ubi/build.c
+--- linux-2.6.39/drivers/mtd/ubi/build.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/mtd/ubi/build.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1287,7 +1287,7 @@ module_exit(ubi_exit);
static int __init bytes_str_to_int(const char *str)
{
char *endp;
result = simple_strtoul(str, &endp, 0);
if (str == endp || result >= INT_MAX) {
-@@ -1296,11 +1296,11 @@ static int __init bytes_str_to_int(const
+@@ -1298,11 +1298,11 @@ static int __init bytes_str_to_int(const
switch (*endp) {
case 'G':
if (endp[1] == 'i' && endp[2] == 'B')
endp += 2;
case '\0':
-@@ -1311,7 +1311,13 @@ static int __init bytes_str_to_int(const
+@@ -1313,7 +1313,13 @@ static int __init bytes_str_to_int(const
return -EINVAL;
}
}
/**
-diff -urNp linux-2.6.38.4/drivers/net/e1000e/82571.c linux-2.6.38.4/drivers/net/e1000e/82571.c
---- linux-2.6.38.4/drivers/net/e1000e/82571.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/e1000e/82571.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/net/bcm63xx_enet.c linux-2.6.39/drivers/net/bcm63xx_enet.c
+--- linux-2.6.39/drivers/net/bcm63xx_enet.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
+ }
+
+-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/drivers/net/bna/bnad_ethtool.c linux-2.6.39/drivers/net/bna/bnad_ethtool.c
+--- linux-2.6.39/drivers/net/bna/bnad_ethtool.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
+ }
+ }
+
+-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/drivers/net/bnx2.c linux-2.6.39/drivers/net/bnx2.c
+--- linux-2.6.39/drivers/net/bnx2.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/bnx2.c 2011-05-22 19:36:31.000000000 -0400
+@@ -5828,6 +5828,8 @@ bnx2_test_nvram(struct bnx2 *bp)
+ int rc = 0;
+ u32 magic, csum;
+
++ pax_track_stack();
++
+ if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0)
+ goto test_nvram_done;
+
+diff -urNp linux-2.6.39/drivers/net/bnx2x/bnx2x_ethtool.c linux-2.6.39/drivers/net/bnx2x/bnx2x_ethtool.c
+--- linux-2.6.39/drivers/net/bnx2x/bnx2x_ethtool.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/bnx2x/bnx2x_ethtool.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1788,6 +1788,8 @@ static int bnx2x_test_nvram(struct bnx2x
+ int i, rc;
+ u32 magic, crc;
+
++ pax_track_stack();
++
+ if (BP_NOMCP(bp))
+ return 0;
+
+diff -urNp linux-2.6.39/drivers/net/chelsio/pm3393.c linux-2.6.39/drivers/net/chelsio/pm3393.c
+--- linux-2.6.39/drivers/net/chelsio/pm3393.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/net/chelsio/vsc7326.c linux-2.6.39/drivers/net/chelsio/vsc7326.c
+--- linux-2.6.39/drivers/net/chelsio/vsc7326.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/net/cxgb4/cxgb4_main.c linux-2.6.39/drivers/net/cxgb4/cxgb4_main.c
+--- linux-2.6.39/drivers/net/cxgb4/cxgb4_main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/cxgb4/cxgb4_main.c 2011-05-22 19:36:31.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];
+
++ pax_track_stack();
++
+ for (i = 0; i < ARRAY_SIZE(entries); ++i)
+ entries[i].entry = i;
+
+diff -urNp linux-2.6.39/drivers/net/cxgb4/t4_hw.c linux-2.6.39/drivers/net/cxgb4/t4_hw.c
+--- linux-2.6.39/drivers/net/cxgb4/t4_hw.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/cxgb4/t4_hw.c 2011-05-22 19:36:31.000000000 -0400
+@@ -362,6 +362,8 @@ static int get_vpd_params(struct adapter
+ u8 vpd[VPD_LEN], csum;
+ unsigned int vpdr_len, kw_offset, id_len;
+
++ pax_track_stack();
++
+ ret = pci_read_vpd(adapter->pdev, VPD_BASE, sizeof(vpd), vpd);
+ if (ret < 0)
+ return ret;
+diff -urNp linux-2.6.39/drivers/net/cxgb4vf/cxgb4vf_main.c linux-2.6.39/drivers/net/cxgb4vf/cxgb4vf_main.c
+--- linux-2.6.39/drivers/net/cxgb4vf/cxgb4vf_main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/cxgb4vf/cxgb4vf_main.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/net/e1000e/82571.c linux-2.6.39/drivers/net/e1000e/82571.c
+--- linux-2.6.39/drivers/net/e1000e/82571.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/e1000e/82571.c 2011-05-22 19:36:31.000000000 -0400
@@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(s
{
struct e1000_hw *hw = &adapter->hw;
.acquire = e1000_acquire_nvm_82571,
.read = e1000e_read_nvm_eerd,
.release = e1000_release_nvm_82571,
-diff -urNp linux-2.6.38.4/drivers/net/e1000e/e1000.h linux-2.6.38.4/drivers/net/e1000e/e1000.h
---- linux-2.6.38.4/drivers/net/e1000e/e1000.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/e1000e/e1000.h 2011-04-28 19:34:15.000000000 -0400
-@@ -408,9 +408,9 @@ struct e1000_info {
+diff -urNp linux-2.6.39/drivers/net/e1000e/e1000.h linux-2.6.39/drivers/net/e1000e/e1000.h
+--- linux-2.6.39/drivers/net/e1000e/e1000.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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 *);
};
/* hardware capability, feature, and workaround flags */
-diff -urNp linux-2.6.38.4/drivers/net/e1000e/es2lan.c linux-2.6.38.4/drivers/net/e1000e/es2lan.c
---- linux-2.6.38.4/drivers/net/e1000e/es2lan.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/e1000e/es2lan.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/net/e1000e/es2lan.c linux-2.6.39/drivers/net/e1000e/es2lan.c
+--- linux-2.6.39/drivers/net/e1000e/es2lan.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/e1000e/es2lan.c 2011-05-22 19:36:31.000000000 -0400
@@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es
{
struct e1000_hw *hw = &adapter->hw;
.acquire = e1000_acquire_nvm_80003es2lan,
.read = e1000e_read_nvm_eerd,
.release = e1000_release_nvm_80003es2lan,
-diff -urNp linux-2.6.38.4/drivers/net/e1000e/hw.h linux-2.6.38.4/drivers/net/e1000e/hw.h
---- linux-2.6.38.4/drivers/net/e1000e/hw.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/e1000e/hw.h 2011-04-28 19:34:15.000000000 -0400
-@@ -801,16 +801,17 @@ struct e1000_phy_operations {
-
- /* Function pointers for the NVM. */
- struct e1000_nvm_operations {
-- s32 (*acquire)(struct e1000_hw *);
-- s32 (*read)(struct e1000_hw *, u16, u16, u16 *);
-- void (*release)(struct e1000_hw *);
-- s32 (*update)(struct e1000_hw *);
-- s32 (*valid_led_default)(struct e1000_hw *, u16 *);
-- s32 (*validate)(struct e1000_hw *);
-- s32 (*write)(struct e1000_hw *, u16, u16, u16 *);
-+ s32 (* acquire)(struct e1000_hw *); /* cannot be const, see drivers/net/e1000e/82571.c e1000_init_nvm_params_82571() */
-+ s32 (* const read)(struct e1000_hw *, u16, u16, u16 *);
-+ void (* release)(struct e1000_hw *); /* cannot be const, see drivers/net/e1000e/82571.c e1000_init_nvm_params_82571() */
-+ s32 (* const update)(struct e1000_hw *);
-+ s32 (* const valid_led_default)(struct e1000_hw *, u16 *);
-+ s32 (* const validate)(struct e1000_hw *);
-+ s32 (* const write)(struct e1000_hw *, u16, u16, u16 *);
+diff -urNp linux-2.6.39/drivers/net/e1000e/hw.h linux-2.6.39/drivers/net/e1000e/hw.h
+--- linux-2.6.39/drivers/net/e1000e/hw.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/e1000e/hw.h 2011-05-22 19:36:31.000000000 -0400
+@@ -811,6 +811,7 @@ struct e1000_nvm_operations {
};
struct e1000_mac_info {
+ /* cannot be const see e1000_init_mac_params_ich8lan */
struct e1000_mac_operations ops;
-
- u8 addr[6];
-@@ -853,6 +854,7 @@ struct e1000_mac_info {
+ u8 addr[ETH_ALEN];
+ u8 perm_addr[ETH_ALEN];
+@@ -852,6 +853,7 @@ struct e1000_mac_info {
};
struct e1000_phy_info {
struct e1000_phy_operations ops;
enum e1000_phy_type type;
-@@ -887,6 +889,7 @@ struct e1000_phy_info {
+@@ -886,6 +888,7 @@ struct e1000_phy_info {
};
struct e1000_nvm_info {
struct e1000_nvm_operations ops;
enum e1000_nvm_type type;
-diff -urNp linux-2.6.38.4/drivers/net/e1000e/ich8lan.c linux-2.6.38.4/drivers/net/e1000e/ich8lan.c
---- linux-2.6.38.4/drivers/net/e1000e/ich8lan.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/e1000e/ich8lan.c 2011-04-28 19:34:15.000000000 -0400
-@@ -3840,7 +3840,7 @@ static void e1000_clear_hw_cntrs_ich8lan
+diff -urNp linux-2.6.39/drivers/net/e1000e/ich8lan.c linux-2.6.39/drivers/net/e1000e/ich8lan.c
+--- linux-2.6.39/drivers/net/e1000e/ich8lan.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/e1000e/ich8lan.c 2011-05-22 19:36:31.000000000 -0400
+@@ -3866,7 +3866,7 @@ static void e1000_clear_hw_cntrs_ich8lan
}
}
.id_led_init = e1000e_id_led_init,
/* check_mng_mode dependent on mac type */
.check_for_link = e1000_check_for_copper_link_ich8lan,
-@@ -3859,7 +3859,7 @@ static struct e1000_mac_operations ich8_
+@@ -3885,7 +3885,7 @@ static struct e1000_mac_operations ich8_
/* id_led_init dependent on mac type */
};
.acquire = e1000_acquire_swflag_ich8lan,
.check_reset_block = e1000_check_reset_block_ich8lan,
.commit = NULL,
-@@ -3873,7 +3873,7 @@ static struct e1000_phy_operations ich8_
+@@ -3899,7 +3899,7 @@ static struct e1000_phy_operations ich8_
.write_reg = e1000e_write_phy_reg_igp,
};
.acquire = e1000_acquire_nvm_ich8lan,
.read = e1000_read_nvm_ich8lan,
.release = e1000_release_nvm_ich8lan,
-diff -urNp linux-2.6.38.4/drivers/net/igb/e1000_82575.c linux-2.6.38.4/drivers/net/igb/e1000_82575.c
---- linux-2.6.38.4/drivers/net/igb/e1000_82575.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/igb/e1000_82575.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1747,7 +1747,7 @@ u16 igb_rxpbs_adjust_82580(u32 data)
+diff -urNp linux-2.6.39/drivers/net/greth.c linux-2.6.39/drivers/net/greth.c
+--- linux-2.6.39/drivers/net/greth.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/greth.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/net/hamradio/6pack.c linux-2.6.39/drivers/net/hamradio/6pack.c
+--- linux-2.6.39/drivers/net/hamradio/6pack.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/hamradio/6pack.c 2011-05-22 19:36:31.000000000 -0400
+@@ -463,6 +463,8 @@ static void sixpack_receive_buf(struct t
+ unsigned char buf[512];
+ int count1;
+
++ pax_track_stack();
++
+ if (!count)
+ return;
+
+diff -urNp linux-2.6.39/drivers/net/ibm_newemac/phy.c linux-2.6.39/drivers/net/ibm_newemac/phy.c
+--- linux-2.6.39/drivers/net/ibm_newemac/phy.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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,
+ };
+
+-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/drivers/net/ibmveth.c linux-2.6.39/drivers/net/ibmveth.c
+--- linux-2.6.39/drivers/net/ibmveth.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/ibmveth.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1625,7 +1625,7 @@ static struct vio_device_id ibmveth_devi
+ };
+ MODULE_DEVICE_TABLE(vio, ibmveth_device_table);
+
+-static struct dev_pm_ops ibmveth_pm_ops = {
++static const struct dev_pm_ops ibmveth_pm_ops = {
+ .resume = ibmveth_resume
+ };
+
+diff -urNp linux-2.6.39/drivers/net/igb/e1000_82575.c linux-2.6.39/drivers/net/igb/e1000_82575.c
+--- linux-2.6.39/drivers/net/igb/e1000_82575.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/igb/e1000_82575.c 2011-05-22 19:36:31.000000000 -0400
+@@ -2029,7 +2029,7 @@ out:
return ret_val;
}
.init_hw = igb_init_hw_82575,
.check_for_link = igb_check_for_link_82575,
.rar_set = igb_rar_set,
-@@ -1755,13 +1755,13 @@ static struct e1000_mac_operations e1000
+@@ -2037,13 +2037,13 @@ static struct e1000_mac_operations e1000
.get_speed_and_duplex = igb_get_speed_and_duplex_copper,
};
.acquire = igb_acquire_nvm_82575,
.read = igb_read_nvm_eerd,
.release = igb_release_nvm_82575,
-diff -urNp linux-2.6.38.4/drivers/net/igb/e1000_hw.h linux-2.6.38.4/drivers/net/igb/e1000_hw.h
---- linux-2.6.38.4/drivers/net/igb/e1000_hw.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/igb/e1000_hw.h 2011-04-28 19:34:15.000000000 -0400
-@@ -327,22 +327,23 @@ struct e1000_phy_operations {
- };
-
- struct e1000_nvm_operations {
-- s32 (*acquire)(struct e1000_hw *);
-- s32 (*read)(struct e1000_hw *, u16, u16, u16 *);
-- void (*release)(struct e1000_hw *);
-- s32 (*write)(struct e1000_hw *, u16, u16, u16 *);
-+ s32 (* const acquire)(struct e1000_hw *);
-+ s32 (* const read)(struct e1000_hw *, u16, u16, u16 *);
-+ void (* const release)(struct e1000_hw *);
-+ s32 (* const write)(struct e1000_hw *, u16, u16, u16 *);
- };
+diff -urNp linux-2.6.39/drivers/net/igb/e1000_hw.h linux-2.6.39/drivers/net/igb/e1000_hw.h
+--- linux-2.6.39/drivers/net/igb/e1000_hw.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/igb/e1000_hw.h 2011-05-22 19:36:31.000000000 -0400
+@@ -342,14 +342,15 @@ struct e1000_nvm_operations {
struct e1000_info {
s32 (*get_invariants)(struct e1000_hw *);
struct e1000_mac_operations ops;
u8 addr[6];
-@@ -381,6 +382,7 @@ struct e1000_mac_info {
+@@ -388,6 +389,7 @@ struct e1000_mac_info {
};
struct e1000_phy_info {
struct e1000_phy_operations ops;
enum e1000_phy_type type;
-@@ -416,6 +418,7 @@ struct e1000_phy_info {
+@@ -423,6 +425,7 @@ struct e1000_phy_info {
};
struct e1000_nvm_info {
+ /* cannot be const */
struct e1000_nvm_operations ops;
-
enum e1000_nvm_type type;
-diff -urNp linux-2.6.38.4/drivers/net/igbvf/vf.h linux-2.6.38.4/drivers/net/igbvf/vf.h
---- linux-2.6.38.4/drivers/net/igbvf/vf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/igbvf/vf.h 2011-04-28 19:34:15.000000000 -0400
+ enum e1000_nvm_override override;
+diff -urNp linux-2.6.39/drivers/net/igbvf/vf.h linux-2.6.39/drivers/net/igbvf/vf.h
+--- linux-2.6.39/drivers/net/igbvf/vf.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/igbvf/vf.h 2011-05-22 19:36:31.000000000 -0400
@@ -191,6 +191,7 @@ struct e1000_mac_operations {
};
struct e1000_mac_operations ops;
u8 addr[6];
u8 perm_addr[6];
-diff -urNp linux-2.6.38.4/drivers/net/pcnet32.c linux-2.6.38.4/drivers/net/pcnet32.c
---- linux-2.6.38.4/drivers/net/pcnet32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/pcnet32.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/net/irda/sh_irda.c linux-2.6.39/drivers/net/irda/sh_irda.c
+--- linux-2.6.39/drivers/net/irda/sh_irda.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
+ }
+
+-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;
+
+diff -urNp linux-2.6.39/drivers/net/ixgb/ixgb_main.c linux-2.6.39/drivers/net/ixgb/ixgb_main.c
+--- linux-2.6.39/drivers/net/ixgb/ixgb_main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/ixgb/ixgb_main.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1069,6 +1069,8 @@ ixgb_set_multi(struct net_device *netdev
+ u32 rctl;
+ int i;
+
++ pax_track_stack();
++
+ /* Check for Promiscuous and All Multicast modes */
+
+ rctl = IXGB_READ_REG(hw, RCTL);
+diff -urNp linux-2.6.39/drivers/net/ixgb/ixgb_param.c linux-2.6.39/drivers/net/ixgb/ixgb_param.c
+--- linux-2.6.39/drivers/net/ixgb/ixgb_param.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/ixgb/ixgb_param.c 2011-05-22 19:36:31.000000000 -0400
+@@ -261,6 +261,9 @@ void __devinit
+ ixgb_check_options(struct ixgb_adapter *adapter)
+ {
+ int bd = adapter->bd_number;
++
++ pax_track_stack();
++
+ 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/drivers/net/ixgbe/ixgbe_82599.c linux-2.6.39/drivers/net/ixgbe/ixgbe_82599.c
+--- linux-2.6.39/drivers/net/ixgbe/ixgbe_82599.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/net/ixgbe/ixgbe.h linux-2.6.39/drivers/net/ixgbe/ixgbe.h
+--- linux-2.6.39/drivers/net/ixgbe/ixgbe.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/ixgbe/ixgbe.h 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/net/ixgbe/ixgbe_type.h linux-2.6.39/drivers/net/ixgbe/ixgbe_type.h
+--- linux-2.6.39/drivers/net/ixgbe/ixgbe_type.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/ixgbe/ixgbe_type.h 2011-05-22 19:36:31.000000000 -0400
+@@ -2572,7 +2572,7 @@ struct ixgbe_phy_operations {
+ };
+
+ struct ixgbe_eeprom_info {
+- struct ixgbe_eeprom_operations ops;
++ struct ixgbe_eeprom_operations ops;
+ enum ixgbe_eeprom_type type;
+ u32 semaphore_delay;
+ u16 word_size;
+@@ -2581,7 +2581,7 @@ struct ixgbe_eeprom_info {
+
+ #define IXGBE_FLAGS_DOUBLE_RESET_REQUIRED 0x01
+ struct ixgbe_mac_info {
+- struct ixgbe_mac_operations ops;
++ struct ixgbe_mac_operations ops;
+ enum ixgbe_mac_type type;
+ u8 addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
+ u8 perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
+@@ -2608,7 +2608,7 @@ struct ixgbe_mac_info {
+ };
+
+ struct ixgbe_phy_info {
+- struct ixgbe_phy_operations ops;
++ struct ixgbe_phy_operations ops;
+ struct mdio_if_info mdio;
+ enum ixgbe_phy_type type;
+ u32 id;
+diff -urNp linux-2.6.39/drivers/net/ixgbe/ixgbe_x540.c linux-2.6.39/drivers/net/ixgbe/ixgbe_x540.c
+--- linux-2.6.39/drivers/net/ixgbe/ixgbe_x540.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/net/ixgbevf/ethtool.c linux-2.6.39/drivers/net/ixgbevf/ethtool.c
+--- linux-2.6.39/drivers/net/ixgbevf/ethtool.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/net/ixgbevf/ixgbevf.h linux-2.6.39/drivers/net/ixgbevf/ixgbevf.h
+--- linux-2.6.39/drivers/net/ixgbevf/ixgbevf.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/net/ixgbevf/vf.c linux-2.6.39/drivers/net/ixgbevf/vf.c
+--- linux-2.6.39/drivers/net/ixgbevf/vf.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/ixgbevf/vf.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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,
+ };
+
+-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,
+ };
+
+-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/drivers/net/ixgbevf/vf.h linux-2.6.39/drivers/net/ixgbevf/vf.h
+--- linux-2.6.39/drivers/net/ixgbevf/vf.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/ixgbevf/vf.h 2011-05-22 19:36:31.000000000 -0400
+@@ -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;
+ };
+
+ #endif /* __IXGBE_VF_H__ */
+diff -urNp linux-2.6.39/drivers/net/ksz884x.c linux-2.6.39/drivers/net/ksz884x.c
+--- linux-2.6.39/drivers/net/ksz884x.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/ksz884x.c 2011-05-22 19:36:31.000000000 -0400
+@@ -6536,6 +6536,8 @@ static void netdev_get_ethtool_stats(str
+ int rc;
+ u64 counter[TOTAL_PORT_COUNTER_NUM];
+
++ pax_track_stack();
++
+ 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/drivers/net/mlx4/main.c linux-2.6.39/drivers/net/mlx4/main.c
+--- linux-2.6.39/drivers/net/mlx4/main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/mlx4/main.c 2011-05-22 19:36:31.000000000 -0400
+@@ -40,6 +40,7 @@
+ #include <linux/dma-mapping.h>
+ #include <linux/slab.h>
+ #include <linux/io-mapping.h>
++#include <linux/sched.h>
+
+ #include <linux/mlx4/device.h>
+ #include <linux/mlx4/doorbell.h>
+@@ -764,6 +765,8 @@ static int mlx4_init_hca(struct mlx4_dev
+ u64 icm_size;
+ int err;
+
++ pax_track_stack();
++
+ err = mlx4_QUERY_FW(dev);
+ if (err) {
+ if (err == -EACCES)
+diff -urNp linux-2.6.39/drivers/net/netconsole.c linux-2.6.39/drivers/net/netconsole.c
+--- linux-2.6.39/drivers/net/netconsole.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/netconsole.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/net/niu.c linux-2.6.39/drivers/net/niu.c
+--- linux-2.6.39/drivers/net/niu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/niu.c 2011-05-22 19:36:31.000000000 -0400
+@@ -9067,6 +9067,8 @@ static void __devinit niu_try_msix(struc
+ int i, num_irqs, err;
+ u8 first_ldg;
+
++ pax_track_stack();
++
+ 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/drivers/net/pcnet32.c linux-2.6.39/drivers/net/pcnet32.c
+--- linux-2.6.39/drivers/net/pcnet32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/pcnet32.c 2011-05-22 19:36:31.000000000 -0400
@@ -82,7 +82,7 @@ static int cards_found;
/*
* VLB I/O addresses
{ 0x300, 0x320, 0x340, 0x360, 0 };
static int pcnet32_debug;
-diff -urNp linux-2.6.38.4/drivers/net/ppp_generic.c linux-2.6.38.4/drivers/net/ppp_generic.c
---- linux-2.6.38.4/drivers/net/ppp_generic.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/ppp_generic.c 2011-04-28 19:34:15.000000000 -0400
-@@ -986,7 +986,6 @@ ppp_net_ioctl(struct net_device *dev, st
+@@ -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/drivers/net/ppp_generic.c linux-2.6.39/drivers/net/ppp_generic.c
+--- linux-2.6.39/drivers/net/ppp_generic.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/ppp_generic.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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;
switch (cmd) {
case SIOCGPPPSTATS:
-@@ -1008,8 +1007,7 @@ ppp_net_ioctl(struct net_device *dev, st
+@@ -1009,8 +1008,7 @@ ppp_net_ioctl(struct net_device *dev, st
break;
case SIOCGPPPVER:
break;
err = 0;
break;
-diff -urNp linux-2.6.38.4/drivers/net/tg3.h linux-2.6.38.4/drivers/net/tg3.h
---- linux-2.6.38.4/drivers/net/tg3.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/tg3.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/net/qlcnic/qlcnic.h linux-2.6.39/drivers/net/qlcnic/qlcnic.h
+--- linux-2.6.39/drivers/net/qlcnic/qlcnic.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/net/qlcnic/qlcnic_main.c linux-2.6.39/drivers/net/qlcnic/qlcnic_main.c
+--- linux-2.6.39/drivers/net/qlcnic/qlcnic_main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/qlcnic/qlcnic_main.c 2011-05-22 19:36:31.000000000 -0400
+@@ -340,13 +340,13 @@ static const struct net_device_ops qlcni
+ #endif
+ };
+
+-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
+ };
+
+-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/drivers/net/qlge/qlge.h linux-2.6.39/drivers/net/qlge/qlge.h
+--- linux-2.6.39/drivers/net/qlge/qlge.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/qlge/qlge.h 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/net/qlge/qlge_main.c linux-2.6.39/drivers/net/qlge/qlge_main.c
+--- linux-2.6.39/drivers/net/qlge/qlge_main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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,
+ };
+
+-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/drivers/net/sfc/falcon.c linux-2.6.39/drivers/net/sfc/falcon.c
+--- linux-2.6.39/drivers/net/sfc/falcon.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/sfc/falcon.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1703,7 +1703,7 @@ static int falcon_set_wol(struct efx_nic
+ **************************************************************************
+ */
+
+-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,
+ };
+
+-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/drivers/net/sfc/mtd.c linux-2.6.39/drivers/net/sfc/mtd.c
+--- linux-2.6.39/drivers/net/sfc/mtd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
+ }
+
+-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;
+ }
+
+-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/drivers/net/sfc/nic.h linux-2.6.39/drivers/net/sfc/nic.h
+--- linux-2.6.39/drivers/net/sfc/nic.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
+ };
+
+-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;
+
+ /**************************************************************************
+ *
+diff -urNp linux-2.6.39/drivers/net/sfc/siena.c linux-2.6.39/drivers/net/sfc/siena.c
+--- linux-2.6.39/drivers/net/sfc/siena.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/sfc/siena.c 2011-05-22 19:36:31.000000000 -0400
+@@ -599,7 +599,7 @@ static void siena_init_wol(struct efx_ni
+ **************************************************************************
+ */
+
+-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/drivers/net/sh_eth.c linux-2.6.39/drivers/net/sh_eth.c
+--- linux-2.6.39/drivers/net/sh_eth.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/net/stmmac/stmmac_ethtool.c linux-2.6.39/drivers/net/stmmac/stmmac_ethtool.c
+--- linux-2.6.39/drivers/net/stmmac/stmmac_ethtool.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/stmmac/stmmac_ethtool.c 2011-05-22 19:36:31.000000000 -0400
+@@ -348,7 +348,7 @@ static int stmmac_set_wol(struct net_dev
+ return 0;
+ }
+
+-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/drivers/net/sungem_phy.c linux-2.6.39/drivers/net/sungem_phy.c
+--- linux-2.6.39/drivers/net/sungem_phy.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/sungem_phy.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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
+ };
+
+ /* 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
+ };
+
+ /* 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
+ };
+
+ /* 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
+ };
+
+ /* 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
+ };
+
+ /* 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
+ };
+
+ /* 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
+ };
+
+ /* 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
+ };
+
+-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
+ };
+
+ /* 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
+ };
+
+ /* 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
+ };
+
+-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
+ };
+
+ /* 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/drivers/net/tg3.h linux-2.6.39/drivers/net/tg3.h
+--- linux-2.6.39/drivers/net/tg3.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/tg3.h 2011-05-22 19:36:31.000000000 -0400
@@ -131,6 +131,7 @@
#define CHIPREV_ID_5750_A0 0x4000
#define CHIPREV_ID_5750_A1 0x4001
#define CHIPREV_ID_5750_C2 0x4202
#define CHIPREV_ID_5752_A0_HW 0x5000
#define CHIPREV_ID_5752_A0 0x6000
-diff -urNp linux-2.6.38.4/drivers/net/tulip/de4x5.c linux-2.6.38.4/drivers/net/tulip/de4x5.c
---- linux-2.6.38.4/drivers/net/tulip/de4x5.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/tulip/de4x5.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/net/tile/tilepro.c linux-2.6.39/drivers/net/tile/tilepro.c
+--- linux-2.6.39/drivers/net/tile/tilepro.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
+ }
+
+
+-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/drivers/net/tulip/de2104x.c linux-2.6.39/drivers/net/tulip/de2104x.c
+--- linux-2.6.39/drivers/net/tulip/de2104x.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/tulip/de2104x.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1817,6 +1817,8 @@ static void __devinit de21041_get_srom_i
+ struct de_srom_info_leaf *il;
+ void *bufp;
+
++ pax_track_stack();
++
+ /* download entire eeprom */
+ for (i = 0; i < DE_EEPROM_WORDS; i++)
+ ((__le16 *)ee_data)[i] =
+diff -urNp linux-2.6.39/drivers/net/tulip/de4x5.c linux-2.6.39/drivers/net/tulip/de4x5.c
+--- linux-2.6.39/drivers/net/tulip/de4x5.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/tulip/de4x5.c 2011-05-22 19:36:31.000000000 -0400
@@ -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];
return -EFAULT;
break;
}
-diff -urNp linux-2.6.38.4/drivers/net/usb/hso.c linux-2.6.38.4/drivers/net/usb/hso.c
---- linux-2.6.38.4/drivers/net/usb/hso.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/usb/hso.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/net/usb/asix.c linux-2.6.39/drivers/net/usb/asix.c
+--- linux-2.6.39/drivers/net/usb/asix.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/net/usb/cdc_ncm.c linux-2.6.39/drivers/net/usb/cdc_ncm.c
+--- linux-2.6.39/drivers/net/usb/cdc_ncm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/usb/cdc_ncm.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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,
+@@ -1257,7 +1257,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/drivers/net/usb/hso.c linux-2.6.39/drivers/net/usb/hso.c
+--- linux-2.6.39/drivers/net/usb/hso.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/usb/hso.c 2011-05-22 19:36:31.000000000 -0400
@@ -71,7 +71,7 @@
#include <asm/byteorder.h>
#include <linux/serial_core.h>
result =
hso_start_serial_device(serial_table[i], GFP_NOIO);
hso_kick_transmit(dev2ser(serial_table[i]));
-diff -urNp linux-2.6.38.4/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-2.6.38.4/drivers/net/vmxnet3/vmxnet3_ethtool.c
---- linux-2.6.38.4/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-04-28 19:34:15.000000000 -0400
-@@ -628,8 +628,7 @@ vmxnet3_set_rss_indir(struct net_device
+diff -urNp linux-2.6.39/drivers/net/usb/ipheth.c linux-2.6.39/drivers/net/usb/ipheth.c
+--- linux-2.6.39/drivers/net/usb/ipheth.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/usb/ipheth.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/net/usb/sierra_net.c linux-2.6.39/drivers/net/usb/sierra_net.c
+--- linux-2.6.39/drivers/net/usb/sierra_net.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-2.6.39/drivers/net/vmxnet3/vmxnet3_ethtool.c
+--- linux-2.6.39/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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
*/
return -EINVAL;
}
-diff -urNp linux-2.6.38.4/drivers/net/wireless/b43/debugfs.c linux-2.6.38.4/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.38.4/drivers/net/wireless/b43/debugfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/wireless/b43/debugfs.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/net/vxge/vxge-config.h linux-2.6.39/drivers/net/vxge/vxge-config.h
+--- linux-2.6.39/drivers/net/vxge/vxge-config.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/vxge/vxge-config.h 2011-05-22 19:36:31.000000000 -0400
+@@ -834,7 +834,7 @@ struct vxge_hw_device_hw_info {
+ struct vxge_hw_device_attr {
+ void __iomem *bar0;
+ struct pci_dev *pdev;
+- struct vxge_hw_uld_cbs uld_callbacks;
++ struct vxge_hw_uld_cbs uld_callbacks;
+ };
+
+ #define VXGE_HW_DEVICE_LINK_STATE_SET(hldev, ls) (hldev->link_state = ls)
+diff -urNp linux-2.6.39/drivers/net/vxge/vxge-main.c linux-2.6.39/drivers/net/vxge/vxge-main.c
+--- linux-2.6.39/drivers/net/vxge/vxge-main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/vxge/vxge-main.c 2011-05-22 19:36:31.000000000 -0400
+@@ -97,6 +97,8 @@ static inline void VXGE_COMPLETE_VPATH_T
+ struct sk_buff *completed[NR_SKB_COMPLETED];
+ int more;
+
++ pax_track_stack();
++
+ do {
+ more = 0;
+ skb_ptr = completed;
+@@ -1927,6 +1929,8 @@ static enum vxge_hw_status vxge_rth_conf
+ u8 mtable[256] = {0}; /* CPU to vpath mapping */
+ int index;
+
++ pax_track_stack();
++
+ /*
+ * Filling
+ * - itable with bucket numbers
+diff -urNp linux-2.6.39/drivers/net/wan/cycx_x25.c linux-2.6.39/drivers/net/wan/cycx_x25.c
+--- linux-2.6.39/drivers/net/wan/cycx_x25.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wan/cycx_x25.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1018,6 +1018,8 @@ static void hex_dump(char *msg, unsigned
+ unsigned char hex[1024],
+ * phex = hex;
+
++ pax_track_stack();
++
+ if (len >= (sizeof(hex) / 2))
+ len = (sizeof(hex) / 2) - 1;
+
+diff -urNp linux-2.6.39/drivers/net/wan/lapbether.c linux-2.6.39/drivers/net/wan/lapbether.c
+--- linux-2.6.39/drivers/net/wan/lapbether.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/net/wan/x25_asy.c linux-2.6.39/drivers/net/wan/x25_asy.c
+--- linux-2.6.39/drivers/net/wan/x25_asy.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wan/x25_asy.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/net/wimax/i2400m/usb-fw.c linux-2.6.39/drivers/net/wimax/i2400m/usb-fw.c
+--- linux-2.6.39/drivers/net/wimax/i2400m/usb-fw.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wimax/i2400m/usb-fw.c 2011-05-22 19:36:31.000000000 -0400
+@@ -287,6 +287,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(stru
+ int do_autopm = 1;
+ DECLARE_COMPLETION_ONSTACK(notif_completion);
+
++ pax_track_stack();
++
+ 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/drivers/net/wireless/airo.c linux-2.6.39/drivers/net/wireless/airo.c
+--- linux-2.6.39/drivers/net/wireless/airo.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/airo.c 2011-05-22 19:36:31.000000000 -0400
+@@ -3001,6 +3001,8 @@ static void airo_process_scan_results (s
+ BSSListElement * loop_net;
+ BSSListElement * tmp_net;
+
++ pax_track_stack();
++
+ /* Blow away current list of scan results */
+ list_for_each_entry_safe (loop_net, tmp_net, &ai->network_list, list) {
+ list_move_tail (&loop_net->list, &ai->network_free_list);
+@@ -3792,6 +3794,8 @@ static u16 setup_card(struct airo_info *
+ WepKeyRid wkr;
+ int rc;
+
++ pax_track_stack();
++
+ memset( &mySsid, 0, sizeof( mySsid ) );
+ kfree (ai->flash);
+ ai->flash = NULL;
+@@ -4760,6 +4764,8 @@ static int proc_stats_rid_open( struct i
+ __le32 *vals = stats.vals;
+ int len;
+
++ pax_track_stack();
++
+ if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
+ return -ENOMEM;
+ data = file->private_data;
+@@ -5483,6 +5489,8 @@ static int proc_BSSList_open( struct ino
+ /* If doLoseSync is not 1, we won't do a Lose Sync */
+ int doLoseSync = -1;
+
++ pax_track_stack();
++
+ if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
+ return -ENOMEM;
+ data = file->private_data;
+@@ -7190,6 +7198,8 @@ static int airo_get_aplist(struct net_de
+ int i;
+ int loseSync = capable(CAP_NET_ADMIN) ? 1: -1;
+
++ pax_track_stack();
++
+ qual = kmalloc(IW_MAX_AP * sizeof(*qual), GFP_KERNEL);
+ if (!qual)
+ return -ENOMEM;
+@@ -7750,6 +7760,8 @@ static void airo_read_wireless_stats(str
+ CapabilityRid cap_rid;
+ __le32 *vals = stats_rid.vals;
+
++ pax_track_stack();
++
+ /* Get stats out of the card */
+ clear_bit(JOB_WSTATS, &local->jobs);
+ if (local->power.event) {
+diff -urNp linux-2.6.39/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.39/drivers/net/wireless/ath/ath5k/debug.c
+--- linux-2.6.39/drivers/net/wireless/ath/ath5k/debug.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/ath/ath5k/debug.c 2011-05-22 19:36:31.000000000 -0400
+@@ -204,6 +204,8 @@ static ssize_t read_file_beacon(struct f
+ unsigned int v;
+ u64 tsf;
+
++ pax_track_stack();
++
+ v = ath5k_hw_reg_read(sc->ah, AR5K_BEACON);
+ len += snprintf(buf+len, sizeof(buf)-len,
+ "%-24s0x%08x\tintval: %d\tTIM: 0x%x\n",
+@@ -323,6 +325,8 @@ static ssize_t read_file_debug(struct fi
+ unsigned int len = 0;
+ unsigned int i;
+
++ pax_track_stack();
++
+ len += snprintf(buf+len, sizeof(buf)-len,
+ "DEBUG LEVEL: 0x%08x\n\n", sc->debug.level);
+
+@@ -384,6 +388,8 @@ static ssize_t read_file_antenna(struct
+ unsigned int i;
+ unsigned int v;
+
++ pax_track_stack();
++
+ len += snprintf(buf+len, sizeof(buf)-len, "antenna mode\t%d\n",
+ sc->ah->ah_ant_mode);
+ len += snprintf(buf+len, sizeof(buf)-len, "default antenna\t%d\n",
+@@ -494,6 +500,8 @@ static ssize_t read_file_misc(struct fil
+ unsigned int len = 0;
+ u32 filt = ath5k_hw_get_rx_filter(sc->ah);
+
++ pax_track_stack();
++
+ len += snprintf(buf+len, sizeof(buf)-len, "bssid-mask: %pM\n",
+ sc->bssidmask);
+ len += snprintf(buf+len, sizeof(buf)-len, "filter-flags: 0x%x ",
+@@ -550,6 +558,8 @@ static ssize_t read_file_frameerrors(str
+ unsigned int len = 0;
+ int i;
+
++ pax_track_stack();
++
+ len += snprintf(buf+len, sizeof(buf)-len,
+ "RX\n---------------------\n");
+ len += snprintf(buf+len, sizeof(buf)-len, "CRC\t%u\t(%u%%)\n",
+@@ -667,6 +677,8 @@ static ssize_t read_file_ani(struct file
+ char buf[700];
+ unsigned int len = 0;
+
++ pax_track_stack();
++
+ len += snprintf(buf+len, sizeof(buf)-len,
+ "HW has PHY error counters:\t%s\n",
+ sc->ah->ah_capabilities.cap_has_phyerr_counters ?
+@@ -827,6 +839,8 @@ static ssize_t read_file_queue(struct fi
+ struct ath5k_buf *bf, *bf0;
+ int i, n;
+
++ pax_track_stack();
++
+ len += snprintf(buf+len, sizeof(buf)-len,
+ "available txbuffers: %d\n", sc->txbuf_len);
+
+diff -urNp linux-2.6.39/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-2.6.39/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+--- linux-2.6.39/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-05-22 19:36:31.000000000 -0400
+@@ -734,6 +734,8 @@ static void ar9003_hw_tx_iq_cal(struct a
+ s32 i, j, ip, im, nmeasurement;
+ u8 nchains = get_streams(common->tx_chainmask);
+
++ pax_track_stack();
++
+ for (ip = 0; ip < MPASS; ip++) {
+ REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_1,
+ AR_PHY_TX_IQCAQL_CONTROL_1_IQCORR_I_Q_COFF_DELPT,
+@@ -856,6 +858,8 @@ static void ar9003_hw_tx_iq_cal_post_pro
+ int i, ip, im, j;
+ int nmeasurement;
+
++ pax_track_stack();
++
+ for (i = 0; i < AR9300_MAX_CHAINS; i++) {
+ if (ah->txchainmask & (1 << i))
+ num_chains++;
+diff -urNp linux-2.6.39/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-2.6.39/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+--- linux-2.6.39/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-05-22 19:36:31.000000000 -0400
+@@ -356,6 +356,8 @@ static bool create_pa_curve(u32 *data_L,
+ int theta_low_bin = 0;
+ int i;
+
++ pax_track_stack();
++
+ /* disregard any bin that contains <= 16 samples */
+ thresh_accum_cnt = 16;
+ scale_factor = 5;
+diff -urNp linux-2.6.39/drivers/net/wireless/ath/ath9k/debug.c linux-2.6.39/drivers/net/wireless/ath/ath9k/debug.c
+--- linux-2.6.39/drivers/net/wireless/ath/ath9k/debug.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/ath/ath9k/debug.c 2011-05-22 19:36:31.000000000 -0400
+@@ -335,6 +335,8 @@ static ssize_t read_file_interrupt(struc
+ char buf[512];
+ unsigned int len = 0;
+
++ pax_track_stack();
++
+ if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
+ len += snprintf(buf + len, sizeof(buf) - len,
+ "%8s: %10u\n", "RXLP", sc->debug.stats.istats.rxlp);
+@@ -422,6 +424,8 @@ static ssize_t read_file_wiphy(struct fi
+ u8 addr[ETH_ALEN];
+ u32 tmp;
+
++ pax_track_stack();
++
+ 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/drivers/net/wireless/ath/ath9k/htc_drv_main.c linux-2.6.39/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+--- linux-2.6.39/drivers/net/wireless/ath/ath9k/htc_drv_main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/ath/ath9k/htc_drv_main.c 2011-05-22 19:36:31.000000000 -0400
+@@ -737,6 +737,8 @@ static ssize_t read_file_tgt_stats(struc
+ unsigned int len = 0;
+ int ret = 0;
+
++ pax_track_stack();
++
+ memset(&cmd_rsp, 0, sizeof(cmd_rsp));
+
+ WMI_CMD(WMI_TGT_STATS_CMDID);
+@@ -782,6 +784,8 @@ static ssize_t read_file_xmit(struct fil
+ char buf[512];
+ unsigned int len = 0;
+
++ pax_track_stack();
++
+ len += snprintf(buf + len, sizeof(buf) - len,
+ "%20s : %10u\n", "Buffers queued",
+ priv->debug.tx_stats.buf_queued);
+@@ -831,6 +835,8 @@ static ssize_t read_file_recv(struct fil
+ char buf[512];
+ unsigned int len = 0;
+
++ pax_track_stack();
++
+ 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/drivers/net/wireless/ath/ath9k/htc.h linux-2.6.39/drivers/net/wireless/ath/ath9k/htc.h
+--- linux-2.6.39/drivers/net/wireless/ath/ath9k/htc.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/net/wireless/ath/ath9k/hw.h linux-2.6.39/drivers/net/wireless/ath/ath9k/hw.h
+--- linux-2.6.39/drivers/net/wireless/ath/ath9k/hw.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/ath/ath9k/hw.h 2011-05-22 19:36:31.000000000 -0400
+@@ -753,9 +753,7 @@ struct ath_hw {
+ } enable_32kHz_clock;
+
+ /* Private to hardware code */
+- struct ath_hw_private_ops private_ops;
+- /* Accessed by the lower level driver */
+- struct ath_hw_ops ops;
++ struct ath_hw_private_ops private_ops;struct ath_hw_ops ops;
+
+ /* Used to program the radio on non single-chip devices */
+ u32 *analogBank0Data;
+diff -urNp linux-2.6.39/drivers/net/wireless/b43/debugfs.c linux-2.6.39/drivers/net/wireless/b43/debugfs.c
+--- linux-2.6.39/drivers/net/wireless/b43/debugfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/b43/debugfs.c 2011-05-22 19:36:31.000000000 -0400
@@ -43,7 +43,7 @@ static struct dentry *rootdir;
struct b43_debugfs_fops {
ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
/* Offset of struct b43_dfs_file in struct b43_dfsentry */
size_t file_struct_offset;
};
-diff -urNp linux-2.6.38.4/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.38.4/drivers/net/wireless/b43legacy/debugfs.c
---- linux-2.6.38.4/drivers/net/wireless/b43legacy/debugfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/wireless/b43legacy/debugfs.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.39/drivers/net/wireless/b43legacy/debugfs.c
+--- linux-2.6.39/drivers/net/wireless/b43legacy/debugfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/b43legacy/debugfs.c 2011-05-22 19:36:31.000000000 -0400
@@ -44,7 +44,7 @@ static struct dentry *rootdir;
struct b43legacy_debugfs_fops {
ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
/* 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.38.4/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.38.4/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-2.6.38.4/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/net/wireless/ipw2x00/ipw2100.c linux-2.6.39/drivers/net/wireless/ipw2x00/ipw2100.c
+--- linux-2.6.39/drivers/net/wireless/ipw2x00/ipw2100.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/ipw2x00/ipw2100.c 2011-05-22 19:36:31.000000000 -0400
+@@ -2100,6 +2100,8 @@ static int ipw2100_set_essid(struct ipw2
+ int err;
+ DECLARE_SSID_BUF(ssid);
+
++ pax_track_stack();
++
+ IPW_DEBUG_HC("SSID: '%s'\n", print_ssid(ssid, essid, ssid_len));
+
+ if (ssid_len)
+@@ -5449,6 +5451,8 @@ static int ipw2100_set_key(struct ipw210
+ struct ipw2100_wep_key *wep_key = (void *)cmd.host_command_parameters;
+ int err;
+
++ pax_track_stack();
++
+ IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n",
+ idx, keylen, len);
+
+diff -urNp linux-2.6.39/drivers/net/wireless/ipw2x00/libipw_rx.c linux-2.6.39/drivers/net/wireless/ipw2x00/libipw_rx.c
+--- linux-2.6.39/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-05-22 19:36:31.000000000 -0400
+@@ -1565,6 +1565,8 @@ static void libipw_process_probe_respons
+ unsigned long flags;
+ DECLARE_SSID_BUF(ssid);
+
++ pax_track_stack();
++
+ LIBIPW_DEBUG_SCAN("'%s' (%pM"
+ "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
+ print_ssid(ssid, info_element->data, info_element->len),
+diff -urNp linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-3945.c linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-3945.c
+--- linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-3945.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-3945.c 2011-05-22 19:36:31.000000000 -0400
+@@ -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/drivers/net/wireless/iwlegacy/iwl-4965.c linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-4965.c
+--- linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-4965.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-4965.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1904,7 +1904,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,
+@@ -2056,7 +2056,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,
+@@ -2114,7 +2114,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/drivers/net/wireless/iwlegacy/iwl-4965.h linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-4965.h
+--- linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-4965.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-4965.h 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/net/wireless/iwlegacy/iwl-core.h linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-core.h
+--- linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-core.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/iwlegacy/iwl-core.h 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-6000.c
+--- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-05-22 19:36:32.000000000 -0400
+@@ -422,11 +422,11 @@ static struct iwl_lib_ops iwl6030_lib =
+ }
+ };
+
+-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/drivers/net/wireless/iwlwifi/iwl-agn.h linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn.h
+--- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn.h 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c
+--- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c 2011-05-22 19:36:32.000000000 -0400
+@@ -363,7 +363,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,
+@@ -372,7 +372,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,
+@@ -381,7 +381,7 @@ struct iwl_hcmd_ops iwlagn_bt_hcmd = {
+ .set_pan_params = iwlagn_set_pan_params,
+ };
+
+-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/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+--- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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;
+
++ pax_track_stack();
++
+ IWL_DEBUG_RATE_LIMIT(priv, "get frame ack response, update rate scale window\n");
+
+ /* Treat uninitialized rate scaling data same as non-existing. */
+@@ -2894,6 +2896,8 @@ static void rs_fill_link_cmd(struct iwl_
+ container_of(lq_sta, struct iwl_station_priv, lq_sta);
+ struct iwl_link_quality_cmd *lq_cmd = &lq_sta->lq;
+
++ pax_track_stack();
++
+ /* 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/drivers/net/wireless/iwlwifi/iwl-core.h linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-core.h
+--- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-core.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-core.h 2011-05-22 19:36:32.000000000 -0400
+@@ -198,28 +198,25 @@ struct iwl_lib_ops {
+ int (*set_channel_switch)(struct iwl_priv *priv,
+ struct ieee80211_channel_switch *ch_switch);
+ /* 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/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+--- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-05-22 19:36:32.000000000 -0400
+@@ -549,6 +549,8 @@ static ssize_t iwl_dbgfs_status_read(str
+ int pos = 0;
+ const size_t bufsz = sizeof(buf);
+
++ pax_track_stack();
++
+ pos += scnprintf(buf + pos, bufsz - pos, "STATUS_HCMD_ACTIVE:\t %d\n",
+ test_bit(STATUS_HCMD_ACTIVE, &priv->status));
+ pos += scnprintf(buf + pos, bufsz - pos, "STATUS_INT_ENABLED:\t %d\n",
+@@ -681,6 +683,8 @@ static ssize_t iwl_dbgfs_qos_read(struct
+ char buf[256 * NUM_IWL_RXON_CTX];
+ const size_t bufsz = sizeof(buf);
+
++ pax_track_stack();
++
+ for_each_context(priv, ctx) {
+ pos += scnprintf(buf + pos, bufsz - pos, "context %d:\n",
+ ctx->ctxid);
+diff -urNp linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-05-22 19:36:32.000000000 -0400
@@ -68,8 +68,8 @@ do {
} while (0)
static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
const void *p, u32 len)
{}
-diff -urNp linux-2.6.38.4/drivers/net/wireless/libertas/debugfs.c linux-2.6.38.4/drivers/net/wireless/libertas/debugfs.c
---- linux-2.6.38.4/drivers/net/wireless/libertas/debugfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/wireless/libertas/debugfs.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/net/wireless/iwmc3200wifi/cfg80211.c linux-2.6.39/drivers/net/wireless/iwmc3200wifi/cfg80211.c
+--- linux-2.6.39/drivers/net/wireless/iwmc3200wifi/cfg80211.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/iwmc3200wifi/cfg80211.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-2.6.39/drivers/net/wireless/iwmc3200wifi/debugfs.c
+--- linux-2.6.39/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-05-22 19:36:32.000000000 -0400
+@@ -327,6 +327,8 @@ static ssize_t iwm_debugfs_fw_err_read(s
+ int buf_len = 512;
+ size_t len = 0;
+
++ pax_track_stack();
++
+ if (*ppos != 0)
+ return 0;
+ if (count < sizeof(buf))
+diff -urNp linux-2.6.39/drivers/net/wireless/libertas/cfg.c linux-2.6.39/drivers/net/wireless/libertas/cfg.c
+--- linux-2.6.39/drivers/net/wireless/libertas/cfg.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/libertas/cfg.c 2011-05-22 19:36:32.000000000 -0400
+@@ -2003,7 +2003,7 @@ static int lbs_leave_ibss(struct wiphy *
+ * Initialization
+ */
+
+-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/drivers/net/wireless/libertas/debugfs.c linux-2.6.39/drivers/net/wireless/libertas/debugfs.c
+--- linux-2.6.39/drivers/net/wireless/libertas/debugfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
};
static const struct lbs_debugfs_files debugfs_files[] = {
-diff -urNp linux-2.6.38.4/drivers/net/wireless/rndis_wlan.c linux-2.6.38.4/drivers/net/wireless/rndis_wlan.c
---- linux-2.6.38.4/drivers/net/wireless/rndis_wlan.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/wireless/rndis_wlan.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/net/wireless/rndis_wlan.c linux-2.6.39/drivers/net/wireless/rndis_wlan.c
+--- linux-2.6.39/drivers/net/wireless/rndis_wlan.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/rndis_wlan.c 2011-05-22 19:36:32.000000000 -0400
@@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbn
netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
rts_threshold = 2347;
tmp = cpu_to_le32(rts_threshold);
-diff -urNp linux-2.6.38.4/drivers/oprofile/buffer_sync.c linux-2.6.38.4/drivers/oprofile/buffer_sync.c
---- linux-2.6.38.4/drivers/oprofile/buffer_sync.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/oprofile/buffer_sync.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/net/wireless/rtlwifi/pci.c linux-2.6.39/drivers/net/wireless/rtlwifi/pci.c
+--- linux-2.6.39/drivers/net/wireless/rtlwifi/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/rtlwifi/pci.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/net/wireless/rtlwifi/pci.h linux-2.6.39/drivers/net/wireless/rtlwifi/pci.h
+--- linux-2.6.39/drivers/net/wireless/rtlwifi/pci.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/rtlwifi/pci.h 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
+--- linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-05-22 19:36:32.000000000 -0400
+@@ -827,6 +827,8 @@ static bool _rtl92c_phy_sw_chnl_step_by_
+ u8 rfpath;
+ u8 num_total_rfpath = rtlphy->num_total_rfpath;
+
++ pax_track_stack();
++
+ precommoncmdcnt = 0;
+ _rtl92c_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++,
+ MAX_PRECMD_CNT,
+diff -urNp linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
+--- linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+--- linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/net/wireless/rtlwifi/usb.c linux-2.6.39/drivers/net/wireless/rtlwifi/usb.c
+--- linux-2.6.39/drivers/net/wireless/rtlwifi/usb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/rtlwifi/usb.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/net/wireless/rtlwifi/wifi.h linux-2.6.39/drivers/net/wireless/rtlwifi/wifi.h
+--- linux-2.6.39/drivers/net/wireless/rtlwifi/wifi.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/rtlwifi/wifi.h 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/net/wireless/wl12xx/spi.c linux-2.6.39/drivers/net/wireless/wl12xx/spi.c
+--- linux-2.6.39/drivers/net/wireless/wl12xx/spi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/wireless/wl12xx/spi.c 2011-05-22 19:36:32.000000000 -0400
+@@ -280,6 +280,8 @@ static void wl1271_spi_raw_write(struct
+ u32 chunk_len;
+ int i;
+
++ pax_track_stack();
++
+ WARN_ON(len > WL1271_AGGR_BUFFER_SIZE);
+
+ spi_message_init(&m);
+diff -urNp linux-2.6.39/drivers/net/xen-netback/interface.c linux-2.6.39/drivers/net/xen-netback/interface.c
+--- linux-2.6.39/drivers/net/xen-netback/interface.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/net/xen-netback/interface.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/net/xilinx_emaclite.c linux-2.6.39/drivers/net/xilinx_emaclite.c
+--- linux-2.6.39/drivers/net/xilinx_emaclite.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/nfc/pn544.c linux-2.6.39/drivers/nfc/pn544.c
+--- linux-2.6.39/drivers/nfc/pn544.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/nfc/pn544.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/of/pdt.c linux-2.6.39/drivers/of/pdt.c
+--- linux-2.6.39/drivers/of/pdt.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/of/pdt.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/oprofile/buffer_sync.c linux-2.6.39/drivers/oprofile/buffer_sync.c
+--- linux-2.6.39/drivers/oprofile/buffer_sync.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/oprofile/buffer_sync.c 2011-05-22 19:36:32.000000000 -0400
@@ -342,7 +342,7 @@ static void add_data(struct op_entry *en
if (cookie == NO_COOKIE)
offset = pc;
}
}
release_mm(mm);
-diff -urNp linux-2.6.38.4/drivers/oprofile/event_buffer.c linux-2.6.38.4/drivers/oprofile/event_buffer.c
---- linux-2.6.38.4/drivers/oprofile/event_buffer.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/oprofile/event_buffer.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/oprofile/event_buffer.c linux-2.6.39/drivers/oprofile/event_buffer.c
+--- linux-2.6.39/drivers/oprofile/event_buffer.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/oprofile/event_buffer.c 2011-05-22 19:36:32.000000000 -0400
@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
}
return;
}
-diff -urNp linux-2.6.38.4/drivers/oprofile/oprof.c linux-2.6.38.4/drivers/oprofile/oprof.c
---- linux-2.6.38.4/drivers/oprofile/oprof.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/oprofile/oprof.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/oprofile/oprof.c linux-2.6.39/drivers/oprofile/oprof.c
+--- linux-2.6.39/drivers/oprofile/oprof.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/oprofile/oprof.c 2011-05-22 19:36:32.000000000 -0400
@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
if (oprofile_ops.switch_events())
return;
start_switch_worker();
}
-diff -urNp linux-2.6.38.4/drivers/oprofile/oprofilefs.c linux-2.6.38.4/drivers/oprofile/oprofilefs.c
---- linux-2.6.38.4/drivers/oprofile/oprofilefs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/oprofile/oprofilefs.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/oprofile/oprofilefs.c linux-2.6.39/drivers/oprofile/oprofilefs.c
+--- linux-2.6.39/drivers/oprofile/oprofilefs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/oprofile/oprofilefs.c 2011-05-22 19:36:32.000000000 -0400
@@ -186,7 +186,7 @@ static const struct file_operations atom
{
return __oprofilefs_create_file(sb, root, name,
&atomic_ro_fops, 0444, val);
-diff -urNp linux-2.6.38.4/drivers/oprofile/oprofile_stats.c linux-2.6.38.4/drivers/oprofile/oprofile_stats.c
---- linux-2.6.38.4/drivers/oprofile/oprofile_stats.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/oprofile/oprofile_stats.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/oprofile/oprofile_stats.c linux-2.6.39/drivers/oprofile/oprofile_stats.c
+--- linux-2.6.39/drivers/oprofile/oprofile_stats.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/oprofile/oprofile_stats.c 2011-05-22 19:36:32.000000000 -0400
@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
cpu_buf->sample_invalid_eip = 0;
}
}
-diff -urNp linux-2.6.38.4/drivers/oprofile/oprofile_stats.h linux-2.6.38.4/drivers/oprofile/oprofile_stats.h
---- linux-2.6.38.4/drivers/oprofile/oprofile_stats.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/oprofile/oprofile_stats.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/oprofile/oprofile_stats.h linux-2.6.39/drivers/oprofile/oprofile_stats.h
+--- linux-2.6.39/drivers/oprofile/oprofile_stats.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/oprofile/oprofile_stats.h 2011-05-22 19:36:32.000000000 -0400
@@ -13,11 +13,11 @@
#include <asm/atomic.h>
};
extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-2.6.38.4/drivers/parport/procfs.c linux-2.6.38.4/drivers/parport/procfs.c
---- linux-2.6.38.4/drivers/parport/procfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/parport/procfs.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/parisc/dino.c linux-2.6.39/drivers/parisc/dino.c
+--- linux-2.6.39/drivers/parisc/dino.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/parisc/lba_pci.c linux-2.6.39/drivers/parisc/lba_pci.c
+--- linux-2.6.39/drivers/parisc/lba_pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/parisc/lba_pci.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/parport/procfs.c linux-2.6.39/drivers/parport/procfs.c
+--- linux-2.6.39/drivers/parport/procfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/parport/procfs.c 2011-05-22 19:36:32.000000000 -0400
@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
*ppos += len;
}
#endif /* IEEE1284.3 support. */
-diff -urNp linux-2.6.38.4/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.38.4/drivers/pci/hotplug/acpiphp_glue.c
---- linux-2.6.38.4/drivers/pci/hotplug/acpiphp_glue.c 2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/drivers/pci/hotplug/acpiphp_glue.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/pci/access.c linux-2.6.39/drivers/pci/access.c
+--- linux-2.6.39/drivers/pci/access.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.39/drivers/pci/hotplug/acpiphp_glue.c
+--- linux-2.6.39/drivers/pci/hotplug/acpiphp_glue.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/pci/hotplug/acpiphp_glue.c 2011-05-22 19:36:32.000000000 -0400
@@ -110,7 +110,7 @@ static int post_dock_fixups(struct notif
}
.handler = handle_hotplug_event_func,
};
-diff -urNp linux-2.6.38.4/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.38.4/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-2.6.38.4/drivers/pci/hotplug/cpqphp_nvram.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/pci/hotplug/cpqphp_nvram.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.39/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-2.6.39/drivers/pci/hotplug/cpqphp_nvram.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/pci/hotplug/cpqphp_nvram.c 2011-05-22 19:36:32.000000000 -0400
@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
void compaq_nvram_init (void __iomem *rom_start)
dbg("int15 entry = %p\n", compaq_int15_entry_point);
/* initialize our int15 lock */
-diff -urNp linux-2.6.38.4/drivers/pci/intel-iommu.c linux-2.6.38.4/drivers/pci/intel-iommu.c
---- linux-2.6.38.4/drivers/pci/intel-iommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/pci/intel-iommu.c 2011-04-28 19:34:15.000000000 -0400
-@@ -2934,7 +2934,7 @@ static int intel_mapping_error(struct de
+diff -urNp linux-2.6.39/drivers/pci/hotplug/shpchp.h linux-2.6.39/drivers/pci/hotplug/shpchp.h
+--- linux-2.6.39/drivers/pci/hotplug/shpchp.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/pci/hotplug/shpchp_hpc.c linux-2.6.39/drivers/pci/hotplug/shpchp_hpc.c
+--- linux-2.6.39/drivers/pci/hotplug/shpchp_hpc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/pci/intel-iommu.c linux-2.6.39/drivers/pci/intel-iommu.c
+--- linux-2.6.39/drivers/pci/intel-iommu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/pci/intel-iommu.c 2011-05-22 19:36:32.000000000 -0400
+@@ -391,7 +391,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)
+ {
+@@ -2945,7 +2945,7 @@ static int intel_mapping_error(struct de
return !dma_addr;
}
.alloc_coherent = intel_alloc_coherent,
.free_coherent = intel_free_coherent,
.map_sg = intel_map_sg,
-diff -urNp linux-2.6.38.4/drivers/pci/pcie/aspm.c linux-2.6.38.4/drivers/pci/pcie/aspm.c
---- linux-2.6.38.4/drivers/pci/pcie/aspm.c 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/drivers/pci/pcie/aspm.c 2011-04-28 19:34:15.000000000 -0400
+@@ -3739,7 +3739,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/drivers/pci/pci-acpi.c linux-2.6.39/drivers/pci/pci-acpi.c
+--- linux-2.6.39/drivers/pci/pci-acpi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/pci/pci.c linux-2.6.39/drivers/pci/pci.c
+--- linux-2.6.39/drivers/pci/pci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/pci/pci.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/pci/pcie/aer/aerdrv_core.c linux-2.6.39/drivers/pci/pcie/aer/aerdrv_core.c
+--- linux-2.6.39/drivers/pci/pcie/aer/aerdrv_core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/pci/pcie/aer/aerdrv_core.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/pci/pcie/aer/aer_inject.c linux-2.6.39/drivers/pci/pcie/aer/aer_inject.c
+--- linux-2.6.39/drivers/pci/pcie/aer/aer_inject.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/pci/pcie/aspm.c linux-2.6.39/drivers/pci/pcie/aspm.c
+--- linux-2.6.39/drivers/pci/pcie/aspm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/pci/pcie/aspm.c 2011-05-22 19:36:32.000000000 -0400
@@ -27,9 +27,9 @@
#define MODULE_PARAM_PREFIX "pcie_aspm."
#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.38.4/drivers/pci/probe.c linux-2.6.38.4/drivers/pci/probe.c
---- linux-2.6.38.4/drivers/pci/probe.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/pci/probe.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/pci/pci.h linux-2.6.39/drivers/pci/pci.h
+--- linux-2.6.39/drivers/pci/pci.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/pci/pci.h 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/pci/probe.c linux-2.6.39/drivers/pci/probe.c
+--- linux-2.6.39/drivers/pci/probe.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/pci/probe.c 2011-05-22 19:36:32.000000000 -0400
@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
return ret;
}
if (!dev->mmio_always_on) {
pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
-diff -urNp linux-2.6.38.4/drivers/pci/proc.c linux-2.6.38.4/drivers/pci/proc.c
---- linux-2.6.38.4/drivers/pci/proc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/pci/proc.c 2011-04-28 19:34:15.000000000 -0400
+@@ -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/drivers/pci/proc.c linux-2.6.39/drivers/pci/proc.c
+--- linux-2.6.39/drivers/pci/proc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/pci/proc.c 2011-05-22 19:41:37.000000000 -0400
@@ -476,7 +476,16 @@ static const struct file_operations proc
static int __init pci_proc_init(void)
{
proc_create("devices", 0, proc_bus_pci_dir,
&proc_bus_pci_dev_operations);
proc_initialized = 1;
-diff -urNp linux-2.6.38.4/drivers/platform/x86/asus-laptop.c linux-2.6.38.4/drivers/platform/x86/asus-laptop.c
---- linux-2.6.38.4/drivers/platform/x86/asus-laptop.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/platform/x86/asus-laptop.c 2011-04-28 19:34:15.000000000 -0400
-@@ -243,7 +243,6 @@ struct asus_laptop {
- struct asus_led gled;
- struct asus_led kled;
- struct workqueue_struct *led_workqueue;
--
- int wireless_status;
- bool have_rsts;
- int lcd_state;
-diff -urNp linux-2.6.38.4/drivers/pnp/pnpbios/bioscalls.c linux-2.6.38.4/drivers/pnp/pnpbios/bioscalls.c
---- linux-2.6.38.4/drivers/pnp/pnpbios/bioscalls.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/pnp/pnpbios/bioscalls.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/pci/xen-pcifront.c linux-2.6.39/drivers/pci/xen-pcifront.c
+--- linux-2.6.39/drivers/pci/xen-pcifront.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/pci/xen-pcifront.c 2011-05-22 19:36:32.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);
+
++ pax_track_stack();
++
+ if (verbose_request)
+ dev_info(&pdev->xdev->dev,
+ "read dev=%04x:%02x:%02x.%01x - offset %x size %d\n",
+@@ -226,6 +228,8 @@ static int pcifront_bus_write(struct pci
+ struct pcifront_sd *sd = bus->sysdata;
+ struct pcifront_device *pdev = pcifront_get_pdev(sd);
+
++ pax_track_stack();
++
+ 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;
+
++ pax_track_stack();
++
+ if (nvec > SH_INFO_MAX_VEC) {
+ dev_err(&dev->dev, "too much vector for pci frontend: %x."
+ " Increase SH_INFO_MAX_VEC.\n", nvec);
+@@ -309,6 +315,8 @@ static void pci_frontend_disable_msix(st
+ struct pcifront_sd *sd = dev->bus->sysdata;
+ struct pcifront_device *pdev = pcifront_get_pdev(sd);
+
++ pax_track_stack();
++
+ err = do_pci_op(pdev, &op);
+
+ /* What should do for error ? */
+@@ -328,6 +336,8 @@ static int pci_frontend_enable_msi(struc
+ struct pcifront_sd *sd = dev->bus->sysdata;
+ struct pcifront_device *pdev = pcifront_get_pdev(sd);
+
++ pax_track_stack();
++
+ 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/drivers/pcmcia/at91_cf.c linux-2.6.39/drivers/pcmcia/at91_cf.c
+--- linux-2.6.39/drivers/pcmcia/at91_cf.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/pcmcia/at91_cf.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/pcmcia/bfin_cf_pcmcia.c linux-2.6.39/drivers/pcmcia/bfin_cf_pcmcia.c
+--- linux-2.6.39/drivers/pcmcia/bfin_cf_pcmcia.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/pcmcia/db1xxx_ss.c linux-2.6.39/drivers/pcmcia/db1xxx_ss.c
+--- linux-2.6.39/drivers/pcmcia/db1xxx_ss.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/pcmcia/electra_cf.c linux-2.6.39/drivers/pcmcia/electra_cf.c
+--- linux-2.6.39/drivers/pcmcia/electra_cf.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/pcmcia/m32r_cfc.c linux-2.6.39/drivers/pcmcia/m32r_cfc.c
+--- linux-2.6.39/drivers/pcmcia/m32r_cfc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/pcmcia/m32r_cfc.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/pcmcia/m32r_pcc.c linux-2.6.39/drivers/pcmcia/m32r_pcc.c
+--- linux-2.6.39/drivers/pcmcia/m32r_pcc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/pcmcia/m32r_pcc.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/pcmcia/m8xx_pcmcia.c linux-2.6.39/drivers/pcmcia/m8xx_pcmcia.c
+--- linux-2.6.39/drivers/pcmcia/m8xx_pcmcia.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/pcmcia/omap_cf.c linux-2.6.39/drivers/pcmcia/omap_cf.c
+--- linux-2.6.39/drivers/pcmcia/omap_cf.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/pcmcia/omap_cf.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/pcmcia/rsrc_iodyn.c linux-2.6.39/drivers/pcmcia/rsrc_iodyn.c
+--- linux-2.6.39/drivers/pcmcia/rsrc_iodyn.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/pcmcia/rsrc_mgr.c linux-2.6.39/drivers/pcmcia/rsrc_mgr.c
+--- linux-2.6.39/drivers/pcmcia/rsrc_mgr.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/pcmcia/rsrc_mgr.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/pcmcia/vrc4171_card.c linux-2.6.39/drivers/pcmcia/vrc4171_card.c
+--- linux-2.6.39/drivers/pcmcia/vrc4171_card.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
+ 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/drivers/pcmcia/vrc4173_cardu.c linux-2.6.39/drivers/pcmcia/vrc4173_cardu.c
+--- linux-2.6.39/drivers/pcmcia/vrc4173_cardu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/pcmcia/vrc4173_cardu.c 2011-05-22 19:36:32.000000000 -0400
+@@ -384,7 +384,7 @@ static void cardu_proc_setup(unsigned in
+ {
+ }
+
+-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/drivers/pcmcia/xxs1500_ss.c linux-2.6.39/drivers/pcmcia/xxs1500_ss.c
+--- linux-2.6.39/drivers/pcmcia/xxs1500_ss.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/platform/x86/acerhdf.c linux-2.6.39/drivers/platform/x86/acerhdf.c
+--- linux-2.6.39/drivers/platform/x86/acerhdf.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/platform/x86/ideapad-laptop.c linux-2.6.39/drivers/platform/x86/ideapad-laptop.c
+--- linux-2.6.39/drivers/platform/x86/ideapad-laptop.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/platform/x86/ideapad-laptop.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/platform/x86/intel_menlow.c linux-2.6.39/drivers/platform/x86/intel_menlow.c
+--- linux-2.6.39/drivers/platform/x86/intel_menlow.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/platform/x86/intel_menlow.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/platform/x86/intel_mid_thermal.c linux-2.6.39/drivers/platform/x86/intel_mid_thermal.c
+--- linux-2.6.39/drivers/platform/x86/intel_mid_thermal.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/platform/x86/intel_mid_thermal.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/platform/x86/samsung-laptop.c linux-2.6.39/drivers/platform/x86/samsung-laptop.c
+--- linux-2.6.39/drivers/platform/x86/samsung-laptop.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/platform/x86/samsung-laptop.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/pnp/pnpbios/bioscalls.c linux-2.6.39/drivers/pnp/pnpbios/bioscalls.c
+--- linux-2.6.39/drivers/pnp/pnpbios/bioscalls.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/pnp/pnpbios/bioscalls.c 2011-05-22 19:36:32.000000000 -0400
@@ -59,7 +59,7 @@ do { \
set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
} while(0)
+
+ pax_close_kernel();
}
-diff -urNp linux-2.6.38.4/drivers/pnp/resource.c linux-2.6.38.4/drivers/pnp/resource.c
---- linux-2.6.38.4/drivers/pnp/resource.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/pnp/resource.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/pnp/resource.c linux-2.6.39/drivers/pnp/resource.c
+--- linux-2.6.39/drivers/pnp/resource.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/pnp/resource.c 2011-05-22 19:36:32.000000000 -0400
@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
return 1;
return 0;
/* check if the resource is reserved */
-diff -urNp linux-2.6.38.4/drivers/rtc/rtc-dev.c linux-2.6.38.4/drivers/rtc/rtc-dev.c
---- linux-2.6.38.4/drivers/rtc/rtc-dev.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/rtc/rtc-dev.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/power/max8925_power.c linux-2.6.39/drivers/power/max8925_power.c
+--- linux-2.6.39/drivers/power/max8925_power.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/regulator/core.c linux-2.6.39/drivers/regulator/core.c
+--- linux-2.6.39/drivers/regulator/core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/regulator/core.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/rtc/rtc-at32ap700x.c linux-2.6.39/drivers/rtc/rtc-at32ap700x.c
+--- linux-2.6.39/drivers/rtc/rtc-at32ap700x.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/rtc/rtc-au1xxx.c linux-2.6.39/drivers/rtc/rtc-au1xxx.c
+--- linux-2.6.39/drivers/rtc/rtc-au1xxx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/rtc/rtc-au1xxx.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/rtc/rtc-bfin.c linux-2.6.39/drivers/rtc/rtc-bfin.c
+--- linux-2.6.39/drivers/rtc/rtc-bfin.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/rtc/rtc-coh901331.c linux-2.6.39/drivers/rtc/rtc-coh901331.c
+--- linux-2.6.39/drivers/rtc/rtc-coh901331.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
+ }
+
+-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/drivers/rtc/rtc-davinci.c linux-2.6.39/drivers/rtc/rtc-davinci.c
+--- linux-2.6.39/drivers/rtc/rtc-davinci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/rtc/rtc-davinci.c 2011-05-22 19:36:32.000000000 -0400
+@@ -469,7 +469,7 @@ static int davinci_rtc_set_alarm(struct
+ return 0;
+ }
+
+-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/drivers/rtc/rtc-dev.c linux-2.6.39/drivers/rtc/rtc-dev.c
+--- linux-2.6.39/drivers/rtc/rtc-dev.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/rtc/rtc-dev.c 2011-05-22 19:41:37.000000000 -0400
@@ -14,6 +14,7 @@
#include <linux/module.h>
#include <linux/rtc.h>
return rtc_set_time(rtc, &tm);
case RTC_PIE_ON:
-diff -urNp linux-2.6.38.4/drivers/s390/cio/qdio_debug.c linux-2.6.38.4/drivers/s390/cio/qdio_debug.c
---- linux-2.6.38.4/drivers/s390/cio/qdio_debug.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/s390/cio/qdio_debug.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/rtc/rtc-dm355evm.c linux-2.6.39/drivers/rtc/rtc-dm355evm.c
+--- linux-2.6.39/drivers/rtc/rtc-dm355evm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/rtc/rtc-ds1302.c linux-2.6.39/drivers/rtc/rtc-ds1302.c
+--- linux-2.6.39/drivers/rtc/rtc-ds1302.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/rtc/rtc-ds1302.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/rtc/rtc-imxdi.c linux-2.6.39/drivers/rtc/rtc-imxdi.c
+--- linux-2.6.39/drivers/rtc/rtc-imxdi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/rtc/rtc-imxdi.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/rtc/rtc-jz4740.c linux-2.6.39/drivers/rtc/rtc-jz4740.c
+--- linux-2.6.39/drivers/rtc/rtc-jz4740.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/rtc/rtc-jz4740.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/rtc/rtc-m41t80.c linux-2.6.39/drivers/rtc/rtc-m41t80.c
+--- linux-2.6.39/drivers/rtc/rtc-m41t80.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/rtc/rtc-m41t80.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/rtc/rtc-mxc.c linux-2.6.39/drivers/rtc/rtc-mxc.c
+--- linux-2.6.39/drivers/rtc/rtc-mxc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/rtc/rtc-nuc900.c linux-2.6.39/drivers/rtc/rtc-nuc900.c
+--- linux-2.6.39/drivers/rtc/rtc-nuc900.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/rtc/rtc-nuc900.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/rtc/rtc-omap.c linux-2.6.39/drivers/rtc/rtc-omap.c
+--- linux-2.6.39/drivers/rtc/rtc-omap.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/rtc/rtc-pcf50633.c linux-2.6.39/drivers/rtc/rtc-pcf50633.c
+--- linux-2.6.39/drivers/rtc/rtc-pcf50633.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/rtc/rtc-pl031.c linux-2.6.39/drivers/rtc/rtc-pl031.c
+--- linux-2.6.39/drivers/rtc/rtc-pl031.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/rtc/rtc-pl031.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/rtc/rtc-rx8025.c linux-2.6.39/drivers/rtc/rtc-rx8025.c
+--- linux-2.6.39/drivers/rtc/rtc-rx8025.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/rtc/rtc-rx8025.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/rtc/rtc-sh.c linux-2.6.39/drivers/rtc/rtc-sh.c
+--- linux-2.6.39/drivers/rtc/rtc-sh.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/rtc/rtc-stmp3xxx.c linux-2.6.39/drivers/rtc/rtc-stmp3xxx.c
+--- linux-2.6.39/drivers/rtc/rtc-stmp3xxx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/rtc/rtc-tegra.c linux-2.6.39/drivers/rtc/rtc-tegra.c
+--- linux-2.6.39/drivers/rtc/rtc-tegra.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/rtc/rtc-tegra.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/rtc/rtc-twl.c linux-2.6.39/drivers/rtc/rtc-twl.c
+--- linux-2.6.39/drivers/rtc/rtc-twl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/rtc/rtc-v3020.c linux-2.6.39/drivers/rtc/rtc-v3020.c
+--- linux-2.6.39/drivers/rtc/rtc-v3020.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/rtc/rtc-v3020.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/s390/char/con3270.c linux-2.6.39/drivers/s390/char/con3270.c
+--- linux-2.6.39/drivers/s390/char/con3270.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
+
+ /*
+ * 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/drivers/s390/char/fs3270.c linux-2.6.39/drivers/s390/char/fs3270.c
+--- linux-2.6.39/drivers/s390/char/fs3270.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/s390/char/raw3270.c linux-2.6.39/drivers/s390/char/raw3270.c
+--- linux-2.6.39/drivers/s390/char/raw3270.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/s390/char/tty3270.c linux-2.6.39/drivers/s390/char/tty3270.c
+--- linux-2.6.39/drivers/s390/char/tty3270.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/s390/cio/qdio_debug.c linux-2.6.39/drivers/s390/cio/qdio_debug.c
+--- linux-2.6.39/drivers/s390/cio/qdio_debug.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
}
.owner = THIS_MODULE,
.open = qperf_seq_open,
.read = seq_read,
-diff -urNp linux-2.6.38.4/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.38.4/drivers/scsi/aic94xx/aic94xx_init.c
---- linux-2.6.38.4/drivers/scsi/aic94xx/aic94xx_init.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/aic94xx/aic94xx_init.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/s390/crypto/zcrypt_cex2a.c linux-2.6.39/drivers/s390/crypto/zcrypt_cex2a.c
+--- linux-2.6.39/drivers/s390/crypto/zcrypt_cex2a.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/s390/crypto/zcrypt_cex2a.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/s390/crypto/zcrypt_pcica.c linux-2.6.39/drivers/s390/crypto/zcrypt_pcica.c
+--- linux-2.6.39/drivers/s390/crypto/zcrypt_pcica.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/s390/crypto/zcrypt_pcica.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/s390/crypto/zcrypt_pcicc.c linux-2.6.39/drivers/s390/crypto/zcrypt_pcicc.c
+--- linux-2.6.39/drivers/s390/crypto/zcrypt_pcicc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/s390/crypto/zcrypt_pcicc.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/s390/crypto/zcrypt_pcixcc.c linux-2.6.39/drivers/s390/crypto/zcrypt_pcixcc.c
+--- linux-2.6.39/drivers/s390/crypto/zcrypt_pcixcc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/s390/crypto/zcrypt_pcixcc.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/s390/kvm/kvm_virtio.c linux-2.6.39/drivers/s390/kvm/kvm_virtio.c
+--- linux-2.6.39/drivers/s390/kvm/kvm_virtio.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/s390/net/qeth_core.h linux-2.6.39/drivers/s390/net/qeth_core.h
+--- linux-2.6.39/drivers/s390/net/qeth_core.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/scsi/53c700.c linux-2.6.39/drivers/scsi/53c700.c
+--- linux-2.6.39/drivers/scsi/53c700.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/scsi/aacraid/commctrl.c linux-2.6.39/drivers/scsi/aacraid/commctrl.c
+--- linux-2.6.39/drivers/scsi/aacraid/commctrl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/aacraid/commctrl.c 2011-05-22 19:36:32.000000000 -0400
+@@ -482,6 +482,7 @@ static int aac_send_raw_srb(struct aac_d
+ u32 actual_fibsize64, actual_fibsize = 0;
+ int i;
+
++ pax_track_stack();
+
+ if (dev->in_reset) {
+ dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n"));
+diff -urNp linux-2.6.39/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.39/drivers/scsi/aic94xx/aic94xx_init.c
+--- linux-2.6.39/drivers/scsi/aic94xx/aic94xx_init.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/aic94xx/aic94xx_init.c 2011-05-22 19:41:37.000000000 -0400
@@ -486,7 +486,7 @@ static ssize_t asd_show_update_bios(stru
flash_error_table[i].reason);
}
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.38.4/drivers/scsi/hosts.c linux-2.6.38.4/drivers/scsi/hosts.c
---- linux-2.6.38.4/drivers/scsi/hosts.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/hosts.c 2011-04-28 19:57:25.000000000 -0400
-@@ -42,7 +42,7 @@
- #include "scsi_logging.h"
-
+diff -urNp linux-2.6.39/drivers/scsi/bfa/bfa_core.c linux-2.6.39/drivers/scsi/bfa/bfa_core.c
+--- linux-2.6.39/drivers/scsi/bfa/bfa_core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/scsi/bfa/bfad.c linux-2.6.39/drivers/scsi/bfa/bfad.c
+--- linux-2.6.39/drivers/scsi/bfa/bfad.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/bfa/bfad.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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;
+
++ pax_track_stack();
++
+ /* Fill the driver_info info to fcs*/
+ memset(&driver_info, 0, sizeof(driver_info));
+ strncpy(driver_info.version, BFAD_DRIVER_VERSION,
+diff -urNp linux-2.6.39/drivers/scsi/bfa/bfa_fcs.c linux-2.6.39/drivers/scsi/bfa/bfa_fcs.c
+--- linux-2.6.39/drivers/scsi/bfa/bfa_fcs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
--static atomic_t scsi_host_next_hn; /* host_no for next new host */
-+static atomic_unchecked_t scsi_host_next_hn; /* host_no for next new host */
+ bfa_wc_init(&fcs->wc, bfa_fcs_exit_comp, fcs);
+diff -urNp linux-2.6.39/drivers/scsi/bfa/bfa_fcs_lport.c linux-2.6.39/drivers/scsi/bfa/bfa_fcs_lport.c
+--- linux-2.6.39/drivers/scsi/bfa/bfa_fcs_lport.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/bfa/bfa_fcs_lport.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1559,6 +1559,8 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struc
+ u16 len, count;
+ u16 templen;
++ pax_track_stack();
++
+ /*
+ * get hba attributes
+ */
+@@ -1836,6 +1838,8 @@ bfa_fcs_lport_fdmi_build_portattr_block(
+ u8 count = 0;
+ u16 templen;
- static void scsi_host_cls_release(struct device *dev)
-@@ -354,7 +354,7 @@ struct Scsi_Host *scsi_host_alloc(struct
- * subtract one because we increment first then return, but we need to
- * know what the next host number was before increment
++ pax_track_stack();
++
+ /*
+ * get port attributes
*/
-- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
-+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
- shost->dma_channel = 0xff;
+diff -urNp linux-2.6.39/drivers/scsi/bfa/bfa_fcs_rport.c linux-2.6.39/drivers/scsi/bfa/bfa_fcs_rport.c
+--- linux-2.6.39/drivers/scsi/bfa/bfa_fcs_rport.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/bfa/bfa_fcs_rport.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1844,6 +1844,8 @@ bfa_fcs_rport_process_rpsc(struct bfa_fc
+ struct fc_rpsc_speed_info_s speeds;
+ struct bfa_port_attr_s pport_attr;
+
++ pax_track_stack();
++
+ bfa_trc(port->fcs, rx_fchs->s_id);
+ bfa_trc(port->fcs, rx_fchs->d_id);
+
+diff -urNp linux-2.6.39/drivers/scsi/bfa/bfa_modules.h linux-2.6.39/drivers/scsi/bfa/bfa_modules.h
+--- linux-2.6.39/drivers/scsi/bfa/bfa_modules.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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 {
+ };
- /* These three are default values which can be overridden */
-diff -urNp linux-2.6.38.4/drivers/scsi/hpsa.c linux-2.6.38.4/drivers/scsi/hpsa.c
---- linux-2.6.38.4/drivers/scsi/hpsa.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/hpsa.c 2011-04-28 19:34:15.000000000 -0400
-@@ -2281,6 +2281,8 @@ static int hpsa_ioctl32_passthru(struct
- int err;
- u32 cp;
+ 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/drivers/scsi/BusLogic.c linux-2.6.39/drivers/scsi/BusLogic.c
+--- linux-2.6.39/drivers/scsi/BusLogic.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/BusLogic.c 2011-05-22 19:36:32.000000000 -0400
+@@ -962,6 +962,8 @@ static int __init BusLogic_InitializeFla
+ static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter
+ *PrototypeHostAdapter)
+ {
++ pax_track_stack();
++
+ /*
+ 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/drivers/scsi/dpt_i2o.c linux-2.6.39/drivers/scsi/dpt_i2o.c
+--- linux-2.6.39/drivers/scsi/dpt_i2o.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/dpt_i2o.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1811,6 +1811,8 @@ static int adpt_i2o_passthru(adpt_hba* p
+ dma_addr_t addr;
+ ulong flags = 0;
-+ memset(&arg64, 0, sizeof(arg64));
++ pax_track_stack();
+
- err = 0;
- err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
- sizeof(arg64.LUN_info));
-diff -urNp linux-2.6.38.4/drivers/scsi/ipr.c linux-2.6.38.4/drivers/scsi/ipr.c
---- linux-2.6.38.4/drivers/scsi/ipr.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/ipr.c 2011-04-28 19:34:15.000000000 -0400
-@@ -6207,7 +6207,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
+ memset(&msg, 0, MAX_MESSAGE_SIZE*4);
+ // get user msg size in u32s
+ if(get_user(size, &user_msg[0])){
+@@ -2317,6 +2319,8 @@ static s32 adpt_scsi_to_i2o(adpt_hba* pH
+ s32 rcode;
+ dma_addr_t addr;
+
++ pax_track_stack();
++
+ memset(msg, 0 , sizeof(msg));
+ len = scsi_bufflen(cmd);
+ direction = 0x00000000;
+diff -urNp linux-2.6.39/drivers/scsi/eata.c linux-2.6.39/drivers/scsi/eata.c
+--- linux-2.6.39/drivers/scsi/eata.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/eata.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1087,6 +1087,8 @@ static int port_detect(unsigned long por
+ struct hostdata *ha;
+ char name[16];
+
++ pax_track_stack();
++
+ sprintf(name, "%s%d", driver_name, j);
+
+ if (!request_region(port_base, REGION_SIZE, driver_name)) {
+diff -urNp linux-2.6.39/drivers/scsi/esp_scsi.c linux-2.6.39/drivers/scsi/esp_scsi.c
+--- linux-2.6.39/drivers/scsi/esp_scsi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/esp_scsi.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/scsi/fcoe/fcoe.c linux-2.6.39/drivers/scsi/fcoe/fcoe.c
+--- linux-2.6.39/drivers/scsi/fcoe/fcoe.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/fcoe/fcoe.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/scsi/fcoe/fcoe_ctlr.c linux-2.6.39/drivers/scsi/fcoe/fcoe_ctlr.c
+--- linux-2.6.39/drivers/scsi/fcoe/fcoe_ctlr.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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,
+ };
+
+@@ -2458,6 +2458,8 @@ static int fcoe_ctlr_vn_recv(struct fcoe
+ } buf;
+ int rc;
+
++ pax_track_stack();
++
+ fiph = (struct fip_header *)skb->data;
+ sub = fiph->fip_subcode;
+
+diff -urNp linux-2.6.39/drivers/scsi/fnic/fnic_main.c linux-2.6.39/drivers/scsi/fnic/fnic_main.c
+--- linux-2.6.39/drivers/scsi/fnic/fnic_main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/scsi/gdth.c linux-2.6.39/drivers/scsi/gdth.c
+--- linux-2.6.39/drivers/scsi/gdth.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/gdth.c 2011-05-22 19:36:32.000000000 -0400
+@@ -4107,6 +4107,8 @@ static int ioc_lockdrv(void __user *arg)
+ unsigned long flags;
+ gdth_ha_str *ha;
+
++ pax_track_stack();
++
+ if (copy_from_user(&ldrv, arg, sizeof(gdth_ioctl_lockdrv)))
+ return -EFAULT;
+ ha = gdth_find_ha(ldrv.ionode);
+@@ -4139,6 +4141,8 @@ static int ioc_resetdrv(void __user *arg
+ gdth_ha_str *ha;
+ int rval;
+
++ pax_track_stack();
++
+ if (copy_from_user(&res, arg, sizeof(gdth_ioctl_reset)) ||
+ res.number >= MAX_HDRIVES)
+ return -EFAULT;
+@@ -4174,6 +4178,8 @@ static int ioc_general(void __user *arg,
+ gdth_ha_str *ha;
+ int rval;
+
++ pax_track_stack();
++
+ if (copy_from_user(&gen, arg, sizeof(gdth_ioctl_general)))
+ return -EFAULT;
+ ha = gdth_find_ha(gen.ionode);
+@@ -4642,6 +4648,9 @@ static void gdth_flush(gdth_ha_str *ha)
+ int i;
+ gdth_cmd_str gdtcmd;
+ char cmnd[MAX_COMMAND_SIZE];
++
++ pax_track_stack();
++
+ memset(cmnd, 0xff, MAX_COMMAND_SIZE);
+
+ TRACE2(("gdth_flush() hanum %d\n", ha->hanum));
+diff -urNp linux-2.6.39/drivers/scsi/gdth_proc.c linux-2.6.39/drivers/scsi/gdth_proc.c
+--- linux-2.6.39/drivers/scsi/gdth_proc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/gdth_proc.c 2011-05-22 19:36:32.000000000 -0400
+@@ -47,6 +47,9 @@ static int gdth_set_asc_info(struct Scsi
+ u64 paddr;
+
+ char cmnd[MAX_COMMAND_SIZE];
++
++ pax_track_stack();
++
+ memset(cmnd, 0xff, 12);
+ memset(&gdtcmd, 0, sizeof(gdth_cmd_str));
+
+@@ -175,6 +178,8 @@ static int gdth_get_info(char *buffer,ch
+ gdth_hget_str *phg;
+ char cmnd[MAX_COMMAND_SIZE];
+
++ pax_track_stack();
++
+ gdtcmd = kmalloc(sizeof(*gdtcmd), GFP_KERNEL);
+ estr = kmalloc(sizeof(*estr), GFP_KERNEL);
+ if (!gdtcmd || !estr)
+diff -urNp linux-2.6.39/drivers/scsi/hosts.c linux-2.6.39/drivers/scsi/hosts.c
+--- linux-2.6.39/drivers/scsi/hosts.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/hosts.c 2011-05-22 19:36:32.000000000 -0400
+@@ -42,7 +42,7 @@
+ #include "scsi_logging.h"
+
+
+-static atomic_t scsi_host_next_hn; /* host_no for next new host */
++static atomic_unchecked_t scsi_host_next_hn; /* host_no for next new host */
+
+
+ static void scsi_host_cls_release(struct device *dev)
+@@ -354,7 +354,7 @@ struct Scsi_Host *scsi_host_alloc(struct
+ * subtract one because we increment first then return, but we need to
+ * know what the next host number was before increment
+ */
+- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
++ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
+ shost->dma_channel = 0xff;
+
+ /* These three are default values which can be overridden */
+diff -urNp linux-2.6.39/drivers/scsi/hpsa.h linux-2.6.39/drivers/scsi/hpsa.h
+--- linux-2.6.39/drivers/scsi/hpsa.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/hpsa.h 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/scsi/hptiop.c linux-2.6.39/drivers/scsi/hptiop.c
+--- linux-2.6.39/drivers/scsi/hptiop.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/scsi/ibmvscsi/ibmvfc.c linux-2.6.39/drivers/scsi/ibmvscsi/ibmvfc.c
+--- linux-2.6.39/drivers/scsi/ibmvscsi/ibmvfc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
+
+-static struct dev_pm_ops ibmvfc_pm_ops = {
++static const struct dev_pm_ops ibmvfc_pm_ops = {
+ .resume = ibmvfc_resume
+ };
+
+diff -urNp linux-2.6.39/drivers/scsi/ibmvscsi/ibmvscsi.c linux-2.6.39/drivers/scsi/ibmvscsi/ibmvscsi.c
+--- linux-2.6.39/drivers/scsi/ibmvscsi/ibmvscsi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/ibmvscsi/ibmvscsi.c 2011-05-22 19:36:32.000000000 -0400
+@@ -104,7 +104,7 @@ static struct scsi_transport_template *i
+
+ #define IBMVSCSI_VERSION "1.5.9"
+
+-static struct ibmvscsi_ops *ibmvscsi_ops;
++static const struct ibmvscsi_ops *ibmvscsi_ops;
+
+ 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 struct dev_pm_ops ibmvscsi_pm_ops = {
++static const struct dev_pm_ops ibmvscsi_pm_ops = {
+ .resume = ibmvscsi_resume
+ };
+
+@@ -2075,7 +2075,7 @@ static struct vio_driver ibmvscsi_driver
+ }
+ };
+
+-static struct srp_function_template ibmvscsi_transport_functions = {
++static const struct srp_function_template ibmvscsi_transport_functions = {
+ };
+
+ int __init ibmvscsi_module_init(void)
+diff -urNp linux-2.6.39/drivers/scsi/ibmvscsi/ibmvscsi.h linux-2.6.39/drivers/scsi/ibmvscsi/ibmvscsi.h
+--- linux-2.6.39/drivers/scsi/ibmvscsi/ibmvscsi.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
+ };
+
+-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;
+
+ #endif /* IBMVSCSI_H */
+diff -urNp linux-2.6.39/drivers/scsi/ibmvscsi/ibmvstgt.c linux-2.6.39/drivers/scsi/ibmvscsi/ibmvstgt.c
+--- linux-2.6.39/drivers/scsi/ibmvscsi/ibmvstgt.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/scsi/ibmvscsi/iseries_vscsi.c linux-2.6.39/drivers/scsi/ibmvscsi/iseries_vscsi.c
+--- linux-2.6.39/drivers/scsi/ibmvscsi/iseries_vscsi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/ibmvscsi/iseries_vscsi.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/scsi/ibmvscsi/rpa_vscsi.c linux-2.6.39/drivers/scsi/ibmvscsi/rpa_vscsi.c
+--- linux-2.6.39/drivers/scsi/ibmvscsi/rpa_vscsi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/scsi/ipr.c linux-2.6.39/drivers/scsi/ipr.c
+--- linux-2.6.39/drivers/scsi/ipr.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/ipr.c 2011-05-22 19:36:32.000000000 -0400
+@@ -6210,7 +6210,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
return true;
}
.phy_reset = ipr_ata_phy_reset,
.hardreset = ipr_sata_reset,
.post_internal_cmd = ipr_ata_post_internal,
-diff -urNp linux-2.6.38.4/drivers/scsi/libfc/fc_exch.c linux-2.6.38.4/drivers/scsi/libfc/fc_exch.c
---- linux-2.6.38.4/drivers/scsi/libfc/fc_exch.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/libfc/fc_exch.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/scsi/libfc/fc_exch.c linux-2.6.39/drivers/scsi/libfc/fc_exch.c
+--- linux-2.6.39/drivers/scsi/libfc/fc_exch.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/libfc/fc_exch.c 2011-05-22 19:36:32.000000000 -0400
@@ -105,12 +105,12 @@ struct fc_exch_mgr {
* all together if not used XXX
*/
} stats;
};
-@@ -687,7 +687,7 @@ static struct fc_exch *fc_exch_em_alloc(
+@@ -700,7 +700,7 @@ static struct fc_exch *fc_exch_em_alloc(
/* allocate memory for exchange */
ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
if (!ep) {
goto out;
}
memset(ep, 0, sizeof(*ep));
-@@ -748,7 +748,7 @@ out:
+@@ -761,7 +761,7 @@ out:
return ep;
err:
spin_unlock_bh(&pool->lock);
mempool_free(ep, mp->ep_pool);
return NULL;
}
-@@ -893,7 +893,7 @@ static enum fc_pf_rjt_reason fc_seq_look
+@@ -906,7 +906,7 @@ static enum fc_pf_rjt_reason fc_seq_look
xid = ntohs(fh->fh_ox_id); /* we originated exch */
ep = fc_exch_find(mp, xid);
if (!ep) {
reject = FC_RJT_OX_ID;
goto out;
}
-@@ -923,7 +923,7 @@ static enum fc_pf_rjt_reason fc_seq_look
+@@ -936,7 +936,7 @@ static enum fc_pf_rjt_reason fc_seq_look
ep = fc_exch_find(mp, xid);
if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
if (ep) {
reject = FC_RJT_RX_ID;
goto rel;
}
-@@ -934,7 +934,7 @@ static enum fc_pf_rjt_reason fc_seq_look
+@@ -947,7 +947,7 @@ static enum fc_pf_rjt_reason fc_seq_look
}
xid = ep->xid; /* get our XID */
} else if (!ep) {
reject = FC_RJT_RX_ID; /* XID not found */
goto out;
}
-@@ -951,7 +951,7 @@ static enum fc_pf_rjt_reason fc_seq_look
+@@ -964,7 +964,7 @@ static enum fc_pf_rjt_reason fc_seq_look
} else {
sp = &ep->seq;
if (sp->id != fh->fh_seq_id) {
reject = FC_RJT_SEQ_ID; /* sequence/exch should exist */
goto rel;
}
-@@ -1368,22 +1368,22 @@ static void fc_exch_recv_seq_resp(struct
+@@ -1392,22 +1392,22 @@ static void fc_exch_recv_seq_resp(struct
ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
if (!ep) {
goto rel;
}
sof = fr_sof(fp);
-@@ -1392,7 +1392,7 @@ static void fc_exch_recv_seq_resp(struct
+@@ -1416,7 +1416,7 @@ static void fc_exch_recv_seq_resp(struct
sp->ssb_stat |= SSB_ST_RESP;
sp->id = fh->fh_seq_id;
} else if (sp->id != fh->fh_seq_id) {
goto rel;
}
-@@ -1455,9 +1455,9 @@ static void fc_exch_recv_resp(struct fc_
+@@ -1479,9 +1479,9 @@ static void fc_exch_recv_resp(struct fc_
sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
if (!sp)
fc_frame_free(fp);
}
-diff -urNp linux-2.6.38.4/drivers/scsi/libsas/sas_ata.c linux-2.6.38.4/drivers/scsi/libsas/sas_ata.c
---- linux-2.6.38.4/drivers/scsi/libsas/sas_ata.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/libsas/sas_ata.c 2011-04-28 19:34:15.000000000 -0400
-@@ -348,7 +348,7 @@ static int sas_ata_scr_read(struct ata_l
+diff -urNp linux-2.6.39/drivers/scsi/libfc/fc_lport.c linux-2.6.39/drivers/scsi/libfc/fc_lport.c
+--- linux-2.6.39/drivers/scsi/libfc/fc_lport.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/scsi/libfc/fc_rport.c linux-2.6.39/drivers/scsi/libfc/fc_rport.c
+--- linux-2.6.39/drivers/scsi/libfc/fc_rport.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/scsi/libsas/sas_ata.c linux-2.6.39/drivers/scsi/libsas/sas_ata.c
+--- linux-2.6.39/drivers/scsi/libsas/sas_ata.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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 = {
- .phy_reset = sas_ata_phy_reset,
+ .prereset = ata_std_prereset,
+ .softreset = NULL,
+ .hardreset = sas_ata_hard_reset,
+ .postreset = ata_std_postreset,
+ .error_handler = ata_std_error_handler,
.post_internal_cmd = sas_ata_post_internal,
- .qc_defer = ata_std_qc_defer,
-diff -urNp linux-2.6.38.4/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.38.4/drivers/scsi/lpfc/lpfc_debugfs.c
---- linux-2.6.38.4/drivers/scsi/lpfc/lpfc_debugfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/lpfc/lpfc_debugfs.c 2011-04-28 19:57:25.000000000 -0400
-@@ -125,7 +125,7 @@ struct lpfc_debug {
- int len;
- };
+- .qc_defer = ata_std_qc_defer,
++ .qc_defer = ata_std_qc_defer,
+ .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/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.39/drivers/scsi/lpfc/lpfc_debugfs.c
+--- linux-2.6.39/drivers/scsi/lpfc/lpfc_debugfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/lpfc/lpfc_debugfs.c 2011-05-22 19:36:32.000000000 -0400
+@@ -104,7 +104,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_
+
+ #include <linux/debugfs.h>
-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
static unsigned long lpfc_debugfs_start_time = 0L;
- /**
-@@ -159,7 +159,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_v
+ /* iDiag */
+@@ -141,7 +141,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_v
lpfc_debugfs_enable = 0;
len = 0;
(lpfc_debugfs_max_disc_trc - 1);
for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
dtp = vport->disc_trc + i;
-@@ -220,7 +220,7 @@ lpfc_debugfs_slow_ring_trc_data(struct l
+@@ -202,7 +202,7 @@ lpfc_debugfs_slow_ring_trc_data(struct l
lpfc_debugfs_enable = 0;
len = 0;
(lpfc_debugfs_max_slow_ring_trc - 1);
for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
dtp = phba->slow_ring_trc + i;
-@@ -635,14 +635,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport
+@@ -380,6 +380,8 @@ lpfc_debugfs_dumpHBASlim_data(struct lpf
+ uint32_t *ptr;
+ char buffer[1024];
+
++ pax_track_stack();
++
+ off = 0;
+ spin_lock_irq(&phba->hbalock);
+
+@@ -617,14 +619,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport
!vport || !vport->disc_trc)
return;
dtp->jif = jiffies;
#endif
return;
-@@ -673,14 +673,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_h
+@@ -655,14 +657,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_h
!phba || !phba->slow_ring_trc)
return;
dtp->jif = jiffies;
#endif
return;
-@@ -1365,7 +1365,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor
+@@ -2145,7 +2147,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor
"slow_ring buffer\n");
goto debug_failed;
}
memset(phba->slow_ring_trc, 0,
(sizeof(struct lpfc_debugfs_trc) *
lpfc_debugfs_max_slow_ring_trc));
-@@ -1411,7 +1411,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor
+@@ -2191,7 +2193,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor
"buffer\n");
goto debug_failed;
}
snprintf(name, sizeof(name), "discovery_trace");
vport->debug_disc_trc =
-diff -urNp linux-2.6.38.4/drivers/scsi/lpfc/lpfc.h linux-2.6.38.4/drivers/scsi/lpfc/lpfc.h
---- linux-2.6.38.4/drivers/scsi/lpfc/lpfc.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/lpfc/lpfc.h 2011-04-28 19:57:25.000000000 -0400
-@@ -414,7 +414,7 @@ struct lpfc_vport {
+diff -urNp linux-2.6.39/drivers/scsi/lpfc/lpfc.h linux-2.6.39/drivers/scsi/lpfc/lpfc.h
+--- linux-2.6.39/drivers/scsi/lpfc/lpfc.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/lpfc/lpfc.h 2011-05-22 19:36:32.000000000 -0400
+@@ -419,7 +419,7 @@ struct lpfc_vport {
struct dentry *debug_nodelist;
struct dentry *vport_debugfs_root;
struct lpfc_debugfs_trc *disc_trc;
#endif
uint8_t stat_data_enabled;
uint8_t stat_data_blocked;
-@@ -776,8 +776,8 @@ struct lpfc_hba {
+@@ -785,8 +785,8 @@ struct lpfc_hba {
struct timer_list fabric_block_timer;
unsigned long bit_flags;
#define FABRIC_COMANDS_BLOCKED 0
unsigned long last_rsrc_error_time;
unsigned long last_ramp_down_time;
unsigned long last_ramp_up_time;
-@@ -791,7 +791,7 @@ struct lpfc_hba {
+@@ -800,7 +800,7 @@ struct lpfc_hba {
struct dentry *debug_dumpDif; /* BlockGuard BPL*/
struct dentry *debug_slow_ring_trc;
struct lpfc_debugfs_trc *slow_ring_trc;
- atomic_t slow_ring_trc_cnt;
+ atomic_unchecked_t slow_ring_trc_cnt;
- #endif
-
- /* Used for deferred freeing of ELS data buffers */
-diff -urNp linux-2.6.38.4/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.38.4/drivers/scsi/lpfc/lpfc_scsi.c
---- linux-2.6.38.4/drivers/scsi/lpfc/lpfc_scsi.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/lpfc/lpfc_scsi.c 2011-04-28 19:57:25.000000000 -0400
+ /* iDiag debugfs sub-directory */
+ struct dentry *idiag_root;
+ struct dentry *idiag_pci_cfg;
+diff -urNp linux-2.6.39/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.39/drivers/scsi/lpfc/lpfc_scsi.c
+--- linux-2.6.39/drivers/scsi/lpfc/lpfc_scsi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/lpfc/lpfc_scsi.c 2011-05-22 19:36:32.000000000 -0400
@@ -297,7 +297,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb
uint32_t evt_posted;
}
/**
-diff -urNp linux-2.6.38.4/drivers/scsi/pmcraid.c linux-2.6.38.4/drivers/scsi/pmcraid.c
---- linux-2.6.38.4/drivers/scsi/pmcraid.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/pmcraid.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/scsi/mac_esp.c linux-2.6.39/drivers/scsi/mac_esp.c
+--- linux-2.6.39/drivers/scsi/mac_esp.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/scsi/megaraid/megaraid_mbox.c linux-2.6.39/drivers/scsi/megaraid/megaraid_mbox.c
+--- linux-2.6.39/drivers/scsi/megaraid/megaraid_mbox.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/megaraid/megaraid_mbox.c 2011-05-22 19:36:32.000000000 -0400
+@@ -3510,6 +3510,8 @@ megaraid_cmm_register(adapter_t *adapter
+ int rval;
+ int i;
+
++ pax_track_stack();
++
+ // 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/drivers/scsi/megaraid/megaraid_sas_base.c linux-2.6.39/drivers/scsi/megaraid/megaraid_sas_base.c
+--- linux-2.6.39/drivers/scsi/megaraid/megaraid_sas_base.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/megaraid/megaraid_sas_base.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/scsi/megaraid/megaraid_sas_fusion.c linux-2.6.39/drivers/scsi/megaraid/megaraid_sas_fusion.c
+--- linux-2.6.39/drivers/scsi/megaraid/megaraid_sas_fusion.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/megaraid/megaraid_sas_fusion.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/scsi/megaraid/megaraid_sas.h linux-2.6.39/drivers/scsi/megaraid/megaraid_sas.h
+--- linux-2.6.39/drivers/scsi/megaraid/megaraid_sas.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/scsi/ncr53c8xx.c linux-2.6.39/drivers/scsi/ncr53c8xx.c
+--- linux-2.6.39/drivers/scsi/ncr53c8xx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/ncr53c8xx.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/scsi/osd/osd_initiator.c linux-2.6.39/drivers/scsi/osd/osd_initiator.c
+--- linux-2.6.39/drivers/scsi/osd/osd_initiator.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/osd/osd_initiator.c 2011-05-22 19:36:32.000000000 -0400
+@@ -97,6 +97,8 @@ static int _osd_get_print_system_info(st
+ int nelem = ARRAY_SIZE(get_attrs), a = 0;
+ int ret;
+
++ pax_track_stack();
++
+ or = osd_start_request(od, GFP_KERNEL);
+ if (!or)
+ return -ENOMEM;
+diff -urNp linux-2.6.39/drivers/scsi/pmcraid.c linux-2.6.39/drivers/scsi/pmcraid.c
+--- linux-2.6.39/drivers/scsi/pmcraid.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/pmcraid.c 2011-05-22 19:36:32.000000000 -0400
@@ -201,8 +201,8 @@ static int pmcraid_slave_alloc(struct sc
res->scsi_dev = scsi_dev;
scsi_dev->hostdata = res;
pinstance->num_hrrq;
cmd->cmd_done = pmcraid_io_done;
-@@ -3857,7 +3857,7 @@ static long pmcraid_ioctl_passthrough(
+@@ -3860,7 +3860,7 @@ static long pmcraid_ioctl_passthrough(
* block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
* hrrq_id assigned here in queuecommand
*/
pinstance->num_hrrq;
if (request_size) {
-@@ -4492,7 +4492,7 @@ static void pmcraid_worker_function(stru
+@@ -4495,7 +4495,7 @@ static void pmcraid_worker_function(stru
pinstance = container_of(workp, struct pmcraid_instance, worker_q);
/* add resources only after host is added into system */
return;
fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
-@@ -5326,8 +5326,8 @@ static int __devinit pmcraid_init_instan
+@@ -5329,8 +5329,8 @@ static int __devinit pmcraid_init_instan
init_waitqueue_head(&pinstance->reset_wait_q);
atomic_set(&pinstance->outstanding_cmds, 0);
INIT_LIST_HEAD(&pinstance->free_res_q);
INIT_LIST_HEAD(&pinstance->used_res_q);
-@@ -6042,7 +6042,7 @@ static int __devinit pmcraid_probe(
+@@ -6045,7 +6045,7 @@ static int __devinit pmcraid_probe(
/* Schedule worker thread to handle CCN and take care of adding and
* removing devices to OS
*/
schedule_work(&pinstance->worker_q);
return rc;
-diff -urNp linux-2.6.38.4/drivers/scsi/pmcraid.h linux-2.6.38.4/drivers/scsi/pmcraid.h
---- linux-2.6.38.4/drivers/scsi/pmcraid.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/pmcraid.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/scsi/pmcraid.h linux-2.6.39/drivers/scsi/pmcraid.h
+--- linux-2.6.39/drivers/scsi/pmcraid.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/pmcraid.h 2011-05-22 19:36:32.000000000 -0400
@@ -750,7 +750,7 @@ struct pmcraid_instance {
struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
/* To indicate add/delete/modify during CCN */
u8 change_detected;
-diff -urNp linux-2.6.38.4/drivers/scsi/qla2xxx/qla_os.c linux-2.6.38.4/drivers/scsi/qla2xxx/qla_os.c
---- linux-2.6.38.4/drivers/scsi/qla2xxx/qla_os.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/qla2xxx/qla_os.c 2011-04-28 19:34:15.000000000 -0400
-@@ -4096,7 +4096,7 @@ static struct pci_driver qla2xxx_pci_dri
+diff -urNp linux-2.6.39/drivers/scsi/qla2xxx/qla_os.c linux-2.6.39/drivers/scsi/qla2xxx/qla_os.c
+--- linux-2.6.39/drivers/scsi/qla2xxx/qla_os.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/qla2xxx/qla_os.c 2011-05-22 19:36:32.000000000 -0400
+@@ -4097,7 +4097,7 @@ static struct pci_driver qla2xxx_pci_dri
.err_handler = &qla2xxx_err_handler,
};
.owner = THIS_MODULE,
.llseek = noop_llseek,
};
-diff -urNp linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_def.h
---- linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_def.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_def.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.39/drivers/scsi/qla4xxx/ql4_def.h
+--- linux-2.6.39/drivers/scsi/qla4xxx/ql4_def.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/qla4xxx/ql4_def.h 2011-05-22 19:36:32.000000000 -0400
@@ -256,7 +256,7 @@ struct ddb_entry {
atomic_t retry_relogin_timer; /* Min Time between relogins
* (4000 only) */
* retried */
uint16_t port;
-diff -urNp linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_init.c
---- linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_init.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_init.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.39/drivers/scsi/qla4xxx/ql4_init.c
+--- linux-2.6.39/drivers/scsi/qla4xxx/ql4_init.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/qla4xxx/ql4_init.c 2011-05-22 19:36:32.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);
atomic_set(&ddb_entry->state, DDB_STATE_ONLINE);
list_add_tail(&ddb_entry->list, &ha->ddb_list);
ha->fw_ddb_index_map[fw_ddb_index] = ddb_entry;
-@@ -1570,7 +1570,7 @@ int qla4xxx_process_ddb_changed(struct s
- /* Device is back online. */
- if (ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_ACTIVE) {
+@@ -1433,7 +1433,7 @@ int qla4xxx_process_ddb_changed(struct s
+ if ((ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_ACTIVE) &&
+ (atomic_read(&ddb_entry->state) != DDB_STATE_ONLINE)) {
atomic_set(&ddb_entry->state, DDB_STATE_ONLINE);
- atomic_set(&ddb_entry->relogin_retry_count, 0);
+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
atomic_set(&ddb_entry->relogin_timer, 0);
clear_bit(DF_RELOGIN, &ddb_entry->flags);
- clear_bit(DF_NO_RELOGIN, &ddb_entry->flags);
-diff -urNp linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_os.c
---- linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_os.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_os.c 2011-04-28 19:57:25.000000000 -0400
-@@ -801,13 +801,13 @@ static void qla4xxx_timer(struct scsi_ql
+ iscsi_unblock_session(ddb_entry->sess);
+diff -urNp linux-2.6.39/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.39/drivers/scsi/qla4xxx/ql4_os.c
+--- linux-2.6.39/drivers/scsi/qla4xxx/ql4_os.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/qla4xxx/ql4_os.c 2011-05-22 19:36:32.000000000 -0400
+@@ -802,13 +802,13 @@ static void qla4xxx_timer(struct scsi_ql
ddb_entry->fw_ddb_device_state ==
DDB_DS_SESSION_FAILED) {
/* Reset retry relogin timer */
relogin_retry_count))
);
start_dpc++;
-diff -urNp linux-2.6.38.4/drivers/scsi/scsi.c linux-2.6.38.4/drivers/scsi/scsi.c
---- linux-2.6.38.4/drivers/scsi/scsi.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/scsi.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/scsi/scsi.c linux-2.6.39/drivers/scsi/scsi.c
+--- linux-2.6.39/drivers/scsi/scsi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/scsi.c 2011-05-22 19:36:32.000000000 -0400
@@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *
unsigned long timeout;
int rtn = 0;
/* check if the device is still usable */
if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
-diff -urNp linux-2.6.38.4/drivers/scsi/scsi_lib.c linux-2.6.38.4/drivers/scsi/scsi_lib.c
---- linux-2.6.38.4/drivers/scsi/scsi_lib.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/scsi_lib.c 2011-04-28 19:57:25.000000000 -0400
-@@ -1376,7 +1376,7 @@ static void scsi_kill_request(struct req
+diff -urNp linux-2.6.39/drivers/scsi/scsi_debug.c linux-2.6.39/drivers/scsi/scsi_debug.c
+--- linux-2.6.39/drivers/scsi/scsi_debug.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/scsi_debug.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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;
+
++ pax_track_stack();
++
+ if ((errsts = check_readiness(scp, 1, devip)))
+ return errsts;
+ memset(arr, 0, sizeof(arr));
+@@ -1590,6 +1592,8 @@ static int resp_log_sense(struct scsi_cm
+ unsigned char arr[SDEBUG_MAX_LSENSE_SZ];
+ unsigned char *cmd = (unsigned char *)scp->cmnd;
+
++ pax_track_stack();
++
+ if ((errsts = check_readiness(scp, 1, devip)))
+ return errsts;
+ memset(arr, 0, sizeof(arr));
+diff -urNp linux-2.6.39/drivers/scsi/scsi_lib.c linux-2.6.39/drivers/scsi/scsi_lib.c
+--- linux-2.6.39/drivers/scsi/scsi_lib.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/scsi_lib.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1410,7 +1410,7 @@ static void scsi_kill_request(struct req
shost = sdev->host;
scsi_init_cmd_errh(cmd);
cmd->result = DID_NO_CONNECT << 16;
/*
* SCSI request completion path will do scsi_device_unbusy(),
-@@ -1402,9 +1402,9 @@ static void scsi_softirq_done(struct req
+@@ -1436,9 +1436,9 @@ static void scsi_softirq_done(struct req
INIT_LIST_HEAD(&cmd->eh_entry);
disposition = scsi_decide_disposition(cmd);
if (disposition != SUCCESS &&
-diff -urNp linux-2.6.38.4/drivers/scsi/scsi_sysfs.c linux-2.6.38.4/drivers/scsi/scsi_sysfs.c
---- linux-2.6.38.4/drivers/scsi/scsi_sysfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/scsi_sysfs.c 2011-04-28 19:57:25.000000000 -0400
-@@ -627,7 +627,7 @@ show_iostat_##field(struct device *dev,
+diff -urNp linux-2.6.39/drivers/scsi/scsi_sysfs.c linux-2.6.39/drivers/scsi/scsi_sysfs.c
+--- linux-2.6.39/drivers/scsi/scsi_sysfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/scsi_sysfs.c 2011-05-22 19:36:32.000000000 -0400
+@@ -621,7 +621,7 @@ show_iostat_##field(struct device *dev,
char *buf) \
{ \
struct scsi_device *sdev = to_scsi_device(dev); \
return snprintf(buf, 20, "0x%llx\n", count); \
} \
static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
-diff -urNp linux-2.6.38.4/drivers/scsi/scsi_transport_fc.c linux-2.6.38.4/drivers/scsi/scsi_transport_fc.c
---- linux-2.6.38.4/drivers/scsi/scsi_transport_fc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/scsi_transport_fc.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/scsi/scsi_transport_fc.c linux-2.6.39/drivers/scsi/scsi_transport_fc.c
+--- linux-2.6.39/drivers/scsi/scsi_transport_fc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/scsi_transport_fc.c 2011-05-22 19:36:32.000000000 -0400
@@ -485,7 +485,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_
* Netlink Infrastructure
*/
return -EINVAL;
/*
* Check for overflow; dev_loss_tmo is u32
-diff -urNp linux-2.6.38.4/drivers/scsi/scsi_transport_iscsi.c linux-2.6.38.4/drivers/scsi/scsi_transport_iscsi.c
---- linux-2.6.38.4/drivers/scsi/scsi_transport_iscsi.c 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/scsi_transport_iscsi.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/scsi/scsi_transport_iscsi.c linux-2.6.39/drivers/scsi/scsi_transport_iscsi.c
+--- linux-2.6.39/drivers/scsi/scsi_transport_iscsi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/scsi_transport_iscsi.c 2011-05-22 19:36:32.000000000 -0400
@@ -83,7 +83,7 @@ struct iscsi_internal {
struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];
};
if (id == ISCSI_MAX_TARGET) {
for (id = 0; id < ISCSI_MAX_TARGET; id++) {
-@@ -2130,7 +2130,7 @@ static __init int iscsi_transport_init(v
+@@ -2200,7 +2200,7 @@ static __init int iscsi_transport_init(v
printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
ISCSI_TRANSPORT_VERSION);
err = class_register(&iscsi_transport_class);
if (err)
-diff -urNp linux-2.6.38.4/drivers/scsi/scsi_transport_srp.c linux-2.6.38.4/drivers/scsi/scsi_transport_srp.c
---- linux-2.6.38.4/drivers/scsi/scsi_transport_srp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/scsi_transport_srp.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/scsi/scsi_transport_srp.c linux-2.6.39/drivers/scsi/scsi_transport_srp.c
+--- linux-2.6.39/drivers/scsi/scsi_transport_srp.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/scsi_transport_srp.c 2011-05-22 19:36:32.000000000 -0400
@@ -33,7 +33,7 @@
#include "scsi_transport_srp_internal.h"
dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
transport_setup_device(&rport->dev);
-diff -urNp linux-2.6.38.4/drivers/scsi/sg.c linux-2.6.38.4/drivers/scsi/sg.c
---- linux-2.6.38.4/drivers/scsi/sg.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/sg.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/scsi/sg.c linux-2.6.39/drivers/scsi/sg.c
+--- linux-2.6.39/drivers/scsi/sg.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/sg.c 2011-05-22 19:36:32.000000000 -0400
@@ -2310,7 +2310,7 @@ struct sg_proc_leaf {
const struct file_operations * fops;
};
sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
if (!sg_proc_sgp)
-diff -urNp linux-2.6.38.4/drivers/staging/autofs/root.c linux-2.6.38.4/drivers/staging/autofs/root.c
---- linux-2.6.38.4/drivers/staging/autofs/root.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/autofs/root.c 2011-04-28 19:34:15.000000000 -0400
-@@ -311,7 +311,8 @@ static int autofs_root_symlink(struct in
- set_bit(n,sbi->symlink_bitmap);
- sl = &sbi->symlink[n];
- sl->len = strlen(symname);
-- sl->data = kmalloc(slsize = sl->len+1, GFP_KERNEL);
-+ slsize = sl->len+1;
-+ sl->data = kmalloc(slsize, GFP_KERNEL);
- if (!sl->data) {
- clear_bit(n,sbi->symlink_bitmap);
- unlock_kernel();
-diff -urNp linux-2.6.38.4/drivers/staging/bcm/Bcmchar.c linux-2.6.38.4/drivers/staging/bcm/Bcmchar.c
---- linux-2.6.38.4/drivers/staging/bcm/Bcmchar.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/bcm/Bcmchar.c 2011-04-28 19:34:15.000000000 -0400
-@@ -2093,7 +2093,7 @@ static long bcm_char_ioctl(struct file *
- }
-
-
--static struct file_operations bcm_fops = {
-+static const struct file_operations bcm_fops = {
- .owner = THIS_MODULE,
- .open = bcm_char_open,
- .release = bcm_char_release,
-diff -urNp linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
---- linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-04-28 19:34:15.000000000 -0400
-@@ -863,14 +863,14 @@ static void dhd_op_if(dhd_if_t *ifp)
+diff -urNp linux-2.6.39/drivers/scsi/sym53c8xx_2/sym_glue.c linux-2.6.39/drivers/scsi/sym53c8xx_2/sym_glue.c
+--- linux-2.6.39/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1756,6 +1756,8 @@ static int __devinit sym2_probe(struct p
+ int do_iounmap = 0;
+ int do_disable_device = 1;
+
++ pax_track_stack();
++
+ memset(&sym_dev, 0, sizeof(sym_dev));
+ memset(&nvram, 0, sizeof(nvram));
+ sym_dev.pdev = pdev;
+diff -urNp linux-2.6.39/drivers/scsi/vmw_pvscsi.c linux-2.6.39/drivers/scsi/vmw_pvscsi.c
+--- linux-2.6.39/drivers/scsi/vmw_pvscsi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/scsi/vmw_pvscsi.c 2011-05-22 19:36:32.000000000 -0400
+@@ -447,6 +447,8 @@ static void pvscsi_setup_all_rings(const
+ dma_addr_t base;
+ unsigned i;
+
++ pax_track_stack();
++
+ cmd.ringsStatePPN = adapter->ringStatePA >> PAGE_SHIFT;
+ cmd.reqRingNumPages = adapter->req_pages;
+ cmd.cmpRingNumPages = adapter->cmp_pages;
+diff -urNp linux-2.6.39/drivers/sh/clk/cpg.c linux-2.6.39/drivers/sh/clk/cpg.c
+--- linux-2.6.39/drivers/sh/clk/cpg.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/sh/clk/cpg.c 2011-05-22 19:36:32.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/drivers/spi/dw_spi.h linux-2.6.39/drivers/spi/dw_spi.h
+--- linux-2.6.39/drivers/spi/dw_spi.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/spi/dw_spi_mid.c linux-2.6.39/drivers/spi/dw_spi_mid.c
+--- linux-2.6.39/drivers/spi/dw_spi_mid.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/spi/dw_spi_mid.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/spi/spi.c linux-2.6.39/drivers/spi/spi.c
+--- linux-2.6.39/drivers/spi/spi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/spi/spi.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1023,7 +1023,7 @@ int spi_bus_unlock(struct spi_master *ma
+ EXPORT_SYMBOL_GPL(spi_bus_unlock);
+
+ /* portable code must never pass more than 32 bytes */
+-#define SPI_BUFSIZ max(32,SMP_CACHE_BYTES)
++#define SPI_BUFSIZ max(32U,SMP_CACHE_BYTES)
+
+ static u8 *buf;
+
+diff -urNp linux-2.6.39/drivers/ssb/driver_pcicore.c linux-2.6.39/drivers/ssb/driver_pcicore.c
+--- linux-2.6.39/drivers/ssb/driver_pcicore.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/staging/ath6kl/os/linux/cfg80211.c linux-2.6.39/drivers/staging/ath6kl/os/linux/cfg80211.c
+--- linux-2.6.39/drivers/staging/ath6kl/os/linux/cfg80211.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2.6.39/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+--- linux-2.6.39/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-05-22 19:36:32.000000000 -0400
+@@ -857,14 +857,14 @@ static void dhd_op_if(dhd_if_t *ifp)
free_netdev(ifp->net);
}
/* Allocate etherdev, including space for private structure */
err = dhd_net_attach(&dhd->pub, ifp->idx);
if (err != 0) {
DHD_ERROR(("%s: dhd_net_attach failed, "
-@@ -1969,25 +1969,23 @@ dhd_pub_t *dhd_attach(struct osl_info *o
+@@ -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);
/* Allocate etherdev, including space for private structure */
if (!net) {
DHD_ERROR(("%s: OOM - alloc_etherdev\n", __func__));
goto fail;
- }
-
- /* Allocate primary dhd_info */
-- dhd = kmalloc(sizeof(dhd_info_t), GFP_ATOMIC);
-+ dhd = kzalloc(sizeof(dhd_info_t), GFP_ATOMIC);
- if (!dhd) {
- DHD_ERROR(("%s: OOM - alloc dhd_info\n", __func__));
- goto fail;
- }
-
-- memset(dhd, 0, sizeof(dhd_info_t));
--
+@@ -1939,7 +1939,7 @@ dhd_pub_t *dhd_attach(struct dhd_bus *bu
/*
* Save the dhd_info into the priv
*/
- memcpy(netdev_priv(net), &dhd, sizeof(dhd));
+ memcpy(netdev_priv(net), dhd, sizeof(*dhd));
- dhd->pub.osh = osh;
/* Set network interface name if it was provided as module parameter */
-@@ -2105,7 +2103,7 @@ dhd_pub_t *dhd_attach(struct osl_info *o
+ if (iface_name[0]) {
+@@ -2056,7 +2056,7 @@ dhd_pub_t *dhd_attach(struct dhd_bus *bu
/*
* Save the dhd_info into the priv
*/
#if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC)
g_bus = bus;
-diff -urNp linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c
---- linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-04-28 19:34:15.000000000 -0400
-@@ -513,7 +513,7 @@ wl_iw_get_range(struct net_device *dev,
+@@ -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/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c linux-2.6.39/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+--- linux-2.6.39/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.39/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+--- linux-2.6.39/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-05-22 19:36:32.000000000 -0400
+@@ -495,7 +495,7 @@ wl_iw_get_range(struct net_device *dev,
list = (wl_u32_list_t *) channels;
dwrq->length = sizeof(struct iw_range);
range->min_nwid = range->max_nwid = 0;
-diff -urNp linux-2.6.38.4/drivers/staging/comedi/comedi_fops.c linux-2.6.38.4/drivers/staging/comedi/comedi_fops.c
---- linux-2.6.38.4/drivers/staging/comedi/comedi_fops.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/comedi/comedi_fops.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1426,7 +1426,7 @@ static void comedi_unmap(struct vm_area_
+diff -urNp linux-2.6.39/drivers/staging/comedi/comedi_fops.c linux-2.6.39/drivers/staging/comedi/comedi_fops.c
+--- linux-2.6.39/drivers/staging/comedi/comedi_fops.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
}
.close = comedi_unmap,
};
-diff -urNp linux-2.6.38.4/drivers/staging/et131x/et1310_tx.c linux-2.6.38.4/drivers/staging/et131x/et1310_tx.c
---- linux-2.6.38.4/drivers/staging/et131x/et1310_tx.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/et131x/et1310_tx.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/staging/cx25821/cx25821-alsa.c linux-2.6.39/drivers/staging/cx25821/cx25821-alsa.c
+--- linux-2.6.39/drivers/staging/cx25821/cx25821-alsa.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/cx25821/cx25821-alsa.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/staging/cx25821/cx25821-i2c.c linux-2.6.39/drivers/staging/cx25821/cx25821-i2c.c
+--- linux-2.6.39/drivers/staging/cx25821/cx25821-i2c.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/cx25821/cx25821-i2c.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/staging/et131x/et1310_tx.c linux-2.6.39/drivers/staging/et131x/et1310_tx.c
+--- linux-2.6.39/drivers/staging/et131x/et1310_tx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/et131x/et1310_tx.c 2011-05-22 19:36:32.000000000 -0400
@@ -635,11 +635,11 @@ inline void et131x_free_send_packet(stru
struct net_device_stats *stats = &etdev->net_stats;
if (tcb->skb) {
stats->tx_bytes += tcb->skb->len;
-diff -urNp linux-2.6.38.4/drivers/staging/et131x/et131x_adapter.h linux-2.6.38.4/drivers/staging/et131x/et131x_adapter.h
---- linux-2.6.38.4/drivers/staging/et131x/et131x_adapter.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/et131x/et131x_adapter.h 2011-04-28 19:57:25.000000000 -0400
-@@ -112,11 +112,11 @@ typedef struct _ce_stats_t {
+diff -urNp linux-2.6.39/drivers/staging/et131x/et131x_adapter.h linux-2.6.39/drivers/staging/et131x/et131x_adapter.h
+--- linux-2.6.39/drivers/staging/et131x/et131x_adapter.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/et131x/et131x_adapter.h 2011-05-22 19:36:32.000000000 -0400
+@@ -110,11 +110,11 @@ typedef struct _ce_stats_t {
* operations
*/
u32 unircv; /* # multicast packets received */
u32 norcvbuf; /* # Rx packets discarded */
u32 noxmtbuf; /* # Tx packets discarded */
-diff -urNp linux-2.6.38.4/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c linux-2.6.38.4/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
---- linux-2.6.38.4/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c linux-2.6.39/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
+--- linux-2.6.39/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
{
.unlocked_ioctl = ft1000_ioctl,
.poll = ft1000_poll_dev,
-diff -urNp linux-2.6.38.4/drivers/staging/go7007/go7007-v4l2.c linux-2.6.38.4/drivers/staging/go7007/go7007-v4l2.c
---- linux-2.6.38.4/drivers/staging/go7007/go7007-v4l2.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/go7007/go7007-v4l2.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/staging/generic_serial/rio/rio_linux.c linux-2.6.39/drivers/staging/generic_serial/rio/rio_linux.c
+--- linux-2.6.39/drivers/staging/generic_serial/rio/rio_linux.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/generic_serial/rio/rio_linux.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/staging/generic_serial/ser_a2232.c linux-2.6.39/drivers/staging/generic_serial/ser_a2232.c
+--- linux-2.6.39/drivers/staging/generic_serial/ser_a2232.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/staging/generic_serial/sx.c linux-2.6.39/drivers/staging/generic_serial/sx.c
+--- linux-2.6.39/drivers/staging/generic_serial/sx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/generic_serial/sx.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/staging/generic_serial/vme_scc.c linux-2.6.39/drivers/staging/generic_serial/vme_scc.c
+--- linux-2.6.39/drivers/staging/generic_serial/vme_scc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/generic_serial/vme_scc.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/staging/gma500/psb_fb.c linux-2.6.39/drivers/staging/gma500/psb_fb.c
+--- linux-2.6.39/drivers/staging/gma500/psb_fb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/gma500/psb_fb.c 2011-05-22 19:36:32.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/drivers/staging/go7007/go7007-i2c.c linux-2.6.39/drivers/staging/go7007/go7007-i2c.c
+--- linux-2.6.39/drivers/staging/go7007/go7007-i2c.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/go7007/go7007-i2c.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/staging/go7007/go7007-usb.c linux-2.6.39/drivers/staging/go7007/go7007-usb.c
+--- linux-2.6.39/drivers/staging/go7007/go7007-usb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/go7007/go7007-usb.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/staging/go7007/go7007-v4l2.c linux-2.6.39/drivers/staging/go7007/go7007-v4l2.c
+--- linux-2.6.39/drivers/staging/go7007/go7007-v4l2.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
}
.open = go7007_vm_open,
.close = go7007_vm_close,
.fault = go7007_vm_fault,
-diff -urNp linux-2.6.38.4/drivers/staging/hv/channel.c linux-2.6.38.4/drivers/staging/hv/channel.c
---- linux-2.6.38.4/drivers/staging/hv/channel.c 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/hv/channel.c 2011-04-28 19:57:25.000000000 -0400
-@@ -501,8 +501,8 @@ int vmbus_establish_gpadl(struct vmbus_c
+diff -urNp linux-2.6.39/drivers/staging/go7007/saa7134-go7007.c linux-2.6.39/drivers/staging/go7007/saa7134-go7007.c
+--- linux-2.6.39/drivers/staging/go7007/saa7134-go7007.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/staging/go7007/snd-go7007.c linux-2.6.39/drivers/staging/go7007/snd-go7007.c
+--- linux-2.6.39/drivers/staging/go7007/snd-go7007.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/go7007/snd-go7007.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/staging/hv/channel.c linux-2.6.39/drivers/staging/hv/channel.c
+--- linux-2.6.39/drivers/staging/hv/channel.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/hv/channel.c 2011-05-22 19:36:32.000000000 -0400
+@@ -509,8 +509,8 @@ int vmbus_establish_gpadl(struct vmbus_c
unsigned long flags;
int ret = 0;
-- next_gpadl_handle = atomic_read(&gVmbusConnection.NextGpadlHandle);
-- atomic_inc(&gVmbusConnection.NextGpadlHandle);
-+ next_gpadl_handle = atomic_read_unchecked(&gVmbusConnection.NextGpadlHandle);
-+ atomic_inc_unchecked(&gVmbusConnection.NextGpadlHandle);
+- next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
+- atomic_inc(&vmbus_connection.next_gpadl_handle);
++ next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
++ atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
if (ret)
-diff -urNp linux-2.6.38.4/drivers/staging/hv/hv.c linux-2.6.38.4/drivers/staging/hv/hv.c
---- linux-2.6.38.4/drivers/staging/hv/hv.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/hv/hv.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/staging/hv/hv.c linux-2.6.39/drivers/staging/hv/hv.c
+--- linux-2.6.39/drivers/staging/hv/hv.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/hv/hv.c 2011-05-22 19:36:32.000000000 -0400
@@ -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;
DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
control, input, output);
-diff -urNp linux-2.6.38.4/drivers/staging/hv/rndis_filter.c linux-2.6.38.4/drivers/staging/hv/rndis_filter.c
---- linux-2.6.38.4/drivers/staging/hv/rndis_filter.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/hv/rndis_filter.c 2011-04-28 19:57:25.000000000 -0400
-@@ -47,7 +47,7 @@ struct rndis_device {
+diff -urNp linux-2.6.39/drivers/staging/hv/rndis_filter.c linux-2.6.39/drivers/staging/hv/rndis_filter.c
+--- linux-2.6.39/drivers/staging/hv/rndis_filter.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/hv/rndis_filter.c 2011-05-22 19:36:32.000000000 -0400
+@@ -49,7 +49,7 @@ struct rndis_device {
enum rndis_device_state state;
u32 link_stat;
spinlock_t request_lock;
struct list_head req_list;
-@@ -145,7 +145,7 @@ static struct rndis_request *get_rndis_r
+@@ -144,7 +144,7 @@ static struct rndis_request *get_rndis_r
* template
*/
set = &rndis_msg->msg.set_req;
/* Add to the request list */
spin_lock_irqsave(&dev->request_lock, flags);
-@@ -707,7 +707,7 @@ static void rndis_filter_halt_device(str
+@@ -709,7 +709,7 @@ static void rndis_filter_halt_device(str
/* Setup the rndis set */
halt = &request->request_msg.msg.halt_req;
/* Ignore return since this msg is optional. */
rndis_filter_send_request(dev, request);
-diff -urNp linux-2.6.38.4/drivers/staging/hv/vmbus_drv.c linux-2.6.38.4/drivers/staging/hv/vmbus_drv.c
---- linux-2.6.38.4/drivers/staging/hv/vmbus_drv.c 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/hv/vmbus_drv.c 2011-04-28 19:57:25.000000000 -0400
-@@ -727,14 +727,14 @@ int vmbus_child_device_register(struct h
- to_vm_device(root_device_obj);
- struct vm_device *child_device_ctx =
- to_vm_device(child_device_obj);
+diff -urNp linux-2.6.39/drivers/staging/hv/vmbus_drv.c linux-2.6.39/drivers/staging/hv/vmbus_drv.c
+--- linux-2.6.39/drivers/staging/hv/vmbus_drv.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/hv/vmbus_drv.c 2011-05-22 19:36:32.000000000 -0400
+@@ -661,14 +661,14 @@ int vmbus_child_device_register(struct h
+ {
+ int ret = 0;
+
- static atomic_t device_num = ATOMIC_INIT(0);
+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
DPRINT_DBG(VMBUS_DRV, "child device (%p) registering",
- child_device_ctx);
+ child_device_obj);
/* Set the device name. Otherwise, device_register() will fail. */
- dev_set_name(&child_device_ctx->device, "vmbus_0_%d",
+ dev_set_name(&child_device_obj->device, "vmbus_0_%d",
- atomic_inc_return(&device_num));
+ atomic_inc_return_unchecked(&device_num));
/* The new device belongs to this bus */
- child_device_ctx->device.bus = &g_vmbus_drv.bus; /* device->dev.bus; */
-diff -urNp linux-2.6.38.4/drivers/staging/hv/vmbus_private.h linux-2.6.38.4/drivers/staging/hv/vmbus_private.h
---- linux-2.6.38.4/drivers/staging/hv/vmbus_private.h 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/hv/vmbus_private.h 2011-04-28 19:57:25.000000000 -0400
-@@ -58,7 +58,7 @@ enum VMBUS_CONNECT_STATE {
- struct VMBUS_CONNECTION {
- enum VMBUS_CONNECT_STATE ConnectState;
+ child_device_obj->device.bus = &vmbus_drv.bus; /* device->dev.bus; */
+diff -urNp linux-2.6.39/drivers/staging/hv/vmbus_private.h linux-2.6.39/drivers/staging/hv/vmbus_private.h
+--- linux-2.6.39/drivers/staging/hv/vmbus_private.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/hv/vmbus_private.h 2011-05-22 19:36:32.000000000 -0400
+@@ -58,7 +58,7 @@ enum vmbus_connect_state {
+ struct vmbus_connection {
+ enum vmbus_connect_state conn_state;
-- atomic_t NextGpadlHandle;
-+ atomic_unchecked_t NextGpadlHandle;
+- atomic_t next_gpadl_handle;
++ atomic_unchecked_t next_gpadl_handle;
/*
* Represents channel interrupts. Each bit position represents a
-diff -urNp linux-2.6.38.4/drivers/staging/octeon/ethernet.c linux-2.6.38.4/drivers/staging/octeon/ethernet.c
---- linux-2.6.38.4/drivers/staging/octeon/ethernet.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/octeon/ethernet.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/staging/iio/ring_generic.h linux-2.6.39/drivers/staging/iio/ring_generic.h
+--- linux-2.6.39/drivers/staging/iio/ring_generic.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/iio/ring_generic.h 2011-05-22 19:36:32.000000000 -0400
+@@ -134,7 +134,7 @@ struct iio_ring_buffer {
+ struct iio_handler access_handler;
+ struct iio_event_interface ev_int;
+ struct iio_shared_ev_pointer shared_ev_pointer;
+- struct iio_ring_access_funcs access;
++ const struct iio_ring_access_funcs access;
+ int (*preenable)(struct iio_dev *);
+ int (*postenable)(struct iio_dev *);
+ int (*predisable)(struct iio_dev *);
+diff -urNp linux-2.6.39/drivers/staging/intel_sst/intelmid_ctrl.c linux-2.6.39/drivers/staging/intel_sst/intelmid_ctrl.c
+--- linux-2.6.39/drivers/staging/intel_sst/intelmid_ctrl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/intel_sst/intelmid_ctrl.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/staging/intel_sst/intel_sst_drv_interface.c linux-2.6.39/drivers/staging/intel_sst/intel_sst_drv_interface.c
+--- linux-2.6.39/drivers/staging/intel_sst/intel_sst_drv_interface.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/staging/line6/capture.c linux-2.6.39/drivers/staging/line6/capture.c
+--- linux-2.6.39/drivers/staging/line6/capture.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/staging/line6/capture.h linux-2.6.39/drivers/staging/line6/capture.h
+--- linux-2.6.39/drivers/staging/line6/capture.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/staging/line6/midi.c linux-2.6.39/drivers/staging/line6/midi.c
+--- linux-2.6.39/drivers/staging/line6/midi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/staging/line6/pcm.c linux-2.6.39/drivers/staging/line6/pcm.c
+--- linux-2.6.39/drivers/staging/line6/pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/staging/line6/playback.c linux-2.6.39/drivers/staging/line6/playback.c
+--- linux-2.6.39/drivers/staging/line6/playback.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/staging/line6/playback.h linux-2.6.39/drivers/staging/line6/playback.h
+--- linux-2.6.39/drivers/staging/line6/playback.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/staging/msm/staging-devices.c linux-2.6.39/drivers/staging/msm/staging-devices.c
+--- linux-2.6.39/drivers/staging/msm/staging-devices.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/msm/staging-devices.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/staging/octeon/ethernet.c linux-2.6.39/drivers/staging/octeon/ethernet.c
+--- linux-2.6.39/drivers/staging/octeon/ethernet.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/octeon/ethernet.c 2011-05-22 19:36:32.000000000 -0400
@@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_
* since the RX tasklet also increments it.
*/
#endif
}
-diff -urNp linux-2.6.38.4/drivers/staging/octeon/ethernet-rx.c linux-2.6.38.4/drivers/staging/octeon/ethernet-rx.c
---- linux-2.6.38.4/drivers/staging/octeon/ethernet-rx.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/octeon/ethernet-rx.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/staging/octeon/ethernet-rx.c linux-2.6.39/drivers/staging/octeon/ethernet-rx.c
+--- linux-2.6.39/drivers/staging/octeon/ethernet-rx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/octeon/ethernet-rx.c 2011-05-22 19:36:32.000000000 -0400
@@ -417,11 +417,11 @@ static int cvm_oct_napi_poll(struct napi
/* Increment RX stats for virtual ports */
if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
#endif
dev_kfree_skb_irq(skb);
}
-diff -urNp linux-2.6.38.4/drivers/staging/phison/phison.c linux-2.6.38.4/drivers/staging/phison/phison.c
---- linux-2.6.38.4/drivers/staging/phison/phison.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/phison/phison.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon.c linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon.c
+--- linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/staging/olpc_dcon/olpc_dcon.h linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon.h
+--- linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon.h 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
+--- linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
+--- linux-2.6.39/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/staging/phison/phison.c linux-2.6.39/drivers/staging/phison/phison.c
+--- linux-2.6.39/drivers/staging/phison/phison.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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),
};
.inherits = &ata_bmdma_port_ops,
.prereset = phison_pre_reset,
};
-diff -urNp linux-2.6.38.4/drivers/staging/pohmelfs/inode.c linux-2.6.38.4/drivers/staging/pohmelfs/inode.c
---- linux-2.6.38.4/drivers/staging/pohmelfs/inode.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/pohmelfs/inode.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/staging/pohmelfs/inode.c linux-2.6.39/drivers/staging/pohmelfs/inode.c
+--- linux-2.6.39/drivers/staging/pohmelfs/inode.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/pohmelfs/inode.c 2011-05-22 19:36:32.000000000 -0400
@@ -1855,7 +1855,7 @@ static int pohmelfs_fill_super(struct su
mutex_init(&psb->mcache_lock);
psb->mcache_root = RB_ROOT;
atomic_long_set(&psb->total_inodes, 0);
mutex_init(&psb->state_lock);
-diff -urNp linux-2.6.38.4/drivers/staging/pohmelfs/mcache.c linux-2.6.38.4/drivers/staging/pohmelfs/mcache.c
---- linux-2.6.38.4/drivers/staging/pohmelfs/mcache.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/pohmelfs/mcache.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/staging/pohmelfs/mcache.c linux-2.6.39/drivers/staging/pohmelfs/mcache.c
+--- linux-2.6.39/drivers/staging/pohmelfs/mcache.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/pohmelfs/mcache.c 2011-05-22 19:36:32.000000000 -0400
@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
m->data = data;
m->start = start;
mutex_lock(&psb->mcache_lock);
err = pohmelfs_mcache_insert(psb, m);
-diff -urNp linux-2.6.38.4/drivers/staging/pohmelfs/netfs.h linux-2.6.38.4/drivers/staging/pohmelfs/netfs.h
---- linux-2.6.38.4/drivers/staging/pohmelfs/netfs.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/pohmelfs/netfs.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/staging/pohmelfs/netfs.h linux-2.6.39/drivers/staging/pohmelfs/netfs.h
+--- linux-2.6.39/drivers/staging/pohmelfs/netfs.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/pohmelfs/netfs.h 2011-05-22 19:36:32.000000000 -0400
@@ -571,14 +571,14 @@ struct pohmelfs_config;
struct pohmelfs_sb {
struct rb_root mcache_root;
unsigned int crypto_attached_size;
unsigned int crypto_align_size;
-diff -urNp linux-2.6.38.4/drivers/staging/pohmelfs/trans.c linux-2.6.38.4/drivers/staging/pohmelfs/trans.c
---- linux-2.6.38.4/drivers/staging/pohmelfs/trans.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/pohmelfs/trans.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/staging/pohmelfs/trans.c linux-2.6.39/drivers/staging/pohmelfs/trans.c
+--- linux-2.6.39/drivers/staging/pohmelfs/trans.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/pohmelfs/trans.c 2011-05-22 19:36:32.000000000 -0400
@@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran
int err;
struct netfs_cmd *cmd = t->iovec.iov_base;
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.38.4/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.38.4/drivers/staging/rtl8192u/ieee80211/proc.c
---- linux-2.6.38.4/drivers/staging/rtl8192u/ieee80211/proc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/rtl8192u/ieee80211/proc.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.39/drivers/staging/rtl8192u/ieee80211/proc.c
+--- linux-2.6.39/drivers/staging/rtl8192u/ieee80211/proc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/rtl8192u/ieee80211/proc.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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);
}
.open = crypto_info_open,
.read = seq_read,
.llseek = seq_lseek,
-diff -urNp linux-2.6.38.4/drivers/staging/spectra/ffsport.c linux-2.6.38.4/drivers/staging/spectra/ffsport.c
---- linux-2.6.38.4/drivers/staging/spectra/ffsport.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/spectra/ffsport.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/staging/rtl8712/rtl871x_io.h linux-2.6.39/drivers/staging/rtl8712/rtl871x_io.h
+--- linux-2.6.39/drivers/staging/rtl8712/rtl871x_io.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/staging/solo6x10/g723.c linux-2.6.39/drivers/staging/solo6x10/g723.c
+--- linux-2.6.39/drivers/staging/solo6x10/g723.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/staging/spectra/ffsport.c linux-2.6.39/drivers/staging/spectra/ffsport.c
+--- linux-2.6.39/drivers/staging/spectra/ffsport.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
}
.owner = THIS_MODULE,
.open = GLOB_SBD_open,
.release = GLOB_SBD_release,
-diff -urNp linux-2.6.38.4/drivers/staging/usbip/vhci.h linux-2.6.38.4/drivers/staging/usbip/vhci.h
---- linux-2.6.38.4/drivers/staging/usbip/vhci.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/usbip/vhci.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/staging/tm6000/tm6000-alsa.c linux-2.6.39/drivers/staging/tm6000/tm6000-alsa.c
+--- linux-2.6.39/drivers/staging/tm6000/tm6000-alsa.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/staging/tty/istallion.c linux-2.6.39/drivers/staging/tty/istallion.c
+--- linux-2.6.39/drivers/staging/tty/istallion.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/tty/istallion.c 2011-05-22 20:49:07.000000000 -0400
+@@ -186,7 +186,6 @@ static struct ktermios stli_deftermios
+ * re-used for each stats call.
+ */
+ static comstats_t stli_comstats;
+-static combrd_t stli_brdstats;
+ static struct asystats stli_cdkstats;
+
+ /*****************************************************************************/
+@@ -4003,6 +4002,7 @@ out:
+
+ static int stli_getbrdstats(combrd_t __user *bp)
+ {
++ combrd_t stli_brdstats;
+ struct stlibrd *brdp;
+ unsigned int i;
+
+@@ -4226,6 +4226,8 @@ static int stli_getportstruct(struct stl
+ struct stliport stli_dummyport;
+ struct stliport *portp;
+
++ pax_track_stack();
++
+ if (copy_from_user(&stli_dummyport, arg, sizeof(struct stliport)))
+ return -EFAULT;
+ portp = stli_getport(stli_dummyport.brdnr, stli_dummyport.panelnr,
+@@ -4248,6 +4250,8 @@ static int stli_getbrdstruct(struct stli
+ struct stlibrd stli_dummybrd;
+ struct stlibrd *brdp;
+
++ pax_track_stack();
++
+ if (copy_from_user(&stli_dummybrd, arg, sizeof(struct stlibrd)))
+ return -EFAULT;
+ if (stli_dummybrd.brdnr >= STL_MAXBRDS)
+diff -urNp linux-2.6.39/drivers/staging/tty/stallion.c linux-2.6.39/drivers/staging/tty/stallion.c
+--- linux-2.6.39/drivers/staging/tty/stallion.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/tty/stallion.c 2011-05-22 19:36:32.000000000 -0400
+@@ -2406,6 +2406,8 @@ static int stl_getportstruct(struct stlp
+ struct stlport stl_dummyport;
+ struct stlport *portp;
+
++ pax_track_stack();
++
+ 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/drivers/staging/usbip/vhci.h linux-2.6.39/drivers/staging/usbip/vhci.h
+--- linux-2.6.39/drivers/staging/usbip/vhci.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/usbip/vhci.h 2011-05-22 19:36:32.000000000 -0400
@@ -92,7 +92,7 @@ struct vhci_hcd {
unsigned resuming:1;
unsigned long re_timeout;
/*
* NOTE:
-diff -urNp linux-2.6.38.4/drivers/staging/usbip/vhci_hcd.c linux-2.6.38.4/drivers/staging/usbip/vhci_hcd.c
---- linux-2.6.38.4/drivers/staging/usbip/vhci_hcd.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/usbip/vhci_hcd.c 2011-04-28 19:57:25.000000000 -0400
-@@ -535,7 +535,7 @@ static void vhci_tx_urb(struct urb *urb)
+diff -urNp linux-2.6.39/drivers/staging/usbip/vhci_hcd.c linux-2.6.39/drivers/staging/usbip/vhci_hcd.c
+--- linux-2.6.39/drivers/staging/usbip/vhci_hcd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/usbip/vhci_hcd.c 2011-05-22 19:36:32.000000000 -0400
+@@ -536,7 +536,7 @@ static void vhci_tx_urb(struct urb *urb)
return;
}
if (priv->seqnum == 0xffff)
usbip_uinfo("seqnum max\n");
-@@ -794,7 +794,7 @@ static int vhci_urb_dequeue(struct usb_h
+@@ -795,7 +795,7 @@ static int vhci_urb_dequeue(struct usb_h
return -ENOMEM;
}
if (unlink->seqnum == 0xffff)
usbip_uinfo("seqnum max\n");
-@@ -989,7 +989,7 @@ static int vhci_start(struct usb_hcd *hc
+@@ -992,7 +992,7 @@ static int vhci_start(struct usb_hcd *hc
vdev->rhport = rhport;
}
spin_lock_init(&vhci->lock);
-diff -urNp linux-2.6.38.4/drivers/staging/usbip/vhci_rx.c linux-2.6.38.4/drivers/staging/usbip/vhci_rx.c
---- linux-2.6.38.4/drivers/staging/usbip/vhci_rx.c 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/usbip/vhci_rx.c 2011-04-28 19:57:25.000000000 -0400
-@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct
+diff -urNp linux-2.6.39/drivers/staging/usbip/vhci_rx.c linux-2.6.39/drivers/staging/usbip/vhci_rx.c
+--- linux-2.6.39/drivers/staging/usbip/vhci_rx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/usbip/vhci_rx.c 2011-05-22 19:36:32.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);
usbip_uinfo("max seqnum %d\n",
usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
return;
}
-diff -urNp linux-2.6.38.4/drivers/staging/vme/devices/vme_user.c linux-2.6.38.4/drivers/staging/vme/devices/vme_user.c
---- linux-2.6.38.4/drivers/staging/vme/devices/vme_user.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/vme/devices/vme_user.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/staging/vme/devices/vme_user.c linux-2.6.39/drivers/staging/vme/devices/vme_user.c
+--- linux-2.6.39/drivers/staging/vme/devices/vme_user.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/vme/devices/vme_user.c 2011-05-22 19:36:32.000000000 -0400
@@ -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);
.open = vme_user_open,
.release = vme_user_release,
.read = vme_user_read,
-diff -urNp linux-2.6.38.4/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c linux-2.6.38.4/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c
---- linux-2.6.38.4/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c linux-2.6.39/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c
+--- linux-2.6.39/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
.open = cyasblkdev_blk_open,
.release = cyasblkdev_blk_release,
.ioctl = cyasblkdev_blk_ioctl,
-diff -urNp linux-2.6.38.4/drivers/target/target_core_tmr.c linux-2.6.38.4/drivers/target/target_core_tmr.c
---- linux-2.6.38.4/drivers/target/target_core_tmr.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/target/target_core_tmr.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/staging/wlags49_h2/wl_netdev.c linux-2.6.39/drivers/staging/wlags49_h2/wl_netdev.c
+--- linux-2.6.39/drivers/staging/wlags49_h2/wl_netdev.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/wlags49_h2/wl_netdev.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/staging/wlan-ng/hfa384x_usb.c linux-2.6.39/drivers/staging/wlan-ng/hfa384x_usb.c
+--- linux-2.6.39/drivers/staging/wlan-ng/hfa384x_usb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/staging/wlan-ng/hfa384x_usb.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/staging/zcache/tmem.c linux-2.6.39/drivers/staging/zcache/tmem.c
+--- linux-2.6.39/drivers/staging/zcache/tmem.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/staging/zcache/zcache.c linux-2.6.39/drivers/staging/zcache/zcache.c
+--- linux-2.6.39/drivers/staging/zcache/zcache.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/target/target_core_alua.c linux-2.6.39/drivers/target/target_core_alua.c
+--- linux-2.6.39/drivers/target/target_core_alua.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/target/target_core_alua.c 2011-05-22 19:36:32.000000000 -0400
+@@ -675,6 +675,8 @@ static int core_alua_update_tpg_primary_
+ char path[ALUA_METADATA_PATH_LEN];
+ int len;
+
++ pax_track_stack();
++
+ memset(path, 0, ALUA_METADATA_PATH_LEN);
+
+ len = snprintf(md_buf, tg_pt_gp->tg_pt_gp_md_buf_len,
+@@ -938,6 +940,8 @@ static int core_alua_update_tpg_secondar
+ char path[ALUA_METADATA_PATH_LEN], wwn[ALUA_SECONDARY_METADATA_WWN_LEN];
+ int len;
+
++ pax_track_stack();
++
+ memset(path, 0, ALUA_METADATA_PATH_LEN);
+ memset(wwn, 0, ALUA_SECONDARY_METADATA_WWN_LEN);
+
+diff -urNp linux-2.6.39/drivers/target/target_core_cdb.c linux-2.6.39/drivers/target/target_core_cdb.c
+--- linux-2.6.39/drivers/target/target_core_cdb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/target/target_core_cdb.c 2011-05-22 19:36:32.000000000 -0400
+@@ -838,6 +838,8 @@ target_emulate_modesense(struct se_cmd *
+ int length = 0;
+ unsigned char buf[SE_MODE_PAGE_BUF];
+
++ pax_track_stack();
++
+ memset(buf, 0, SE_MODE_PAGE_BUF);
+
+ switch (cdb[2] & 0x3f) {
+diff -urNp linux-2.6.39/drivers/target/target_core_configfs.c linux-2.6.39/drivers/target/target_core_configfs.c
+--- linux-2.6.39/drivers/target/target_core_configfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/target/target_core_configfs.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1280,6 +1280,8 @@ static ssize_t target_core_dev_pr_show_a
+ ssize_t len = 0;
+ int reg_count = 0, prf_isid;
+
++ pax_track_stack();
++
+ 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/drivers/target/target_core_fabric_configfs.c linux-2.6.39/drivers/target/target_core_fabric_configfs.c
+--- linux-2.6.39/drivers/target/target_core_fabric_configfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/target/target_core_fabric_configfs.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/target/target_core_pr.c linux-2.6.39/drivers/target/target_core_pr.c
+--- linux-2.6.39/drivers/target/target_core_pr.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/target/target_core_pr.c 2011-05-22 19:36:32.000000000 -0400
+@@ -918,6 +918,8 @@ static int __core_scsi3_check_aptpl_regi
+ unsigned char t_port[PR_APTPL_MAX_TPORT_LEN];
+ u16 tpgt;
+
++ pax_track_stack();
++
+ memset(i_port, 0, PR_APTPL_MAX_IPORT_LEN);
+ memset(t_port, 0, PR_APTPL_MAX_TPORT_LEN);
+ /*
+@@ -1861,6 +1863,8 @@ static int __core_scsi3_update_aptpl_buf
+ ssize_t len = 0;
+ int reg_count = 0;
+
++ pax_track_stack();
++
+ memset(buf, 0, pr_aptpl_buf_len);
+ /*
+ * Called to clear metadata once APTPL has been deactivated.
+@@ -1983,6 +1987,8 @@ static int __core_scsi3_write_aptpl_to_f
+ char path[512];
+ int ret;
+
++ pax_track_stack();
++
+ memset(iov, 0, sizeof(struct iovec));
+ memset(path, 0, 512);
+
+diff -urNp linux-2.6.39/drivers/target/target_core_tmr.c linux-2.6.39/drivers/target/target_core_tmr.c
+--- linux-2.6.39/drivers/target/target_core_tmr.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/target/target_core_tmr.c 2011-05-22 19:36:32.000000000 -0400
@@ -262,7 +262,7 @@ int core_tmr_lun_reset(
CMD_TFO(cmd)->get_task_tag(cmd), cmd->pr_res_key,
T_TASK(cmd)->t_task_cdbs,
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.38.4/drivers/target/target_core_transport.c linux-2.6.38.4/drivers/target/target_core_transport.c
---- linux-2.6.38.4/drivers/target/target_core_transport.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/target/target_core_transport.c 2011-04-28 19:57:25.000000000 -0400
-@@ -1678,7 +1678,7 @@ struct se_device *transport_add_device_t
+diff -urNp linux-2.6.39/drivers/target/target_core_transport.c linux-2.6.39/drivers/target/target_core_transport.c
+--- linux-2.6.39/drivers/target/target_core_transport.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/target/target_core_transport.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1675,7 +1675,7 @@ struct se_device *transport_add_device_t
dev->queue_depth = dev_limits->queue_depth;
atomic_set(&dev->depth_left, dev->queue_depth);
se_dev_set_default_attribs(dev, dev_limits);
-@@ -1880,7 +1880,7 @@ static int transport_check_alloc_task_at
+@@ -1876,7 +1876,7 @@ static int transport_check_alloc_task_at
* Used to determine when ORDERED commands should go from
* Dormant to Active status.
*/
smp_mb__after_atomic_inc();
DEBUG_STA("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
cmd->se_ordered_id, cmd->sam_task_attr,
-@@ -2160,7 +2160,7 @@ static void transport_generic_request_fa
+@@ -2156,7 +2156,7 @@ static void transport_generic_request_fa
" t_transport_active: %d t_transport_stop: %d"
" t_transport_sent: %d\n", T_TASK(cmd)->t_task_cdbs,
atomic_read(&T_TASK(cmd)->t_task_cdbs_left),
atomic_read(&T_TASK(cmd)->t_task_cdbs_ex_left),
atomic_read(&T_TASK(cmd)->t_transport_active),
atomic_read(&T_TASK(cmd)->t_transport_stop),
-@@ -2664,9 +2664,9 @@ check_depth:
+@@ -2660,9 +2660,9 @@ check_depth:
spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
atomic_set(&task->task_active, 1);
atomic_set(&task->task_sent, 1);
T_TASK(cmd)->t_task_cdbs)
atomic_set(&cmd->transport_sent, 1);
-@@ -5550,7 +5550,7 @@ static void transport_generic_wait_for_t
+@@ -5549,7 +5549,7 @@ static void transport_generic_wait_for_t
atomic_set(&T_TASK(cmd)->transport_lun_stop, 0);
}
if (!atomic_read(&T_TASK(cmd)->t_transport_active) ||
goto remove;
atomic_set(&T_TASK(cmd)->t_transport_stop, 1);
-@@ -5779,7 +5779,7 @@ int transport_check_aborted_status(struc
+@@ -5778,7 +5778,7 @@ int transport_check_aborted_status(struc
{
int ret = 0;
if (!(send_status) ||
(cmd->se_cmd_flags & SCF_SENT_DELAYED_TAS))
return 1;
-@@ -5807,7 +5807,7 @@ void transport_send_task_abort(struct se
+@@ -5806,7 +5806,7 @@ void transport_send_task_abort(struct se
*/
if (cmd->data_direction == DMA_TO_DEVICE) {
if (CMD_TFO(cmd)->write_pending_status(cmd) != 0) {
smp_mb__after_atomic_inc();
cmd->scsi_status = SAM_STAT_TASK_ABORTED;
transport_new_cmd_failure(cmd);
-@@ -5936,7 +5936,7 @@ static void transport_processing_shutdow
+@@ -5930,7 +5930,7 @@ static void transport_processing_shutdow
CMD_TFO(cmd)->get_task_tag(cmd),
T_TASK(cmd)->t_task_cdbs,
atomic_read(&T_TASK(cmd)->t_task_cdbs_left),
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.38.4/drivers/tty/hvc/hvc_console.h linux-2.6.38.4/drivers/tty/hvc/hvc_console.h
---- linux-2.6.38.4/drivers/tty/hvc/hvc_console.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/hvc/hvc_console.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/telephony/ixj.c linux-2.6.39/drivers/telephony/ixj.c
+--- linux-2.6.39/drivers/telephony/ixj.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/telephony/ixj.c 2011-05-22 19:36:32.000000000 -0400
+@@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j)
+ bool mContinue;
+ char *pIn, *pOut;
+
++ pax_track_stack();
++
+ if (!SCI_Prepare(j))
+ return 0;
+
+diff -urNp linux-2.6.39/drivers/tty/hvc/hvc_console.h linux-2.6.39/drivers/tty/hvc/hvc_console.h
+--- linux-2.6.39/drivers/tty/hvc/hvc_console.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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,
/* 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.38.4/drivers/tty/hvc/hvcs.c linux-2.6.38.4/drivers/tty/hvc/hvcs.c
---- linux-2.6.38.4/drivers/tty/hvc/hvcs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/hvc/hvcs.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/tty/hvc/hvc_iucv.c linux-2.6.39/drivers/tty/hvc/hvc_iucv.c
+--- linux-2.6.39/drivers/tty/hvc/hvc_iucv.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/hvc/hvcs.c linux-2.6.39/drivers/tty/hvc/hvcs.c
+--- linux-2.6.39/drivers/tty/hvc/hvcs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/hvc/hvcs.c 2011-05-22 19:36:32.000000000 -0400
@@ -83,6 +83,7 @@
#include <asm/hvcserver.h>
#include <asm/uaccess.h>
/*
* Used to tell the driver kernel_thread what operations need to take
-@@ -420,7 +421,7 @@ static ssize_t hvcs_vterm_state_store(st
+@@ -422,7 +423,7 @@ static ssize_t hvcs_vterm_state_store(st
spin_lock_irqsave(&hvcsd->lock, flags);
spin_unlock_irqrestore(&hvcsd->lock, flags);
printk(KERN_INFO "HVCS: vterm state unchanged. "
"The hvcs device node is still in use.\n");
-@@ -1136,7 +1137,7 @@ static int hvcs_open(struct tty_struct *
+@@ -1145,7 +1146,7 @@ static int hvcs_open(struct tty_struct *
if ((retval = hvcs_partner_connect(hvcsd)))
goto error_release;
hvcsd->tty = tty;
tty->driver_data = hvcsd;
-@@ -1170,7 +1171,7 @@ fast_open:
+@@ -1179,7 +1180,7 @@ fast_open:
spin_lock_irqsave(&hvcsd->lock, flags);
kref_get(&hvcsd->kref);
hvcsd->todo_mask |= HVCS_SCHED_READ;
spin_unlock_irqrestore(&hvcsd->lock, flags);
-@@ -1214,7 +1215,7 @@ static void hvcs_close(struct tty_struct
+@@ -1223,7 +1224,7 @@ static void hvcs_close(struct tty_struct
hvcsd = tty->driver_data;
spin_lock_irqsave(&hvcsd->lock, flags);
vio_disable_interrupts(hvcsd->vdev);
-@@ -1240,10 +1241,10 @@ static void hvcs_close(struct tty_struct
+@@ -1249,10 +1250,10 @@ static void hvcs_close(struct tty_struct
free_irq(irq, hvcsd);
kref_put(&hvcsd->kref, destroy_hvcs_struct);
return;
}
spin_unlock_irqrestore(&hvcsd->lock, flags);
-@@ -1259,7 +1260,7 @@ static void hvcs_hangup(struct tty_struc
+@@ -1268,7 +1269,7 @@ static void hvcs_hangup(struct tty_struc
spin_lock_irqsave(&hvcsd->lock, flags);
/* Preserve this so that we know how many kref refs to put */
/*
* Don't kref put inside the spinlock because the destruction
-@@ -1274,7 +1275,7 @@ static void hvcs_hangup(struct tty_struc
+@@ -1283,7 +1284,7 @@ static void hvcs_hangup(struct tty_struc
hvcsd->tty->driver_data = NULL;
hvcsd->tty = NULL;
/* This will drop any buffered data on the floor which is OK in a hangup
* scenario. */
-@@ -1345,7 +1346,7 @@ static int hvcs_write(struct tty_struct
+@@ -1354,7 +1355,7 @@ static int hvcs_write(struct tty_struct
* the middle of a write operation? This is a crummy place to do this
* but we want to keep it all in the spinlock.
*/
spin_unlock_irqrestore(&hvcsd->lock, flags);
return -ENODEV;
}
-@@ -1419,7 +1420,7 @@ static int hvcs_write_room(struct tty_st
+@@ -1428,7 +1429,7 @@ static int hvcs_write_room(struct tty_st
{
struct hvcs_struct *hvcsd = tty->driver_data;
return 0;
return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-2.6.38.4/drivers/tty/hvc/hvc_xen.c linux-2.6.38.4/drivers/tty/hvc/hvc_xen.c
---- linux-2.6.38.4/drivers/tty/hvc/hvc_xen.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/hvc/hvc_xen.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/tty/hvc/hvc_xen.c linux-2.6.39/drivers/tty/hvc/hvc_xen.c
+--- linux-2.6.39/drivers/tty/hvc/hvc_xen.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/hvc/hvc_xen.c 2011-05-22 19:36:32.000000000 -0400
@@ -123,7 +123,7 @@ static int domU_read_console(uint32_t vt
return recv;
}
if (!xen_pv_domain())
return -ENODEV;
-@@ -203,7 +203,7 @@ static void __exit xen_hvc_fini(void)
+@@ -205,7 +205,7 @@ static void __exit xen_hvc_fini(void)
static int xen_cons_init(void)
{
if (!xen_pv_domain())
return 0;
-diff -urNp linux-2.6.38.4/drivers/tty/n_gsm.c linux-2.6.38.4/drivers/tty/n_gsm.c
---- linux-2.6.38.4/drivers/tty/n_gsm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/n_gsm.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1589,7 +1589,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s
+diff -urNp linux-2.6.39/drivers/tty/ipwireless/tty.c linux-2.6.39/drivers/tty/ipwireless/tty.c
+--- linux-2.6.39/drivers/tty/ipwireless/tty.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/ipwireless/tty.c 2011-05-22 19:36:32.000000000 -0400
+@@ -29,6 +29,7 @@
+ #include <linux/tty_driver.h>
+ #include <linux/tty_flip.h>
+ #include <linux/uaccess.h>
++#include <asm/local.h>
+
+ #include "tty.h"
+ #include "network.h"
+@@ -51,7 +52,7 @@ struct ipw_tty {
+ int tty_type;
+ struct ipw_network *network;
+ struct tty_struct *linux_tty;
+- int open_count;
++ local_t open_count;
+ unsigned int control_lines;
+ struct mutex ipw_tty_mutex;
+ int tx_bytes_queued;
+@@ -127,10 +128,10 @@ static int ipw_open(struct tty_struct *l
+ mutex_unlock(&tty->ipw_tty_mutex);
+ return -ENODEV;
+ }
+- if (tty->open_count == 0)
++ if (local_read(&tty->open_count) == 0)
+ tty->tx_bytes_queued = 0;
+
+- tty->open_count++;
++ local_inc(&tty->open_count);
+
+ tty->linux_tty = linux_tty;
+ linux_tty->driver_data = tty;
+@@ -146,9 +147,7 @@ static int ipw_open(struct tty_struct *l
+
+ static void do_ipw_close(struct ipw_tty *tty)
+ {
+- tty->open_count--;
+-
+- if (tty->open_count == 0) {
++ if (local_dec_return(&tty->open_count) == 0) {
+ struct tty_struct *linux_tty = tty->linux_tty;
+
+ if (linux_tty != NULL) {
+@@ -169,7 +168,7 @@ static void ipw_hangup(struct tty_struct
+ return;
+
+ mutex_lock(&tty->ipw_tty_mutex);
+- if (tty->open_count == 0) {
++ if (local_read(&tty->open_count) == 0) {
+ mutex_unlock(&tty->ipw_tty_mutex);
+ return;
+ }
+@@ -198,7 +197,7 @@ void ipwireless_tty_received(struct ipw_
+ return;
+ }
+
+- if (!tty->open_count) {
++ if (!local_read(&tty->open_count)) {
+ mutex_unlock(&tty->ipw_tty_mutex);
+ return;
+ }
+@@ -240,7 +239,7 @@ static int ipw_write(struct tty_struct *
+ return -ENODEV;
+
+ mutex_lock(&tty->ipw_tty_mutex);
+- if (!tty->open_count) {
++ if (!local_read(&tty->open_count)) {
+ mutex_unlock(&tty->ipw_tty_mutex);
+ return -EINVAL;
+ }
+@@ -280,7 +279,7 @@ static int ipw_write_room(struct tty_str
+ if (!tty)
+ return -ENODEV;
+
+- if (!tty->open_count)
++ if (!local_read(&tty->open_count))
+ return -EINVAL;
+
+ room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
+@@ -322,7 +321,7 @@ static int ipw_chars_in_buffer(struct tt
+ if (!tty)
+ return 0;
+
+- if (!tty->open_count)
++ if (!local_read(&tty->open_count))
+ return 0;
+
+ return tty->tx_bytes_queued;
+@@ -403,7 +402,7 @@ static int ipw_tiocmget(struct tty_struc
+ if (!tty)
+ return -ENODEV;
+
+- if (!tty->open_count)
++ if (!local_read(&tty->open_count))
+ return -EINVAL;
+
+ return get_control_lines(tty);
+@@ -419,7 +418,7 @@ ipw_tiocmset(struct tty_struct *linux_tt
+ if (!tty)
+ return -ENODEV;
+
+- if (!tty->open_count)
++ if (!local_read(&tty->open_count))
+ return -EINVAL;
+
+ return set_control_lines(tty, set, clear);
+@@ -433,7 +432,7 @@ static int ipw_ioctl(struct tty_struct *
+ if (!tty)
+ return -ENODEV;
+
+- if (!tty->open_count)
++ if (!local_read(&tty->open_count))
+ return -EINVAL;
+
+ /* FIXME: Exactly how is the tty object locked here .. */
+@@ -582,7 +581,7 @@ void ipwireless_tty_free(struct ipw_tty
+ against a parallel ioctl etc */
+ mutex_lock(&ttyj->ipw_tty_mutex);
+ }
+- while (ttyj->open_count)
++ while (local_read(&ttyj->open_count))
+ do_ipw_close(ttyj);
+ ipwireless_disassociate_network_ttys(network,
+ ttyj->channel_idx);
+diff -urNp linux-2.6.39/drivers/tty/mxser.c linux-2.6.39/drivers/tty/mxser.c
+--- linux-2.6.39/drivers/tty/mxser.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/mxser.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/tty/n_gsm.c linux-2.6.39/drivers/tty/n_gsm.c
+--- linux-2.6.39/drivers/tty/n_gsm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/n_gsm.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1588,7 +1588,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s
return NULL;
spin_lock_init(&dlci->lock);
dlci->fifo = &dlci->_fifo;
kfree(dlci);
return NULL;
}
-diff -urNp linux-2.6.38.4/drivers/tty/n_tty.c linux-2.6.38.4/drivers/tty/n_tty.c
---- linux-2.6.38.4/drivers/tty/n_tty.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/n_tty.c 2011-04-28 19:34:15.000000000 -0400
-@@ -2116,6 +2116,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
+diff -urNp linux-2.6.39/drivers/tty/n_tty.c linux-2.6.39/drivers/tty/n_tty.c
+--- linux-2.6.39/drivers/tty/n_tty.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/n_tty.c 2011-05-22 19:36:32.000000000 -0400
+@@ -2122,6 +2122,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
{
*ops = tty_ldisc_N_TTY;
ops->owner = NULL;
+ ops->flags = 0;
}
EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
-diff -urNp linux-2.6.38.4/drivers/tty/pty.c linux-2.6.38.4/drivers/tty/pty.c
---- linux-2.6.38.4/drivers/tty/pty.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/pty.c 2011-04-28 19:34:15.000000000 -0400
-@@ -700,7 +700,18 @@ out:
+diff -urNp linux-2.6.39/drivers/tty/pty.c linux-2.6.39/drivers/tty/pty.c
+--- linux-2.6.39/drivers/tty/pty.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/pty.c 2011-05-22 19:36:32.000000000 -0400
+@@ -699,7 +699,18 @@ out:
return retval;
}
static void __init unix98_pty_init(void)
{
-@@ -753,10 +764,6 @@ static void __init unix98_pty_init(void)
+@@ -752,10 +763,6 @@ static void __init unix98_pty_init(void)
register_sysctl_table(pty_root_table);
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.38.4/drivers/tty/serial/kgdboc.c linux-2.6.38.4/drivers/tty/serial/kgdboc.c
---- linux-2.6.38.4/drivers/tty/serial/kgdboc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/serial/kgdboc.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/tty/rocket.c linux-2.6.39/drivers/tty/rocket.c
+--- linux-2.6.39/drivers/tty/rocket.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/rocket.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1277,6 +1277,8 @@ static int get_ports(struct r_port *info
+ struct rocket_ports tmp;
+ int board;
+
++ pax_track_stack();
++
+ if (!retports)
+ return -EFAULT;
+ memset(&tmp, 0, sizeof (tmp));
+diff -urNp linux-2.6.39/drivers/tty/serial/21285.c linux-2.6.39/drivers/tty/serial/21285.c
+--- linux-2.6.39/drivers/tty/serial/21285.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
+ }
+
+-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/drivers/tty/serial/8250.c linux-2.6.39/drivers/tty/serial/8250.c
+--- linux-2.6.39/drivers/tty/serial/8250.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/serial/8250.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/tty/serial/altera_jtaguart.c linux-2.6.39/drivers/tty/serial/altera_jtaguart.c
+--- linux-2.6.39/drivers/tty/serial/altera_jtaguart.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/altera_uart.c linux-2.6.39/drivers/tty/serial/altera_uart.c
+--- linux-2.6.39/drivers/tty/serial/altera_uart.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/amba-pl010.c linux-2.6.39/drivers/tty/serial/amba-pl010.c
+--- linux-2.6.39/drivers/tty/serial/amba-pl010.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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 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/drivers/tty/serial/amba-pl011.c linux-2.6.39/drivers/tty/serial/amba-pl011.c
+--- linux-2.6.39/drivers/tty/serial/amba-pl011.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
+ }
+
+-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/drivers/tty/serial/apbuart.c linux-2.6.39/drivers/tty/serial/apbuart.c
+--- linux-2.6.39/drivers/tty/serial/apbuart.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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 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/drivers/tty/serial/atmel_serial.c linux-2.6.39/drivers/tty/serial/atmel_serial.c
+--- linux-2.6.39/drivers/tty/serial/atmel_serial.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/bcm63xx_uart.c linux-2.6.39/drivers/tty/serial/bcm63xx_uart.c
+--- linux-2.6.39/drivers/tty/serial/bcm63xx_uart.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/bfin_5xx.c linux-2.6.39/drivers/tty/serial/bfin_5xx.c
+--- linux-2.6.39/drivers/tty/serial/bfin_5xx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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 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/drivers/tty/serial/bfin_sport_uart.c linux-2.6.39/drivers/tty/serial/bfin_sport_uart.c
+--- linux-2.6.39/drivers/tty/serial/bfin_sport_uart.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/clps711x.c linux-2.6.39/drivers/tty/serial/clps711x.c
+--- linux-2.6.39/drivers/tty/serial/clps711x.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/serial/clps711x.c 2011-05-22 19:36:32.000000000 -0400
+@@ -380,7 +380,7 @@ static int clps711xuart_request_port(str
+ 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/drivers/tty/serial/cpm_uart/cpm_uart_core.c linux-2.6.39/drivers/tty/serial/cpm_uart/cpm_uart_core.c
+--- linux-2.6.39/drivers/tty/serial/cpm_uart/cpm_uart_core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/serial/cpm_uart/cpm_uart_core.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/tty/serial/dz.c linux-2.6.39/drivers/tty/serial/dz.c
+--- linux-2.6.39/drivers/tty/serial/dz.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/serial/dz.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/tty/serial/imx.c linux-2.6.39/drivers/tty/serial/imx.c
+--- linux-2.6.39/drivers/tty/serial/imx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/serial/imx.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/tty/serial/ioc3_serial.c linux-2.6.39/drivers/tty/serial/ioc3_serial.c
+--- linux-2.6.39/drivers/tty/serial/ioc3_serial.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/ioc4_serial.c linux-2.6.39/drivers/tty/serial/ioc4_serial.c
+--- linux-2.6.39/drivers/tty/serial/ioc4_serial.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/ip22zilog.c linux-2.6.39/drivers/tty/serial/ip22zilog.c
+--- linux-2.6.39/drivers/tty/serial/ip22zilog.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/kgdboc.c linux-2.6.39/drivers/tty/serial/kgdboc.c
+--- linux-2.6.39/drivers/tty/serial/kgdboc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/serial/kgdboc.c 2011-05-22 19:36:32.000000000 -0400
@@ -22,7 +22,7 @@
#define MAX_CONFIG_LEN 40
.name = "kgdboc",
.read_char = kgdboc_get_char,
.write_char = kgdboc_put_char,
-diff -urNp linux-2.6.38.4/drivers/tty/tty_io.c linux-2.6.38.4/drivers/tty/tty_io.c
---- linux-2.6.38.4/drivers/tty/tty_io.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/tty_io.c 2011-04-28 19:34:15.000000000 -0400
-@@ -140,21 +140,11 @@ EXPORT_SYMBOL(tty_mutex);
+diff -urNp linux-2.6.39/drivers/tty/serial/m32r_sio.c linux-2.6.39/drivers/tty/serial/m32r_sio.c
+--- linux-2.6.39/drivers/tty/serial/m32r_sio.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/max3100.c linux-2.6.39/drivers/tty/serial/max3100.c
+--- linux-2.6.39/drivers/tty/serial/max3100.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/max3107.c linux-2.6.39/drivers/tty/serial/max3107.c
+--- linux-2.6.39/drivers/tty/serial/max3107.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/mfd.c linux-2.6.39/drivers/tty/serial/mfd.c
+--- linux-2.6.39/drivers/tty/serial/mfd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/serial/mfd.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1178,7 +1178,7 @@ static struct console serial_hsu_console
+ };
+ #endif
+
+-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/drivers/tty/serial/mpc52xx_uart.c linux-2.6.39/drivers/tty/serial/mpc52xx_uart.c
+--- linux-2.6.39/drivers/tty/serial/mpc52xx_uart.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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,
+ };
+
+-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 =
+ };
+ #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/drivers/tty/serial/mpsc.c linux-2.6.39/drivers/tty/serial/mpsc.c
+--- linux-2.6.39/drivers/tty/serial/mpsc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/serial/mpsc.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/tty/serial/mrst_max3110.c linux-2.6.39/drivers/tty/serial/mrst_max3110.c
+--- linux-2.6.39/drivers/tty/serial/mrst_max3110.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/serial/mrst_max3110.c 2011-05-22 19:36:32.000000000 -0400
+@@ -393,6 +393,8 @@ static void max3110_con_receive(struct u
+ int loop = 1, num, total = 0;
+ u8 recv_buf[512], *pbuf;
+
++ pax_track_stack();
++
+ 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/drivers/tty/serial/msm_serial.c linux-2.6.39/drivers/tty/serial/msm_serial.c
+--- linux-2.6.39/drivers/tty/serial/msm_serial.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/msm_serial_hs.c linux-2.6.39/drivers/tty/serial/msm_serial_hs.c
+--- linux-2.6.39/drivers/tty/serial/msm_serial_hs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/serial/msm_serial_hs.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/tty/serial/mux.c linux-2.6.39/drivers/tty/serial/mux.c
+--- linux-2.6.39/drivers/tty/serial/mux.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/serial/mux.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/tty/serial/mxs-auart.c linux-2.6.39/drivers/tty/serial/mxs-auart.c
+--- linux-2.6.39/drivers/tty/serial/mxs-auart.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/netx-serial.c linux-2.6.39/drivers/tty/serial/netx-serial.c
+--- linux-2.6.39/drivers/tty/serial/netx-serial.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/nwpserial.c linux-2.6.39/drivers/tty/serial/nwpserial.c
+--- linux-2.6.39/drivers/tty/serial/nwpserial.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/omap-serial.c linux-2.6.39/drivers/tty/serial/omap-serial.c
+--- linux-2.6.39/drivers/tty/serial/omap-serial.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/pch_uart.c linux-2.6.39/drivers/tty/serial/pch_uart.c
+--- linux-2.6.39/drivers/tty/serial/pch_uart.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/serial/pch_uart.c 2011-05-22 19:36:32.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/drivers/tty/serial/pmac_zilog.c linux-2.6.39/drivers/tty/serial/pmac_zilog.c
+--- linux-2.6.39/drivers/tty/serial/pmac_zilog.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/pnx8xxx_uart.c linux-2.6.39/drivers/tty/serial/pnx8xxx_uart.c
+--- linux-2.6.39/drivers/tty/serial/pnx8xxx_uart.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/pxa.c linux-2.6.39/drivers/tty/serial/pxa.c
+--- linux-2.6.39/drivers/tty/serial/pxa.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/serial/pxa.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/tty/serial/sa1100.c linux-2.6.39/drivers/tty/serial/sa1100.c
+--- linux-2.6.39/drivers/tty/serial/sa1100.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/samsung.c linux-2.6.39/drivers/tty/serial/samsung.c
+--- linux-2.6.39/drivers/tty/serial/samsung.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
+
+-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/drivers/tty/serial/sc26xx.c linux-2.6.39/drivers/tty/serial/sc26xx.c
+--- linux-2.6.39/drivers/tty/serial/sc26xx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/serial_ks8695.c linux-2.6.39/drivers/tty/serial/serial_ks8695.c
+--- linux-2.6.39/drivers/tty/serial/serial_ks8695.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/serial/serial_ks8695.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/tty/serial/serial_txx9.c linux-2.6.39/drivers/tty/serial/serial_txx9.c
+--- linux-2.6.39/drivers/tty/serial/serial_txx9.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/sn_console.c linux-2.6.39/drivers/tty/serial/sn_console.c
+--- linux-2.6.39/drivers/tty/serial/sn_console.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/sunhv.c linux-2.6.39/drivers/tty/serial/sunhv.c
+--- linux-2.6.39/drivers/tty/serial/sunhv.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/sunsab.c linux-2.6.39/drivers/tty/serial/sunsab.c
+--- linux-2.6.39/drivers/tty/serial/sunsab.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/sunsu.c linux-2.6.39/drivers/tty/serial/sunsu.c
+--- linux-2.6.39/drivers/tty/serial/sunsu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/sunzilog.c linux-2.6.39/drivers/tty/serial/sunzilog.c
+--- linux-2.6.39/drivers/tty/serial/sunzilog.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/timbuart.c linux-2.6.39/drivers/tty/serial/timbuart.c
+--- linux-2.6.39/drivers/tty/serial/timbuart.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/uartlite.c linux-2.6.39/drivers/tty/serial/uartlite.c
+--- linux-2.6.39/drivers/tty/serial/uartlite.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/ucc_uart.c linux-2.6.39/drivers/tty/serial/ucc_uart.c
+--- linux-2.6.39/drivers/tty/serial/ucc_uart.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/vr41xx_siu.c linux-2.6.39/drivers/tty/serial/vr41xx_siu.c
+--- linux-2.6.39/drivers/tty/serial/vr41xx_siu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/tty/serial/vt8500_serial.c linux-2.6.39/drivers/tty/serial/vt8500_serial.c
+--- linux-2.6.39/drivers/tty/serial/vt8500_serial.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/serial/vt8500_serial.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/tty/serial/zs.c linux-2.6.39/drivers/tty/serial/zs.c
+--- linux-2.6.39/drivers/tty/serial/zs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/serial/zs.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/tty/tty_io.c linux-2.6.39/drivers/tty/tty_io.c
+--- linux-2.6.39/drivers/tty/tty_io.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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 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);
-@@ -938,7 +928,7 @@ EXPORT_SYMBOL(start_tty);
+@@ -937,7 +927,7 @@ EXPORT_SYMBOL(start_tty);
* read calls may be outstanding in parallel.
*/
loff_t *ppos)
{
int i;
-@@ -964,6 +954,8 @@ static ssize_t tty_read(struct file *fil
+@@ -963,6 +953,8 @@ static ssize_t tty_read(struct file *fil
return i;
}
void tty_write_unlock(struct tty_struct *tty)
{
mutex_unlock(&tty->atomic_write_lock);
-@@ -1113,7 +1105,7 @@ void tty_write_message(struct tty_struct
+@@ -1112,7 +1104,7 @@ void tty_write_message(struct tty_struct
* write method will not be invoked in parallel for each device.
*/
size_t count, loff_t *ppos)
{
struct inode *inode = file->f_path.dentry->d_inode;
-@@ -1139,6 +1131,8 @@ static ssize_t tty_write(struct file *fi
+@@ -1138,6 +1130,8 @@ static ssize_t tty_write(struct file *fi
return ret;
}
ssize_t redirected_tty_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
{
-@@ -1778,6 +1772,8 @@ int tty_release(struct inode *inode, str
+@@ -1777,6 +1771,8 @@ int tty_release(struct inode *inode, str
return 0;
}
/**
* tty_open - open a tty device
* @inode: inode of device file
-@@ -1969,7 +1965,7 @@ got_driver:
+@@ -1968,7 +1964,7 @@ got_driver:
* may be re-entered freely by other callers.
*/
{
struct tty_struct *tty = file_tty(filp);
struct tty_ldisc *ld;
-@@ -1985,6 +1981,8 @@ static unsigned int tty_poll(struct file
+@@ -1984,6 +1980,8 @@ static unsigned int tty_poll(struct file
return ret;
}
static int __tty_fasync(int fd, struct file *filp, int on)
{
struct tty_struct *tty = file_tty(filp);
-@@ -2026,7 +2024,7 @@ out:
+@@ -2025,7 +2023,7 @@ out:
return retval;
}
{
int retval;
tty_lock();
-@@ -2035,6 +2033,8 @@ static int tty_fasync(int fd, struct fil
+@@ -2034,6 +2032,8 @@ static int tty_fasync(int fd, struct fil
return retval;
}
/**
* tiocsti - fake input character
* @tty: tty to fake input into
-@@ -2692,8 +2692,10 @@ long tty_ioctl(struct file *file, unsign
+@@ -2695,8 +2695,10 @@ long tty_ioctl(struct file *file, unsign
return retval;
}
unsigned long arg)
{
struct inode *inode = file->f_dentry->d_inode;
-@@ -2717,6 +2719,9 @@ static long tty_compat_ioctl(struct file
+@@ -2720,6 +2722,9 @@ static long tty_compat_ioctl(struct file
return retval;
}
#endif
/*
-@@ -3195,11 +3200,6 @@ struct tty_struct *get_current_tty(void)
+@@ -3198,11 +3203,6 @@ struct tty_struct *get_current_tty(void)
}
EXPORT_SYMBOL_GPL(get_current_tty);
/*
* 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.38.4/drivers/tty/tty_ldisc.c linux-2.6.38.4/drivers/tty/tty_ldisc.c
---- linux-2.6.38.4/drivers/tty/tty_ldisc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/tty_ldisc.c 2011-04-28 19:34:15.000000000 -0400
-@@ -76,7 +76,7 @@ static void put_ldisc(struct tty_ldisc *
+diff -urNp linux-2.6.39/drivers/tty/tty_ldisc.c linux-2.6.39/drivers/tty/tty_ldisc.c
+--- linux-2.6.39/drivers/tty/tty_ldisc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/tty_ldisc.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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;
module_put(ldo->owner);
spin_unlock_irqrestore(&tty_ldisc_lock, flags);
-@@ -111,7 +111,7 @@ int tty_register_ldisc(int disc, struct
+@@ -109,7 +109,7 @@ int tty_register_ldisc(int disc, struct
spin_lock_irqsave(&tty_ldisc_lock, flags);
tty_ldiscs[disc] = new_ldisc;
new_ldisc->num = disc;
spin_unlock_irqrestore(&tty_ldisc_lock, flags);
return ret;
-@@ -139,7 +139,7 @@ int tty_unregister_ldisc(int disc)
+@@ -137,7 +137,7 @@ int tty_unregister_ldisc(int disc)
return -EINVAL;
spin_lock_irqsave(&tty_ldisc_lock, flags);
ret = -EBUSY;
else
tty_ldiscs[disc] = NULL;
-@@ -160,7 +160,7 @@ static struct tty_ldisc_ops *get_ldops(i
+@@ -158,7 +158,7 @@ static struct tty_ldisc_ops *get_ldops(i
if (ldops) {
ret = ERR_PTR(-EAGAIN);
if (try_module_get(ldops->owner)) {
ret = ldops;
}
}
-@@ -173,7 +173,7 @@ static void put_ldops(struct tty_ldisc_o
+@@ -171,7 +171,7 @@ static void put_ldops(struct tty_ldisc_o
unsigned long flags;
spin_lock_irqsave(&tty_ldisc_lock, flags);
module_put(ldops->owner);
spin_unlock_irqrestore(&tty_ldisc_lock, flags);
}
-diff -urNp linux-2.6.38.4/drivers/tty/vt/keyboard.c linux-2.6.38.4/drivers/tty/vt/keyboard.c
---- linux-2.6.38.4/drivers/tty/vt/keyboard.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/vt/keyboard.c 2011-04-28 19:34:15.000000000 -0400
-@@ -657,6 +657,16 @@ static void k_spec(struct vc_data *vc, u
- kbd->kbdmode == VC_MEDIUMRAW) &&
+diff -urNp linux-2.6.39/drivers/tty/vt/keyboard.c linux-2.6.39/drivers/tty/vt/keyboard.c
+--- linux-2.6.39/drivers/tty/vt/keyboard.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/vt/keyboard.c 2011-05-22 20:32:43.000000000 -0400
+@@ -658,6 +658,16 @@ static void k_spec(struct vc_data *vc, u
+ kbd->kbdmode == VC_OFF) &&
value != KVAL(K_SAK))
return; /* SAK is allowed even in raw mode */
+
fn_handler[value](vc);
}
-diff -urNp linux-2.6.38.4/drivers/tty/vt/vt.c linux-2.6.38.4/drivers/tty/vt/vt.c
---- linux-2.6.38.4/drivers/tty/vt/vt.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/vt/vt.c 2011-04-28 19:34:15.000000000 -0400
-@@ -262,7 +262,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier
+diff -urNp linux-2.6.39/drivers/tty/vt/vt.c linux-2.6.39/drivers/tty/vt/vt.c
+--- linux-2.6.39/drivers/tty/vt/vt.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/vt/vt.c 2011-05-22 19:36:32.000000000 -0400
+@@ -261,7 +261,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier
static void notify_write(struct vc_data *vc, unsigned int unicode)
{
atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, ¶m);
}
-diff -urNp linux-2.6.38.4/drivers/tty/vt/vt_ioctl.c linux-2.6.38.4/drivers/tty/vt/vt_ioctl.c
---- linux-2.6.38.4/drivers/tty/vt/vt_ioctl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/vt/vt_ioctl.c 2011-04-28 19:34:15.000000000 -0400
-@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
+diff -urNp linux-2.6.39/drivers/tty/vt/vt_ioctl.c linux-2.6.39/drivers/tty/vt/vt_ioctl.c
+--- linux-2.6.39/drivers/tty/vt/vt_ioctl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/tty/vt/vt_ioctl.c 2011-05-22 19:41:37.000000000 -0400
+@@ -209,9 +209,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
return -EFAULT;
switch (cmd) {
case KDGKBENT:
key_map = key_maps[s];
-@@ -224,6 +221,9 @@ do_kdsk_ioctl(int cmd, struct kbentry __
+@@ -223,6 +220,9 @@ do_kdsk_ioctl(int cmd, struct kbentry __
val = (i ? K_HOLE : K_NOSUCHMAP);
return put_user(val, &user_kbe->kb_value);
case KDSKBENT:
if (!perm)
return -EPERM;
if (!i && v == K_NOSUCHMAP) {
-@@ -325,9 +325,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry
+@@ -324,9 +324,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry
int i, j, k;
int ret;
kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
if (!kbs) {
ret = -ENOMEM;
-@@ -361,6 +358,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry
+@@ -360,6 +357,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry
kfree(kbs);
return ((p && *p) ? -EOVERFLOW : 0);
case KDSKBSENT:
if (!perm) {
ret = -EPERM;
goto reterr;
-diff -urNp linux-2.6.38.4/drivers/uio/uio.c linux-2.6.38.4/drivers/uio/uio.c
---- linux-2.6.38.4/drivers/uio/uio.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/uio/uio.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/uio/uio.c linux-2.6.39/drivers/uio/uio.c
+--- linux-2.6.39/drivers/uio/uio.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/uio/uio.c 2011-05-22 19:36:32.000000000 -0400
@@ -25,6 +25,7 @@
#include <linux/kobject.h>
#include <linux/cdev.h>
ret = uio_get_minor(idev);
if (ret)
-diff -urNp linux-2.6.38.4/drivers/usb/atm/cxacru.c linux-2.6.38.4/drivers/usb/atm/cxacru.c
---- linux-2.6.38.4/drivers/usb/atm/cxacru.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/usb/atm/cxacru.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/usb/atm/cxacru.c linux-2.6.39/drivers/usb/atm/cxacru.c
+--- linux-2.6.39/drivers/usb/atm/cxacru.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/usb/atm/cxacru.c 2011-05-22 19:36:32.000000000 -0400
@@ -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)
return -EINVAL;
pos += tmp;
-diff -urNp linux-2.6.38.4/drivers/usb/atm/usbatm.c linux-2.6.38.4/drivers/usb/atm/usbatm.c
---- linux-2.6.38.4/drivers/usb/atm/usbatm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/usb/atm/usbatm.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/usb/atm/usbatm.c linux-2.6.39/drivers/usb/atm/usbatm.c
+--- linux-2.6.39/drivers/usb/atm/usbatm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/usb/atm/usbatm.c 2011-05-22 19:36:32.000000000 -0400
@@ -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",
if (!left--) {
if (instance->disconnected)
-diff -urNp linux-2.6.38.4/drivers/usb/core/devices.c linux-2.6.38.4/drivers/usb/core/devices.c
---- linux-2.6.38.4/drivers/usb/core/devices.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/drivers/usb/core/devices.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/usb/core/devices.c linux-2.6.39/drivers/usb/core/devices.c
+--- linux-2.6.39/drivers/usb/core/devices.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/usb/core/devices.c 2011-05-22 19:36:32.000000000 -0400
@@ -126,7 +126,7 @@ static const char *format_endpt =
* time it gets called.
*/
if (file->f_version != event_count) {
file->f_version = event_count;
return POLLIN | POLLRDNORM;
-diff -urNp linux-2.6.38.4/drivers/usb/core/hcd.c linux-2.6.38.4/drivers/usb/core/hcd.c
---- linux-2.6.38.4/drivers/usb/core/hcd.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/drivers/usb/core/hcd.c 2011-04-28 19:34:15.000000000 -0400
-@@ -2457,7 +2457,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
+diff -urNp linux-2.6.39/drivers/usb/core/hcd.c linux-2.6.39/drivers/usb/core/hcd.c
+--- linux-2.6.39/drivers/usb/core/hcd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/usb/core/hcd.c 2011-05-22 19:36:32.000000000 -0400
+@@ -2577,7 +2577,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
/*
* The registration is unlocked.
-@@ -2467,7 +2467,7 @@ struct usb_mon_operations *mon_ops;
+@@ -2587,7 +2587,7 @@ struct usb_mon_operations *mon_ops;
* symbols from usbcore, usbcore gets referenced and cannot be unloaded first.
*/
{
if (mon_ops)
-diff -urNp linux-2.6.38.4/drivers/usb/core/message.c linux-2.6.38.4/drivers/usb/core/message.c
---- linux-2.6.38.4/drivers/usb/core/message.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/usb/core/message.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/usb/core/message.c linux-2.6.39/drivers/usb/core/message.c
+--- linux-2.6.39/drivers/usb/core/message.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/usb/core/message.c 2011-05-22 19:36:32.000000000 -0400
@@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device
buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
if (buf) {
if (!smallbuf)
return buf;
memcpy(smallbuf, buf, len);
-diff -urNp linux-2.6.38.4/drivers/usb/early/ehci-dbgp.c linux-2.6.38.4/drivers/usb/early/ehci-dbgp.c
---- linux-2.6.38.4/drivers/usb/early/ehci-dbgp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/usb/early/ehci-dbgp.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/usb/early/ehci-dbgp.c linux-2.6.39/drivers/usb/early/ehci-dbgp.c
+--- linux-2.6.39/drivers/usb/early/ehci-dbgp.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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,
}
.name = "kgdbdbgp",
.read_char = kgdbdbgp_read_char,
.write_char = kgdbdbgp_write_char,
-diff -urNp linux-2.6.38.4/drivers/usb/mon/mon_main.c linux-2.6.38.4/drivers/usb/mon/mon_main.c
---- linux-2.6.38.4/drivers/usb/mon/mon_main.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/usb/mon/mon_main.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/usb/gadget/fsl_qe_udc.c linux-2.6.39/drivers/usb/gadget/fsl_qe_udc.c
+--- linux-2.6.39/drivers/usb/gadget/fsl_qe_udc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/usb/gadget/fsl_udc_core.c linux-2.6.39/drivers/usb/gadget/fsl_udc_core.c
+--- linux-2.6.39/drivers/usb/gadget/fsl_udc_core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/usb/gadget/fusb300_udc.c linux-2.6.39/drivers/usb/gadget/fusb300_udc.c
+--- linux-2.6.39/drivers/usb/gadget/fusb300_udc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/usb/gadget/goku_udc.c linux-2.6.39/drivers/usb/gadget/goku_udc.c
+--- linux-2.6.39/drivers/usb/gadget/goku_udc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/usb/gadget/imx_udc.c linux-2.6.39/drivers/usb/gadget/imx_udc.c
+--- linux-2.6.39/drivers/usb/gadget/imx_udc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/usb/gadget/m66592-udc.c linux-2.6.39/drivers/usb/gadget/m66592-udc.c
+--- linux-2.6.39/drivers/usb/gadget/m66592-udc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/usb/gadget/mv_udc_core.c linux-2.6.39/drivers/usb/gadget/mv_udc_core.c
+--- linux-2.6.39/drivers/usb/gadget/mv_udc_core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/usb/gadget/omap_udc.c linux-2.6.39/drivers/usb/gadget/omap_udc.c
+--- linux-2.6.39/drivers/usb/gadget/omap_udc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/usb/gadget/pxa25x_udc.c linux-2.6.39/drivers/usb/gadget/pxa25x_udc.c
+--- linux-2.6.39/drivers/usb/gadget/pxa25x_udc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/usb/gadget/pxa27x_udc.c linux-2.6.39/drivers/usb/gadget/pxa27x_udc.c
+--- linux-2.6.39/drivers/usb/gadget/pxa27x_udc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/usb/gadget/r8a66597-udc.c linux-2.6.39/drivers/usb/gadget/r8a66597-udc.c
+--- linux-2.6.39/drivers/usb/gadget/r8a66597-udc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/usb/gadget/s3c-hsotg.c linux-2.6.39/drivers/usb/gadget/s3c-hsotg.c
+--- linux-2.6.39/drivers/usb/gadget/s3c-hsotg.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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,
+ };
+
+diff -urNp linux-2.6.39/drivers/usb/gadget/uvc_queue.c linux-2.6.39/drivers/usb/gadget/uvc_queue.c
+--- linux-2.6.39/drivers/usb/gadget/uvc_queue.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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 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/drivers/usb/host/ehci-fsl.c linux-2.6.39/drivers/usb/host/ehci-fsl.c
+--- linux-2.6.39/drivers/usb/host/ehci-fsl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/usb/host/xhci-mem.c linux-2.6.39/drivers/usb/host/xhci-mem.c
+--- linux-2.6.39/drivers/usb/host/xhci-mem.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/usb/host/xhci-mem.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1671,6 +1671,8 @@ static int xhci_check_trb_in_td_math(str
+ unsigned int num_tests;
+ int i, ret;
+
++ pax_track_stack();
++
+ 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/drivers/usb/mon/mon_main.c linux-2.6.39/drivers/usb/mon/mon_main.c
+--- linux-2.6.39/drivers/usb/mon/mon_main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
.urb_submit = mon_submit,
.urb_submit_error = mon_submit_error,
.urb_complete = mon_complete,
-diff -urNp linux-2.6.38.4/drivers/usb/wusbcore/wa-hc.h linux-2.6.38.4/drivers/usb/wusbcore/wa-hc.h
---- linux-2.6.38.4/drivers/usb/wusbcore/wa-hc.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/usb/wusbcore/wa-hc.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/usb/musb/cppi_dma.h linux-2.6.39/drivers/usb/musb/cppi_dma.h
+--- linux-2.6.39/drivers/usb/musb/cppi_dma.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/usb/otg/msm_otg.c linux-2.6.39/drivers/usb/otg/msm_otg.c
+--- linux-2.6.39/drivers/usb/otg/msm_otg.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/usb/otg/msm_otg.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/usb/otg/ulpi_viewport.c linux-2.6.39/drivers/usb/otg/ulpi_viewport.c
+--- linux-2.6.39/drivers/usb/otg/ulpi_viewport.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/usb/serial/ftdi_sio.c linux-2.6.39/drivers/usb/serial/ftdi_sio.c
+--- linux-2.6.39/drivers/usb/serial/ftdi_sio.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/usb/serial/ftdi_sio.c 2011-05-22 19:36:32.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/drivers/usb/wusbcore/wa-hc.h linux-2.6.39/drivers/usb/wusbcore/wa-hc.h
+--- linux-2.6.39/drivers/usb/wusbcore/wa-hc.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/usb/wusbcore/wa-hc.h 2011-05-22 19:36:32.000000000 -0400
@@ -192,7 +192,7 @@ struct wahc {
struct list_head xfer_delayed_list;
spinlock_t xfer_list_lock;
}
/**
-diff -urNp linux-2.6.38.4/drivers/usb/wusbcore/wa-xfer.c linux-2.6.38.4/drivers/usb/wusbcore/wa-xfer.c
---- linux-2.6.38.4/drivers/usb/wusbcore/wa-xfer.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/usb/wusbcore/wa-xfer.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/usb/wusbcore/wa-xfer.c linux-2.6.39/drivers/usb/wusbcore/wa-xfer.c
+--- linux-2.6.39/drivers/usb/wusbcore/wa-xfer.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/usb/wusbcore/wa-xfer.c 2011-05-22 19:36:32.000000000 -0400
@@ -294,7 +294,7 @@ out:
*/
static void wa_xfer_id_init(struct wa_xfer *xfer)
}
/*
-diff -urNp linux-2.6.38.4/drivers/vhost/vhost.c linux-2.6.38.4/drivers/vhost/vhost.c
---- linux-2.6.38.4/drivers/vhost/vhost.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/vhost/vhost.c 2011-04-28 19:34:15.000000000 -0400
-@@ -565,7 +565,7 @@ static int init_used(struct vhost_virtqu
+diff -urNp linux-2.6.39/drivers/vhost/vhost.c linux-2.6.39/drivers/vhost/vhost.c
+--- linux-2.6.39/drivers/vhost/vhost.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/vhost/vhost.c 2011-05-22 19:36:32.000000000 -0400
+@@ -580,7 +580,7 @@ static int init_used(struct vhost_virtqu
return get_user(vq->last_used_idx, &used->idx);
}
{
struct file *eventfp, *filep = NULL,
*pollstart = NULL, *pollstop = NULL;
-diff -urNp linux-2.6.38.4/drivers/video/fbcmap.c linux-2.6.38.4/drivers/video/fbcmap.c
---- linux-2.6.38.4/drivers/video/fbcmap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/video/fbcmap.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/video/backlight/corgi_lcd.c linux-2.6.39/drivers/video/backlight/corgi_lcd.c
+--- linux-2.6.39/drivers/video/backlight/corgi_lcd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/video/backlight/corgi_lcd.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/video/backlight/cr_bllcd.c linux-2.6.39/drivers/video/backlight/cr_bllcd.c
+--- linux-2.6.39/drivers/video/backlight/cr_bllcd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/video/backlight/cr_bllcd.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/video/backlight/ili9320.c linux-2.6.39/drivers/video/backlight/ili9320.c
+--- linux-2.6.39/drivers/video/backlight/ili9320.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/video/backlight/jornada720_lcd.c linux-2.6.39/drivers/video/backlight/jornada720_lcd.c
+--- linux-2.6.39/drivers/video/backlight/jornada720_lcd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/video/backlight/jornada720_lcd.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/video/backlight/l4f00242t03.c linux-2.6.39/drivers/video/backlight/l4f00242t03.c
+--- linux-2.6.39/drivers/video/backlight/l4f00242t03.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/video/backlight/l4f00242t03.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/video/backlight/lcd.c linux-2.6.39/drivers/video/backlight/lcd.c
+--- linux-2.6.39/drivers/video/backlight/lcd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/video/backlight/ld9040.c linux-2.6.39/drivers/video/backlight/ld9040.c
+--- linux-2.6.39/drivers/video/backlight/ld9040.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/video/backlight/lms283gf05.c linux-2.6.39/drivers/video/backlight/lms283gf05.c
+--- linux-2.6.39/drivers/video/backlight/lms283gf05.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/video/backlight/ltv350qv.c linux-2.6.39/drivers/video/backlight/ltv350qv.c
+--- linux-2.6.39/drivers/video/backlight/ltv350qv.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/video/backlight/ltv350qv.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/video/backlight/platform_lcd.c linux-2.6.39/drivers/video/backlight/platform_lcd.c
+--- linux-2.6.39/drivers/video/backlight/platform_lcd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/video/backlight/platform_lcd.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/video/backlight/s6e63m0.c linux-2.6.39/drivers/video/backlight/s6e63m0.c
+--- linux-2.6.39/drivers/video/backlight/s6e63m0.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/video/backlight/tdo24m.c linux-2.6.39/drivers/video/backlight/tdo24m.c
+--- linux-2.6.39/drivers/video/backlight/tdo24m.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/video/backlight/tosa_lcd.c linux-2.6.39/drivers/video/backlight/tosa_lcd.c
+--- linux-2.6.39/drivers/video/backlight/tosa_lcd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/video/backlight/tosa_lcd.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/video/bf537-lq035.c linux-2.6.39/drivers/video/bf537-lq035.c
+--- linux-2.6.39/drivers/video/bf537-lq035.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/video/bf54x-lq043fb.c linux-2.6.39/drivers/video/bf54x-lq043fb.c
+--- linux-2.6.39/drivers/video/bf54x-lq043fb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/video/bfin-t350mcqb-fb.c linux-2.6.39/drivers/video/bfin-t350mcqb-fb.c
+--- linux-2.6.39/drivers/video/bfin-t350mcqb-fb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/video/fbcmap.c linux-2.6.39/drivers/video/fbcmap.c
+--- linux-2.6.39/drivers/video/fbcmap.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/video/fbcmap.c 2011-05-22 19:36:32.000000000 -0400
@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user
rc = -ENODEV;
goto out;
rc = -EINVAL;
goto out1;
}
-diff -urNp linux-2.6.38.4/drivers/video/fbmem.c linux-2.6.38.4/drivers/video/fbmem.c
---- linux-2.6.38.4/drivers/video/fbmem.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/video/fbmem.c 2011-04-28 19:34:15.000000000 -0400
-@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
+diff -urNp linux-2.6.39/drivers/video/fbmem.c linux-2.6.39/drivers/video/fbmem.c
+--- linux-2.6.39/drivers/video/fbmem.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/video/fbmem.c 2011-05-22 19:36:32.000000000 -0400
+@@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_in
image->dx += image->width + 8;
}
} else if (rotate == FB_ROTATE_UD) {
info->fbops->fb_imageblit(info, image);
image->dx -= image->width + 8;
}
-@@ -415,7 +415,7 @@ static void fb_do_show_logo(struct fb_in
+@@ -440,7 +440,7 @@ static void fb_do_show_logo(struct fb_in
image->dy += image->height + 8;
}
} else if (rotate == FB_ROTATE_CCW) {
info->fbops->fb_imageblit(info, image);
image->dy -= image->height + 8;
}
-@@ -1101,7 +1101,7 @@ static long do_fb_ioctl(struct fb_info *
+@@ -939,6 +939,8 @@ fb_set_var(struct fb_info *info, struct
+ int flags = info->flags;
+ int ret = 0;
+
++ pax_track_stack();
++
+ if (var->activate & FB_ACTIVATE_INV_MODE) {
+ struct fb_videomode mode1, mode2;
+
+@@ -1064,6 +1066,8 @@ static long do_fb_ioctl(struct fb_info *
+ void __user *argp = (void __user *)arg;
+ long ret = 0;
+
++ pax_track_stack();
++
+ switch (cmd) {
+ case FBIOGET_VSCREENINFO:
+ if (!lock_fb_info(info))
+@@ -1143,7 +1147,7 @@ static long do_fb_ioctl(struct fb_info *
return -EFAULT;
if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
return -EINVAL;
return -EINVAL;
if (!registered_fb[con2fb.framebuffer])
request_module("fb%d", con2fb.framebuffer);
-diff -urNp linux-2.6.38.4/drivers/video/i810/i810_accel.c linux-2.6.38.4/drivers/video/i810/i810_accel.c
---- linux-2.6.38.4/drivers/video/i810/i810_accel.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/video/i810/i810_accel.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/video/geode/display_gx1.c linux-2.6.39/drivers/video/geode/display_gx1.c
+--- linux-2.6.39/drivers/video/geode/display_gx1.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/video/geode/display_gx1.h linux-2.6.39/drivers/video/geode/display_gx1.h
+--- linux-2.6.39/drivers/video/geode/display_gx1.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/video/geode/geodefb.h linux-2.6.39/drivers/video/geode/geodefb.h
+--- linux-2.6.39/drivers/video/geode/geodefb.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/video/geode/video_cs5530.c linux-2.6.39/drivers/video/geode/video_cs5530.c
+--- linux-2.6.39/drivers/video/geode/video_cs5530.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/video/geode/video_cs5530.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/video/geode/video_cs5530.h linux-2.6.39/drivers/video/geode/video_cs5530.h
+--- linux-2.6.39/drivers/video/geode/video_cs5530.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/video/geode/video_cs5530.h 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/video/i810/i810_accel.c linux-2.6.39/drivers/video/i810/i810_accel.c
+--- linux-2.6.39/drivers/video/i810/i810_accel.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/video/i810/i810_accel.c 2011-05-22 19:36:32.000000000 -0400
@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
}
}
i810_report_error(mmio);
par->dev_flags |= LOCKUP;
info->pixmap.scan_align = 1;
-diff -urNp linux-2.6.38.4/drivers/video/pxa3xx-gcu.c linux-2.6.38.4/drivers/video/pxa3xx-gcu.c
---- linux-2.6.38.4/drivers/video/pxa3xx-gcu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/video/pxa3xx-gcu.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/video/matrox/matroxfb_base.c linux-2.6.39/drivers/video/matrox/matroxfb_base.c
+--- linux-2.6.39/drivers/video/matrox/matroxfb_base.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/video/omap/lcd_ams_delta.c linux-2.6.39/drivers/video/omap/lcd_ams_delta.c
+--- linux-2.6.39/drivers/video/omap/lcd_ams_delta.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/video/omap/lcd_ams_delta.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/drivers/video/pxa3xx-gcu.c linux-2.6.39/drivers/video/pxa3xx-gcu.c
+--- linux-2.6.39/drivers/video/pxa3xx-gcu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
wait_queue_head_t wait_idle;
wait_queue_head_t wait_free;
spinlock_t spinlock;
-diff -urNp linux-2.6.38.4/drivers/video/udlfb.c linux-2.6.38.4/drivers/video/udlfb.c
---- linux-2.6.38.4/drivers/video/udlfb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/video/udlfb.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/drivers/video/sh_mobile_lcdcfb.c linux-2.6.39/drivers/video/sh_mobile_lcdcfb.c
+--- linux-2.6.39/drivers/video/sh_mobile_lcdcfb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/video/udlfb.c linux-2.6.39/drivers/video/udlfb.c
+--- linux-2.6.39/drivers/video/udlfb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/video/udlfb.c 2011-05-22 19:36:32.000000000 -0400
@@ -584,11 +584,11 @@ int dlfb_handle_damage(struct dlfb_data
dlfb_urb_completion(urb);
return count;
}
-diff -urNp linux-2.6.38.4/drivers/video/uvesafb.c linux-2.6.38.4/drivers/video/uvesafb.c
---- linux-2.6.38.4/drivers/video/uvesafb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/video/uvesafb.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/drivers/video/uvesafb.c linux-2.6.39/drivers/video/uvesafb.c
+--- linux-2.6.39/drivers/video/uvesafb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/video/uvesafb.c 2011-05-22 19:36:32.000000000 -0400
@@ -19,6 +19,7 @@
#include <linux/io.h>
#include <linux/mutex.h>
printk(KERN_INFO "uvesafb: protected mode interface info at "
"%04x:%04x\n",
(u16)task->t.regs.es, (u16)task->t.regs.edi);
-@@ -1800,6 +1823,11 @@ out:
+@@ -1821,6 +1844,11 @@ out:
if (par->vbe_modes)
kfree(par->vbe_modes);
framebuffer_release(info);
return err;
}
-@@ -1826,6 +1854,12 @@ static int uvesafb_remove(struct platfor
+@@ -1847,6 +1875,12 @@ static int uvesafb_remove(struct platfor
kfree(par->vbe_state_orig);
if (par->vbe_state_saved)
kfree(par->vbe_state_saved);
}
framebuffer_release(info);
-diff -urNp linux-2.6.38.4/drivers/video/vesafb.c linux-2.6.38.4/drivers/video/vesafb.c
---- linux-2.6.38.4/drivers/video/vesafb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/video/vesafb.c 2011-04-28 19:34:15.000000000 -0400
+@@ -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/drivers/video/vesafb.c linux-2.6.39/drivers/video/vesafb.c
+--- linux-2.6.39/drivers/video/vesafb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/video/vesafb.c 2011-05-22 19:36:32.000000000 -0400
@@ -9,6 +9,7 @@
*/
if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
printk(KERN_WARNING
"vesafb: cannot reserve video memory at 0x%lx\n",
-@@ -319,9 +317,21 @@ static int __init vesafb_probe(struct pl
+@@ -306,9 +304,21 @@ static int __init vesafb_probe(struct pl
printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
}
if (screen_info.vesapm_seg < 0xc000)
-@@ -329,9 +339,25 @@ static int __init vesafb_probe(struct pl
+@@ -316,9 +326,25 @@ static int __init vesafb_probe(struct pl
if (ypan || pmi_setpal) {
unsigned short *pmi_base;
printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
if (pmi_base[3]) {
printk(KERN_INFO "vesafb: pmi: ports = ");
-@@ -473,6 +499,11 @@ static int __init vesafb_probe(struct pl
+@@ -487,6 +513,11 @@ static int __init vesafb_probe(struct pl
info->node, info->fix.id);
return 0;
err:
if (info->screen_base)
iounmap(info->screen_base);
framebuffer_release(info);
-diff -urNp linux-2.6.38.4/fs/9p/vfs_inode.c linux-2.6.38.4/fs/9p/vfs_inode.c
---- linux-2.6.38.4/fs/9p/vfs_inode.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/9p/vfs_inode.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1094,7 +1094,7 @@ static void *v9fs_vfs_follow_link(struct
+diff -urNp linux-2.6.39/drivers/virtio/virtio_balloon.c linux-2.6.39/drivers/virtio/virtio_balloon.c
+--- linux-2.6.39/drivers/virtio/virtio_balloon.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/drivers/virtio/virtio_balloon.c 2011-05-22 19:36:32.000000000 -0400
+@@ -176,6 +176,8 @@ static void update_balloon_stats(struct
+ struct sysinfo i;
+ int idx = 0;
+
++ pax_track_stack();
++
+ all_vm_events(events);
+ si_meminfo(&i);
+
+diff -urNp linux-2.6.39/drivers/xen/gntalloc.c linux-2.6.39/drivers/xen/gntalloc.c
+--- linux-2.6.39/drivers/xen/gntalloc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/xen/gntdev.c linux-2.6.39/drivers/xen/gntdev.c
+--- linux-2.6.39/drivers/xen/gntdev.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/drivers/xen/xenfs/privcmd.c linux-2.6.39/drivers/xen/xenfs/privcmd.c
+--- linux-2.6.39/drivers/xen/xenfs/privcmd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/fs/9p/vfs_inode.c linux-2.6.39/fs/9p/vfs_inode.c
+--- linux-2.6.39/fs/9p/vfs_inode.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/9p/vfs_inode.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1210,7 +1210,7 @@ static void *v9fs_vfs_follow_link(struct
void
v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
{
P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
IS_ERR(s) ? "<error>" : s);
-diff -urNp linux-2.6.38.4/fs/aio.c linux-2.6.38.4/fs/aio.c
---- linux-2.6.38.4/fs/aio.c 2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/fs/aio.c 2011-04-28 19:34:15.000000000 -0400
-@@ -130,7 +130,7 @@ static int aio_setup_ring(struct kioctx
+diff -urNp linux-2.6.39/fs/aio.c linux-2.6.39/fs/aio.c
+--- linux-2.6.39/fs/aio.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/aio.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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;
return -EINVAL;
nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
-diff -urNp linux-2.6.38.4/fs/attr.c linux-2.6.38.4/fs/attr.c
---- linux-2.6.38.4/fs/attr.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/attr.c 2011-04-28 19:34:15.000000000 -0400
+@@ -1088,6 +1088,8 @@ static int read_events(struct kioctx *ct
+ struct aio_timeout to;
+ int retry = 0;
+
++ pax_track_stack();
++
+ /* needed to zero any padding within an entry (there shouldn't be
+ * any, but C is fun!
+ */
+diff -urNp linux-2.6.39/fs/attr.c linux-2.6.39/fs/attr.c
+--- linux-2.6.39/fs/attr.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/attr.c 2011-05-22 19:41:37.000000000 -0400
@@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode
unsigned long limit;
if (limit != RLIM_INFINITY && offset > limit)
goto out_sig;
if (offset > inode->i_sb->s_maxbytes)
-diff -urNp linux-2.6.38.4/fs/befs/linuxvfs.c linux-2.6.38.4/fs/befs/linuxvfs.c
---- linux-2.6.38.4/fs/befs/linuxvfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/befs/linuxvfs.c 2011-04-28 19:34:15.000000000 -0400
-@@ -499,7 +499,7 @@ static void befs_put_link(struct dentry
+diff -urNp linux-2.6.39/fs/befs/linuxvfs.c linux-2.6.39/fs/befs/linuxvfs.c
+--- linux-2.6.39/fs/befs/linuxvfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/befs/linuxvfs.c 2011-05-22 19:36:32.000000000 -0400
+@@ -498,7 +498,7 @@ static void befs_put_link(struct dentry
{
befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
if (!IS_ERR(link))
kfree(link);
}
-diff -urNp linux-2.6.38.4/fs/binfmt_aout.c linux-2.6.38.4/fs/binfmt_aout.c
---- linux-2.6.38.4/fs/binfmt_aout.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/binfmt_aout.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/binfmt_aout.c linux-2.6.39/fs/binfmt_aout.c
+--- linux-2.6.39/fs/binfmt_aout.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/binfmt_aout.c 2011-05-22 19:41:37.000000000 -0400
@@ -16,6 +16,7 @@
#include <linux/string.h>
#include <linux/fs.h>
MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
fd_offset + ex.a_text);
up_write(¤t->mm->mmap_sem);
-diff -urNp linux-2.6.38.4/fs/binfmt_elf.c linux-2.6.38.4/fs/binfmt_elf.c
---- linux-2.6.38.4/fs/binfmt_elf.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/fs/binfmt_elf.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/binfmt_elf.c linux-2.6.39/fs/binfmt_elf.c
+--- linux-2.6.39/fs/binfmt_elf.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/binfmt_elf.c 2011-05-22 19:41:37.000000000 -0400
@@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump
#define elf_core_dump NULL
#endif
return 0;
}
-@@ -148,12 +159,13 @@ create_elf_tables(struct linux_binprm *b
+@@ -148,12 +159,15 @@ create_elf_tables(struct linux_binprm *b
elf_addr_t __user *u_rand_bytes;
const char *k_platform = ELF_PLATFORM;
const char *k_base_platform = ELF_BASE_PLATFORM;
const struct cred *cred = current_cred();
struct vm_area_struct *vma;
+ unsigned long saved_auxv[AT_VECTOR_SIZE];
++
++ pax_track_stack();
/*
* In some cases (e.g. Hyper-Threading), we want to avoid L1
-@@ -195,8 +207,12 @@ create_elf_tables(struct linux_binprm *b
+@@ -195,8 +209,12 @@ create_elf_tables(struct linux_binprm *b
* Generate 16 random bytes for userspace PRNG seeding.
*/
get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
return -EFAULT;
-@@ -308,9 +324,11 @@ create_elf_tables(struct linux_binprm *b
+@@ -308,9 +326,11 @@ create_elf_tables(struct linux_binprm *b
return -EFAULT;
current->mm->env_end = p;
return -EFAULT;
return 0;
}
-@@ -381,10 +399,10 @@ static unsigned long load_elf_interp(str
+@@ -381,10 +401,10 @@ static unsigned long load_elf_interp(str
{
struct elf_phdr *elf_phdata;
struct elf_phdr *eppnt;
unsigned long total_size;
int retval, i, size;
-@@ -430,6 +448,11 @@ static unsigned long load_elf_interp(str
+@@ -430,6 +450,11 @@ static unsigned long load_elf_interp(str
goto out_close;
}
eppnt = elf_phdata;
for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
if (eppnt->p_type == PT_LOAD) {
-@@ -473,8 +496,8 @@ static unsigned long load_elf_interp(str
+@@ -473,8 +498,8 @@ static unsigned long load_elf_interp(str
k = load_addr + eppnt->p_vaddr;
if (BAD_ADDR(k) ||
eppnt->p_filesz > eppnt->p_memsz ||
error = -ENOMEM;
goto out_close;
}
-@@ -528,6 +551,193 @@ out:
+@@ -528,6 +553,193 @@ out:
return error;
}
/*
* These are the functions used to load ELF style executables and shared
* libraries. There is no binary dependent code anywhere else.
-@@ -544,6 +754,11 @@ static unsigned long randomize_stack_top
+@@ -544,6 +756,11 @@ static unsigned long randomize_stack_top
{
unsigned int random_variable = 0;
if ((current->flags & PF_RANDOMIZE) &&
!(current->personality & ADDR_NO_RANDOMIZE)) {
random_variable = get_random_int() & STACK_RND_MASK;
-@@ -562,7 +777,7 @@ static int load_elf_binary(struct linux_
+@@ -562,7 +779,7 @@ static int load_elf_binary(struct linux_
unsigned long load_addr = 0, load_bias = 0;
int load_addr_set = 0;
char * elf_interpreter = NULL;
struct elf_phdr *elf_ppnt, *elf_phdata;
unsigned long elf_bss, elf_brk;
int retval, i;
-@@ -572,11 +787,11 @@ static int load_elf_binary(struct linux_
+@@ -572,11 +789,11 @@ static int load_elf_binary(struct linux_
unsigned long start_code, end_code, start_data, end_data;
- unsigned long reloc_func_desc = 0;
+ unsigned long reloc_func_desc __maybe_unused = 0;
int executable_stack = EXSTACK_DEFAULT;
- unsigned long def_flags = 0;
struct {
loc = kmalloc(sizeof(*loc), GFP_KERNEL);
if (!loc) {
-@@ -714,11 +929,80 @@ static int load_elf_binary(struct linux_
+@@ -714,11 +931,81 @@ static int load_elf_binary(struct linux_
/* OK, This is the point of no return */
current->flags &= ~PF_FORKNOEXEC;
+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
+ pax_task_size = SEGMEXEC_TASK_SIZE;
++ current->mm->def_flags |= VM_NOHUGEPAGE;
+ }
+#endif
+
if (elf_read_implies_exec(loc->elf_ex, executable_stack))
current->personality |= READ_IMPLIES_EXEC;
-@@ -800,6 +1084,20 @@ static int load_elf_binary(struct linux_
+@@ -800,6 +1087,20 @@ static int load_elf_binary(struct linux_
#else
load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
#endif
}
error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
-@@ -832,9 +1130,9 @@ static int load_elf_binary(struct linux_
+@@ -832,9 +1133,9 @@ static int load_elf_binary(struct linux_
* allowed task size. Note that p_filesz must always be
* <= p_memsz so it is only necessary to check p_memsz.
*/
/* set_brk can never work. Avoid overflows. */
send_sig(SIGKILL, current, 0);
retval = -EINVAL;
-@@ -862,6 +1160,11 @@ static int load_elf_binary(struct linux_
+@@ -862,6 +1163,11 @@ static int load_elf_binary(struct linux_
start_data += load_bias;
end_data += load_bias;
/* Calling set_brk effectively mmaps the pages that we need
* for the bss and break sections. We must do this before
* mapping in the interpreter, to make sure it doesn't wind
-@@ -873,9 +1176,11 @@ static int load_elf_binary(struct linux_
+@@ -873,9 +1179,11 @@ static int load_elf_binary(struct linux_
goto out_free_dentry;
}
if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
}
if (elf_interpreter) {
-@@ -1090,7 +1395,7 @@ out:
+@@ -1090,7 +1398,7 @@ out:
* Decide what to dump of a segment, part, all or none.
*/
static unsigned long vma_dump_size(struct vm_area_struct *vma,
{
#define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
-@@ -1124,7 +1429,7 @@ static unsigned long vma_dump_size(struc
+@@ -1124,7 +1432,7 @@ static unsigned long vma_dump_size(struc
if (vma->vm_file == NULL)
return 0;
goto whole;
/*
-@@ -1346,9 +1651,9 @@ static void fill_auxv_note(struct memelf
+@@ -1346,9 +1654,9 @@ static void fill_auxv_note(struct memelf
{
elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
int i = 0;
fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
}
-@@ -1854,14 +2159,14 @@ static void fill_extnum_info(struct elfh
+@@ -1854,14 +2162,14 @@ static void fill_extnum_info(struct elfh
}
static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
return size;
}
-@@ -1955,7 +2260,7 @@ static int elf_core_dump(struct coredump
+@@ -1955,7 +2263,7 @@ static int elf_core_dump(struct coredump
dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
offset += elf_core_extra_data_size();
e_shoff = offset;
-@@ -1969,10 +2274,12 @@ static int elf_core_dump(struct coredump
+@@ -1969,10 +2277,12 @@ static int elf_core_dump(struct coredump
offset = dataoff;
size += sizeof(*elf);
if (size > cprm->limit
|| !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
goto end_coredump;
-@@ -1986,7 +2293,7 @@ static int elf_core_dump(struct coredump
+@@ -1986,7 +2296,7 @@ static int elf_core_dump(struct coredump
phdr.p_offset = offset;
phdr.p_vaddr = vma->vm_start;
phdr.p_paddr = 0;
phdr.p_memsz = vma->vm_end - vma->vm_start;
offset += phdr.p_filesz;
phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
-@@ -1997,6 +2304,7 @@ static int elf_core_dump(struct coredump
+@@ -1997,6 +2307,7 @@ static int elf_core_dump(struct coredump
phdr.p_align = ELF_EXEC_PAGESIZE;
size += sizeof(phdr);
if (size > cprm->limit
|| !dump_write(cprm->file, &phdr, sizeof(phdr)))
goto end_coredump;
-@@ -2021,7 +2329,7 @@ static int elf_core_dump(struct coredump
+@@ -2021,7 +2332,7 @@ static int elf_core_dump(struct coredump
unsigned long addr;
unsigned long end;
for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
struct page *page;
-@@ -2030,6 +2338,7 @@ static int elf_core_dump(struct coredump
+@@ -2030,6 +2341,7 @@ static int elf_core_dump(struct coredump
page = get_dump_page(addr);
if (page) {
void *kaddr = kmap(page);
stop = ((size += PAGE_SIZE) > cprm->limit) ||
!dump_write(cprm->file, kaddr,
PAGE_SIZE);
-@@ -2047,6 +2356,7 @@ static int elf_core_dump(struct coredump
+@@ -2047,6 +2359,7 @@ static int elf_core_dump(struct coredump
if (e_phnum == PN_XNUM) {
size += sizeof(*shdr4extnum);
if (size > cprm->limit
|| !dump_write(cprm->file, shdr4extnum,
sizeof(*shdr4extnum)))
-@@ -2067,6 +2377,97 @@ out:
+@@ -2067,6 +2380,97 @@ out:
#endif /* CONFIG_ELF_CORE */
static int __init init_elf_binfmt(void)
{
return register_binfmt(&elf_format);
-diff -urNp linux-2.6.38.4/fs/binfmt_flat.c linux-2.6.38.4/fs/binfmt_flat.c
---- linux-2.6.38.4/fs/binfmt_flat.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/binfmt_flat.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/binfmt_flat.c linux-2.6.39/fs/binfmt_flat.c
+--- linux-2.6.39/fs/binfmt_flat.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/binfmt_flat.c 2011-05-22 19:36:32.000000000 -0400
@@ -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",
ret = result;
goto err;
}
-diff -urNp linux-2.6.38.4/fs/bio.c linux-2.6.38.4/fs/bio.c
---- linux-2.6.38.4/fs/bio.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/bio.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/bio.c linux-2.6.39/fs/bio.c
+--- linux-2.6.39/fs/bio.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/bio.c 2011-05-22 19:36:32.000000000 -0400
@@ -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;
__bio_for_each_segment(bvec, bio, i, 0) {
char *addr = page_address(bvec->bv_page);
-diff -urNp linux-2.6.38.4/fs/block_dev.c linux-2.6.38.4/fs/block_dev.c
---- linux-2.6.38.4/fs/block_dev.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/block_dev.c 2011-04-28 19:34:15.000000000 -0400
-@@ -669,7 +669,7 @@ static bool bd_may_claim(struct block_de
+diff -urNp linux-2.6.39/fs/block_dev.c linux-2.6.39/fs/block_dev.c
+--- linux-2.6.39/fs/block_dev.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/block_dev.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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 */
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.38.4/fs/btrfs/ctree.c linux-2.6.38.4/fs/btrfs/ctree.c
---- linux-2.6.38.4/fs/btrfs/ctree.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/btrfs/ctree.c 2011-04-28 19:34:15.000000000 -0400
-@@ -468,9 +468,12 @@ static noinline int __btrfs_cow_block(st
+diff -urNp linux-2.6.39/fs/btrfs/compression.c linux-2.6.39/fs/btrfs/compression.c
+--- linux-2.6.39/fs/btrfs/compression.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/fs/btrfs/compression.h linux-2.6.39/fs/btrfs/compression.h
+--- linux-2.6.39/fs/btrfs/compression.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/fs/btrfs/ctree.c linux-2.6.39/fs/btrfs/ctree.c
+--- linux-2.6.39/fs/btrfs/ctree.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/btrfs/ctree.c 2011-05-22 19:36:32.000000000 -0400
+@@ -461,9 +461,12 @@ static noinline int __btrfs_cow_block(st
free_extent_buffer(buf);
add_root_to_dirty_list(root);
} else {
parent_start = 0;
WARN_ON(trans->transid != btrfs_header_generation(parent));
-@@ -3776,7 +3779,6 @@ setup_items_for_insert(struct btrfs_tran
+@@ -3647,7 +3650,6 @@ setup_items_for_insert(struct btrfs_tran
ret = 0;
if (slot == 0) {
btrfs_cpu_key_to_disk(&disk_key, cpu_key);
ret = fixup_low_keys(trans, root, path, &disk_key, 1);
}
-diff -urNp linux-2.6.38.4/fs/btrfs/disk-io.c linux-2.6.38.4/fs/btrfs/disk-io.c
---- linux-2.6.38.4/fs/btrfs/disk-io.c 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/fs/btrfs/disk-io.c 2011-04-28 19:34:15.000000000 -0400
-@@ -41,7 +41,7 @@
+diff -urNp linux-2.6.39/fs/btrfs/disk-io.c linux-2.6.39/fs/btrfs/disk-io.c
+--- linux-2.6.39/fs/btrfs/disk-io.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/btrfs/disk-io.c 2011-05-22 19:36:32.000000000 -0400
+@@ -42,7 +42,7 @@
#include "tree-log.h"
#include "free-space-cache.h"
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,
-@@ -3030,7 +3030,7 @@ static int btrfs_cleanup_transaction(str
+@@ -3070,7 +3070,7 @@ static int btrfs_cleanup_transaction(str
return 0;
}
.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.38.4/fs/btrfs/extent_io.h linux-2.6.38.4/fs/btrfs/extent_io.h
---- linux-2.6.38.4/fs/btrfs/extent_io.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/btrfs/extent_io.h 2011-04-28 19:34:15.000000000 -0400
-@@ -55,36 +55,36 @@ typedef int (extent_submit_bio_hook_t)(s
+diff -urNp linux-2.6.39/fs/btrfs/extent_io.h linux-2.6.39/fs/btrfs/extent_io.h
+--- linux-2.6.39/fs/btrfs/extent_io.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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 {
};
struct extent_io_tree {
-@@ -94,7 +94,7 @@ struct extent_io_tree {
+@@ -95,7 +95,7 @@ struct extent_io_tree {
u64 dirty_bytes;
spinlock_t lock;
spinlock_t buffer_lock;
};
struct extent_state {
-diff -urNp linux-2.6.38.4/fs/btrfs/free-space-cache.c linux-2.6.38.4/fs/btrfs/free-space-cache.c
---- linux-2.6.38.4/fs/btrfs/free-space-cache.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/btrfs/free-space-cache.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1855,8 +1855,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
-
+diff -urNp linux-2.6.39/fs/btrfs/free-space-cache.c linux-2.6.39/fs/btrfs/free-space-cache.c
+--- linux-2.6.39/fs/btrfs/free-space-cache.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/btrfs/free-space-cache.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1910,8 +1910,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
while(1) {
- if (entry->bytes < bytes || entry->offset < min_start) {
+ if (entry->bytes < bytes ||
+ (!entry->bitmap && entry->offset < min_start)) {
- struct rb_node *node;
-
node = rb_next(&entry->offset_index);
if (!node)
break;
-@@ -2018,7 +2016,7 @@ again:
- */
- while (entry->bitmap || found_bitmap ||
- (!entry->bitmap && entry->bytes < min_bytes)) {
-- struct rb_node *node = rb_next(&entry->offset_index);
-+ node = rb_next(&entry->offset_index);
-
- if (entry->bitmap && entry->bytes > bytes + empty_size) {
- ret = btrfs_bitmap_cluster(block_group, entry, cluster,
-diff -urNp linux-2.6.38.4/fs/btrfs/inode.c linux-2.6.38.4/fs/btrfs/inode.c
---- linux-2.6.38.4/fs/btrfs/inode.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/btrfs/inode.c 2011-04-28 19:34:15.000000000 -0400
-@@ -64,7 +64,7 @@ static const struct inode_operations btr
+@@ -1925,7 +1923,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
+ cluster, entry, bytes,
+ min_start);
+ if (ret == 0) {
+- struct rb_node *node;
+ node = rb_next(&entry->offset_index);
+ if (!node)
+ break;
+diff -urNp linux-2.6.39/fs/btrfs/inode.c linux-2.6.39/fs/btrfs/inode.c
+--- linux-2.6.39/fs/btrfs/inode.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/btrfs/inode.c 2011-05-22 20:42:42.000000000 -0400
+@@ -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 kmem_cache *btrfs_inode_cachep;
struct kmem_cache *btrfs_trans_handle_cachep;
-@@ -6796,7 +6796,7 @@ fail:
+@@ -6947,7 +6947,7 @@ fail:
return -ENOMEM;
}
struct dentry *dentry, struct kstat *stat)
{
struct inode *inode = dentry->d_inode;
-@@ -6808,6 +6808,14 @@ static int btrfs_getattr(struct vfsmount
+@@ -6959,6 +6959,14 @@ static int btrfs_getattr(struct vfsmount
return 0;
}
+}
+EXPORT_SYMBOL(get_btrfs_dev_from_inode);
+
- static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
- struct inode *new_dir, struct dentry *new_dentry)
- {
-@@ -7311,7 +7319,7 @@ static const struct file_operations btrf
+ /*
+ * 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,
};
.fill_delalloc = run_delalloc_range,
.submit_bio_hook = btrfs_submit_bio_hook,
.merge_bio_hook = btrfs_merge_bio_hook,
-diff -urNp linux-2.6.38.4/fs/btrfs/ioctl.c linux-2.6.38.4/fs/btrfs/ioctl.c
---- linux-2.6.38.4/fs/btrfs/ioctl.c 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/fs/btrfs/ioctl.c 2011-04-28 19:34:15.000000000 -0400
-@@ -2274,9 +2274,12 @@ long btrfs_ioctl_space_info(struct btrfs
+diff -urNp linux-2.6.39/fs/btrfs/ioctl.c linux-2.6.39/fs/btrfs/ioctl.c
+--- linux-2.6.39/fs/btrfs/ioctl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/btrfs/ioctl.c 2011-05-22 19:41:37.000000000 -0400
+@@ -2361,9 +2361,12 @@ long btrfs_ioctl_space_info(struct btrfs
for (i = 0; i < num_types; i++) {
struct btrfs_space_info *tmp;
info = NULL;
rcu_read_lock();
list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
-@@ -2298,10 +2301,7 @@ long btrfs_ioctl_space_info(struct btrfs
+@@ -2385,10 +2388,7 @@ long btrfs_ioctl_space_info(struct btrfs
memcpy(dest, &space, sizeof(space));
dest++;
space_args.total_spaces++;
}
up_read(&info->groups_sem);
}
-diff -urNp linux-2.6.38.4/fs/btrfs/relocation.c linux-2.6.38.4/fs/btrfs/relocation.c
---- linux-2.6.38.4/fs/btrfs/relocation.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/btrfs/relocation.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/btrfs/lzo.c linux-2.6.39/fs/btrfs/lzo.c
+--- linux-2.6.39/fs/btrfs/lzo.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/btrfs/lzo.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/fs/btrfs/relocation.c linux-2.6.39/fs/btrfs/relocation.c
+--- linux-2.6.39/fs/btrfs/relocation.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/btrfs/relocation.c 2011-05-22 19:36:32.000000000 -0400
@@ -1239,7 +1239,7 @@ static int __update_reloc_root(struct bt
}
spin_unlock(&rc->reloc_root_tree.lock);
if (!del) {
spin_lock(&rc->reloc_root_tree.lock);
-diff -urNp linux-2.6.38.4/fs/cachefiles/bind.c linux-2.6.38.4/fs/cachefiles/bind.c
---- linux-2.6.38.4/fs/cachefiles/bind.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/cachefiles/bind.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/btrfs/zlib.c linux-2.6.39/fs/btrfs/zlib.c
+--- linux-2.6.39/fs/btrfs/zlib.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/btrfs/zlib.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/fs/cachefiles/bind.c linux-2.6.39/fs/cachefiles/bind.c
+--- linux-2.6.39/fs/cachefiles/bind.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/cachefiles/bind.c 2011-05-22 19:36:32.000000000 -0400
@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
args);
cache->bcull_percent < cache->brun_percent &&
cache->brun_percent < 100);
-diff -urNp linux-2.6.38.4/fs/cachefiles/daemon.c linux-2.6.38.4/fs/cachefiles/daemon.c
---- linux-2.6.38.4/fs/cachefiles/daemon.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/cachefiles/daemon.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/cachefiles/daemon.c linux-2.6.39/fs/cachefiles/daemon.c
+--- linux-2.6.39/fs/cachefiles/daemon.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/cachefiles/daemon.c 2011-05-22 19:36:32.000000000 -0400
@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st
if (n > buflen)
return -EMSGSIZE;
return cachefiles_daemon_range_error(cache, args);
cache->bstop_percent = bstop;
-diff -urNp linux-2.6.38.4/fs/cachefiles/internal.h linux-2.6.38.4/fs/cachefiles/internal.h
---- linux-2.6.38.4/fs/cachefiles/internal.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/cachefiles/internal.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/fs/cachefiles/internal.h linux-2.6.39/fs/cachefiles/internal.h
+--- linux-2.6.39/fs/cachefiles/internal.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/cachefiles/internal.h 2011-05-22 19:36:32.000000000 -0400
@@ -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) */
}
#else
-diff -urNp linux-2.6.38.4/fs/cachefiles/namei.c linux-2.6.38.4/fs/cachefiles/namei.c
---- linux-2.6.38.4/fs/cachefiles/namei.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/cachefiles/namei.c 2011-04-28 19:57:25.000000000 -0400
-@@ -309,7 +309,7 @@ try_again:
+diff -urNp linux-2.6.39/fs/cachefiles/namei.c linux-2.6.39/fs/cachefiles/namei.c
+--- linux-2.6.39/fs/cachefiles/namei.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/cachefiles/namei.c 2011-05-22 19:36:32.000000000 -0400
+@@ -318,7 +318,7 @@ try_again:
/* first step is to make up a grave dentry in the graveyard */
sprintf(nbuffer, "%08x%08x",
(uint32_t) get_seconds(),
/* do the multiway lock magic */
trap = lock_rename(cache->graveyard, dir);
-diff -urNp linux-2.6.38.4/fs/cachefiles/proc.c linux-2.6.38.4/fs/cachefiles/proc.c
---- linux-2.6.38.4/fs/cachefiles/proc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/cachefiles/proc.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/fs/cachefiles/proc.c linux-2.6.39/fs/cachefiles/proc.c
+--- linux-2.6.39/fs/cachefiles/proc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/cachefiles/proc.c 2011-05-22 19:36:32.000000000 -0400
@@ -14,9 +14,9 @@
#include <linux/seq_file.h>
#include "internal.h"
if (x == 0 && y == 0 && z == 0)
return 0;
-diff -urNp linux-2.6.38.4/fs/cachefiles/rdwr.c linux-2.6.38.4/fs/cachefiles/rdwr.c
---- linux-2.6.38.4/fs/cachefiles/rdwr.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/cachefiles/rdwr.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/cachefiles/rdwr.c linux-2.6.39/fs/cachefiles/rdwr.c
+--- linux-2.6.39/fs/cachefiles/rdwr.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/cachefiles/rdwr.c 2011-05-22 19:36:32.000000000 -0400
@@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache
old_fs = get_fs();
set_fs(KERNEL_DS);
set_fs(old_fs);
kunmap(page);
if (ret != len)
-diff -urNp linux-2.6.38.4/fs/ceph/dir.c linux-2.6.38.4/fs/ceph/dir.c
---- linux-2.6.38.4/fs/ceph/dir.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ceph/dir.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/ceph/addr.c linux-2.6.39/fs/ceph/addr.c
+--- linux-2.6.39/fs/ceph/addr.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/ceph/addr.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/fs/ceph/dir.c linux-2.6.39/fs/ceph/dir.c
+--- linux-2.6.39/fs/ceph/dir.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/ceph/dir.c 2011-05-22 19:36:32.000000000 -0400
@@ -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;
int err;
u32 ftype;
struct ceph_mds_reply_info_parsed *rinfo;
-@@ -358,7 +358,7 @@ more:
+@@ -360,7 +360,7 @@ more:
rinfo = &fi->last_readdir->r_reply_info;
dout("readdir frag %x num %d off %d chunkoff %d\n", frag,
rinfo->dir_nr, off, fi->offset);
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.38.4/fs/cifs/cifs_debug.c linux-2.6.38.4/fs/cifs/cifs_debug.c
---- linux-2.6.38.4/fs/cifs/cifs_debug.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/cifs/cifs_debug.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/fs/cifs/cifs_debug.c linux-2.6.39/fs/cifs/cifs_debug.c
+--- linux-2.6.39/fs/cifs/cifs_debug.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/cifs/cifs_debug.c 2011-05-22 19:36:32.000000000 -0400
@@ -279,25 +279,25 @@ static ssize_t cifs_stats_proc_write(str
tcon = list_entry(tmp3,
struct cifsTconInfo,
}
}
}
-diff -urNp linux-2.6.38.4/fs/cifs/cifsglob.h linux-2.6.38.4/fs/cifs/cifsglob.h
---- linux-2.6.38.4/fs/cifs/cifsglob.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/cifs/cifsglob.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/fs/cifs/cifsglob.h linux-2.6.39/fs/cifs/cifsglob.h
+--- linux-2.6.39/fs/cifs/cifsglob.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/cifs/cifsglob.h 2011-05-22 19:36:32.000000000 -0400
@@ -305,28 +305,28 @@ struct cifsTconInfo {
__u16 Flags; /* optional support bits */
enum statusEnum tidStatus;
static inline void cifs_stats_bytes_written(struct cifsTconInfo *tcon,
unsigned int bytes)
-diff -urNp linux-2.6.38.4/fs/cifs/link.c linux-2.6.38.4/fs/cifs/link.c
---- linux-2.6.38.4/fs/cifs/link.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/cifs/link.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/cifs/link.c linux-2.6.39/fs/cifs/link.c
+--- linux-2.6.39/fs/cifs/link.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/cifs/link.c 2011-05-22 19:36:32.000000000 -0400
@@ -577,7 +577,7 @@ symlink_exit:
void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
if (!IS_ERR(p))
kfree(p);
}
-diff -urNp linux-2.6.38.4/fs/coda/cache.c linux-2.6.38.4/fs/coda/cache.c
---- linux-2.6.38.4/fs/coda/cache.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/coda/cache.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/fs/coda/cache.c linux-2.6.39/fs/coda/cache.c
+--- linux-2.6.39/fs/coda/cache.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/coda/cache.c 2011-05-22 19:36:32.000000000 -0400
@@ -24,7 +24,7 @@
#include "coda_linux.h"
#include "coda_cache.h"
spin_unlock(&cii->c_lock);
return hit;
-diff -urNp linux-2.6.38.4/fs/compat_binfmt_elf.c linux-2.6.38.4/fs/compat_binfmt_elf.c
---- linux-2.6.38.4/fs/compat_binfmt_elf.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/compat_binfmt_elf.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/compat_binfmt_elf.c linux-2.6.39/fs/compat_binfmt_elf.c
+--- linux-2.6.39/fs/compat_binfmt_elf.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/compat_binfmt_elf.c 2011-05-22 19:36:32.000000000 -0400
@@ -30,11 +30,13 @@
#undef elf_phdr
#undef elf_shdr
#define elf_addr_t Elf32_Addr
/*
-diff -urNp linux-2.6.38.4/fs/compat.c linux-2.6.38.4/fs/compat.c
---- linux-2.6.38.4/fs/compat.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/compat.c 2011-04-28 19:34:15.000000000 -0400
-@@ -594,7 +594,7 @@ ssize_t compat_rw_copy_check_uvector(int
+diff -urNp linux-2.6.39/fs/compat.c linux-2.6.39/fs/compat.c
+--- linux-2.6.39/fs/compat.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/compat.c 2011-05-22 19:41:37.000000000 -0400
+@@ -566,7 +566,7 @@ ssize_t compat_rw_copy_check_uvector(int
goto out;
ret = -EINVAL;
goto out;
if (nr_segs > fast_segs) {
ret = -ENOMEM;
-@@ -876,6 +876,7 @@ struct compat_old_linux_dirent {
+@@ -848,6 +848,7 @@ struct compat_old_linux_dirent {
struct compat_readdir_callback {
struct compat_old_linux_dirent __user *dirent;
int result;
};
-@@ -893,6 +894,10 @@ static int compat_fillonedir(void *__buf
+@@ -865,6 +866,10 @@ static int compat_fillonedir(void *__buf
buf->result = -EOVERFLOW;
return -EOVERFLOW;
}
buf->result++;
dirent = buf->dirent;
if (!access_ok(VERIFY_WRITE, dirent,
-@@ -925,6 +930,7 @@ asmlinkage long compat_sys_old_readdir(u
+@@ -897,6 +902,7 @@ asmlinkage long compat_sys_old_readdir(u
buf.result = 0;
buf.dirent = dirent;
error = vfs_readdir(file, compat_fillonedir, &buf);
if (buf.result)
-@@ -945,6 +951,7 @@ struct compat_linux_dirent {
+@@ -917,6 +923,7 @@ struct compat_linux_dirent {
struct compat_getdents_callback {
struct compat_linux_dirent __user *current_dir;
struct compat_linux_dirent __user *previous;
int count;
int error;
};
-@@ -966,6 +973,10 @@ static int compat_filldir(void *__buf, c
+@@ -938,6 +945,10 @@ static int compat_filldir(void *__buf, c
buf->error = -EOVERFLOW;
return -EOVERFLOW;
}
dirent = buf->previous;
if (dirent) {
if (__put_user(offset, &dirent->d_off))
-@@ -1013,6 +1024,7 @@ asmlinkage long compat_sys_getdents(unsi
+@@ -985,6 +996,7 @@ asmlinkage long compat_sys_getdents(unsi
buf.previous = NULL;
buf.count = count;
buf.error = 0;
error = vfs_readdir(file, compat_filldir, &buf);
if (error >= 0)
-@@ -1034,6 +1046,7 @@ out:
+@@ -1006,6 +1018,7 @@ out:
struct compat_getdents_callback64 {
struct linux_dirent64 __user *current_dir;
struct linux_dirent64 __user *previous;
int count;
int error;
};
-@@ -1050,6 +1063,10 @@ static int compat_filldir64(void * __buf
+@@ -1022,6 +1035,10 @@ static int compat_filldir64(void * __buf
buf->error = -EINVAL; /* only used if we fail.. */
if (reclen > buf->count)
return -EINVAL;
dirent = buf->previous;
if (dirent) {
-@@ -1101,6 +1118,7 @@ asmlinkage long compat_sys_getdents64(un
+@@ -1073,6 +1090,7 @@ asmlinkage long compat_sys_getdents64(un
buf.previous = NULL;
buf.count = count;
buf.error = 0;
error = vfs_readdir(file, compat_filldir64, &buf);
if (error >= 0)
-@@ -1464,6 +1482,11 @@ int compat_do_execve(char * filename,
+@@ -1436,6 +1454,11 @@ int compat_do_execve(char * filename,
compat_uptr_t __user *envp,
struct pt_regs * regs)
{
struct linux_binprm *bprm;
struct file *file;
struct files_struct *displaced;
-@@ -1500,6 +1523,19 @@ int compat_do_execve(char * filename,
+@@ -1472,6 +1495,19 @@ int compat_do_execve(char * filename,
bprm->filename = filename;
bprm->interp = filename;
retval = bprm_mm_init(bprm);
if (retval)
goto out_file;
-@@ -1529,9 +1565,40 @@ int compat_do_execve(char * filename,
+@@ -1501,9 +1537,40 @@ int compat_do_execve(char * filename,
if (retval < 0)
goto out;
/* execve succeeded */
current->fs->in_exec = 0;
-@@ -1542,6 +1609,14 @@ int compat_do_execve(char * filename,
+@@ -1514,6 +1581,14 @@ int compat_do_execve(char * filename,
put_files_struct(displaced);
return retval;
out:
if (bprm->mm) {
acct_arg_size(bprm, 0);
-diff -urNp linux-2.6.38.4/fs/compat_ioctl.c linux-2.6.38.4/fs/compat_ioctl.c
---- linux-2.6.38.4/fs/compat_ioctl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/compat_ioctl.c 2011-04-28 19:34:15.000000000 -0400
+@@ -1681,6 +1756,8 @@ int compat_core_sys_select(int n, compat
+ struct fdtable *fdt;
+ long stack_fds[SELECT_STACK_ALLOC/sizeof(long)];
+
++ pax_track_stack();
++
+ if (n < 0)
+ goto out_nofds;
+
+diff -urNp linux-2.6.39/fs/compat_ioctl.c linux-2.6.39/fs/compat_ioctl.c
+--- linux-2.6.39/fs/compat_ioctl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/compat_ioctl.c 2011-05-22 19:36:32.000000000 -0400
@@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsi
err = get_user(palp, &up->palette);
if (a > b)
return 1;
if (a < b)
-diff -urNp linux-2.6.38.4/fs/dcache.c linux-2.6.38.4/fs/dcache.c
---- linux-2.6.38.4/fs/dcache.c 2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/fs/dcache.c 2011-04-28 19:34:15.000000000 -0400
-@@ -3092,7 +3092,7 @@ void __init vfs_caches_init(unsigned lon
+diff -urNp linux-2.6.39/fs/configfs/dir.c linux-2.6.39/fs/configfs/dir.c
+--- linux-2.6.39/fs/configfs/dir.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/configfs/dir.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1575,7 +1575,8 @@ static int configfs_readdir(struct file
+ }
+ for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
+ struct configfs_dirent *next;
+- const char * name;
++ const unsigned char * name;
++ char d_name[sizeof(next->s_dentry->d_iname)];
+ int len;
+ struct inode *inode = NULL;
+
+@@ -1585,7 +1586,12 @@ static int configfs_readdir(struct file
+ continue;
+
+ name = configfs_get_name(next);
+- len = strlen(name);
++ if (next->s_dentry && name == next->s_dentry->d_iname) {
++ len = next->s_dentry->d_name.len;
++ memcpy(d_name, name, len);
++ name = d_name;
++ } else
++ len = strlen(name);
+
+ /*
+ * We'll have a dentry and an inode for
+diff -urNp linux-2.6.39/fs/configfs/file.c linux-2.6.39/fs/configfs/file.c
+--- linux-2.6.39/fs/configfs/file.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/configfs/file.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/fs/configfs/item.c linux-2.6.39/fs/configfs/item.c
+--- linux-2.6.39/fs/configfs/item.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/configfs/item.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/fs/dcache.c linux-2.6.39/fs/dcache.c
+--- linux-2.6.39/fs/dcache.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/dcache.c 2011-05-22 19:36:32.000000000 -0400
+@@ -3069,7 +3069,7 @@ void __init vfs_caches_init(unsigned lon
mempages -= reserve;
names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
dcache_init();
inode_init();
-diff -urNp linux-2.6.38.4/fs/dlm/lockspace.c linux-2.6.38.4/fs/dlm/lockspace.c
---- linux-2.6.38.4/fs/dlm/lockspace.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/dlm/lockspace.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/dlm/lockspace.c linux-2.6.39/fs/dlm/lockspace.c
+--- linux-2.6.39/fs/dlm/lockspace.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/dlm/lockspace.c 2011-05-22 19:36:32.000000000 -0400
@@ -200,7 +200,7 @@ static int dlm_uevent(struct kset *kset,
return 0;
}
.uevent = dlm_uevent,
};
-diff -urNp linux-2.6.38.4/fs/ecryptfs/inode.c linux-2.6.38.4/fs/ecryptfs/inode.c
---- linux-2.6.38.4/fs/ecryptfs/inode.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ecryptfs/inode.c 2011-04-28 19:34:15.000000000 -0400
-@@ -658,7 +658,7 @@ static int ecryptfs_readlink_lower(struc
+diff -urNp linux-2.6.39/fs/ecryptfs/inode.c linux-2.6.39/fs/ecryptfs/inode.c
+--- linux-2.6.39/fs/ecryptfs/inode.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/ecryptfs/inode.c 2011-05-22 19:36:32.000000000 -0400
+@@ -621,7 +621,7 @@ static int ecryptfs_readlink_lower(struc
old_fs = get_fs();
set_fs(get_ds());
rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
lower_bufsiz);
set_fs(old_fs);
if (rc < 0)
-@@ -704,7 +704,7 @@ static void *ecryptfs_follow_link(struct
+@@ -667,7 +667,7 @@ static void *ecryptfs_follow_link(struct
}
old_fs = get_fs();
set_fs(get_ds());
set_fs(old_fs);
if (rc < 0) {
kfree(buf);
-@@ -719,7 +719,7 @@ out:
+@@ -682,7 +682,7 @@ out:
static void
ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
{
if (!IS_ERR(buf)) {
/* Free the char* */
kfree(buf);
-diff -urNp linux-2.6.38.4/fs/ecryptfs/miscdev.c linux-2.6.38.4/fs/ecryptfs/miscdev.c
---- linux-2.6.38.4/fs/ecryptfs/miscdev.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ecryptfs/miscdev.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/ecryptfs/miscdev.c linux-2.6.39/fs/ecryptfs/miscdev.c
+--- linux-2.6.39/fs/ecryptfs/miscdev.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/ecryptfs/miscdev.c 2011-05-22 19:36:32.000000000 -0400
@@ -328,7 +328,7 @@ check_list:
goto out_unlock_msg_ctx;
i = 5;
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.38.4/fs/exec.c linux-2.6.38.4/fs/exec.c
---- linux-2.6.38.4/fs/exec.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/exec.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/fs/exec.c linux-2.6.39/fs/exec.c
+--- linux-2.6.39/fs/exec.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/exec.c 2011-05-22 20:44:52.000000000 -0400
@@ -55,12 +55,24 @@
#include <linux/fs_struct.h>
#include <linux/pipe_fs_i.h>
/* The maximal length of core_pattern is also specified in sysctl.c */
-@@ -120,7 +132,7 @@ SYSCALL_DEFINE1(uselib, const char __use
- goto out;
-
- file = do_filp_open(AT_FDCWD, tmp,
-- O_LARGEFILE | O_RDONLY | __FMODE_EXEC, 0,
-+ O_LARGEFILE | O_RDONLY | __FMODE_EXEC | FMODE_GREXEC, 0,
- MAY_READ | MAY_EXEC | MAY_OPEN);
- putname(tmp);
- error = PTR_ERR(file);
-@@ -187,18 +199,10 @@ struct page *get_arg_page(struct linux_b
+@@ -116,7 +128,7 @@ SYSCALL_DEFINE1(uselib, const char __use
+ char *tmp = getname(library);
+ int error = PTR_ERR(tmp);
+ static const struct open_flags uselib_flags = {
+- .open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC,
++ .open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC | FMODE_GREXEC,
+ .acc_mode = MAY_READ | MAY_EXEC | MAY_OPEN,
+ .intent = LOOKUP_OPEN
+ };
+@@ -190,18 +202,10 @@ struct page *get_arg_page(struct linux_b
int write)
{
struct page *page;
return NULL;
if (write) {
-@@ -273,6 +277,11 @@ static int __bprm_mm_init(struct linux_b
+@@ -276,6 +280,11 @@ static int __bprm_mm_init(struct linux_b
vma->vm_end = STACK_TOP_MAX;
vma->vm_start = vma->vm_end - PAGE_SIZE;
vma->vm_flags = VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
INIT_LIST_HEAD(&vma->anon_vma_chain);
-@@ -287,6 +296,12 @@ static int __bprm_mm_init(struct linux_b
+@@ -290,6 +299,12 @@ static int __bprm_mm_init(struct linux_b
mm->stack_vm = mm->total_vm = 1;
up_write(&mm->mmap_sem);
bprm->p = vma->vm_end - sizeof(void *);
return 0;
err:
up_write(&mm->mmap_sem);
-@@ -522,7 +537,7 @@ int copy_strings_kernel(int argc, const
+@@ -525,7 +540,7 @@ int copy_strings_kernel(int argc, const
int r;
mm_segment_t oldfs = get_fs();
set_fs(KERNEL_DS);
set_fs(oldfs);
return r;
}
-@@ -552,7 +567,8 @@ static int shift_arg_pages(struct vm_are
+@@ -555,7 +570,8 @@ static int shift_arg_pages(struct vm_are
unsigned long new_end = old_end - shift;
struct mmu_gather *tlb;
/*
* ensure there are no vmas between where we want to go
-@@ -561,6 +577,10 @@ static int shift_arg_pages(struct vm_are
+@@ -564,6 +580,10 @@ static int shift_arg_pages(struct vm_are
if (vma != find_vma(mm, new_start))
return -EFAULT;
/*
* cover the whole range: [new_start, old_end)
*/
-@@ -641,10 +661,6 @@ int setup_arg_pages(struct linux_binprm
+@@ -644,10 +664,6 @@ int setup_arg_pages(struct linux_binprm
stack_top = arch_align_stack(stack_top);
stack_top = PAGE_ALIGN(stack_top);
stack_shift = vma->vm_end - stack_top;
bprm->p -= stack_shift;
-@@ -656,8 +672,28 @@ int setup_arg_pages(struct linux_binprm
+@@ -659,8 +675,28 @@ int setup_arg_pages(struct linux_binprm
bprm->exec -= stack_shift;
down_write(&mm->mmap_sem);
/*
* Adjust stack execute permissions; explicitly enable for
* EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
-@@ -676,13 +712,6 @@ int setup_arg_pages(struct linux_binprm
+@@ -679,13 +715,6 @@ int setup_arg_pages(struct linux_binprm
goto out_unlock;
BUG_ON(prev != vma);
/* mprotect_fixup is overkill to remove the temporary stack flags */
vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
-@@ -723,7 +752,7 @@ struct file *open_exec(const char *name)
+@@ -725,7 +754,7 @@ struct file *open_exec(const char *name)
+ struct file *file;
int err;
-
- file = do_filp_open(AT_FDCWD, name,
-- O_LARGEFILE | O_RDONLY | __FMODE_EXEC, 0,
-+ O_LARGEFILE | O_RDONLY | __FMODE_EXEC | FMODE_GREXEC, 0,
- MAY_EXEC | MAY_OPEN);
- if (IS_ERR(file))
- goto out;
-@@ -760,7 +789,7 @@ int kernel_read(struct file *file, loff_
+ static const struct open_flags open_exec_flags = {
+- .open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC,
++ .open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC | FMODE_GREXEC,
+ .acc_mode = MAY_EXEC | MAY_OPEN,
+ .intent = LOOKUP_OPEN
+ };
+@@ -766,7 +795,7 @@ int kernel_read(struct file *file, loff_
old_fs = get_fs();
set_fs(get_ds());
/* The cast to a user pointer is valid due to the set_fs() */
set_fs(old_fs);
return result;
}
-@@ -1182,7 +1211,7 @@ int check_unsafe_exec(struct linux_binpr
+@@ -1188,7 +1217,7 @@ int check_unsafe_exec(struct linux_binpr
}
rcu_read_unlock();
bprm->unsafe |= LSM_UNSAFE_SHARE;
} else {
res = -EAGAIN;
-@@ -1378,6 +1407,11 @@ int do_execve(const char * filename,
+@@ -1384,6 +1413,11 @@ int do_execve(const char * filename,
const char __user *const __user *envp,
struct pt_regs * regs)
{
struct linux_binprm *bprm;
struct file *file;
struct files_struct *displaced;
-@@ -1414,6 +1448,23 @@ int do_execve(const char * filename,
+@@ -1420,6 +1454,23 @@ int do_execve(const char * filename,
bprm->filename = filename;
bprm->interp = filename;
retval = bprm_mm_init(bprm);
if (retval)
goto out_file;
-@@ -1443,9 +1494,40 @@ int do_execve(const char * filename,
+@@ -1449,9 +1500,40 @@ int do_execve(const char * filename,
if (retval < 0)
goto out;
/* execve succeeded */
current->fs->in_exec = 0;
-@@ -1456,6 +1538,14 @@ int do_execve(const char * filename,
+@@ -1462,6 +1544,14 @@ int do_execve(const char * filename,
put_files_struct(displaced);
return retval;
out:
if (bprm->mm) {
acct_arg_size(bprm, 0);
-@@ -1501,7 +1591,7 @@ static int expand_corename(struct core_n
+@@ -1507,7 +1597,7 @@ static int expand_corename(struct core_n
{
char *old_corename = cn->corename;
cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL);
if (!cn->corename) {
-@@ -1554,7 +1644,7 @@ static int format_corename(struct core_n
+@@ -1560,7 +1650,7 @@ static int format_corename(struct core_n
int pid_in_pattern = 0;
int err = 0;
cn->corename = kmalloc(cn->size, GFP_KERNEL);
cn->used = 0;
-@@ -1642,6 +1732,208 @@ out:
+@@ -1648,6 +1738,208 @@ out:
return ispipe;
}
static int zap_process(struct task_struct *start, int exit_code)
{
struct task_struct *t;
-@@ -1852,17 +2144,17 @@ static void wait_for_dump_helpers(struct
+@@ -1858,17 +2150,17 @@ static void wait_for_dump_helpers(struct
pipe = file->f_path.dentry->d_inode->i_pipe;
pipe_lock(pipe);
pipe_unlock(pipe);
}
-@@ -1923,7 +2215,7 @@ void do_coredump(long signr, int exit_co
+@@ -1929,7 +2221,7 @@ void do_coredump(long signr, int exit_co
int retval = 0;
int flag = 0;
int ispipe;
struct coredump_params cprm = {
.signr = signr,
.regs = regs,
-@@ -1938,6 +2230,9 @@ void do_coredump(long signr, int exit_co
+@@ -1944,6 +2236,9 @@ void do_coredump(long signr, int exit_co
audit_core_dumps(signr);
binfmt = mm->binfmt;
if (!binfmt || !binfmt->core_dump)
goto fail;
-@@ -1978,6 +2273,8 @@ void do_coredump(long signr, int exit_co
+@@ -1984,6 +2279,8 @@ void do_coredump(long signr, int exit_co
goto fail_corename;
}
if (ispipe) {
int dump_count;
char **helper_argv;
-@@ -2005,7 +2302,7 @@ void do_coredump(long signr, int exit_co
+@@ -2011,7 +2308,7 @@ void do_coredump(long signr, int exit_co
}
cprm.limit = RLIM_INFINITY;
if (core_pipe_limit && (core_pipe_limit < dump_count)) {
printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
task_tgid_vnr(current), current->comm);
-@@ -2075,7 +2372,7 @@ close_fail:
+@@ -2081,7 +2378,7 @@ close_fail:
filp_close(cprm.file, NULL);
fail_dropcount:
if (ispipe)
fail_unlock:
kfree(cn.corename);
fail_corename:
-diff -urNp linux-2.6.38.4/fs/ext2/balloc.c linux-2.6.38.4/fs/ext2/balloc.c
---- linux-2.6.38.4/fs/ext2/balloc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ext2/balloc.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/ext2/balloc.c linux-2.6.39/fs/ext2/balloc.c
+--- linux-2.6.39/fs/ext2/balloc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/ext2/balloc.c 2011-05-22 19:41:37.000000000 -0400
@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
sbi->s_resuid != current_fsuid() &&
(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
return 0;
-diff -urNp linux-2.6.38.4/fs/ext3/balloc.c linux-2.6.38.4/fs/ext3/balloc.c
---- linux-2.6.38.4/fs/ext3/balloc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ext3/balloc.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/ext3/balloc.c linux-2.6.39/fs/ext3/balloc.c
+--- linux-2.6.39/fs/ext3/balloc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/ext3/balloc.c 2011-05-22 19:41:37.000000000 -0400
@@ -1441,7 +1441,7 @@ static int ext3_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
sbi->s_resuid != current_fsuid() &&
(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
return 0;
-diff -urNp linux-2.6.38.4/fs/ext4/balloc.c linux-2.6.38.4/fs/ext4/balloc.c
---- linux-2.6.38.4/fs/ext4/balloc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ext4/balloc.c 2011-04-28 19:34:15.000000000 -0400
-@@ -519,7 +519,7 @@ static int ext4_has_free_blocks(struct e
+diff -urNp linux-2.6.39/fs/ext4/balloc.c linux-2.6.39/fs/ext4/balloc.c
+--- linux-2.6.39/fs/ext4/balloc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/ext4/balloc.c 2011-05-22 19:41:37.000000000 -0400
+@@ -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() ||
((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
if (free_blocks >= (nblocks + dirty_blocks))
return 1;
}
-diff -urNp linux-2.6.38.4/fs/ext4/ext4.h linux-2.6.38.4/fs/ext4/ext4.h
---- linux-2.6.38.4/fs/ext4/ext4.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ext4/ext4.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/ext4/ext4.h linux-2.6.39/fs/ext4/ext4.h
+--- linux-2.6.39/fs/ext4/ext4.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/ext4/ext4.h 2011-05-22 19:36:32.000000000 -0400
@@ -1166,19 +1166,19 @@ struct ext4_sb_info {
unsigned long s_mb_last_start;
atomic_t s_lock_busy;
/* locality groups */
-diff -urNp linux-2.6.38.4/fs/ext4/mballoc.c linux-2.6.38.4/fs/ext4/mballoc.c
---- linux-2.6.38.4/fs/ext4/mballoc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ext4/mballoc.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1846,7 +1846,7 @@ void ext4_mb_simple_scan_group(struct ex
+diff -urNp linux-2.6.39/fs/ext4/mballoc.c linux-2.6.39/fs/ext4/mballoc.c
+--- linux-2.6.39/fs/ext4/mballoc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/ext4/mballoc.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1851,7 +1851,7 @@ void ext4_mb_simple_scan_group(struct ex
BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
if (EXT4_SB(sb)->s_mb_stats)
break;
}
-@@ -2140,7 +2140,7 @@ repeat:
+@@ -2145,7 +2145,7 @@ repeat:
ac->ac_status = AC_STATUS_CONTINUE;
ac->ac_flags |= EXT4_MB_HINT_FIRST;
cr = 3;
goto repeat;
}
}
-@@ -2606,25 +2606,25 @@ int ext4_mb_release(struct super_block *
+@@ -2188,6 +2188,8 @@ static int ext4_mb_seq_groups_show(struc
+ ext4_grpblk_t counters[16];
+ } sg;
+
++ pax_track_stack();
++
+ group--;
+ if (group == 0)
+ seq_printf(seq, "#%-5s: %-5s %-5s %-5s "
+@@ -2611,25 +2613,25 @@ int ext4_mb_release(struct super_block *
if (sbi->s_mb_stats) {
printk(KERN_INFO
"EXT4-fs: mballoc: %u blocks %u reqs (%u success)\n",
}
free_percpu(sbi->s_locality_groups);
-@@ -3100,16 +3100,16 @@ static void ext4_mb_collect_stats(struct
+@@ -3105,16 +3107,16 @@ static void ext4_mb_collect_stats(struct
struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
}
if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
-@@ -3507,7 +3507,7 @@ ext4_mb_new_inode_pa(struct ext4_allocat
+@@ -3512,7 +3514,7 @@ ext4_mb_new_inode_pa(struct ext4_allocat
trace_ext4_mb_new_inode_pa(ac, pa);
ext4_mb_use_inode_pa(ac, pa);
ei = EXT4_I(ac->ac_inode);
grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
-@@ -3567,7 +3567,7 @@ ext4_mb_new_group_pa(struct ext4_allocat
+@@ -3572,7 +3574,7 @@ ext4_mb_new_group_pa(struct ext4_allocat
trace_ext4_mb_new_group_pa(ac, pa);
ext4_mb_use_group_pa(ac, pa);
grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
lg = ac->ac_lg;
-@@ -3654,7 +3654,7 @@ ext4_mb_release_inode_pa(struct ext4_bud
+@@ -3659,7 +3661,7 @@ ext4_mb_release_inode_pa(struct ext4_bud
* from the bitmap and continue.
*/
}
return err;
}
-@@ -3672,7 +3672,7 @@ ext4_mb_release_group_pa(struct ext4_bud
+@@ -3677,7 +3679,7 @@ ext4_mb_release_group_pa(struct ext4_bud
ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
return 0;
-diff -urNp linux-2.6.38.4/fs/fcntl.c linux-2.6.38.4/fs/fcntl.c
---- linux-2.6.38.4/fs/fcntl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fcntl.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/fcntl.c linux-2.6.39/fs/fcntl.c
+--- linux-2.6.39/fs/fcntl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/fcntl.c 2011-05-22 20:45:50.000000000 -0400
@@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct
if (err)
return err;
if (arg >= rlimit(RLIMIT_NOFILE))
break;
err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
-@@ -808,14 +814,14 @@ static int __init fcntl_init(void)
+@@ -835,14 +841,14 @@ static int __init fcntl_init(void)
* Exceptions: O_NONBLOCK is a two bit define on parisc; O_NDELAY
* is defined as O_NONBLOCK on some platforms and not on others.
*/
-- BUILD_BUG_ON(18 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(
-+ BUILD_BUG_ON(19 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(
+- BUILD_BUG_ON(19 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(
++ BUILD_BUG_ON(20 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(
O_RDONLY | O_WRONLY | O_RDWR |
O_CREAT | O_EXCL | O_NOCTTY |
O_TRUNC | O_APPEND | /* O_NONBLOCK | */
__O_SYNC | O_DSYNC | FASYNC |
O_DIRECT | O_LARGEFILE | O_DIRECTORY |
O_NOFOLLOW | O_NOATIME | O_CLOEXEC |
-- __FMODE_EXEC
-+ __FMODE_EXEC | FMODE_GREXEC
+- __FMODE_EXEC | O_PATH
++ __FMODE_EXEC | O_PATH | FMODE_GREXEC
));
fasync_cache = kmem_cache_create("fasync_cache",
-diff -urNp linux-2.6.38.4/fs/fifo.c linux-2.6.38.4/fs/fifo.c
---- linux-2.6.38.4/fs/fifo.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fifo.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/fifo.c linux-2.6.39/fs/fifo.c
+--- linux-2.6.39/fs/fifo.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/fifo.c 2011-05-22 19:36:32.000000000 -0400
@@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode
*/
filp->f_op = &read_pipefifo_fops;
if ((filp->f_flags & O_NONBLOCK)) {
/* suppress POLLHUP until we have
* seen a writer */
-@@ -82,15 +82,15 @@ static int fifo_open(struct inode *inode
+@@ -81,15 +81,15 @@ static int fifo_open(struct inode *inode
* errno=ENXIO when there is no process reading the FIFO.
*/
ret = -ENXIO;
wait_for_partner(inode, &pipe->r_counter);
if (signal_pending(current))
goto err_wr;
-@@ -106,11 +106,11 @@ static int fifo_open(struct inode *inode
+@@ -105,11 +105,11 @@ static int fifo_open(struct inode *inode
*/
filp->f_op = &rdwr_pipefifo_fops;
wake_up_partner(inode);
break;
-@@ -124,19 +124,19 @@ static int fifo_open(struct inode *inode
+@@ -123,19 +123,19 @@ static int fifo_open(struct inode *inode
return 0;
err_rd:
free_pipe_info(inode);
err_nocleanup:
-diff -urNp linux-2.6.38.4/fs/file.c linux-2.6.38.4/fs/file.c
---- linux-2.6.38.4/fs/file.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/file.c 2011-04-28 19:34:15.000000000 -0400
-@@ -14,6 +14,7 @@
+diff -urNp linux-2.6.39/fs/file.c linux-2.6.39/fs/file.c
+--- linux-2.6.39/fs/file.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/file.c 2011-05-22 19:41:37.000000000 -0400
+@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/file.h>
#include <linux/fdtable.h>
#include <linux/bitops.h>
#include <linux/interrupt.h>
-@@ -250,6 +251,7 @@ int expand_files(struct files_struct *fi
+@@ -254,6 +255,7 @@ int expand_files(struct files_struct *fi
* N.B. For clone tasks sharing a files structure, this test
* will limit the total number of files that can be opened.
*/
if (nr >= rlimit(RLIMIT_NOFILE))
return -EMFILE;
-diff -urNp linux-2.6.38.4/fs/filesystems.c linux-2.6.38.4/fs/filesystems.c
---- linux-2.6.38.4/fs/filesystems.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/filesystems.c 2011-04-28 19:34:15.000000000 -0400
-@@ -275,7 +275,12 @@ struct file_system_type *get_fs_type(con
+diff -urNp linux-2.6.39/fs/filesystems.c linux-2.6.39/fs/filesystems.c
+--- linux-2.6.39/fs/filesystems.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/filesystems.c 2011-05-22 19:41:37.000000000 -0400
+@@ -274,7 +274,12 @@ struct file_system_type *get_fs_type(con
int len = dot ? dot - name : strlen(name);
fs = __get_fs_type(name, len);
fs = __get_fs_type(name, len);
if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
-diff -urNp linux-2.6.38.4/fs/fscache/cookie.c linux-2.6.38.4/fs/fscache/cookie.c
---- linux-2.6.38.4/fs/fscache/cookie.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fscache/cookie.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/fs/fscache/cookie.c linux-2.6.39/fs/fscache/cookie.c
+--- linux-2.6.39/fs/fscache/cookie.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/fscache/cookie.c 2011-05-22 19:36:32.000000000 -0400
@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire
parent ? (char *) parent->def->name : "<no-parent>",
def->name, netfs_data);
wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
fscache_wait_bit, TASK_UNINTERRUPTIBLE);
}
-diff -urNp linux-2.6.38.4/fs/fscache/internal.h linux-2.6.38.4/fs/fscache/internal.h
---- linux-2.6.38.4/fs/fscache/internal.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fscache/internal.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/fs/fscache/internal.h linux-2.6.39/fs/fscache/internal.h
+--- linux-2.6.39/fs/fscache/internal.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/fscache/internal.h 2011-05-22 19:36:32.000000000 -0400
@@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void);
extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
static inline void fscache_stat_d(atomic_t *stat)
{
atomic_dec(stat);
-diff -urNp linux-2.6.38.4/fs/fscache/object.c linux-2.6.38.4/fs/fscache/object.c
---- linux-2.6.38.4/fs/fscache/object.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fscache/object.c 2011-04-28 19:57:25.000000000 -0400
+@@ -267,6 +272,7 @@ extern const struct file_operations fsca
+
+ #define __fscache_stat(stat) (NULL)
+ #define fscache_stat(stat) do {} while (0)
++#define fscache_stat_unchecked(stat) do {} while (0)
+ #define fscache_stat_d(stat) do {} while (0)
+ #endif
+
+diff -urNp linux-2.6.39/fs/fscache/object.c linux-2.6.39/fs/fscache/object.c
+--- linux-2.6.39/fs/fscache/object.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/fscache/object.c 2011-05-22 19:36:32.000000000 -0400
@@ -128,7 +128,7 @@ static void fscache_object_state_machine
/* update the object metadata on disk */
case FSCACHE_OBJECT_UPDATING:
break;
default:
-diff -urNp linux-2.6.38.4/fs/fscache/operation.c linux-2.6.38.4/fs/fscache/operation.c
---- linux-2.6.38.4/fs/fscache/operation.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fscache/operation.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/fs/fscache/operation.c linux-2.6.39/fs/fscache/operation.c
+--- linux-2.6.39/fs/fscache/operation.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/fscache/operation.c 2011-05-22 19:36:32.000000000 -0400
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include "internal.h"
ASSERTCMP(atomic_read(&op->usage), ==, 0);
-diff -urNp linux-2.6.38.4/fs/fscache/page.c linux-2.6.38.4/fs/fscache/page.c
---- linux-2.6.38.4/fs/fscache/page.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fscache/page.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/fs/fscache/page.c linux-2.6.39/fs/fscache/page.c
+--- linux-2.6.39/fs/fscache/page.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/fscache/page.c 2011-05-22 19:36:32.000000000 -0400
@@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct
val = radix_tree_lookup(&cookie->stores, page->index);
if (!val) {
#endif
for (loop = 0; loop < pagevec->nr; loop++) {
-diff -urNp linux-2.6.38.4/fs/fscache/stats.c linux-2.6.38.4/fs/fscache/stats.c
---- linux-2.6.38.4/fs/fscache/stats.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fscache/stats.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/fs/fscache/stats.c linux-2.6.39/fs/fscache/stats.c
+--- linux-2.6.39/fs/fscache/stats.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/fscache/stats.c 2011-05-22 19:36:32.000000000 -0400
@@ -18,95 +18,95 @@
/*
* operation counters
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.38.4/fs/fs_struct.c linux-2.6.38.4/fs/fs_struct.c
---- linux-2.6.38.4/fs/fs_struct.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fs_struct.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/fs_struct.c linux-2.6.39/fs/fs_struct.c
+--- linux-2.6.39/fs/fs_struct.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/fs_struct.c 2011-05-22 19:41:37.000000000 -0400
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
spin_unlock(&fs->lock);
task_unlock(current);
-diff -urNp linux-2.6.38.4/fs/fuse/cuse.c linux-2.6.38.4/fs/fuse/cuse.c
---- linux-2.6.38.4/fs/fuse/cuse.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fuse/cuse.c 2011-04-28 19:34:15.000000000 -0400
-@@ -530,8 +530,18 @@ static int cuse_channel_release(struct i
+diff -urNp linux-2.6.39/fs/fuse/cuse.c linux-2.6.39/fs/fuse/cuse.c
+--- linux-2.6.39/fs/fuse/cuse.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/fuse/cuse.c 2011-05-22 19:36:32.000000000 -0400
+@@ -538,8 +538,18 @@ static int cuse_channel_release(struct i
return rc;
}
/**************************************************************************
* Misc stuff and module initializatiion
-@@ -577,12 +587,6 @@ static int __init cuse_init(void)
+@@ -585,12 +595,6 @@ static int __init cuse_init(void)
for (i = 0; i < CUSE_CONNTBL_LEN; i++)
INIT_LIST_HEAD(&cuse_conntbl[i]);
cuse_class = class_create(THIS_MODULE, "cuse");
if (IS_ERR(cuse_class))
return PTR_ERR(cuse_class);
-diff -urNp linux-2.6.38.4/fs/fuse/dev.c linux-2.6.38.4/fs/fuse/dev.c
---- linux-2.6.38.4/fs/fuse/dev.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fuse/dev.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1183,7 +1183,7 @@ static ssize_t fuse_dev_do_read(struct f
+diff -urNp linux-2.6.39/fs/fuse/dev.c linux-2.6.39/fs/fuse/dev.c
+--- linux-2.6.39/fs/fuse/dev.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/fuse/dev.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1181,7 +1181,7 @@ static ssize_t fuse_dev_do_read(struct f
return err;
}
unsigned long nr_segs, loff_t pos)
{
struct fuse_copy_state cs;
-@@ -1197,6 +1197,8 @@ static ssize_t fuse_dev_read(struct kioc
+@@ -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));
}
static int fuse_dev_pipe_buf_steal(struct pipe_inode_info *pipe,
struct pipe_buffer *buf)
{
-@@ -1240,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(stru
+@@ -1238,7 +1240,7 @@ static ssize_t fuse_dev_splice_read(stru
ret = 0;
pipe_lock(pipe);
send_sig(SIGPIPE, current, 0);
if (!ret)
ret = -EPIPE;
-@@ -1733,7 +1735,7 @@ static ssize_t fuse_dev_do_write(struct
+@@ -1731,7 +1733,7 @@ static ssize_t fuse_dev_do_write(struct
return err;
}
unsigned long nr_segs, loff_t pos)
{
struct fuse_copy_state cs;
-@@ -1746,6 +1748,8 @@ static ssize_t fuse_dev_write(struct kio
+@@ -1744,6 +1746,8 @@ static ssize_t fuse_dev_write(struct kio
return fuse_dev_do_write(fc, &cs, iov_length(iov, nr_segs));
}
static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe,
struct file *out, loff_t *ppos,
size_t len, unsigned int flags)
-@@ -1824,7 +1828,7 @@ out:
+@@ -1822,7 +1826,7 @@ out:
return ret;
}
{
unsigned mask = POLLOUT | POLLWRNORM;
struct fuse_conn *fc = fuse_get_conn(file);
-@@ -1843,6 +1847,8 @@ static unsigned fuse_dev_poll(struct fil
+@@ -1841,6 +1845,8 @@ static unsigned fuse_dev_poll(struct fil
return mask;
}
/*
* Abort all requests on the given list (pending or processing)
*
-@@ -1962,7 +1968,7 @@ int fuse_dev_release(struct inode *inode
+@@ -1977,7 +1983,7 @@ int fuse_dev_release(struct inode *inode
}
EXPORT_SYMBOL_GPL(fuse_dev_release);
{
struct fuse_conn *fc = fuse_get_conn(file);
if (!fc)
-@@ -1972,6 +1978,8 @@ static int fuse_dev_fasync(int fd, struc
+@@ -1987,6 +1993,8 @@ static int fuse_dev_fasync(int fd, struc
return fasync_helper(fd, file, on, &fc->fasync);
}
const struct file_operations fuse_dev_operations = {
.owner = THIS_MODULE,
.llseek = no_llseek,
-diff -urNp linux-2.6.38.4/fs/fuse/dir.c linux-2.6.38.4/fs/fuse/dir.c
---- linux-2.6.38.4/fs/fuse/dir.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fuse/dir.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1133,7 +1133,7 @@ static char *read_link(struct dentry *de
+diff -urNp linux-2.6.39/fs/fuse/dir.c linux-2.6.39/fs/fuse/dir.c
+--- linux-2.6.39/fs/fuse/dir.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/fuse/dir.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1147,7 +1147,7 @@ static char *read_link(struct dentry *de
return link;
}
{
if (!IS_ERR(link))
free_page((unsigned long) link);
-diff -urNp linux-2.6.38.4/fs/fuse/fuse_i.h linux-2.6.38.4/fs/fuse/fuse_i.h
---- linux-2.6.38.4/fs/fuse/fuse_i.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fuse/fuse_i.h 2011-04-28 19:34:15.000000000 -0400
-@@ -541,6 +541,16 @@ extern const struct file_operations fuse
+diff -urNp linux-2.6.39/fs/fuse/fuse_i.h linux-2.6.39/fs/fuse/fuse_i.h
+--- linux-2.6.39/fs/fuse/fuse_i.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/fuse/fuse_i.h 2011-05-22 19:36:32.000000000 -0400
+@@ -540,6 +540,16 @@ extern const struct file_operations fuse
extern const struct dentry_operations fuse_dentry_operations;
/**
* Inode to nodeid comparison.
*/
-diff -urNp linux-2.6.38.4/fs/hugetlbfs/inode.c linux-2.6.38.4/fs/hugetlbfs/inode.c
---- linux-2.6.38.4/fs/hugetlbfs/inode.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/hugetlbfs/inode.c 2011-04-28 19:34:15.000000000 -0400
-@@ -915,7 +915,7 @@ static struct file_system_type hugetlbfs
+diff -urNp linux-2.6.39/fs/gfs2/ops_inode.c linux-2.6.39/fs/gfs2/ops_inode.c
+--- linux-2.6.39/fs/gfs2/ops_inode.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/gfs2/ops_inode.c 2011-05-22 19:36:32.000000000 -0400
+@@ -740,6 +740,8 @@ static int gfs2_rename(struct inode *odi
+ unsigned int x;
+ int error;
+
++ pax_track_stack();
++
+ if (ndentry->d_inode) {
+ nip = GFS2_I(ndentry->d_inode);
+ if (ip == nip)
+@@ -1019,7 +1021,7 @@ out:
+
+ static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
+ {
+- char *s = nd_get_link(nd);
++ const char *s = nd_get_link(nd);
+ if (!IS_ERR(s))
+ kfree(s);
+ }
+diff -urNp linux-2.6.39/fs/hfsplus/catalog.c linux-2.6.39/fs/hfsplus/catalog.c
+--- linux-2.6.39/fs/hfsplus/catalog.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/hfsplus/catalog.c 2011-05-22 19:36:32.000000000 -0400
+@@ -179,6 +179,8 @@ int hfsplus_find_cat(struct super_block
+ int err;
+ u16 type;
+
++ pax_track_stack();
++
+ hfsplus_cat_build_key(sb, fd->search_key, cnid, NULL);
+ err = hfs_brec_read(fd, &tmp, sizeof(hfsplus_cat_entry));
+ if (err)
+@@ -210,6 +212,8 @@ int hfsplus_create_cat(u32 cnid, struct
+ int entry_size;
+ int err;
+
++ pax_track_stack();
++
+ dprint(DBG_CAT_MOD, "create_cat: %s,%u(%d)\n",
+ str->name, cnid, inode->i_nlink);
+ hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &fd);
+@@ -349,6 +353,8 @@ int hfsplus_rename_cat(u32 cnid,
+ int entry_size, type;
+ int err = 0;
+
++ pax_track_stack();
++
+ dprint(DBG_CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n",
+ cnid, src_dir->i_ino, src_name->name,
+ dst_dir->i_ino, dst_name->name);
+diff -urNp linux-2.6.39/fs/hfsplus/dir.c linux-2.6.39/fs/hfsplus/dir.c
+--- linux-2.6.39/fs/hfsplus/dir.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/hfsplus/dir.c 2011-05-22 19:36:32.000000000 -0400
+@@ -129,6 +129,8 @@ static int hfsplus_readdir(struct file *
+ struct hfsplus_readdir_data *rd;
+ u16 type;
+
++ pax_track_stack();
++
+ if (filp->f_pos >= inode->i_size)
+ return 0;
+
+diff -urNp linux-2.6.39/fs/hfsplus/inode.c linux-2.6.39/fs/hfsplus/inode.c
+--- linux-2.6.39/fs/hfsplus/inode.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/hfsplus/inode.c 2011-05-22 19:36:32.000000000 -0400
+@@ -489,6 +489,8 @@ int hfsplus_cat_read_inode(struct inode
+ int res = 0;
+ u16 type;
+
++ pax_track_stack();
++
+ type = hfs_bnode_read_u16(fd->bnode, fd->entryoffset);
+
+ HFSPLUS_I(inode)->linkid = 0;
+@@ -552,6 +554,8 @@ int hfsplus_cat_write_inode(struct inode
+ struct hfs_find_data fd;
+ hfsplus_cat_entry entry;
+
++ pax_track_stack();
++
+ if (HFSPLUS_IS_RSRC(inode))
+ main_inode = HFSPLUS_I(inode)->rsrc_inode;
+
+diff -urNp linux-2.6.39/fs/hfsplus/ioctl.c linux-2.6.39/fs/hfsplus/ioctl.c
+--- linux-2.6.39/fs/hfsplus/ioctl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/hfsplus/ioctl.c 2011-05-22 19:36:32.000000000 -0400
+@@ -122,6 +122,8 @@ int hfsplus_setxattr(struct dentry *dent
+ struct hfsplus_cat_file *file;
+ int res;
+
++ pax_track_stack();
++
+ if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
+ return -EOPNOTSUPP;
+
+@@ -166,6 +168,8 @@ ssize_t hfsplus_getxattr(struct dentry *
+ struct hfsplus_cat_file *file;
+ ssize_t res = 0;
+
++ pax_track_stack();
++
+ if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
+ return -EOPNOTSUPP;
+
+diff -urNp linux-2.6.39/fs/hfsplus/super.c linux-2.6.39/fs/hfsplus/super.c
+--- linux-2.6.39/fs/hfsplus/super.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/hfsplus/super.c 2011-05-22 19:36:32.000000000 -0400
+@@ -340,6 +340,8 @@ static int hfsplus_fill_super(struct sup
+ struct nls_table *nls = NULL;
+ int err;
+
++ pax_track_stack();
++
+ err = -EINVAL;
+ sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
+ if (!sbi)
+diff -urNp linux-2.6.39/fs/hugetlbfs/inode.c linux-2.6.39/fs/hugetlbfs/inode.c
+--- linux-2.6.39/fs/hugetlbfs/inode.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/hugetlbfs/inode.c 2011-05-22 19:41:37.000000000 -0400
+@@ -914,7 +914,7 @@ static struct file_system_type hugetlbfs
.kill_sb = kill_litter_super,
};
static int can_do_hugetlb_shm(void)
{
-diff -urNp linux-2.6.38.4/fs/inode.c linux-2.6.38.4/fs/inode.c
---- linux-2.6.38.4/fs/inode.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/inode.c 2011-04-28 19:34:15.000000000 -0400
-@@ -801,8 +801,8 @@ unsigned int get_next_ino(void)
+diff -urNp linux-2.6.39/fs/inode.c linux-2.6.39/fs/inode.c
+--- linux-2.6.39/fs/inode.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/inode.c 2011-05-22 19:36:32.000000000 -0400
+@@ -862,8 +862,8 @@ unsigned int get_next_ino(void)
#ifdef CONFIG_SMP
if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
res = next - LAST_INO_BATCH;
}
-diff -urNp linux-2.6.38.4/fs/jffs2/erase.c linux-2.6.38.4/fs/jffs2/erase.c
---- linux-2.6.38.4/fs/jffs2/erase.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/jffs2/erase.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/jbd/checkpoint.c linux-2.6.39/fs/jbd/checkpoint.c
+--- linux-2.6.39/fs/jbd/checkpoint.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/jbd/checkpoint.c 2011-05-22 19:36:32.000000000 -0400
+@@ -350,6 +350,8 @@ int log_do_checkpoint(journal_t *journal
+ tid_t this_tid;
+ int result;
+
++ pax_track_stack();
++
+ jbd_debug(1, "Start checkpoint\n");
+
+ /*
+diff -urNp linux-2.6.39/fs/jffs2/compr_rtime.c linux-2.6.39/fs/jffs2/compr_rtime.c
+--- linux-2.6.39/fs/jffs2/compr_rtime.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/jffs2/compr_rtime.c 2011-05-22 19:36:32.000000000 -0400
+@@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned
+ int outpos = 0;
+ int pos=0;
+
++ pax_track_stack();
++
+ memset(positions,0,sizeof(positions));
+
+ while (pos < (*sourcelen) && outpos <= (*dstlen)-2) {
+@@ -78,6 +80,8 @@ static int jffs2_rtime_decompress(unsign
+ int outpos = 0;
+ int pos=0;
+
++ pax_track_stack();
++
+ memset(positions,0,sizeof(positions));
+
+ while (outpos<destlen) {
+diff -urNp linux-2.6.39/fs/jffs2/compr_rubin.c linux-2.6.39/fs/jffs2/compr_rubin.c
+--- linux-2.6.39/fs/jffs2/compr_rubin.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/jffs2/compr_rubin.c 2011-05-22 19:36:32.000000000 -0400
+@@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsig
+ int ret;
+ uint32_t mysrclen, mydstlen;
+
++ pax_track_stack();
++
+ mysrclen = *sourcelen;
+ mydstlen = *dstlen - 8;
+
+diff -urNp linux-2.6.39/fs/jffs2/erase.c linux-2.6.39/fs/jffs2/erase.c
+--- linux-2.6.39/fs/jffs2/erase.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/jffs2/erase.c 2011-05-22 19:36:32.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),
};
jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-2.6.38.4/fs/jffs2/wbuf.c linux-2.6.38.4/fs/jffs2/wbuf.c
---- linux-2.6.38.4/fs/jffs2/wbuf.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/jffs2/wbuf.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/jffs2/wbuf.c linux-2.6.39/fs/jffs2/wbuf.c
+--- linux-2.6.39/fs/jffs2/wbuf.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/jffs2/wbuf.c 2011-05-22 19:36:32.000000000 -0400
@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
{
.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
};
/*
-diff -urNp linux-2.6.38.4/fs/Kconfig.binfmt linux-2.6.38.4/fs/Kconfig.binfmt
---- linux-2.6.38.4/fs/Kconfig.binfmt 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/Kconfig.binfmt 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/jffs2/xattr.c linux-2.6.39/fs/jffs2/xattr.c
+--- linux-2.6.39/fs/jffs2/xattr.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/jffs2/xattr.c 2011-05-22 19:36:32.000000000 -0400
+@@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct
+
+ BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING));
+
++ pax_track_stack();
++
+ /* Phase.1 : Merge same xref */
+ for (i=0; i < XREF_TMPHASH_SIZE; i++)
+ xref_tmphash[i] = NULL;
+diff -urNp linux-2.6.39/fs/Kconfig.binfmt linux-2.6.39/fs/Kconfig.binfmt
+--- linux-2.6.39/fs/Kconfig.binfmt 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/Kconfig.binfmt 2011-05-22 19:36:32.000000000 -0400
@@ -86,7 +86,7 @@ config HAVE_AOUT
config BINFMT_AOUT
---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.38.4/fs/libfs.c linux-2.6.38.4/fs/libfs.c
---- linux-2.6.38.4/fs/libfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/libfs.c 2011-04-28 19:34:15.000000000 -0400
-@@ -138,6 +138,8 @@ int dcache_readdir(struct file * filp, v
- struct dentry *dentry = filp->f_path.dentry;
- struct dentry *cursor = filp->private_data;
- struct list_head *p, *q = &cursor->d_u.d_child;
-+ char d_name[DNAME_INLINE_LEN];
-+ const char *name;
- ino_t ino;
- int i = filp->f_pos;
-
-@@ -172,7 +174,12 @@ int dcache_readdir(struct file * filp, v
+diff -urNp linux-2.6.39/fs/libfs.c linux-2.6.39/fs/libfs.c
+--- linux-2.6.39/fs/libfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/libfs.c 2011-05-22 19:36:32.000000000 -0400
+@@ -163,6 +163,9 @@ int dcache_readdir(struct file * filp, v
+
+ for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
+ struct dentry *next;
++ char d_name[sizeof(next->d_iname)];
++ const unsigned char *name;
++
+ next = list_entry(p, struct dentry, d_u.d_child);
+ spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
+ if (!simple_positive(next)) {
+@@ -172,7 +175,12 @@ int dcache_readdir(struct file * filp, v
spin_unlock(&next->d_lock);
spin_unlock(&dentry->d_lock);
- if (filldir(dirent, next->d_name.name,
-+ if (next->d_name.len < DNAME_INLINE_LEN) {
-+ memcpy(d_name, next->d_name.name, next->d_name.len);
++ name = next->d_name.name;
++ if (name == next->d_iname) {
++ memcpy(d_name, name, next->d_name.len);
+ name = d_name;
-+ } else
-+ name = next->d_name.name;
++ }
+ if (filldir(dirent, name,
next->d_name.len, filp->f_pos,
next->d_inode->i_ino,
dt_type(next->d_inode)) < 0)
-diff -urNp linux-2.6.38.4/fs/lockd/clntproc.c linux-2.6.38.4/fs/lockd/clntproc.c
---- linux-2.6.38.4/fs/lockd/clntproc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/lockd/clntproc.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/fs/lockd/clntproc.c linux-2.6.39/fs/lockd/clntproc.c
+--- linux-2.6.39/fs/lockd/clntproc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/lockd/clntproc.c 2011-05-22 19:36:32.000000000 -0400
@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt
/*
* Cookie counter for NLM requests
memcpy(c->data, &cookie, 4);
c->len=4;
-diff -urNp linux-2.6.38.4/fs/lockd/svc.c linux-2.6.38.4/fs/lockd/svc.c
---- linux-2.6.38.4/fs/lockd/svc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/lockd/svc.c 2011-04-28 19:34:15.000000000 -0400
+@@ -620,6 +620,8 @@ nlmclnt_reclaim(struct nlm_host *host, s
+ struct nlm_rqst reqst, *req;
+ int status;
+
++ pax_track_stack();
++
+ req = &reqst;
+ memset(req, 0, sizeof(*req));
+ locks_init_lock(&req->a_args.lock.fl);
+diff -urNp linux-2.6.39/fs/lockd/svc.c linux-2.6.39/fs/lockd/svc.c
+--- linux-2.6.39/fs/lockd/svc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/lockd/svc.c 2011-05-22 19:36:32.000000000 -0400
@@ -41,7 +41,7 @@
static struct svc_program nlmsvc_program;
EXPORT_SYMBOL_GPL(nlmsvc_ops);
static DEFINE_MUTEX(nlmsvc_mutex);
-diff -urNp linux-2.6.38.4/fs/locks.c linux-2.6.38.4/fs/locks.c
---- linux-2.6.38.4/fs/locks.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/locks.c 2011-04-28 19:34:15.000000000 -0400
-@@ -2044,16 +2044,16 @@ void locks_remove_flock(struct file *fil
+diff -urNp linux-2.6.39/fs/locks.c linux-2.6.39/fs/locks.c
+--- linux-2.6.39/fs/locks.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/locks.c 2011-05-22 19:36:32.000000000 -0400
+@@ -2033,16 +2033,16 @@ void locks_remove_flock(struct file *fil
return;
if (filp->f_op && filp->f_op->flock) {
}
lock_flocks();
-diff -urNp linux-2.6.38.4/fs/namei.c linux-2.6.38.4/fs/namei.c
---- linux-2.6.38.4/fs/namei.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/fs/namei.c 2011-04-28 19:34:15.000000000 -0400
-@@ -226,14 +226,6 @@ int generic_permission(struct inode *ino
+diff -urNp linux-2.6.39/fs/logfs/super.c linux-2.6.39/fs/logfs/super.c
+--- linux-2.6.39/fs/logfs/super.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/logfs/super.c 2011-05-22 19:36:32.000000000 -0400
+@@ -266,6 +266,8 @@ static int logfs_recover_sb(struct super
+ struct logfs_disk_super _ds1, *ds1 = &_ds1;
+ int err, valid0, valid1;
+
++ pax_track_stack();
++
+ /* read first superblock */
+ err = wbuf_read(sb, super->s_sb_ofs[0], sizeof(*ds0), ds0);
+ if (err)
+diff -urNp linux-2.6.39/fs/namei.c linux-2.6.39/fs/namei.c
+--- linux-2.6.39/fs/namei.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/namei.c 2011-05-23 18:21:41.000000000 -0400
+@@ -237,20 +237,30 @@ int generic_permission(struct inode *ino
return ret;
/*
- * Read/write DACs are always overridable.
- * Executable DACs are overridable if at least one exec bit is set.
-- */
-- if (!(mask & MAY_EXEC) || execute_ok(inode))
-- if (capable(CAP_DAC_OVERRIDE))
-- return 0;
--
-- /*
- * Searching includes executable on directories, else just read.
++ * Searching includes executable on directories, else just read.
*/
- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
-@@ -241,6 +233,14 @@ int generic_permission(struct inode *ino
- if (capable(CAP_DAC_READ_SEARCH))
+- if (!(mask & MAY_EXEC) || execute_ok(inode))
+- if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
++ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
++ if (mask == MAY_READ || (S_ISDIR(inode->i_mode) && !(mask & MAY_WRITE))) {
++#ifdef CONFIG_GRKERNSEC
++ if (flags & IPERM_FLAG_RCU)
++ return -ECHILD;
++#endif
++ if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
return 0;
++ }
-+ /*
+ /*
+- * Searching includes executable on directories, else just read.
+ * Read/write DACs are always overridable.
+ * Executable DACs are overridable if at least one exec bit is set.
-+ */
-+ if (!(mask & MAY_EXEC) || execute_ok(inode))
-+ if (capable(CAP_DAC_OVERRIDE))
-+ return 0;
-+
+ */
+- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
+- if (mask == MAY_READ || (S_ISDIR(inode->i_mode) && !(mask & MAY_WRITE)))
+- if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
++ if (!(mask & MAY_EXEC) || execute_ok(inode)) {
++#ifdef CONFIG_GRKERNSEC
++ if (flags & IPERM_FLAG_RCU)
++ return -ECHILD;
++#endif
++ if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
+ return 0;
++ }
+
return -EACCES;
}
+@@ -626,6 +636,9 @@ static inline int handle_reval_path(stru
+ struct dentry *dentry = nd->path.dentry;
+ int status;
+
++ if (!(nd->flags & LOOKUP_PARENT) && !gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt))
++ return -ENOENT;
++
+ if (likely(!(nd->flags & LOOKUP_JUMPED)))
+ return 0;
-@@ -687,7 +687,8 @@ static inline int exec_permission(struct
+@@ -671,9 +684,16 @@ static inline int exec_permission(struct
if (ret == -ECHILD)
return ret;
-- if (capable(CAP_DAC_OVERRIDE) || capable(CAP_DAC_READ_SEARCH))
-+ if (capable_nolog(CAP_DAC_OVERRIDE) || capable(CAP_DAC_READ_SEARCH) ||
-+ capable(CAP_DAC_OVERRIDE))
+- if (ns_capable(ns, CAP_DAC_OVERRIDE) ||
+- ns_capable(ns, CAP_DAC_READ_SEARCH))
++ if (ns_capable_nolog(ns, CAP_DAC_OVERRIDE))
goto ok;
++ else {
++#ifdef CONFIG_GRKERNSEC
++ if (flags & IPERM_FLAG_RCU)
++ return -ECHILD;
++#endif
++ if (ns_capable(ns, CAP_DAC_READ_SEARCH) || ns_capable(ns, CAP_DAC_OVERRIDE))
++ goto ok;
++ }
return ret;
-@@ -776,7 +777,7 @@ __do_follow_link(const struct path *link
+ ok:
+@@ -781,11 +801,19 @@ follow_link(struct path *link, struct na
+ return error;
+ }
+
++ if (gr_handle_follow_link(dentry->d_parent->d_inode,
++ dentry->d_inode, dentry, nd->path.mnt)) {
++ error = -EACCES;
++ *p = ERR_PTR(error); /* no ->put_link(), please */
++ path_put(&nd->path);
++ return error;
++ }
++
+ nd->last_type = LAST_BIND;
*p = dentry->d_inode->i_op->follow_link(dentry, nd);
error = PTR_ERR(*p);
if (!IS_ERR(*p)) {
error = 0;
if (s)
error = __vfs_follow_link(nd, s);
-@@ -815,6 +816,13 @@ static inline int do_follow_link(struct
- err = security_inode_follow_link(path->dentry, nd);
- if (err)
- goto loop;
-+
-+ if (gr_handle_follow_link(path->dentry->d_parent->d_inode,
-+ path->dentry->d_inode, path->dentry, nd->path.mnt)) {
-+ err = -EACCES;
-+ goto loop;
-+ }
-+
- current->link_count++;
- current->total_link_count++;
- nd->depth++;
-@@ -1506,13 +1514,36 @@ return_reval:
- return_base:
- if (nameidata_drop_rcu_last_maybe(nd))
- return -ECHILD;
-+
-+ if (!(nd->flags & LOOKUP_PARENT) && !gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
-+ err = -ENOENT;
-+ goto err_and_ret;
-+ }
-+
- return 0;
- out_dput:
- if (!(nd->flags & LOOKUP_RCU))
- path_put_conditional(&next, nd);
- break;
- }
-+#ifdef CONFIG_GRKERNSEC
-+ /* we do this because we can't operate here on an rcu'd dentry,
-+ acquire a properly-referenced copy
-+ */
-+ if (nameidata_drop_rcu_last_maybe(nd))
-+ return -ECHILD;
-+#endif
-+
-+ if (!(nd->flags & LOOKUP_PARENT) && !gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt))
-+ err = -ENOENT;
-+
-+err_and_ret:
-+#ifndef CONFIG_GRKERNSEC
-+ /* since we convert to ref-walk above, always put the path if we reach
-+ here
-+ */
- if (!(nd->flags & LOOKUP_RCU))
-+#endif
- path_put(&nd->path);
- return_err:
- return err;
-@@ -1739,6 +1770,9 @@ static int do_path_lookup(int dfd, const
- }
+@@ -1697,6 +1725,9 @@ static int do_path_lookup(int dfd, const
+ retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
if (likely(!retval)) {
+ if (*name != '/' && nd->path.dentry && nd->inode && !gr_chroot_fchdir(nd->path.dentry, nd->path.mnt))
if (unlikely(!audit_dummy_context())) {
if (nd->path.dentry && nd->inode)
audit_inode(name, nd->path.dentry);
-@@ -2079,6 +2113,30 @@ int vfs_create(struct inode *dir, struct
+@@ -2007,6 +2038,30 @@ int vfs_create(struct inode *dir, struct
return error;
}
+ return flag;
+}
+
- int may_open(struct path *path, int acc_mode, int flag)
+ static int may_open(struct path *path, int acc_mode, int flag)
{
struct dentry *dentry = path->dentry;
-@@ -2127,7 +2185,27 @@ int may_open(struct path *path, int acc_
+@@ -2059,7 +2114,27 @@ static int may_open(struct path *path, i
/*
* Ensure there are no outstanding leases on the file.
*/
}
static int handle_truncate(struct file *filp)
-@@ -2162,6 +2240,12 @@ static int __open_namei_create(struct na
- {
- int error;
- struct dentry *dir = nd->path.dentry;
-+ int flag = open_to_namei_flags(open_flag);
-+
-+ if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, nd->path.mnt, flag, mode)) {
-+ error = -EACCES;
-+ goto out_unlock;
-+ }
-
- if (!IS_POSIXACL(dir->d_inode))
- mode &= ~current_umask();
-@@ -2169,6 +2253,8 @@ static int __open_namei_create(struct na
- if (error)
- goto out_unlock;
- error = vfs_create(dir->d_inode, path->dentry, mode, nd);
-+ if (!error)
-+ gr_handle_create(path->dentry, nd->path.mnt);
- out_unlock:
- mutex_unlock(&dir->d_inode->i_mutex);
- dput(nd->path.dentry);
-@@ -2180,30 +2266,6 @@ out_unlock:
- return may_open(&nd->path, 0, open_flag & ~O_TRUNC);
+@@ -2085,30 +2160,6 @@ static int handle_truncate(struct file *
}
--/*
+ /*
- * Note that while the flag value (low two bits) for sys_open means:
- * 00 - read-only
- * 01 - write-only
- return flag;
-}
-
- static int open_will_truncate(int flag, struct inode *inode)
- {
- /*
-@@ -2274,6 +2336,7 @@ static struct file *do_last(struct namei
- int mode, const char *pathname)
- {
+-/*
+ * 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
struct dentry *dir = nd->path.dentry;
+ struct dentry *dentry;
+ int open_flag = op->open_flag;
+ int flag = open_to_namei_flags(open_flag);
- struct file *filp;
- int error = -EISDIR;
-
-@@ -2352,6 +2415,14 @@ static struct file *do_last(struct namei
+ 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
+ /* Negative dentry, just create the file */
+ if (!dentry->d_inode) {
+ int mode = op->mode;
++
++ if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, path->mnt, flag, mode)) {
++ error = -EACCES;
++ goto exit_mutex_unlock;
++ }
++
+ if (!IS_POSIXACL(dir->d_inode))
+ mode &= ~current_umask();
+ /*
+@@ -2235,6 +2293,8 @@ static struct file *do_last(struct namei
+ error = vfs_create(dir->d_inode, dentry, mode, nd);
+ if (error)
+ goto exit_mutex_unlock;
++ else
++ gr_handle_create(path->dentry, path->mnt);
+ 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
/*
* It already exists.
*/
mutex_unlock(&dir->d_inode->i_mutex);
audit_inode(pathname, path->dentry);
-@@ -2535,6 +2606,11 @@ reval:
- error = security_inode_follow_link(link.dentry, &nd);
- if (error)
- goto exit_dput;
-+ if (gr_handle_follow_link(link.dentry->d_parent->d_inode,
-+ link.dentry->d_inode, link.dentry, nd.path.mnt)) {
-+ error = -EACCES;
-+ goto exit_dput;
-+ }
- error = __do_follow_link(&link, &nd, &cookie);
- if (unlikely(error)) {
- if (!IS_ERR(cookie) && linki->i_op->put_link)
-@@ -2705,6 +2781,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+@@ -2530,6 +2598,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
error = may_mknod(mode);
if (error)
goto out_dput;
error = mnt_want_write(nd.path.mnt);
if (error)
goto out_dput;
-@@ -2725,6 +2812,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+@@ -2550,6 +2629,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
}
out_drop_write:
mnt_drop_write(nd.path.mnt);
out_dput:
dput(dentry);
out_unlock:
-@@ -2777,6 +2867,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+@@ -2602,6 +2684,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
if (IS_ERR(dentry))
goto out_unlock;
if (!IS_POSIXACL(nd.path.dentry->d_inode))
mode &= ~current_umask();
error = mnt_want_write(nd.path.mnt);
-@@ -2788,6 +2883,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+@@ -2613,6 +2700,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);
out_dput:
dput(dentry);
out_unlock:
-@@ -2867,6 +2966,8 @@ static long do_rmdir(int dfd, const char
+@@ -2692,6 +2783,8 @@ static long do_rmdir(int dfd, const char
char * name;
struct dentry *dentry;
struct nameidata nd;
error = user_path_parent(dfd, pathname, &nd, &name);
if (error)
-@@ -2891,6 +2992,19 @@ static long do_rmdir(int dfd, const char
+@@ -2716,6 +2809,19 @@ static long do_rmdir(int dfd, const char
error = PTR_ERR(dentry);
if (IS_ERR(dentry))
goto exit2;
error = mnt_want_write(nd.path.mnt);
if (error)
goto exit3;
-@@ -2898,6 +3012,8 @@ static long do_rmdir(int dfd, const char
+@@ -2723,6 +2829,8 @@ static long do_rmdir(int dfd, const char
if (error)
goto exit4;
error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
exit4:
mnt_drop_write(nd.path.mnt);
exit3:
-@@ -2960,6 +3076,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2785,6 +2893,8 @@ static long do_unlinkat(int dfd, const c
struct dentry *dentry;
struct nameidata nd;
struct inode *inode = NULL;
error = user_path_parent(dfd, pathname, &nd, &name);
if (error)
-@@ -2979,8 +3097,17 @@ static long do_unlinkat(int dfd, const c
+@@ -2804,8 +2914,17 @@ static long do_unlinkat(int dfd, const c
if (nd.last.name[nd.last.len])
goto slashes;
inode = dentry->d_inode;
error = mnt_want_write(nd.path.mnt);
if (error)
goto exit2;
-@@ -2988,6 +3115,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2813,6 +2932,8 @@ static long do_unlinkat(int dfd, const c
if (error)
goto exit3;
error = vfs_unlink(nd.path.dentry->d_inode, dentry);
exit3:
mnt_drop_write(nd.path.mnt);
exit2:
-@@ -3065,6 +3194,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -2890,6 +3011,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
if (IS_ERR(dentry))
goto out_unlock;
error = mnt_want_write(nd.path.mnt);
if (error)
goto out_dput;
-@@ -3072,6 +3206,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -2897,6 +3023,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
if (error)
goto out_drop_write;
error = vfs_symlink(nd.path.dentry->d_inode, dentry, from);
out_drop_write:
mnt_drop_write(nd.path.mnt);
out_dput:
-@@ -3164,6 +3300,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -3005,6 +3133,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
error = PTR_ERR(new_dentry);
if (IS_ERR(new_dentry))
goto out_unlock;
error = mnt_want_write(nd.path.mnt);
if (error)
goto out_dput;
-@@ -3171,6 +3321,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -3012,6 +3154,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);
out_drop_write:
mnt_drop_write(nd.path.mnt);
out_dput:
-@@ -3404,6 +3556,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -3189,6 +3333,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+ char *to;
+ int error;
+
++ pax_track_stack();
++
+ error = user_path_parent(olddfd, oldname, &oldnd, &from);
+ if (error)
+ goto exit;
+@@ -3245,6 +3391,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
if (new_dentry == trap)
goto exit5;
error = mnt_want_write(oldnd.path.mnt);
if (error)
goto exit5;
-@@ -3413,6 +3571,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -3254,6 +3406,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
goto exit6;
error = vfs_rename(old_dir->d_inode, old_dentry,
new_dir->d_inode, new_dentry);
exit6:
mnt_drop_write(oldnd.path.mnt);
exit5:
-@@ -3438,6 +3599,8 @@ SYSCALL_DEFINE2(rename, const char __use
+@@ -3279,6 +3434,8 @@ SYSCALL_DEFINE2(rename, const char __use
int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
{
int len;
len = PTR_ERR(link);
-@@ -3447,7 +3610,14 @@ int vfs_readlink(struct dentry *dentry,
+@@ -3288,7 +3445,14 @@ int vfs_readlink(struct dentry *dentry,
len = strlen(link);
if (len > (unsigned) buflen)
len = buflen;
len = -EFAULT;
out:
return len;
-diff -urNp linux-2.6.38.4/fs/namespace.c linux-2.6.38.4/fs/namespace.c
---- linux-2.6.38.4/fs/namespace.c 2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/fs/namespace.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1285,6 +1285,9 @@ static int do_umount(struct vfsmount *mn
+diff -urNp linux-2.6.39/fs/namespace.c linux-2.6.39/fs/namespace.c
+--- linux-2.6.39/fs/namespace.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/namespace.c 2011-05-22 20:43:58.000000000 -0400
+@@ -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);
up_write(&sb->s_umount);
return retval;
}
-@@ -1304,6 +1307,9 @@ static int do_umount(struct vfsmount *mn
+@@ -1347,6 +1350,9 @@ static int do_umount(struct vfsmount *mn
br_write_unlock(vfsmount_lock);
up_write(&namespace_sem);
release_mounts(&umount_list);
return retval;
}
-@@ -2241,6 +2247,16 @@ long do_mount(char *dev_name, char *dir_
+@@ -2338,6 +2344,16 @@ long do_mount(char *dev_name, char *dir_
MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
MS_STRICTATIME);
if (flags & MS_REMOUNT)
retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
data_page);
-@@ -2255,6 +2271,9 @@ long do_mount(char *dev_name, char *dir_
+@@ -2352,6 +2368,9 @@ long do_mount(char *dev_name, char *dir_
dev_name, data_page);
dput_out:
path_put(&path);
return retval;
}
-@@ -2480,6 +2499,12 @@ SYSCALL_DEFINE2(pivot_root, const char _
- goto out1;
- }
+@@ -2575,6 +2594,11 @@ SYSCALL_DEFINE2(pivot_root, const char _
+ if (error)
+ goto out2;
+ if (gr_handle_chroot_pivot()) {
+ error = -EPERM;
-+ path_put(&old);
-+ goto out1;
++ goto out2;
+ }
+
get_fs_root(current->fs, &root);
- down_write(&namespace_sem);
- mutex_lock(&old.dentry->d_inode->i_mutex);
-diff -urNp linux-2.6.38.4/fs/nfs/inode.c linux-2.6.38.4/fs/nfs/inode.c
---- linux-2.6.38.4/fs/nfs/inode.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/nfs/inode.c 2011-04-28 19:34:15.000000000 -0400
-@@ -998,16 +998,16 @@ static int nfs_size_need_update(const st
+ error = lock_mount(&old);
+ if (error)
+diff -urNp linux-2.6.39/fs/ncpfs/dir.c linux-2.6.39/fs/ncpfs/dir.c
+--- linux-2.6.39/fs/ncpfs/dir.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/ncpfs/dir.c 2011-05-22 19:36:32.000000000 -0400
+@@ -299,6 +299,8 @@ ncp_lookup_validate(struct dentry *dentr
+ int res, val = 0, len;
+ __u8 __name[NCP_MAXPATHLEN + 1];
+
++ pax_track_stack();
++
+ if (dentry == dentry->d_sb->s_root)
+ return 1;
+
+@@ -844,6 +846,8 @@ static struct dentry *ncp_lookup(struct
+ int error, res, len;
+ __u8 __name[NCP_MAXPATHLEN + 1];
+
++ pax_track_stack();
++
+ error = -EIO;
+ if (!ncp_conn_valid(server))
+ goto finished;
+@@ -931,6 +935,8 @@ int ncp_create_new(struct inode *dir, st
+ PPRINTK("ncp_create_new: creating %s/%s, mode=%x\n",
+ dentry->d_parent->d_name.name, dentry->d_name.name, mode);
+
++ pax_track_stack();
++
+ ncp_age_dentry(server, dentry);
+ len = sizeof(__name);
+ error = ncp_io2vol(server, __name, &len, dentry->d_name.name,
+@@ -992,6 +998,8 @@ static int ncp_mkdir(struct inode *dir,
+ int error, len;
+ __u8 __name[NCP_MAXPATHLEN + 1];
+
++ pax_track_stack();
++
+ DPRINTK("ncp_mkdir: making %s/%s\n",
+ dentry->d_parent->d_name.name, dentry->d_name.name);
+
+@@ -1135,6 +1143,8 @@ static int ncp_rename(struct inode *old_
+ int old_len, new_len;
+ __u8 __old_name[NCP_MAXPATHLEN + 1], __new_name[NCP_MAXPATHLEN + 1];
+
++ pax_track_stack();
++
+ DPRINTK("ncp_rename: %s/%s to %s/%s\n",
+ old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
+ new_dentry->d_parent->d_name.name, new_dentry->d_name.name);
+diff -urNp linux-2.6.39/fs/ncpfs/inode.c linux-2.6.39/fs/ncpfs/inode.c
+--- linux-2.6.39/fs/ncpfs/inode.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/ncpfs/inode.c 2011-05-22 19:36:32.000000000 -0400
+@@ -461,6 +461,8 @@ static int ncp_fill_super(struct super_b
+ #endif
+ struct ncp_entry_info finfo;
+
++ pax_track_stack();
++
+ data.wdog_pid = NULL;
+ server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL);
+ if (!server)
+diff -urNp linux-2.6.39/fs/nfs/inode.c linux-2.6.39/fs/nfs/inode.c
+--- linux-2.6.39/fs/nfs/inode.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/nfs/inode.c 2011-05-22 19:36:32.000000000 -0400
+@@ -999,16 +999,16 @@ static int nfs_size_need_update(const st
return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
}
}
void nfs_fattr_init(struct nfs_fattr *fattr)
-diff -urNp linux-2.6.38.4/fs/nfsd/lockd.c linux-2.6.38.4/fs/nfsd/lockd.c
---- linux-2.6.38.4/fs/nfsd/lockd.c 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/fs/nfsd/lockd.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/nfs/nfs4proc.c linux-2.6.39/fs/nfs/nfs4proc.c
+--- linux-2.6.39/fs/nfs/nfs4proc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/nfs/nfs4proc.c 2011-05-22 19:36:32.000000000 -0400
+@@ -5840,14 +5840,14 @@ struct nfs4_state_recovery_ops nfs41_nog
+ };
+ #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/fs/nfsd/lockd.c linux-2.6.39/fs/nfsd/lockd.c
+--- linux-2.6.39/fs/nfsd/lockd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/nfsd/lockd.c 2011-05-22 19:36:32.000000000 -0400
@@ -60,7 +60,7 @@ nlm_fclose(struct file *filp)
fput(filp);
}
.fopen = nlm_fopen, /* open file for locking */
.fclose = nlm_fclose, /* close file */
};
-diff -urNp linux-2.6.38.4/fs/nfsd/nfsctl.c linux-2.6.38.4/fs/nfsd/nfsctl.c
---- linux-2.6.38.4/fs/nfsd/nfsctl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/nfsd/nfsctl.c 2011-04-28 19:34:15.000000000 -0400
-@@ -180,7 +180,7 @@ static int export_features_open(struct i
+diff -urNp linux-2.6.39/fs/nfsd/nfs4state.c linux-2.6.39/fs/nfsd/nfs4state.c
+--- linux-2.6.39/fs/nfsd/nfs4state.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/nfsd/nfs4state.c 2011-05-22 19:36:32.000000000 -0400
+@@ -3784,6 +3784,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc
+ unsigned int strhashval;
+ int err;
+
++ pax_track_stack();
++
+ 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/fs/nfsd/nfs4xdr.c linux-2.6.39/fs/nfsd/nfs4xdr.c
+--- linux-2.6.39/fs/nfsd/nfs4xdr.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/nfsd/nfs4xdr.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1793,6 +1793,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
+ .dentry = dentry,
+ };
+
++ pax_track_stack();
++
+ BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1);
+ BUG_ON(bmval0 & ~nfsd_suppattrs0(minorversion));
+ BUG_ON(bmval1 & ~nfsd_suppattrs1(minorversion));
+diff -urNp linux-2.6.39/fs/nfsd/nfsctl.c linux-2.6.39/fs/nfsd/nfsctl.c
+--- linux-2.6.39/fs/nfsd/nfsctl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/nfsd/nfsctl.c 2011-05-22 19:36:32.000000000 -0400
+@@ -182,7 +182,7 @@ static int export_features_open(struct i
return single_open(file, export_features_show, NULL);
}
.open = export_features_open,
.read = seq_read,
.llseek = seq_lseek,
-diff -urNp linux-2.6.38.4/fs/nfsd/vfs.c linux-2.6.38.4/fs/nfsd/vfs.c
---- linux-2.6.38.4/fs/nfsd/vfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/nfsd/vfs.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/nfsd/vfs.c linux-2.6.39/fs/nfsd/vfs.c
+--- linux-2.6.39/fs/nfsd/vfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/nfsd/vfs.c 2011-05-22 19:36:32.000000000 -0400
@@ -898,7 +898,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
} else {
oldfs = get_fs();
set_fs(oldfs);
if (host_err < 0)
goto out_nfserr;
-@@ -1518,7 +1518,7 @@ nfsd_readlink(struct svc_rqst *rqstp, st
+@@ -1525,7 +1525,7 @@ nfsd_readlink(struct svc_rqst *rqstp, st
*/
oldfs = get_fs(); set_fs(KERNEL_DS);
set_fs(oldfs);
if (host_err < 0)
-diff -urNp linux-2.6.38.4/fs/notify/dnotify/dnotify.c linux-2.6.38.4/fs/notify/dnotify/dnotify.c
---- linux-2.6.38.4/fs/notify/dnotify/dnotify.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/notify/dnotify/dnotify.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/nilfs2/segment.c linux-2.6.39/fs/nilfs2/segment.c
+--- linux-2.6.39/fs/nilfs2/segment.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/nilfs2/segment.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/fs/notify/dnotify/dnotify.c linux-2.6.39/fs/notify/dnotify/dnotify.c
+--- linux-2.6.39/fs/notify/dnotify/dnotify.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
}
.handle_event = dnotify_handle_event,
.should_send_event = dnotify_should_send_event,
.free_group_priv = NULL,
-diff -urNp linux-2.6.38.4/fs/notify/notification.c linux-2.6.38.4/fs/notify/notification.c
---- linux-2.6.38.4/fs/notify/notification.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/notify/notification.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/fs/notify/notification.c linux-2.6.39/fs/notify/notification.c
+--- linux-2.6.39/fs/notify/notification.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/notify/notification.c 2011-05-22 19:36:32.000000000 -0400
@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event
* get set to 0 so it will never get 'freed'
*/
}
EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
-diff -urNp linux-2.6.38.4/fs/ntfs/dir.c linux-2.6.38.4/fs/ntfs/dir.c
---- linux-2.6.38.4/fs/ntfs/dir.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ntfs/dir.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/ntfs/dir.c linux-2.6.39/fs/ntfs/dir.c
+--- linux-2.6.39/fs/ntfs/dir.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/ntfs/dir.c 2011-05-22 19:36:32.000000000 -0400
@@ -1329,7 +1329,7 @@ find_next_index_buffer:
ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
~(s64)(ndir->itype.index.block_size - 1)));
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.38.4/fs/ntfs/file.c linux-2.6.38.4/fs/ntfs/file.c
---- linux-2.6.38.4/fs/ntfs/file.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ntfs/file.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/ntfs/file.c linux-2.6.39/fs/ntfs/file.c
+--- linux-2.6.39/fs/ntfs/file.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/ntfs/file.c 2011-05-22 19:36:32.000000000 -0400
@@ -2222,6 +2222,6 @@ const struct inode_operations ntfs_file_
#endif /* NTFS_RW */
};
-const struct inode_operations ntfs_empty_inode_ops = {};
+const struct inode_operations ntfs_empty_inode_ops __read_only;
-diff -urNp linux-2.6.38.4/fs/ocfs2/localalloc.c linux-2.6.38.4/fs/ocfs2/localalloc.c
---- linux-2.6.38.4/fs/ocfs2/localalloc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ocfs2/localalloc.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1307,7 +1307,7 @@ static int ocfs2_local_alloc_slide_windo
+diff -urNp linux-2.6.39/fs/ocfs2/cluster/heartbeat.c linux-2.6.39/fs/ocfs2/cluster/heartbeat.c
+--- linux-2.6.39/fs/ocfs2/cluster/heartbeat.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/fs/ocfs2/cluster/nodemanager.c linux-2.6.39/fs/ocfs2/cluster/nodemanager.c
+--- linux-2.6.39/fs/ocfs2/cluster/nodemanager.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/fs/ocfs2/localalloc.c linux-2.6.39/fs/ocfs2/localalloc.c
+--- linux-2.6.39/fs/ocfs2/localalloc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/ocfs2/localalloc.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_windo
goto bail;
}
bail:
if (handle)
-diff -urNp linux-2.6.38.4/fs/ocfs2/ocfs2.h linux-2.6.38.4/fs/ocfs2/ocfs2.h
---- linux-2.6.38.4/fs/ocfs2/ocfs2.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ocfs2/ocfs2.h 2011-04-28 19:34:15.000000000 -0400
-@@ -230,11 +230,11 @@ enum ocfs2_vol_state
+diff -urNp linux-2.6.39/fs/ocfs2/namei.c linux-2.6.39/fs/ocfs2/namei.c
+--- linux-2.6.39/fs/ocfs2/namei.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/ocfs2/namei.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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, };
+
++ pax_track_stack();
++
+ /* At some point it might be nice to break this function up a
+ * bit. */
+
+diff -urNp linux-2.6.39/fs/ocfs2/ocfs2.h linux-2.6.39/fs/ocfs2/ocfs2.h
+--- linux-2.6.39/fs/ocfs2/ocfs2.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/ocfs2/ocfs2.h 2011-05-22 19:36:32.000000000 -0400
+@@ -235,11 +235,11 @@ enum ocfs2_vol_state
struct ocfs2_alloc_stats
{
};
enum ocfs2_local_alloc_state
-diff -urNp linux-2.6.38.4/fs/ocfs2/suballoc.c linux-2.6.38.4/fs/ocfs2/suballoc.c
---- linux-2.6.38.4/fs/ocfs2/suballoc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ocfs2/suballoc.c 2011-04-28 19:34:15.000000000 -0400
-@@ -877,7 +877,7 @@ static int ocfs2_reserve_suballoc_bits(s
+diff -urNp linux-2.6.39/fs/ocfs2/stackglue.h linux-2.6.39/fs/ocfs2/stackglue.h
+--- linux-2.6.39/fs/ocfs2/stackglue.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/fs/ocfs2/stack_o2cb.c linux-2.6.39/fs/ocfs2/stack_o2cb.c
+--- linux-2.6.39/fs/ocfs2/stack_o2cb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/ocfs2/stack_o2cb.c 2011-05-22 19:36:32.000000000 -0400
+@@ -358,7 +358,7 @@ static int o2cb_cluster_this_node(unsign
+ return 0;
+ }
+
+-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,
+@@ -369,7 +369,6 @@ static struct ocfs2_stack_operations o2c
+ .lock_lvb = o2cb_dlm_lvb,
+ .dump_lksb = o2cb_dump_lksb,
+ };
+-
+ static struct ocfs2_stack_plugin o2cb_stack = {
+ .sp_name = "o2cb",
+ .sp_ops = &o2cb_stack_ops,
+diff -urNp linux-2.6.39/fs/ocfs2/stack_user.c linux-2.6.39/fs/ocfs2/stack_user.c
+--- linux-2.6.39/fs/ocfs2/stack_user.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/fs/ocfs2/suballoc.c linux-2.6.39/fs/ocfs2/suballoc.c
+--- linux-2.6.39/fs/ocfs2/suballoc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/ocfs2/suballoc.c 2011-05-22 19:36:32.000000000 -0400
+@@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(s
mlog_errno(status);
goto bail;
}
/* You should never ask for this much metadata */
BUG_ON(bits_wanted >
-@@ -2012,7 +2012,7 @@ int ocfs2_claim_metadata(handle_t *handl
+@@ -2008,7 +2008,7 @@ int ocfs2_claim_metadata(handle_t *handl
mlog_errno(status);
goto bail;
}
*suballoc_loc = res.sr_bg_blkno;
*suballoc_bit_start = res.sr_bit_offset;
-@@ -2219,7 +2219,7 @@ int ocfs2_claim_new_inode(handle_t *hand
+@@ -2172,7 +2172,7 @@ int ocfs2_claim_new_inode_at_loc(handle_
+ trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
+ res->sr_bits);
+
+- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
++ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
+
+ BUG_ON(res->sr_bits != 1);
+
+@@ -2214,7 +2214,7 @@ int ocfs2_claim_new_inode(handle_t *hand
mlog_errno(status);
goto bail;
}
BUG_ON(res.sr_bits != 1);
-@@ -2324,7 +2324,7 @@ int __ocfs2_claim_clusters(handle_t *han
+@@ -2318,7 +2318,7 @@ int __ocfs2_claim_clusters(handle_t *han
cluster_start,
num_clusters);
if (!status)
} else {
if (min_clusters > (osb->bitmap_cpg - 1)) {
/* The only paths asking for contiguousness
-@@ -2350,7 +2350,7 @@ int __ocfs2_claim_clusters(handle_t *han
+@@ -2344,7 +2344,7 @@ int __ocfs2_claim_clusters(handle_t *han
ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
res.sr_bg_blkno,
res.sr_bit_offset);
*num_clusters = res.sr_bits;
}
}
-diff -urNp linux-2.6.38.4/fs/ocfs2/super.c linux-2.6.38.4/fs/ocfs2/super.c
---- linux-2.6.38.4/fs/ocfs2/super.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ocfs2/super.c 2011-04-28 19:34:15.000000000 -0400
-@@ -297,11 +297,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
+diff -urNp linux-2.6.39/fs/ocfs2/super.c linux-2.6.39/fs/ocfs2/super.c
+--- linux-2.6.39/fs/ocfs2/super.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/ocfs2/super.c 2011-05-22 19:36:32.000000000 -0400
+@@ -299,11 +299,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
"%10s => GlobalAllocs: %d LocalAllocs: %d "
"SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
"Stats",
out += snprintf(buf + out, len - out,
"%10s => State: %u Descriptor: %llu Size: %u bits "
-@@ -2141,11 +2141,11 @@ static int ocfs2_initialize_super(struct
+@@ -2111,11 +2111,11 @@ static int ocfs2_initialize_super(struct
spin_lock_init(&osb->osb_xattr_lock);
ocfs2_init_steal_slots(osb);
/* Copy the blockcheck stats from the superblock probe */
osb->osb_ecc_stats = *stats;
-diff -urNp linux-2.6.38.4/fs/ocfs2/symlink.c linux-2.6.38.4/fs/ocfs2/symlink.c
---- linux-2.6.38.4/fs/ocfs2/symlink.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ocfs2/symlink.c 2011-04-28 19:34:15.000000000 -0400
-@@ -148,7 +148,7 @@ bail:
+diff -urNp linux-2.6.39/fs/ocfs2/symlink.c linux-2.6.39/fs/ocfs2/symlink.c
+--- linux-2.6.39/fs/ocfs2/symlink.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/ocfs2/symlink.c 2011-05-22 19:36:32.000000000 -0400
+@@ -142,7 +142,7 @@ bail:
static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
{
if (!IS_ERR(link))
kfree(link);
}
-diff -urNp linux-2.6.38.4/fs/open.c linux-2.6.38.4/fs/open.c
---- linux-2.6.38.4/fs/open.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/open.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/open.c linux-2.6.39/fs/open.c
+--- linux-2.6.39/fs/open.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/open.c 2011-05-22 20:46:51.000000000 -0400
@@ -112,6 +112,10 @@ static long do_sys_truncate(const char _
error = locks_verify_truncate(inode, NULL, length);
if (!error)
newattrs.ia_valid = ATTR_CTIME;
if (user != (uid_t) -1) {
newattrs.ia_valid |= ATTR_UID;
-@@ -898,7 +954,10 @@ long do_sys_open(int dfd, const char __u
+@@ -998,7 +1054,10 @@ long do_sys_open(int dfd, const char __u
if (!IS_ERR(tmp)) {
fd = get_unused_fd_flags(flags);
if (fd >= 0) {
-- struct file *f = do_filp_open(dfd, tmp, flags, mode, 0);
+- struct file *f = do_filp_open(dfd, tmp, &op, lookup);
+ struct file *f;
+ /* don't allow to be set by userland */
+ flags &= ~FMODE_GREXEC;
-+ f = do_filp_open(dfd, tmp, flags, mode, 0);
++ f = do_filp_open(dfd, tmp, &op, lookup);
if (IS_ERR(f)) {
put_unused_fd(fd);
fd = PTR_ERR(f);
-diff -urNp linux-2.6.38.4/fs/partitions/ldm.c linux-2.6.38.4/fs/partitions/ldm.c
---- linux-2.6.38.4/fs/partitions/ldm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/partitions/ldm.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1299,6 +1299,11 @@ static bool ldm_frag_add (const u8 *data
-
- BUG_ON (!data || !frags);
-
-+ if (size < 2 * VBLK_SIZE_HEAD) {
-+ ldm_error("Value of size is to small.");
-+ return false;
-+ }
-+
- group = get_unaligned_be32(data + 0x08);
- rec = get_unaligned_be16(data + 0x0C);
- num = get_unaligned_be16(data + 0x0E);
-@@ -1307,13 +1312,18 @@ static bool ldm_frag_add (const u8 *data
+diff -urNp linux-2.6.39/fs/partitions/ldm.c linux-2.6.39/fs/partitions/ldm.c
+--- linux-2.6.39/fs/partitions/ldm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/partitions/ldm.c 2011-05-22 19:41:37.000000000 -0400
+@@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data
+ ldm_error ("A VBLK claims to have %d parts.", num);
return false;
}
-
-+ if (rec >= num) {
-+ ldm_error("REC value (%d) exceeds NUM value (%d)", rec, num);
-+ return false;
-+ }
+
- list_for_each (item, frags) {
- f = list_entry (item, struct frag, list);
- if (f->group == group)
+ if (rec >= num) {
+ ldm_error("REC value (%d) exceeds NUM value (%d)", rec, num);
+ return false;
+@@ -1322,7 +1323,7 @@ static bool ldm_frag_add (const u8 *data
goto found;
}
if (!f) {
ldm_crit ("Out of memory.");
return false;
-@@ -1334,10 +1344,9 @@ found:
-
- f->map |= (1 << rec);
-
-- if (num > 0) {
-- data += VBLK_SIZE_HEAD;
-- size -= VBLK_SIZE_HEAD;
-- }
-+ data += VBLK_SIZE_HEAD;
-+ size -= VBLK_SIZE_HEAD;
-+
- memcpy (f->data+rec*(size-VBLK_SIZE_HEAD)+VBLK_SIZE_HEAD, data, size);
-
- return true;
-diff -urNp linux-2.6.38.4/fs/pipe.c linux-2.6.38.4/fs/pipe.c
---- linux-2.6.38.4/fs/pipe.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/pipe.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/pipe.c linux-2.6.39/fs/pipe.c
+--- linux-2.6.39/fs/pipe.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/pipe.c 2011-05-22 19:41:37.000000000 -0400
@@ -420,9 +420,9 @@ redo:
}
if (bufs) /* More to do? */
inode->i_fop = &rdwr_pipefifo_fops;
/*
-diff -urNp linux-2.6.38.4/fs/proc/array.c linux-2.6.38.4/fs/proc/array.c
---- linux-2.6.38.4/fs/proc/array.c 2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/array.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/proc/array.c linux-2.6.39/fs/proc/array.c
+--- linux-2.6.39/fs/proc/array.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/proc/array.c 2011-05-22 19:41:37.000000000 -0400
@@ -60,6 +60,7 @@
#include <linux/tty.h>
#include <linux/string.h>
static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task, int whole)
{
-@@ -449,6 +480,19 @@ static int do_task_stat(struct seq_file
+@@ -375,9 +406,11 @@ static int do_task_stat(struct seq_file
+ cputime_t cutime, cstime, utime, stime;
+ cputime_t cgtime, gtime;
+ unsigned long rsslim = 0;
+- char tcomm[sizeof(task->comm)];
++ char tcomm[sizeof(task->comm)] = { 0 };
+ unsigned long flags;
+
++ pax_track_stack();
++
+ state = *get_task_state(task);
+ vsize = eip = esp = 0;
+ permitted = ptrace_may_access(task, PTRACE_MODE_READ);
+@@ -449,6 +482,19 @@ static int do_task_stat(struct seq_file
gtime = task->gtime;
}
/* scale priority and nice values from timeslices to -20..20 */
/* to make it look like a "normal" Unix priority/nice value */
priority = task_prio(task);
-@@ -489,9 +533,15 @@ static int do_task_stat(struct seq_file
+@@ -489,9 +535,15 @@ static int do_task_stat(struct seq_file
vsize,
mm ? get_mm_rss(mm) : 0,
rsslim,
esp,
eip,
/* The signal information here is obsolete.
-@@ -544,3 +594,18 @@ int proc_pid_statm(struct seq_file *m, s
+@@ -544,3 +596,18 @@ int proc_pid_statm(struct seq_file *m, s
return 0;
}
+ return sprintf(buffer, "%pI4\n", &curr_ip);
+}
+#endif
-diff -urNp linux-2.6.38.4/fs/proc/base.c linux-2.6.38.4/fs/proc/base.c
---- linux-2.6.38.4/fs/proc/base.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/base.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/proc/base.c linux-2.6.39/fs/proc/base.c
+--- linux-2.6.39/fs/proc/base.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/proc/base.c 2011-05-22 21:50:17.000000000 -0400
@@ -104,6 +104,22 @@ struct pid_entry {
union proc_op op;
};
#define NOD(NAME, MODE, IOP, FOP, OP) { \
.name = (NAME), \
.len = sizeof(NAME) - 1, \
-@@ -203,6 +219,9 @@ static int check_mem_permission(struct t
+@@ -206,6 +222,9 @@ static struct mm_struct *__check_mem_per
if (task == current)
- return 0;
+ return mm;
+ if (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))
-+ return -EPERM;
++ return ERR_PTR(-EPERM);
+
/*
* If current is actively ptrace'ing, and would also be
* permitted to freshly attach with ptrace now, permit it.
-@@ -250,6 +269,9 @@ static int proc_pid_cmdline(struct task_
+@@ -279,6 +298,9 @@ static int proc_pid_cmdline(struct task_
if (!mm->arg_end)
goto out_mm; /* Shh! No looking before we're done */
len = mm->arg_end - mm->arg_start;
if (len > PAGE_SIZE)
-@@ -277,12 +299,28 @@ out:
+@@ -306,12 +328,28 @@ out:
return res;
}
+
static int proc_pid_auxv(struct task_struct *task, char *buffer)
{
- int res = 0;
- struct mm_struct *mm = get_task_mm(task);
- if (mm) {
+ struct mm_struct *mm = mm_for_maps(task);
+ int res = PTR_ERR(mm);
+ if (mm && !IS_ERR(mm)) {
unsigned int nwords = 0;
+
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
do {
nwords += 2;
} while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
-@@ -296,7 +334,7 @@ static int proc_pid_auxv(struct task_str
+@@ -325,7 +363,7 @@ static int proc_pid_auxv(struct task_str
}
/*
* Provides a wchan file via kallsyms in a proper one-value-per-file format.
* Returns the resolved symbol. If that fails, simply return the address.
-@@ -318,7 +356,7 @@ static int proc_pid_wchan(struct task_st
+@@ -364,7 +402,7 @@ static void unlock_trace(struct task_str
+ mutex_unlock(&task->signal->cred_guard_mutex);
}
- #endif /* CONFIG_KALLSYMS */
-#ifdef CONFIG_STACKTRACE
+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
#define MAX_STACK_TRACE_DEPTH 64
-@@ -503,7 +541,7 @@ static int proc_pid_limits(struct task_s
+@@ -555,7 +593,7 @@ static int proc_pid_limits(struct task_s
return count;
}
static int proc_pid_syscall(struct task_struct *task, char *buffer)
{
long nr;
-@@ -528,7 +566,7 @@ static int proc_pid_syscall(struct task_
+@@ -584,7 +622,7 @@ static int proc_pid_syscall(struct task_
/************************************************************************/
/* permission checks */
{
struct task_struct *task;
int allowed = 0;
-@@ -538,7 +576,10 @@ static int proc_fd_access_allowed(struct
+@@ -594,7 +632,10 @@ static int proc_fd_access_allowed(struct
*/
task = get_proc_task(inode);
if (task) {
put_task_struct(task);
}
return allowed;
-@@ -917,6 +958,9 @@ static ssize_t environ_read(struct file
+@@ -973,6 +1014,9 @@ static ssize_t environ_read(struct file
if (!task)
goto out_no_task;
+ if (gr_acl_handle_procpidmem(task))
+ goto out;
+
- if (!ptrace_may_access(task, PTRACE_MODE_READ))
- goto out;
-
-@@ -1606,7 +1650,7 @@ static void *proc_pid_follow_link(struct
+ ret = -ENOMEM;
+ page = (char *)__get_free_page(GFP_TEMPORARY);
+ if (!page)
+@@ -1660,7 +1704,7 @@ static void *proc_pid_follow_link(struct
path_put(&nd->path);
/* Are we allowed to snoop on the tasks file descriptors? */
goto out;
error = PROC_I(inode)->op.proc_get_link(inode, &nd->path);
-@@ -1645,8 +1689,18 @@ static int proc_pid_readlink(struct dent
+@@ -1699,8 +1743,18 @@ static int proc_pid_readlink(struct dent
struct path path;
/* Are we allowed to snoop on the tasks file descriptors? */
error = PROC_I(inode)->op.proc_get_link(inode, &path);
if (error)
-@@ -1712,7 +1766,11 @@ static struct inode *proc_pid_make_inode
+@@ -1766,7 +1820,11 @@ static struct inode *proc_pid_make_inode
rcu_read_lock();
cred = __task_cred(task);
inode->i_uid = cred->euid;
rcu_read_unlock();
}
security_task_to_inode(task, inode);
-@@ -1730,6 +1788,9 @@ static int pid_getattr(struct vfsmount *
+@@ -1784,6 +1842,9 @@ static int pid_getattr(struct vfsmount *
struct inode *inode = dentry->d_inode;
struct task_struct *task;
const struct cred *cred;
generic_fillattr(inode, stat);
-@@ -1737,12 +1798,34 @@ static int pid_getattr(struct vfsmount *
+@@ -1791,12 +1852,34 @@ static int pid_getattr(struct vfsmount *
stat->uid = 0;
stat->gid = 0;
task = pid_task(proc_pid(inode), PIDTYPE_PID);
}
}
rcu_read_unlock();
-@@ -1780,11 +1863,20 @@ static int pid_revalidate(struct dentry
+@@ -1834,11 +1917,20 @@ static int pid_revalidate(struct dentry
if (task) {
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
rcu_read_unlock();
} else {
inode->i_uid = 0;
-@@ -1905,7 +1997,8 @@ static int proc_fd_info(struct inode *in
+@@ -1959,7 +2051,8 @@ static int proc_fd_info(struct inode *in
int fd = proc_fd(inode);
if (task) {
put_task_struct(task);
}
if (files) {
-@@ -2165,15 +2258,25 @@ static const struct file_operations proc
+@@ -2219,15 +2312,25 @@ static const struct file_operations proc
*/
static int proc_fd_permission(struct inode *inode, int mask, unsigned int flags)
{
return rv;
}
-@@ -2283,6 +2386,9 @@ static struct dentry *proc_pident_lookup
+@@ -2337,6 +2440,9 @@ static struct dentry *proc_pident_lookup
if (!task)
goto out_no_task;
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2327,6 +2433,9 @@ static int proc_pident_readdir(struct fi
+@@ -2381,6 +2487,9 @@ static int proc_pident_readdir(struct fi
if (!task)
goto out_no_task;
ret = 0;
i = filp->f_pos;
switch (i) {
-@@ -2597,7 +2706,7 @@ static void *proc_self_follow_link(struc
+@@ -2651,7 +2760,7 @@ static void *proc_self_follow_link(struc
static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
void *cookie)
{
if (!IS_ERR(s))
__putname(s);
}
-@@ -2777,7 +2886,7 @@ static const struct pid_entry tgid_base_
+@@ -2835,7 +2944,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),
-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
- INF("syscall", S_IRUSR, proc_pid_syscall),
+ INF("syscall", S_IRUGO, proc_pid_syscall),
#endif
INF("cmdline", S_IRUGO, proc_pid_cmdline),
-@@ -2802,10 +2911,10 @@ static const struct pid_entry tgid_base_
+@@ -2860,10 +2969,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
#endif
-#ifdef CONFIG_STACKTRACE
+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
- ONE("stack", S_IRUSR, proc_pid_stack),
+ ONE("stack", S_IRUGO, proc_pid_stack),
#endif
#ifdef CONFIG_SCHEDSTATS
-@@ -2836,6 +2945,9 @@ static const struct pid_entry tgid_base_
+@@ -2894,6 +3003,9 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_TASK_IO_ACCOUNTING
INF("io", S_IRUGO, proc_tgid_io_accounting),
#endif
};
static int proc_tgid_base_readdir(struct file * filp,
-@@ -2961,7 +3073,14 @@ static struct dentry *proc_pid_instantia
+@@ -3019,7 +3131,14 @@ static struct dentry *proc_pid_instantia
if (!inode)
goto out;
inode->i_op = &proc_tgid_base_inode_operations;
inode->i_fop = &proc_tgid_base_operations;
inode->i_flags|=S_IMMUTABLE;
-@@ -3003,7 +3122,11 @@ struct dentry *proc_pid_lookup(struct in
+@@ -3061,7 +3180,11 @@ struct dentry *proc_pid_lookup(struct in
if (!task)
goto out;
put_task_struct(task);
out:
return result;
-@@ -3068,6 +3191,11 @@ int proc_pid_readdir(struct file * filp,
+@@ -3126,6 +3249,11 @@ int proc_pid_readdir(struct file * filp,
{
unsigned int nr;
struct task_struct *reaper;
struct tgid_iter iter;
struct pid_namespace *ns;
-@@ -3091,8 +3219,27 @@ int proc_pid_readdir(struct file * filp,
+@@ -3149,8 +3277,27 @@ int proc_pid_readdir(struct file * filp,
for (iter = next_tgid(ns, iter);
iter.task;
iter.tgid += 1, iter = next_tgid(ns, iter)) {
put_task_struct(iter.task);
goto out;
}
-@@ -3119,7 +3266,7 @@ static const struct pid_entry tid_base_s
+@@ -3177,7 +3324,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),
-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
- INF("syscall", S_IRUSR, proc_pid_syscall),
+ INF("syscall", S_IRUGO, proc_pid_syscall),
#endif
INF("cmdline", S_IRUGO, proc_pid_cmdline),
-@@ -3143,10 +3290,10 @@ static const struct pid_entry tid_base_s
+@@ -3201,10 +3348,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
#endif
-#ifdef CONFIG_STACKTRACE
+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
- ONE("stack", S_IRUSR, proc_pid_stack),
+ ONE("stack", S_IRUGO, proc_pid_stack),
#endif
#ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-2.6.38.4/fs/proc/cmdline.c linux-2.6.38.4/fs/proc/cmdline.c
---- linux-2.6.38.4/fs/proc/cmdline.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/cmdline.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/proc/cmdline.c linux-2.6.39/fs/proc/cmdline.c
+--- linux-2.6.39/fs/proc/cmdline.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/proc/cmdline.c 2011-05-22 19:41:37.000000000 -0400
@@ -23,7 +23,11 @@ static const struct file_operations cmdl
static int __init proc_cmdline_init(void)
return 0;
}
module_init(proc_cmdline_init);
-diff -urNp linux-2.6.38.4/fs/proc/devices.c linux-2.6.38.4/fs/proc/devices.c
---- linux-2.6.38.4/fs/proc/devices.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/devices.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/proc/devices.c linux-2.6.39/fs/proc/devices.c
+--- linux-2.6.39/fs/proc/devices.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/proc/devices.c 2011-05-22 19:41:37.000000000 -0400
@@ -64,7 +64,11 @@ static const struct file_operations proc
static int __init proc_devices_init(void)
return 0;
}
module_init(proc_devices_init);
-diff -urNp linux-2.6.38.4/fs/proc/inode.c linux-2.6.38.4/fs/proc/inode.c
---- linux-2.6.38.4/fs/proc/inode.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/inode.c 2011-04-28 19:34:15.000000000 -0400
-@@ -435,7 +435,11 @@ struct inode *proc_get_inode(struct supe
+diff -urNp linux-2.6.39/fs/proc/inode.c linux-2.6.39/fs/proc/inode.c
+--- linux-2.6.39/fs/proc/inode.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/proc/inode.c 2011-05-22 19:41:37.000000000 -0400
+@@ -433,7 +433,11 @@ struct inode *proc_get_inode(struct supe
if (de->mode) {
inode->i_mode = de->mode;
inode->i_uid = de->uid;
}
if (de->size)
inode->i_size = de->size;
-diff -urNp linux-2.6.38.4/fs/proc/internal.h linux-2.6.38.4/fs/proc/internal.h
---- linux-2.6.38.4/fs/proc/internal.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/internal.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/proc/internal.h linux-2.6.39/fs/proc/internal.h
+--- linux-2.6.39/fs/proc/internal.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/proc/internal.h 2011-05-22 19:41:37.000000000 -0400
@@ -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,
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.38.4/fs/proc/Kconfig linux-2.6.38.4/fs/proc/Kconfig
---- linux-2.6.38.4/fs/proc/Kconfig 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/Kconfig 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/proc/Kconfig linux-2.6.39/fs/proc/Kconfig
+--- linux-2.6.39/fs/proc/Kconfig 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/proc/Kconfig 2011-05-22 19:41:37.000000000 -0400
@@ -30,12 +30,12 @@ config PROC_FS
config PROC_KCORE
bool "Enable /proc page monitoring" if EXPERT
help
Various /proc files exist to monitor process memory utilization:
-diff -urNp linux-2.6.38.4/fs/proc/kcore.c linux-2.6.38.4/fs/proc/kcore.c
---- linux-2.6.38.4/fs/proc/kcore.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/kcore.c 2011-04-28 19:34:15.000000000 -0400
-@@ -478,9 +478,10 @@ read_kcore(struct file *file, char __use
+diff -urNp linux-2.6.39/fs/proc/kcore.c linux-2.6.39/fs/proc/kcore.c
+--- linux-2.6.39/fs/proc/kcore.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/proc/kcore.c 2011-05-22 19:41:37.000000000 -0400
+@@ -321,6 +321,8 @@ static void elf_kcore_store_hdr(char *bu
+ off_t offset = 0;
+ struct kcore_list *m;
+
++ pax_track_stack();
++
+ /* setup ELF header */
+ elf = (struct elfhdr *) bufp;
+ bufp += sizeof(struct elfhdr);
+@@ -478,9 +480,10 @@ read_kcore(struct file *file, char __use
* the addresses in the elf_phdr on our list.
*/
start = kc_offset_to_vaddr(*fpos - elf_buflen);
while (buflen) {
struct kcore_list *m;
-@@ -509,20 +510,23 @@ read_kcore(struct file *file, char __use
+@@ -509,20 +512,23 @@ read_kcore(struct file *file, char __use
kfree(elf_buf);
} else {
if (kern_addr_valid(start)) {
} else {
if (clear_user(buffer, tsz))
return -EFAULT;
-@@ -542,6 +546,9 @@ read_kcore(struct file *file, char __use
+@@ -542,6 +548,9 @@ read_kcore(struct file *file, char __use
static int open_kcore(struct inode *inode, struct file *filp)
{
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
if (kcore_need_update)
-diff -urNp linux-2.6.38.4/fs/proc/meminfo.c linux-2.6.38.4/fs/proc/meminfo.c
---- linux-2.6.38.4/fs/proc/meminfo.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/meminfo.c 2011-04-28 19:34:15.000000000 -0400
-@@ -157,7 +157,7 @@ static int meminfo_proc_show(struct seq_
+diff -urNp linux-2.6.39/fs/proc/meminfo.c linux-2.6.39/fs/proc/meminfo.c
+--- linux-2.6.39/fs/proc/meminfo.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/proc/meminfo.c 2011-05-22 19:36:32.000000000 -0400
+@@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_
+ unsigned long pages[NR_LRU_LISTS];
+ int lru;
+
++ pax_track_stack();
++
+ /*
+ * display in kilobytes.
+ */
+@@ -157,7 +159,7 @@ static int meminfo_proc_show(struct seq_
vmi.used >> 10,
vmi.largest_chunk >> 10
#ifdef CONFIG_MEMORY_FAILURE
#endif
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
-diff -urNp linux-2.6.38.4/fs/proc/nommu.c linux-2.6.38.4/fs/proc/nommu.c
---- linux-2.6.38.4/fs/proc/nommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/nommu.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/proc/nommu.c linux-2.6.39/fs/proc/nommu.c
+--- linux-2.6.39/fs/proc/nommu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/proc/nommu.c 2011-05-22 19:36:32.000000000 -0400
@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_
if (len < 1)
len = 1;
}
seq_putc(m, '\n');
-diff -urNp linux-2.6.38.4/fs/proc/proc_net.c linux-2.6.38.4/fs/proc/proc_net.c
---- linux-2.6.38.4/fs/proc/proc_net.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/proc_net.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/proc/proc_net.c linux-2.6.39/fs/proc/proc_net.c
+--- linux-2.6.39/fs/proc/proc_net.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/proc/proc_net.c 2011-05-22 19:41:37.000000000 -0400
@@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str
struct task_struct *task;
struct nsproxy *ns;
rcu_read_lock();
task = pid_task(proc_pid(dir), PIDTYPE_PID);
-diff -urNp linux-2.6.38.4/fs/proc/proc_sysctl.c linux-2.6.38.4/fs/proc/proc_sysctl.c
---- linux-2.6.38.4/fs/proc/proc_sysctl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/proc_sysctl.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/proc/proc_sysctl.c linux-2.6.39/fs/proc/proc_sysctl.c
+--- linux-2.6.39/fs/proc/proc_sysctl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/proc/proc_sysctl.c 2011-05-22 19:41:37.000000000 -0400
@@ -8,6 +8,8 @@
#include <linux/namei.h>
#include "internal.h"
static const struct dentry_operations proc_sys_dentry_operations;
static const struct file_operations proc_sys_file_operations;
static const struct inode_operations proc_sys_inode_operations;
-@@ -112,6 +114,9 @@ static struct dentry *proc_sys_lookup(st
+@@ -111,6 +113,9 @@ static struct dentry *proc_sys_lookup(st
if (!p)
goto out;
err = ERR_PTR(-ENOMEM);
inode = proc_sys_make_inode(dir->i_sb, h ? h : head, p);
if (h)
-@@ -231,6 +236,9 @@ static int scan(struct ctl_table_header
+@@ -230,6 +235,9 @@ static int scan(struct ctl_table_header
if (*pos < file->f_pos)
continue;
res = proc_sys_fill_cache(file, dirent, filldir, head, table);
if (res)
return res;
-@@ -359,6 +367,9 @@ static int proc_sys_getattr(struct vfsmo
+@@ -358,6 +366,9 @@ static int proc_sys_getattr(struct vfsmo
if (IS_ERR(head))
return PTR_ERR(head);
generic_fillattr(inode, stat);
if (table)
stat->mode = (stat->mode & S_IFMT) | table->mode;
-diff -urNp linux-2.6.38.4/fs/proc/root.c linux-2.6.38.4/fs/proc/root.c
---- linux-2.6.38.4/fs/proc/root.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/root.c 2011-04-28 19:34:15.000000000 -0400
-@@ -132,7 +132,15 @@ void __init proc_root_init(void)
+diff -urNp linux-2.6.39/fs/proc/root.c linux-2.6.39/fs/proc/root.c
+--- linux-2.6.39/fs/proc/root.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/proc/root.c 2011-05-22 19:41:37.000000000 -0400
+@@ -122,7 +122,15 @@ void __init proc_root_init(void)
#ifdef CONFIG_PROC_DEVICETREE
proc_device_tree_init();
#endif
proc_sys_init();
}
-diff -urNp linux-2.6.38.4/fs/proc/task_mmu.c linux-2.6.38.4/fs/proc/task_mmu.c
---- linux-2.6.38.4/fs/proc/task_mmu.c 2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/task_mmu.c 2011-04-28 19:34:15.000000000 -0400
-@@ -49,8 +49,13 @@ void task_mem(struct seq_file *m, struct
+diff -urNp linux-2.6.39/fs/proc/task_mmu.c linux-2.6.39/fs/proc/task_mmu.c
+--- linux-2.6.39/fs/proc/task_mmu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/proc/task_mmu.c 2011-05-22 22:43:29.000000000 -0400
+@@ -51,8 +51,13 @@ void task_mem(struct seq_file *m, struct
"VmExe:\t%8lu kB\n"
"VmLib:\t%8lu kB\n"
"VmPTE:\t%8lu kB\n"
(total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
mm->locked_vm << (PAGE_SHIFT-10),
hiwater_rss << (PAGE_SHIFT-10),
-@@ -58,7 +63,13 @@ void task_mem(struct seq_file *m, struct
+@@ -60,7 +65,13 @@ void task_mem(struct seq_file *m, struct
data << (PAGE_SHIFT-10),
mm->stack_vm << (PAGE_SHIFT-10), text, lib,
(PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
}
unsigned long task_vsize(struct mm_struct *mm)
-@@ -180,7 +191,8 @@ static void m_stop(struct seq_file *m, v
- struct proc_maps_private *priv = m->private;
- struct vm_area_struct *vma = v;
-
-- vma_stop(priv, vma);
-+ if (!IS_ERR(vma))
-+ vma_stop(priv, vma);
- if (priv->task)
- put_task_struct(priv->task);
- }
-@@ -204,6 +216,12 @@ static int do_maps_open(struct inode *in
+@@ -207,6 +218,12 @@ static int do_maps_open(struct inode *in
return ret;
}
static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
{
struct mm_struct *mm = vma->vm_mm;
-@@ -211,7 +229,6 @@ static void show_map_vma(struct seq_file
- int flags = vma->vm_flags;
- unsigned long ino = 0;
- unsigned long long pgoff = 0;
-- unsigned long start;
- dev_t dev = 0;
- int len;
-
-@@ -222,20 +239,23 @@ static void show_map_vma(struct seq_file
+@@ -225,13 +242,13 @@ static void show_map_vma(struct seq_file
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
}
- /* We don't show the stack guard page in /proc/maps */
-- start = vma->vm_start;
-- if (vma->vm_flags & VM_GROWSDOWN)
-- if (!vma_stack_continue(vma->vm_prev, vma->vm_start))
-- start += PAGE_SIZE;
--
- seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
-- start,
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
-+ PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start,
-+ PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end,
++ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
++ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
+#else
-+ vma->vm_start,
- vma->vm_end,
+ start = vma->vm_start;
+- if (stack_guard_page_start(vma, start))
+- start += PAGE_SIZE;
+ end = vma->vm_end;
+- if (stack_guard_page_end(vma, end))
+- end -= PAGE_SIZE;
+#endif
- flags & VM_READ ? 'r' : '-',
+
+ seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
+ start,
+@@ -240,7 +257,11 @@ static void show_map_vma(struct seq_file
flags & VM_WRITE ? 'w' : '-',
flags & VM_EXEC ? 'x' : '-',
flags & VM_MAYSHARE ? 's' : 'p',
MAJOR(dev), MINOR(dev), ino, &len);
/*
-@@ -244,16 +264,16 @@ static void show_map_vma(struct seq_file
+@@ -249,7 +270,7 @@ static void show_map_vma(struct seq_file
*/
if (file) {
pad_len_spaces(m, len);
} else {
const char *name = arch_vma_name(vma);
if (!name) {
- if (mm) {
-- if (vma->vm_start <= mm->brk &&
-- vma->vm_end >= mm->start_brk) {
-+ if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
+@@ -257,8 +278,9 @@ static void show_map_vma(struct seq_file
+ if (vma->vm_start <= mm->brk &&
+ vma->vm_end >= mm->start_brk) {
name = "[heap]";
- } else if (vma->vm_start <= mm->start_stack &&
- vma->vm_end >= mm->start_stack) {
name = "[stack]";
}
} else {
-@@ -399,11 +419,16 @@ static int show_smap(struct seq_file *m,
+@@ -433,11 +455,16 @@ static int show_smap(struct seq_file *m,
};
memset(&mss, 0, sizeof mss);
show_map_vma(m, vma);
seq_printf(m,
-@@ -420,7 +445,11 @@ static int show_smap(struct seq_file *m,
+@@ -455,7 +482,11 @@ static int show_smap(struct seq_file *m,
"KernelPageSize: %8lu kB\n"
"MMUPageSize: %8lu kB\n"
"Locked: %8lu kB\n",
mss.resident >> 10,
(unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
mss.shared_clean >> 10,
-diff -urNp linux-2.6.38.4/fs/proc/task_nommu.c linux-2.6.38.4/fs/proc/task_nommu.c
---- linux-2.6.38.4/fs/proc/task_nommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/task_nommu.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/proc/task_nommu.c linux-2.6.39/fs/proc/task_nommu.c
+--- linux-2.6.39/fs/proc/task_nommu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/proc/task_nommu.c 2011-05-22 19:36:32.000000000 -0400
@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct
else
bytes += kobjsize(mm);
} else if (mm) {
if (vma->vm_start <= mm->start_stack &&
vma->vm_end >= mm->start_stack) {
-diff -urNp linux-2.6.38.4/fs/quota/netlink.c linux-2.6.38.4/fs/quota/netlink.c
---- linux-2.6.38.4/fs/quota/netlink.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/quota/netlink.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/fs/quota/netlink.c linux-2.6.39/fs/quota/netlink.c
+--- linux-2.6.39/fs/quota/netlink.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/quota/netlink.c 2011-05-22 19:36:32.000000000 -0400
@@ -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)
"a_genl_family, 0, QUOTA_NL_C_WARNING);
if (!msg_head) {
printk(KERN_ERR
-diff -urNp linux-2.6.38.4/fs/readdir.c linux-2.6.38.4/fs/readdir.c
---- linux-2.6.38.4/fs/readdir.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/readdir.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/readdir.c linux-2.6.39/fs/readdir.c
+--- linux-2.6.39/fs/readdir.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/readdir.c 2011-05-22 19:41:42.000000000 -0400
@@ -17,6 +17,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
buf.count = count;
buf.error = 0;
-diff -urNp linux-2.6.38.4/fs/reiserfs/do_balan.c linux-2.6.38.4/fs/reiserfs/do_balan.c
---- linux-2.6.38.4/fs/reiserfs/do_balan.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/reiserfs/do_balan.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/reiserfs/dir.c linux-2.6.39/fs/reiserfs/dir.c
+--- linux-2.6.39/fs/reiserfs/dir.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/reiserfs/dir.c 2011-05-22 19:36:32.000000000 -0400
+@@ -66,6 +66,8 @@ int reiserfs_readdir_dentry(struct dentr
+ struct reiserfs_dir_entry de;
+ int ret = 0;
+
++ pax_track_stack();
++
+ reiserfs_write_lock(inode->i_sb);
+
+ reiserfs_check_lock_depth(inode->i_sb, "readdir");
+diff -urNp linux-2.6.39/fs/reiserfs/do_balan.c linux-2.6.39/fs/reiserfs/do_balan.c
+--- linux-2.6.39/fs/reiserfs/do_balan.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/reiserfs/do_balan.c 2011-05-22 19:36:32.000000000 -0400
@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb,
return;
}
do_balance_starts(tb);
/* balance leaf returns 0 except if combining L R and S into
-diff -urNp linux-2.6.38.4/fs/reiserfs/item_ops.c linux-2.6.38.4/fs/reiserfs/item_ops.c
---- linux-2.6.38.4/fs/reiserfs/item_ops.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/reiserfs/item_ops.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/reiserfs/item_ops.c linux-2.6.39/fs/reiserfs/item_ops.c
+--- linux-2.6.39/fs/reiserfs/item_ops.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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);
}
&stat_data_ops,
&indirect_ops,
&direct_ops,
-diff -urNp linux-2.6.38.4/fs/reiserfs/procfs.c linux-2.6.38.4/fs/reiserfs/procfs.c
---- linux-2.6.38.4/fs/reiserfs/procfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/reiserfs/procfs.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/reiserfs/journal.c linux-2.6.39/fs/reiserfs/journal.c
+--- linux-2.6.39/fs/reiserfs/journal.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/reiserfs/journal.c 2011-05-22 19:36:32.000000000 -0400
+@@ -2299,6 +2299,8 @@ static struct buffer_head *reiserfs_brea
+ struct buffer_head *bh;
+ int i, j;
+
++ pax_track_stack();
++
+ bh = __getblk(dev, block, bufsize);
+ if (buffer_uptodate(bh))
+ return (bh);
+diff -urNp linux-2.6.39/fs/reiserfs/namei.c linux-2.6.39/fs/reiserfs/namei.c
+--- linux-2.6.39/fs/reiserfs/namei.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/reiserfs/namei.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1225,6 +1225,8 @@ static int reiserfs_rename(struct inode
+ unsigned long savelink = 1;
+ struct timespec ctime;
+
++ pax_track_stack();
++
+ /* three balancings: (1) old name removal, (2) new name insertion
+ and (3) maybe "save" link insertion
+ stat data updates: (1) old directory,
+diff -urNp linux-2.6.39/fs/reiserfs/procfs.c linux-2.6.39/fs/reiserfs/procfs.c
+--- linux-2.6.39/fs/reiserfs/procfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/reiserfs/procfs.c 2011-05-22 19:36:32.000000000 -0400
@@ -113,7 +113,7 @@ static int show_super(struct seq_file *m
"SMALL_TAILS " : "NO_TAILS ",
replay_only(sb) ? "REPLAY_ONLY " : "",
SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
SF(s_do_balance), SF(s_unneeded_left_neighbor),
SF(s_good_search_by_key_reada), SF(s_bmaps),
-diff -urNp linux-2.6.38.4/fs/select.c linux-2.6.38.4/fs/select.c
---- linux-2.6.38.4/fs/select.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/select.c 2011-04-28 19:34:15.000000000 -0400
+@@ -299,6 +299,8 @@ static int show_journal(struct seq_file
+ struct journal_params *jp = &rs->s_v1.s_journal;
+ char b[BDEVNAME_SIZE];
+
++ pax_track_stack();
++
+ seq_printf(m, /* on-disk fields */
+ "jp_journal_1st_block: \t%i\n"
+ "jp_journal_dev: \t%s[%x]\n"
+diff -urNp linux-2.6.39/fs/reiserfs/stree.c linux-2.6.39/fs/reiserfs/stree.c
+--- linux-2.6.39/fs/reiserfs/stree.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/reiserfs/stree.c 2011-05-22 19:36:32.000000000 -0400
+@@ -1196,6 +1196,8 @@ int reiserfs_delete_item(struct reiserfs
+ int iter = 0;
+ #endif
+
++ pax_track_stack();
++
+ BUG_ON(!th->t_trans_id);
+
+ init_tb_struct(th, &s_del_balance, sb, path,
+@@ -1333,6 +1335,8 @@ void reiserfs_delete_solid_item(struct r
+ int retval;
+ int quota_cut_bytes = 0;
+
++ pax_track_stack();
++
+ BUG_ON(!th->t_trans_id);
+
+ le_key2cpu_key(&cpu_key, key);
+@@ -1562,6 +1566,8 @@ int reiserfs_cut_from_item(struct reiser
+ int quota_cut_bytes;
+ loff_t tail_pos = 0;
+
++ pax_track_stack();
++
+ BUG_ON(!th->t_trans_id);
+
+ init_tb_struct(th, &s_cut_balance, inode->i_sb, path,
+@@ -1957,6 +1963,8 @@ int reiserfs_paste_into_item(struct reis
+ int retval;
+ int fs_gen;
+
++ pax_track_stack();
++
+ BUG_ON(!th->t_trans_id);
+
+ fs_gen = get_generation(inode->i_sb);
+@@ -2045,6 +2053,8 @@ int reiserfs_insert_item(struct reiserfs
+ int fs_gen = 0;
+ int quota_bytes = 0;
+
++ pax_track_stack();
++
+ BUG_ON(!th->t_trans_id);
+
+ if (inode) { /* Do we count quotas for item? */
+diff -urNp linux-2.6.39/fs/reiserfs/super.c linux-2.6.39/fs/reiserfs/super.c
+--- linux-2.6.39/fs/reiserfs/super.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/reiserfs/super.c 2011-05-22 19:36:32.000000000 -0400
+@@ -927,6 +927,8 @@ static int reiserfs_parse_options(struct
+ {.option_name = NULL}
+ };
+
++ pax_track_stack();
++
+ *blocks = 0;
+ if (!options || !*options)
+ /* use default configuration: create tails, journaling on, no
+diff -urNp linux-2.6.39/fs/select.c linux-2.6.39/fs/select.c
+--- linux-2.6.39/fs/select.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/select.c 2011-05-22 19:41:42.000000000 -0400
@@ -20,6 +20,7 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/personality.h> /* for STICKY_TIMEOUTS */
#include <linux/file.h>
#include <linux/fdtable.h>
-@@ -840,6 +841,7 @@ int do_sys_poll(struct pollfd __user *uf
+@@ -403,6 +404,8 @@ int do_select(int n, fd_set_bits *fds, s
+ int retval, i, timed_out = 0;
+ unsigned long slack = 0;
+
++ pax_track_stack();
++
+ rcu_read_lock();
+ retval = max_select_fd(n, fds);
+ rcu_read_unlock();
+@@ -528,6 +531,8 @@ int core_sys_select(int n, fd_set __user
+ /* Allocate small arguments on the stack to save memory and be faster */
+ long stack_fds[SELECT_STACK_ALLOC/sizeof(long)];
+
++ pax_track_stack();
++
+ ret = -EINVAL;
+ if (n < 0)
+ goto out_nofds;
+@@ -837,6 +842,9 @@ int do_sys_poll(struct pollfd __user *uf
struct poll_list *walk = head;
unsigned long todo = nfds;
++ pax_track_stack();
++
+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
if (nfds > rlimit(RLIMIT_NOFILE))
return -EINVAL;
-diff -urNp linux-2.6.38.4/fs/seq_file.c linux-2.6.38.4/fs/seq_file.c
---- linux-2.6.38.4/fs/seq_file.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/seq_file.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/seq_file.c linux-2.6.39/fs/seq_file.c
+--- linux-2.6.39/fs/seq_file.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/seq_file.c 2011-05-22 19:36:32.000000000 -0400
@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
return 0;
}
if (!m->buf)
goto Enomem;
m->count = 0;
-diff -urNp linux-2.6.38.4/fs/splice.c linux-2.6.38.4/fs/splice.c
---- linux-2.6.38.4/fs/splice.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/splice.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/splice.c linux-2.6.39/fs/splice.c
+--- linux-2.6.39/fs/splice.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/splice.c 2011-05-22 19:36:32.000000000 -0400
@@ -186,7 +186,7 @@ ssize_t splice_to_pipe(struct pipe_inode
pipe_lock(pipe);
}
pipe_unlock(pipe);
-@@ -556,7 +556,7 @@ static ssize_t kernel_readv(struct file
+@@ -316,6 +316,8 @@ __generic_file_splice_read(struct file *
+ .spd_release = spd_release_page,
+ };
+
++ pax_track_stack();
++
+ if (splice_grow_spd(pipe, &spd))
+ return -ENOMEM;
+
+@@ -556,7 +558,7 @@ static ssize_t kernel_readv(struct file
old_fs = get_fs();
set_fs(get_ds());
/* The cast to a user pointer is valid due to the set_fs() */
set_fs(old_fs);
return res;
-@@ -571,7 +571,7 @@ static ssize_t kernel_write(struct file
+@@ -571,7 +573,7 @@ static ssize_t kernel_write(struct file
old_fs = get_fs();
set_fs(get_ds());
/* The cast to a user pointer is valid due to the set_fs() */
set_fs(old_fs);
return res;
-@@ -622,7 +622,7 @@ ssize_t default_file_splice_read(struct
+@@ -599,6 +601,8 @@ ssize_t default_file_splice_read(struct
+ .spd_release = spd_release_page,
+ };
+
++ pax_track_stack();
++
+ if (splice_grow_spd(pipe, &spd))
+ return -ENOMEM;
+
+@@ -622,7 +626,7 @@ ssize_t default_file_splice_read(struct
goto err;
this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
vec[i].iov_len = this_len;
spd.pages[i] = page;
spd.nr_pages++;
-@@ -842,10 +842,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
+@@ -842,10 +846,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
{
while (!pipe->nrbufs) {
return 0;
if (sd->flags & SPLICE_F_NONBLOCK)
-@@ -1178,7 +1178,7 @@ ssize_t splice_direct_to_actor(struct fi
+@@ -1178,7 +1182,7 @@ ssize_t splice_direct_to_actor(struct fi
* out of the pipe right after the splice_to_pipe(). So set
* PIPE_READERS appropriately.
*/
current->splice_pipe = pipe;
}
-@@ -1730,9 +1730,9 @@ static int ipipe_prep(struct pipe_inode_
+@@ -1615,6 +1619,8 @@ static long vmsplice_to_pipe(struct file
+ };
+ long ret;
+
++ pax_track_stack();
++
+ pipe = get_pipe_info(file);
+ if (!pipe)
+ return -EBADF;
+@@ -1730,9 +1736,9 @@ static int ipipe_prep(struct pipe_inode_
ret = -ERESTARTSYS;
break;
}
if (flags & SPLICE_F_NONBLOCK) {
ret = -EAGAIN;
break;
-@@ -1764,7 +1764,7 @@ static int opipe_prep(struct pipe_inode_
+@@ -1764,7 +1770,7 @@ static int opipe_prep(struct pipe_inode_
pipe_lock(pipe);
while (pipe->nrbufs >= pipe->buffers) {
send_sig(SIGPIPE, current, 0);
ret = -EPIPE;
break;
-@@ -1777,9 +1777,9 @@ static int opipe_prep(struct pipe_inode_
+@@ -1777,9 +1783,9 @@ static int opipe_prep(struct pipe_inode_
ret = -ERESTARTSYS;
break;
}
}
pipe_unlock(pipe);
-@@ -1815,14 +1815,14 @@ retry:
+@@ -1815,14 +1821,14 @@ retry:
pipe_double_lock(ipipe, opipe);
do {
break;
/*
-@@ -1922,7 +1922,7 @@ static int link_pipe(struct pipe_inode_i
+@@ -1922,7 +1928,7 @@ static int link_pipe(struct pipe_inode_i
pipe_double_lock(ipipe, opipe);
do {
send_sig(SIGPIPE, current, 0);
if (!ret)
ret = -EPIPE;
-@@ -1967,7 +1967,7 @@ static int link_pipe(struct pipe_inode_i
+@@ -1967,7 +1973,7 @@ static int link_pipe(struct pipe_inode_i
* return EAGAIN if we have the potential of some data in the
* future, otherwise just return 0
*/
ret = -EAGAIN;
pipe_unlock(ipipe);
-diff -urNp linux-2.6.38.4/fs/sysfs/file.c linux-2.6.38.4/fs/sysfs/file.c
---- linux-2.6.38.4/fs/sysfs/file.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/sysfs/file.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/fs/sysfs/file.c linux-2.6.39/fs/sysfs/file.c
+--- linux-2.6.39/fs/sysfs/file.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/sysfs/file.c 2011-05-22 19:36:32.000000000 -0400
@@ -44,7 +44,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent
struct sysfs_open_dirent {
wake_up_interruptible(&od->poll);
}
-diff -urNp linux-2.6.38.4/fs/sysfs/mount.c linux-2.6.38.4/fs/sysfs/mount.c
---- linux-2.6.38.4/fs/sysfs/mount.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/sysfs/mount.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/sysfs/mount.c linux-2.6.39/fs/sysfs/mount.c
+--- linux-2.6.39/fs/sysfs/mount.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/sysfs/mount.c 2011-05-22 19:41:42.000000000 -0400
@@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = {
.s_name = "",
.s_count = ATOMIC_INIT(1),
.s_ino = 1,
};
-diff -urNp linux-2.6.38.4/fs/sysfs/symlink.c linux-2.6.38.4/fs/sysfs/symlink.c
---- linux-2.6.38.4/fs/sysfs/symlink.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/sysfs/symlink.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/sysfs/symlink.c linux-2.6.39/fs/sysfs/symlink.c
+--- linux-2.6.39/fs/sysfs/symlink.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/sysfs/symlink.c 2011-05-22 19:36:32.000000000 -0400
@@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de
static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
if (!IS_ERR(page))
free_page((unsigned long)page);
}
-diff -urNp linux-2.6.38.4/fs/udf/misc.c linux-2.6.38.4/fs/udf/misc.c
---- linux-2.6.38.4/fs/udf/misc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/udf/misc.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/udf/inode.c linux-2.6.39/fs/udf/inode.c
+--- linux-2.6.39/fs/udf/inode.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/udf/inode.c 2011-05-22 19:36:32.000000000 -0400
+@@ -560,6 +560,8 @@ static struct buffer_head *inode_getblk(
+ int goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
+ int lastblock = 0;
+
++ pax_track_stack();
++
+ 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/fs/udf/misc.c linux-2.6.39/fs/udf/misc.c
+--- linux-2.6.39/fs/udf/misc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/udf/misc.c 2011-05-22 19:36:32.000000000 -0400
@@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id
u8 udf_tag_checksum(const struct tag *t)
u8 checksum = 0;
int i;
for (i = 0; i < sizeof(struct tag); ++i)
-diff -urNp linux-2.6.38.4/fs/utimes.c linux-2.6.38.4/fs/utimes.c
---- linux-2.6.38.4/fs/utimes.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/utimes.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/utimes.c linux-2.6.39/fs/utimes.c
+--- linux-2.6.39/fs/utimes.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/utimes.c 2011-05-22 19:41:42.000000000 -0400
@@ -1,6 +1,7 @@
#include <linux/compiler.h>
#include <linux/file.h>
mutex_lock(&inode->i_mutex);
error = notify_change(path->dentry, &newattrs);
mutex_unlock(&inode->i_mutex);
-diff -urNp linux-2.6.38.4/fs/xattr_acl.c linux-2.6.38.4/fs/xattr_acl.c
---- linux-2.6.38.4/fs/xattr_acl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/xattr_acl.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/xattr_acl.c linux-2.6.39/fs/xattr_acl.c
+--- linux-2.6.39/fs/xattr_acl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/xattr_acl.c 2011-05-22 19:36:32.000000000 -0400
@@ -17,8 +17,8 @@
struct posix_acl *
posix_acl_from_xattr(const void *value, size_t size)
int count;
struct posix_acl *acl;
struct posix_acl_entry *acl_e;
-diff -urNp linux-2.6.38.4/fs/xattr.c linux-2.6.38.4/fs/xattr.c
---- linux-2.6.38.4/fs/xattr.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/xattr.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/xattr.c linux-2.6.39/fs/xattr.c
+--- linux-2.6.39/fs/xattr.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/xattr.c 2011-05-22 19:41:42.000000000 -0400
@@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
* Extended attribute SET operations
*/
mnt_drop_write(f->f_path.mnt);
}
fput(f);
-diff -urNp linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl32.c
---- linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.39/fs/xfs/linux-2.6/xfs_ioctl32.c
+--- linux-2.6.39/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-05-22 19:41:42.000000000 -0400
@@ -73,6 +73,7 @@ xfs_compat_ioc_fsgeometry_v1(
xfs_fsop_geom_t fsgeo;
int error;
error = xfs_fs_geometry(mp, &fsgeo, 3);
if (error)
return -error;
-diff -urNp linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.39/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-2.6.39/fs/xfs/linux-2.6/xfs_ioctl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/xfs/linux-2.6/xfs_ioctl.c 2011-05-22 19:36:32.000000000 -0400
@@ -128,7 +128,7 @@ xfs_find_handle(
}
copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
goto out_put;
-diff -urNp linux-2.6.38.4/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.38.4/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.38.4/fs/xfs/linux-2.6/xfs_iops.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/xfs/linux-2.6/xfs_iops.c 2011-04-28 19:34:15.000000000 -0400
-@@ -436,7 +436,7 @@ xfs_vn_put_link(
+diff -urNp linux-2.6.39/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.39/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.39/fs/xfs/linux-2.6/xfs_iops.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/xfs/linux-2.6/xfs_iops.c 2011-05-22 19:36:32.000000000 -0400
+@@ -437,7 +437,7 @@ xfs_vn_put_link(
struct nameidata *nd,
void *p)
{
if (!IS_ERR(s))
kfree(s);
-diff -urNp linux-2.6.38.4/fs/xfs/xfs_bmap.c linux-2.6.38.4/fs/xfs/xfs_bmap.c
---- linux-2.6.38.4/fs/xfs/xfs_bmap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/xfs/xfs_bmap.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/xfs/xfs_bmap.c linux-2.6.39/fs/xfs/xfs_bmap.c
+--- linux-2.6.39/fs/xfs/xfs_bmap.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/xfs/xfs_bmap.c 2011-05-22 19:36:32.000000000 -0400
@@ -287,7 +287,7 @@ xfs_bmap_validate_ret(
int nmap,
int ret_nmap);
#endif /* DEBUG */
STATIC int
-diff -urNp linux-2.6.38.4/fs/xfs/xfs_dir2_sf.c linux-2.6.38.4/fs/xfs/xfs_dir2_sf.c
---- linux-2.6.38.4/fs/xfs/xfs_dir2_sf.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/xfs/xfs_dir2_sf.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/fs/xfs/xfs_dir2.c linux-2.6.39/fs/xfs/xfs_dir2.c
+--- linux-2.6.39/fs/xfs/xfs_dir2.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/xfs/xfs_dir2.c 2011-05-22 19:36:32.000000000 -0400
+@@ -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/fs/xfs/xfs_dir2_sf.c linux-2.6.39/fs/xfs/xfs_dir2_sf.c
+--- linux-2.6.39/fs/xfs/xfs_dir2_sf.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/fs/xfs/xfs_dir2_sf.c 2011-05-22 19:36:32.000000000 -0400
@@ -780,7 +780,15 @@ xfs_dir2_sf_getdents(
}
off & 0x7fffffff, ino, DT_UNKNOWN)) {
*offset = off & 0x7fffffff;
return 0;
-diff -urNp linux-2.6.38.4/grsecurity/gracl_alloc.c linux-2.6.38.4/grsecurity/gracl_alloc.c
---- linux-2.6.38.4/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/gracl_alloc.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/gracl_alloc.c linux-2.6.39/grsecurity/gracl_alloc.c
+--- linux-2.6.39/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/gracl_alloc.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,105 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
+ else
+ return 1;
+}
-diff -urNp linux-2.6.38.4/grsecurity/gracl.c linux-2.6.38.4/grsecurity/gracl.c
---- linux-2.6.38.4/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/gracl.c 2011-04-28 19:34:15.000000000 -0400
-@@ -0,0 +1,4074 @@
+diff -urNp linux-2.6.39/grsecurity/gracl.c linux-2.6.39/grsecurity/gracl.c
+--- linux-2.6.39/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/gracl.c 2011-05-22 22:47:25.000000000 -0400
+@@ -0,0 +1,4097 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
+#include <linux/mount.h>
+#include <linux/tty.h>
+#include <linux/proc_fs.h>
-+#include <linux/smp_lock.h>
+#include <linux/lglock.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+ return;
+}
+
++extern int __gr_process_user_ban(struct user_struct *user);
++
+int
+gr_check_user_change(int real, int effective, int fs)
+{
+ int effectiveok = 0;
+ int fsok = 0;
+
++#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
++ struct user_struct *user;
++
++ if (real == -1)
++ goto skipit;
++
++ user = find_user(real);
++ if (user == NULL)
++ goto skipit;
++
++ if (__gr_process_user_ban(user)) {
++ /* for find_user */
++ free_uid(user);
++ return 1;
++ }
++
++ /* for find_user */
++ free_uid(user);
++
++skipit:
++#endif
++
+ if (unlikely(!(gr_status & GR_READY)))
+ return 0;
+
+EXPORT_SYMBOL(gr_check_group_change);
+#endif
+
-diff -urNp linux-2.6.38.4/grsecurity/gracl_cap.c linux-2.6.38.4/grsecurity/gracl_cap.c
---- linux-2.6.38.4/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/gracl_cap.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/gracl_cap.c linux-2.6.39/grsecurity/gracl_cap.c
+--- linux-2.6.39/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/gracl_cap.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,139 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+ return 0;
+}
+
-diff -urNp linux-2.6.38.4/grsecurity/gracl_fs.c linux-2.6.38.4/grsecurity/gracl_fs.c
---- linux-2.6.38.4/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/gracl_fs.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/gracl_fs.c linux-2.6.39/grsecurity/gracl_fs.c
+--- linux-2.6.39/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/gracl_fs.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,431 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+
+ return 0;
+}
-diff -urNp linux-2.6.38.4/grsecurity/gracl_ip.c linux-2.6.38.4/grsecurity/gracl_ip.c
---- linux-2.6.38.4/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/gracl_ip.c 2011-04-28 19:34:15.000000000 -0400
-@@ -0,0 +1,382 @@
+diff -urNp linux-2.6.39/grsecurity/gracl_ip.c linux-2.6.39/grsecurity/gracl_ip.c
+--- linux-2.6.39/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/gracl_ip.c 2011-05-22 22:47:31.000000000 -0400
+@@ -0,0 +1,381 @@
+#include <linux/kernel.h>
+#include <asm/uaccess.h>
+#include <asm/errno.h>
+#include <linux/skbuff.h>
+#include <linux/ip.h>
+#include <linux/udp.h>
-+#include <linux/smp_lock.h>
+#include <linux/types.h>
+#include <linux/sched.h>
+#include <linux/netdevice.h>
+
+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
+}
-diff -urNp linux-2.6.38.4/grsecurity/gracl_learn.c linux-2.6.38.4/grsecurity/gracl_learn.c
---- linux-2.6.38.4/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/gracl_learn.c 2011-04-28 19:34:15.000000000 -0400
-@@ -0,0 +1,211 @@
+diff -urNp linux-2.6.39/grsecurity/gracl_learn.c linux-2.6.39/grsecurity/gracl_learn.c
+--- linux-2.6.39/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/gracl_learn.c 2011-05-22 22:47:45.000000000 -0400
+@@ -0,0 +1,210 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/sched.h>
+#include <linux/poll.h>
-+#include <linux/smp_lock.h>
+#include <linux/string.h>
+#include <linux/file.h>
+#include <linux/types.h>
+ .release = close_learn,
+ .poll = poll_learn,
+};
-diff -urNp linux-2.6.38.4/grsecurity/gracl_res.c linux-2.6.38.4/grsecurity/gracl_res.c
---- linux-2.6.38.4/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/gracl_res.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/gracl_res.c linux-2.6.39/grsecurity/gracl_res.c
+--- linux-2.6.39/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/gracl_res.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,68 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+ rcu_read_unlock();
+ return;
+}
-diff -urNp linux-2.6.38.4/grsecurity/gracl_segv.c linux-2.6.38.4/grsecurity/gracl_segv.c
---- linux-2.6.38.4/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/gracl_segv.c 2011-04-28 19:34:15.000000000 -0400
-@@ -0,0 +1,300 @@
+diff -urNp linux-2.6.39/grsecurity/gracl_segv.c linux-2.6.39/grsecurity/gracl_segv.c
+--- linux-2.6.39/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/gracl_segv.c 2011-05-22 22:47:39.000000000 -0400
+@@ -0,0 +1,299 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <asm/uaccess.h>
+#include <linux/fs.h>
+#include <linux/net.h>
+#include <linux/in.h>
-+#include <linux/smp_lock.h>
+#include <linux/slab.h>
+#include <linux/types.h>
+#include <linux/sched.h>
+
+ return;
+}
-diff -urNp linux-2.6.38.4/grsecurity/gracl_shm.c linux-2.6.38.4/grsecurity/gracl_shm.c
---- linux-2.6.38.4/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/gracl_shm.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/gracl_shm.c linux-2.6.39/grsecurity/gracl_shm.c
+--- linux-2.6.39/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/gracl_shm.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,40 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
+
+ return 1;
+}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_chdir.c linux-2.6.38.4/grsecurity/grsec_chdir.c
---- linux-2.6.38.4/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_chdir.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/grsec_chdir.c linux-2.6.39/grsecurity/grsec_chdir.c
+--- linux-2.6.39/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/grsec_chdir.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,19 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return;
+}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_chroot.c linux-2.6.38.4/grsecurity/grsec_chroot.c
---- linux-2.6.38.4/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_chroot.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/grsec_chroot.c linux-2.6.39/grsecurity/grsec_chroot.c
+--- linux-2.6.39/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/grsec_chroot.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,355 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#ifdef CONFIG_SECURITY
+EXPORT_SYMBOL(gr_handle_chroot_caps);
+#endif
-diff -urNp linux-2.6.38.4/grsecurity/grsec_disabled.c linux-2.6.38.4/grsecurity/grsec_disabled.c
---- linux-2.6.38.4/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_disabled.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/grsec_disabled.c linux-2.6.39/grsecurity/grsec_disabled.c
+--- linux-2.6.39/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/grsec_disabled.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,447 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+EXPORT_SYMBOL(gr_check_user_change);
+EXPORT_SYMBOL(gr_check_group_change);
+#endif
-diff -urNp linux-2.6.38.4/grsecurity/grsec_exec.c linux-2.6.38.4/grsecurity/grsec_exec.c
---- linux-2.6.38.4/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_exec.c 2011-04-28 19:34:15.000000000 -0400
-@@ -0,0 +1,147 @@
+diff -urNp linux-2.6.39/grsecurity/grsec_exec.c linux-2.6.39/grsecurity/grsec_exec.c
+--- linux-2.6.39/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/grsec_exec.c 2011-05-22 22:41:29.000000000 -0400
+@@ -0,0 +1,146 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/file.h>
+#include <linux/binfmts.h>
-+#include <linux/smp_lock.h>
+#include <linux/fs.h>
+#include <linux/types.h>
+#include <linux/grdefs.h>
+ return;
+}
+#endif
-diff -urNp linux-2.6.38.4/grsecurity/grsec_fifo.c linux-2.6.38.4/grsecurity/grsec_fifo.c
---- linux-2.6.38.4/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_fifo.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/grsec_fifo.c linux-2.6.39/grsecurity/grsec_fifo.c
+--- linux-2.6.39/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/grsec_fifo.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,24 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_fork.c linux-2.6.38.4/grsecurity/grsec_fork.c
---- linux-2.6.38.4/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_fork.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/grsec_fork.c linux-2.6.39/grsecurity/grsec_fork.c
+--- linux-2.6.39/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/grsec_fork.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,23 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return;
+}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_init.c linux-2.6.38.4/grsecurity/grsec_init.c
---- linux-2.6.38.4/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_init.c 2011-04-28 19:34:15.000000000 -0400
-@@ -0,0 +1,270 @@
+diff -urNp linux-2.6.39/grsecurity/grsec_init.c linux-2.6.39/grsecurity/grsec_init.c
+--- linux-2.6.39/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/grsec_init.c 2011-05-22 22:47:15.000000000 -0400
+@@ -0,0 +1,269 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/mm.h>
-+#include <linux/smp_lock.h>
+#include <linux/gracl.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+
+ return;
+}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_link.c linux-2.6.38.4/grsecurity/grsec_link.c
---- linux-2.6.38.4/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_link.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/grsec_link.c linux-2.6.39/grsecurity/grsec_link.c
+--- linux-2.6.39/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/grsec_link.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,43 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_log.c linux-2.6.38.4/grsecurity/grsec_log.c
---- linux-2.6.38.4/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_log.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/grsec_log.c linux-2.6.39/grsecurity/grsec_log.c
+--- linux-2.6.39/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/grsec_log.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,310 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+{
+ int logtype;
+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
-+ char *str1, *str2, *str3;
-+ void *voidptr;
-+ int num1, num2;
-+ unsigned long ulong1, ulong2;
-+ struct dentry *dentry;
-+ struct vfsmount *mnt;
-+ struct file *file;
-+ struct task_struct *task;
++ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
++ void *voidptr = NULL;
++ int num1 = 0, num2 = 0;
++ unsigned long ulong1 = 0, ulong2 = 0;
++ struct dentry *dentry = NULL;
++ struct vfsmount *mnt = NULL;
++ struct file *file = NULL;
++ struct task_struct *task = NULL;
+ const struct cred *cred, *pcred;
+ va_list ap;
+
+ gr_log_end(audit);
+ END_LOCKS(audit);
+}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_mem.c linux-2.6.38.4/grsecurity/grsec_mem.c
---- linux-2.6.38.4/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_mem.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/grsec_mem.c linux-2.6.39/grsecurity/grsec_mem.c
+--- linux-2.6.39/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/grsec_mem.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,33 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
+ return;
+}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_mount.c linux-2.6.38.4/grsecurity/grsec_mount.c
---- linux-2.6.38.4/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_mount.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/grsec_mount.c linux-2.6.39/grsecurity/grsec_mount.c
+--- linux-2.6.39/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/grsec_mount.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,62 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_pax.c linux-2.6.38.4/grsecurity/grsec_pax.c
---- linux-2.6.38.4/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_pax.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/grsec_pax.c linux-2.6.39/grsecurity/grsec_pax.c
+--- linux-2.6.39/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/grsec_pax.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,36 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return;
+}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_ptrace.c linux-2.6.38.4/grsecurity/grsec_ptrace.c
---- linux-2.6.38.4/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_ptrace.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/grsec_ptrace.c linux-2.6.39/grsecurity/grsec_ptrace.c
+--- linux-2.6.39/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/grsec_ptrace.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,14 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return;
+}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_sig.c linux-2.6.38.4/grsecurity/grsec_sig.c
---- linux-2.6.38.4/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_sig.c 2011-04-28 19:34:15.000000000 -0400
-@@ -0,0 +1,197 @@
+diff -urNp linux-2.6.39/grsecurity/grsec_sig.c linux-2.6.39/grsecurity/grsec_sig.c
+--- linux-2.6.39/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/grsec_sig.c 2011-05-22 19:41:42.000000000 -0400
+@@ -0,0 +1,203 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/delay.h>
+#endif
+}
+
-+int gr_process_user_ban(void)
++int __gr_process_user_ban(struct user_struct *user)
+{
+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
-+ if (unlikely(current->cred->user->banned)) {
-+ struct user_struct *user = current->cred->user;
++ if (unlikely(user->banned)) {
+ if (user->ban_expires != ~0UL && time_after_eq(get_seconds(), user->ban_expires)) {
+ user->banned = 0;
+ user->ban_expires = 0;
+ }
+#endif
+ return 0;
++}
+
++int gr_process_user_ban(void)
++{
++#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
++ return __gr_process_user_ban(current->cred->user);
++#endif
++ return 0;
+}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_sock.c linux-2.6.38.4/grsecurity/grsec_sock.c
---- linux-2.6.38.4/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_sock.c 2011-04-28 19:34:15.000000000 -0400
-@@ -0,0 +1,275 @@
+diff -urNp linux-2.6.39/grsecurity/grsec_sock.c linux-2.6.39/grsecurity/grsec_sock.c
+--- linux-2.6.39/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/grsec_sock.c 2011-05-22 20:29:21.000000000 -0400
+@@ -0,0 +1,244 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
+#include <linux/grinternal.h>
+#include <linux/gracl.h>
+
-+kernel_cap_t gr_cap_rtnetlink(struct sock *sock);
-+EXPORT_SYMBOL(gr_cap_rtnetlink);
-+
+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
+
+#endif
+ return 0;
+}
-+
-+kernel_cap_t
-+gr_cap_rtnetlink(struct sock *sock)
-+{
-+#ifdef CONFIG_GRKERNSEC
-+ if (!gr_acl_is_enabled())
-+ return current_cap();
-+ else if (sock->sk_protocol == NETLINK_ISCSI &&
-+ cap_raised(current_cap(), CAP_SYS_ADMIN) &&
-+ gr_is_capable(CAP_SYS_ADMIN))
-+ return current_cap();
-+ else if (sock->sk_protocol == NETLINK_AUDIT &&
-+ cap_raised(current_cap(), CAP_AUDIT_WRITE) &&
-+ gr_is_capable(CAP_AUDIT_WRITE) &&
-+ cap_raised(current_cap(), CAP_AUDIT_CONTROL) &&
-+ gr_is_capable(CAP_AUDIT_CONTROL))
-+ return current_cap();
-+ else if (cap_raised(current_cap(), CAP_NET_ADMIN) &&
-+ ((sock->sk_protocol == NETLINK_ROUTE) ?
-+ gr_is_capable_nolog(CAP_NET_ADMIN) :
-+ gr_is_capable(CAP_NET_ADMIN)))
-+ return current_cap();
-+ else
-+ return __cap_empty_set;
-+#else
-+ return current_cap();
-+#endif
-+}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_sysctl.c linux-2.6.38.4/grsecurity/grsec_sysctl.c
---- linux-2.6.38.4/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_sysctl.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/grsec_sysctl.c linux-2.6.39/grsecurity/grsec_sysctl.c
+--- linux-2.6.39/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/grsec_sysctl.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,433 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+ { }
+};
+#endif
-diff -urNp linux-2.6.38.4/grsecurity/grsec_time.c linux-2.6.38.4/grsecurity/grsec_time.c
---- linux-2.6.38.4/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_time.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/grsec_time.c linux-2.6.39/grsecurity/grsec_time.c
+--- linux-2.6.39/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/grsec_time.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,16 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+}
+
+EXPORT_SYMBOL(gr_log_timechange);
-diff -urNp linux-2.6.38.4/grsecurity/grsec_tpe.c linux-2.6.38.4/grsecurity/grsec_tpe.c
---- linux-2.6.38.4/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_tpe.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/grsec_tpe.c linux-2.6.39/grsecurity/grsec_tpe.c
+--- linux-2.6.39/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/grsec_tpe.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,39 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return 1;
+}
-diff -urNp linux-2.6.38.4/grsecurity/grsum.c linux-2.6.38.4/grsecurity/grsum.c
---- linux-2.6.38.4/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsum.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/grsum.c linux-2.6.39/grsecurity/grsum.c
+--- linux-2.6.39/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/grsum.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,61 @@
+#include <linux/err.h>
+#include <linux/kernel.h>
+
+ return retval;
+}
-diff -urNp linux-2.6.38.4/grsecurity/Kconfig linux-2.6.38.4/grsecurity/Kconfig
---- linux-2.6.38.4/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/Kconfig 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/Kconfig linux-2.6.39/grsecurity/Kconfig
+--- linux-2.6.39/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/Kconfig 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,1045 @@
+#
+# grecurity configuration
+endmenu
+
+endmenu
-diff -urNp linux-2.6.38.4/grsecurity/Makefile linux-2.6.38.4/grsecurity/Makefile
---- linux-2.6.38.4/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/Makefile 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/grsecurity/Makefile linux-2.6.39/grsecurity/Makefile
+--- linux-2.6.39/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/grsecurity/Makefile 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,29 @@
+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
+# during 2001-2009 it has been completely redesigned by Brad Spengler
+ @-chmod -f 700 .
+ @echo ' grsec: protected kernel image paths'
+endif
-diff -urNp linux-2.6.38.4/include/acpi/acpi_drivers.h linux-2.6.38.4/include/acpi/acpi_drivers.h
---- linux-2.6.38.4/include/acpi/acpi_drivers.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/acpi/acpi_drivers.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/acpi/acpi_drivers.h linux-2.6.39/include/acpi/acpi_drivers.h
+--- linux-2.6.39/include/acpi/acpi_drivers.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
-------------------------------------------------------------------------- */
void *context)
{
return -ENODEV;
-diff -urNp linux-2.6.38.4/include/asm-generic/atomic-long.h linux-2.6.38.4/include/asm-generic/atomic-long.h
---- linux-2.6.38.4/include/asm-generic/atomic-long.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/atomic-long.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/include/acpi/processor.h linux-2.6.39/include/acpi/processor.h
+--- linux-2.6.39/include/acpi/processor.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/acpi/processor.h 2011-05-22 19:36:32.000000000 -0400
+@@ -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/include/asm-generic/atomic-long.h linux-2.6.39/include/asm-generic/atomic-long.h
+--- linux-2.6.39/include/asm-generic/atomic-long.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/asm-generic/atomic-long.h 2011-05-22 19:36:32.000000000 -0400
@@ -22,6 +22,12 @@
typedef atomic64_t atomic_long_t;
+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
+#define atomic_inc_unchecked(v) atomic_inc(v)
-+#define atomic_inc_and_test_unchecked(v) atomic_inc(v)
++#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
+#define atomic_dec_unchecked(v) atomic_dec(v)
+#endif
+
#endif /* _ASM_GENERIC_ATOMIC_LONG_H */
-diff -urNp linux-2.6.38.4/include/asm-generic/cache.h linux-2.6.38.4/include/asm-generic/cache.h
---- linux-2.6.38.4/include/asm-generic/cache.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/cache.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/include/asm-generic/cache.h linux-2.6.39/include/asm-generic/cache.h
+--- linux-2.6.39/include/asm-generic/cache.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/asm-generic/cache.h 2011-05-22 19:36:32.000000000 -0400
@@ -6,7 +6,7 @@
* cache lines need to provide their own cache.h.
*/
+#define L1_CACHE_BYTES (1U << L1_CACHE_SHIFT)
#endif /* __ASM_GENERIC_CACHE_H */
-diff -urNp linux-2.6.38.4/include/asm-generic/dma-mapping-common.h linux-2.6.38.4/include/asm-generic/dma-mapping-common.h
---- linux-2.6.38.4/include/asm-generic/dma-mapping-common.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/dma-mapping-common.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/asm-generic/dma-mapping-common.h linux-2.6.39/include/asm-generic/dma-mapping-common.h
+--- linux-2.6.39/include/asm-generic/dma-mapping-common.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/asm-generic/dma-mapping-common.h 2011-05-22 19:36:32.000000000 -0400
@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
enum dma_data_direction dir,
struct dma_attrs *attrs)
BUG_ON(!valid_dma_direction(dir));
if (ops->sync_sg_for_device)
-diff -urNp linux-2.6.38.4/include/asm-generic/futex.h linux-2.6.38.4/include/asm-generic/futex.h
---- linux-2.6.38.4/include/asm-generic/futex.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/futex.h 2011-04-28 19:34:15.000000000 -0400
-@@ -6,7 +6,7 @@
- #include <asm/errno.h>
-
- static inline int
--futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
-+futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
- {
- int op = (encoded_op >> 28) & 7;
- int cmp = (encoded_op >> 24) & 15;
-@@ -48,7 +48,7 @@ futex_atomic_op_inuser (int encoded_op,
- }
-
- static inline int
--futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
-+futex_atomic_cmpxchg_inatomic(u32 __user *uaddr, int oldval, int newval)
- {
- return -ENOSYS;
- }
-diff -urNp linux-2.6.38.4/include/asm-generic/int-l64.h linux-2.6.38.4/include/asm-generic/int-l64.h
---- linux-2.6.38.4/include/asm-generic/int-l64.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/int-l64.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/asm-generic/int-l64.h linux-2.6.39/include/asm-generic/int-l64.h
+--- linux-2.6.39/include/asm-generic/int-l64.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/asm-generic/int-l64.h 2011-05-22 19:36:32.000000000 -0400
@@ -46,6 +46,8 @@ typedef unsigned int u32;
typedef signed long s64;
typedef unsigned long u64;
#define S8_C(x) x
#define U8_C(x) x ## U
#define S16_C(x) x
-diff -urNp linux-2.6.38.4/include/asm-generic/int-ll64.h linux-2.6.38.4/include/asm-generic/int-ll64.h
---- linux-2.6.38.4/include/asm-generic/int-ll64.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/int-ll64.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/asm-generic/int-ll64.h linux-2.6.39/include/asm-generic/int-ll64.h
+--- linux-2.6.39/include/asm-generic/int-ll64.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/asm-generic/int-ll64.h 2011-05-22 19:36:32.000000000 -0400
@@ -51,6 +51,8 @@ typedef unsigned int u32;
typedef signed long long s64;
typedef unsigned long long u64;
#define S8_C(x) x
#define U8_C(x) x ## U
#define S16_C(x) x
-diff -urNp linux-2.6.38.4/include/asm-generic/kmap_types.h linux-2.6.38.4/include/asm-generic/kmap_types.h
---- linux-2.6.38.4/include/asm-generic/kmap_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/kmap_types.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/asm-generic/kmap_types.h linux-2.6.39/include/asm-generic/kmap_types.h
+--- linux-2.6.39/include/asm-generic/kmap_types.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/asm-generic/kmap_types.h 2011-05-22 19:36:32.000000000 -0400
@@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE,
KMAP_D(17) KM_NMI,
KMAP_D(18) KM_NMI_PTE,
};
#undef KMAP_D
-diff -urNp linux-2.6.38.4/include/asm-generic/pgtable.h linux-2.6.38.4/include/asm-generic/pgtable.h
---- linux-2.6.38.4/include/asm-generic/pgtable.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/pgtable.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/asm-generic/pgtable.h linux-2.6.39/include/asm-generic/pgtable.h
+--- linux-2.6.39/include/asm-generic/pgtable.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/asm-generic/pgtable.h 2011-05-22 19:36:32.000000000 -0400
@@ -447,6 +447,14 @@ static inline int pmd_write(pmd_t pmd)
#endif /* __HAVE_ARCH_PMD_WRITE */
#endif
#endif /* !__ASSEMBLY__ */
#endif /* _ASM_GENERIC_PGTABLE_H */
-diff -urNp linux-2.6.38.4/include/asm-generic/pgtable-nopmd.h linux-2.6.38.4/include/asm-generic/pgtable-nopmd.h
---- linux-2.6.38.4/include/asm-generic/pgtable-nopmd.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/pgtable-nopmd.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/asm-generic/pgtable-nopmd.h linux-2.6.39/include/asm-generic/pgtable-nopmd.h
+--- linux-2.6.39/include/asm-generic/pgtable-nopmd.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/asm-generic/pgtable-nopmd.h 2011-05-22 19:36:32.000000000 -0400
@@ -1,14 +1,19 @@
#ifndef _PGTABLE_NOPMD_H
#define _PGTABLE_NOPMD_H
/*
* 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.38.4/include/asm-generic/pgtable-nopud.h linux-2.6.38.4/include/asm-generic/pgtable-nopud.h
---- linux-2.6.38.4/include/asm-generic/pgtable-nopud.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/pgtable-nopud.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/asm-generic/pgtable-nopud.h linux-2.6.39/include/asm-generic/pgtable-nopud.h
+--- linux-2.6.39/include/asm-generic/pgtable-nopud.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/asm-generic/pgtable-nopud.h 2011-05-22 19:36:32.000000000 -0400
@@ -1,10 +1,15 @@
#ifndef _PGTABLE_NOPUD_H
#define _PGTABLE_NOPUD_H
/*
* 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.38.4/include/asm-generic/vmlinux.lds.h linux-2.6.38.4/include/asm-generic/vmlinux.lds.h
---- linux-2.6.38.4/include/asm-generic/vmlinux.lds.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/vmlinux.lds.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/asm-generic/vmlinux.lds.h linux-2.6.39/include/asm-generic/vmlinux.lds.h
+--- linux-2.6.39/include/asm-generic/vmlinux.lds.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/asm-generic/vmlinux.lds.h 2011-05-22 19:36:32.000000000 -0400
@@ -213,6 +213,7 @@
.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start_rodata) = .; \
*(__vermagic) /* Kernel version magic */ \
. = ALIGN(8); \
VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
-@@ -696,14 +697,15 @@
+@@ -707,14 +708,15 @@
* section in the linker script will go there too. @phdr should have
* a leading colon.
*
* If there is no need to put the percpu section at a predetermined
* address, use PERCPU().
*/
- #define PERCPU_VADDR(vaddr, phdr) \
+ #define PERCPU_VADDR(cacheline, vaddr, phdr) \
- VMLINUX_SYMBOL(__per_cpu_load) = .; \
- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
+ per_cpu_load = .; \
VMLINUX_SYMBOL(__per_cpu_start) = .; \
*(.data..percpu..first) \
. = ALIGN(PAGE_SIZE); \
-@@ -713,7 +715,7 @@
+@@ -726,7 +728,7 @@
*(.data..percpu..shared_aligned) \
VMLINUX_SYMBOL(__per_cpu_end) = .; \
} phdr \
/**
* PERCPU - define output section for percpu area, simple version
-diff -urNp linux-2.6.38.4/include/drm/drmP.h linux-2.6.38.4/include/drm/drmP.h
---- linux-2.6.38.4/include/drm/drmP.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/drm/drmP.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/drm/drmP.h linux-2.6.39/include/drm/drmP.h
+--- linux-2.6.39/include/drm/drmP.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/drm/drmP.h 2011-05-22 19:41:42.000000000 -0400
@@ -73,6 +73,7 @@
#include <linux/workqueue.h>
#include <linux/poll.h>
#include "drm.h"
#include <linux/idr.h>
-@@ -881,7 +882,7 @@ struct drm_driver {
- void (*vgaarb_irq)(struct drm_device *dev, bool state);
+@@ -908,7 +909,7 @@ struct drm_driver {
+ uint32_t handle);
/* Driver private ops for this object */
- struct vm_operations_struct *gem_vm_ops;
int major;
int minor;
-@@ -894,7 +895,7 @@ struct drm_driver {
- int dev_priv_size;
- struct drm_ioctl_desc *ioctls;
- int num_ioctls;
-- struct file_operations fops;
-+ const struct file_operations fops;
- struct pci_driver pci_driver;
- struct platform_device *platform_device;
- /* List of devices hanging off this driver */
-@@ -991,7 +992,7 @@ struct drm_device {
+@@ -1023,7 +1024,7 @@ struct drm_device {
/** \name Usage Counters */
/*@{ */
atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
atomic_t vma_count; /**< Outstanding vma areas open */
int buf_use; /**< Buffers in use -- cannot alloc */
-@@ -1002,7 +1003,7 @@ struct drm_device {
+@@ -1034,7 +1035,7 @@ struct drm_device {
/*@{ */
unsigned long counters;
enum drm_stat_type types[15];
/*@} */
struct list_head filelist;
-@@ -1101,7 +1102,7 @@ struct drm_device {
- struct platform_device *platformdev; /**< Platform device struture */
-
- struct drm_sg_mem *sg; /**< Scatter gather memory */
-- unsigned int num_crtcs; /**< Number of CRTCs on this device */
-+ unsigned int num_crtcs; /**< Number of CRTCs on this device */
- void *dev_private; /**< device private data */
- void *mm_private;
- struct address_space *dev_mapping;
-diff -urNp linux-2.6.38.4/include/linux/a.out.h linux-2.6.38.4/include/linux/a.out.h
---- linux-2.6.38.4/include/linux/a.out.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/a.out.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/a.out.h linux-2.6.39/include/linux/a.out.h
+--- linux-2.6.39/include/linux/a.out.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/a.out.h 2011-05-22 19:36:32.000000000 -0400
@@ -39,6 +39,14 @@ enum machine_type {
M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
};
#if !defined (N_MAGIC)
#define N_MAGIC(exec) ((exec).a_info & 0xffff)
#endif
-diff -urNp linux-2.6.38.4/include/linux/atmdev.h linux-2.6.38.4/include/linux/atmdev.h
---- linux-2.6.38.4/include/linux/atmdev.h 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/include/linux/atmdev.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/atmdev.h linux-2.6.39/include/linux/atmdev.h
+--- linux-2.6.39/include/linux/atmdev.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/atmdev.h 2011-05-22 19:36:32.000000000 -0400
@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
#endif
__AAL_STAT_ITEMS
#undef __HANDLE_ITEM
};
-diff -urNp linux-2.6.38.4/include/linux/binfmts.h linux-2.6.38.4/include/linux/binfmts.h
---- linux-2.6.38.4/include/linux/binfmts.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/binfmts.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/binfmts.h linux-2.6.39/include/linux/binfmts.h
+--- linux-2.6.39/include/linux/binfmts.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/binfmts.h 2011-05-22 19:36:32.000000000 -0400
@@ -92,6 +92,7 @@ struct linux_binfmt {
int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
int (*load_shlib)(struct file *);
unsigned long min_coredump; /* minimal dump size */
};
-diff -urNp linux-2.6.38.4/include/linux/blkdev.h linux-2.6.38.4/include/linux/blkdev.h
---- linux-2.6.38.4/include/linux/blkdev.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/blkdev.h 2011-04-28 19:34:15.000000000 -0400
-@@ -1247,22 +1247,22 @@ queue_max_integrity_segments(struct requ
+diff -urNp linux-2.6.39/include/linux/blkdev.h linux-2.6.39/include/linux/blkdev.h
+--- linux-2.6.39/include/linux/blkdev.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/blkdev.h 2011-05-22 19:36:32.000000000 -0400
+@@ -1281,22 +1281,22 @@ queue_max_integrity_segments(struct requ
#endif /* CONFIG_BLK_DEV_INTEGRITY */
struct block_device_operations {
};
extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
-diff -urNp linux-2.6.38.4/include/linux/blktrace_api.h linux-2.6.38.4/include/linux/blktrace_api.h
---- linux-2.6.38.4/include/linux/blktrace_api.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/blktrace_api.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/blktrace_api.h linux-2.6.39/include/linux/blktrace_api.h
+--- linux-2.6.39/include/linux/blktrace_api.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/blktrace_api.h 2011-05-22 19:36:32.000000000 -0400
@@ -161,7 +161,7 @@ struct blk_trace {
struct dentry *dir;
struct dentry *dropped_file;
};
extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
-diff -urNp linux-2.6.38.4/include/linux/byteorder/little_endian.h linux-2.6.38.4/include/linux/byteorder/little_endian.h
---- linux-2.6.38.4/include/linux/byteorder/little_endian.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/byteorder/little_endian.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/byteorder/little_endian.h linux-2.6.39/include/linux/byteorder/little_endian.h
+--- linux-2.6.39/include/linux/byteorder/little_endian.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/byteorder/little_endian.h 2011-05-22 19:36:32.000000000 -0400
@@ -42,51 +42,51 @@
static inline __le64 __cpu_to_le64p(const __u64 *p)
}
#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.38.4/include/linux/cache.h linux-2.6.38.4/include/linux/cache.h
---- linux-2.6.38.4/include/linux/cache.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/cache.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/cache.h linux-2.6.39/include/linux/cache.h
+--- linux-2.6.39/include/linux/cache.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/cache.h 2011-05-22 19:36:32.000000000 -0400
@@ -16,6 +16,10 @@
#define __read_mostly
#endif
#ifndef ____cacheline_aligned
#define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
#endif
-diff -urNp linux-2.6.38.4/include/linux/capability.h linux-2.6.38.4/include/linux/capability.h
---- linux-2.6.38.4/include/linux/capability.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/capability.h 2011-04-28 19:34:15.000000000 -0400
-@@ -561,6 +561,7 @@ extern const kernel_cap_t __cap_init_eff
- (security_real_capable_noaudit((t), (cap)) == 0)
-
- extern int capable(int cap);
-+int capable_nolog(int cap);
+diff -urNp linux-2.6.39/include/linux/capability.h linux-2.6.39/include/linux/capability.h
+--- linux-2.6.39/include/linux/capability.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/capability.h 2011-05-22 21:02:47.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);
+ extern bool nsown_capable(int cap);
++extern bool task_ns_capable_nolog(struct task_struct *t, int cap);
++extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
++extern bool capable_nolog(int cap);
/* audit system wants to get cap info from files as well */
- struct dentry;
-diff -urNp linux-2.6.38.4/include/linux/compiler-gcc4.h linux-2.6.38.4/include/linux/compiler-gcc4.h
---- linux-2.6.38.4/include/linux/compiler-gcc4.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/compiler-gcc4.h 2011-04-28 19:34:15.000000000 -0400
-@@ -54,6 +54,10 @@
+ extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
+diff -urNp linux-2.6.39/include/linux/compiler-gcc4.h linux-2.6.39/include/linux/compiler-gcc4.h
+--- linux-2.6.39/include/linux/compiler-gcc4.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/compiler-gcc4.h 2011-05-22 19:36:32.000000000 -0400
+@@ -46,6 +46,11 @@
+ #define __noclone __attribute__((__noclone__))
#endif
-
++
+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
+#define __bos0(ptr) __bos((ptr), 0)
#endif
#if __GNUC_MINOR__ > 0
-diff -urNp linux-2.6.38.4/include/linux/compiler.h linux-2.6.38.4/include/linux/compiler.h
---- linux-2.6.38.4/include/linux/compiler.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/compiler.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/compiler.h linux-2.6.39/include/linux/compiler.h
+--- linux-2.6.39/include/linux/compiler.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/compiler.h 2011-05-22 19:36:32.000000000 -0400
@@ -273,6 +273,22 @@ void ftrace_likely_update(struct ftrace_
#define __cold
#endif
+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
#endif /* __LINUX_COMPILER_H */
-diff -urNp linux-2.6.38.4/include/linux/cpuset.h linux-2.6.38.4/include/linux/cpuset.h
---- linux-2.6.38.4/include/linux/cpuset.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/cpuset.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/concap.h linux-2.6.39/include/linux/concap.h
+--- linux-2.6.39/include/linux/concap.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/include/linux/configfs.h linux-2.6.39/include/linux/configfs.h
+--- linux-2.6.39/include/linux/configfs.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/configfs.h 2011-05-22 19:36:32.000000000 -0400
+@@ -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/include/linux/cpuset.h linux-2.6.39/include/linux/cpuset.h
+--- linux-2.6.39/include/linux/cpuset.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/cpuset.h 2011-05-22 19:36:32.000000000 -0400
@@ -118,7 +118,7 @@ static inline void put_mems_allowed(void
* nodemask.
*/
}
static inline void set_mems_allowed(nodemask_t nodemask)
-diff -urNp linux-2.6.38.4/include/linux/decompress/mm.h linux-2.6.38.4/include/linux/decompress/mm.h
---- linux-2.6.38.4/include/linux/decompress/mm.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/decompress/mm.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/dca.h linux-2.6.39/include/linux/dca.h
+--- linux-2.6.39/include/linux/dca.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/dca.h 2011-05-22 19:36:32.000000000 -0400
+@@ -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/include/linux/decompress/mm.h linux-2.6.39/include/linux/decompress/mm.h
+--- linux-2.6.39/include/linux/decompress/mm.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/decompress/mm.h 2011-05-22 19:36:33.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 */
#define free(a) kfree(a)
#define large_malloc(a) vmalloc(a)
-diff -urNp linux-2.6.38.4/include/linux/dma-mapping.h linux-2.6.38.4/include/linux/dma-mapping.h
---- linux-2.6.38.4/include/linux/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/dma-mapping.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/dma-mapping.h linux-2.6.39/include/linux/dma-mapping.h
+--- linux-2.6.39/include/linux/dma-mapping.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/dma-mapping.h 2011-05-22 19:36:33.000000000 -0400
@@ -16,40 +16,40 @@ enum dma_data_direction {
};
};
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-diff -urNp linux-2.6.38.4/include/linux/elf.h linux-2.6.38.4/include/linux/elf.h
---- linux-2.6.38.4/include/linux/elf.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/elf.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/elf.h linux-2.6.39/include/linux/elf.h
+--- linux-2.6.39/include/linux/elf.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/elf.h 2011-05-22 19:36:33.000000000 -0400
@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
#define PT_GNU_EH_FRAME 0x6474e550
#endif
-diff -urNp linux-2.6.38.4/include/linux/fscache-cache.h linux-2.6.38.4/include/linux/fscache-cache.h
---- linux-2.6.38.4/include/linux/fscache-cache.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/fscache-cache.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/enclosure.h linux-2.6.39/include/linux/enclosure.h
+--- linux-2.6.39/include/linux/enclosure.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/enclosure.h 2011-05-22 19:36:33.000000000 -0400
+@@ -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/include/linux/fscache-cache.h linux-2.6.39/include/linux/fscache-cache.h
+--- linux-2.6.39/include/linux/fscache-cache.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/fscache-cache.h 2011-05-22 19:36:33.000000000 -0400
@@ -113,7 +113,7 @@ struct fscache_operation {
#endif
};
op->processor = processor;
op->release = release;
INIT_LIST_HEAD(&op->pend_link);
-diff -urNp linux-2.6.38.4/include/linux/fs.h linux-2.6.38.4/include/linux/fs.h
---- linux-2.6.38.4/include/linux/fs.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/fs.h 2011-04-28 19:34:15.000000000 -0400
-@@ -105,6 +105,11 @@ struct inodes_stat_t {
+diff -urNp linux-2.6.39/include/linux/fs.h linux-2.6.39/include/linux/fs.h
+--- linux-2.6.39/include/linux/fs.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/fs.h 2011-05-22 19:41:42.000000000 -0400
+@@ -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)
/*
* The below are the various read and write types that we support. Some of
* them include behavioral modifiers that send information down to the
-@@ -581,42 +586,42 @@ typedef int (*read_actor_t)(read_descrip
+@@ -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 *);
-- void (*sync_page)(struct page *);
+ int (* const writepage)(struct page *page, struct writeback_control *wbc);
+ int (* const readpage)(struct file *, struct page *);
-+ void (* const sync_page)(struct page *);
/* Write back some dirty pages from this mapping. */
- int (*writepages)(struct address_space *, struct writeback_control *);
+ int (* const error_remove_page)(struct address_space *, struct page *);
};
- /*
-@@ -1059,17 +1064,17 @@ static inline int file_check_writeable(s
+ 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 {
};
struct lock_manager {
-@@ -1604,29 +1609,29 @@ extern ssize_t vfs_writev(struct file *,
+@@ -1611,31 +1616,31 @@ extern ssize_t vfs_writev(struct file *,
unsigned long, loff_t *);
struct super_operations {
- 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 *);
+ int (* const statfs) (struct dentry *, struct kstatfs *);
+ int (* const remount_fs) (struct super_block *, int *, char *);
+ void (* const umount_begin) (struct super_block *);
-
-- int (*show_options)(struct seq_file *, struct vfsmount *);
-- int (*show_stats)(struct seq_file *, struct vfsmount *);
++
+ 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);
};
/*
-diff -urNp linux-2.6.38.4/include/linux/fs_struct.h linux-2.6.38.4/include/linux/fs_struct.h
---- linux-2.6.38.4/include/linux/fs_struct.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/fs_struct.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/fs_struct.h linux-2.6.39/include/linux/fs_struct.h
+--- linux-2.6.39/include/linux/fs_struct.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/fs_struct.h 2011-05-22 19:36:33.000000000 -0400
@@ -6,7 +6,7 @@
#include <linux/seqlock.h>
spinlock_t lock;
seqcount_t seq;
int umask;
-diff -urNp linux-2.6.38.4/include/linux/genhd.h linux-2.6.38.4/include/linux/genhd.h
---- linux-2.6.38.4/include/linux/genhd.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/genhd.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/ftrace_event.h linux-2.6.39/include/linux/ftrace_event.h
+--- linux-2.6.39/include/linux/ftrace_event.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/ftrace_event.h 2011-05-22 19:36:33.000000000 -0400
+@@ -235,7 +235,7 @@ extern int trace_define_field(struct ftr
+ extern int trace_add_event_call(struct ftrace_event_call *call);
+ extern void trace_remove_event_call(struct ftrace_event_call *call);
+
+-#define is_signed_type(type) (((type)(-1)) < 0)
++#define is_signed_type(type) (((type)(-1)) < (type)1)
+
+ int trace_set_clr_event(const char *system, const char *event, int set);
+
+diff -urNp linux-2.6.39/include/linux/ftrace.h linux-2.6.39/include/linux/ftrace.h
+--- linux-2.6.39/include/linux/ftrace.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/include/linux/genhd.h linux-2.6.39/include/linux/genhd.h
+--- linux-2.6.39/include/linux/genhd.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/genhd.h 2011-05-22 19:36:33.000000000 -0400
@@ -183,7 +183,7 @@ struct gendisk {
struct kobject *slave_dir;
struct disk_events *ev;
#ifdef CONFIG_BLK_DEV_INTEGRITY
struct blk_integrity *integrity;
-diff -urNp linux-2.6.38.4/include/linux/gracl.h linux-2.6.38.4/include/linux/gracl.h
---- linux-2.6.38.4/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/include/linux/gracl.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/gracl.h linux-2.6.39/include/linux/gracl.h
+--- linux-2.6.39/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/include/linux/gracl.h 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,317 @@
+#ifndef GR_ACL_H
+#define GR_ACL_H
+
+#endif
+
-diff -urNp linux-2.6.38.4/include/linux/gralloc.h linux-2.6.38.4/include/linux/gralloc.h
---- linux-2.6.38.4/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/include/linux/gralloc.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/gralloc.h linux-2.6.39/include/linux/gralloc.h
+--- linux-2.6.39/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/include/linux/gralloc.h 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,9 @@
+#ifndef __GRALLOC_H
+#define __GRALLOC_H
+void *acl_alloc_num(unsigned long num, unsigned long len);
+
+#endif
-diff -urNp linux-2.6.38.4/include/linux/grdefs.h linux-2.6.38.4/include/linux/grdefs.h
---- linux-2.6.38.4/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/include/linux/grdefs.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/grdefs.h linux-2.6.39/include/linux/grdefs.h
+--- linux-2.6.39/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/include/linux/grdefs.h 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,139 @@
+#ifndef GRDEFS_H
+#define GRDEFS_H
+};
+
+#endif
-diff -urNp linux-2.6.38.4/include/linux/grinternal.h linux-2.6.38.4/include/linux/grinternal.h
---- linux-2.6.38.4/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/include/linux/grinternal.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/grinternal.h linux-2.6.39/include/linux/grinternal.h
+--- linux-2.6.39/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/include/linux/grinternal.h 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,219 @@
+#ifndef __GRINTERNAL_H
+#define __GRINTERNAL_H
+#endif
+
+#endif
-diff -urNp linux-2.6.38.4/include/linux/grmsg.h linux-2.6.38.4/include/linux/grmsg.h
---- linux-2.6.38.4/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/include/linux/grmsg.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/grmsg.h linux-2.6.39/include/linux/grmsg.h
+--- linux-2.6.39/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/include/linux/grmsg.h 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,108 @@
+#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
+#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/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"
+#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.38.4/include/linux/grsecurity.h linux-2.6.38.4/include/linux/grsecurity.h
---- linux-2.6.38.4/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/include/linux/grsecurity.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/grsecurity.h linux-2.6.39/include/linux/grsecurity.h
+--- linux-2.6.39/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/include/linux/grsecurity.h 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,212 @@
+#ifndef GR_SECURITY_H
+#define GR_SECURITY_H
+#endif
+
+#endif
-diff -urNp linux-2.6.38.4/include/linux/grsock.h linux-2.6.38.4/include/linux/grsock.h
---- linux-2.6.38.4/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/include/linux/grsock.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/grsock.h linux-2.6.39/include/linux/grsock.h
+--- linux-2.6.39/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/include/linux/grsock.h 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,19 @@
+#ifndef __GRSOCK_H
+#define __GRSOCK_H
+ const int protocol);
+
+#endif
-diff -urNp linux-2.6.38.4/include/linux/highmem.h linux-2.6.38.4/include/linux/highmem.h
---- linux-2.6.38.4/include/linux/highmem.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/highmem.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/highmem.h linux-2.6.39/include/linux/highmem.h
+--- linux-2.6.39/include/linux/highmem.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/highmem.h 2011-05-22 19:36:33.000000000 -0400
@@ -185,6 +185,18 @@ static inline void clear_highpage(struct
kunmap_atomic(kaddr, KM_USER0);
}
static inline void zero_user_segments(struct page *page,
unsigned start1, unsigned end1,
unsigned start2, unsigned end2)
-diff -urNp linux-2.6.38.4/include/linux/i2o.h linux-2.6.38.4/include/linux/i2o.h
---- linux-2.6.38.4/include/linux/i2o.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/i2o.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/i2o.h linux-2.6.39/include/linux/i2o.h
+--- linux-2.6.39/include/linux/i2o.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/i2o.h 2011-05-22 19:36:33.000000000 -0400
@@ -564,7 +564,7 @@ struct i2o_controller {
struct i2o_device *exec; /* Executive */
#if BITS_PER_LONG == 64
struct list_head context_list; /* list of context id's
and pointers */
#endif
-diff -urNp linux-2.6.38.4/include/linux/init.h linux-2.6.38.4/include/linux/init.h
---- linux-2.6.38.4/include/linux/init.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/init.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/if_phonet.h linux-2.6.39/include/linux/if_phonet.h
+--- linux-2.6.39/include/linux/if_phonet.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/if_phonet.h 2011-05-22 19:36:33.000000000 -0400
+@@ -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/include/linux/init.h linux-2.6.39/include/linux/init.h
+--- linux-2.6.39/include/linux/init.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/init.h 2011-05-22 19:36:33.000000000 -0400
@@ -293,13 +293,13 @@ void __init parse_early_options(char *cm
/* Each module must use one module_init(). */
{ return exitfn; } \
void cleanup_module(void) __attribute__((alias(#exitfn)));
-diff -urNp linux-2.6.38.4/include/linux/init_task.h linux-2.6.38.4/include/linux/init_task.h
---- linux-2.6.38.4/include/linux/init_task.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/init_task.h 2011-04-30 11:48:57.000000000 -0400
-@@ -83,6 +83,14 @@ extern struct group_info init_groups;
+diff -urNp linux-2.6.39/include/linux/init_task.h linux-2.6.39/include/linux/init_task.h
+--- linux-2.6.39/include/linux/init_task.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/init_task.h 2011-05-22 19:36:33.000000000 -0400
+@@ -83,6 +83,12 @@ extern struct group_info init_groups;
#define INIT_IDS
#endif
+#ifdef CONFIG_X86
+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
-+#define INIT_TASK_STACK .stack = &init_thread_union,
+#else
+#define INIT_TASK_THREAD_INFO
-+#define INIT_TASK_STACK .stack = &init_thread_info,
+#endif
+
/*
* Because of the reduced scope of CAP_SETPCAP when filesystem
* capabilities are in effect, it is safe to allow CAP_SETPCAP to
-@@ -131,7 +139,7 @@ extern struct cred init_cred;
- #define INIT_TASK(tsk) \
- { \
- .state = 0, \
-- .stack = &init_thread_info, \
-+ INIT_TASK_STACK \
- .usage = ATOMIC_INIT(2), \
- .flags = PF_KTHREAD, \
- .lock_depth = -1, \
-@@ -163,6 +171,7 @@ extern struct cred init_cred;
+@@ -163,6 +169,7 @@ extern struct cred init_cred;
RCU_INIT_POINTER(.cred, &init_cred), \
.comm = "swapper", \
.thread = INIT_THREAD, \
.fs = &init_fs, \
.files = &init_files, \
.signal = &init_signals, \
-diff -urNp linux-2.6.38.4/include/linux/interrupt.h linux-2.6.38.4/include/linux/interrupt.h
---- linux-2.6.38.4/include/linux/interrupt.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/interrupt.h 2011-04-28 19:34:15.000000000 -0400
-@@ -393,7 +393,7 @@ enum
+diff -urNp linux-2.6.39/include/linux/interrupt.h linux-2.6.39/include/linux/interrupt.h
+--- linux-2.6.39/include/linux/interrupt.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/interrupt.h 2011-05-22 19:36:33.000000000 -0400
+@@ -422,7 +422,7 @@ enum
/* map softirq index to softirq name. update 'softirq_to_name' in
* kernel/softirq.c when adding a new softirq.
*/
/* softirq mask and active fields moved to irq_cpustat_t in
* asm/hardirq.h to get better cache usage. KAO
-@@ -401,12 +401,12 @@ extern char *softirq_to_name[NR_SOFTIRQS
+@@ -430,12 +430,12 @@ extern char *softirq_to_name[NR_SOFTIRQS
struct softirq_action
{
extern void softirq_init(void);
static inline void __raise_softirq_irqoff(unsigned int nr)
{
-diff -urNp linux-2.6.38.4/include/linux/kallsyms.h linux-2.6.38.4/include/linux/kallsyms.h
---- linux-2.6.38.4/include/linux/kallsyms.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/kallsyms.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/iommu.h linux-2.6.39/include/linux/iommu.h
+--- linux-2.6.39/include/linux/iommu.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/include/linux/ipmi.h linux-2.6.39/include/linux/ipmi.h
+--- linux-2.6.39/include/linux/ipmi.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/include/linux/kallsyms.h linux-2.6.39/include/linux/kallsyms.h
+--- linux-2.6.39/include/linux/kallsyms.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/kallsyms.h 2011-05-22 22:52:54.000000000 -0400
@@ -15,7 +15,8 @@
struct module;
/* Lookup the address for a symbol. Returns 0 if not found. */
unsigned long kallsyms_lookup_name(const char *name);
-@@ -92,6 +93,15 @@ static inline int lookup_symbol_attrs(un
+@@ -99,6 +100,16 @@ static inline int lookup_symbol_attrs(un
/* Stupid that this does nothing, but I didn't create this mess. */
#define __print_symbol(fmt, addr)
#endif /*CONFIG_KALLSYMS*/
+#else /* when included by kallsyms.c, vsnprintf.c, or
+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
+extern void __print_symbol(const char *fmt, unsigned long address);
++extern int sprint_backtrace(char *buffer, unsigned long address);
+extern int sprint_symbol(char *buffer, unsigned long address);
+const char *kallsyms_lookup(unsigned long addr,
+ unsigned long *symbolsize,
/* This macro allows us to keep printk typechecking */
static void __check_printsym_format(const char *fmt, ...)
-diff -urNp linux-2.6.38.4/include/linux/kgdb.h linux-2.6.38.4/include/linux/kgdb.h
---- linux-2.6.38.4/include/linux/kgdb.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/kgdb.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/kgdb.h linux-2.6.39/include/linux/kgdb.h
+--- linux-2.6.39/include/linux/kgdb.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/kgdb.h 2011-05-22 19:36:33.000000000 -0400
@@ -53,7 +53,7 @@ extern int kgdb_connected;
extern int kgdb_io_module_registered;
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.38.4/include/linux/kmod.h linux-2.6.38.4/include/linux/kmod.h
---- linux-2.6.38.4/include/linux/kmod.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/kmod.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/kmod.h linux-2.6.39/include/linux/kmod.h
+--- linux-2.6.39/include/linux/kmod.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/kmod.h 2011-05-22 19:41:42.000000000 -0400
@@ -33,6 +33,8 @@ extern char modprobe_path[]; /* for sysc
* usually useless though. */
extern int __request_module(bool wait, const char *name, ...) \
#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.38.4/include/linux/kvm_host.h linux-2.6.38.4/include/linux/kvm_host.h
---- linux-2.6.38.4/include/linux/kvm_host.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/kvm_host.h 2011-04-28 19:34:15.000000000 -0400
-@@ -288,7 +288,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
+diff -urNp linux-2.6.39/include/linux/kvm_host.h linux-2.6.39/include/linux/kvm_host.h
+--- linux-2.6.39/include/linux/kvm_host.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/kvm_host.h 2011-05-22 19:36:33.000000000 -0400
+@@ -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);
struct module *module);
void kvm_exit(void);
-@@ -428,7 +428,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(
+@@ -442,7 +442,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(
struct kvm_guest_debug *dbg);
int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
void kvm_arch_exit(void);
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff -urNp linux-2.6.38.4/include/linux/libata.h linux-2.6.38.4/include/linux/libata.h
---- linux-2.6.38.4/include/linux/libata.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/libata.h 2011-04-28 19:34:15.000000000 -0400
-@@ -530,11 +530,11 @@ struct ata_ioports {
+diff -urNp linux-2.6.39/include/linux/lapb.h linux-2.6.39/include/linux/lapb.h
+--- linux-2.6.39/include/linux/lapb.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/include/linux/lcd.h linux-2.6.39/include/linux/lcd.h
+--- linux-2.6.39/include/linux/lcd.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/lcd.h 2011-05-22 19:36:33.000000000 -0400
+@@ -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/include/linux/libata.h linux-2.6.39/include/linux/libata.h
+--- linux-2.6.39/include/linux/libata.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
unsigned long flags;
struct mutex eh_mutex;
-@@ -725,7 +725,7 @@ struct ata_link {
+@@ -719,7 +719,7 @@ struct ata_link {
struct ata_port {
struct Scsi_Host *scsi_host; /* our co-allocated scsi host */
spinlock_t *lock;
/* Flags owned by the EH context. Only EH should touch these once the
port is active */
-@@ -913,7 +913,7 @@ struct ata_port_info {
+@@ -907,7 +907,7 @@ struct ata_port_info {
unsigned long pio_mask;
unsigned long mwdma_mask;
unsigned long udma_mask;
void *private_data;
};
-@@ -937,7 +937,7 @@ extern const unsigned long sata_deb_timi
+@@ -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 const struct ata_port_info ata_dummy_port_info;
static inline const unsigned long *
-@@ -983,7 +983,7 @@ extern int ata_host_activate(struct ata_
+@@ -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 *,
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.38.4/include/linux/lockd/bind.h linux-2.6.38.4/include/linux/lockd/bind.h
---- linux-2.6.38.4/include/linux/lockd/bind.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/lockd/bind.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/lockd/bind.h linux-2.6.39/include/linux/lockd/bind.h
+--- linux-2.6.39/include/linux/lockd/bind.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
*/
/*
* Similar to nfs_client_initdata, but without the NFS-specific
-diff -urNp linux-2.6.38.4/include/linux/mm.h linux-2.6.38.4/include/linux/mm.h
---- linux-2.6.38.4/include/linux/mm.h 2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/include/linux/mm.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/mfd/abx500.h linux-2.6.39/include/linux/mfd/abx500.h
+--- linux-2.6.39/include/linux/mfd/abx500.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/mfd/abx500.h 2011-05-22 19:36:33.000000000 -0400
+@@ -227,6 +227,6 @@ struct abx500_ops {
+ int (*startup_irq_enabled) (struct device *, unsigned int);
+ };
+
+-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);
+ void abx500_remove_ops(struct device *dev);
+ #endif
+diff -urNp linux-2.6.39/include/linux/mm.h linux-2.6.39/include/linux/mm.h
+--- linux-2.6.39/include/linux/mm.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/mm.h 2011-05-22 19:36:33.000000000 -0400
@@ -113,7 +113,14 @@ extern unsigned int kobjsize(const void
#define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
#define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
#define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
-@@ -992,12 +999,6 @@ int set_page_dirty(struct page *page);
+@@ -1010,34 +1017,6 @@ int set_page_dirty(struct page *page);
int set_page_dirty_lock(struct page *page);
int clear_page_dirty_for_io(struct page *page);
-/* Is the vma a continuation of the stack vma above it? */
--static inline int vma_stack_continue(struct vm_area_struct *vma, unsigned long addr)
+-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
-{
- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
-}
+-
+-static inline int stack_guard_page_start(struct vm_area_struct *vma,
+- unsigned long addr)
+-{
+- return (vma->vm_flags & VM_GROWSDOWN) &&
+- (vma->vm_start == addr) &&
+- !vma_growsdown(vma->vm_prev, addr);
+-}
+-
+-/* Is the vma a continuation of the stack vma below it? */
+-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
+-{
+- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
+-}
+-
+-static inline int stack_guard_page_end(struct vm_area_struct *vma,
+- unsigned long addr)
+-{
+- return (vma->vm_flags & VM_GROWSUP) &&
+- (vma->vm_end == addr) &&
+- !vma_growsup(vma->vm_next, addr);
+-}
-
extern unsigned long move_page_tables(struct vm_area_struct *vma,
unsigned long old_addr, struct vm_area_struct *new_vma,
unsigned long new_addr, unsigned long len);
-@@ -1149,6 +1150,15 @@ struct shrinker {
+@@ -1189,6 +1168,15 @@ struct shrinker {
extern void register_shrinker(struct shrinker *);
extern void unregister_shrinker(struct shrinker *);
int vma_wants_writenotify(struct vm_area_struct *vma);
extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
-@@ -1438,6 +1448,7 @@ out:
+@@ -1476,6 +1464,7 @@ out:
}
extern int do_munmap(struct mm_struct *, unsigned long, size_t);
extern unsigned long do_brk(unsigned long, unsigned long);
-@@ -1494,6 +1505,10 @@ extern struct vm_area_struct * find_vma(
+@@ -1532,6 +1521,10 @@ extern struct vm_area_struct * find_vma(
extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
struct vm_area_struct **pprev);
/* Look up the first VMA which intersects the interval start_addr..end_addr-1,
NULL if none. Assume start_addr < end_addr. */
static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
-@@ -1510,15 +1525,6 @@ static inline unsigned long vma_pages(st
+@@ -1548,15 +1541,6 @@ static inline unsigned long vma_pages(st
return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
}
struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
unsigned long pfn, unsigned long size, pgprot_t);
-@@ -1627,7 +1633,7 @@ extern int unpoison_memory(unsigned long
+@@ -1668,7 +1652,7 @@ extern int unpoison_memory(unsigned long
extern int sysctl_memory_failure_early_kill;
extern int sysctl_memory_failure_recovery;
extern void shake_page(struct page *p, int access);
-extern atomic_long_t mce_bad_pages;
+extern atomic_long_unchecked_t mce_bad_pages;
extern int soft_offline_page(struct page *page, int flags);
- #ifdef CONFIG_MEMORY_FAILURE
- int is_hwpoison_address(unsigned long addr);
-@@ -1649,5 +1655,11 @@ extern void copy_user_huge_page(struct p
+
+ extern void dump_page(struct page *page);
+@@ -1682,5 +1666,11 @@ extern void copy_user_huge_page(struct p
unsigned int pages_per_huge_page);
#endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLBFS */
+
#endif /* __KERNEL__ */
#endif /* _LINUX_MM_H */
-diff -urNp linux-2.6.38.4/include/linux/mm_types.h linux-2.6.38.4/include/linux/mm_types.h
---- linux-2.6.38.4/include/linux/mm_types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/mm_types.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/mm_types.h linux-2.6.39/include/linux/mm_types.h
+--- linux-2.6.39/include/linux/mm_types.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/mm_types.h 2011-05-22 19:36:33.000000000 -0400
@@ -183,6 +183,8 @@ struct vm_area_struct {
#ifdef CONFIG_NUMA
struct mempolicy *vm_policy; /* NUMA policy for the VMA */
};
struct core_thread {
-@@ -315,6 +317,24 @@ struct mm_struct {
+@@ -317,6 +319,24 @@ struct mm_struct {
+ #ifdef CONFIG_TRANSPARENT_HUGEPAGE
+ pgtable_t pmd_huge_pte; /* protected by page_table_lock */
#endif
- /* How many tasks sharing this mm are OOM_DISABLE */
- atomic_t oom_disable_count;
+
+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
+ unsigned long pax_flags;
};
/* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
-diff -urNp linux-2.6.38.4/include/linux/mmu_notifier.h linux-2.6.38.4/include/linux/mmu_notifier.h
---- linux-2.6.38.4/include/linux/mmu_notifier.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/mmu_notifier.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/mmu_notifier.h linux-2.6.39/include/linux/mmu_notifier.h
+--- linux-2.6.39/include/linux/mmu_notifier.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/mmu_notifier.h 2011-05-22 19:36:33.000000000 -0400
@@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destr
*/
#define ptep_clear_flush_notify(__vma, __address, __ptep) \
})
#define pmdp_clear_flush_notify(__vma, __address, __pmdp) \
-diff -urNp linux-2.6.38.4/include/linux/mmzone.h linux-2.6.38.4/include/linux/mmzone.h
---- linux-2.6.38.4/include/linux/mmzone.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/mmzone.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/mmzone.h linux-2.6.39/include/linux/mmzone.h
+--- linux-2.6.39/include/linux/mmzone.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/mmzone.h 2011-05-22 19:36:33.000000000 -0400
@@ -355,7 +355,7 @@ struct zone {
unsigned long flags; /* zone flags, see below */
/*
* The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
-diff -urNp linux-2.6.38.4/include/linux/mod_devicetable.h linux-2.6.38.4/include/linux/mod_devicetable.h
---- linux-2.6.38.4/include/linux/mod_devicetable.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/mod_devicetable.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/mod_devicetable.h linux-2.6.39/include/linux/mod_devicetable.h
+--- linux-2.6.39/include/linux/mod_devicetable.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/mod_devicetable.h 2011-05-22 19:36:33.000000000 -0400
@@ -12,7 +12,7 @@
typedef unsigned long kernel_ulong_t;
#endif
struct hid_device_id {
__u16 bus;
-diff -urNp linux-2.6.38.4/include/linux/module.h linux-2.6.38.4/include/linux/module.h
---- linux-2.6.38.4/include/linux/module.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/module.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/module.h linux-2.6.39/include/linux/module.h
+--- linux-2.6.39/include/linux/module.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/module.h 2011-05-22 19:36:33.000000000 -0400
@@ -324,19 +324,16 @@ struct module
int (*init)(void);
}
/* Search for module by name: must hold module_mutex. */
-diff -urNp linux-2.6.38.4/include/linux/moduleloader.h linux-2.6.38.4/include/linux/moduleloader.h
---- linux-2.6.38.4/include/linux/moduleloader.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/moduleloader.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/moduleloader.h linux-2.6.39/include/linux/moduleloader.h
+--- linux-2.6.39/include/linux/moduleloader.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/moduleloader.h 2011-05-22 19:36:33.000000000 -0400
@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
sections. Returns NULL on failure. */
void *module_alloc(unsigned long size);
/* Apply the given relocation to the (simplified) ELF. Return -error
or 0. */
int apply_relocate(Elf_Shdr *sechdrs,
-diff -urNp linux-2.6.38.4/include/linux/moduleparam.h linux-2.6.38.4/include/linux/moduleparam.h
---- linux-2.6.38.4/include/linux/moduleparam.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/moduleparam.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/moduleparam.h linux-2.6.39/include/linux/moduleparam.h
+--- linux-2.6.39/include/linux/moduleparam.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/moduleparam.h 2011-05-22 19:36:33.000000000 -0400
@@ -255,7 +255,7 @@ static inline void __kernel_param_unlock
* @len is usually just sizeof(string).
*/
= { len, string }; \
__module_param_call(MODULE_PARAM_PREFIX, name, \
¶m_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.
*/
= { ARRAY_SIZE(array), nump, ¶m_ops_##type, \
sizeof(array[0]), array }; \
__module_param_call(MODULE_PARAM_PREFIX, name, \
-diff -urNp linux-2.6.38.4/include/linux/mutex.h linux-2.6.38.4/include/linux/mutex.h
---- linux-2.6.38.4/include/linux/mutex.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/mutex.h 2011-04-28 19:34:15.000000000 -0400
+@@ -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/include/linux/mutex.h linux-2.6.39/include/linux/mutex.h
+--- linux-2.6.39/include/linux/mutex.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/mutex.h 2011-05-22 19:36:33.000000000 -0400
@@ -51,7 +51,7 @@ struct mutex {
spinlock_t wait_lock;
struct list_head wait_list;
#endif
#ifdef CONFIG_DEBUG_MUTEXES
const char *name;
-diff -urNp linux-2.6.38.4/include/linux/namei.h linux-2.6.38.4/include/linux/namei.h
---- linux-2.6.38.4/include/linux/namei.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/namei.h 2011-04-28 19:34:15.000000000 -0400
-@@ -25,7 +25,7 @@ struct nameidata {
+diff -urNp linux-2.6.39/include/linux/namei.h linux-2.6.39/include/linux/namei.h
+--- linux-2.6.39/include/linux/namei.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/namei.h 2011-05-22 19:36:33.000000000 -0400
+@@ -24,7 +24,7 @@ struct nameidata {
unsigned seq;
int last_type;
unsigned depth;
/* Intent data */
union {
-@@ -88,12 +88,12 @@ extern int follow_up(struct path *);
+@@ -91,12 +91,12 @@ extern int follow_up(struct path *);
extern struct dentry *lock_rename(struct dentry *, struct dentry *);
extern void unlock_rename(struct dentry *, struct dentry *);
{
return nd->saved_names[nd->depth];
}
-diff -urNp linux-2.6.38.4/include/linux/netfilter/xt_gradm.h linux-2.6.38.4/include/linux/netfilter/xt_gradm.h
---- linux-2.6.38.4/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/include/linux/netfilter/xt_gradm.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/netfilter/xt_gradm.h linux-2.6.39/include/linux/netfilter/xt_gradm.h
+--- linux-2.6.39/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/include/linux/netfilter/xt_gradm.h 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,9 @@
+#ifndef _LINUX_NETFILTER_XT_GRADM_H
+#define _LINUX_NETFILTER_XT_GRADM_H 1
+};
+
+#endif
-diff -urNp linux-2.6.38.4/include/linux/oprofile.h linux-2.6.38.4/include/linux/oprofile.h
---- linux-2.6.38.4/include/linux/oprofile.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/oprofile.h 2011-04-28 19:34:15.000000000 -0400
-@@ -132,9 +132,9 @@ int oprofilefs_create_ulong(struct super
+diff -urNp linux-2.6.39/include/linux/oprofile.h linux-2.6.39/include/linux/oprofile.h
+--- linux-2.6.39/include/linux/oprofile.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/oprofile.h 2011-05-22 19:36:33.000000000 -0400
+@@ -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);
/** create a directory */
struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
-diff -urNp linux-2.6.38.4/include/linux/padata.h linux-2.6.38.4/include/linux/padata.h
---- linux-2.6.38.4/include/linux/padata.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/padata.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/padata.h linux-2.6.39/include/linux/padata.h
+--- linux-2.6.39/include/linux/padata.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/padata.h 2011-05-22 19:36:33.000000000 -0400
@@ -129,7 +129,7 @@ struct parallel_data {
struct padata_instance *pinst;
struct padata_parallel_queue __percpu *pqueue;
atomic_t reorder_objects;
atomic_t refcnt;
unsigned int max_seq_nr;
-diff -urNp linux-2.6.38.4/include/linux/perf_event.h linux-2.6.38.4/include/linux/perf_event.h
---- linux-2.6.38.4/include/linux/perf_event.h 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/include/linux/perf_event.h 2011-04-28 19:57:25.000000000 -0400
-@@ -732,8 +732,8 @@ struct perf_event {
+diff -urNp linux-2.6.39/include/linux/pci.h linux-2.6.39/include/linux/pci.h
+--- linux-2.6.39/include/linux/pci.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/pci.h 2011-05-22 19:36:33.000000000 -0400
+@@ -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/include/linux/perf_event.h linux-2.6.39/include/linux/perf_event.h
+--- linux-2.6.39/include/linux/perf_event.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/perf_event.h 2011-05-22 19:36:33.000000000 -0400
+@@ -759,8 +759,8 @@ struct perf_event {
enum perf_event_active_state state;
unsigned int attach_state;
/*
* These are the total time in nanoseconds that the event
-@@ -784,8 +784,8 @@ struct perf_event {
+@@ -811,8 +811,8 @@ struct perf_event {
* These accumulate total time (in nanoseconds) that children
* events have been enabled and running, respectively.
*/
/*
* Protect attach/detach and child_list:
-diff -urNp linux-2.6.38.4/include/linux/pipe_fs_i.h linux-2.6.38.4/include/linux/pipe_fs_i.h
---- linux-2.6.38.4/include/linux/pipe_fs_i.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/pipe_fs_i.h 2011-04-28 19:34:15.000000000 -0400
+@@ -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/include/linux/pipe_fs_i.h linux-2.6.39/include/linux/pipe_fs_i.h
+--- linux-2.6.39/include/linux/pipe_fs_i.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/pipe_fs_i.h 2011-05-22 19:36:33.000000000 -0400
@@ -46,9 +46,9 @@ struct pipe_buffer {
struct pipe_inode_info {
wait_queue_head_t wait;
unsigned int r_counter;
unsigned int w_counter;
struct page *tmp_page;
-diff -urNp linux-2.6.38.4/include/linux/pm_runtime.h linux-2.6.38.4/include/linux/pm_runtime.h
---- linux-2.6.38.4/include/linux/pm_runtime.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/pm_runtime.h 2011-04-28 19:34:15.000000000 -0400
-@@ -89,7 +89,7 @@ static inline bool pm_runtime_enabled(st
+diff -urNp linux-2.6.39/include/linux/pm.h linux-2.6.39/include/linux/pm.h
+--- linux-2.6.39/include/linux/pm.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/pm.h 2011-05-22 19:36:33.000000000 -0400
+@@ -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
+@@ -471,7 +471,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/include/linux/pm_runtime.h linux-2.6.39/include/linux/pm_runtime.h
+--- linux-2.6.39/include/linux/pm_runtime.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/pm_runtime.h 2011-05-22 19:36:33.000000000 -0400
+@@ -94,7 +94,7 @@ static inline bool pm_runtime_callbacks_
static inline void pm_runtime_mark_last_busy(struct device *dev)
{
}
#else /* !CONFIG_PM_RUNTIME */
-diff -urNp linux-2.6.38.4/include/linux/poison.h linux-2.6.38.4/include/linux/poison.h
---- linux-2.6.38.4/include/linux/poison.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/poison.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/poison.h linux-2.6.39/include/linux/poison.h
+--- linux-2.6.39/include/linux/poison.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/poison.h 2011-05-22 19:36:33.000000000 -0400
@@ -19,8 +19,8 @@
* under normal circumstances, used to verify that nobody uses
* non-initialized list entries.
/********** include/linux/timer.h **********/
/*
-diff -urNp linux-2.6.38.4/include/linux/proc_fs.h linux-2.6.38.4/include/linux/proc_fs.h
---- linux-2.6.38.4/include/linux/proc_fs.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/proc_fs.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/posix-timers.h linux-2.6.39/include/linux/posix-timers.h
+--- linux-2.6.39/include/linux/posix-timers.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
+
+-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/include/linux/proc_fs.h linux-2.6.39/include/linux/proc_fs.h
+--- linux-2.6.39/include/linux/proc_fs.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/proc_fs.h 2011-05-22 19:41:42.000000000 -0400
@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
return proc_create_data(name, mode, parent, proc_fops, NULL);
}
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.38.4/include/linux/ptrace.h linux-2.6.38.4/include/linux/ptrace.h
---- linux-2.6.38.4/include/linux/ptrace.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/ptrace.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/ptrace.h linux-2.6.39/include/linux/ptrace.h
+--- linux-2.6.39/include/linux/ptrace.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/ptrace.h 2011-05-22 19:41:42.000000000 -0400
@@ -115,10 +115,10 @@ extern void __ptrace_unlink(struct task_
extern void exit_ptrace(struct task_struct *tracer);
#define PTRACE_MODE_READ 1
static inline int ptrace_reparented(struct task_struct *child)
{
-diff -urNp linux-2.6.38.4/include/linux/random.h linux-2.6.38.4/include/linux/random.h
---- linux-2.6.38.4/include/linux/random.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/random.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/random.h linux-2.6.39/include/linux/random.h
+--- linux-2.6.39/include/linux/random.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/random.h 2011-05-22 19:36:33.000000000 -0400
@@ -80,12 +80,17 @@ void srandom32(u32 seed);
u32 prandom32(struct rnd_state *);
}
/**
-diff -urNp linux-2.6.38.4/include/linux/reiserfs_fs.h linux-2.6.38.4/include/linux/reiserfs_fs.h
---- linux-2.6.38.4/include/linux/reiserfs_fs.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/reiserfs_fs.h 2011-04-28 19:34:15.000000000 -0400
-@@ -1403,7 +1403,7 @@ static inline loff_t max_reiserfs_offset
+diff -urNp linux-2.6.39/include/linux/reboot.h linux-2.6.39/include/linux/reboot.h
+--- linux-2.6.39/include/linux/reboot.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/reboot.h 2011-05-22 19:36:33.000000000 -0400
+@@ -47,9 +47,9 @@ extern int unregister_reboot_notifier(st
+ * Architecture-specific implementations of sys_reboot commands.
+ */
+
+-extern void machine_restart(char *cmd);
+-extern void machine_halt(void);
+-extern void machine_power_off(void);
++extern void machine_restart(char *cmd) __noreturn;
++extern void machine_halt(void) __noreturn;
++extern void machine_power_off(void) __noreturn;
+
+ extern void machine_shutdown(void);
+ struct pt_regs;
+@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struc
+ */
+
+ extern void kernel_restart_prepare(char *cmd);
+-extern void kernel_restart(char *cmd);
+-extern void kernel_halt(void);
+-extern void kernel_power_off(void);
++extern void kernel_restart(char *cmd) __noreturn;
++extern void kernel_halt(void) __noreturn;
++extern void kernel_power_off(void) __noreturn;
+
+ extern int C_A_D; /* for sysctl */
+ void ctrl_alt_del(void);
+@@ -76,7 +76,7 @@ extern int orderly_poweroff(bool force);
+ * Emergency restart, callable from an interrupt handler.
+ */
+
+-extern void emergency_restart(void);
++extern void emergency_restart(void) __noreturn;
+ #include <asm/emergency-restart.h>
+
+ #endif
+diff -urNp linux-2.6.39/include/linux/reiserfs_fs.h linux-2.6.39/include/linux/reiserfs_fs.h
+--- linux-2.6.39/include/linux/reiserfs_fs.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/reiserfs_fs.h 2011-05-22 19:36:33.000000000 -0400
+@@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset
#define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
#define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
#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) \
-@@ -1615,24 +1615,24 @@ static inline struct super_block *sb_fro
+@@ -1618,24 +1618,24 @@ static inline struct super_block *sb_fro
*/
struct item_operations {
#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.38.4/include/linux/reiserfs_fs_sb.h linux-2.6.38.4/include/linux/reiserfs_fs_sb.h
---- linux-2.6.38.4/include/linux/reiserfs_fs_sb.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/reiserfs_fs_sb.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/reiserfs_fs_sb.h linux-2.6.39/include/linux/reiserfs_fs_sb.h
+--- linux-2.6.39/include/linux/reiserfs_fs_sb.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/reiserfs_fs_sb.h 2011-05-22 19:36:33.000000000 -0400
@@ -386,7 +386,7 @@ struct reiserfs_sb_info {
/* Comment? -Hans */
wait_queue_head_t s_wait;
// tree gets re-balanced
unsigned long s_properties; /* File system properties. Currently holds
on-disk FS format */
-diff -urNp linux-2.6.38.4/include/linux/rmap.h linux-2.6.38.4/include/linux/rmap.h
---- linux-2.6.38.4/include/linux/rmap.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/rmap.h 2011-04-28 19:34:15.000000000 -0400
-@@ -145,8 +145,8 @@ static inline void anon_vma_unlock(struc
+diff -urNp linux-2.6.39/include/linux/rmap.h linux-2.6.39/include/linux/rmap.h
+--- linux-2.6.39/include/linux/rmap.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/rmap.h 2011-05-22 19:36:33.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 *);
void unlink_anon_vmas(struct vm_area_struct *);
+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
void __anon_vma_link(struct vm_area_struct *);
- void anon_vma_free(struct anon_vma *);
-diff -urNp linux-2.6.38.4/include/linux/sched.h linux-2.6.38.4/include/linux/sched.h
---- linux-2.6.38.4/include/linux/sched.h 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/include/linux/sched.h 2011-04-28 19:34:15.000000000 -0400
-@@ -99,6 +99,7 @@ struct robust_list_head;
- struct bio_list;
+ static inline void anon_vma_merge(struct vm_area_struct *vma,
+diff -urNp linux-2.6.39/include/linux/sched.h linux-2.6.39/include/linux/sched.h
+--- linux-2.6.39/include/linux/sched.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/sched.h 2011-05-22 19:41:42.000000000 -0400
+@@ -100,6 +100,7 @@ struct bio_list;
struct fs_struct;
struct perf_event_context;
+ struct blk_plug;
+struct linux_binprm;
/*
* List of flags we want to share for kernel threads,
-@@ -359,7 +360,7 @@ extern signed long schedule_timeout_inte
+@@ -360,7 +361,7 @@ extern signed long schedule_timeout_inte
extern signed long schedule_timeout_killable(signed long timeout);
extern signed long schedule_timeout_uninterruptible(signed long timeout);
asmlinkage void schedule(void);
struct nsproxy;
struct user_namespace;
-@@ -380,10 +381,13 @@ struct user_namespace;
+@@ -381,10 +382,13 @@ struct user_namespace;
#define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
extern int sysctl_max_map_count;
extern void arch_pick_mmap_layout(struct mm_struct *mm);
extern unsigned long
arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
-@@ -628,6 +632,17 @@ struct signal_struct {
+@@ -629,6 +633,17 @@ struct signal_struct {
#ifdef CONFIG_TASKSTATS
struct taskstats *stats;
#endif
#ifdef CONFIG_AUDIT
unsigned audit_tty;
struct tty_audit_buf *tty_audit_buf;
-@@ -700,6 +715,11 @@ struct user_struct {
+@@ -701,6 +716,11 @@ struct user_struct {
struct key *session_keyring; /* UID's default session keyring */
#endif
#ifdef CONFIG_DEBUG_MUTEXES
/* mutex deadlock detection */
struct mutex_waiter *blocked_on;
-@@ -1502,6 +1528,21 @@ struct task_struct {
+@@ -1508,6 +1534,21 @@ struct task_struct {
unsigned long default_timer_slack_ns;
struct list_head *scm_work_list;
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
/* Index of current stored address in ret_stack */
int curr_ret_stack;
-@@ -1533,6 +1574,51 @@ struct task_struct {
+@@ -1542,6 +1583,63 @@ struct task_struct {
#endif
};
+void pax_report_insns(void *pc, void *sp);
+void pax_report_refcount_overflow(struct pt_regs *regs);
+void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type);
++
++static inline void pax_track_stack(void)
++{
++
++#ifdef CONFIG_PAX_MEMORY_STACKLEAK
++ unsigned long sp = current_stack_pointer;
++ if (current_thread_info()->lowest_stack > sp &&
++ (unsigned long)task_stack_page(current) < sp)
++ current_thread_info()->lowest_stack = sp;
++#endif
++
++}
+
/* Future-safe accessor for struct task_struct's cpus_allowed. */
#define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
-@@ -2002,7 +2088,9 @@ void yield(void);
+@@ -2009,7 +2107,9 @@ void yield(void);
extern struct exec_domain default_exec_domain;
union thread_union {
unsigned long stack[THREAD_SIZE/sizeof(long)];
};
-@@ -2172,7 +2260,7 @@ extern void __cleanup_sighand(struct sig
+@@ -2179,7 +2279,7 @@ extern void __cleanup_sighand(struct sig
extern void exit_itimers(struct signal_struct *);
extern void flush_itimer_signals(void);
extern void daemonize(const char *, ...);
extern int allow_signal(int);
-@@ -2313,13 +2401,17 @@ static inline unsigned long *end_of_stac
+@@ -2320,13 +2420,17 @@ static inline unsigned long *end_of_stac
#endif
extern void thread_info_cache_init(void);
#ifdef CONFIG_DEBUG_STACK_USAGE
-diff -urNp linux-2.6.38.4/include/linux/screen_info.h linux-2.6.38.4/include/linux/screen_info.h
---- linux-2.6.38.4/include/linux/screen_info.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/screen_info.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/screen_info.h linux-2.6.39/include/linux/screen_info.h
+--- linux-2.6.39/include/linux/screen_info.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/screen_info.h 2011-05-22 19:36:33.000000000 -0400
@@ -43,7 +43,8 @@ struct screen_info {
__u16 pages; /* 0x32 */
__u16 vesa_attributes; /* 0x34 */
} __attribute__((packed));
#define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
-diff -urNp linux-2.6.38.4/include/linux/security.h linux-2.6.38.4/include/linux/security.h
---- linux-2.6.38.4/include/linux/security.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/security.h 2011-04-28 19:34:15.000000000 -0400
-@@ -35,6 +35,7 @@
+diff -urNp linux-2.6.39/include/linux/security.h linux-2.6.39/include/linux/security.h
+--- linux-2.6.39/include/linux/security.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/security.h 2011-05-22 19:41:42.000000000 -0400
+@@ -36,6 +36,7 @@
#include <linux/key.h>
#include <linux/xfrm.h>
#include <linux/slab.h>
#include <net/flow.h>
/* Maximum number of letters for an LSM name string */
-diff -urNp linux-2.6.38.4/include/linux/shm.h linux-2.6.38.4/include/linux/shm.h
---- linux-2.6.38.4/include/linux/shm.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/shm.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/shm.h linux-2.6.39/include/linux/shm.h
+--- linux-2.6.39/include/linux/shm.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/shm.h 2011-05-22 19:41:42.000000000 -0400
@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
pid_t shm_cprid;
pid_t shm_lprid;
};
/* shm_mode upper byte flags */
-diff -urNp linux-2.6.38.4/include/linux/skbuff.h linux-2.6.38.4/include/linux/skbuff.h
---- linux-2.6.38.4/include/linux/skbuff.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/skbuff.h 2011-04-28 19:57:25.000000000 -0400
-@@ -589,7 +589,7 @@ static inline struct skb_shared_hwtstamp
+diff -urNp linux-2.6.39/include/linux/skbuff.h linux-2.6.39/include/linux/skbuff.h
+--- linux-2.6.39/include/linux/skbuff.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/skbuff.h 2011-05-22 19:36:33.000000000 -0400
+@@ -592,7 +592,7 @@ static inline struct skb_shared_hwtstamp
*/
static inline int skb_queue_empty(const struct sk_buff_head *list)
{
}
/**
-@@ -602,7 +602,7 @@ static inline int skb_queue_empty(const
+@@ -605,7 +605,7 @@ static inline int skb_queue_empty(const
static inline bool skb_queue_is_last(const struct sk_buff_head *list,
const struct sk_buff *skb)
{
}
/**
-@@ -615,7 +615,7 @@ static inline bool skb_queue_is_last(con
+@@ -618,7 +618,7 @@ static inline bool skb_queue_is_last(con
static inline bool skb_queue_is_first(const struct sk_buff_head *list,
const struct sk_buff *skb)
{
}
/**
-@@ -1432,7 +1432,7 @@ static inline int pskb_network_may_pull(
+@@ -1435,7 +1435,7 @@ static inline int pskb_network_may_pull(
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
*/
#ifndef NET_SKB_PAD
#endif
extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
-diff -urNp linux-2.6.38.4/include/linux/slab_def.h linux-2.6.38.4/include/linux/slab_def.h
---- linux-2.6.38.4/include/linux/slab_def.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/slab_def.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/slab_def.h linux-2.6.39/include/linux/slab_def.h
+--- linux-2.6.39/include/linux/slab_def.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/slab_def.h 2011-05-22 19:36:33.000000000 -0400
@@ -96,10 +96,10 @@ struct kmem_cache {
unsigned long node_allocs;
unsigned long node_frees;
/*
* If debugging is enabled, then the allocator can add additional
-diff -urNp linux-2.6.38.4/include/linux/slab.h linux-2.6.38.4/include/linux/slab.h
---- linux-2.6.38.4/include/linux/slab.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/slab.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/slab.h linux-2.6.39/include/linux/slab.h
+--- linux-2.6.39/include/linux/slab.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/slab.h 2011-05-23 17:07:00.000000000 -0400
@@ -11,12 +11,20 @@
#include <linux/gfp.h>
/*
* struct kmem_cache related prototypes
-@@ -142,6 +153,7 @@ void * __must_check krealloc(const void
+@@ -141,6 +152,7 @@ void * __must_check krealloc(const void
void kfree(const void *);
void kzfree(const void *);
size_t ksize(const void *);
/*
* Allocator specific definitions. These are mainly used to establish optimized
-@@ -334,4 +346,37 @@ static inline void *kzalloc_node(size_t
+@@ -333,4 +345,59 @@ static inline void *kzalloc_node(size_t
void __init kmem_cache_init_late(void);
-+#define kmalloc(x, y) \
-+({ \
-+ void *___retval; \
-+ intoverflow_t ___x = (intoverflow_t)x; \
-+ if (WARN(___x > ULONG_MAX, "kmalloc size overflow\n"))\
-+ ___retval = NULL; \
-+ else \
-+ ___retval = kmalloc((size_t)___x, (y)); \
-+ ___retval; \
++#define kmalloc(x, y) \
++({ \
++ void *___retval; \
++ intoverflow_t ___x = (intoverflow_t)x; \
++ if (WARN(___x > ULONG_MAX, "kmalloc size overflow\n")) \
++ ___retval = NULL; \
++ else \
++ ___retval = kmalloc((size_t)___x, (y)); \
++ ___retval; \
+})
+
+#define kmalloc_node(x, y, z) \
+ ___retval; \
+})
+
-+#define kzalloc(x, y) \
-+({ \
-+ void *___retval; \
-+ intoverflow_t ___x = (intoverflow_t)x; \
-+ if (WARN(___x > ULONG_MAX, "kzalloc size overflow\n"))\
-+ ___retval = NULL; \
-+ else \
-+ ___retval = kzalloc((size_t)___x, (y)); \
-+ ___retval; \
++#define kzalloc(x, y) \
++({ \
++ void *___retval; \
++ intoverflow_t ___x = (intoverflow_t)x; \
++ if (WARN(___x > ULONG_MAX, "kzalloc size overflow\n")) \
++ ___retval = NULL; \
++ else \
++ ___retval = kzalloc((size_t)___x, (y)); \
++ ___retval; \
++})
++
++#define __krealloc(x, y, z) \
++({ \
++ void *___retval; \
++ intoverflow_t ___y = (intoverflow_t)y; \
++ if (WARN(___y > ULONG_MAX, "__krealloc size overflow\n"))\
++ ___retval = NULL; \
++ else \
++ ___retval = __krealloc((x), (size_t)___y, (z)); \
++ ___retval; \
++})
++
++#define krealloc(x, y, z) \
++({ \
++ void *___retval; \
++ intoverflow_t ___y = (intoverflow_t)y; \
++ if (WARN(___y > ULONG_MAX, "krealloc size overflow\n")) \
++ ___retval = NULL; \
++ else \
++ ___retval = krealloc((x), (size_t)___y, (z)); \
++ ___retval; \
+})
+
#endif /* _LINUX_SLAB_H */
-diff -urNp linux-2.6.38.4/include/linux/slub_def.h linux-2.6.38.4/include/linux/slub_def.h
---- linux-2.6.38.4/include/linux/slub_def.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/slub_def.h 2011-04-28 19:34:15.000000000 -0400
-@@ -79,7 +79,7 @@ struct kmem_cache {
+diff -urNp linux-2.6.39/include/linux/slub_def.h linux-2.6.39/include/linux/slub_def.h
+--- linux-2.6.39/include/linux/slub_def.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/slub_def.h 2011-05-22 19:36:33.000000000 -0400
+@@ -84,7 +84,7 @@ struct kmem_cache {
struct kmem_cache_order_objects max;
struct kmem_cache_order_objects min;
gfp_t allocflags; /* gfp flags to use on each alloc */
void (*ctor)(void *);
int inuse; /* Offset to metadata */
int align; /* Alignment */
-diff -urNp linux-2.6.38.4/include/linux/sonet.h linux-2.6.38.4/include/linux/sonet.h
---- linux-2.6.38.4/include/linux/sonet.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/sonet.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/sonet.h linux-2.6.39/include/linux/sonet.h
+--- linux-2.6.39/include/linux/sonet.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/sonet.h 2011-05-22 19:36:33.000000000 -0400
@@ -61,7 +61,7 @@ struct sonet_stats {
#include <asm/atomic.h>
__SONET_ITEMS
#undef __HANDLE_ITEM
};
-diff -urNp linux-2.6.38.4/include/linux/sunrpc/clnt.h linux-2.6.38.4/include/linux/sunrpc/clnt.h
---- linux-2.6.38.4/include/linux/sunrpc/clnt.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/sunrpc/clnt.h 2011-04-28 19:34:15.000000000 -0400
-@@ -168,9 +168,9 @@ static inline unsigned short rpc_get_por
+diff -urNp linux-2.6.39/include/linux/ssb/ssb_driver_gige.h linux-2.6.39/include/linux/ssb/ssb_driver_gige.h
+--- linux-2.6.39/include/linux/ssb/ssb_driver_gige.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/ssb/ssb_driver_gige.h 2011-05-22 19:36:33.000000000 -0400
+@@ -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/include/linux/sunrpc/clnt.h linux-2.6.39/include/linux/sunrpc/clnt.h
+--- linux-2.6.39/include/linux/sunrpc/clnt.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/sunrpc/clnt.h 2011-05-22 19:36:33.000000000 -0400
+@@ -169,9 +169,9 @@ static inline unsigned short rpc_get_por
{
switch (sap->sa_family) {
case AF_INET:
}
return 0;
}
-@@ -203,7 +203,7 @@ static inline bool __rpc_cmp_addr4(const
+@@ -204,7 +204,7 @@ static inline bool __rpc_cmp_addr4(const
static inline bool __rpc_copy_addr4(struct sockaddr *dst,
const struct sockaddr *src)
{
struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
dsin->sin_family = ssin->sin_family;
-@@ -300,7 +300,7 @@ static inline u32 rpc_get_scope_id(const
+@@ -301,7 +301,7 @@ static inline u32 rpc_get_scope_id(const
if (sa->sa_family != AF_INET6)
return 0;
}
#endif /* __KERNEL__ */
-diff -urNp linux-2.6.38.4/include/linux/sunrpc/svc_rdma.h linux-2.6.38.4/include/linux/sunrpc/svc_rdma.h
---- linux-2.6.38.4/include/linux/sunrpc/svc_rdma.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/sunrpc/svc_rdma.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/sunrpc/svc_rdma.h linux-2.6.39/include/linux/sunrpc/svc_rdma.h
+--- linux-2.6.39/include/linux/sunrpc/svc_rdma.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/sunrpc/svc_rdma.h 2011-05-22 19:36:33.000000000 -0400
@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
extern unsigned int svcrdma_max_requests;
extern unsigned int svcrdma_max_req_size;
#define RPCRDMA_VERSION 1
-diff -urNp linux-2.6.38.4/include/linux/suspend.h linux-2.6.38.4/include/linux/suspend.h
---- linux-2.6.38.4/include/linux/suspend.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/suspend.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/suspend.h linux-2.6.39/include/linux/suspend.h
+--- linux-2.6.39/include/linux/suspend.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/suspend.h 2011-05-22 19:36:33.000000000 -0400
@@ -106,15 +106,15 @@ typedef int __bitwise suspend_state_t;
* which require special recovery actions in that situation.
*/
};
#ifdef CONFIG_HIBERNATION
-diff -urNp linux-2.6.38.4/include/linux/sysctl.h linux-2.6.38.4/include/linux/sysctl.h
---- linux-2.6.38.4/include/linux/sysctl.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/sysctl.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/sysctl.h linux-2.6.39/include/linux/sysctl.h
+--- linux-2.6.39/include/linux/sysctl.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/sysctl.h 2011-05-22 19:41:42.000000000 -0400
@@ -155,7 +155,11 @@ enum
KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
};
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.38.4/include/linux/sysfs.h linux-2.6.38.4/include/linux/sysfs.h
---- linux-2.6.38.4/include/linux/sysfs.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/sysfs.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/sysfs.h linux-2.6.39/include/linux/sysfs.h
+--- linux-2.6.39/include/linux/sysfs.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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_dirent;
-diff -urNp linux-2.6.38.4/include/linux/tty.h linux-2.6.38.4/include/linux/tty.h
---- linux-2.6.38.4/include/linux/tty.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/tty.h 2011-04-28 19:34:15.000000000 -0400
-@@ -13,6 +13,8 @@
+diff -urNp linux-2.6.39/include/linux/tty.h linux-2.6.39/include/linux/tty.h
+--- linux-2.6.39/include/linux/tty.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/tty.h 2011-05-22 19:36:33.000000000 -0400
+@@ -13,6 +13,7 @@
#include <linux/tty_driver.h>
#include <linux/tty_ldisc.h>
#include <linux/mutex.h>
+#include <linux/poll.h>
-+#include <linux/smp_lock.h>
#include <asm/system.h>
-@@ -465,7 +467,6 @@ extern int tty_perform_flush(struct tty_
+@@ -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 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);
-@@ -528,6 +529,18 @@ extern void tty_ldisc_begin(void);
+@@ -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);
/* n_tty.c */
extern struct tty_ldisc_ops tty_ldisc_N_TTY;
-diff -urNp linux-2.6.38.4/include/linux/tty_ldisc.h linux-2.6.38.4/include/linux/tty_ldisc.h
---- linux-2.6.38.4/include/linux/tty_ldisc.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/tty_ldisc.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/tty_ldisc.h linux-2.6.39/include/linux/tty_ldisc.h
+--- linux-2.6.39/include/linux/tty_ldisc.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/tty_ldisc.h 2011-05-22 19:36:33.000000000 -0400
@@ -148,7 +148,7 @@ struct tty_ldisc_ops {
struct module *owner;
};
struct tty_ldisc {
-diff -urNp linux-2.6.38.4/include/linux/types.h linux-2.6.38.4/include/linux/types.h
---- linux-2.6.38.4/include/linux/types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/types.h 2011-04-28 19:34:15.000000000 -0400
-@@ -207,10 +207,26 @@ typedef struct {
+diff -urNp linux-2.6.39/include/linux/types.h linux-2.6.39/include/linux/types.h
+--- linux-2.6.39/include/linux/types.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/types.h 2011-05-22 19:36:33.000000000 -0400
+@@ -213,10 +213,26 @@ typedef struct {
int counter;
} atomic_t;
#endif
struct list_head {
-diff -urNp linux-2.6.38.4/include/linux/uaccess.h linux-2.6.38.4/include/linux/uaccess.h
---- linux-2.6.38.4/include/linux/uaccess.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/uaccess.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/uaccess.h linux-2.6.39/include/linux/uaccess.h
+--- linux-2.6.39/include/linux/uaccess.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/uaccess.h 2011-05-22 19:36:33.000000000 -0400
@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
long ret; \
mm_segment_t old_fs = get_fs(); \
+extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size);
#endif /* __LINUX_UACCESS_H__ */
-diff -urNp linux-2.6.38.4/include/linux/unaligned/access_ok.h linux-2.6.38.4/include/linux/unaligned/access_ok.h
---- linux-2.6.38.4/include/linux/unaligned/access_ok.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/unaligned/access_ok.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/unaligned/access_ok.h linux-2.6.39/include/linux/unaligned/access_ok.h
+--- linux-2.6.39/include/linux/unaligned/access_ok.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/unaligned/access_ok.h 2011-05-22 19:36:33.000000000 -0400
@@ -6,32 +6,32 @@
static inline u16 get_unaligned_le16(const void *p)
}
static inline void put_unaligned_le16(u16 val, void *p)
-diff -urNp linux-2.6.38.4/include/linux/usb/hcd.h linux-2.6.38.4/include/linux/usb/hcd.h
---- linux-2.6.38.4/include/linux/usb/hcd.h 2011-04-18 17:27:14.000000000 -0400
-+++ linux-2.6.38.4/include/linux/usb/hcd.h 2011-04-28 19:34:15.000000000 -0400
-@@ -589,7 +589,7 @@ struct usb_mon_operations {
+diff -urNp linux-2.6.39/include/linux/usb/hcd.h linux-2.6.39/include/linux/usb/hcd.h
+--- linux-2.6.39/include/linux/usb/hcd.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/usb/hcd.h 2011-05-22 19:36:33.000000000 -0400
+@@ -615,7 +615,7 @@ struct usb_mon_operations {
/* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */
};
static inline void usbmon_urb_submit(struct usb_bus *bus, struct urb *urb)
{
-@@ -611,7 +611,7 @@ static inline void usbmon_urb_complete(s
+@@ -637,7 +637,7 @@ static inline void usbmon_urb_complete(s
(*mon_ops->urb_complete)(bus, urb, status);
}
void usb_mon_deregister(void);
#else
-diff -urNp linux-2.6.38.4/include/linux/vmalloc.h linux-2.6.38.4/include/linux/vmalloc.h
---- linux-2.6.38.4/include/linux/vmalloc.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/vmalloc.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/linux/usb/intel_mid_otg.h linux-2.6.39/include/linux/usb/intel_mid_otg.h
+--- linux-2.6.39/include/linux/usb/intel_mid_otg.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/include/linux/usb/ulpi.h linux-2.6.39/include/linux/usb/ulpi.h
+--- linux-2.6.39/include/linux/usb/ulpi.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/usb/ulpi.h 2011-05-22 19:36:33.000000000 -0400
+@@ -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/include/linux/vga_switcheroo.h linux-2.6.39/include/linux/vga_switcheroo.h
+--- linux-2.6.39/include/linux/vga_switcheroo.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/include/linux/virtio.h linux-2.6.39/include/linux/virtio.h
+--- linux-2.6.39/include/linux/virtio.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/include/linux/vmalloc.h linux-2.6.39/include/linux/vmalloc.h
+--- linux-2.6.39/include/linux/vmalloc.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/vmalloc.h 2011-05-22 19:36:33.000000000 -0400
@@ -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 */
/* bits [20..32] reserved for arch specific ioremap internals */
/*
-@@ -123,4 +128,103 @@ struct vm_struct **pcpu_get_vm_areas(con
- void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms);
+@@ -155,4 +160,103 @@ pcpu_free_vm_areas(struct vm_struct **vm
+ # endif
#endif
+#define vmalloc(x) \
+})
+
#endif /* _LINUX_VMALLOC_H */
-diff -urNp linux-2.6.38.4/include/linux/vmstat.h linux-2.6.38.4/include/linux/vmstat.h
---- linux-2.6.38.4/include/linux/vmstat.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/vmstat.h 2011-04-28 19:34:15.000000000 -0400
-@@ -140,18 +140,18 @@ static inline void vm_events_fold_cpu(in
+diff -urNp linux-2.6.39/include/linux/vmstat.h linux-2.6.39/include/linux/vmstat.h
+--- linux-2.6.39/include/linux/vmstat.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/linux/vmstat.h 2011-05-22 19:36:33.000000000 -0400
+@@ -147,18 +147,18 @@ static inline void vm_events_fold_cpu(in
/*
* Zone based page accounting with per cpu differentials.
*/
#ifdef CONFIG_SMP
if (x < 0)
x = 0;
-@@ -162,7 +162,7 @@ static inline unsigned long global_page_
+@@ -169,7 +169,7 @@ static inline unsigned long global_page_
static inline unsigned long zone_page_state(struct zone *zone,
enum zone_stat_item item)
{
#ifdef CONFIG_SMP
if (x < 0)
x = 0;
-@@ -179,7 +179,7 @@ static inline unsigned long zone_page_st
+@@ -186,7 +186,7 @@ static inline unsigned long zone_page_st
static inline unsigned long zone_page_state_snapshot(struct zone *zone,
enum zone_stat_item item)
{
#ifdef CONFIG_SMP
int cpu;
-@@ -273,8 +273,8 @@ static inline void __mod_zone_page_state
+@@ -280,8 +280,8 @@ static inline void __mod_zone_page_state
static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
{
}
static inline void __inc_zone_page_state(struct page *page,
-@@ -285,8 +285,8 @@ static inline void __inc_zone_page_state
+@@ -292,8 +292,8 @@ static inline void __inc_zone_page_state
static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
{
}
static inline void __dec_zone_page_state(struct page *page,
-diff -urNp linux-2.6.38.4/include/media/v4l2-device.h linux-2.6.38.4/include/media/v4l2-device.h
---- linux-2.6.38.4/include/media/v4l2-device.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/media/v4l2-device.h 2011-04-28 19:57:25.000000000 -0400
-@@ -77,7 +77,7 @@ int __must_check v4l2_device_register(st
+diff -urNp linux-2.6.39/include/media/saa7146_vv.h linux-2.6.39/include/media/saa7146_vv.h
+--- linux-2.6.39/include/media/saa7146_vv.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/include/media/v4l2-device.h linux-2.6.39/include/media/v4l2-device.h
+--- linux-2.6.39/include/media/v4l2-device.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/media/v4l2-device.h 2011-05-22 19:36:33.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. */
int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
/* 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.38.4/include/net/caif/cfctrl.h linux-2.6.38.4/include/net/caif/cfctrl.h
---- linux-2.6.38.4/include/net/caif/cfctrl.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/caif/cfctrl.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/include/net/caif/cfctrl.h linux-2.6.39/include/net/caif/cfctrl.h
+--- linux-2.6.39/include/net/caif/cfctrl.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/net/caif/cfctrl.h 2011-05-22 19:36:33.000000000 -0400
@@ -101,8 +101,8 @@ struct cfctrl_request_info {
struct cfctrl {
struct cfsrvl serv;
struct list_head list;
/* Protects from simultaneous access to first_req list */
spinlock_t info_list_lock;
-diff -urNp linux-2.6.38.4/include/net/flow.h linux-2.6.38.4/include/net/flow.h
---- linux-2.6.38.4/include/net/flow.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/flow.h 2011-04-28 19:57:25.000000000 -0400
-@@ -109,7 +109,7 @@ extern struct flow_cache_object *flow_ca
+diff -urNp linux-2.6.39/include/net/flow.h linux-2.6.39/include/net/flow.h
+--- linux-2.6.39/include/net/flow.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/net/flow.h 2011-05-22 19:36:33.000000000 -0400
+@@ -167,6 +167,6 @@ extern struct flow_cache_object *flow_ca
u8 dir, flow_resolve_t resolver, void *ctx);
extern void flow_cache_flush(void);
-extern atomic_t flow_cache_genid;
+extern atomic_unchecked_t flow_cache_genid;
- static inline int flow_cache_uli_match(struct flowi *fl1, struct flowi *fl2)
- {
-diff -urNp linux-2.6.38.4/include/net/inetpeer.h linux-2.6.38.4/include/net/inetpeer.h
---- linux-2.6.38.4/include/net/inetpeer.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/inetpeer.h 2011-04-28 19:34:15.000000000 -0400
-@@ -38,8 +38,8 @@ struct inet_peer {
+ #endif
+diff -urNp linux-2.6.39/include/net/inetpeer.h linux-2.6.39/include/net/inetpeer.h
+--- linux-2.6.39/include/net/inetpeer.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/net/inetpeer.h 2011-05-22 19:36:33.000000000 -0400
+@@ -43,8 +43,8 @@ struct inet_peer {
*/
union {
struct {
-- atomic_t rid; /* Frag reception counter */
-- atomic_t ip_id_count; /* IP ID for the next packet */
-+ atomic_unchecked_t rid; /* Frag reception counter */
-+ atomic_unchecked_t ip_id_count; /* IP ID for the next packet */
- __u32 tcp_ts;
- __u32 tcp_ts_stamp;
- };
-@@ -88,7 +88,7 @@ static inline __u16 inet_getid(struct in
+- atomic_t rid; /* Frag reception counter */
+- atomic_t ip_id_count; /* IP ID for the next packet */
++ atomic_unchecked_t rid; /* Frag reception counter */
++ atomic_unchecked_t ip_id_count; /* IP ID for the next packet */
+ __u32 tcp_ts;
+ __u32 tcp_ts_stamp;
+ u32 metrics[RTAX_MAX];
+@@ -108,7 +108,7 @@ static inline __u16 inet_getid(struct in
{
more++;
inet_peer_refcheck(p);
}
#endif /* _NET_INETPEER_H */
-diff -urNp linux-2.6.38.4/include/net/ip_vs.h linux-2.6.38.4/include/net/ip_vs.h
---- linux-2.6.38.4/include/net/ip_vs.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/ip_vs.h 2011-04-28 19:57:25.000000000 -0400
-@@ -404,7 +404,7 @@ struct ip_vs_conn {
+diff -urNp linux-2.6.39/include/net/ip_fib.h linux-2.6.39/include/net/ip_fib.h
+--- linux-2.6.39/include/net/ip_fib.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/net/ip_fib.h 2011-05-22 19:36:33.000000000 -0400
+@@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(s
+
+ #define FIB_RES_SADDR(net, res) \
+ ((FIB_RES_NH(res).nh_saddr_genid == \
+- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
++ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
+ FIB_RES_NH(res).nh_saddr : \
+ fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
+ #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
+diff -urNp linux-2.6.39/include/net/ip_vs.h linux-2.6.39/include/net/ip_vs.h
+--- linux-2.6.39/include/net/ip_vs.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/net/ip_vs.h 2011-05-22 19:36:33.000000000 -0400
+@@ -512,7 +512,7 @@ struct ip_vs_conn {
struct ip_vs_conn *control; /* Master control connection */
atomic_t n_control; /* Number of controlled ones */
struct ip_vs_dest *dest; /* real server */
/* packet transmitter for different forwarding methods. If it
mangles the packet, it must return NF_DROP or better NF_STOLEN,
-@@ -513,7 +513,7 @@ struct ip_vs_dest {
- union nf_inet_addr addr; /* IP address of the server */
+@@ -650,7 +650,7 @@ struct ip_vs_dest {
__be16 port; /* port number of the server */
+ union nf_inet_addr addr; /* IP address of the server */
volatile unsigned flags; /* dest status flags */
- atomic_t conn_flags; /* flags to copy to conn */
+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
atomic_t weight; /* server weight */
atomic_t refcnt; /* reference counter */
-diff -urNp linux-2.6.38.4/include/net/irda/ircomm_tty.h linux-2.6.38.4/include/net/irda/ircomm_tty.h
---- linux-2.6.38.4/include/net/irda/ircomm_tty.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/irda/ircomm_tty.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/net/irda/ircomm_tty.h linux-2.6.39/include/net/irda/ircomm_tty.h
+--- linux-2.6.39/include/net/irda/ircomm_tty.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/net/irda/ircomm_tty.h 2011-05-22 19:36:33.000000000 -0400
@@ -35,6 +35,7 @@
#include <linux/termios.h>
#include <linux/timer.h>
/* Protect concurent access to :
* o self->open_count
-diff -urNp linux-2.6.38.4/include/net/iucv/af_iucv.h linux-2.6.38.4/include/net/iucv/af_iucv.h
---- linux-2.6.38.4/include/net/iucv/af_iucv.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/iucv/af_iucv.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/include/net/iucv/af_iucv.h linux-2.6.39/include/net/iucv/af_iucv.h
+--- linux-2.6.39/include/net/iucv/af_iucv.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/net/iucv/af_iucv.h 2011-05-22 19:36:33.000000000 -0400
@@ -87,7 +87,7 @@ struct iucv_sock {
struct iucv_sock_list {
struct hlist_head head;
};
unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
-diff -urNp linux-2.6.38.4/include/net/neighbour.h linux-2.6.38.4/include/net/neighbour.h
---- linux-2.6.38.4/include/net/neighbour.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/neighbour.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/net/neighbour.h linux-2.6.39/include/net/neighbour.h
+--- linux-2.6.39/include/net/neighbour.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/net/neighbour.h 2011-05-22 19:36:33.000000000 -0400
@@ -118,12 +118,12 @@ struct neighbour {
struct neigh_ops {
};
struct pneigh_entry {
-diff -urNp linux-2.6.38.4/include/net/netlink.h linux-2.6.38.4/include/net/netlink.h
---- linux-2.6.38.4/include/net/netlink.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/netlink.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/net/netfilter/nf_conntrack_ecache.h linux-2.6.39/include/net/netfilter/nf_conntrack_ecache.h
+--- linux-2.6.39/include/net/netfilter/nf_conntrack_ecache.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/net/netfilter/nf_conntrack_ecache.h 2011-05-22 19:36:33.000000000 -0400
+@@ -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/include/net/netlink.h linux-2.6.39/include/net/netlink.h
+--- linux-2.6.39/include/net/netlink.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/net/netlink.h 2011-05-22 19:36:33.000000000 -0400
@@ -562,7 +562,7 @@ static inline void *nlmsg_get_pos(struct
static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
{
}
/**
-diff -urNp linux-2.6.38.4/include/net/netns/ipv4.h linux-2.6.38.4/include/net/netns/ipv4.h
---- linux-2.6.38.4/include/net/netns/ipv4.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/netns/ipv4.h 2011-04-28 19:57:25.000000000 -0400
-@@ -55,7 +55,7 @@ struct netns_ipv4 {
+diff -urNp linux-2.6.39/include/net/netns/ipv4.h linux-2.6.39/include/net/netns/ipv4.h
+--- linux-2.6.39/include/net/netns/ipv4.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/net/netns/ipv4.h 2011-05-22 19:36:33.000000000 -0400
+@@ -54,8 +54,8 @@ struct netns_ipv4 {
int sysctl_rt_cache_rebuild_count;
int current_rt_cache_rebuild_count;
- atomic_t rt_genid;
+- atomic_t dev_addr_genid;
+ atomic_unchecked_t rt_genid;
++ atomic_unchecked_t dev_addr_genid;
#ifdef CONFIG_IP_MROUTE
#ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
-diff -urNp linux-2.6.38.4/include/net/sctp/sctp.h linux-2.6.38.4/include/net/sctp/sctp.h
---- linux-2.6.38.4/include/net/sctp/sctp.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/sctp/sctp.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/net/sctp/sctp.h linux-2.6.39/include/net/sctp/sctp.h
+--- linux-2.6.39/include/net/sctp/sctp.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/net/sctp/sctp.h 2011-05-22 19:36:33.000000000 -0400
@@ -316,9 +316,9 @@ do { \
#else /* SCTP_DEBUG */
#define SCTP_ENABLE_DEBUG
#define SCTP_DISABLE_DEBUG
#define SCTP_ASSERT(expr, str, func)
-diff -urNp linux-2.6.38.4/include/net/sock.h linux-2.6.38.4/include/net/sock.h
---- linux-2.6.38.4/include/net/sock.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/sock.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/include/net/sock.h linux-2.6.39/include/net/sock.h
+--- linux-2.6.39/include/net/sock.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/net/sock.h 2011-05-22 19:36:33.000000000 -0400
@@ -277,7 +277,7 @@ struct sock {
#ifdef CONFIG_RPS
__u32 sk_rxhash;
int sk_rcvbuf;
struct sk_filter __rcu *sk_filter;
-diff -urNp linux-2.6.38.4/include/net/tcp.h linux-2.6.38.4/include/net/tcp.h
---- linux-2.6.38.4/include/net/tcp.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/tcp.h 2011-04-28 19:34:15.000000000 -0400
-@@ -1382,7 +1382,7 @@ enum tcp_seq_states {
+diff -urNp linux-2.6.39/include/net/tcp.h linux-2.6.39/include/net/tcp.h
+--- linux-2.6.39/include/net/tcp.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/net/tcp.h 2011-05-22 19:36:33.000000000 -0400
+@@ -1374,7 +1374,7 @@ enum tcp_seq_states {
struct tcp_seq_afinfo {
char *name;
sa_family_t family;
struct seq_operations seq_ops;
};
-diff -urNp linux-2.6.38.4/include/net/udp.h linux-2.6.38.4/include/net/udp.h
---- linux-2.6.38.4/include/net/udp.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/udp.h 2011-04-28 19:34:15.000000000 -0400
-@@ -223,7 +223,7 @@ struct udp_seq_afinfo {
+diff -urNp linux-2.6.39/include/net/udp.h linux-2.6.39/include/net/udp.h
+--- linux-2.6.39/include/net/udp.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/net/udp.h 2011-05-22 19:36:33.000000000 -0400
+@@ -234,7 +234,7 @@ struct udp_seq_afinfo {
char *name;
sa_family_t family;
struct udp_table *udp_table;
struct seq_operations seq_ops;
};
-diff -urNp linux-2.6.38.4/include/net/xfrm.h linux-2.6.38.4/include/net/xfrm.h
---- linux-2.6.38.4/include/net/xfrm.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/xfrm.h 2011-04-28 19:57:25.000000000 -0400
-@@ -484,7 +484,7 @@ struct xfrm_policy {
+diff -urNp linux-2.6.39/include/net/xfrm.h linux-2.6.39/include/net/xfrm.h
+--- linux-2.6.39/include/net/xfrm.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/net/xfrm.h 2011-05-22 19:36:33.000000000 -0400
+@@ -505,7 +505,7 @@ struct xfrm_policy {
struct timer_list timer;
struct flow_cache_object flo;
u32 priority;
u32 index;
struct xfrm_mark mark;
-diff -urNp linux-2.6.38.4/include/scsi/scsi_device.h linux-2.6.38.4/include/scsi/scsi_device.h
---- linux-2.6.38.4/include/scsi/scsi_device.h 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/include/scsi/scsi_device.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/include/pcmcia/ss.h linux-2.6.39/include/pcmcia/ss.h
+--- linux-2.6.39/include/pcmcia/ss.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/pcmcia/ss.h 2011-05-22 19:36:33.000000000 -0400
+@@ -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/include/rdma/ib_verbs.h linux-2.6.39/include/rdma/ib_verbs.h
+--- linux-2.6.39/include/rdma/ib_verbs.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/rdma/ib_verbs.h 2011-05-22 19:36:33.000000000 -0400
+@@ -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/include/scsi/libfc.h linux-2.6.39/include/scsi/libfc.h
+--- linux-2.6.39/include/scsi/libfc.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/include/scsi/scsi_device.h linux-2.6.39/include/scsi/scsi_device.h
+--- linux-2.6.39/include/scsi/scsi_device.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/scsi/scsi_device.h 2011-05-22 19:36:33.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
struct device sdev_gendev,
sdev_dev;
-diff -urNp linux-2.6.38.4/include/sound/ac97_codec.h linux-2.6.38.4/include/sound/ac97_codec.h
---- linux-2.6.38.4/include/sound/ac97_codec.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/sound/ac97_codec.h 2011-04-28 19:34:15.000000000 -0400
-@@ -419,15 +419,15 @@
+diff -urNp linux-2.6.39/include/sound/ac97_codec.h linux-2.6.39/include/sound/ac97_codec.h
+--- linux-2.6.39/include/sound/ac97_codec.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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 {
};
struct snd_ac97_bus_ops {
-diff -urNp linux-2.6.38.4/include/sound/ymfpci.h linux-2.6.38.4/include/sound/ymfpci.h
---- linux-2.6.38.4/include/sound/ymfpci.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/sound/ymfpci.h 2011-04-28 19:57:25.000000000 -0400
+@@ -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/include/sound/core.h linux-2.6.39/include/sound/core.h
+--- linux-2.6.39/include/sound/core.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/include/sound/pcm.h linux-2.6.39/include/sound/pcm.h
+--- linux-2.6.39/include/sound/pcm.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/sound/pcm.h 2011-05-22 19:36:33.000000000 -0400
+@@ -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/include/sound/rawmidi.h linux-2.6.39/include/sound/rawmidi.h
+--- linux-2.6.39/include/sound/rawmidi.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/sound/rawmidi.h 2011-05-22 19:36:33.000000000 -0400
+@@ -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
+
+- struct snd_rawmidi_global_ops *ops;
++ const struct snd_rawmidi_global_ops *ops;
+
+ struct snd_rawmidi_str streams[2];
+
+@@ -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);
+
+ /* callbacks */
+
+diff -urNp linux-2.6.39/include/sound/seq_device.h linux-2.6.39/include/sound/seq_device.h
+--- linux-2.6.39/include/sound/seq_device.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/include/sound/snd_wavefront.h linux-2.6.39/include/sound/snd_wavefront.h
+--- linux-2.6.39/include/sound/snd_wavefront.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/include/sound/soc.h linux-2.6.39/include/sound/soc.h
+--- linux-2.6.39/include/sound/soc.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/sound/soc.h 2011-05-22 19:36:33.000000000 -0400
+@@ -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/include/sound/ymfpci.h linux-2.6.39/include/sound/ymfpci.h
+--- linux-2.6.39/include/sound/ymfpci.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/sound/ymfpci.h 2011-05-22 19:36:33.000000000 -0400
@@ -358,7 +358,7 @@ struct snd_ymfpci {
spinlock_t reg_lock;
spinlock_t voice_lock;
struct snd_info_entry *proc_entry;
const struct firmware *dsp_microcode;
const struct firmware *controller_microcode;
-diff -urNp linux-2.6.38.4/include/target/target_core_base.h linux-2.6.38.4/include/target/target_core_base.h
---- linux-2.6.38.4/include/target/target_core_base.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/target/target_core_base.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/include/target/target_core_base.h linux-2.6.39/include/target/target_core_base.h
+--- linux-2.6.39/include/target/target_core_base.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/target/target_core_base.h 2011-05-22 19:36:33.000000000 -0400
@@ -431,8 +431,8 @@ struct se_transport_task {
atomic_t t_task_cdbs_left;
atomic_t t_task_cdbs_ex_left;
atomic_t t_transport_active;
atomic_t t_transport_complete;
atomic_t t_transport_queue_active;
-@@ -753,7 +753,7 @@ struct se_device {
+@@ -773,7 +773,7 @@ struct se_device {
atomic_t active_cmds;
atomic_t simple_cmds;
atomic_t depth_left;
atomic_t dev_tur_active;
atomic_t execute_tasks;
atomic_t dev_status_thr_count;
-diff -urNp linux-2.6.38.4/include/trace/events/irq.h linux-2.6.38.4/include/trace/events/irq.h
---- linux-2.6.38.4/include/trace/events/irq.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/trace/events/irq.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/trace/events/irq.h linux-2.6.39/include/trace/events/irq.h
+--- linux-2.6.39/include/trace/events/irq.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/trace/events/irq.h 2011-05-22 19:36:33.000000000 -0400
@@ -36,7 +36,7 @@ struct softirq_action;
*/
TRACE_EVENT(irq_handler_entry,
TP_ARGS(irq, action, ret),
-diff -urNp linux-2.6.38.4/include/video/udlfb.h linux-2.6.38.4/include/video/udlfb.h
---- linux-2.6.38.4/include/video/udlfb.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/video/udlfb.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/include/video/udlfb.h linux-2.6.39/include/video/udlfb.h
+--- linux-2.6.39/include/video/udlfb.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/video/udlfb.h 2011-05-22 19:36:33.000000000 -0400
@@ -51,10 +51,10 @@ struct dlfb_data {
int base8;
u32 pseudo_palette[256];
};
#define NR_USB_REQUEST_I2C_SUB_IO 0x02
-diff -urNp linux-2.6.38.4/include/video/uvesafb.h linux-2.6.38.4/include/video/uvesafb.h
---- linux-2.6.38.4/include/video/uvesafb.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/video/uvesafb.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/include/video/uvesafb.h linux-2.6.39/include/video/uvesafb.h
+--- linux-2.6.39/include/video/uvesafb.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/include/video/uvesafb.h 2011-05-22 19:36:33.000000000 -0400
@@ -177,6 +177,7 @@ struct uvesafb_par {
u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
u8 pmi_setpal; /* PMI for palette changes */
void *pmi_start;
void *pmi_pal;
u8 *vbe_state_orig; /*
-diff -urNp linux-2.6.38.4/init/do_mounts.c linux-2.6.38.4/init/do_mounts.c
---- linux-2.6.38.4/init/do_mounts.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/init/do_mounts.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/init/do_mounts.c linux-2.6.39/init/do_mounts.c
+--- linux-2.6.39/init/do_mounts.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/init/do_mounts.c 2011-05-22 19:36:33.000000000 -0400
@@ -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)
if (err)
return err;
-@@ -382,18 +382,18 @@ void __init change_floppy(char *fmt, ...
+@@ -383,18 +383,18 @@ void __init change_floppy(char *fmt, ...
va_start(args, fmt);
vsprintf(buf, fmt, args);
va_end(args);
termios.c_lflag |= ICANON;
sys_ioctl(fd, TCSETSF, (long)&termios);
sys_close(fd);
-@@ -487,6 +487,6 @@ void __init prepare_namespace(void)
+@@ -488,6 +488,6 @@ void __init prepare_namespace(void)
mount_root();
out:
devtmpfs_mount("dev");
+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
sys_chroot((const char __user __force *)".");
}
-diff -urNp linux-2.6.38.4/init/do_mounts.h linux-2.6.38.4/init/do_mounts.h
---- linux-2.6.38.4/init/do_mounts.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/init/do_mounts.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/init/do_mounts.h linux-2.6.39/init/do_mounts.h
+--- linux-2.6.39/init/do_mounts.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/init/do_mounts.h 2011-05-22 19:36:33.000000000 -0400
@@ -15,15 +15,15 @@ extern int root_mountflags;
static inline int create_dev(char *name, dev_t dev)
return 0;
if (!S_ISBLK(stat.st_mode))
return 0;
-diff -urNp linux-2.6.38.4/init/do_mounts_initrd.c linux-2.6.38.4/init/do_mounts_initrd.c
---- linux-2.6.38.4/init/do_mounts_initrd.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/init/do_mounts_initrd.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/init/do_mounts_initrd.c linux-2.6.39/init/do_mounts_initrd.c
+--- linux-2.6.39/init/do_mounts_initrd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/init/do_mounts_initrd.c 2011-05-22 19:36:33.000000000 -0400
@@ -44,13 +44,13 @@ static void __init handle_initrd(void)
create_dev("/dev/root.old", Root_RAM0);
/* mount initrd on rootfs' /root */
+ sys_unlink((__force const char __user *)"/initrd.image");
return 0;
}
-diff -urNp linux-2.6.38.4/init/do_mounts_md.c linux-2.6.38.4/init/do_mounts_md.c
---- linux-2.6.38.4/init/do_mounts_md.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/init/do_mounts_md.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/init/do_mounts_md.c linux-2.6.39/init/do_mounts_md.c
+--- linux-2.6.39/init/do_mounts_md.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/init/do_mounts_md.c 2011-05-22 19:36:33.000000000 -0400
@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
partitioned ? "_d" : "", minor,
md_setup_args[ent].device_names);
sys_ioctl(fd, BLKRRPART, 0);
}
sys_close(fd);
-diff -urNp linux-2.6.38.4/init/initramfs.c linux-2.6.38.4/init/initramfs.c
---- linux-2.6.38.4/init/initramfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/init/initramfs.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/init/initramfs.c linux-2.6.39/init/initramfs.c
+--- linux-2.6.39/init/initramfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/init/initramfs.c 2011-05-22 19:36:33.000000000 -0400
@@ -74,7 +74,7 @@ static void __init free_hash(void)
}
}
state = SkipIt;
next_state = Reset;
return 0;
-diff -urNp linux-2.6.38.4/init/Kconfig linux-2.6.38.4/init/Kconfig
---- linux-2.6.38.4/init/Kconfig 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/init/Kconfig 2011-04-28 19:34:15.000000000 -0400
-@@ -1185,7 +1185,7 @@ config SLUB_DEBUG
+diff -urNp linux-2.6.39/init/Kconfig linux-2.6.39/init/Kconfig
+--- linux-2.6.39/init/Kconfig 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/init/Kconfig 2011-05-22 19:36:33.000000000 -0400
+@@ -1202,7 +1202,7 @@ config SLUB_DEBUG
config COMPAT_BRK
bool "Disable heap randomization"
help
Randomizing heap placement makes heap exploits harder, but it
also breaks ancient binaries (including anything libc5 based).
-diff -urNp linux-2.6.38.4/init/main.c linux-2.6.38.4/init/main.c
---- linux-2.6.38.4/init/main.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/init/main.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/init/main.c linux-2.6.39/init/main.c
+--- linux-2.6.39/init/main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/init/main.c 2011-05-22 19:41:42.000000000 -0400
@@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void)
extern void tc_init(void);
#endif
/*
* Debug helper: via this flag we know that we are in 'early bootup code'
* where only the boot processor is running with IRQ disabled. This means
-@@ -206,6 +208,47 @@ static int __init set_reset_devices(char
+@@ -149,6 +151,49 @@ static int __init set_reset_devices(char
__setup("reset_devices", set_reset_devices);
+{
+#ifdef CONFIG_X86_32
+ unsigned int cpu;
++ struct desc_struct *gdt;
+
+ for (cpu = 0; cpu < NR_CPUS; cpu++) {
-+ get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_DS].type = 3;
-+ get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_DS].limit = 0xf;
-+ get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
-+ get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
++ gdt = get_cpu_gdt_table(cpu);
++ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
++ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
++ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
++ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
+ }
+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
+#else
static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
static const char *panic_later, *panic_param;
-@@ -751,6 +794,7 @@ int __init_or_module do_one_initcall(ini
+@@ -663,6 +708,7 @@ int __init_or_module do_one_initcall(ini
{
int count = preempt_count();
int ret;
if (initcall_debug)
ret = do_one_initcall_debug(fn);
-@@ -763,15 +807,15 @@ int __init_or_module do_one_initcall(ini
+@@ -675,15 +721,15 @@ int __init_or_module do_one_initcall(ini
sprintf(msgbuf, "error code %d ", ret);
if (preempt_count() != count) {
}
return ret;
-@@ -898,7 +942,7 @@ static int __init kernel_init(void * unu
+@@ -801,7 +847,7 @@ static int __init kernel_init(void * unu
do_basic_setup();
/* Open the /dev/console on the rootfs, this should never fail */
printk(KERN_WARNING "Warning: unable to open an initial console.\n");
(void) sys_dup(0);
-@@ -911,11 +955,13 @@ static int __init kernel_init(void * unu
+@@ -814,11 +860,13 @@ static int __init kernel_init(void * unu
if (!ramdisk_execute_command)
ramdisk_execute_command = "/init";
/*
* Ok, we have completed the initial bootup, and
* we're essentially up and running. Get rid of the
-diff -urNp linux-2.6.38.4/ipc/mqueue.c linux-2.6.38.4/ipc/mqueue.c
---- linux-2.6.38.4/ipc/mqueue.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/ipc/mqueue.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/ipc/mqueue.c linux-2.6.39/ipc/mqueue.c
+--- linux-2.6.39/ipc/mqueue.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/ipc/mqueue.c 2011-05-22 19:41:42.000000000 -0400
@@ -154,6 +154,7 @@ static struct inode *mqueue_get_inode(st
mq_bytes = (mq_msg_tblsz +
(info->attr.mq_maxmsg * info->attr.mq_msgsize));
spin_lock(&mq_lock);
if (u->mq_bytes + mq_bytes < u->mq_bytes ||
u->mq_bytes + mq_bytes >
-diff -urNp linux-2.6.38.4/ipc/shm.c linux-2.6.38.4/ipc/shm.c
---- linux-2.6.38.4/ipc/shm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/ipc/shm.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/ipc/sem.c linux-2.6.39/ipc/sem.c
+--- linux-2.6.39/ipc/sem.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/ipc/sem.c 2011-05-22 19:36:33.000000000 -0400
+@@ -854,6 +854,8 @@ static int semctl_main(struct ipc_namesp
+ int nsems;
+ struct list_head tasks;
+
++ pax_track_stack();
++
+ sma = sem_lock_check(ns, semid);
+ if (IS_ERR(sma))
+ return PTR_ERR(sma);
+@@ -1301,6 +1303,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid,
+ struct ipc_namespace *ns;
+ struct list_head tasks;
+
++ pax_track_stack();
++
+ ns = current->nsproxy->ipc_ns;
+
+ if (nsops < 1 || semid < 0)
+diff -urNp linux-2.6.39/ipc/shm.c linux-2.6.39/ipc/shm.c
+--- linux-2.6.39/ipc/shm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/ipc/shm.c 2011-05-22 19:41:42.000000000 -0400
@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name
static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
#endif
shp->shm_segsz = size;
shp->shm_nattch = 0;
shp->shm_file = file;
-@@ -761,8 +777,6 @@ SYSCALL_DEFINE3(shmctl, int, shmid, int,
+@@ -762,8 +778,6 @@ SYSCALL_DEFINE3(shmctl, int, shmid, int,
case SHM_LOCK:
case SHM_UNLOCK:
{
lru_add_drain_all(); /* drain pagevecs to lru lists */
shp = shm_lock_check(ns, shmid);
-@@ -895,9 +909,21 @@ long do_shmat(int shmid, char __user *sh
+@@ -896,9 +910,21 @@ long do_shmat(int shmid, char __user *sh
if (err)
goto out_unlock;
size = i_size_read(path.dentry->d_inode);
shm_unlock(shp);
-diff -urNp linux-2.6.38.4/kernel/acct.c linux-2.6.38.4/kernel/acct.c
---- linux-2.6.38.4/kernel/acct.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/acct.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/acct.c linux-2.6.39/kernel/acct.c
+--- linux-2.6.39/kernel/acct.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/acct.c 2011-05-22 19:36:33.000000000 -0400
@@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a
*/
flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
sizeof(acct_t), &file->f_pos);
current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
set_fs(fs);
-diff -urNp linux-2.6.38.4/kernel/audit.c linux-2.6.38.4/kernel/audit.c
---- linux-2.6.38.4/kernel/audit.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/audit.c 2011-04-28 19:57:25.000000000 -0400
-@@ -110,7 +110,7 @@ u32 audit_sig_sid = 0;
+diff -urNp linux-2.6.39/kernel/audit.c linux-2.6.39/kernel/audit.c
+--- linux-2.6.39/kernel/audit.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/audit.c 2011-05-22 19:36:33.000000000 -0400
+@@ -112,7 +112,7 @@ u32 audit_sig_sid = 0;
3) suppressed due to audit_rate_limit
4) suppressed due to audit_backlog_limit
*/
/* The netlink socket. */
static struct sock *audit_sock;
-@@ -232,7 +232,7 @@ void audit_log_lost(const char *message)
+@@ -234,7 +234,7 @@ void audit_log_lost(const char *message)
unsigned long now;
int print;
print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
-@@ -251,7 +251,7 @@ void audit_log_lost(const char *message)
+@@ -253,7 +253,7 @@ void audit_log_lost(const char *message)
printk(KERN_WARNING
"audit: audit_lost=%d audit_rate_limit=%d "
"audit_backlog_limit=%d\n",
audit_rate_limit,
audit_backlog_limit);
audit_panic(message);
-@@ -684,7 +684,7 @@ static int audit_receive_msg(struct sk_b
+@@ -686,7 +686,7 @@ static int audit_receive_msg(struct sk_b
status_set.pid = audit_pid;
status_set.rate_limit = audit_rate_limit;
status_set.backlog_limit = audit_backlog_limit;
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.38.4/kernel/auditsc.c linux-2.6.38.4/kernel/auditsc.c
---- linux-2.6.38.4/kernel/auditsc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/auditsc.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/kernel/auditsc.c linux-2.6.39/kernel/auditsc.c
+--- linux-2.6.39/kernel/auditsc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/auditsc.c 2011-05-22 19:36:33.000000000 -0400
@@ -2111,7 +2111,7 @@ int auditsc_get_stamp(struct audit_conte
}
struct audit_context *context = task->audit_context;
if (context && context->in_syscall) {
-diff -urNp linux-2.6.38.4/kernel/capability.c linux-2.6.38.4/kernel/capability.c
---- linux-2.6.38.4/kernel/capability.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/capability.c 2011-04-28 19:34:15.000000000 -0400
-@@ -205,6 +205,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_
+diff -urNp linux-2.6.39/kernel/capability.c linux-2.6.39/kernel/capability.c
+--- linux-2.6.39/kernel/capability.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/capability.c 2011-05-22 21:02:23.000000000 -0400
+@@ -206,6 +206,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_
* before modification is attempted and the application
* fails.
*/
if (copy_to_user(dataptr, kdata, tocopy
* sizeof(struct __user_cap_data_struct))) {
return -EFAULT;
-@@ -306,10 +309,26 @@ int capable(int cap)
+@@ -378,7 +381,7 @@ bool ns_capable(struct user_namespace *n
BUG();
}
-- if (security_capable(current_cred(), cap) == 0) {
-+ if (security_capable(current_cred(), cap) == 0 && gr_is_capable(cap)) {
+- if (security_capable(ns, current_cred(), cap) == 0) {
++ if (security_capable(ns, current_cred(), cap) == 0 && gr_is_capable(cap)) {
current->flags |= PF_SUPERPRIV;
- return 1;
+ return true;
}
- return 0;
+@@ -386,6 +389,27 @@ bool ns_capable(struct user_namespace *n
}
-+
-+int capable_nolog(int cap)
+ EXPORT_SYMBOL(ns_capable);
+
++bool ns_capable_nolog(struct user_namespace *ns, int cap)
+{
+ if (unlikely(!cap_valid(cap))) {
+ printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
+ BUG();
+ }
+
-+ if (security_capable(current_cred(), cap) == 0 && gr_is_capable_nolog(cap)) {
++ if (security_capable(ns, current_cred(), cap) == 0 && gr_is_capable_nolog(cap)) {
+ current->flags |= PF_SUPERPRIV;
-+ return 1;
++ return true;
+ }
-+ return 0;
++ return false;
+}
++EXPORT_SYMBOL(ns_capable_nolog);
+
- EXPORT_SYMBOL(capable);
++bool capable_nolog(int cap)
++{
++ return ns_capable_nolog(&init_user_ns, cap);
++}
+EXPORT_SYMBOL(capable_nolog);
-diff -urNp linux-2.6.38.4/kernel/compat.c linux-2.6.38.4/kernel/compat.c
---- linux-2.6.38.4/kernel/compat.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/compat.c 2011-04-28 19:34:15.000000000 -0400
++
+ /**
+ * task_ns_capable - Determine whether current task has a superior
+ * capability targeted at a specific task's user namespace.
+@@ -400,6 +424,12 @@ bool task_ns_capable(struct task_struct
+ }
+ EXPORT_SYMBOL(task_ns_capable);
+
++bool task_ns_capable_nolog(struct task_struct *t, int cap)
++{
++ return ns_capable_nolog(task_cred_xxx(t, user)->user_ns, cap);
++}
++EXPORT_SYMBOL(task_ns_capable_nolog);
++
+ /**
+ * nsown_capable - Check superior capability to one's own user_ns
+ * @cap: The capability in question
+diff -urNp linux-2.6.39/kernel/cgroup.c linux-2.6.39/kernel/cgroup.c
+--- linux-2.6.39/kernel/cgroup.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/cgroup.c 2011-05-22 19:36:33.000000000 -0400
+@@ -598,6 +598,8 @@ static struct css_set *find_css_set(
+ struct hlist_head *hhead;
+ struct cg_cgroup_link *link;
+
++ pax_track_stack();
++
+ /* First see if we already have a cgroup group that matches
+ * the desired set */
+ read_lock(&css_set_lock);
+diff -urNp linux-2.6.39/kernel/compat.c linux-2.6.39/kernel/compat.c
+--- linux-2.6.39/kernel/compat.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/compat.c 2011-05-22 19:41:42.000000000 -0400
@@ -13,6 +13,7 @@
#include <linux/linkage.h>
#include <linux/errno.h>
#include <linux/time.h>
#include <linux/signal.h>
-diff -urNp linux-2.6.38.4/kernel/configs.c linux-2.6.38.4/kernel/configs.c
---- linux-2.6.38.4/kernel/configs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/configs.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/configs.c linux-2.6.39/kernel/configs.c
+--- linux-2.6.39/kernel/configs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/configs.c 2011-05-22 19:41:42.000000000 -0400
@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
struct proc_dir_entry *entry;
if (!entry)
return -ENOMEM;
-diff -urNp linux-2.6.38.4/kernel/cred.c linux-2.6.38.4/kernel/cred.c
---- linux-2.6.38.4/kernel/cred.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/cred.c 2011-04-28 19:34:15.000000000 -0400
-@@ -483,6 +483,8 @@ int commit_creds(struct cred *new)
+diff -urNp linux-2.6.39/kernel/cred.c linux-2.6.39/kernel/cred.c
+--- linux-2.6.39/kernel/cred.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/cred.c 2011-05-22 19:41:42.000000000 -0400
+@@ -158,6 +158,8 @@ static void put_cred_rcu(struct rcu_head
+ */
+ void __put_cred(struct cred *cred)
+ {
++ pax_track_stack();
++
+ kdebug("__put_cred(%p{%d,%d})", cred,
+ atomic_read(&cred->usage),
+ read_cred_subscribers(cred));
+@@ -182,6 +184,8 @@ void exit_creds(struct task_struct *tsk)
+ {
+ struct cred *cred;
+
++ pax_track_stack();
++
+ kdebug("exit_creds(%u,%p,%p,{%d,%d})", tsk->pid, tsk->real_cred, tsk->cred,
+ atomic_read(&tsk->cred->usage),
+ read_cred_subscribers(tsk->cred));
+@@ -220,6 +224,8 @@ const struct cred *get_task_cred(struct
+ {
+ const struct cred *cred;
+
++ pax_track_stack();
++
+ rcu_read_lock();
+
+ do {
+@@ -239,6 +245,8 @@ struct cred *cred_alloc_blank(void)
+ {
+ struct cred *new;
+
++ pax_track_stack();
++
+ new = kmem_cache_zalloc(cred_jar, GFP_KERNEL);
+ if (!new)
+ return NULL;
+@@ -287,6 +295,8 @@ struct cred *prepare_creds(void)
+ const struct cred *old;
+ struct cred *new;
+
++ pax_track_stack();
++
+ validate_process_creds();
+
+ new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
+@@ -333,6 +343,8 @@ struct cred *prepare_exec_creds(void)
+ struct thread_group_cred *tgcred = NULL;
+ struct cred *new;
+
++ pax_track_stack();
++
+ #ifdef CONFIG_KEYS
+ tgcred = kmalloc(sizeof(*tgcred), GFP_KERNEL);
+ if (!tgcred)
+@@ -385,6 +397,8 @@ int copy_creds(struct task_struct *p, un
+ struct cred *new;
+ int ret;
+
++ pax_track_stack();
++
+ if (
+ #ifdef CONFIG_KEYS
+ !p->cred->thread_keyring &&
+@@ -475,6 +489,8 @@ int commit_creds(struct cred *new)
+ struct task_struct *task = current;
+ const struct cred *old = task->real_cred;
+
++ pax_track_stack();
++
+ kdebug("commit_creds(%p{%d,%d})", new,
+ atomic_read(&new->usage),
+ read_cred_subscribers(new));
+@@ -489,6 +505,8 @@ int commit_creds(struct cred *new)
get_cred(new); /* we will require a ref for the subj creds too */
/* dumpability changes */
if (old->euid != new->euid ||
old->egid != new->egid ||
-diff -urNp linux-2.6.38.4/kernel/debug/debug_core.c linux-2.6.38.4/kernel/debug/debug_core.c
---- linux-2.6.38.4/kernel/debug/debug_core.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/debug/debug_core.c 2011-04-28 19:57:25.000000000 -0400
+@@ -551,6 +569,8 @@ EXPORT_SYMBOL(commit_creds);
+ */
+ void abort_creds(struct cred *new)
+ {
++ pax_track_stack();
++
+ kdebug("abort_creds(%p{%d,%d})", new,
+ atomic_read(&new->usage),
+ read_cred_subscribers(new));
+@@ -574,6 +594,8 @@ const struct cred *override_creds(const
+ {
+ const struct cred *old = current->cred;
+
++ pax_track_stack();
++
+ kdebug("override_creds(%p{%d,%d})", new,
+ atomic_read(&new->usage),
+ read_cred_subscribers(new));
+@@ -603,6 +625,8 @@ void revert_creds(const struct cred *old
+ {
+ const struct cred *override = current->cred;
+
++ pax_track_stack();
++
+ kdebug("revert_creds(%p{%d,%d})", old,
+ atomic_read(&old->usage),
+ read_cred_subscribers(old));
+@@ -649,6 +673,8 @@ struct cred *prepare_kernel_cred(struct
+ const struct cred *old;
+ struct cred *new;
+
++ pax_track_stack();
++
+ new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
+ if (!new)
+ return NULL;
+@@ -703,6 +729,8 @@ EXPORT_SYMBOL(prepare_kernel_cred);
+ */
+ int set_security_override(struct cred *new, u32 secid)
+ {
++ pax_track_stack();
++
+ return security_kernel_act_as(new, secid);
+ }
+ EXPORT_SYMBOL(set_security_override);
+@@ -722,6 +750,8 @@ int set_security_override_from_ctx(struc
+ u32 secid;
+ int ret;
+
++ pax_track_stack();
++
+ ret = security_secctx_to_secid(secctx, strlen(secctx), &secid);
+ if (ret < 0)
+ return ret;
+diff -urNp linux-2.6.39/kernel/debug/debug_core.c linux-2.6.39/kernel/debug/debug_core.c
+--- linux-2.6.39/kernel/debug/debug_core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/debug/debug_core.c 2011-05-22 19:36:33.000000000 -0400
@@ -72,7 +72,7 @@ int kgdb_io_module_registered;
/* Guard for recursive entry */
static int exception_level;
{
BUG_ON(kgdb_connected);
-diff -urNp linux-2.6.38.4/kernel/debug/kdb/kdb_main.c linux-2.6.38.4/kernel/debug/kdb/kdb_main.c
---- linux-2.6.38.4/kernel/debug/kdb/kdb_main.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/debug/kdb/kdb_main.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/debug/kdb/kdb_main.c linux-2.6.39/kernel/debug/kdb/kdb_main.c
+--- linux-2.6.39/kernel/debug/kdb/kdb_main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/debug/kdb/kdb_main.c 2011-05-22 19:36:33.000000000 -0400
@@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha
list_for_each_entry(mod, kdb_modules, list) {
#ifdef CONFIG_MODULE_UNLOAD
{
-diff -urNp linux-2.6.38.4/kernel/exit.c linux-2.6.38.4/kernel/exit.c
---- linux-2.6.38.4/kernel/exit.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/exit.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/exit.c linux-2.6.39/kernel/exit.c
+--- linux-2.6.39/kernel/exit.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/exit.c 2011-05-22 20:02:30.000000000 -0400
@@ -57,6 +57,10 @@
#include <asm/pgtable.h>
#include <asm/mmu_context.h>
/*
* If we were started as result of loading a module, close all of the
* user space pages. We don't need them, and if we didn't close them
-@@ -905,17 +933,17 @@ NORET_TYPE void do_exit(long code)
+@@ -905,15 +933,8 @@ NORET_TYPE void do_exit(long code)
struct task_struct *tsk = current;
int group_dead;
- profile_task_exit(tsk);
-
- WARN_ON(atomic_read(&tsk->fs_excl));
+- WARN_ON(blk_needs_flush_plug(tsk));
-
-+ /*
-+ * Check this first since set_fs() below depends on
-+ * current_thread_info(), which we better not access when we're in
-+ * interrupt context. Other than that, we want to do the set_fs()
-+ * as early as possible.
-+ */
if (unlikely(in_interrupt()))
panic("Aiee, killing interrupt handler!");
- if (unlikely(!tsk->pid))
- panic("Attempted to kill the idle task!");
/*
-- * If do_exit is called because this processes oopsed, it's possible
-+ * If do_exit is called because this processes Oops'ed, it's possible
- * that get_fs() was left as KERNEL_DS, so reset it to USER_DS before
- * continuing. Amongst other possible reasons, this is to prevent
- * mm_release()->clear_child_tid() from writing to a user-controlled
-@@ -923,6 +951,13 @@ NORET_TYPE void do_exit(long code)
+ * If do_exit is called because this processes oopsed, it's possible
+@@ -924,6 +945,14 @@ NORET_TYPE void do_exit(long code)
*/
set_fs(USER_DS);
+ profile_task_exit(tsk);
+
+ WARN_ON(atomic_read(&tsk->fs_excl));
++ WARN_ON(blk_needs_flush_plug(tsk));
+
+ if (unlikely(!tsk->pid))
+ panic("Attempted to kill the idle task!");
tracehook_report_exit(&code);
validate_creds_for_do_exit(tsk);
-@@ -983,6 +1018,9 @@ NORET_TYPE void do_exit(long code)
+@@ -984,6 +1013,9 @@ NORET_TYPE void do_exit(long code)
tsk->exit_code = code;
taskstats_exit(tsk, group_dead);
exit_mm(tsk);
if (group_dead)
-diff -urNp linux-2.6.38.4/kernel/fork.c linux-2.6.38.4/kernel/fork.c
---- linux-2.6.38.4/kernel/fork.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/fork.c 2011-04-28 19:34:15.000000000 -0400
-@@ -280,7 +280,7 @@ static struct task_struct *dup_task_stru
+diff -urNp linux-2.6.39/kernel/fork.c linux-2.6.39/kernel/fork.c
+--- linux-2.6.39/kernel/fork.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/fork.c 2011-05-22 19:41:42.000000000 -0400
+@@ -287,7 +287,7 @@ static struct task_struct *dup_task_stru
*stackend = STACK_END_MAGIC; /* for overflow detection */
#ifdef CONFIG_CC_STACKPROTECTOR
#endif
/* One for us, one for whoever does the "release_task()" (usually parent) */
-@@ -302,13 +302,78 @@ out:
+@@ -309,13 +309,78 @@ out:
}
#ifdef CONFIG_MMU
down_write(&oldmm->mmap_sem);
flush_cache_dup_mm(oldmm);
-@@ -320,8 +385,8 @@ static int dup_mmap(struct mm_struct *mm
+@@ -327,8 +392,8 @@ static int dup_mmap(struct mm_struct *mm
mm->locked_vm = 0;
mm->mmap = NULL;
mm->mmap_cache = NULL;
mm->map_count = 0;
cpumask_clear(mm_cpumask(mm));
mm->mm_rb = RB_ROOT;
-@@ -337,8 +402,6 @@ static int dup_mmap(struct mm_struct *mm
+@@ -344,8 +409,6 @@ static int dup_mmap(struct mm_struct *mm
prev = NULL;
for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
if (mpnt->vm_flags & VM_DONTCOPY) {
long pages = vma_pages(mpnt);
mm->total_vm -= pages;
-@@ -346,56 +409,13 @@ static int dup_mmap(struct mm_struct *mm
+@@ -353,56 +416,13 @@ static int dup_mmap(struct mm_struct *mm
-pages);
continue;
}
* Link in the new vma and copy the page table entries.
*/
*pprev = tmp;
-@@ -416,6 +436,31 @@ static int dup_mmap(struct mm_struct *mm
+@@ -423,6 +443,31 @@ static int dup_mmap(struct mm_struct *mm
if (retval)
goto out;
}
/* a new mm has just been created */
arch_dup_mmap(oldmm, mm);
retval = 0;
-@@ -424,14 +469,6 @@ out:
+@@ -431,14 +476,6 @@ out:
flush_tlb_mm(oldmm);
up_write(&oldmm->mmap_sem);
return retval;
}
static inline int mm_alloc_pgd(struct mm_struct * mm)
-@@ -778,13 +815,14 @@ static int copy_fs(unsigned long clone_f
+@@ -785,13 +822,14 @@ static int copy_fs(unsigned long clone_f
spin_unlock(&fs->lock);
return -EAGAIN;
}
return 0;
}
-@@ -1042,10 +1080,13 @@ static struct task_struct *copy_process(
+@@ -1049,10 +1087,13 @@ static struct task_struct *copy_process(
DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
#endif
retval = -EAGAIN;
goto bad_fork_free;
}
-@@ -1199,6 +1240,8 @@ static struct task_struct *copy_process(
+@@ -1200,6 +1241,8 @@ static struct task_struct *copy_process(
goto bad_fork_free_pid;
}
p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL;
/*
* Clear TID on mm_release()?
-@@ -1356,6 +1399,8 @@ bad_fork_cleanup_count:
+@@ -1360,6 +1403,8 @@ bad_fork_cleanup_count:
bad_fork_free:
free_task(p);
fork_out:
return ERR_PTR(retval);
}
-@@ -1444,6 +1489,8 @@ long do_fork(unsigned long clone_flags,
+@@ -1448,6 +1493,8 @@ long do_fork(unsigned long clone_flags,
if (clone_flags & CLONE_PARENT_SETTID)
put_user(nr, parent_tidptr);
if (clone_flags & CLONE_VFORK) {
p->vfork_done = &vfork;
init_completion(&vfork);
-@@ -1559,7 +1606,7 @@ static int unshare_fs(unsigned long unsh
+@@ -1549,7 +1596,7 @@ static int unshare_fs(unsigned long unsh
return 0;
/* don't need lock here; in the worst case we'll do useless copy */
return 0;
*new_fsp = copy_fs_struct(fs);
-@@ -1682,7 +1729,8 @@ SYSCALL_DEFINE1(unshare, unsigned long,
+@@ -1636,7 +1683,8 @@ SYSCALL_DEFINE1(unshare, unsigned long,
fs = current->fs;
spin_lock(&fs->lock);
current->fs = new_fs;
new_fs = NULL;
else
new_fs = fs;
-diff -urNp linux-2.6.38.4/kernel/futex.c linux-2.6.38.4/kernel/futex.c
---- linux-2.6.38.4/kernel/futex.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/kernel/futex.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/futex.c linux-2.6.39/kernel/futex.c
+--- linux-2.6.39/kernel/futex.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/futex.c 2011-05-22 22:41:57.000000000 -0400
@@ -54,6 +54,7 @@
#include <linux/mount.h>
#include <linux/pagemap.h>
/*
* The futex address must be "naturally" aligned.
*/
-@@ -2404,7 +2410,9 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
+@@ -1833,6 +1839,8 @@ static int futex_wait(u32 __user *uaddr,
+ struct futex_q q = futex_q_init;
+ int ret;
+
++ pax_track_stack();
++
+ if (!bitset)
+ return -EINVAL;
+ q.bitset = bitset;
+@@ -2229,6 +2237,8 @@ static int futex_wait_requeue_pi(u32 __u
+ struct futex_q q = futex_q_init;
+ int res, ret;
+
++ pax_track_stack();
++
+ if (!bitset)
+ return -EINVAL;
+
+@@ -2401,7 +2411,9 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
{
struct robust_list_head __user *head;
unsigned long ret;
if (!futex_cmpxchg_enabled)
return -ENOSYS;
-@@ -2420,11 +2428,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
+@@ -2417,6 +2429,10 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
if (!p)
goto err_unlock;
ret = -EPERM;
+ goto err_unlock;
+#else
pcred = __task_cred(p);
- if (cred->euid != pcred->euid &&
- cred->euid != pcred->uid &&
- !capable(CAP_SYS_PTRACE))
+ /* If victim is in different user_ns, then uids are not
+ comparable, so we must have CAP_SYS_PTRACE */
+@@ -2431,6 +2447,7 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
+ !ns_capable(pcred->user->user_ns, CAP_SYS_PTRACE))
goto err_unlock;
+ ok:
+#endif
head = p->robust_list;
rcu_read_unlock();
}
-@@ -2667,6 +2680,7 @@ static int __init futex_init(void)
+@@ -2682,6 +2699,7 @@ static int __init futex_init(void)
{
u32 curval;
int i;
/*
* This will fail and we want it. Some arch implementations do
-@@ -2678,7 +2692,10 @@ static int __init futex_init(void)
+@@ -2693,8 +2711,11 @@ static int __init futex_init(void)
* implementation, the non-functional ones will return
* -ENOSYS.
*/
+ oldfs = get_fs();
+ set_fs(USER_DS);
- curval = cmpxchg_futex_value_locked(NULL, 0, 0);
-+ set_fs(oldfs);
- if (curval == -EFAULT)
+ if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
futex_cmpxchg_enabled = 1;
++ set_fs(oldfs);
-diff -urNp linux-2.6.38.4/kernel/futex_compat.c linux-2.6.38.4/kernel/futex_compat.c
---- linux-2.6.38.4/kernel/futex_compat.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/futex_compat.c 2011-04-28 19:34:15.000000000 -0400
+ 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/kernel/futex_compat.c linux-2.6.39/kernel/futex_compat.c
+--- linux-2.6.39/kernel/futex_compat.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/futex_compat.c 2011-05-22 22:42:09.000000000 -0400
@@ -10,6 +10,7 @@
#include <linux/compat.h>
#include <linux/nsproxy.h>
if (!futex_cmpxchg_enabled)
return -ENOSYS;
-@@ -152,11 +156,16 @@ compat_sys_get_robust_list(int pid, comp
+@@ -152,6 +156,10 @@ compat_sys_get_robust_list(int pid, comp
if (!p)
goto err_unlock;
ret = -EPERM;
+ goto err_unlock;
+#else
pcred = __task_cred(p);
- if (cred->euid != pcred->euid &&
- cred->euid != pcred->uid &&
- !capable(CAP_SYS_PTRACE))
+ /* If victim is in different user_ns, then uids are not
+ comparable, so we must have CAP_SYS_PTRACE */
+@@ -166,6 +174,7 @@ compat_sys_get_robust_list(int pid, comp
+ !ns_capable(pcred->user->user_ns, CAP_SYS_PTRACE))
goto err_unlock;
+ ok:
+#endif
head = p->compat_robust_list;
rcu_read_unlock();
}
-diff -urNp linux-2.6.38.4/kernel/gcov/base.c linux-2.6.38.4/kernel/gcov/base.c
---- linux-2.6.38.4/kernel/gcov/base.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/gcov/base.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/gcov/base.c linux-2.6.39/kernel/gcov/base.c
+--- linux-2.6.39/kernel/gcov/base.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/gcov/base.c 2011-05-22 19:36:33.000000000 -0400
@@ -102,11 +102,6 @@ void gcov_enable_events(void)
}
if (prev)
prev->next = info->next;
else
-diff -urNp linux-2.6.38.4/kernel/hrtimer.c linux-2.6.38.4/kernel/hrtimer.c
---- linux-2.6.38.4/kernel/hrtimer.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/hrtimer.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1371,7 +1371,7 @@ void hrtimer_peek_ahead_timers(void)
+diff -urNp linux-2.6.39/kernel/hrtimer.c linux-2.6.39/kernel/hrtimer.c
+--- linux-2.6.39/kernel/hrtimer.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/hrtimer.c 2011-05-22 19:36:33.000000000 -0400
+@@ -1383,7 +1383,7 @@ void hrtimer_peek_ahead_timers(void)
local_irq_restore(flags);
}
{
hrtimer_peek_ahead_timers();
}
-diff -urNp linux-2.6.38.4/kernel/jump_label.c linux-2.6.38.4/kernel/jump_label.c
---- linux-2.6.38.4/kernel/jump_label.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/jump_label.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/jump_label.c linux-2.6.39/kernel/jump_label.c
+--- linux-2.6.39/kernel/jump_label.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/jump_label.c 2011-05-22 19:36:33.000000000 -0400
@@ -49,6 +49,17 @@ void jump_label_unlock(void)
mutex_unlock(&jump_label_mutex);
}
iter++;
}
}
-diff -urNp linux-2.6.38.4/kernel/kallsyms.c linux-2.6.38.4/kernel/kallsyms.c
---- linux-2.6.38.4/kernel/kallsyms.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/kallsyms.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/kallsyms.c linux-2.6.39/kernel/kallsyms.c
+--- linux-2.6.39/kernel/kallsyms.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/kallsyms.c 2011-05-22 19:41:42.000000000 -0400
@@ -11,6 +11,9 @@
* Changed the compression method from stem compression to "table lookup"
* compression (see scripts/kallsyms.c for a more complete description)
+#endif
+
return 1;
- return in_gate_area_no_task(addr);
+ return in_gate_area_no_mm(addr);
}
static int is_ksym_addr(unsigned long addr)
if (all_var)
return is_kernel(addr);
-@@ -416,7 +455,6 @@ static unsigned long get_ksymbol_core(st
+@@ -454,7 +493,6 @@ static unsigned long get_ksymbol_core(st
static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
{
iter->nameoff = get_symbol_offset(new_pos);
iter->pos = new_pos;
}
-@@ -464,6 +502,11 @@ static int s_show(struct seq_file *m, vo
+@@ -502,6 +540,11 @@ static int s_show(struct seq_file *m, vo
{
struct kallsym_iter *iter = m->private;
/* Some debugging symbols have no name. Ignore them. */
if (!iter->name[0])
return 0;
-@@ -504,7 +547,7 @@ static int kallsyms_open(struct inode *i
+@@ -540,7 +583,7 @@ static int kallsyms_open(struct inode *i
struct kallsym_iter *iter;
int ret;
if (!iter)
return -ENOMEM;
reset_iter(iter, 0);
-diff -urNp linux-2.6.38.4/kernel/kmod.c linux-2.6.38.4/kernel/kmod.c
---- linux-2.6.38.4/kernel/kmod.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/kmod.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/kmod.c linux-2.6.39/kernel/kmod.c
+--- linux-2.6.39/kernel/kmod.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/kmod.c 2011-05-22 19:41:42.000000000 -0400
@@ -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.
EXPORT_SYMBOL(__request_module);
#endif /* CONFIG_MODULES */
-diff -urNp linux-2.6.38.4/kernel/kprobes.c linux-2.6.38.4/kernel/kprobes.c
---- linux-2.6.38.4/kernel/kprobes.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/kprobes.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/kprobes.c linux-2.6.39/kernel/kprobes.c
+--- linux-2.6.39/kernel/kprobes.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/kprobes.c 2011-05-22 19:36:33.000000000 -0400
@@ -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.
head = &kprobe_table[i];
preempt_disable();
-diff -urNp linux-2.6.38.4/kernel/lockdep.c linux-2.6.38.4/kernel/lockdep.c
---- linux-2.6.38.4/kernel/lockdep.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/lockdep.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/lockdep.c linux-2.6.39/kernel/lockdep.c
+--- linux-2.6.39/kernel/lockdep.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/lockdep.c 2011-05-22 19:36:33.000000000 -0400
@@ -571,6 +571,10 @@ static int static_obj(void *obj)
end = (unsigned long) &_end,
addr = (unsigned long) obj;
if (very_verbose(class)) {
printk("\nacquire class [%p] %s", class->key, class->name);
if (class->name_version > 1)
-diff -urNp linux-2.6.38.4/kernel/lockdep_proc.c linux-2.6.38.4/kernel/lockdep_proc.c
---- linux-2.6.38.4/kernel/lockdep_proc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/lockdep_proc.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/lockdep_proc.c linux-2.6.39/kernel/lockdep_proc.c
+--- linux-2.6.39/kernel/lockdep_proc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/lockdep_proc.c 2011-05-22 19:36:33.000000000 -0400
@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
static void print_name(struct seq_file *m, struct lock_class *class)
const char *name = class->name;
if (!name) {
-diff -urNp linux-2.6.38.4/kernel/module.c linux-2.6.38.4/kernel/module.c
---- linux-2.6.38.4/kernel/module.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/module.c 2011-04-29 18:46:41.000000000 -0400
+diff -urNp linux-2.6.39/kernel/module.c linux-2.6.39/kernel/module.c
+--- linux-2.6.39/kernel/module.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/module.c 2011-05-22 19:41:42.000000000 -0400
@@ -57,6 +57,7 @@
#include <linux/kmemleak.h>
#include <linux/jump_label.h>
- nextval = (unsigned long)mod->module_core+mod->core_text_size;
+ return NULL;
- /* Scan for closest preceeding symbol, and next symbol. (ELF
+ /* Scan for closest preceding symbol, and next symbol. (ELF
starts real symbols at 1). */
@@ -3215,7 +3339,7 @@ static int m_show(struct seq_file *m, vo
char buf[8];
mod->state == MODULE_STATE_COMING ? "Loading":
"Live");
/* Used by oprofile and other similar tools. */
-- seq_printf(m, " 0x%p", mod->module_core);
-+ seq_printf(m, " 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
+- seq_printf(m, " 0x%pK", mod->module_core);
++ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
/* Taints info */
if (mod->taints)
mod = NULL;
}
return mod;
-diff -urNp linux-2.6.38.4/kernel/mutex.c linux-2.6.38.4/kernel/mutex.c
---- linux-2.6.38.4/kernel/mutex.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/mutex.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/mutex.c linux-2.6.39/kernel/mutex.c
+--- linux-2.6.39/kernel/mutex.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/mutex.c 2011-05-22 19:36:33.000000000 -0400
@@ -160,7 +160,7 @@ __mutex_lock_common(struct mutex *lock,
*/
lock_acquired(&lock->dep_map, ip);
/* got the lock - rejoice! */
- mutex_remove_waiter(lock, &waiter, current_thread_info());
-+ mutex_remove_waiter(lock, &waiter, current);
++ mutex_remove_waiter(lock, &waiter, task);
mutex_set_owner(lock);
/* set it to 0 if there are no waiters left: */
-diff -urNp linux-2.6.38.4/kernel/mutex-debug.c linux-2.6.38.4/kernel/mutex-debug.c
---- linux-2.6.38.4/kernel/mutex-debug.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/mutex-debug.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/mutex-debug.c linux-2.6.39/kernel/mutex-debug.c
+--- linux-2.6.39/kernel/mutex-debug.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/mutex-debug.c 2011-05-22 19:36:33.000000000 -0400
@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute
}
- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
- ti->task->blocked_on = NULL;
+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
-+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter->task);
++ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
+ task->blocked_on = NULL;
list_del_init(&waiter->list);
DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
mutex_clear_owner(lock);
}
-diff -urNp linux-2.6.38.4/kernel/mutex-debug.h linux-2.6.38.4/kernel/mutex-debug.h
---- linux-2.6.38.4/kernel/mutex-debug.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/mutex-debug.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/mutex-debug.h linux-2.6.39/kernel/mutex-debug.h
+--- linux-2.6.39/kernel/mutex-debug.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/mutex-debug.h 2011-05-22 19:36:33.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,
}
static inline void mutex_clear_owner(struct mutex *lock)
-diff -urNp linux-2.6.38.4/kernel/mutex.h linux-2.6.38.4/kernel/mutex.h
---- linux-2.6.38.4/kernel/mutex.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/mutex.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/mutex.h linux-2.6.39/kernel/mutex.h
+--- linux-2.6.39/kernel/mutex.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/mutex.h 2011-05-22 19:36:33.000000000 -0400
@@ -19,7 +19,7 @@
#ifdef CONFIG_SMP
static inline void mutex_set_owner(struct mutex *lock)
}
static inline void mutex_clear_owner(struct mutex *lock)
-diff -urNp linux-2.6.38.4/kernel/padata.c linux-2.6.38.4/kernel/padata.c
---- linux-2.6.38.4/kernel/padata.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/padata.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/kernel/padata.c linux-2.6.39/kernel/padata.c
+--- linux-2.6.39/kernel/padata.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/padata.c 2011-05-22 19:36:33.000000000 -0400
@@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_ins
padata->pd = pd;
padata->cb_cpu = cb_cpu;
atomic_set(&pd->reorder_objects, 0);
atomic_set(&pd->refcnt, 0);
pd->pinst = pinst;
-diff -urNp linux-2.6.38.4/kernel/panic.c linux-2.6.38.4/kernel/panic.c
---- linux-2.6.38.4/kernel/panic.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/panic.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/panic.c linux-2.6.39/kernel/panic.c
+--- linux-2.6.39/kernel/panic.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/panic.c 2011-05-22 19:41:42.000000000 -0400
@@ -369,7 +369,7 @@ static void warn_slowpath_common(const c
const char *board;
__builtin_return_address(0));
}
EXPORT_SYMBOL(__stack_chk_fail);
-diff -urNp linux-2.6.38.4/kernel/perf_event.c linux-2.6.38.4/kernel/perf_event.c
---- linux-2.6.38.4/kernel/perf_event.c 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/kernel/perf_event.c 2011-04-28 19:57:25.000000000 -0400
-@@ -70,7 +70,7 @@ int sysctl_perf_event_mlock __read_mostl
- */
- int sysctl_perf_event_sample_rate __read_mostly = 100000;
+diff -urNp linux-2.6.39/kernel/params.c linux-2.6.39/kernel/params.c
+--- linux-2.6.39/kernel/params.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/params.c 2011-05-22 19:36:33.000000000 -0400
+@@ -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/kernel/perf_event.c linux-2.6.39/kernel/perf_event.c
+--- linux-2.6.39/kernel/perf_event.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/perf_event.c 2011-05-22 19:36:33.000000000 -0400
+@@ -170,7 +170,7 @@ int perf_proc_update_handler(struct ctl_
+ return 0;
+ }
-static atomic64_t perf_event_id;
+static atomic64_unchecked_t perf_event_id;
static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
enum event_type_t event_type);
-@@ -1923,7 +1923,7 @@ static void __perf_event_read(void *info
+@@ -2496,7 +2496,7 @@ static void __perf_event_read(void *info
static inline u64 perf_event_count(struct perf_event *event)
{
}
static u64 perf_event_read(struct perf_event *event)
-@@ -2442,9 +2442,9 @@ u64 perf_event_read_value(struct perf_ev
+@@ -3031,9 +3031,9 @@ u64 perf_event_read_value(struct perf_ev
mutex_lock(&event->child_mutex);
total += perf_event_read(event);
*enabled += event->total_time_enabled +
list_for_each_entry(child, &event->child_list, child_list) {
total += perf_event_read(child);
-@@ -2807,10 +2807,10 @@ void perf_event_update_userpage(struct p
+@@ -3396,10 +3396,10 @@ void perf_event_update_userpage(struct p
userpg->offset -= local64_read(&event->hw.prev_count);
userpg->time_enabled = event->total_time_enabled +
barrier();
++userpg->lock;
-@@ -3607,11 +3607,11 @@ static void perf_output_read_one(struct
+@@ -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) {
values[n++] = enabled +
}
if (read_format & PERF_FORMAT_ID)
values[n++] = primary_event_id(event);
-@@ -5597,7 +5597,7 @@ perf_event_alloc(struct perf_event_attr
+@@ -6201,7 +6201,7 @@ perf_event_alloc(struct perf_event_attr
event->parent = parent_event;
event->ns = get_pid_ns(current->nsproxy->pid_ns);
event->state = PERF_EVENT_STATE_INACTIVE;
-@@ -6095,10 +6095,10 @@ static void sync_child_event(struct perf
+@@ -6724,10 +6724,10 @@ static void sync_child_event(struct perf
/*
* Add back the child's count to the parent's count:
*/
&parent_event->child_total_time_running);
/*
-diff -urNp linux-2.6.38.4/kernel/pid.c linux-2.6.38.4/kernel/pid.c
---- linux-2.6.38.4/kernel/pid.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/kernel/pid.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/pid.c linux-2.6.39/kernel/pid.c
+--- linux-2.6.39/kernel/pid.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/pid.c 2011-05-22 19:41:42.000000000 -0400
@@ -33,6 +33,7 @@
#include <linux/rculist.h>
#include <linux/bootmem.h>
}
struct task_struct *find_task_by_vpid(pid_t vnr)
-diff -urNp linux-2.6.38.4/kernel/posix-cpu-timers.c linux-2.6.38.4/kernel/posix-cpu-timers.c
---- linux-2.6.38.4/kernel/posix-cpu-timers.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/posix-cpu-timers.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/posix-cpu-timers.c linux-2.6.39/kernel/posix-cpu-timers.c
+--- linux-2.6.39/kernel/posix-cpu-timers.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/posix-cpu-timers.c 2011-05-22 19:41:42.000000000 -0400
@@ -6,6 +6,7 @@
#include <linux/posix-timers.h>
#include <linux/errno.h>
#include <asm/uaccess.h>
#include <linux/kernel_stat.h>
#include <trace/events/timer.h>
-diff -urNp linux-2.6.38.4/kernel/posix-timers.c linux-2.6.38.4/kernel/posix-timers.c
---- linux-2.6.38.4/kernel/posix-timers.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/posix-timers.c 2011-04-28 19:34:15.000000000 -0400
-@@ -42,6 +42,7 @@
- #include <linux/compiler.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/kernel/posix-timers.c linux-2.6.39/kernel/posix-timers.c
+--- linux-2.6.39/kernel/posix-timers.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/posix-timers.c 2011-05-22 20:13:41.000000000 -0400
+@@ -43,6 +43,7 @@
#include <linux/idr.h>
+ #include <linux/posix-clock.h>
#include <linux/posix-timers.h>
+#include <linux/grsecurity.h>
#include <linux/syscalls.h>
#include <linux/wait.h>
#include <linux/workqueue.h>
-@@ -955,6 +956,13 @@ SYSCALL_DEFINE2(clock_settime, const clo
+@@ -227,7 +228,7 @@ static int posix_get_boottime(const cloc
+ */
+ 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,
+@@ -272,6 +273,8 @@ static __init int init_posix_timers(void
+ .timer_del = common_timer_del,
+ };
+
++ pax_track_stack();
++
+ 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
+ }
+
+ 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);
+ }
+
+-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)
+ 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);
+
+ 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 (!kc || !kc->clock_set)
+@@ -956,13 +959,20 @@ SYSCALL_DEFINE2(clock_settime, const clo
if (copy_from_user(&new_tp, tp, sizeof (*tp)))
return -EFAULT;
+ we hook
+ */
+
- return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp));
+ return kc->clock_set(which_clock, &new_tp);
}
-diff -urNp linux-2.6.38.4/kernel/power/poweroff.c linux-2.6.38.4/kernel/power/poweroff.c
---- linux-2.6.38.4/kernel/power/poweroff.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/power/poweroff.c 2011-04-28 19:34:15.000000000 -0400
+ 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/kernel/power/poweroff.c linux-2.6.39/kernel/power/poweroff.c
+--- linux-2.6.39/kernel/power/poweroff.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/power/poweroff.c 2011-05-22 19:36:33.000000000 -0400
@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
.enable_mask = SYSRQ_ENABLE_BOOT,
};
{
register_sysrq_key('o', &sysrq_poweroff_op);
return 0;
-diff -urNp linux-2.6.38.4/kernel/power/process.c linux-2.6.38.4/kernel/power/process.c
---- linux-2.6.38.4/kernel/power/process.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/power/process.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/power/process.c linux-2.6.39/kernel/power/process.c
+--- linux-2.6.39/kernel/power/process.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/power/process.c 2011-05-22 19:36:33.000000000 -0400
@@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_
u64 elapsed_csecs64;
unsigned int elapsed_csecs;
break;
if (pm_wakeup_pending()) {
-diff -urNp linux-2.6.38.4/kernel/printk.c linux-2.6.38.4/kernel/printk.c
---- linux-2.6.38.4/kernel/printk.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/printk.c 2011-04-28 19:34:15.000000000 -0400
-@@ -279,12 +279,17 @@ static int check_syslog_permissions(int
+diff -urNp linux-2.6.39/kernel/printk.c linux-2.6.39/kernel/printk.c
+--- linux-2.6.39/kernel/printk.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/printk.c 2011-05-22 19:41:42.000000000 -0400
+@@ -284,12 +284,17 @@ static int check_syslog_permissions(int
if (from_file && type != SYSLOG_ACTION_OPEN)
return 0;
"but no CAP_SYSLOG (deprecated).\n");
return 0;
}
-diff -urNp linux-2.6.38.4/kernel/profile.c linux-2.6.38.4/kernel/profile.c
---- linux-2.6.38.4/kernel/profile.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/profile.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/kernel/profile.c linux-2.6.39/kernel/profile.c
+--- linux-2.6.39/kernel/profile.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/profile.c 2011-05-22 19:36:33.000000000 -0400
@@ -39,7 +39,7 @@ struct profile_hit {
/* Oprofile timer tick hook */
static int (*timer_hook)(struct pt_regs *) __read_mostly;
return count;
}
-diff -urNp linux-2.6.38.4/kernel/ptrace.c linux-2.6.38.4/kernel/ptrace.c
---- linux-2.6.38.4/kernel/ptrace.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/ptrace.c 2011-04-28 19:34:15.000000000 -0400
-@@ -116,7 +116,8 @@ int ptrace_check_attach(struct task_stru
+diff -urNp linux-2.6.39/kernel/ptrace.c linux-2.6.39/kernel/ptrace.c
+--- linux-2.6.39/kernel/ptrace.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/ptrace.c 2011-05-23 17:07:00.000000000 -0400
+@@ -117,7 +117,8 @@ int ptrace_check_attach(struct task_stru
return ret;
}
{
const struct cred *cred = current_cred(), *tcred;
-@@ -140,7 +141,9 @@ int __ptrace_may_access(struct task_stru
- cred->gid != tcred->egid ||
- cred->gid != tcred->sgid ||
- cred->gid != tcred->gid) &&
-- !capable(CAP_SYS_PTRACE)) {
-+ ((!log && !capable_nolog(CAP_SYS_PTRACE)) ||
-+ (log && !capable(CAP_SYS_PTRACE)))
-+ ) {
- rcu_read_unlock();
- return -EPERM;
- }
-@@ -148,7 +151,9 @@ int __ptrace_may_access(struct task_stru
+@@ -143,7 +144,8 @@ int __ptrace_may_access(struct task_stru
+ cred->gid == tcred->sgid &&
+ cred->gid == tcred->gid))
+ goto ok;
+- if (ns_capable(tcred->user->user_ns, CAP_SYS_PTRACE))
++ if ((!log && ns_capable_nolog(tcred->user->user_ns, CAP_SYS_PTRACE)) ||
++ (log && ns_capable(tcred->user->user_ns, CAP_SYS_PTRACE)))
+ goto ok;
+ rcu_read_unlock();
+ return -EPERM;
+@@ -152,7 +154,9 @@ ok:
smp_rmb();
if (task->mm)
dumpable = get_dumpable(task->mm);
-- if (!dumpable && !capable(CAP_SYS_PTRACE))
+- if (!dumpable && !task_ns_capable(task, CAP_SYS_PTRACE))
+ if (!dumpable &&
-+ ((!log && !capable_nolog(CAP_SYS_PTRACE)) ||
-+ (log && !capable(CAP_SYS_PTRACE))))
++ ((!log && !task_ns_capable_nolog(task, CAP_SYS_PTRACE)) ||
++ (log && !task_ns_capable(task, CAP_SYS_PTRACE))))
return -EPERM;
return security_ptrace_access_check(task, mode);
-@@ -158,7 +163,16 @@ bool ptrace_may_access(struct task_struc
+@@ -162,7 +166,16 @@ bool ptrace_may_access(struct task_struc
{
int err;
task_lock(task);
task_unlock(task);
return !err;
}
-@@ -185,7 +199,7 @@ static int ptrace_attach(struct task_str
+@@ -189,7 +202,7 @@ static int ptrace_attach(struct task_str
goto out;
task_lock(task);
task_unlock(task);
if (retval)
goto unlock_creds;
-@@ -198,7 +212,7 @@ static int ptrace_attach(struct task_str
+@@ -202,7 +215,7 @@ static int ptrace_attach(struct task_str
goto unlock_tasklist;
task->ptrace = PT_PTRACED;
-- if (capable(CAP_SYS_PTRACE))
-+ if (capable_nolog(CAP_SYS_PTRACE))
+- if (task_ns_capable(task, CAP_SYS_PTRACE))
++ if (task_ns_capable_nolog(task, CAP_SYS_PTRACE))
task->ptrace |= PT_PTRACE_CAP;
__ptrace_link(task, current);
-@@ -369,7 +383,7 @@ int ptrace_readdata(struct task_struct *
+@@ -362,6 +375,8 @@ int ptrace_readdata(struct task_struct *
+ {
+ int copied = 0;
+
++ pax_track_stack();
++
+ while (len > 0) {
+ char buf[128];
+ int this_len, retval;
+@@ -373,7 +388,7 @@ int ptrace_readdata(struct task_struct *
break;
return -EIO;
}
return -EFAULT;
copied += retval;
src += retval;
-@@ -565,7 +579,7 @@ int ptrace_request(struct task_struct *c
+@@ -387,6 +402,8 @@ int ptrace_writedata(struct task_struct
+ {
+ int copied = 0;
+
++ pax_track_stack();
++
+ while (len > 0) {
+ char buf[128];
+ int this_len, retval;
+@@ -569,9 +586,11 @@ int ptrace_request(struct task_struct *c
{
int ret = -EIO;
siginfo_t siginfo;
+ void __user *datavp = (__force void __user *) data;
unsigned long __user *datalp = datavp;
++ pax_track_stack();
++
switch (request) {
-@@ -713,14 +727,21 @@ SYSCALL_DEFINE4(ptrace, long, request, l
+ case PTRACE_PEEKTEXT:
+ case PTRACE_PEEKDATA:
+@@ -717,14 +736,21 @@ SYSCALL_DEFINE4(ptrace, long, request, l
goto out;
}
goto out_put_task_struct;
}
-@@ -745,7 +766,7 @@ int generic_ptrace_peekdata(struct task_
+@@ -749,7 +775,7 @@ int generic_ptrace_peekdata(struct task_
copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
if (copied != sizeof(tmp))
return -EIO;
}
int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
-@@ -855,14 +876,21 @@ asmlinkage long compat_sys_ptrace(compat
+@@ -772,6 +798,8 @@ int compat_ptrace_request(struct task_st
+ siginfo_t siginfo;
+ int ret;
+
++ pax_track_stack();
++
+ switch (request) {
+ case PTRACE_PEEKTEXT:
+ case PTRACE_PEEKDATA:
+@@ -859,14 +887,21 @@ asmlinkage long compat_sys_ptrace(compat
goto out;
}
goto out_put_task_struct;
}
-diff -urNp linux-2.6.38.4/kernel/rcutorture.c linux-2.6.38.4/kernel/rcutorture.c
---- linux-2.6.38.4/kernel/rcutorture.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/rcutorture.c 2011-04-28 19:57:25.000000000 -0400
-@@ -139,12 +139,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_
+diff -urNp linux-2.6.39/kernel/rcutorture.c linux-2.6.39/kernel/rcutorture.c
+--- linux-2.6.39/kernel/rcutorture.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/rcutorture.c 2011-05-22 19:36:33.000000000 -0400
+@@ -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) =
{ 0 };
static long n_rcu_torture_boost_ktrerror;
static long n_rcu_torture_boost_rterror;
static long n_rcu_torture_boost_allocerror;
-@@ -226,11 +226,11 @@ rcu_torture_alloc(void)
+@@ -225,11 +225,11 @@ rcu_torture_alloc(void)
spin_lock_bh(&rcu_torture_lock);
if (list_empty(&rcu_torture_freelist)) {
p = rcu_torture_freelist.next;
list_del_init(p);
spin_unlock_bh(&rcu_torture_lock);
-@@ -243,7 +243,7 @@ rcu_torture_alloc(void)
+@@ -242,7 +242,7 @@ rcu_torture_alloc(void)
static void
rcu_torture_free(struct rcu_torture *p)
{
spin_lock_bh(&rcu_torture_lock);
list_add_tail(&p->rtort_free, &rcu_torture_freelist);
spin_unlock_bh(&rcu_torture_lock);
-@@ -363,7 +363,7 @@ rcu_torture_cb(struct rcu_head *p)
+@@ -362,7 +362,7 @@ rcu_torture_cb(struct rcu_head *p)
i = rp->rtort_pipe_count;
if (i > RCU_TORTURE_PIPE_LEN)
i = RCU_TORTURE_PIPE_LEN;
if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
rp->rtort_mbtest = 0;
rcu_torture_free(rp);
-@@ -410,7 +410,7 @@ static void rcu_sync_torture_deferred_fr
+@@ -409,7 +409,7 @@ static void rcu_sync_torture_deferred_fr
i = rp->rtort_pipe_count;
if (i > RCU_TORTURE_PIPE_LEN)
i = RCU_TORTURE_PIPE_LEN;
if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
rp->rtort_mbtest = 0;
list_del(&rp->rtort_free);
-@@ -883,7 +883,7 @@ rcu_torture_writer(void *arg)
+@@ -882,7 +882,7 @@ rcu_torture_writer(void *arg)
i = old_rp->rtort_pipe_count;
if (i > RCU_TORTURE_PIPE_LEN)
i = RCU_TORTURE_PIPE_LEN;
old_rp->rtort_pipe_count++;
cur_ops->deferred_free(old_rp);
}
-@@ -952,7 +952,7 @@ static void rcu_torture_timer(unsigned l
+@@ -951,7 +951,7 @@ static void rcu_torture_timer(unsigned l
return;
}
if (p->rtort_mbtest == 0)
spin_lock(&rand_lock);
cur_ops->read_delay(&rand);
n_rcu_torture_timers++;
-@@ -1014,7 +1014,7 @@ rcu_torture_reader(void *arg)
+@@ -1013,7 +1013,7 @@ rcu_torture_reader(void *arg)
continue;
}
if (p->rtort_mbtest == 0)
cur_ops->read_delay(&rand);
preempt_disable();
pipe_count = p->rtort_pipe_count;
-@@ -1073,10 +1073,10 @@ rcu_torture_printk(char *page)
+@@ -1072,10 +1072,10 @@ rcu_torture_printk(char *page)
rcu_torture_current,
rcu_torture_current_version,
list_empty(&rcu_torture_freelist),
n_rcu_torture_boost_ktrerror,
n_rcu_torture_boost_rterror,
n_rcu_torture_boost_allocerror,
-@@ -1084,7 +1084,7 @@ rcu_torture_printk(char *page)
+@@ -1083,7 +1083,7 @@ rcu_torture_printk(char *page)
n_rcu_torture_boost_failure,
n_rcu_torture_boosts,
n_rcu_torture_timers);
n_rcu_torture_boost_ktrerror != 0 ||
n_rcu_torture_boost_rterror != 0 ||
n_rcu_torture_boost_allocerror != 0 ||
-@@ -1094,7 +1094,7 @@ rcu_torture_printk(char *page)
+@@ -1093,7 +1093,7 @@ rcu_torture_printk(char *page)
cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
if (i > 1) {
cnt += sprintf(&page[cnt], "!!! ");
WARN_ON_ONCE(1);
}
cnt += sprintf(&page[cnt], "Reader Pipe: ");
-@@ -1108,7 +1108,7 @@ rcu_torture_printk(char *page)
+@@ -1107,7 +1107,7 @@ rcu_torture_printk(char *page)
cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
cnt += sprintf(&page[cnt], " %d",
}
cnt += sprintf(&page[cnt], "\n");
if (cur_ops->stats)
-@@ -1416,7 +1416,7 @@ rcu_torture_cleanup(void)
+@@ -1415,7 +1415,7 @@ rcu_torture_cleanup(void)
if (cur_ops->cleanup)
cur_ops->cleanup();
rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
else
rcu_torture_print_module_parms(cur_ops, "End of test: SUCCESS");
-@@ -1480,11 +1480,11 @@ rcu_torture_init(void)
+@@ -1479,11 +1479,11 @@ rcu_torture_init(void)
rcu_torture_current = NULL;
rcu_torture_current_version = 0;
n_rcu_torture_boost_ktrerror = 0;
n_rcu_torture_boost_rterror = 0;
n_rcu_torture_boost_allocerror = 0;
-@@ -1492,7 +1492,7 @@ rcu_torture_init(void)
+@@ -1491,7 +1491,7 @@ rcu_torture_init(void)
n_rcu_torture_boost_failure = 0;
n_rcu_torture_boosts = 0;
for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
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.38.4/kernel/rcutree.c linux-2.6.38.4/kernel/rcutree.c
---- linux-2.6.38.4/kernel/rcutree.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/rcutree.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/rcutree.c linux-2.6.39/kernel/rcutree.c
+--- linux-2.6.39/kernel/rcutree.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/rcutree.c 2011-05-22 19:36:33.000000000 -0400
@@ -1389,7 +1389,7 @@ __rcu_process_callbacks(struct rcu_state
/*
* Do softirq processing for the current CPU.
{
/*
* Memory references from any prior RCU read-side critical sections
-diff -urNp linux-2.6.38.4/kernel/rcutree_plugin.h linux-2.6.38.4/kernel/rcutree_plugin.h
---- linux-2.6.38.4/kernel/rcutree_plugin.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/rcutree_plugin.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/kernel/rcutree_plugin.h linux-2.6.39/kernel/rcutree_plugin.h
+--- linux-2.6.39/kernel/rcutree_plugin.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/rcutree_plugin.h 2011-05-22 19:36:33.000000000 -0400
@@ -730,7 +730,7 @@ void synchronize_rcu_expedited(void)
/* Clean up and exit. */
put_online_cpus();
}
-diff -urNp linux-2.6.38.4/kernel/resource.c linux-2.6.38.4/kernel/resource.c
---- linux-2.6.38.4/kernel/resource.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/resource.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/relay.c linux-2.6.39/kernel/relay.c
+--- linux-2.6.39/kernel/relay.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/relay.c 2011-05-22 19:36:33.000000000 -0400
+@@ -1236,6 +1236,8 @@ static ssize_t subbuf_splice_actor(struc
+ };
+ ssize_t ret;
+
++ pax_track_stack();
++
+ if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
+ return 0;
+ if (splice_grow_spd(pipe, &spd))
+diff -urNp linux-2.6.39/kernel/resource.c linux-2.6.39/kernel/resource.c
+--- linux-2.6.39/kernel/resource.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/resource.c 2011-05-22 19:41:42.000000000 -0400
@@ -133,8 +133,18 @@ static const struct file_operations proc
static int __init ioresources_init(void)
return 0;
}
__initcall(ioresources_init);
-diff -urNp linux-2.6.38.4/kernel/rtmutex.c linux-2.6.38.4/kernel/rtmutex.c
---- linux-2.6.38.4/kernel/rtmutex.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/rtmutex.c 2011-04-28 19:34:15.000000000 -0400
-@@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt
- */
- raw_spin_lock_irqsave(&pendowner->pi_lock, flags);
-
-- WARN_ON(!pendowner->pi_blocked_on);
-+ BUG_ON(!pendowner->pi_blocked_on);
- WARN_ON(pendowner->pi_blocked_on != waiter);
- WARN_ON(pendowner->pi_blocked_on->lock != lock);
-
-diff -urNp linux-2.6.38.4/kernel/rtmutex-tester.c linux-2.6.38.4/kernel/rtmutex-tester.c
---- linux-2.6.38.4/kernel/rtmutex-tester.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/rtmutex-tester.c 2011-04-28 19:57:25.000000000 -0400
-@@ -21,7 +21,7 @@
+diff -urNp linux-2.6.39/kernel/rtmutex-tester.c linux-2.6.39/kernel/rtmutex-tester.c
+--- linux-2.6.39/kernel/rtmutex-tester.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/rtmutex-tester.c 2011-05-22 19:36:33.000000000 -0400
+@@ -20,7 +20,7 @@
#define MAX_RT_TEST_MUTEXES 8
static spinlock_t rttest_lock;
struct test_thread_data {
int opcode;
-@@ -64,7 +64,7 @@ static int handle_op(struct test_thread_
+@@ -61,7 +61,7 @@ static int handle_op(struct test_thread_
case RTTEST_LOCKCONT:
td->mutexes[td->opdata] = 1;
return 0;
case RTTEST_RESET:
-@@ -84,7 +84,7 @@ static int handle_op(struct test_thread_
+@@ -74,7 +74,7 @@ static int handle_op(struct test_thread_
return 0;
case RTTEST_RESETEVENT:
return 0;
default:
-@@ -101,9 +101,9 @@ static int handle_op(struct test_thread_
+@@ -91,9 +91,9 @@ static int handle_op(struct test_thread_
return ret;
td->mutexes[id] = 1;
td->mutexes[id] = 4;
return 0;
-@@ -114,9 +114,9 @@ static int handle_op(struct test_thread_
+@@ -104,9 +104,9 @@ static int handle_op(struct test_thread_
return ret;
td->mutexes[id] = 1;
td->mutexes[id] = ret ? 0 : 4;
return ret ? -EINTR : 0;
-@@ -125,9 +125,9 @@ static int handle_op(struct test_thread_
+@@ -115,9 +115,9 @@ static int handle_op(struct test_thread_
if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
return ret;
td->mutexes[id] = 0;
return 0;
-@@ -193,7 +193,7 @@ void schedule_rt_mutex_test(struct rt_mu
+@@ -164,7 +164,7 @@ void schedule_rt_mutex_test(struct rt_mu
break;
td->mutexes[dat] = 2;
+ td->event = atomic_add_return_unchecked(1, &rttest_event);
break;
- case RTTEST_LOCKBKL:
-@@ -214,7 +214,7 @@ void schedule_rt_mutex_test(struct rt_mu
+ default:
+@@ -184,7 +184,7 @@ void schedule_rt_mutex_test(struct rt_mu
return;
td->mutexes[dat] = 3;
break;
case RTTEST_LOCKNOWAIT:
-@@ -226,7 +226,7 @@ void schedule_rt_mutex_test(struct rt_mu
+@@ -196,7 +196,7 @@ void schedule_rt_mutex_test(struct rt_mu
return;
td->mutexes[dat] = 1;
+ td->event = atomic_add_return_unchecked(1, &rttest_event);
return;
- case RTTEST_LOCKBKL:
-diff -urNp linux-2.6.38.4/kernel/sched_autogroup.c linux-2.6.38.4/kernel/sched_autogroup.c
---- linux-2.6.38.4/kernel/sched_autogroup.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/sched_autogroup.c 2011-04-28 19:57:25.000000000 -0400
+ default:
+diff -urNp linux-2.6.39/kernel/sched_autogroup.c linux-2.6.39/kernel/sched_autogroup.c
+--- linux-2.6.39/kernel/sched_autogroup.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/sched_autogroup.c 2011-05-22 19:36:33.000000000 -0400
@@ -7,7 +7,7 @@
unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
static void __init autogroup_init(struct task_struct *init_task)
{
-@@ -79,7 +79,7 @@ static inline struct autogroup *autogrou
+@@ -78,7 +78,7 @@ static inline struct autogroup *autogrou
kref_init(&ag->kref);
init_rwsem(&ag->lock);
ag->tg = tg;
#ifdef CONFIG_RT_GROUP_SCHED
/*
-diff -urNp linux-2.6.38.4/kernel/sched.c linux-2.6.38.4/kernel/sched.c
---- linux-2.6.38.4/kernel/sched.c 2011-04-18 17:27:14.000000000 -0400
-+++ linux-2.6.38.4/kernel/sched.c 2011-04-28 19:34:15.000000000 -0400
-@@ -4024,7 +4024,7 @@ EXPORT_SYMBOL(schedule);
+diff -urNp linux-2.6.39/kernel/sched.c linux-2.6.39/kernel/sched.c
+--- linux-2.6.39/kernel/sched.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/sched.c 2011-05-23 17:07:00.000000000 -0400
+@@ -4078,6 +4078,8 @@ asmlinkage void __sched schedule(void)
+ struct rq *rq;
+ int cpu;
+
++ pax_track_stack();
++
+ need_resched:
+ preempt_disable();
+ cpu = smp_processor_id();
+@@ -4165,7 +4167,7 @@ EXPORT_SYMBOL(schedule);
* Look out! "owner" is an entirely speculative pointer
* access and not reliable.
*/
{
unsigned int cpu;
struct rq *rq;
-@@ -4038,10 +4038,10 @@ int mutex_spin_on_owner(struct mutex *lo
+@@ -4179,10 +4181,10 @@ int mutex_spin_on_owner(struct mutex *lo
* DEBUG_PAGEALLOC could have unmapped it if
* the mutex owner just released it and exited.
*/
#endif
/*
-@@ -4078,7 +4078,7 @@ int mutex_spin_on_owner(struct mutex *lo
+@@ -4219,7 +4221,7 @@ int mutex_spin_on_owner(struct mutex *lo
/*
* Is that owner really running on that cpu?
*/
return 0;
arch_mutex_cpu_relax();
-@@ -4638,6 +4638,8 @@ int can_nice(const struct task_struct *p
+@@ -4778,6 +4780,8 @@ int can_nice(const struct task_struct *p
/* convert nice value [19,-20] to rlimit style value [1,40] */
int nice_rlim = 20 - nice;
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
-@@ -4671,7 +4673,8 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -4811,7 +4815,8 @@ SYSCALL_DEFINE1(nice, int, increment)
if (nice > 19)
nice = 19;
return -EPERM;
retval = security_task_setnice(current, nice);
-@@ -4814,6 +4817,7 @@ recheck:
+@@ -4957,6 +4962,7 @@ recheck:
unsigned long rlim_rtprio =
task_rlimit(p, RLIMIT_RTPRIO);
/* can't set/change the rt policy */
if (policy != p->policy && !rlim_rtprio)
return -EPERM;
-@@ -6942,7 +6946,7 @@ static void init_sched_groups_power(int
+@@ -7164,7 +7170,7 @@ static void init_sched_groups_power(int
long power;
int weight;
if (cpu != group_first_cpu(sd->groups))
return;
-diff -urNp linux-2.6.38.4/kernel/sched_fair.c linux-2.6.38.4/kernel/sched_fair.c
---- linux-2.6.38.4/kernel/sched_fair.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/kernel/sched_fair.c 2011-04-28 19:34:15.000000000 -0400
-@@ -3957,7 +3957,7 @@ static void nohz_idle_balance(int this_c
+diff -urNp linux-2.6.39/kernel/sched_fair.c linux-2.6.39/kernel/sched_fair.c
+--- linux-2.6.39/kernel/sched_fair.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/sched_fair.c 2011-05-22 19:36:33.000000000 -0400
+@@ -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).
*/
{
int this_cpu = smp_processor_id();
struct rq *this_rq = cpu_rq(this_cpu);
-diff -urNp linux-2.6.38.4/kernel/signal.c linux-2.6.38.4/kernel/signal.c
---- linux-2.6.38.4/kernel/signal.c 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/kernel/signal.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/signal.c linux-2.6.39/kernel/signal.c
+--- linux-2.6.39/kernel/signal.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/signal.c 2011-05-23 17:07:00.000000000 -0400
@@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache
int print_fatal_signals __read_mostly;
if (is_global_init(tsk))
return 1;
if (handler != SIG_IGN && handler != SIG_DFL)
-@@ -678,6 +681,9 @@ static int check_kill_permission(int sig
+@@ -693,6 +696,9 @@ static int check_kill_permission(int sig
}
}
return security_task_kill(t, info, sig, 0);
}
-@@ -1025,7 +1031,7 @@ __group_send_sig_info(int sig, struct si
+@@ -1041,7 +1047,7 @@ __group_send_sig_info(int sig, struct si
return send_signal(sig, info, p, 1);
}
specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
{
return send_signal(sig, info, t, 0);
-@@ -1062,6 +1068,7 @@ force_sig_info(int sig, struct siginfo *
+@@ -1078,6 +1084,7 @@ force_sig_info(int sig, struct siginfo *
unsigned long int flags;
int ret, blocked, ignored;
struct k_sigaction *action;
spin_lock_irqsave(&t->sighand->siglock, flags);
action = &t->sighand->action[sig-1];
-@@ -1076,9 +1083,18 @@ force_sig_info(int sig, struct siginfo *
+@@ -1092,9 +1099,18 @@ force_sig_info(int sig, struct siginfo *
}
if (action->sa.sa_handler == SIG_DFL)
t->signal->flags &= ~SIGNAL_UNKILLABLE;
return ret;
}
-@@ -1137,8 +1153,11 @@ int group_send_sig_info(int sig, struct
+@@ -1153,8 +1169,11 @@ int group_send_sig_info(int sig, struct
ret = check_kill_permission(sig, info, p);
rcu_read_unlock();
return ret;
}
-diff -urNp linux-2.6.38.4/kernel/smp.c linux-2.6.38.4/kernel/smp.c
---- linux-2.6.38.4/kernel/smp.c 2011-04-18 17:27:14.000000000 -0400
-+++ linux-2.6.38.4/kernel/smp.c 2011-04-28 19:34:15.000000000 -0400
+@@ -1718,6 +1737,8 @@ void ptrace_notify(int exit_code)
+ {
+ siginfo_t info;
+
++ pax_track_stack();
++
+ BUG_ON((exit_code & (0x7f | ~0xffff)) != SIGTRAP);
+
+ memset(&info, 0, sizeof info);
+diff -urNp linux-2.6.39/kernel/smp.c linux-2.6.39/kernel/smp.c
+--- linux-2.6.39/kernel/smp.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/smp.c 2011-05-22 19:36:33.000000000 -0400
@@ -583,22 +583,22 @@ int smp_call_function(smp_call_func_t fu
}
EXPORT_SYMBOL(smp_call_function);
{
raw_spin_unlock_irq(&call_function.lock);
}
-diff -urNp linux-2.6.38.4/kernel/softirq.c linux-2.6.38.4/kernel/softirq.c
---- linux-2.6.38.4/kernel/softirq.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/softirq.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/softirq.c linux-2.6.39/kernel/softirq.c
+--- linux-2.6.39/kernel/softirq.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/softirq.c 2011-05-22 19:36:33.000000000 -0400
@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
- static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
+ DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
-char *softirq_to_name[NR_SOFTIRQS] = {
+const char * const softirq_to_name[NR_SOFTIRQS] = {
trace_softirq_exit(vec_nr);
if (unlikely(prev_count != preempt_count())) {
printk(KERN_ERR "huh, entered softirq %u %s %p"
-@@ -365,7 +365,7 @@ void raise_softirq(unsigned int nr)
+@@ -377,7 +377,7 @@ void raise_softirq(unsigned int nr)
local_irq_restore(flags);
}
{
softirq_vec[nr].action = action;
}
-@@ -421,7 +421,7 @@ void __tasklet_hi_schedule_first(struct
+@@ -433,7 +433,7 @@ void __tasklet_hi_schedule_first(struct
EXPORT_SYMBOL(__tasklet_hi_schedule_first);
{
struct tasklet_struct *list;
-@@ -456,7 +456,7 @@ static void tasklet_action(struct softir
+@@ -468,7 +468,7 @@ static void tasklet_action(struct softir
}
}
{
struct tasklet_struct *list;
-diff -urNp linux-2.6.38.4/kernel/sys.c linux-2.6.38.4/kernel/sys.c
---- linux-2.6.38.4/kernel/sys.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/sys.c 2011-04-28 19:34:15.000000000 -0400
-@@ -136,6 +136,12 @@ static int set_one_prio(struct task_stru
+diff -urNp linux-2.6.39/kernel/sys.c linux-2.6.39/kernel/sys.c
+--- linux-2.6.39/kernel/sys.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/sys.c 2011-05-22 21:08:10.000000000 -0400
+@@ -154,6 +154,12 @@ static int set_one_prio(struct task_stru
error = -EACCES;
goto out;
}
no_nice = security_task_setnice(p, niceval);
if (no_nice) {
error = no_nice;
-@@ -517,6 +523,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g
+@@ -538,6 +544,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g
goto error;
}
if (rgid != (gid_t) -1 ||
(egid != (gid_t) -1 && egid != old->gid))
new->sgid = new->egid;
-@@ -546,6 +555,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
+@@ -567,6 +576,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
old = current_cred();
retval = -EPERM;
+ if (gr_check_group_change(gid, gid, gid))
+ goto error;
+
- if (capable(CAP_SETGID))
+ if (nsown_capable(CAP_SETGID))
new->gid = new->egid = new->sgid = new->fsgid = gid;
else if (gid == old->gid || gid == old->sgid)
-@@ -626,6 +639,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u
+@@ -647,6 +660,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u
goto error;
}
if (new->uid != old->uid) {
retval = set_user(new);
if (retval < 0)
-@@ -670,6 +686,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
+@@ -691,6 +707,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
old = current_cred();
retval = -EPERM;
+ if (gr_check_user_change(uid, uid, uid))
+ goto error;
+
- if (capable(CAP_SETUID)) {
+ if (nsown_capable(CAP_SETUID)) {
new->suid = new->uid = uid;
if (uid != old->uid) {
-@@ -724,6 +746,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid,
+@@ -745,6 +767,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid,
goto error;
}
if (ruid != (uid_t) -1) {
new->uid = ruid;
if (ruid != old->uid) {
-@@ -788,6 +813,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid,
+@@ -809,6 +834,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid,
goto error;
}
if (rgid != (gid_t) -1)
new->gid = rgid;
if (egid != (gid_t) -1)
-@@ -834,6 +862,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
+@@ -855,6 +883,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
old = current_cred();
old_fsuid = old->fsuid;
+
if (uid == old->uid || uid == old->euid ||
uid == old->suid || uid == old->fsuid ||
- capable(CAP_SETUID)) {
-@@ -844,6 +875,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
+ nsown_capable(CAP_SETUID)) {
+@@ -865,6 +896,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
}
}
abort_creds(new);
return old_fsuid;
-@@ -870,12 +902,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
+@@ -891,12 +923,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
if (gid == old->gid || gid == old->egid ||
gid == old->sgid || gid == old->fsgid ||
- capable(CAP_SETGID)) {
+ nsown_capable(CAP_SETGID)) {
+ if (gr_check_group_change(-1, -1, gid))
+ goto error;
+
abort_creds(new);
return old_fsgid;
-@@ -1616,7 +1652,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
+@@ -1643,7 +1679,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
error = get_dumpable(me->mm);
break;
case PR_SET_DUMPABLE:
error = -EINVAL;
break;
}
-diff -urNp linux-2.6.38.4/kernel/sysctl.c linux-2.6.38.4/kernel/sysctl.c
---- linux-2.6.38.4/kernel/sysctl.c 2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/kernel/sysctl.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/sysctl.c linux-2.6.39/kernel/sysctl.c
+--- linux-2.6.39/kernel/sysctl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/sysctl.c 2011-05-22 20:23:10.000000000 -0400
@@ -84,6 +84,13 @@
/* External variables not in a header file. */
extern int sysctl_overcommit_memory;
-@@ -195,6 +202,7 @@ static int sysrq_sysctl_handler(ctl_tabl
+@@ -196,6 +203,7 @@ static int sysrq_sysctl_handler(ctl_tabl
}
#endif
static struct ctl_table root_table[];
static struct ctl_table_root sysctl_table_root;
-@@ -224,6 +232,20 @@ extern struct ctl_table epoll_table[];
+@@ -225,6 +233,20 @@ extern struct ctl_table epoll_table[];
int sysctl_legacy_va_layout;
#endif
/* The default sysctl tables: */
static struct ctl_table root_table[] = {
-@@ -270,6 +292,22 @@ static int max_extfrag_threshold = 1000;
+@@ -271,6 +293,22 @@ static int max_extfrag_threshold = 1000;
#endif
static struct ctl_table kern_table[] = {
{
.procname = "sched_child_runs_first",
.data = &sysctl_sched_child_runs_first,
-@@ -551,7 +589,7 @@ static struct ctl_table kern_table[] = {
+@@ -545,7 +583,7 @@ static struct ctl_table kern_table[] = {
.data = &modprobe_path,
.maxlen = KMOD_PATH_LEN,
.mode = 0644,
},
{
.procname = "modules_disabled",
-@@ -713,16 +751,20 @@ static struct ctl_table kern_table[] = {
+@@ -707,16 +745,20 @@ static struct ctl_table kern_table[] = {
.extra1 = &zero,
.extra2 = &one,
},
{
.procname = "ngroups_max",
.data = &ngroups_max,
-@@ -1187,6 +1229,13 @@ static struct ctl_table vm_table[] = {
+@@ -1189,6 +1231,13 @@ static struct ctl_table vm_table[] = {
.proc_handler = proc_dointvec_minmax,
.extra1 = &zero,
},
#else
{
.procname = "nr_trim_pages",
-@@ -1698,6 +1747,16 @@ int sysctl_perm(struct ctl_table_root *r
- int error;
+@@ -1698,6 +1747,17 @@ static int test_perm(int mode, int op)
+ int sysctl_perm(struct ctl_table_root *root, struct ctl_table *table, int op)
+ {
int mode;
-
++ int error;
++
+ if (table->parent != NULL && table->parent->procname != NULL &&
+ table->procname != NULL &&
+ gr_handle_sysctl_mod(table->parent->procname, table->procname, op))
+ error = gr_handle_sysctl(table, op);
+ if (error)
+ return error;
-+
- error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
- if (error)
- return error;
-@@ -2105,6 +2164,16 @@ int proc_dostring(struct ctl_table *tabl
+
+ if (root->permissions)
+ mode = root->permissions(root, current->nsproxy, table);
+@@ -2102,6 +2162,16 @@ int proc_dostring(struct ctl_table *tabl
buffer, lenp, ppos);
}
static size_t proc_skip_spaces(char **buf)
{
size_t ret;
-@@ -2210,6 +2279,8 @@ static int proc_put_long(void __user **b
+@@ -2207,6 +2277,8 @@ static int proc_put_long(void __user **b
len = strlen(tmp);
if (len > *size)
len = *size;
if (copy_to_user(*buf, tmp, len))
return -EFAULT;
*size -= len;
-@@ -2526,8 +2597,11 @@ static int __do_proc_doulongvec_minmax(v
+@@ -2523,8 +2595,11 @@ static int __do_proc_doulongvec_minmax(v
*i = val;
} else {
val = convdiv * (*i) / convmul;
err = proc_put_long(&buffer, &left, val, false);
if (err)
break;
-@@ -2922,6 +2996,12 @@ int proc_dostring(struct ctl_table *tabl
+@@ -2919,6 +2994,12 @@ int proc_dostring(struct ctl_table *tabl
return -ENOSYS;
}
int proc_dointvec(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
-@@ -2978,6 +3058,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
+@@ -2975,6 +3056,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
EXPORT_SYMBOL(proc_dostring);
EXPORT_SYMBOL(proc_doulongvec_minmax);
EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
EXPORT_SYMBOL(register_sysctl_table);
-diff -urNp linux-2.6.38.4/kernel/sysctl_check.c linux-2.6.38.4/kernel/sysctl_check.c
---- linux-2.6.38.4/kernel/sysctl_check.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/sysctl_check.c 2011-04-28 19:34:15.000000000 -0400
-@@ -131,6 +131,7 @@ int sysctl_check_table(struct nsproxy *n
+diff -urNp linux-2.6.39/kernel/sysctl_check.c linux-2.6.39/kernel/sysctl_check.c
+--- linux-2.6.39/kernel/sysctl_check.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/sysctl_check.c 2011-05-22 19:41:42.000000000 -0400
+@@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *n
set_fail(&fail, table, "Directory with extra2");
} else {
if ((table->proc_handler == proc_dostring) ||
(table->proc_handler == proc_dointvec) ||
(table->proc_handler == proc_dointvec_minmax) ||
(table->proc_handler == proc_dointvec_jiffies) ||
-diff -urNp linux-2.6.38.4/kernel/taskstats.c linux-2.6.38.4/kernel/taskstats.c
---- linux-2.6.38.4/kernel/taskstats.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/taskstats.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/taskstats.c linux-2.6.39/kernel/taskstats.c
+--- linux-2.6.39/kernel/taskstats.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/taskstats.c 2011-05-22 19:41:42.000000000 -0400
@@ -27,9 +27,12 @@
#include <linux/cgroup.h>
#include <linux/fs.h>
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.38.4/kernel/time/tick-broadcast.c linux-2.6.38.4/kernel/time/tick-broadcast.c
---- linux-2.6.38.4/kernel/time/tick-broadcast.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/time/tick-broadcast.c 2011-04-28 19:34:15.000000000 -0400
-@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
+diff -urNp linux-2.6.39/kernel/time/posix-clock.c linux-2.6.39/kernel/time/posix-clock.c
+--- linux-2.6.39/kernel/time/posix-clock.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/time/posix-clock.c 2011-05-22 19:36:33.000000000 -0400
+@@ -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/kernel/time/tick-broadcast.c linux-2.6.39/kernel/time/tick-broadcast.c
+--- linux-2.6.39/kernel/time/tick-broadcast.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/time/tick-broadcast.c 2011-05-22 19:36:33.000000000 -0400
+@@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct cl
* then clear the broadcast bit.
*/
if (!(dev->features & CLOCK_EVT_FEAT_C3STOP)) {
cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
tick_broadcast_clear_oneshot(cpu);
-diff -urNp linux-2.6.38.4/kernel/time/timekeeping.c linux-2.6.38.4/kernel/time/timekeeping.c
---- linux-2.6.38.4/kernel/time/timekeeping.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/time/timekeeping.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/time/timekeeping.c linux-2.6.39/kernel/time/timekeeping.c
+--- linux-2.6.39/kernel/time/timekeeping.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/time/timekeeping.c 2011-05-22 20:40:50.000000000 -0400
@@ -14,6 +14,7 @@
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/sched.h>
+#include <linux/grsecurity.h>
- #include <linux/sysdev.h>
+ #include <linux/syscore_ops.h>
#include <linux/clocksource.h>
#include <linux/jiffies.h>
-@@ -361,6 +362,8 @@ int do_settimeofday(struct timespec *tv)
+@@ -361,6 +362,8 @@ int do_settimeofday(const struct timespe
if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
return -EINVAL;
write_seqlock_irqsave(&xtime_lock, flags);
timekeeping_forward_now();
-diff -urNp linux-2.6.38.4/kernel/time/timer_list.c linux-2.6.38.4/kernel/time/timer_list.c
---- linux-2.6.38.4/kernel/time/timer_list.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/time/timer_list.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/time/timer_list.c linux-2.6.39/kernel/time/timer_list.c
+--- linux-2.6.39/kernel/time/timer_list.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/time/timer_list.c 2011-05-22 19:41:42.000000000 -0400
@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
static void print_name_offset(struct seq_file *m, void *sym)
if (!pe)
return -ENOMEM;
return 0;
-diff -urNp linux-2.6.38.4/kernel/time/timer_stats.c linux-2.6.38.4/kernel/time/timer_stats.c
---- linux-2.6.38.4/kernel/time/timer_stats.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/time/timer_stats.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/kernel/time/timer_stats.c linux-2.6.39/kernel/time/timer_stats.c
+--- linux-2.6.39/kernel/time/timer_stats.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/time/timer_stats.c 2011-05-22 19:41:42.000000000 -0400
@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
static unsigned long nr_entries;
static struct entry entries[MAX_ENTRIES];
if (!pe)
return -ENOMEM;
return 0;
-diff -urNp linux-2.6.38.4/kernel/time.c linux-2.6.38.4/kernel/time.c
---- linux-2.6.38.4/kernel/time.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/time.c 2011-04-28 19:34:15.000000000 -0400
-@@ -163,6 +163,11 @@ int do_sys_settimeofday(struct timespec
+diff -urNp linux-2.6.39/kernel/time.c linux-2.6.39/kernel/time.c
+--- linux-2.6.39/kernel/time.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/time.c 2011-05-22 19:41:42.000000000 -0400
+@@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct tim
return error;
if (tz) {
/* SMP safe, global irq locking makes it work. */
sys_tz = *tz;
update_vsyscall_tz();
-diff -urNp linux-2.6.38.4/kernel/timer.c linux-2.6.38.4/kernel/timer.c
---- linux-2.6.38.4/kernel/timer.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/timer.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1276,7 +1276,7 @@ void update_process_times(int user_tick)
+diff -urNp linux-2.6.39/kernel/timer.c linux-2.6.39/kernel/timer.c
+--- linux-2.6.39/kernel/timer.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/timer.c 2011-05-22 19:36:33.000000000 -0400
+@@ -1305,7 +1305,7 @@ void update_process_times(int user_tick)
/*
* This function runs timers and the timer-tq in bottom half context.
*/
{
struct tvec_base *base = __this_cpu_read(tvec_bases);
-diff -urNp linux-2.6.38.4/kernel/trace/blktrace.c linux-2.6.38.4/kernel/trace/blktrace.c
---- linux-2.6.38.4/kernel/trace/blktrace.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/trace/blktrace.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/kernel/trace/blktrace.c linux-2.6.39/kernel/trace/blktrace.c
+--- linux-2.6.39/kernel/trace/blktrace.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/trace/blktrace.c 2011-05-22 19:36:33.000000000 -0400
@@ -321,7 +321,7 @@ static ssize_t blk_dropped_read(struct f
struct blk_trace *bt = filp->private_data;
char buf[16];
ret = -EIO;
bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
-diff -urNp linux-2.6.38.4/kernel/trace/ftrace.c linux-2.6.38.4/kernel/trace/ftrace.c
---- linux-2.6.38.4/kernel/trace/ftrace.c 2011-04-18 17:27:14.000000000 -0400
-+++ linux-2.6.38.4/kernel/trace/ftrace.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/trace/ftrace.c linux-2.6.39/kernel/trace/ftrace.c
+--- linux-2.6.39/kernel/trace/ftrace.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/trace/ftrace.c 2011-05-22 19:36:33.000000000 -0400
@@ -1107,13 +1107,18 @@ ftrace_code_disable(struct module *mod,
ip = rec->ip;
}
/*
-diff -urNp linux-2.6.38.4/kernel/trace/ring_buffer.c linux-2.6.38.4/kernel/trace/ring_buffer.c
---- linux-2.6.38.4/kernel/trace/ring_buffer.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/trace/ring_buffer.c 2011-04-28 19:34:15.000000000 -0400
-@@ -669,7 +669,7 @@ static struct list_head *rb_list_head(st
- * the reader page). But if the next page is a header page,
- * its flags will be non zero.
- */
--static int inline
-+static inline int
- rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
- struct buffer_page *page, struct list_head *list)
+@@ -2011,7 +2016,7 @@ static void ftrace_free_entry_rcu(struct
+
+ int
+ register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
+- void *data)
++ void *data)
+ {
+ 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)
{
-diff -urNp linux-2.6.38.4/kernel/trace/trace.c linux-2.6.38.4/kernel/trace/trace.c
---- linux-2.6.38.4/kernel/trace/trace.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/trace/trace.c 2011-04-28 19:34:15.000000000 -0400
-@@ -3967,10 +3967,9 @@ static const struct file_operations trac
+ __unregister_ftrace_function_probe(glob, ops, NULL, PROBE_TEST_FUNC);
+ }
+diff -urNp linux-2.6.39/kernel/trace/trace.c linux-2.6.39/kernel/trace/trace.c
+--- linux-2.6.39/kernel/trace/trace.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/trace/trace.c 2011-05-22 19:36:33.000000000 -0400
+@@ -3330,6 +3330,8 @@ static ssize_t tracing_splice_read_pipe(
+ size_t rem;
+ unsigned int i;
+
++ pax_track_stack();
++
+ if (splice_grow_spd(pipe, &spd))
+ return -ENOMEM;
+
+@@ -3813,6 +3815,8 @@ tracing_buffers_splice_read(struct file
+ int entries, size, i;
+ size_t ret;
+
++ pax_track_stack();
++
+ if (splice_grow_spd(pipe, &spd))
+ return -ENOMEM;
+
+@@ -3981,10 +3985,9 @@ static const struct file_operations trac
};
#endif
static int once;
if (d_tracer)
-@@ -3990,10 +3989,9 @@ struct dentry *tracing_init_dentry(void)
+@@ -4004,10 +4007,9 @@ struct dentry *tracing_init_dentry(void)
return d_tracer;
}
static int once;
struct dentry *d_tracer;
-diff -urNp linux-2.6.38.4/kernel/trace/trace_events.c linux-2.6.38.4/kernel/trace/trace_events.c
---- linux-2.6.38.4/kernel/trace/trace_events.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/trace/trace_events.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1240,10 +1240,10 @@ static LIST_HEAD(ftrace_module_file_list
+diff -urNp linux-2.6.39/kernel/trace/trace_events.c linux-2.6.39/kernel/trace/trace_events.c
+--- linux-2.6.39/kernel/trace/trace_events.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/trace/trace_events.c 2011-05-22 19:36:33.000000000 -0400
+@@ -1241,10 +1241,10 @@ static LIST_HEAD(ftrace_module_file_list
struct ftrace_module_file_ops {
struct list_head list;
struct module *mod;
};
static struct ftrace_module_file_ops *
-diff -urNp linux-2.6.38.4/kernel/trace/trace_mmiotrace.c linux-2.6.38.4/kernel/trace/trace_mmiotrace.c
---- linux-2.6.38.4/kernel/trace/trace_mmiotrace.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/trace/trace_mmiotrace.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/kernel/trace/trace_functions.c linux-2.6.39/kernel/trace/trace_functions.c
+--- linux-2.6.39/kernel/trace/trace_functions.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
+
+ /* we register both traceon and traceoff to this callback */
+ if (strcmp(cmd, "traceon") == 0)
+diff -urNp linux-2.6.39/kernel/trace/trace_mmiotrace.c linux-2.6.39/kernel/trace/trace_mmiotrace.c
+--- linux-2.6.39/kernel/trace/trace_mmiotrace.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/trace/trace_mmiotrace.c 2011-05-22 19:36:33.000000000 -0400
@@ -24,7 +24,7 @@ struct header_iter {
static struct trace_array *mmio_trace_array;
static bool overrun_detected;
return;
}
entry = ring_buffer_event_data(event);
-diff -urNp linux-2.6.38.4/kernel/trace/trace_output.c linux-2.6.38.4/kernel/trace/trace_output.c
---- linux-2.6.38.4/kernel/trace/trace_output.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/trace/trace_output.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/trace/trace_output.c linux-2.6.39/kernel/trace/trace_output.c
+--- linux-2.6.39/kernel/trace/trace_output.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/trace/trace_output.c 2011-05-22 19:36:33.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);
if (p) {
s->len = p - s->buffer;
return 1;
-diff -urNp linux-2.6.38.4/kernel/trace/trace_stack.c linux-2.6.38.4/kernel/trace/trace_stack.c
---- linux-2.6.38.4/kernel/trace/trace_stack.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/trace/trace_stack.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/trace/trace_stack.c linux-2.6.39/kernel/trace/trace_stack.c
+--- linux-2.6.39/kernel/trace/trace_stack.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/trace/trace_stack.c 2011-05-22 19:36:33.000000000 -0400
@@ -50,7 +50,7 @@ static inline void check_stack(void)
return;
return;
local_irq_save(flags);
-diff -urNp linux-2.6.38.4/kernel/trace/trace_workqueue.c linux-2.6.38.4/kernel/trace/trace_workqueue.c
---- linux-2.6.38.4/kernel/trace/trace_workqueue.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/trace/trace_workqueue.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/kernel/trace/trace_workqueue.c linux-2.6.39/kernel/trace/trace_workqueue.c
+--- linux-2.6.39/kernel/trace/trace_workqueue.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/kernel/trace/trace_workqueue.c 2011-05-22 19:36:33.000000000 -0400
@@ -22,7 +22,7 @@ struct cpu_workqueue_stats {
int cpu;
pid_t pid;
tsk->comm);
put_task_struct(tsk);
}
-diff -urNp linux-2.6.38.4/lib/bug.c linux-2.6.38.4/lib/bug.c
---- linux-2.6.38.4/lib/bug.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/lib/bug.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/lib/bug.c linux-2.6.39/lib/bug.c
+--- linux-2.6.39/lib/bug.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/lib/bug.c 2011-05-22 19:36:33.000000000 -0400
@@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l
return BUG_TRAP_TYPE_NONE;
file = NULL;
line = 0;
-diff -urNp linux-2.6.38.4/lib/debugobjects.c linux-2.6.38.4/lib/debugobjects.c
---- linux-2.6.38.4/lib/debugobjects.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/lib/debugobjects.c 2011-04-28 19:34:15.000000000 -0400
-@@ -281,7 +281,7 @@ static void debug_object_is_on_stack(voi
+diff -urNp linux-2.6.39/lib/debugobjects.c linux-2.6.39/lib/debugobjects.c
+--- linux-2.6.39/lib/debugobjects.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/lib/debugobjects.c 2011-05-22 19:36:33.000000000 -0400
+@@ -284,7 +284,7 @@ static void debug_object_is_on_stack(voi
if (limit > 4)
return;
if (is_on_stack == onstack)
return;
-diff -urNp linux-2.6.38.4/lib/dma-debug.c linux-2.6.38.4/lib/dma-debug.c
---- linux-2.6.38.4/lib/dma-debug.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/lib/dma-debug.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/lib/dma-debug.c linux-2.6.39/lib/dma-debug.c
+--- linux-2.6.39/lib/dma-debug.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/lib/dma-debug.c 2011-05-22 19:36:33.000000000 -0400
@@ -862,7 +862,7 @@ out:
static void check_for_stack(struct device *dev, void *addr)
err_printk(dev, NULL, "DMA-API: device driver maps memory from"
"stack [addr=%p]\n", addr);
}
-diff -urNp linux-2.6.38.4/lib/inflate.c linux-2.6.38.4/lib/inflate.c
---- linux-2.6.38.4/lib/inflate.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/lib/inflate.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/lib/inflate.c linux-2.6.39/lib/inflate.c
+--- linux-2.6.39/lib/inflate.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/lib/inflate.c 2011-05-22 19:36:33.000000000 -0400
@@ -269,7 +269,7 @@ static void free(void *where)
malloc_ptr = free_mem_ptr;
}
#define free(a) kfree(a)
#endif
-diff -urNp linux-2.6.38.4/lib/Kconfig.debug linux-2.6.38.4/lib/Kconfig.debug
---- linux-2.6.38.4/lib/Kconfig.debug 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/lib/Kconfig.debug 2011-04-28 19:34:15.000000000 -0400
-@@ -1066,6 +1066,7 @@ config LATENCYTOP
+diff -urNp linux-2.6.39/lib/Kconfig.debug linux-2.6.39/lib/Kconfig.debug
+--- linux-2.6.39/lib/Kconfig.debug 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/lib/Kconfig.debug 2011-05-22 19:41:42.000000000 -0400
+@@ -1078,6 +1078,7 @@ config LATENCYTOP
depends on DEBUG_KERNEL
depends on STACKTRACE_SUPPORT
depends on PROC_FS
select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE
select KALLSYMS
select KALLSYMS_ALL
-diff -urNp linux-2.6.38.4/lib/kref.c linux-2.6.38.4/lib/kref.c
---- linux-2.6.38.4/lib/kref.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/lib/kref.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/lib/kref.c linux-2.6.39/lib/kref.c
+--- linux-2.6.39/lib/kref.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/lib/kref.c 2011-05-22 19:36:33.000000000 -0400
@@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
*/
int kref_put(struct kref *kref, void (*release)(struct kref *kref))
WARN_ON(release == (void (*)(struct kref *))kfree);
if (atomic_dec_and_test(&kref->refcount)) {
-diff -urNp linux-2.6.38.4/lib/radix-tree.c linux-2.6.38.4/lib/radix-tree.c
---- linux-2.6.38.4/lib/radix-tree.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/lib/radix-tree.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/lib/radix-tree.c linux-2.6.39/lib/radix-tree.c
+--- linux-2.6.39/lib/radix-tree.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/lib/radix-tree.c 2011-05-22 19:36:33.000000000 -0400
@@ -80,7 +80,7 @@ struct radix_tree_preload {
int nr;
struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
static inline void *ptr_to_indirect(void *ptr)
{
-diff -urNp linux-2.6.38.4/lib/vsprintf.c linux-2.6.38.4/lib/vsprintf.c
---- linux-2.6.38.4/lib/vsprintf.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/lib/vsprintf.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/lib/vsprintf.c linux-2.6.39/lib/vsprintf.c
+--- linux-2.6.39/lib/vsprintf.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/lib/vsprintf.c 2011-05-22 20:54:59.000000000 -0400
@@ -16,6 +16,9 @@
* - scnprintf and vscnprintf
*/
#include <stdarg.h>
#include <linux/module.h>
#include <linux/types.h>
-@@ -433,7 +436,7 @@ char *symbol_string(char *buf, char *end
- unsigned long value = (unsigned long) ptr;
- #ifdef CONFIG_KALLSYMS
+@@ -435,7 +438,7 @@ char *symbol_string(char *buf, char *end
char sym[KSYM_SYMBOL_LEN];
-- if (ext != 'f' && ext != 's')
-+ if (ext != 'f' && ext != 's' && ext != 'a')
+ if (ext == 'B')
+ sprint_backtrace(sym, value);
+- else if (ext != 'f' && ext != 's')
++ else if (ext != 'f' && ext != 's' && ext != 'a')
sprint_symbol(sym, value);
else
kallsyms_lookup(value, NULL, NULL, NULL, sym);
-@@ -795,7 +798,11 @@ char *uuid_string(char *buf, char *end,
+@@ -797,7 +800,11 @@ char *uuid_string(char *buf, char *end,
return string(buf, end, uuid, spec);
}
+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+int kptr_restrict = 2;
++int kptr_restrict __read_mostly = 2;
+#else
- int kptr_restrict = 1;
+ int kptr_restrict __read_mostly;
+#endif
/*
* Show a '%p' thing. A kernel extension is that the '%p' is followed
-@@ -808,6 +815,8 @@ int kptr_restrict = 1;
- * - 'f' For simple symbolic function names without offset
+@@ -811,6 +818,8 @@ int kptr_restrict __read_mostly;
* - 'S' For symbolic direct pointers with offset
* - 's' For symbolic direct pointers without offset
+ * - 'B' For backtraced symbolic direct pointers with offset
+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
+ * - 'a' For symbolic direct pointers without offset approved for use with GRKERNSEC_HIDESYM
* - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
* - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201]
* - 'M' For a 6-byte MAC address, it prints the address in the
-@@ -852,12 +861,12 @@ char *pointer(const char *fmt, char *buf
+@@ -855,12 +864,12 @@ char *pointer(const char *fmt, char *buf
{
- if (!ptr) {
+ if (!ptr && *fmt != 'K') {
/*
- * Print (null) with the same width as a pointer so it makes
+ * Print (nil) with the same width as a pointer so it makes
}
switch (*fmt) {
-@@ -867,6 +876,13 @@ char *pointer(const char *fmt, char *buf
+@@ -870,6 +879,13 @@ char *pointer(const char *fmt, char *buf
/* Fallthrough */
case 'S':
case 's':
+#endif
+ case 'A':
+ case 'a':
+ case 'B':
return symbol_string(buf, end, ptr, spec, *fmt);
case 'R':
- case 'r':
-@@ -1631,11 +1647,11 @@ int bstr_printf(char *buf, size_t size,
+@@ -1632,11 +1648,11 @@ int bstr_printf(char *buf, size_t size,
typeof(type) value; \
if (sizeof(type) == 8) { \
args = PTR_ALIGN(args, sizeof(u32)); \
} \
args += sizeof(type); \
value; \
-@@ -1698,7 +1714,7 @@ int bstr_printf(char *buf, size_t size,
+@@ -1699,7 +1715,7 @@ int bstr_printf(char *buf, size_t size,
case FORMAT_TYPE_STR: {
const char *str_arg = args;
args += strlen(str_arg) + 1;
break;
}
-diff -urNp linux-2.6.38.4/localversion-grsec linux-2.6.38.4/localversion-grsec
---- linux-2.6.38.4/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/localversion-grsec 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/localversion-grsec linux-2.6.39/localversion-grsec
+--- linux-2.6.39/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/localversion-grsec 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1 @@
+-grsec
-diff -urNp linux-2.6.38.4/Makefile linux-2.6.38.4/Makefile
---- linux-2.6.38.4/Makefile 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/Makefile 2011-04-28 19:34:15.000000000 -0400
-@@ -233,8 +233,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
+diff -urNp linux-2.6.39/Makefile linux-2.6.39/Makefile
+--- linux-2.6.39/Makefile 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/Makefile 2011-05-22 19:41:42.000000000 -0400
+@@ -237,8 +237,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
HOSTCC = gcc
HOSTCXX = g++
-HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
-HOSTCXXFLAGS = -O2
-+HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-empty-body -Wno-missing-field-initializers -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
++HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-empty-body -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
+HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks
# Decide whether to build built-in, modular, or both.
# Normally, just do built-in.
-@@ -352,6 +352,7 @@ LINUXINCLUDE := -I$(srctree)/arch/$(h
+@@ -356,6 +356,7 @@ LINUXINCLUDE := -I$(srctree)/arch/$(h
KBUILD_CPPFLAGS := -D__KERNEL__
KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
-fno-strict-aliasing -fno-common \
-Werror-implicit-function-declaration \
-Wno-format-security \
-@@ -681,7 +682,7 @@ export mod_strip_cmd
+@@ -685,7 +686,7 @@ export mod_strip_cmd
ifeq ($(KBUILD_EXTMOD),)
vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-diff -urNp linux-2.6.38.4/mm/bootmem.c linux-2.6.38.4/mm/bootmem.c
---- linux-2.6.38.4/mm/bootmem.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/bootmem.c 2011-04-28 19:34:15.000000000 -0400
-@@ -201,19 +201,30 @@ static void __init __free_pages_memory(u
- unsigned long __init free_all_memory_core_early(int nodeid)
- {
- int i;
-- u64 start, end;
-+ u64 start, end, startrange, endrange;
- unsigned long count = 0;
-- struct range *range = NULL;
-+ struct range *range = NULL, rangerange = { 0, 0 };
- int nr_range;
-
- nr_range = get_free_all_memory_range(&range, nodeid);
-+ startrange = __pa(range) >> PAGE_SHIFT;
-+ endrange = (__pa(range + nr_range) - 1) >> PAGE_SHIFT;
-
- for (i = 0; i < nr_range; i++) {
- start = range[i].start;
- end = range[i].end;
-+ if (start <= endrange && startrange < end) {
-+ BUG_ON(rangerange.start | rangerange.end);
-+ rangerange = range[i];
-+ continue;
-+ }
- count += end - start;
- __free_pages_memory(start, end);
- }
-+ start = rangerange.start;
-+ end = rangerange.end;
-+ count += end - start;
-+ __free_pages_memory(start, end);
-
- return count;
- }
-diff -urNp linux-2.6.38.4/mm/filemap.c linux-2.6.38.4/mm/filemap.c
---- linux-2.6.38.4/mm/filemap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/filemap.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1664,7 +1664,7 @@ int generic_file_mmap(struct file * file
+diff -urNp linux-2.6.39/mm/filemap.c linux-2.6.39/mm/filemap.c
+--- linux-2.6.39/mm/filemap.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/filemap.c 2011-05-22 19:41:42.000000000 -0400
+@@ -1724,7 +1724,7 @@ int generic_file_mmap(struct file * file
struct address_space *mapping = file->f_mapping;
if (!mapping->a_ops->readpage)
file_accessed(file);
vma->vm_ops = &generic_file_vm_ops;
vma->vm_flags |= VM_CAN_NONLINEAR;
-@@ -2060,6 +2060,7 @@ inline int generic_write_checks(struct f
+@@ -2120,6 +2120,7 @@ inline int generic_write_checks(struct f
*pos = i_size_read(inode);
if (limit != RLIM_INFINITY) {
if (*pos >= limit) {
send_sig(SIGXFSZ, current, 0);
return -EFBIG;
-diff -urNp linux-2.6.38.4/mm/fremap.c linux-2.6.38.4/mm/fremap.c
---- linux-2.6.38.4/mm/fremap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/fremap.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/mm/fremap.c linux-2.6.39/mm/fremap.c
+--- linux-2.6.39/mm/fremap.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/fremap.c 2011-05-22 19:36:33.000000000 -0400
@@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
retry:
vma = find_vma(mm, start);
munlock_vma_pages_range(vma, start, start + size);
vma->vm_flags = saved_flags;
}
-diff -urNp linux-2.6.38.4/mm/highmem.c linux-2.6.38.4/mm/highmem.c
---- linux-2.6.38.4/mm/highmem.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/highmem.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/mm/highmem.c linux-2.6.39/mm/highmem.c
+--- linux-2.6.39/mm/highmem.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/highmem.c 2011-05-22 19:36:33.000000000 -0400
@@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
* So no dangers, even with speculative execution.
*/
pkmap_count[last_pkmap_nr] = 1;
set_page_address(page, (void *)vaddr);
-diff -urNp linux-2.6.38.4/mm/hugetlb.c linux-2.6.38.4/mm/hugetlb.c
---- linux-2.6.38.4/mm/hugetlb.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/hugetlb.c 2011-04-28 19:34:15.000000000 -0400
-@@ -2333,6 +2333,27 @@ static int unmap_ref_private(struct mm_s
+diff -urNp linux-2.6.39/mm/huge_memory.c linux-2.6.39/mm/huge_memory.c
+--- linux-2.6.39/mm/huge_memory.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/huge_memory.c 2011-05-22 19:36:33.000000000 -0400
+@@ -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.
+ */
+- if (unlikely(__pte_alloc(mm, vma, pmd, address)))
++ if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
+ return VM_FAULT_OOM;
+ /* if an huge pmd materialized from under us just retry later */
+ if (unlikely(pmd_trans_huge(*pmd)))
+diff -urNp linux-2.6.39/mm/hugetlb.c linux-2.6.39/mm/hugetlb.c
+--- linux-2.6.39/mm/hugetlb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/hugetlb.c 2011-05-22 19:36:33.000000000 -0400
+@@ -2331,6 +2331,27 @@ static int unmap_ref_private(struct mm_s
return 1;
}
/*
* Hugetlb_cow() should be called with page lock of the original hugepage held.
*/
-@@ -2434,6 +2455,11 @@ retry_avoidcopy:
+@@ -2432,6 +2453,11 @@ retry_avoidcopy:
make_huge_pte(vma, new_page, 1));
page_remove_rmap(old_page);
hugepage_add_new_anon_rmap(new_page, vma, address);
/* Make the old page be freed below */
new_page = old_page;
mmu_notifier_invalidate_range_end(mm,
-@@ -2585,6 +2611,10 @@ retry:
+@@ -2583,6 +2609,10 @@ retry:
&& (vma->vm_flags & VM_SHARED)));
set_huge_pte_at(mm, address, ptep, new_pte);
if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
/* Optimization, do the COW without a second fault */
ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
-@@ -2614,6 +2644,10 @@ int hugetlb_fault(struct mm_struct *mm,
+@@ -2612,6 +2642,10 @@ int hugetlb_fault(struct mm_struct *mm,
static DEFINE_MUTEX(hugetlb_instantiation_mutex);
struct hstate *h = hstate_vma(vma);
ptep = huge_pte_offset(mm, address);
if (ptep) {
entry = huge_ptep_get(ptep);
-@@ -2625,6 +2659,26 @@ int hugetlb_fault(struct mm_struct *mm,
+@@ -2623,6 +2657,26 @@ int hugetlb_fault(struct mm_struct *mm,
VM_FAULT_SET_HINDEX(h - hstates);
}
ptep = huge_pte_alloc(mm, address, huge_page_size(h));
if (!ptep)
return VM_FAULT_OOM;
-diff -urNp linux-2.6.38.4/mm/Kconfig linux-2.6.38.4/mm/Kconfig
---- linux-2.6.38.4/mm/Kconfig 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/Kconfig 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/mm/Kconfig linux-2.6.39/mm/Kconfig
+--- linux-2.6.39/mm/Kconfig 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/Kconfig 2011-05-22 19:41:42.000000000 -0400
@@ -240,7 +240,7 @@ config KSM
config DEFAULT_MMAP_MIN_ADDR
int "Low address space to protect from user allocation"
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.38.4/mm/kmemleak.c linux-2.6.38.4/mm/kmemleak.c
---- linux-2.6.38.4/mm/kmemleak.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/kmemleak.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/mm/kmemleak.c linux-2.6.39/mm/kmemleak.c
+--- linux-2.6.39/mm/kmemleak.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/kmemleak.c 2011-05-22 19:41:42.000000000 -0400
@@ -357,7 +357,7 @@ static void print_unreferenced(struct se
for (i = 0; i < object->trace_len; i++) {
}
}
-diff -urNp linux-2.6.38.4/mm/maccess.c linux-2.6.38.4/mm/maccess.c
---- linux-2.6.38.4/mm/maccess.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/maccess.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/mm/maccess.c linux-2.6.39/mm/maccess.c
+--- linux-2.6.39/mm/maccess.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/maccess.c 2011-05-22 19:36:33.000000000 -0400
@@ -15,10 +15,10 @@
* happens, handle that and return -EFAULT.
*/
{
long ret;
mm_segment_t old_fs = get_fs();
-diff -urNp linux-2.6.38.4/mm/madvise.c linux-2.6.38.4/mm/madvise.c
---- linux-2.6.38.4/mm/madvise.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/madvise.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/mm/madvise.c linux-2.6.39/mm/madvise.c
+--- linux-2.6.39/mm/madvise.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/madvise.c 2011-05-22 19:36:33.000000000 -0400
@@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a
pgoff_t pgoff;
unsigned long new_flags = vma->vm_flags;
error = 0;
if (end == start)
goto out;
-diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
---- linux-2.6.38.4/mm/memory.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/mm/memory.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/mm/memory.c linux-2.6.39/mm/memory.c
+--- linux-2.6.39/mm/memory.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/memory.c 2011-05-22 19:36:33.000000000 -0400
@@ -259,8 +259,12 @@ static inline void free_pmd_range(struct
return;
}
/*
-@@ -1410,13 +1417,6 @@ no_page_table:
+@@ -1410,12 +1417,6 @@ no_page_table:
return page;
}
-static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
-{
-- return (vma->vm_flags & VM_GROWSDOWN) &&
-- (vma->vm_start == addr) &&
-- !vma_stack_continue(vma->vm_prev, addr);
+- return stack_guard_page_start(vma, addr) ||
+- stack_guard_page_end(vma, addr+PAGE_SIZE);
-}
-
- int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
- unsigned long start, int nr_pages, unsigned int gup_flags,
- struct page **pages, struct vm_area_struct **vmas,
-@@ -1440,10 +1440,10 @@ int __get_user_pages(struct task_struct
+ /**
+ * __get_user_pages() - pin user pages in memory
+ * @tsk: task_struct of target task
+@@ -1488,10 +1489,10 @@ int __get_user_pages(struct task_struct
(VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
i = 0;
- vma = find_extend_vma(mm, start);
+ vma = find_vma(mm, start);
- if (!vma && in_gate_area(tsk, start)) {
+ if (!vma && in_gate_area(mm, start)) {
unsigned long pg = start & PAGE_MASK;
pgd_t *pgd;
-@@ -1491,7 +1491,7 @@ int __get_user_pages(struct task_struct
+@@ -1539,7 +1540,7 @@ int __get_user_pages(struct task_struct
goto next_page;
}
(vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
!(vm_flags & vma->vm_flags))
return i ? : -EFAULT;
-@@ -1502,13 +1502,6 @@ int __get_user_pages(struct task_struct
- continue;
- }
-
-- /*
-- * If we don't actually want the page itself,
-- * and it's the stack guard page, just skip it.
-- */
-- if (!pages && stack_guard_page(vma, start))
-- goto next_page;
--
- do {
- struct page *page;
- unsigned int foll_flags = gup_flags;
-@@ -1585,7 +1578,7 @@ next_page:
+@@ -1566,11 +1567,6 @@ int __get_user_pages(struct task_struct
+ int ret;
+ unsigned int fault_flags = 0;
+
+- /* For mlock, just skip the stack guard page. */
+- if (foll_flags & FOLL_MLOCK) {
+- if (stack_guard_page(vma, start))
+- goto next_page;
+- }
+ if (foll_flags & FOLL_WRITE)
+ fault_flags |= FAULT_FLAG_WRITE;
+ if (nonblocking)
+@@ -1644,7 +1640,7 @@ next_page:
start += PAGE_SIZE;
nr_pages--;
} while (nr_pages && start < vma->vm_end);
+ }
return i;
}
-
-@@ -1734,6 +1727,10 @@ static int insert_page(struct vm_area_st
+ EXPORT_SYMBOL(__get_user_pages);
+@@ -1795,6 +1791,10 @@ static int insert_page(struct vm_area_st
page_add_file_rmap(page);
set_pte_at(mm, addr, pte, mk_pte(page, prot));
retval = 0;
pte_unmap_unlock(pte, ptl);
return retval;
-@@ -1768,10 +1765,22 @@ out:
+@@ -1829,10 +1829,22 @@ out:
int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
struct page *page)
{
vma->vm_flags |= VM_INSERTPAGE;
return insert_page(vma, addr, page, vma->vm_page_prot);
}
-@@ -1857,6 +1866,7 @@ int vm_insert_mixed(struct vm_area_struc
+@@ -1918,6 +1930,7 @@ int vm_insert_mixed(struct vm_area_struc
unsigned long pfn)
{
BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
if (addr < vma->vm_start || addr >= vma->vm_end)
return -EFAULT;
-@@ -2172,6 +2182,186 @@ static inline void cow_user_page(struct
+@@ -2233,6 +2246,186 @@ static inline void cow_user_page(struct
copy_user_highpage(dst, src, va, vma);
}
/*
* This routine handles present pages, when users try to write
* to a shared page. It is done by copying the page to a new address
-@@ -2383,6 +2573,12 @@ gotten:
+@@ -2444,6 +2637,12 @@ gotten:
*/
page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
if (likely(pte_same(*page_table, orig_pte))) {
if (old_page) {
if (!PageAnon(old_page)) {
dec_mm_counter_fast(mm, MM_FILEPAGES);
-@@ -2434,6 +2630,10 @@ gotten:
+@@ -2495,6 +2694,10 @@ gotten:
page_remove_rmap(old_page);
}
/* Free the old page.. */
new_page = old_page;
ret |= VM_FAULT_WRITE;
-@@ -2844,6 +3044,11 @@ static int do_swap_page(struct mm_struct
+@@ -2905,6 +3108,11 @@ static int do_swap_page(struct mm_struct
swap_free(entry);
if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
try_to_free_swap(page);
unlock_page(page);
if (swapcache) {
/*
-@@ -2867,6 +3072,11 @@ static int do_swap_page(struct mm_struct
+@@ -2928,6 +3136,11 @@ static int do_swap_page(struct mm_struct
/* No need to invalidate - it was non-present before */
update_mmu_cache(vma, address, page_table);
unlock:
pte_unmap_unlock(page_table, ptl);
out:
-@@ -2886,40 +3096,6 @@ out_release:
+@@ -2947,40 +3160,6 @@ out_release:
}
/*
* We enter with non-exclusive mmap_sem (to exclude vma changes,
* but allow concurrent faults), and pte mapped but not yet locked.
* We return with mmap_sem still held, but pte unmapped and unlocked.
-@@ -2928,27 +3104,23 @@ static int do_anonymous_page(struct mm_s
+@@ -2989,27 +3168,23 @@ static int do_anonymous_page(struct mm_s
unsigned long address, pte_t *page_table, pmd_t *pmd,
unsigned int flags)
{
if (unlikely(anon_vma_prepare(vma)))
goto oom;
page = alloc_zeroed_user_highpage_movable(vma, address);
-@@ -2967,6 +3139,11 @@ static int do_anonymous_page(struct mm_s
+@@ -3028,6 +3203,11 @@ static int do_anonymous_page(struct mm_s
if (!pte_none(*page_table))
goto release;
inc_mm_counter_fast(mm, MM_ANONPAGES);
page_add_new_anon_rmap(page, vma, address);
setpte:
-@@ -2974,6 +3151,12 @@ setpte:
+@@ -3035,6 +3215,12 @@ setpte:
/* No need to invalidate - it was non-present before */
update_mmu_cache(vma, address, page_table);
unlock:
pte_unmap_unlock(page_table, ptl);
return 0;
-@@ -3111,6 +3294,12 @@ static int __do_fault(struct mm_struct *
+@@ -3172,6 +3358,12 @@ static int __do_fault(struct mm_struct *
*/
/* Only go through if we didn't race with anybody else... */
if (likely(pte_same(*page_table, orig_pte))) {
flush_icache_page(vma, page);
entry = mk_pte(page, vma->vm_page_prot);
if (flags & FAULT_FLAG_WRITE)
-@@ -3130,6 +3319,14 @@ static int __do_fault(struct mm_struct *
+@@ -3191,6 +3383,14 @@ static int __do_fault(struct mm_struct *
/* no need to invalidate: a not-present page won't be cached */
update_mmu_cache(vma, address, page_table);
} else {
if (charged)
mem_cgroup_uncharge_page(page);
-@@ -3277,6 +3474,12 @@ int handle_pte_fault(struct mm_struct *m
+@@ -3338,6 +3538,12 @@ int handle_pte_fault(struct mm_struct *m
if (flags & FAULT_FLAG_WRITE)
flush_tlb_fix_spurious_fault(vma, address);
}
unlock:
pte_unmap_unlock(pte, ptl);
return 0;
-@@ -3293,6 +3496,10 @@ int handle_mm_fault(struct mm_struct *mm
+@@ -3354,6 +3560,10 @@ int handle_mm_fault(struct mm_struct *mm
pmd_t *pmd;
pte_t *pte;
__set_current_state(TASK_RUNNING);
count_vm_event(PGFAULT);
-@@ -3303,6 +3510,34 @@ int handle_mm_fault(struct mm_struct *mm
+@@ -3364,6 +3574,34 @@ int handle_mm_fault(struct mm_struct *mm
if (unlikely(is_vm_hugetlb_page(vma)))
return hugetlb_fault(mm, vma, address, flags);
pgd = pgd_offset(mm, address);
pud = pud_alloc(mm, pgd, address);
if (!pud)
-@@ -3436,7 +3671,7 @@ static int __init gate_vma_init(void)
+@@ -3393,7 +3631,7 @@ int handle_mm_fault(struct mm_struct *mm
+ * run pte_offset_map on the pmd, if an huge pmd could
+ * materialize from under us from a different thread.
+ */
+- if (unlikely(pmd_none(*pmd)) && __pte_alloc(mm, vma, pmd, address))
++ if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
+ return VM_FAULT_OOM;
+ /* if an huge pmd materialized from under us just retry later */
+ if (unlikely(pmd_trans_huge(*pmd)))
+@@ -3497,7 +3735,7 @@ static int __init gate_vma_init(void)
gate_vma.vm_start = FIXADDR_USER_START;
gate_vma.vm_end = FIXADDR_USER_END;
gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
/*
* Make sure the vDSO gets into every core dump.
* Dumping its contents makes post-mortem fully interpretable later
-diff -urNp linux-2.6.38.4/mm/memory-failure.c linux-2.6.38.4/mm/memory-failure.c
---- linux-2.6.38.4/mm/memory-failure.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/memory-failure.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/mm/memory-failure.c linux-2.6.39/mm/memory-failure.c
+--- linux-2.6.39/mm/memory-failure.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/memory-failure.c 2011-05-22 19:36:33.000000000 -0400
@@ -58,7 +58,7 @@ int sysctl_memory_failure_early_kill __r
int sysctl_memory_failure_recovery __read_mostly = 1;
SetPageHWPoison(page);
/* keep elevated page count for bad page */
return ret;
-diff -urNp linux-2.6.38.4/mm/mempolicy.c linux-2.6.38.4/mm/mempolicy.c
---- linux-2.6.38.4/mm/mempolicy.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/mempolicy.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/mm/mempolicy.c linux-2.6.39/mm/mempolicy.c
+--- linux-2.6.39/mm/mempolicy.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/mempolicy.c 2011-05-22 19:41:42.000000000 -0400
@@ -643,6 +643,10 @@ static int mbind_range(struct mm_struct
unsigned long vmstart;
unsigned long vmend;
rcu_read_unlock();
err = -EPERM;
goto out;
-@@ -2635,7 +2667,7 @@ int show_numa_map(struct seq_file *m, vo
+@@ -2634,7 +2666,7 @@ int show_numa_map(struct seq_file *m, vo
if (file) {
seq_printf(m, " file=");
} 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.38.4/mm/migrate.c linux-2.6.38.4/mm/migrate.c
---- linux-2.6.38.4/mm/migrate.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/migrate.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1299,6 +1299,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
+diff -urNp linux-2.6.39/mm/migrate.c linux-2.6.39/mm/migrate.c
+--- linux-2.6.39/mm/migrate.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/migrate.c 2011-05-22 19:41:42.000000000 -0400
+@@ -1133,6 +1133,8 @@ static int do_pages_move(struct mm_struc
+ unsigned long chunk_start;
+ int err;
+
++ pax_track_stack();
++
+ task_nodes = cpuset_mems_allowed(task);
+
+ err = -ENOMEM;
+@@ -1317,6 +1319,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
if (!mm)
return -EINVAL;
/*
* Check if this process has the right to modify the specified
* process. The right exists if the process has administrative
-@@ -1308,8 +1316,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
+@@ -1326,8 +1336,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
rcu_read_lock();
tcred = __task_cred(task);
if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
rcu_read_unlock();
err = -EPERM;
goto out;
-diff -urNp linux-2.6.38.4/mm/mlock.c linux-2.6.38.4/mm/mlock.c
---- linux-2.6.38.4/mm/mlock.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/mm/mlock.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/mm/mlock.c linux-2.6.39/mm/mlock.c
+--- linux-2.6.39/mm/mlock.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/mlock.c 2011-05-22 19:41:42.000000000 -0400
@@ -13,6 +13,7 @@
#include <linux/pagemap.h>
#include <linux/mempolicy.h>
#include <linux/sched.h>
#include <linux/module.h>
#include <linux/rmap.h>
-@@ -380,6 +381,9 @@ static int do_mlock(unsigned long start,
+@@ -377,6 +378,9 @@ static int do_mlock(unsigned long start,
return -EINVAL;
if (end == start)
return 0;
vma = find_vma_prev(current->mm, start, &prev);
if (!vma || vma->vm_start > start)
return -ENOMEM;
-@@ -390,6 +394,11 @@ static int do_mlock(unsigned long start,
+@@ -387,6 +391,11 @@ static int do_mlock(unsigned long start,
for (nstart = start ; ; ) {
unsigned int newflags;
/* Here we know that vma->vm_start <= nstart < vma->vm_end. */
newflags = vma->vm_flags | VM_LOCKED;
-@@ -495,6 +504,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st
+@@ -492,6 +501,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st
lock_limit >>= PAGE_SHIFT;
/* check against resource limits */
if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
error = do_mlock(start, len, 1);
up_write(¤t->mm->mmap_sem);
-@@ -518,17 +528,23 @@ SYSCALL_DEFINE2(munlock, unsigned long,
+@@ -515,17 +525,23 @@ SYSCALL_DEFINE2(munlock, unsigned long,
static int do_mlockall(int flags)
{
struct vm_area_struct * vma, * prev = NULL;
newflags = vma->vm_flags | VM_LOCKED;
if (!(flags & MCL_CURRENT))
newflags &= ~VM_LOCKED;
-@@ -560,6 +576,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
+@@ -557,6 +573,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
lock_limit >>= PAGE_SHIFT;
ret = -ENOMEM;
if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
capable(CAP_IPC_LOCK))
ret = do_mlockall(flags);
-diff -urNp linux-2.6.38.4/mm/mmap.c linux-2.6.38.4/mm/mmap.c
---- linux-2.6.38.4/mm/mmap.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/mm/mmap.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/mm/mmap.c linux-2.6.39/mm/mmap.c
+--- linux-2.6.39/mm/mmap.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/mmap.c 2011-05-22 19:41:42.000000000 -0400
@@ -46,6 +46,16 @@
#define arch_rebalance_pgtables(addr, len) (addr)
#endif
unsigned long size, grow;
size = address - vma->vm_start;
-@@ -1773,6 +2034,8 @@ int expand_upwards(struct vm_area_struct
- perf_event_mmap(vma);
+@@ -1776,6 +2037,8 @@ int expand_upwards(struct vm_area_struct
+ }
}
}
+ if (locknext)
vma_unlock_anon_vma(vma);
khugepaged_enter_vma_merge(vma);
return error;
-@@ -1786,6 +2049,8 @@ static int expand_downwards(struct vm_ar
+@@ -1789,6 +2052,8 @@ static int expand_downwards(struct vm_ar
unsigned long address)
{
int error;
/*
* We must make sure the anon_vma is allocated
-@@ -1799,6 +2064,15 @@ static int expand_downwards(struct vm_ar
+@@ -1802,6 +2067,15 @@ static int expand_downwards(struct vm_ar
if (error)
return error;
vma_lock_anon_vma(vma);
/*
-@@ -1808,9 +2082,17 @@ static int expand_downwards(struct vm_ar
+@@ -1811,9 +2085,17 @@ static int expand_downwards(struct vm_ar
*/
/* Somebody else might have raced and expanded it already */
size = vma->vm_end - address;
grow = (vma->vm_start - address) >> PAGE_SHIFT;
-@@ -1820,11 +2102,22 @@ static int expand_downwards(struct vm_ar
+@@ -1823,11 +2105,22 @@ static int expand_downwards(struct vm_ar
if (!error) {
vma->vm_start = address;
vma->vm_pgoff -= grow;
khugepaged_enter_vma_merge(vma);
return error;
}
-@@ -1899,6 +2192,13 @@ static void remove_vma_list(struct mm_st
+@@ -1902,6 +2195,13 @@ static void remove_vma_list(struct mm_st
do {
long nrpages = vma_pages(vma);
mm->total_vm -= nrpages;
vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
vma = remove_vma(vma);
-@@ -1944,6 +2244,16 @@ detach_vmas_to_be_unmapped(struct mm_str
+@@ -1947,6 +2247,16 @@ detach_vmas_to_be_unmapped(struct mm_str
insertion_point = (prev ? &prev->vm_next : &mm->mmap);
vma->vm_prev = NULL;
do {
rb_erase(&vma->vm_rb, &mm->mm_rb);
mm->map_count--;
tail_vma = vma;
-@@ -1972,14 +2282,33 @@ static int __split_vma(struct mm_struct
+@@ -1975,14 +2285,33 @@ static int __split_vma(struct mm_struct
struct vm_area_struct *new;
int err = -ENOMEM;
/* most fields are the same, copy all, and then fixup */
*new = *vma;
-@@ -1992,6 +2321,22 @@ static int __split_vma(struct mm_struct
+@@ -1995,6 +2324,22 @@ static int __split_vma(struct mm_struct
new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
}
pol = mpol_dup(vma_policy(vma));
if (IS_ERR(pol)) {
err = PTR_ERR(pol);
-@@ -2017,6 +2362,42 @@ static int __split_vma(struct mm_struct
+@@ -2020,6 +2365,42 @@ static int __split_vma(struct mm_struct
else
err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
/* Success. */
if (!err)
return 0;
-@@ -2029,10 +2410,18 @@ static int __split_vma(struct mm_struct
+@@ -2032,10 +2413,18 @@ static int __split_vma(struct mm_struct
removed_exe_file_vma(mm);
fput(new->vm_file);
}
kmem_cache_free(vm_area_cachep, new);
out_err:
return err;
-@@ -2045,6 +2434,15 @@ static int __split_vma(struct mm_struct
+@@ -2048,6 +2437,15 @@ static int __split_vma(struct mm_struct
int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
unsigned long addr, int new_below)
{
if (mm->map_count >= sysctl_max_map_count)
return -ENOMEM;
-@@ -2056,11 +2454,30 @@ int split_vma(struct mm_struct *mm, stru
+@@ -2059,11 +2457,30 @@ int split_vma(struct mm_struct *mm, stru
* work. This now handles partial unmappings.
* Jeremy Fitzhardinge <jeremy@goop.org>
*/
if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
return -EINVAL;
-@@ -2134,6 +2551,8 @@ int do_munmap(struct mm_struct *mm, unsi
+@@ -2137,6 +2554,8 @@ int do_munmap(struct mm_struct *mm, unsi
/* Fix up all other VM information */
remove_vma_list(mm, vma);
return 0;
}
-@@ -2146,22 +2565,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a
+@@ -2149,22 +2568,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a
profile_munmap(addr);
/*
* this is really a simplified "do_mmap". it only handles
* anonymous maps. eventually we may be able to do some
-@@ -2175,6 +2590,7 @@ unsigned long do_brk(unsigned long addr,
+@@ -2178,6 +2593,7 @@ unsigned long do_brk(unsigned long addr,
struct rb_node ** rb_link, * rb_parent;
pgoff_t pgoff = addr >> PAGE_SHIFT;
int error;
len = PAGE_ALIGN(len);
if (!len)
-@@ -2186,16 +2602,30 @@ unsigned long do_brk(unsigned long addr,
+@@ -2189,16 +2605,30 @@ unsigned long do_brk(unsigned long addr,
flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
locked += mm->locked_vm;
lock_limit = rlimit(RLIMIT_MEMLOCK);
lock_limit >>= PAGE_SHIFT;
-@@ -2212,22 +2642,22 @@ unsigned long do_brk(unsigned long addr,
+@@ -2215,22 +2645,22 @@ unsigned long do_brk(unsigned long addr,
/*
* Clear old maps. this also does some error checking for us
*/
return -ENOMEM;
/* Can we just expand an old private anonymous mapping? */
-@@ -2241,7 +2671,7 @@ unsigned long do_brk(unsigned long addr,
+@@ -2244,7 +2674,7 @@ unsigned long do_brk(unsigned long addr,
*/
vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
if (!vma) {
return -ENOMEM;
}
-@@ -2255,11 +2685,12 @@ unsigned long do_brk(unsigned long addr,
+@@ -2258,11 +2688,12 @@ unsigned long do_brk(unsigned long addr,
vma_link(mm, vma, prev, rb_link, rb_parent);
out:
perf_event_mmap(vma);
return addr;
}
-@@ -2306,8 +2737,10 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2309,8 +2740,10 @@ void exit_mmap(struct mm_struct *mm)
* Walk the list again, actually closing and freeing it,
* with preemption enabled, without holding any MM locks.
*/
BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
}
-@@ -2321,6 +2754,13 @@ int insert_vm_struct(struct mm_struct *
+@@ -2324,6 +2757,13 @@ int insert_vm_struct(struct mm_struct *
struct vm_area_struct * __vma, * prev;
struct rb_node ** rb_link, * rb_parent;
/*
* The vm_pgoff of a purely anonymous vma should be irrelevant
* until its first write fault, when page's anon_vma and index
-@@ -2343,7 +2783,22 @@ int insert_vm_struct(struct mm_struct *
+@@ -2346,7 +2786,22 @@ int insert_vm_struct(struct mm_struct *
if ((vma->vm_flags & VM_ACCOUNT) &&
security_vm_enough_memory_mm(mm, vma_pages(vma)))
return -ENOMEM;
return 0;
}
-@@ -2361,6 +2816,8 @@ struct vm_area_struct *copy_vma(struct v
+@@ -2364,6 +2819,8 @@ struct vm_area_struct *copy_vma(struct v
struct rb_node **rb_link, *rb_parent;
struct mempolicy *pol;
/*
* If anonymous vma has not yet been faulted, update new pgoff
* to match new location, to increase its chance of merging.
-@@ -2410,6 +2867,39 @@ struct vm_area_struct *copy_vma(struct v
+@@ -2413,6 +2870,39 @@ struct vm_area_struct *copy_vma(struct v
kmem_cache_free(vm_area_cachep, new_vma);
return NULL;
}
/*
* Return true if the calling process may expand its vm space by the passed
-@@ -2421,7 +2911,7 @@ int may_expand_vm(struct mm_struct *mm,
+@@ -2424,7 +2914,7 @@ int may_expand_vm(struct mm_struct *mm,
unsigned long lim;
lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
if (cur + npages > lim)
return 0;
return 1;
-@@ -2492,6 +2982,22 @@ int install_special_mapping(struct mm_st
+@@ -2495,6 +2985,22 @@ int install_special_mapping(struct mm_st
vma->vm_start = addr;
vma->vm_end = addr + len;
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.38.4/mm/mprotect.c linux-2.6.38.4/mm/mprotect.c
---- linux-2.6.38.4/mm/mprotect.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/mprotect.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/mm/mprotect.c linux-2.6.39/mm/mprotect.c
+--- linux-2.6.39/mm/mprotect.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/mprotect.c 2011-05-22 19:41:42.000000000 -0400
@@ -23,10 +23,16 @@
#include <linux/mmu_notifier.h>
#include <linux/migrate.h>
nstart = tmp;
if (nstart < prev->vm_end)
-diff -urNp linux-2.6.38.4/mm/mremap.c linux-2.6.38.4/mm/mremap.c
---- linux-2.6.38.4/mm/mremap.c 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/mm/mremap.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/mm/mremap.c linux-2.6.39/mm/mremap.c
+--- linux-2.6.39/mm/mremap.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/mremap.c 2011-05-22 19:36:33.000000000 -0400
@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str
continue;
pte = ptep_clear_flush(vma, old_addr, old_pte);
}
out:
if (ret & ~PAGE_MASK)
-diff -urNp linux-2.6.38.4/mm/nommu.c linux-2.6.38.4/mm/nommu.c
---- linux-2.6.38.4/mm/nommu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/nommu.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/mm/nobootmem.c linux-2.6.39/mm/nobootmem.c
+--- linux-2.6.39/mm/nobootmem.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/nobootmem.c 2011-05-22 19:36:33.000000000 -0400
+@@ -110,19 +110,30 @@ static void __init __free_pages_memory(u
+ unsigned long __init free_all_memory_core_early(int nodeid)
+ {
+ int i;
+- u64 start, end;
++ u64 start, end, startrange, endrange;
+ unsigned long count = 0;
+- struct range *range = NULL;
++ struct range *range = NULL, rangerange = { 0, 0 };
+ int nr_range;
+
+ nr_range = get_free_all_memory_range(&range, nodeid);
++ startrange = __pa(range) >> PAGE_SHIFT;
++ endrange = (__pa(range + nr_range) - 1) >> PAGE_SHIFT;
+
+ for (i = 0; i < nr_range; i++) {
+ start = range[i].start;
+ end = range[i].end;
++ if (start <= endrange && startrange < end) {
++ BUG_ON(rangerange.start | rangerange.end);
++ rangerange = range[i];
++ continue;
++ }
+ count += end - start;
+ __free_pages_memory(start, end);
+ }
++ start = rangerange.start;
++ end = rangerange.end;
++ count += end - start;
++ __free_pages_memory(start, end);
+
+ return count;
+ }
+diff -urNp linux-2.6.39/mm/nommu.c linux-2.6.39/mm/nommu.c
+--- linux-2.6.39/mm/nommu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/nommu.c 2011-05-22 19:36:33.000000000 -0400
@@ -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;
*region = *vma->vm_region;
new->vm_region = region;
-diff -urNp linux-2.6.38.4/mm/page_alloc.c linux-2.6.38.4/mm/page_alloc.c
---- linux-2.6.38.4/mm/page_alloc.c 2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/mm/page_alloc.c 2011-04-28 19:34:15.000000000 -0400
-@@ -644,6 +644,10 @@ static bool free_pages_prepare(struct pa
+diff -urNp linux-2.6.39/mm/page_alloc.c linux-2.6.39/mm/page_alloc.c
+--- linux-2.6.39/mm/page_alloc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/page_alloc.c 2011-05-22 19:36:33.000000000 -0400
+@@ -650,6 +650,10 @@ static bool free_pages_prepare(struct pa
int i;
int bad = 0;
trace_mm_page_free_direct(page, order);
kmemcheck_free_shadow(page, order);
-@@ -659,6 +663,12 @@ static bool free_pages_prepare(struct pa
+@@ -665,6 +669,12 @@ static bool free_pages_prepare(struct pa
debug_check_no_obj_freed(page_address(page),
PAGE_SIZE << order);
}
arch_free_page(page, order);
kernel_map_pages(page, 1 << order, 0);
-@@ -773,8 +783,10 @@ static int prep_new_page(struct page *pa
+@@ -780,8 +790,10 @@ static int prep_new_page(struct page *pa
arch_alloc_page(page, order);
kernel_map_pages(page, 1 << order, 1);
if (order && (gfp_flags & __GFP_COMP))
prep_compound_page(page, order);
-diff -urNp linux-2.6.38.4/mm/percpu.c linux-2.6.38.4/mm/percpu.c
---- linux-2.6.38.4/mm/percpu.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/percpu.c 2011-04-28 19:34:15.000000000 -0400
+@@ -2504,6 +2516,8 @@ void __show_free_areas(unsigned int filt
+ int cpu;
+ struct zone *zone;
+
++ pax_track_stack();
++
+ for_each_populated_zone(zone) {
+ if (skip_free_areas_zone(filter, zone))
+ continue;
+diff -urNp linux-2.6.39/mm/percpu.c linux-2.6.39/mm/percpu.c
+--- linux-2.6.39/mm/percpu.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/percpu.c 2011-05-22 19:36:33.000000000 -0400
@@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu
static unsigned int pcpu_last_unit_cpu __read_mostly;
EXPORT_SYMBOL_GPL(pcpu_base_addr);
static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
-diff -urNp linux-2.6.38.4/mm/rmap.c linux-2.6.38.4/mm/rmap.c
---- linux-2.6.38.4/mm/rmap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/rmap.c 2011-04-28 19:34:15.000000000 -0400
-@@ -117,6 +117,10 @@ int anon_vma_prepare(struct vm_area_stru
+diff -urNp linux-2.6.39/mm/rmap.c linux-2.6.39/mm/rmap.c
+--- linux-2.6.39/mm/rmap.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/rmap.c 2011-05-22 19:36:33.000000000 -0400
+@@ -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;
might_sleep();
if (unlikely(!anon_vma)) {
struct mm_struct *mm = vma->vm_mm;
-@@ -126,6 +130,12 @@ int anon_vma_prepare(struct vm_area_stru
+@@ -140,6 +144,12 @@ int anon_vma_prepare(struct vm_area_stru
if (!avc)
goto out_enomem;
anon_vma = find_mergeable_anon_vma(vma);
allocated = NULL;
if (!anon_vma) {
-@@ -144,6 +154,21 @@ int anon_vma_prepare(struct vm_area_stru
+@@ -153,6 +163,21 @@ int anon_vma_prepare(struct vm_area_stru
/* page_table_lock to protect against threads */
spin_lock(&mm->page_table_lock);
if (likely(!vma->anon_vma)) {
vma->anon_vma = anon_vma;
avc->anon_vma = anon_vma;
avc->vma = vma;
-@@ -157,12 +182,24 @@ int anon_vma_prepare(struct vm_area_stru
+@@ -166,12 +191,24 @@ int anon_vma_prepare(struct vm_area_stru
if (unlikely(allocated))
- anon_vma_free(allocated);
+ put_anon_vma(allocated);
+
+#ifdef CONFIG_PAX_SEGMEXEC
+ if (unlikely(avc_m))
anon_vma_chain_free(avc);
out_enomem:
return -ENOMEM;
-@@ -189,7 +226,7 @@ static void anon_vma_chain_link(struct v
+@@ -198,7 +235,7 @@ static void anon_vma_chain_link(struct v
* Attach the anon_vmas from src to dst.
* Returns 0 on success, -ENOMEM on failure.
*/
{
struct anon_vma_chain *avc, *pavc;
-@@ -211,7 +248,7 @@ int anon_vma_clone(struct vm_area_struct
+@@ -220,7 +257,7 @@ int anon_vma_clone(struct vm_area_struct
* the corresponding VMA in the parent process is attached to.
* Returns 0 on success, non-zero on failure.
*/
{
struct anon_vma_chain *avc;
struct anon_vma *anon_vma;
-diff -urNp linux-2.6.38.4/mm/shmem.c linux-2.6.38.4/mm/shmem.c
---- linux-2.6.38.4/mm/shmem.c 2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/mm/shmem.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/mm/shmem.c linux-2.6.39/mm/shmem.c
+--- linux-2.6.39/mm/shmem.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/shmem.c 2011-05-22 19:41:42.000000000 -0400
@@ -31,7 +31,7 @@
#include <linux/percpu_counter.h>
#include <linux/swap.h>
#ifdef CONFIG_SHMEM
/*
-@@ -1070,6 +1070,8 @@ static int shmem_writepage(struct page *
+@@ -1086,6 +1086,8 @@ static int shmem_writepage(struct page *
goto unlock;
}
entry = shmem_swp_entry(info, index, NULL);
if (entry->val) {
/*
* The more uptodate page coming down from a stacked
-@@ -1995,7 +1997,7 @@ static int shmem_symlink(struct inode *d
+@@ -1157,6 +1159,8 @@ static struct page *shmem_swapin(swp_ent
+ struct vm_area_struct pvma;
+ struct page *page;
+
++ pax_track_stack();
++
+ spol = mpol_cond_copy(&mpol,
+ mpol_shared_policy_lookup(&info->policy, idx));
+
+@@ -2013,7 +2017,7 @@ static int shmem_symlink(struct inode *d
info = SHMEM_I(inode);
inode->i_size = len-1;
- if (len <= (char *)inode - (char *)info) {
-+ if (len <= min((char *)inode - (char *)info, 64)) {
++ if (len <= (char *)inode - (char *)info && len <= 64) {
/* do it inline */
memcpy(info, symname, len);
inode->i_op = &shmem_symlink_inline_operations;
-diff -urNp linux-2.6.38.4/mm/slab.c linux-2.6.38.4/mm/slab.c
---- linux-2.6.38.4/mm/slab.c 2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/mm/slab.c 2011-04-28 19:57:25.000000000 -0400
+@@ -2361,8 +2365,7 @@ int shmem_fill_super(struct super_block
+ int err = -ENOMEM;
+
+ /* Round up to L1_CACHE_BYTES to resist false sharing */
+- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
+- L1_CACHE_BYTES), GFP_KERNEL);
++ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
+ if (!sbinfo)
+ return -ENOMEM;
+
+diff -urNp linux-2.6.39/mm/slab.c linux-2.6.39/mm/slab.c
+--- linux-2.6.39/mm/slab.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/slab.c 2011-05-22 19:41:42.000000000 -0400
@@ -150,7 +150,7 @@
/* Legal flag mask for kmem_cache_create(). */
SLAB_CACHE_DMA | \
SLAB_RECLAIM_ACCOUNT | SLAB_PANIC | \
SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
-@@ -284,7 +284,7 @@ struct kmem_list3 {
+@@ -287,7 +287,7 @@ struct kmem_list3 {
* Need this for bootstrapping a per node allocator.
*/
#define NUM_INIT_LISTS (3 * MAX_NUMNODES)
#define CACHE_CACHE 0
#define SIZE_AC MAX_NUMNODES
#define SIZE_L3 (2 * MAX_NUMNODES)
-@@ -385,10 +385,10 @@ static void kmem_list3_init(struct kmem_
+@@ -388,10 +388,10 @@ static void kmem_list3_init(struct kmem_
if ((x)->max_freeable < i) \
(x)->max_freeable = i; \
} while (0)
#else
#define STATS_INC_ACTIVE(x) do { } while (0)
#define STATS_DEC_ACTIVE(x) do { } while (0)
-@@ -534,7 +534,7 @@ static inline void *index_to_obj(struct
+@@ -537,7 +537,7 @@ static inline void *index_to_obj(struct
* reciprocal_divide(offset, cache->reciprocal_buffer_size)
*/
static inline unsigned int obj_to_index(const struct kmem_cache *cache,
{
u32 offset = (obj - slab->s_mem);
return reciprocal_divide(offset, cache->reciprocal_buffer_size);
-@@ -560,7 +560,7 @@ struct cache_names {
+@@ -563,7 +563,7 @@ struct cache_names {
static struct cache_names __initdata cache_names[] = {
#define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)" },
#include <linux/kmalloc_sizes.h>
#undef CACHE
};
-@@ -1526,7 +1526,7 @@ void __init kmem_cache_init(void)
+@@ -1529,7 +1529,7 @@ void __init kmem_cache_init(void)
sizes[INDEX_AC].cs_cachep = kmem_cache_create(names[INDEX_AC].name,
sizes[INDEX_AC].cs_size,
ARCH_KMALLOC_MINALIGN,
NULL);
if (INDEX_AC != INDEX_L3) {
-@@ -1534,7 +1534,7 @@ void __init kmem_cache_init(void)
+@@ -1537,7 +1537,7 @@ void __init kmem_cache_init(void)
kmem_cache_create(names[INDEX_L3].name,
sizes[INDEX_L3].cs_size,
ARCH_KMALLOC_MINALIGN,
NULL);
}
-@@ -1552,7 +1552,7 @@ void __init kmem_cache_init(void)
+@@ -1555,7 +1555,7 @@ void __init kmem_cache_init(void)
sizes->cs_cachep = kmem_cache_create(names->name,
sizes->cs_size,
ARCH_KMALLOC_MINALIGN,
NULL);
}
#ifdef CONFIG_ZONE_DMA
-@@ -4275,10 +4275,10 @@ static int s_show(struct seq_file *m, vo
+@@ -4270,10 +4270,10 @@ static int s_show(struct seq_file *m, vo
}
/* cpu stats */
{
seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
allochit, allocmiss, freehit, freemiss);
-@@ -4535,15 +4535,66 @@ static const struct file_operations proc
+@@ -4530,15 +4530,66 @@ static const struct file_operations proc
static int __init slab_proc_init(void)
{
/**
* ksize - get the actual amount of memory allocated for a given object
* @objp: Pointer to the object
-diff -urNp linux-2.6.38.4/mm/slob.c linux-2.6.38.4/mm/slob.c
---- linux-2.6.38.4/mm/slob.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/slob.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/mm/slob.c linux-2.6.39/mm/slob.c
+--- linux-2.6.39/mm/slob.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/slob.c 2011-05-22 19:36:33.000000000 -0400
@@ -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
}
trace_kmem_cache_free(_RET_IP_, b);
-diff -urNp linux-2.6.38.4/mm/slub.c linux-2.6.38.4/mm/slub.c
---- linux-2.6.38.4/mm/slub.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/slub.c 2011-04-28 19:34:15.000000000 -0400
-@@ -390,7 +390,7 @@ static void print_track(const char *s, s
+diff -urNp linux-2.6.39/mm/slub.c linux-2.6.39/mm/slub.c
+--- linux-2.6.39/mm/slub.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/slub.c 2011-05-22 19:41:42.000000000 -0400
+@@ -419,7 +419,7 @@ static void print_track(const char *s, s
if (!t->addr)
return;
s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
}
-@@ -1927,6 +1927,8 @@ void kmem_cache_free(struct kmem_cache *
+@@ -2171,6 +2171,8 @@ void kmem_cache_free(struct kmem_cache *
page = virt_to_head_page(x);
slab_free(s, page, x, _RET_IP_);
trace_kmem_cache_free(_RET_IP_, x);
-@@ -1960,7 +1962,7 @@ static int slub_min_objects;
+@@ -2204,7 +2206,7 @@ static int slub_min_objects;
* Merge control. If this is set then no merging of slab caches will occur.
* (Could be removed. This was introduced to pacify the merge skeptics.)
*/
/*
* Calculate the order of allocation given an slab object size.
-@@ -2370,7 +2372,7 @@ static int kmem_cache_open(struct kmem_c
+@@ -2632,7 +2634,7 @@ static int kmem_cache_open(struct kmem_c
* list to avoid pounding the page allocator excessively.
*/
set_min_partial(s, ilog2(s->size));
#ifdef CONFIG_NUMA
s->remote_node_defrag_ratio = 1000;
#endif
-@@ -2482,8 +2484,7 @@ static inline int kmem_cache_close(struc
+@@ -2738,8 +2740,7 @@ static inline int kmem_cache_close(struc
void kmem_cache_destroy(struct kmem_cache *s)
{
down_write(&slub_lock);
list_del(&s->list);
if (kmem_cache_close(s)) {
printk(KERN_ERR "SLUB %s: %s called for cache that "
-@@ -2693,6 +2694,46 @@ void *__kmalloc_node(size_t size, gfp_t
+@@ -2949,6 +2950,46 @@ void *__kmalloc_node(size_t size, gfp_t
EXPORT_SYMBOL(__kmalloc_node);
#endif
size_t ksize(const void *object)
{
struct page *page;
-@@ -2958,7 +2999,7 @@ static void __init kmem_cache_bootstrap_
+@@ -3193,7 +3234,7 @@ static void __init kmem_cache_bootstrap_
int node;
list_add(&s->list, &slab_caches);
for_each_node_state(node, N_NORMAL_MEMORY) {
struct kmem_cache_node *n = get_node(s, node);
-@@ -3075,17 +3116,17 @@ void __init kmem_cache_init(void)
+@@ -3310,17 +3351,17 @@ void __init kmem_cache_init(void)
/* Caches that are not of the two-to-the-power-of size */
if (KMALLOC_MIN_SIZE <= 32) {
caches++;
}
-@@ -3153,7 +3194,7 @@ static int slab_unmergeable(struct kmem_
+@@ -3388,7 +3429,7 @@ static int slab_unmergeable(struct kmem_
/*
* We may have set a slab to be unmergeable during bootstrap.
*/
return 1;
return 0;
-@@ -3212,7 +3253,7 @@ struct kmem_cache *kmem_cache_create(con
+@@ -3447,7 +3488,7 @@ struct kmem_cache *kmem_cache_create(con
down_write(&slub_lock);
s = find_mergeable(size, align, flags, name, ctor);
if (s) {
/*
* Adjust the object sizes so that we clear
* the complete object on kzalloc.
-@@ -3221,7 +3262,7 @@ struct kmem_cache *kmem_cache_create(con
+@@ -3456,7 +3497,7 @@ struct kmem_cache *kmem_cache_create(con
s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
if (sysfs_slab_alias(s, name)) {
goto err;
}
up_write(&slub_lock);
-@@ -3954,7 +3995,7 @@ SLAB_ATTR_RO(ctor);
+@@ -4189,7 +4230,7 @@ SLAB_ATTR_RO(ctor);
static ssize_t aliases_show(struct kmem_cache *s, char *buf)
{
}
SLAB_ATTR_RO(aliases);
-@@ -4691,7 +4732,13 @@ static const struct file_operations proc
+@@ -4933,7 +4974,13 @@ static const struct file_operations proc
static int __init slab_proc_init(void)
{
return 0;
}
module_init(slab_proc_init);
-diff -urNp linux-2.6.38.4/mm/swapfile.c linux-2.6.38.4/mm/swapfile.c
---- linux-2.6.38.4/mm/swapfile.c 2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/mm/swapfile.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/mm/swapfile.c linux-2.6.39/mm/swapfile.c
+--- linux-2.6.39/mm/swapfile.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/swapfile.c 2011-05-22 19:36:33.000000000 -0400
@@ -61,7 +61,7 @@ static DEFINE_MUTEX(swapon_mutex);
static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
static inline unsigned char swap_count(unsigned char ent)
{
-@@ -1687,7 +1687,7 @@ SYSCALL_DEFINE1(swapoff, const char __us
+@@ -1669,7 +1669,7 @@ SYSCALL_DEFINE1(swapoff, const char __us
}
filp_close(swap_file, NULL);
err = 0;
wake_up_interruptible(&proc_poll_wait);
out_dput:
-@@ -1708,8 +1708,8 @@ static unsigned swaps_poll(struct file *
+@@ -1690,8 +1690,8 @@ static unsigned swaps_poll(struct file *
poll_wait(file, &proc_poll_wait, wait);
return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
}
-@@ -1815,7 +1815,7 @@ static int swaps_open(struct inode *inod
+@@ -1797,7 +1797,7 @@ static int swaps_open(struct inode *inod
}
s->seq.private = s;
}
@@ -2131,7 +2131,7 @@ SYSCALL_DEFINE2(swapon, const char __use
- swap_info[prev]->next = type;
- spin_unlock(&swap_lock);
+ (p->flags & SWP_DISCARDABLE) ? "D" : "");
+
mutex_unlock(&swapon_mutex);
- atomic_inc(&proc_poll_event);
+ atomic_inc_unchecked(&proc_poll_event);
wake_up_interruptible(&proc_poll_wait);
- error = 0;
-diff -urNp linux-2.6.38.4/mm/util.c linux-2.6.38.4/mm/util.c
---- linux-2.6.38.4/mm/util.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/util.c 2011-04-28 19:34:15.000000000 -0400
-@@ -219,6 +219,12 @@ EXPORT_SYMBOL(strndup_user);
+ if (S_ISREG(inode->i_mode))
+diff -urNp linux-2.6.39/mm/util.c linux-2.6.39/mm/util.c
+--- linux-2.6.39/mm/util.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/util.c 2011-05-23 17:07:00.000000000 -0400
+@@ -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.
+ */
++#undef __krealloc
+ void *__krealloc(const void *p, size_t new_size, gfp_t flags)
+ {
+ void *ret;
+@@ -145,6 +146,7 @@ EXPORT_SYMBOL(__krealloc);
+ * behaves exactly like kmalloc(). If @size is 0 and @p is not a
+ * %NULL pointer, the object pointed to is freed.
+ */
++#undef krealloc
+ void *krealloc(const void *p, size_t new_size, gfp_t flags)
+ {
+ void *ret;
+@@ -219,6 +221,12 @@ EXPORT_SYMBOL(strndup_user);
void arch_pick_mmap_layout(struct mm_struct *mm)
{
mm->mmap_base = TASK_UNMAPPED_BASE;
mm->get_unmapped_area = arch_get_unmapped_area;
mm->unmap_area = arch_unmap_area;
}
-diff -urNp linux-2.6.38.4/mm/vmalloc.c linux-2.6.38.4/mm/vmalloc.c
---- linux-2.6.38.4/mm/vmalloc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/vmalloc.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/mm/vmalloc.c linux-2.6.39/mm/vmalloc.c
+--- linux-2.6.39/mm/vmalloc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/vmalloc.c 2011-05-22 19:36:33.000000000 -0400
@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd,
pte = pte_offset_kernel(pmd, addr);
if (!pmd_none(*pmd)) {
pte_t *ptep, pte;
-@@ -1244,6 +1284,16 @@ static struct vm_struct *__get_vm_area_n
+@@ -1296,6 +1336,16 @@ static struct vm_struct *__get_vm_area_n
struct vm_struct *area;
BUG_ON(in_interrupt());
if (flags & VM_IOREMAP) {
int bit = fls(size);
-@@ -1462,6 +1512,11 @@ void *vmap(struct page **pages, unsigned
+@@ -1514,6 +1564,11 @@ void *vmap(struct page **pages, unsigned
if (count > totalram_pages)
return NULL;
area = get_vm_area_caller((count << PAGE_SHIFT), flags,
__builtin_return_address(0));
if (!area)
-@@ -1558,6 +1613,13 @@ void *__vmalloc_node_range(unsigned long
+@@ -1610,6 +1665,13 @@ void *__vmalloc_node_range(unsigned long
if (!size || (size >> PAGE_SHIFT) > totalram_pages)
return NULL;
area = __get_vm_area_node(size, align, VM_ALLOC, start, end, node,
gfp_mask, caller);
-@@ -1597,6 +1659,7 @@ static void *__vmalloc_node(unsigned lon
+@@ -1649,6 +1711,7 @@ static void *__vmalloc_node(unsigned lon
gfp_mask, prot, node, caller);
}
void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
{
return __vmalloc_node(size, 1, gfp_mask, prot, -1,
-@@ -1620,6 +1683,7 @@ static inline void *__vmalloc_node_flags
+@@ -1672,6 +1735,7 @@ static inline void *__vmalloc_node_flags
* For tight control over page level allocator and protection flags
* use __vmalloc() instead.
*/
void *vmalloc(unsigned long size)
{
return __vmalloc_node_flags(size, -1, GFP_KERNEL | __GFP_HIGHMEM);
-@@ -1636,6 +1700,7 @@ EXPORT_SYMBOL(vmalloc);
+@@ -1688,6 +1752,7 @@ EXPORT_SYMBOL(vmalloc);
* For tight control over page level allocator and protection flags
* use __vmalloc() instead.
*/
void *vzalloc(unsigned long size)
{
return __vmalloc_node_flags(size, -1,
-@@ -1650,6 +1715,7 @@ EXPORT_SYMBOL(vzalloc);
+@@ -1702,6 +1767,7 @@ EXPORT_SYMBOL(vzalloc);
* The resulting memory area is zeroed so it can be mapped to userspace
* without leaking data.
*/
void *vmalloc_user(unsigned long size)
{
struct vm_struct *area;
-@@ -1677,6 +1743,7 @@ EXPORT_SYMBOL(vmalloc_user);
+@@ -1729,6 +1795,7 @@ EXPORT_SYMBOL(vmalloc_user);
* For tight control over page level allocator and protection flags
* use __vmalloc() instead.
*/
void *vmalloc_node(unsigned long size, int node)
{
return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
-@@ -1696,6 +1763,7 @@ EXPORT_SYMBOL(vmalloc_node);
+@@ -1748,6 +1815,7 @@ EXPORT_SYMBOL(vmalloc_node);
* For tight control over page level allocator and protection flags
* use __vmalloc_node() instead.
*/
void *vzalloc_node(unsigned long size, int node)
{
return __vmalloc_node_flags(size, node,
-@@ -1718,10 +1786,10 @@ EXPORT_SYMBOL(vzalloc_node);
+@@ -1770,10 +1838,10 @@ EXPORT_SYMBOL(vzalloc_node);
* For tight control over page level allocator and protection flags
* use __vmalloc() instead.
*/
-1, __builtin_return_address(0));
}
-@@ -1740,6 +1808,7 @@ void *vmalloc_exec(unsigned long size)
+@@ -1792,6 +1860,7 @@ void *vmalloc_exec(unsigned long size)
* Allocate enough 32bit PA addressable pages to cover @size from the
* page level allocator and map them into contiguous kernel virtual space.
*/
void *vmalloc_32(unsigned long size)
{
return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL,
-@@ -1754,6 +1823,7 @@ EXPORT_SYMBOL(vmalloc_32);
+@@ -1806,6 +1875,7 @@ EXPORT_SYMBOL(vmalloc_32);
* The resulting memory area is 32bit addressable and zeroed so it can be
* mapped to userspace without leaking data.
*/
void *vmalloc_32_user(unsigned long size)
{
struct vm_struct *area;
-@@ -2018,6 +2088,8 @@ int remap_vmalloc_range(struct vm_area_s
+@@ -2068,6 +2138,8 @@ int remap_vmalloc_range(struct vm_area_s
unsigned long uaddr = vma->vm_start;
unsigned long usize = vma->vm_end - vma->vm_start;
if ((PAGE_SIZE-1) & (unsigned long)addr)
return -EINVAL;
-diff -urNp linux-2.6.38.4/mm/vmstat.c linux-2.6.38.4/mm/vmstat.c
---- linux-2.6.38.4/mm/vmstat.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/vmstat.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/mm/vmstat.c linux-2.6.39/mm/vmstat.c
+--- linux-2.6.39/mm/vmstat.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/mm/vmstat.c 2011-05-22 19:41:42.000000000 -0400
@@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
*
* vm_stat contains the global counters
EXPORT_SYMBOL(vm_stat);
#ifdef CONFIG_SMP
-@@ -451,7 +451,7 @@ void refresh_cpu_vm_stats(int cpu)
+@@ -454,7 +454,7 @@ void refresh_cpu_vm_stats(int cpu)
v = p->vm_stat_diff[i];
p->vm_stat_diff[i] = 0;
local_irq_restore(flags);
global_diff[i] += v;
#ifdef CONFIG_NUMA
/* 3 seconds idle till flush */
-@@ -489,7 +489,7 @@ void refresh_cpu_vm_stats(int cpu)
+@@ -492,7 +492,7 @@ void refresh_cpu_vm_stats(int cpu)
for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
if (global_diff[i])
}
#endif
-@@ -1188,10 +1188,20 @@ static int __init setup_vmstat(void)
+@@ -1205,10 +1205,20 @@ static int __init setup_vmstat(void)
start_cpu_timer(cpu);
#endif
#ifdef CONFIG_PROC_FS
#endif
return 0;
}
-diff -urNp linux-2.6.38.4/net/8021q/vlan.c linux-2.6.38.4/net/8021q/vlan.c
---- linux-2.6.38.4/net/8021q/vlan.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/8021q/vlan.c 2011-04-28 19:34:15.000000000 -0400
-@@ -589,8 +589,7 @@ static int vlan_ioctl_handler(struct net
+diff -urNp linux-2.6.39/net/8021q/vlan.c linux-2.6.39/net/8021q/vlan.c
+--- linux-2.6.39/net/8021q/vlan.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/8021q/vlan.c 2011-05-22 19:36:33.000000000 -0400
+@@ -592,8 +592,7 @@ static int vlan_ioctl_handler(struct net
err = -EPERM;
if (!capable(CAP_NET_ADMIN))
break;
struct vlan_net *vn;
vn = net_generic(net, vlan_net_id);
-diff -urNp linux-2.6.38.4/net/atm/atm_misc.c linux-2.6.38.4/net/atm/atm_misc.c
---- linux-2.6.38.4/net/atm/atm_misc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/atm/atm_misc.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/atm/atm_misc.c linux-2.6.39/net/atm/atm_misc.c
+--- linux-2.6.39/net/atm/atm_misc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/atm/atm_misc.c 2011-05-22 19:36:33.000000000 -0400
@@ -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;
__SONET_ITEMS
#undef __HANDLE_ITEM
}
-diff -urNp linux-2.6.38.4/net/atm/proc.c linux-2.6.38.4/net/atm/proc.c
---- linux-2.6.38.4/net/atm/proc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/atm/proc.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/atm/mpoa_caches.c linux-2.6.39/net/atm/mpoa_caches.c
+--- linux-2.6.39/net/atm/mpoa_caches.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/atm/mpoa_caches.c 2011-05-22 19:36:33.000000000 -0400
+@@ -255,6 +255,8 @@ static void check_resolving_entries(stru
+ struct timeval now;
+ struct k_message msg;
+
++ pax_track_stack();
++
+ do_gettimeofday(&now);
+
+ read_lock_bh(&client->ingress_lock);
+diff -urNp linux-2.6.39/net/atm/proc.c linux-2.6.39/net/atm/proc.c
+--- linux-2.6.39/net/atm/proc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/atm/proc.c 2011-05-22 19:41:42.000000000 -0400
@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s
const struct k_atm_aal_stats *stats)
{
else
seq_printf(seq, "%3d %3d %5d ",
vcc->dev->number, vcc->vpi, vcc->vci);
-diff -urNp linux-2.6.38.4/net/atm/resources.c linux-2.6.38.4/net/atm/resources.c
---- linux-2.6.38.4/net/atm/resources.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/atm/resources.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/atm/resources.c linux-2.6.39/net/atm/resources.c
+--- linux-2.6.39/net/atm/resources.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/atm/resources.c 2011-05-22 19:36:33.000000000 -0400
@@ -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)
__AAL_STAT_ITEMS
#undef __HANDLE_ITEM
}
-diff -urNp linux-2.6.38.4/net/batman-adv/hard-interface.c linux-2.6.38.4/net/batman-adv/hard-interface.c
---- linux-2.6.38.4/net/batman-adv/hard-interface.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/batman-adv/hard-interface.c 2011-04-28 19:57:25.000000000 -0400
-@@ -325,8 +325,8 @@ int hardif_enable_interface(struct batma
- kref_get(&batman_if->refcount);
- dev_add_pack(&batman_if->batman_adv_ptype);
-
-- atomic_set(&batman_if->seqno, 1);
-- atomic_set(&batman_if->frag_seqno, 1);
-+ atomic_set_unchecked(&batman_if->seqno, 1);
-+ atomic_set_unchecked(&batman_if->frag_seqno, 1);
- bat_info(batman_if->soft_iface, "Adding interface: %s\n",
- batman_if->net_dev->name);
-
-diff -urNp linux-2.6.38.4/net/batman-adv/routing.c linux-2.6.38.4/net/batman-adv/routing.c
---- linux-2.6.38.4/net/batman-adv/routing.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/batman-adv/routing.c 2011-04-28 19:57:25.000000000 -0400
-@@ -569,7 +569,7 @@ void receive_bat_packet(struct ethhdr *e
+diff -urNp linux-2.6.39/net/batman-adv/hard-interface.c linux-2.6.39/net/batman-adv/hard-interface.c
+--- linux-2.6.39/net/batman-adv/hard-interface.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/batman-adv/hard-interface.c 2011-05-22 19:36:33.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);
+
+- atomic_set(&hard_iface->seqno, 1);
+- atomic_set(&hard_iface->frag_seqno, 1);
++ atomic_set_unchecked(&hard_iface->seqno, 1);
++ atomic_set_unchecked(&hard_iface->frag_seqno, 1);
+ bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
+ hard_iface->net_dev->name);
+
+diff -urNp linux-2.6.39/net/batman-adv/routing.c linux-2.6.39/net/batman-adv/routing.c
+--- linux-2.6.39/net/batman-adv/routing.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/batman-adv/routing.c 2011-05-22 19:36:33.000000000 -0400
+@@ -625,7 +625,7 @@ void receive_bat_packet(struct ethhdr *e
return;
/* could be changed by schedule_own_packet() */
has_directlink_flag = (batman_packet->flags & DIRECTLINK ? 1 : 0);
-diff -urNp linux-2.6.38.4/net/batman-adv/send.c linux-2.6.38.4/net/batman-adv/send.c
---- linux-2.6.38.4/net/batman-adv/send.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/batman-adv/send.c 2011-04-28 19:57:25.000000000 -0400
-@@ -277,7 +277,7 @@ void schedule_own_packet(struct batman_i
+diff -urNp linux-2.6.39/net/batman-adv/send.c linux-2.6.39/net/batman-adv/send.c
+--- linux-2.6.39/net/batman-adv/send.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/batman-adv/send.c 2011-05-22 19:36:33.000000000 -0400
+@@ -277,7 +277,7 @@ void schedule_own_packet(struct hard_ifa
/* change sequence number to network order */
batman_packet->seqno =
-- htonl((uint32_t)atomic_read(&batman_if->seqno));
-+ htonl((uint32_t)atomic_read_unchecked(&batman_if->seqno));
+- htonl((uint32_t)atomic_read(&hard_iface->seqno));
++ htonl((uint32_t)atomic_read_unchecked(&hard_iface->seqno));
if (vis_server == VIS_TYPE_SERVER_SYNC)
batman_packet->flags |= VIS_SERVER;
-@@ -291,7 +291,7 @@ void schedule_own_packet(struct batman_i
+@@ -291,7 +291,7 @@ void schedule_own_packet(struct hard_ifa
else
batman_packet->gw_flags = 0;
-- atomic_inc(&batman_if->seqno);
-+ atomic_inc_unchecked(&batman_if->seqno);
+- atomic_inc(&hard_iface->seqno);
++ atomic_inc_unchecked(&hard_iface->seqno);
- slide_own_bcast_window(batman_if);
+ slide_own_bcast_window(hard_iface);
send_time = own_send_time(bat_priv);
-diff -urNp linux-2.6.38.4/net/batman-adv/soft-interface.c linux-2.6.38.4/net/batman-adv/soft-interface.c
---- linux-2.6.38.4/net/batman-adv/soft-interface.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/batman-adv/soft-interface.c 2011-04-28 19:57:25.000000000 -0400
-@@ -410,7 +410,7 @@ int interface_tx(struct sk_buff *skb, st
+diff -urNp linux-2.6.39/net/batman-adv/soft-interface.c linux-2.6.39/net/batman-adv/soft-interface.c
+--- linux-2.6.39/net/batman-adv/soft-interface.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/batman-adv/soft-interface.c 2011-05-22 19:36:33.000000000 -0400
+@@ -386,7 +386,7 @@ int interface_tx(struct sk_buff *skb, st
/* set broadcast sequence number */
bcast_packet->seqno =
add_bcast_packet_to_list(bat_priv, skb);
-@@ -603,7 +603,7 @@ struct net_device *softif_create(char *n
+@@ -579,7 +579,7 @@ struct net_device *softif_create(char *n
atomic_set(&bat_priv->batman_queue_left, BATMAN_QUEUE_LEN);
atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
atomic_set(&bat_priv->hna_local_changed, 0);
bat_priv->primary_if = NULL;
-diff -urNp linux-2.6.38.4/net/batman-adv/types.h linux-2.6.38.4/net/batman-adv/types.h
---- linux-2.6.38.4/net/batman-adv/types.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/batman-adv/types.h 2011-04-28 19:57:25.000000000 -0400
-@@ -38,8 +38,8 @@ struct batman_if {
+diff -urNp linux-2.6.39/net/batman-adv/types.h linux-2.6.39/net/batman-adv/types.h
+--- linux-2.6.39/net/batman-adv/types.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/batman-adv/types.h 2011-05-22 19:36:33.000000000 -0400
+@@ -38,8 +38,8 @@ struct hard_iface {
int16_t if_num;
char if_status;
struct net_device *net_dev;
unsigned char *packet_buff;
int packet_len;
struct kobject *hardif_obj;
-@@ -133,7 +133,7 @@ struct bat_priv {
+@@ -141,7 +141,7 @@ struct bat_priv {
atomic_t orig_interval; /* uint */
atomic_t hop_penalty; /* uint */
atomic_t log_level; /* uint */
atomic_t bcast_queue_left;
atomic_t batman_queue_left;
char num_ifaces;
-diff -urNp linux-2.6.38.4/net/batman-adv/unicast.c linux-2.6.38.4/net/batman-adv/unicast.c
---- linux-2.6.38.4/net/batman-adv/unicast.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/batman-adv/unicast.c 2011-04-28 19:57:25.000000000 -0400
-@@ -261,9 +261,9 @@ int frag_send_skb(struct sk_buff *skb, s
- frag1->flags |= UNI_FRAG_HEAD;
- frag2->flags &= ~UNI_FRAG_HEAD;
-
-- frag1->seqno = htons((uint16_t)atomic_inc_return(
-+ frag1->seqno = htons((uint16_t)atomic_inc_return_unchecked(
- &batman_if->frag_seqno));
-- frag2->seqno = htons((uint16_t)atomic_inc_return(
-+ frag2->seqno = htons((uint16_t)atomic_inc_return_unchecked(
- &batman_if->frag_seqno));
-
- send_skb_packet(skb, batman_if, dstaddr);
-diff -urNp linux-2.6.38.4/net/bridge/br_multicast.c linux-2.6.38.4/net/bridge/br_multicast.c
---- linux-2.6.38.4/net/bridge/br_multicast.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/net/bridge/br_multicast.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/batman-adv/unicast.c linux-2.6.39/net/batman-adv/unicast.c
+--- linux-2.6.39/net/batman-adv/unicast.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/batman-adv/unicast.c 2011-05-22 19:36:33.000000000 -0400
+@@ -263,7 +263,7 @@ int frag_send_skb(struct sk_buff *skb, s
+ frag1->flags = UNI_FRAG_HEAD | large_tail;
+ frag2->flags = large_tail;
+
+- seqno = atomic_add_return(2, &hard_iface->frag_seqno);
++ seqno = atomic_add_return_unchecked(2, &hard_iface->frag_seqno);
+ frag1->seqno = htons(seqno - 1);
+ frag2->seqno = htons(seqno);
+
+diff -urNp linux-2.6.39/net/bridge/br_multicast.c linux-2.6.39/net/bridge/br_multicast.c
+--- linux-2.6.39/net/bridge/br_multicast.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/bridge/br_multicast.c 2011-05-22 19:36:33.000000000 -0400
@@ -1482,7 +1482,7 @@ static int br_multicast_ipv6_rcv(struct
nexthdr = ip6h->nexthdr;
offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
return 0;
/* Okay, we found ICMPv6 header */
-diff -urNp linux-2.6.38.4/net/bridge/netfilter/ebtables.c linux-2.6.38.4/net/bridge/netfilter/ebtables.c
---- linux-2.6.38.4/net/bridge/netfilter/ebtables.c 2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/net/bridge/netfilter/ebtables.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/bridge/netfilter/ebtables.c linux-2.6.39/net/bridge/netfilter/ebtables.c
+--- linux-2.6.39/net/bridge/netfilter/ebtables.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/bridge/netfilter/ebtables.c 2011-05-22 19:36:33.000000000 -0400
@@ -1512,7 +1512,7 @@ static int do_ebt_get_ctl(struct sock *s
tmp.valid_hooks = t->table->valid_hooks;
}
BUGPRINT("c2u Didn't work\n");
ret = -EFAULT;
break;
-diff -urNp linux-2.6.38.4/net/caif/caif_socket.c linux-2.6.38.4/net/caif/caif_socket.c
---- linux-2.6.38.4/net/caif/caif_socket.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/caif/caif_socket.c 2011-04-28 19:57:25.000000000 -0400
+@@ -1780,6 +1780,8 @@ static int compat_copy_everything_to_use
+ int ret;
+ void __user *pos;
+
++ pax_track_stack();
++
+ memset(&tinfo, 0, sizeof(tinfo));
+
+ if (cmd == EBT_SO_GET_ENTRIES) {
+diff -urNp linux-2.6.39/net/caif/caif_socket.c linux-2.6.39/net/caif/caif_socket.c
+--- linux-2.6.39/net/caif/caif_socket.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/caif/caif_socket.c 2011-05-22 19:36:33.000000000 -0400
@@ -48,18 +48,19 @@ static struct dentry *debugfsdir;
#ifdef CONFIG_DEBUG_FS
struct debug_fs_counter {
if (cf_sk->debugfs_socket_dir != NULL)
debugfs_remove_recursive(cf_sk->debugfs_socket_dir);
-diff -urNp linux-2.6.38.4/net/caif/cfctrl.c linux-2.6.38.4/net/caif/cfctrl.c
---- linux-2.6.38.4/net/caif/cfctrl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/caif/cfctrl.c 2011-04-28 19:57:25.000000000 -0400
-@@ -46,8 +46,8 @@ struct cflayer *cfctrl_create(void)
+diff -urNp linux-2.6.39/net/caif/cfctrl.c linux-2.6.39/net/caif/cfctrl.c
+--- linux-2.6.39/net/caif/cfctrl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/caif/cfctrl.c 2011-05-22 19:36:33.000000000 -0400
+@@ -9,6 +9,7 @@
+ #include <linux/stddef.h>
+ #include <linux/spinlock.h>
+ #include <linux/slab.h>
++#include <linux/sched.h>
+ #include <net/caif/caif_layer.h>
+ #include <net/caif/cfpkt.h>
+ #include <net/caif/cfctrl.h>
+@@ -46,8 +47,8 @@ struct cflayer *cfctrl_create(void)
dev_info.id = 0xff;
memset(this, 0, sizeof(*this));
cfsrvl_init(&this->serv, 0, &dev_info, false);
this->serv.layer.receive = cfctrl_recv;
sprintf(this->serv.layer.name, "ctrl");
this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
-@@ -116,8 +116,8 @@ void cfctrl_insert_req(struct cfctrl *ct
+@@ -116,8 +117,8 @@ void cfctrl_insert_req(struct cfctrl *ct
struct cfctrl_request_info *req)
{
spin_lock(&ctrl->info_list_lock);
list_add_tail(&req->list, &ctrl->list);
spin_unlock(&ctrl->info_list_lock);
}
-@@ -136,7 +136,7 @@ struct cfctrl_request_info *cfctrl_remov
+@@ -136,7 +137,7 @@ struct cfctrl_request_info *cfctrl_remov
if (p != first)
pr_warn("Requests are not received in order\n");
p->sequence_no);
list_del(&p->list);
goto out;
-diff -urNp linux-2.6.38.4/net/can/bcm.c linux-2.6.38.4/net/can/bcm.c
---- linux-2.6.38.4/net/can/bcm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/can/bcm.c 2011-04-28 19:34:15.000000000 -0400
+@@ -385,6 +386,7 @@ static int cfctrl_recv(struct cflayer *l
+ struct cfctrl *cfctrl = container_obj(layer);
+ struct cfctrl_request_info rsp, *req;
+
++ pax_track_stack();
+
+ cfpkt_extr_head(pkt, &cmdrsp, 1);
+ cmd = cmdrsp & CFCTRL_CMD_MASK;
+diff -urNp linux-2.6.39/net/can/bcm.c linux-2.6.39/net/can/bcm.c
+--- linux-2.6.39/net/can/bcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/can/bcm.c 2011-05-22 19:41:42.000000000 -0400
@@ -165,9 +165,15 @@ static int bcm_proc_show(struct seq_file
struct bcm_sock *bo = bcm_sk(sk);
struct bcm_op *op;
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.38.4/net/can/raw.c linux-2.6.38.4/net/can/raw.c
---- linux-2.6.38.4/net/can/raw.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/can/raw.c 2011-04-28 19:34:15.000000000 -0400
-@@ -305,7 +305,12 @@ static int raw_init(struct sock *sk)
- static int raw_release(struct socket *sock)
- {
- struct sock *sk = sock->sk;
-- struct raw_sock *ro = raw_sk(sk);
-+ struct raw_sock *ro;
-+
-+ if (!sk)
-+ return 0;
-+
-+ ro = raw_sk(sk);
-
- unregister_netdevice_notifier(&ro->notifier);
-
-diff -urNp linux-2.6.38.4/net/core/datagram.c linux-2.6.38.4/net/core/datagram.c
---- linux-2.6.38.4/net/core/datagram.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/core/datagram.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/core/datagram.c linux-2.6.39/net/core/datagram.c
+--- linux-2.6.39/net/core/datagram.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/core/datagram.c 2011-05-22 19:36:33.000000000 -0400
@@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, s
}
sk_mem_reclaim_partial(sk);
return err;
-diff -urNp linux-2.6.38.4/net/core/dev.c linux-2.6.38.4/net/core/dev.c
---- linux-2.6.38.4/net/core/dev.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/core/dev.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1124,10 +1124,14 @@ void dev_load(struct net *net, const cha
+diff -urNp linux-2.6.39/net/core/dev.c linux-2.6.39/net/core/dev.c
+--- linux-2.6.39/net/core/dev.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/core/dev.c 2011-05-22 19:41:42.000000000 -0400
+@@ -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);
if (no_module && capable(CAP_SYS_MODULE)) {
}
}
EXPORT_SYMBOL(dev_load);
-@@ -2787,7 +2791,7 @@ int netif_rx_ni(struct sk_buff *skb)
+@@ -1957,7 +1961,7 @@ struct dev_gso_cb {
+
+ static void dev_gso_skb_destructor(struct sk_buff *skb)
+ {
+- struct dev_gso_cb *cb;
++ const struct dev_gso_cb *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);
{
struct softnet_data *sd = &__get_cpu_var(softnet_data);
-@@ -3697,7 +3701,7 @@ void netif_napi_del(struct napi_struct *
+@@ -3765,7 +3769,7 @@ void netif_napi_del(struct napi_struct *
}
EXPORT_SYMBOL(netif_napi_del);
{
struct softnet_data *sd = &__get_cpu_var(softnet_data);
unsigned long time_limit = jiffies + 2;
-diff -urNp linux-2.6.38.4/net/core/flow.c linux-2.6.38.4/net/core/flow.c
---- linux-2.6.38.4/net/core/flow.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/core/flow.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/core/flow.c linux-2.6.39/net/core/flow.c
+--- linux-2.6.39/net/core/flow.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/core/flow.c 2011-05-22 19:36:34.000000000 -0400
@@ -60,7 +60,7 @@ struct flow_cache {
struct timer_list rnd_timer;
};
return 0;
if (fle->object && !fle->object->ops->check(fle->object))
return 0;
-@@ -253,7 +253,7 @@ flow_cache_lookup(struct net *net, struc
+@@ -253,7 +253,7 @@ flow_cache_lookup(struct net *net, const
hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
fcp->hash_count++;
}
if (!IS_ERR(flo))
fle->object = flo;
else
-diff -urNp linux-2.6.38.4/net/core/sock.c linux-2.6.38.4/net/core/sock.c
---- linux-2.6.38.4/net/core/sock.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/core/sock.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/core/skbuff.c linux-2.6.39/net/core/skbuff.c
+--- linux-2.6.39/net/core/skbuff.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/core/skbuff.c 2011-05-22 19:36:34.000000000 -0400
+@@ -1542,6 +1542,8 @@ int skb_splice_bits(struct sk_buff *skb,
+ struct sock *sk = skb->sk;
+ int ret = 0;
+
++ pax_track_stack();
++
+ if (splice_grow_spd(pipe, &spd))
+ return -ENOMEM;
+
+diff -urNp linux-2.6.39/net/core/sock.c linux-2.6.39/net/core/sock.c
+--- linux-2.6.39/net/core/sock.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/core/sock.c 2011-05-22 19:36:34.000000000 -0400
@@ -291,7 +291,7 @@ int sock_queue_rcv_skb(struct sock *sk,
*/
if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
}
EXPORT_SYMBOL(sock_init_data);
-diff -urNp linux-2.6.38.4/net/decnet/sysctl_net_decnet.c linux-2.6.38.4/net/decnet/sysctl_net_decnet.c
---- linux-2.6.38.4/net/decnet/sysctl_net_decnet.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/decnet/sysctl_net_decnet.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/decnet/sysctl_net_decnet.c linux-2.6.39/net/decnet/sysctl_net_decnet.c
+--- linux-2.6.39/net/decnet/sysctl_net_decnet.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/decnet/sysctl_net_decnet.c 2011-05-22 19:36:34.000000000 -0400
@@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_t
if (len > *lenp) len = *lenp;
return -EFAULT;
*lenp = len;
-diff -urNp linux-2.6.38.4/net/econet/Kconfig linux-2.6.38.4/net/econet/Kconfig
---- linux-2.6.38.4/net/econet/Kconfig 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/econet/Kconfig 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/econet/Kconfig linux-2.6.39/net/econet/Kconfig
+--- linux-2.6.39/net/econet/Kconfig 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/econet/Kconfig 2011-05-22 19:41:42.000000000 -0400
@@ -4,7 +4,7 @@
config ECONET
---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.38.4/net/ipv4/inet_diag.c linux-2.6.38.4/net/ipv4/inet_diag.c
---- linux-2.6.38.4/net/ipv4/inet_diag.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/inet_diag.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/ipv4/fib_frontend.c linux-2.6.39/net/ipv4/fib_frontend.c
+--- linux-2.6.39/net/ipv4/fib_frontend.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv4/fib_frontend.c 2011-05-22 19:36:34.000000000 -0400
+@@ -968,12 +968,12 @@ static int fib_inetaddr_event(struct not
+ #ifdef CONFIG_IP_ROUTE_MULTIPATH
+ fib_sync_up(dev);
+ #endif
+- atomic_inc(&net->ipv4.dev_addr_genid);
++ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
+ rt_cache_flush(dev_net(dev), -1);
+ break;
+ case NETDEV_DOWN:
+ fib_del_ifaddr(ifa, NULL);
+- atomic_inc(&net->ipv4.dev_addr_genid);
++ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
+ if (ifa->ifa_dev->ifa_list == NULL) {
+ /* Last address was deleted from this interface.
+ * Disable IP.
+@@ -1009,7 +1009,7 @@ static int fib_netdev_event(struct notif
+ #ifdef CONFIG_IP_ROUTE_MULTIPATH
+ fib_sync_up(dev);
+ #endif
+- atomic_inc(&net->ipv4.dev_addr_genid);
++ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
+ rt_cache_flush(dev_net(dev), -1);
+ break;
+ case NETDEV_DOWN:
+diff -urNp linux-2.6.39/net/ipv4/fib_semantics.c linux-2.6.39/net/ipv4/fib_semantics.c
+--- linux-2.6.39/net/ipv4/fib_semantics.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv4/fib_semantics.c 2011-05-22 19:36:34.000000000 -0400
+@@ -701,7 +701,7 @@ __be32 fib_info_update_nh_saddr(struct n
+ nh->nh_saddr = inet_select_addr(nh->nh_dev,
+ nh->nh_gw,
+ nh->nh_parent->fib_scope);
+- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
++ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
+
+ return nh->nh_saddr;
+ }
+diff -urNp linux-2.6.39/net/ipv4/inet_diag.c linux-2.6.39/net/ipv4/inet_diag.c
+--- linux-2.6.39/net/ipv4/inet_diag.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv4/inet_diag.c 2011-05-22 19:41:42.000000000 -0400
@@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc
r->idiag_retrans = 0;
tmo = req->expires - jiffies;
if (tmo < 0)
-diff -urNp linux-2.6.38.4/net/ipv4/inet_hashtables.c linux-2.6.38.4/net/ipv4/inet_hashtables.c
---- linux-2.6.38.4/net/ipv4/inet_hashtables.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/inet_hashtables.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/ipv4/inet_hashtables.c linux-2.6.39/net/ipv4/inet_hashtables.c
+--- linux-2.6.39/net/ipv4/inet_hashtables.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv4/inet_hashtables.c 2011-05-22 19:41:42.000000000 -0400
@@ -18,11 +18,14 @@
#include <linux/sched.h>
#include <linux/slab.h>
if (tw) {
inet_twsk_deschedule(tw, death_row);
while (twrefcnt) {
-diff -urNp linux-2.6.38.4/net/ipv4/inetpeer.c linux-2.6.38.4/net/ipv4/inetpeer.c
---- linux-2.6.38.4/net/ipv4/inetpeer.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/inetpeer.c 2011-04-28 19:34:15.000000000 -0400
-@@ -509,8 +509,8 @@ struct inet_peer *inet_getpeer(struct in
+diff -urNp linux-2.6.39/net/ipv4/inetpeer.c linux-2.6.39/net/ipv4/inetpeer.c
+--- linux-2.6.39/net/ipv4/inetpeer.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv4/inetpeer.c 2011-05-22 19:36:34.000000000 -0400
+@@ -467,6 +467,8 @@ struct inet_peer *inet_getpeer(struct in
+ unsigned int sequence;
+ int invalidated;
+
++ pax_track_stack();
++
+ /* Look up for the address quickly, lockless.
+ * Because of a concurrent writer, we might not find an existing entry.
+ */
+@@ -504,8 +506,8 @@ struct inet_peer *inet_getpeer(struct in
if (p) {
p->daddr = *daddr;
atomic_set(&p->refcnt, 1);
- atomic_set(&p->rid, 0);
-- atomic_set(&p->ip_id_count, secure_ip_id(daddr->a4));
+- atomic_set(&p->ip_id_count, secure_ip_id(daddr->addr.a4));
+ atomic_set_unchecked(&p->rid, 0);
-+ atomic_set_unchecked(&p->ip_id_count, secure_ip_id(daddr->a4));
++ atomic_set_unchecked(&p->ip_id_count, secure_ip_id(daddr->addr.a4));
p->tcp_ts_stamp = 0;
- INIT_LIST_HEAD(&p->unused);
-
-diff -urNp linux-2.6.38.4/net/ipv4/ip_fragment.c linux-2.6.38.4/net/ipv4/ip_fragment.c
---- linux-2.6.38.4/net/ipv4/ip_fragment.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/ip_fragment.c 2011-04-28 19:34:15.000000000 -0400
-@@ -298,7 +298,7 @@ static inline int ip_frag_too_far(struct
+ p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
+ p->rate_tokens = 0;
+diff -urNp linux-2.6.39/net/ipv4/ip_fragment.c linux-2.6.39/net/ipv4/ip_fragment.c
+--- linux-2.6.39/net/ipv4/ip_fragment.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv4/ip_fragment.c 2011-05-22 19:36:34.000000000 -0400
+@@ -297,7 +297,7 @@ static inline int ip_frag_too_far(struct
return 0;
start = qp->rid;
qp->rid = end;
rc = qp->q.fragments && (end - start) > max;
-diff -urNp linux-2.6.38.4/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.38.4/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-2.6.38.4/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-04-28 19:34:15.000000000 -0400
-@@ -398,7 +398,7 @@ static unsigned char asn1_octets_decode(
+diff -urNp linux-2.6.39/net/ipv4/ip_sockglue.c linux-2.6.39/net/ipv4/ip_sockglue.c
+--- linux-2.6.39/net/ipv4/ip_sockglue.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv4/ip_sockglue.c 2011-05-22 19:36:34.000000000 -0400
+@@ -1064,6 +1064,8 @@ static int do_ip_getsockopt(struct sock
+ int val;
+ int len;
+
++ pax_track_stack();
++
+ if (level != SOL_IP)
+ return -EOPNOTSUPP;
+
+diff -urNp linux-2.6.39/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.39/net/ipv4/netfilter/nf_nat_snmp_basic.c
+--- linux-2.6.39/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-05-22 19:36:34.000000000 -0400
+@@ -399,7 +399,7 @@ static unsigned char asn1_octets_decode(
*len = 0;
if (*octets == NULL) {
if (net_ratelimit())
pr_notice("OOM in bsalg (%d)\n", __LINE__);
-diff -urNp linux-2.6.38.4/net/ipv4/raw.c linux-2.6.38.4/net/ipv4/raw.c
---- linux-2.6.38.4/net/ipv4/raw.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/raw.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/ipv4/raw.c linux-2.6.39/net/ipv4/raw.c
+--- linux-2.6.39/net/ipv4/raw.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv4/raw.c 2011-05-22 19:41:42.000000000 -0400
@@ -302,7 +302,7 @@ static int raw_rcv_skb(struct sock * sk,
int raw_rcv(struct sock *sk, struct sk_buff *skb)
{
kfree_skb(skb);
return NET_RX_DROP;
}
-@@ -724,15 +724,19 @@ static int raw_init(struct sock *sk)
+@@ -730,15 +730,19 @@ static int raw_init(struct sock *sk)
static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
{
int len, ret = -EFAULT;
if (get_user(len, optlen))
-@@ -743,8 +747,9 @@ static int raw_geticmpfilter(struct sock
+@@ -749,8 +753,9 @@ static int raw_geticmpfilter(struct sock
if (len > sizeof(struct icmp_filter))
len = sizeof(struct icmp_filter);
ret = -EFAULT;
goto out;
ret = 0;
out: return ret;
-@@ -972,7 +977,7 @@ static void raw_sock_seq_show(struct seq
+@@ -978,7 +983,13 @@ static void raw_sock_seq_show(struct seq
sk_wmem_alloc_get(sp),
sk_rmem_alloc_get(sp),
0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
-+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
++ atomic_read(&sp->sk_refcnt),
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++ NULL,
++#else
++ sp,
++#endif
++ atomic_read_unchecked(&sp->sk_drops));
}
static int raw_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.38.4/net/ipv4/route.c linux-2.6.38.4/net/ipv4/route.c
---- linux-2.6.38.4/net/ipv4/route.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/route.c 2011-04-28 19:57:25.000000000 -0400
-@@ -270,7 +270,7 @@ static inline unsigned int rt_hash(__be3
+diff -urNp linux-2.6.39/net/ipv4/route.c linux-2.6.39/net/ipv4/route.c
+--- linux-2.6.39/net/ipv4/route.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv4/route.c 2011-05-22 19:36:34.000000000 -0400
+@@ -303,7 +303,7 @@ static inline unsigned int rt_hash(__be3
static inline int rt_genid(struct net *net)
{
}
#ifdef CONFIG_PROC_FS
-@@ -895,7 +895,7 @@ static void rt_cache_invalidate(struct n
+@@ -831,7 +831,7 @@ static void rt_cache_invalidate(struct n
unsigned char shuffle;
get_random_bytes(&shuffle, sizeof(shuffle));
}
/*
-@@ -2857,7 +2857,7 @@ static int rt_fill_info(struct net *net,
- expires = rt->dst.expires ? rt->dst.expires - jiffies : 0;
+@@ -2835,7 +2835,7 @@ static int rt_fill_info(struct net *net,
+ rt->peer->pmtu_expires - jiffies : 0;
if (rt->peer) {
inet_peer_refcheck(rt->peer);
- id = atomic_read(&rt->peer->ip_id_count) & 0xffff;
if (rt->peer->tcp_ts_stamp) {
ts = rt->peer->tcp_ts;
tsage = get_seconds() - rt->peer->tcp_ts_stamp;
-diff -urNp linux-2.6.38.4/net/ipv4/tcp_ipv4.c linux-2.6.38.4/net/ipv4/tcp_ipv4.c
---- linux-2.6.38.4/net/ipv4/tcp_ipv4.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/tcp_ipv4.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/ipv4/tcp.c linux-2.6.39/net/ipv4/tcp.c
+--- linux-2.6.39/net/ipv4/tcp.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv4/tcp.c 2011-05-22 19:36:34.000000000 -0400
+@@ -2121,6 +2121,8 @@ static int do_tcp_setsockopt(struct sock
+ int val;
+ int err = 0;
+
++ pax_track_stack();
++
+ /* These are data/string values, all the others are ints */
+ switch (optname) {
+ case TCP_CONGESTION: {
+@@ -2500,6 +2502,8 @@ static int do_tcp_getsockopt(struct sock
+ struct tcp_sock *tp = tcp_sk(sk);
+ int val, len;
+
++ pax_track_stack();
++
+ if (get_user(len, optlen))
+ return -EFAULT;
+
+diff -urNp linux-2.6.39/net/ipv4/tcp_ipv4.c linux-2.6.39/net/ipv4/tcp_ipv4.c
+--- linux-2.6.39/net/ipv4/tcp_ipv4.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv4/tcp_ipv4.c 2011-05-22 19:41:42.000000000 -0400
@@ -86,6 +86,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
int sysctl_tcp_low_latency __read_mostly;
EXPORT_SYMBOL(sysctl_tcp_low_latency);
#ifdef CONFIG_TCP_MD5SIG
static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
-@@ -1593,6 +1596,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc
+@@ -1594,6 +1597,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc
return 0;
reset:
tcp_v4_send_reset(rsk, skb);
discard:
kfree_skb(skb);
-@@ -1655,12 +1661,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
+@@ -1656,12 +1662,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
TCP_SKB_CB(skb)->sacked = 0;
sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
-@@ -1710,6 +1723,10 @@ no_tcp_socket:
+@@ -1711,6 +1724,10 @@ no_tcp_socket:
bad_packet:
TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
} else {
tcp_v4_send_reset(NULL, skb);
}
-@@ -2373,7 +2390,11 @@ static void get_openreq4(struct sock *sk
+@@ -2374,7 +2391,11 @@ static void get_openreq4(struct sock *sk
0, /* non standard timer */
0, /* open_requests have no inode */
atomic_read(&sk->sk_refcnt),
len);
}
-@@ -2423,7 +2444,12 @@ static void get_tcp4_sock(struct sock *s
+@@ -2424,7 +2445,12 @@ static void get_tcp4_sock(struct sock *s
sock_i_uid(sk),
icsk->icsk_probes_out,
sock_i_ino(sk),
jiffies_to_clock_t(icsk->icsk_rto),
jiffies_to_clock_t(icsk->icsk_ack.ato),
(icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
-@@ -2451,7 +2477,13 @@ static void get_timewait4_sock(struct in
+@@ -2452,7 +2478,13 @@ static void get_timewait4_sock(struct in
" %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %p%n",
i, src, srcp, dest, destp, tw->tw_substate, 0, 0,
3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
}
#define TMPSZ 150
-diff -urNp linux-2.6.38.4/net/ipv4/tcp_minisocks.c linux-2.6.38.4/net/ipv4/tcp_minisocks.c
---- linux-2.6.38.4/net/ipv4/tcp_minisocks.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/tcp_minisocks.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/ipv4/tcp_minisocks.c linux-2.6.39/net/ipv4/tcp_minisocks.c
+--- linux-2.6.39/net/ipv4/tcp_minisocks.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv4/tcp_minisocks.c 2011-05-22 19:41:42.000000000 -0400
@@ -27,6 +27,10 @@
#include <net/inet_common.h>
#include <net/xfrm.h>
if (!(flg & TCP_FLAG_RST))
req->rsk_ops->send_reset(sk, skb);
-diff -urNp linux-2.6.38.4/net/ipv4/tcp_probe.c linux-2.6.38.4/net/ipv4/tcp_probe.c
---- linux-2.6.38.4/net/ipv4/tcp_probe.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/tcp_probe.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/ipv4/tcp_output.c linux-2.6.39/net/ipv4/tcp_output.c
+--- linux-2.6.39/net/ipv4/tcp_output.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv4/tcp_output.c 2011-05-22 19:36:34.000000000 -0400
+@@ -2421,6 +2421,8 @@ struct sk_buff *tcp_make_synack(struct s
+ int mss;
+ int s_data_desired = 0;
+
++ pax_track_stack();
++
+ 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/net/ipv4/tcp_probe.c linux-2.6.39/net/ipv4/tcp_probe.c
+--- linux-2.6.39/net/ipv4/tcp_probe.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv4/tcp_probe.c 2011-05-22 19:36:34.000000000 -0400
@@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file
if (cnt + width >= len)
break;
return -EFAULT;
cnt += width;
}
-diff -urNp linux-2.6.38.4/net/ipv4/tcp_timer.c linux-2.6.38.4/net/ipv4/tcp_timer.c
---- linux-2.6.38.4/net/ipv4/tcp_timer.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/tcp_timer.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/ipv4/tcp_timer.c linux-2.6.39/net/ipv4/tcp_timer.c
+--- linux-2.6.39/net/ipv4/tcp_timer.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv4/tcp_timer.c 2011-05-22 19:41:42.000000000 -0400
@@ -22,6 +22,10 @@
#include <linux/gfp.h>
#include <net/tcp.h>
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.38.4/net/ipv4/udp.c linux-2.6.38.4/net/ipv4/udp.c
---- linux-2.6.38.4/net/ipv4/udp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/udp.c 2011-04-28 20:09:30.000000000 -0400
+diff -urNp linux-2.6.39/net/ipv4/udp.c linux-2.6.39/net/ipv4/udp.c
+--- linux-2.6.39/net/ipv4/udp.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv4/udp.c 2011-05-22 19:41:42.000000000 -0400
@@ -86,6 +86,7 @@
#include <linux/types.h>
#include <linux/fcntl.h>
/*
* This routine is called by the ICMP module when it gets some
* sort of error condition. If err < 0 then the socket should
-@@ -832,9 +840,18 @@ int udp_sendmsg(struct kiocb *iocb, stru
+@@ -853,9 +861,18 @@ int udp_sendmsg(struct kiocb *iocb, stru
dport = usin->sin_port;
if (dport == 0)
return -EINVAL;
daddr = inet->inet_daddr;
dport = inet->inet_dport;
/* Open fast path for connected socket.
-@@ -1053,7 +1070,7 @@ static unsigned int first_packet_length(
+@@ -1090,7 +1107,7 @@ static unsigned int first_packet_length(
udp_lib_checksum_complete(skb)) {
UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
IS_UDPLITE(sk));
__skb_unlink(skb, rcvq);
__skb_queue_tail(&list_kill, skb);
}
-@@ -1139,6 +1156,10 @@ try_again:
+@@ -1176,6 +1193,10 @@ try_again:
if (!skb)
goto out;
ulen = skb->len - sizeof(struct udphdr);
if (len > ulen)
len = ulen;
-@@ -1435,7 +1456,7 @@ int udp_queue_rcv_skb(struct sock *sk, s
+@@ -1472,7 +1493,7 @@ int udp_queue_rcv_skb(struct sock *sk, s
drop:
UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
kfree_skb(skb);
return -1;
}
-@@ -1454,7 +1475,7 @@ static void flush_stack(struct sock **st
+@@ -1491,7 +1512,7 @@ static void flush_stack(struct sock **st
skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
if (!skb1) {
UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
IS_UDPLITE(sk));
UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
-@@ -1623,6 +1644,9 @@ int __udp4_lib_rcv(struct sk_buff *skb,
+@@ -1660,6 +1681,9 @@ int __udp4_lib_rcv(struct sk_buff *skb,
goto csum_error;
UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
/*
-@@ -2050,8 +2074,13 @@ static void udp4_format_sock(struct sock
+@@ -2087,8 +2111,13 @@ static void udp4_format_sock(struct sock
sk_wmem_alloc_get(sp),
sk_rmem_alloc_get(sp),
0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
}
int udp4_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.38.4/net/ipv6/inet6_connection_sock.c linux-2.6.38.4/net/ipv6/inet6_connection_sock.c
---- linux-2.6.38.4/net/ipv6/inet6_connection_sock.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv6/inet6_connection_sock.c 2011-04-28 19:57:25.000000000 -0400
-@@ -183,7 +183,7 @@ void __inet6_csk_dst_store(struct sock *
+diff -urNp linux-2.6.39/net/ipv6/inet6_connection_sock.c linux-2.6.39/net/ipv6/inet6_connection_sock.c
+--- linux-2.6.39/net/ipv6/inet6_connection_sock.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv6/inet6_connection_sock.c 2011-05-22 19:36:34.000000000 -0400
+@@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock *
#ifdef CONFIG_XFRM
{
struct rt6_info *rt = (struct rt6_info *)dst;
}
#endif
}
-@@ -198,7 +198,7 @@ struct dst_entry *__inet6_csk_dst_check(
+@@ -193,7 +193,7 @@ struct dst_entry *__inet6_csk_dst_check(
#ifdef CONFIG_XFRM
if (dst) {
struct rt6_info *rt = (struct rt6_info *)dst;
__sk_dst_reset(sk);
dst = NULL;
}
-diff -urNp linux-2.6.38.4/net/ipv6/raw.c linux-2.6.38.4/net/ipv6/raw.c
---- linux-2.6.38.4/net/ipv6/raw.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv6/raw.c 2011-04-28 20:08:36.000000000 -0400
+diff -urNp linux-2.6.39/net/ipv6/ipv6_sockglue.c linux-2.6.39/net/ipv6/ipv6_sockglue.c
+--- linux-2.6.39/net/ipv6/ipv6_sockglue.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv6/ipv6_sockglue.c 2011-05-22 19:36:34.000000000 -0400
+@@ -129,6 +129,8 @@ static int do_ipv6_setsockopt(struct soc
+ int val, valbool;
+ int retv = -ENOPROTOOPT;
+
++ pax_track_stack();
++
+ if (optval == NULL)
+ val=0;
+ else {
+@@ -919,6 +921,8 @@ static int do_ipv6_getsockopt(struct soc
+ int len;
+ int val;
+
++ pax_track_stack();
++
+ if (ip6_mroute_opt(optname))
+ return ip6_mroute_getsockopt(sk, optname, optval, optlen);
+
+diff -urNp linux-2.6.39/net/ipv6/raw.c linux-2.6.39/net/ipv6/raw.c
+--- linux-2.6.39/net/ipv6/raw.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv6/raw.c 2011-05-22 19:41:42.000000000 -0400
@@ -376,7 +376,7 @@ static inline int rawv6_rcv_skb(struct s
{
if ((raw6_sk(sk)->checksum || rcu_dereference_raw(sk->sk_filter)) &&
kfree_skb(skb);
return NET_RX_DROP;
}
-@@ -602,7 +602,7 @@ out:
+@@ -601,7 +601,7 @@ out:
return err;
}
-static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
+static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
- struct flowi *fl, struct dst_entry **dstp,
+ struct flowi6 *fl6, struct dst_entry **dstp,
unsigned int flags)
{
-@@ -919,12 +919,15 @@ do_confirm:
+@@ -742,6 +742,8 @@ static int rawv6_sendmsg(struct kiocb *i
+ u16 proto;
+ int err;
+
++ pax_track_stack();
++
+ /* Rough check on arithmetic overflow,
+ better check is made in ip6_append_data().
+ */
+@@ -909,12 +911,15 @@ do_confirm:
static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
char __user *optval, int optlen)
{
return 0;
default:
return -ENOPROTOOPT;
-@@ -936,6 +939,7 @@ static int rawv6_seticmpfilter(struct so
+@@ -926,6 +931,7 @@ static int rawv6_seticmpfilter(struct so
static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
char __user *optval, int __user *optlen)
{
int len;
switch (optname) {
-@@ -948,7 +952,8 @@ static int rawv6_geticmpfilter(struct so
+@@ -938,7 +944,8 @@ static int rawv6_geticmpfilter(struct so
len = sizeof(struct icmp6_filter);
if (put_user(len, optlen))
return -EFAULT;
return -EFAULT;
return 0;
default:
-@@ -1262,7 +1267,13 @@ static void raw6_sock_seq_show(struct se
+@@ -1252,7 +1259,13 @@ static void raw6_sock_seq_show(struct se
0, 0L, 0,
sock_i_uid(sp), 0,
sock_i_ino(sp),
}
static int raw6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.38.4/net/ipv6/tcp_ipv6.c linux-2.6.38.4/net/ipv6/tcp_ipv6.c
---- linux-2.6.38.4/net/ipv6/tcp_ipv6.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv6/tcp_ipv6.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/ipv6/tcp_ipv6.c linux-2.6.39/net/ipv6/tcp_ipv6.c
+--- linux-2.6.39/net/ipv6/tcp_ipv6.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv6/tcp_ipv6.c 2011-05-22 19:41:42.000000000 -0400
@@ -92,6 +92,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
}
#endif
static void tcp_v6_hash(struct sock *sk)
{
if (sk->sk_state != TCP_CLOSE) {
-@@ -1676,6 +1680,9 @@ static int tcp_v6_do_rcv(struct sock *sk
+@@ -1660,6 +1664,9 @@ static int tcp_v6_do_rcv(struct sock *sk
return 0;
reset:
tcp_v6_send_reset(sk, skb);
discard:
if (opt_skb)
-@@ -1755,12 +1762,20 @@ static int tcp_v6_rcv(struct sk_buff *sk
+@@ -1739,12 +1746,20 @@ static int tcp_v6_rcv(struct sk_buff *sk
TCP_SKB_CB(skb)->sacked = 0;
sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
-@@ -1808,6 +1823,10 @@ no_tcp_socket:
+@@ -1792,6 +1807,10 @@ no_tcp_socket:
bad_packet:
TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
} else {
tcp_v6_send_reset(NULL, skb);
}
-@@ -2068,7 +2087,13 @@ static void get_openreq6(struct seq_file
+@@ -2052,7 +2071,13 @@ static void get_openreq6(struct seq_file
uid,
0, /* non standard timer */
0, /* open_requests have no inode */
}
static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
-@@ -2118,7 +2143,12 @@ static void get_tcp6_sock(struct seq_fil
+@@ -2102,7 +2127,12 @@ static void get_tcp6_sock(struct seq_fil
sock_i_uid(sp),
icsk->icsk_probes_out,
sock_i_ino(sp),
jiffies_to_clock_t(icsk->icsk_rto),
jiffies_to_clock_t(icsk->icsk_ack.ato),
(icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong,
-@@ -2153,7 +2183,13 @@ static void get_timewait6_sock(struct se
+@@ -2137,7 +2167,13 @@ static void get_timewait6_sock(struct se
dest->s6_addr32[2], dest->s6_addr32[3], destp,
tw->tw_substate, 0, 0,
3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
}
static int tcp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.38.4/net/ipv6/udp.c linux-2.6.38.4/net/ipv6/udp.c
---- linux-2.6.38.4/net/ipv6/udp.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv6/udp.c 2011-04-28 20:09:04.000000000 -0400
+diff -urNp linux-2.6.39/net/ipv6/udp.c linux-2.6.39/net/ipv6/udp.c
+--- linux-2.6.39/net/ipv6/udp.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/ipv6/udp.c 2011-05-22 19:41:42.000000000 -0400
@@ -50,6 +50,10 @@
#include <linux/seq_file.h>
#include "udp_impl.h"
int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
{
const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
-@@ -542,7 +546,7 @@ int udpv6_queue_rcv_skb(struct sock * sk
+@@ -545,7 +549,7 @@ int udpv6_queue_rcv_skb(struct sock * sk
return 0;
drop:
drop_no_sk_drops_inc:
UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
kfree_skb(skb);
-@@ -618,7 +622,7 @@ static void flush_stack(struct sock **st
+@@ -621,7 +625,7 @@ static void flush_stack(struct sock **st
continue;
}
drop:
UDP6_INC_STATS_BH(sock_net(sk),
UDP_MIB_RCVBUFERRORS, IS_UDPLITE(sk));
UDP6_INC_STATS_BH(sock_net(sk),
-@@ -773,6 +777,9 @@ int __udp6_lib_rcv(struct sk_buff *skb,
+@@ -776,6 +780,9 @@ int __udp6_lib_rcv(struct sk_buff *skb,
UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
proto == IPPROTO_UDPLITE);
icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
kfree_skb(skb);
-@@ -789,7 +796,7 @@ int __udp6_lib_rcv(struct sk_buff *skb,
+@@ -792,7 +799,7 @@ int __udp6_lib_rcv(struct sk_buff *skb,
if (!sock_owned_by_user(sk))
udpv6_queue_rcv_skb(sk, skb);
else if (sk_add_backlog(sk, skb)) {
bh_unlock_sock(sk);
sock_put(sk);
goto discard;
-@@ -1407,8 +1414,13 @@ static void udp6_sock_seq_show(struct se
+@@ -1403,8 +1410,13 @@ static void udp6_sock_seq_show(struct se
0, 0L, 0,
sock_i_uid(sp), 0,
sock_i_ino(sp),
}
int udp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.38.4/net/irda/ircomm/ircomm_tty.c linux-2.6.38.4/net/irda/ircomm/ircomm_tty.c
---- linux-2.6.38.4/net/irda/ircomm/ircomm_tty.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/irda/ircomm/ircomm_tty.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/irda/ircomm/ircomm_tty.c linux-2.6.39/net/irda/ircomm/ircomm_tty.c
+--- linux-2.6.39/net/irda/ircomm/ircomm_tty.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/irda/ircomm/ircomm_tty.c 2011-05-22 19:36:34.000000000 -0400
@@ -281,16 +281,16 @@ static int ircomm_tty_block_til_ready(st
add_wait_queue(&self->open_wait, &wait);
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.38.4/net/iucv/af_iucv.c linux-2.6.38.4/net/iucv/af_iucv.c
---- linux-2.6.38.4/net/iucv/af_iucv.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/iucv/af_iucv.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/iucv/af_iucv.c linux-2.6.39/net/iucv/af_iucv.c
+--- linux-2.6.39/net/iucv/af_iucv.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/iucv/af_iucv.c 2011-05-22 19:36:34.000000000 -0400
@@ -653,10 +653,10 @@ static int iucv_sock_autobind(struct soc
write_lock_bh(&iucv_sk_list.lock);
}
write_unlock_bh(&iucv_sk_list.lock);
-diff -urNp linux-2.6.38.4/net/key/af_key.c linux-2.6.38.4/net/key/af_key.c
---- linux-2.6.38.4/net/key/af_key.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/key/af_key.c 2011-04-28 19:57:25.000000000 -0400
-@@ -3003,10 +3003,10 @@ static int pfkey_send_policy_notify(stru
+diff -urNp linux-2.6.39/net/key/af_key.c linux-2.6.39/net/key/af_key.c
+--- linux-2.6.39/net/key/af_key.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/key/af_key.c 2011-05-22 19:41:42.000000000 -0400
+@@ -2481,6 +2481,8 @@ static int pfkey_migrate(struct sock *sk
+ struct xfrm_migrate m[XFRM_MAX_DEPTH];
+ struct xfrm_kmaddress k;
+
++ pax_track_stack();
++
+ if (!present_and_same_family(ext_hdrs[SADB_EXT_ADDRESS_SRC - 1],
+ ext_hdrs[SADB_EXT_ADDRESS_DST - 1]) ||
+ !ext_hdrs[SADB_X_EXT_POLICY - 1]) {
+@@ -3016,10 +3018,10 @@ static int pfkey_send_policy_notify(stru
static u32 get_acqseq(void)
{
u32 res;
} while (!res);
return res;
}
-@@ -3644,7 +3644,11 @@ static int pfkey_seq_show(struct seq_fil
+@@ -3657,7 +3659,11 @@ static int pfkey_seq_show(struct seq_fil
seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n");
else
seq_printf(f ,"%p %-6d %-6u %-6u %-6u %-6lu\n",
atomic_read(&s->sk_refcnt),
sk_rmem_alloc_get(s),
sk_wmem_alloc_get(s),
-diff -urNp linux-2.6.38.4/net/mac80211/cfg.c linux-2.6.38.4/net/mac80211/cfg.c
---- linux-2.6.38.4/net/mac80211/cfg.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/mac80211/cfg.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1939,7 +1939,7 @@ static int ieee80211_get_antenna(struct
- return drv_get_antenna(local, tx_ant, rx_ant);
+diff -urNp linux-2.6.39/net/l2tp/l2tp_ip.c linux-2.6.39/net/l2tp/l2tp_ip.c
+--- linux-2.6.39/net/l2tp/l2tp_ip.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/l2tp/l2tp_ip.c 2011-05-22 19:36:34.000000000 -0400
+@@ -625,7 +625,7 @@ static struct inet_protosw l2tp_ip_proto
+ .no_check = 0,
+ };
+
+-static struct net_protocol l2tp_ip_protocol __read_mostly = {
++static const struct net_protocol l2tp_ip_protocol = {
+ .handler = l2tp_ip_recv,
+ };
+
+diff -urNp linux-2.6.39/net/lapb/lapb_iface.c linux-2.6.39/net/lapb/lapb_iface.c
+--- linux-2.6.39/net/lapb/lapb_iface.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
+ }
+-
+-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/net/mac80211/cfg.c linux-2.6.39/net/mac80211/cfg.c
+--- linux-2.6.39/net/mac80211/cfg.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/mac80211/cfg.c 2011-05-22 19:36:34.000000000 -0400
+@@ -2029,7 +2029,7 @@ static void ieee80211_get_ringparam(stru
+ drv_get_ringparam(local, tx, tx_max, rx, rx_max);
}
-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.38.4/net/mac80211/cfg.h linux-2.6.38.4/net/mac80211/cfg.h
---- linux-2.6.38.4/net/mac80211/cfg.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/mac80211/cfg.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/mac80211/cfg.h linux-2.6.39/net/mac80211/cfg.h
+--- linux-2.6.39/net/mac80211/cfg.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/mac80211/cfg.h 2011-05-22 19:36:34.000000000 -0400
@@ -4,6 +4,6 @@
#ifndef __CFG_H
#define __CFG_H
+extern const struct cfg80211_ops mac80211_config_ops;
#endif /* __CFG_H */
-diff -urNp linux-2.6.38.4/net/mac80211/ieee80211_i.h linux-2.6.38.4/net/mac80211/ieee80211_i.h
---- linux-2.6.38.4/net/mac80211/ieee80211_i.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/mac80211/ieee80211_i.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/mac80211/debugfs_sta.c linux-2.6.39/net/mac80211/debugfs_sta.c
+--- linux-2.6.39/net/mac80211/debugfs_sta.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/mac80211/debugfs_sta.c 2011-05-22 19:36:34.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;
+
++ pax_track_stack();
++
+ rcu_read_lock();
+
+ p += scnprintf(p, sizeof(buf) + buf - p, "next dialog_token: %#02x\n",
+@@ -215,6 +217,8 @@ static ssize_t sta_ht_capa_read(struct f
+ struct sta_info *sta = file->private_data;
+ struct ieee80211_sta_ht_cap *htc = &sta->sta.ht_cap;
+
++ pax_track_stack();
++
+ p += scnprintf(p, sizeof(buf) + buf - p, "ht %ssupported\n",
+ htc->ht_supported ? "" : "not ");
+ if (htc->ht_supported) {
+diff -urNp linux-2.6.39/net/mac80211/ieee80211_i.h linux-2.6.39/net/mac80211/ieee80211_i.h
+--- linux-2.6.39/net/mac80211/ieee80211_i.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/mac80211/ieee80211_i.h 2011-05-22 19:36:34.000000000 -0400
@@ -27,6 +27,7 @@
#include <net/ieee80211_radiotap.h>
#include <net/cfg80211.h>
#include "key.h"
#include "sta_info.h"
-@@ -716,7 +717,7 @@ struct ieee80211_local {
+@@ -714,7 +715,7 @@ struct ieee80211_local {
/* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
spinlock_t queue_stop_reason_lock;
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.38.4/net/mac80211/iface.c linux-2.6.38.4/net/mac80211/iface.c
---- linux-2.6.38.4/net/mac80211/iface.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/mac80211/iface.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/mac80211/iface.c linux-2.6.39/net/mac80211/iface.c
+--- linux-2.6.39/net/mac80211/iface.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/mac80211/iface.c 2011-05-22 19:36:34.000000000 -0400
@@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_
break;
}
drv_stop(local);
err_del_bss:
sdata->bss = NULL;
-@@ -473,7 +473,7 @@ static void ieee80211_do_stop(struct iee
+@@ -474,7 +474,7 @@ static void ieee80211_do_stop(struct iee
}
if (going_down)
switch (sdata->vif.type) {
case NL80211_IFTYPE_AP_VLAN:
-@@ -532,7 +532,7 @@ static void ieee80211_do_stop(struct iee
+@@ -533,7 +533,7 @@ static void ieee80211_do_stop(struct iee
ieee80211_recalc_ps(local, -1);
if (local->ops->napi_poll)
napi_disable(&local->napi);
ieee80211_clear_tx_pending(local);
-diff -urNp linux-2.6.38.4/net/mac80211/main.c linux-2.6.38.4/net/mac80211/main.c
---- linux-2.6.38.4/net/mac80211/main.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/mac80211/main.c 2011-04-28 19:34:15.000000000 -0400
-@@ -161,7 +161,7 @@ int ieee80211_hw_config(struct ieee80211
+diff -urNp linux-2.6.39/net/mac80211/main.c linux-2.6.39/net/mac80211/main.c
+--- linux-2.6.39/net/mac80211/main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/mac80211/main.c 2011-05-22 19:36:34.000000000 -0400
+@@ -215,7 +215,7 @@ int ieee80211_hw_config(struct ieee80211
local->hw.conf.power_level = power;
}
ret = drv_config(local, changed);
/*
* Goal:
-diff -urNp linux-2.6.38.4/net/mac80211/pm.c linux-2.6.38.4/net/mac80211/pm.c
---- linux-2.6.38.4/net/mac80211/pm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/mac80211/pm.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/mac80211/mlme.c linux-2.6.39/net/mac80211/mlme.c
+--- linux-2.6.39/net/mac80211/mlme.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/mac80211/mlme.c 2011-05-22 19:36:34.000000000 -0400
+@@ -1431,6 +1431,8 @@ static bool ieee80211_assoc_success(stru
+ bool have_higher_than_11mbit = false;
+ u16 ap_ht_cap_flags;
+
++ pax_track_stack();
++
+ /* AssocResp and ReassocResp have identical structure */
+
+ aid = le16_to_cpu(mgmt->u.assoc_resp.aid);
+diff -urNp linux-2.6.39/net/mac80211/pm.c linux-2.6.39/net/mac80211/pm.c
+--- linux-2.6.39/net/mac80211/pm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/mac80211/pm.c 2011-05-22 19:36:34.000000000 -0400
@@ -95,7 +95,7 @@ int __ieee80211_suspend(struct ieee80211
}
ieee80211_stop_device(local);
local->suspended = true;
-diff -urNp linux-2.6.38.4/net/mac80211/rate.c linux-2.6.38.4/net/mac80211/rate.c
---- linux-2.6.38.4/net/mac80211/rate.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/mac80211/rate.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/mac80211/rate.c linux-2.6.39/net/mac80211/rate.c
+--- linux-2.6.39/net/mac80211/rate.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/mac80211/rate.c 2011-05-22 19:36:34.000000000 -0400
@@ -371,7 +371,7 @@ int ieee80211_init_rate_ctrl_alg(struct
ASSERT_RTNL();
return -EBUSY;
if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
-diff -urNp linux-2.6.38.4/net/mac80211/rc80211_pid_debugfs.c linux-2.6.38.4/net/mac80211/rc80211_pid_debugfs.c
---- linux-2.6.38.4/net/mac80211/rc80211_pid_debugfs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/mac80211/rc80211_pid_debugfs.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/mac80211/rc80211_pid_debugfs.c linux-2.6.39/net/mac80211/rc80211_pid_debugfs.c
+--- linux-2.6.39/net/mac80211/rc80211_pid_debugfs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/mac80211/rc80211_pid_debugfs.c 2011-05-22 19:36:34.000000000 -0400
@@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r
spin_unlock_irqrestore(&events->lock, status);
return -EFAULT;
return p;
-diff -urNp linux-2.6.38.4/net/mac80211/tx.c linux-2.6.38.4/net/mac80211/tx.c
---- linux-2.6.38.4/net/mac80211/tx.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/mac80211/tx.c 2011-04-28 19:34:15.000000000 -0400
-@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct
- return cpu_to_le16(dur);
- }
-
--static int inline is_ieee80211_device(struct ieee80211_local *local,
-+static inline int is_ieee80211_device(struct ieee80211_local *local,
- struct net_device *dev)
- {
- return local == wdev_priv(dev->ieee80211_ptr);
-diff -urNp linux-2.6.38.4/net/mac80211/util.c linux-2.6.38.4/net/mac80211/util.c
---- linux-2.6.38.4/net/mac80211/util.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/mac80211/util.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1135,7 +1135,7 @@ int ieee80211_reconfig(struct ieee80211_
+diff -urNp linux-2.6.39/net/mac80211/util.c linux-2.6.39/net/mac80211/util.c
+--- linux-2.6.39/net/mac80211/util.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/mac80211/util.c 2011-05-22 19:36:34.000000000 -0400
+@@ -1129,7 +1129,7 @@ int ieee80211_reconfig(struct ieee80211_
local->resuming = true;
/* restart hardware */
/*
* Upon resume hardware can sometimes be goofy due to
* various platform / driver / bus issues, so restarting
-diff -urNp linux-2.6.38.4/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.38.4/net/netfilter/ipvs/ip_vs_conn.c
---- linux-2.6.38.4/net/netfilter/ipvs/ip_vs_conn.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/ipvs/ip_vs_conn.c 2011-04-28 19:57:25.000000000 -0400
-@@ -553,7 +553,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, s
+diff -urNp linux-2.6.39/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.39/net/netfilter/ipvs/ip_vs_conn.c
+--- linux-2.6.39/net/netfilter/ipvs/ip_vs_conn.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/netfilter/ipvs/ip_vs_conn.c 2011-05-22 19:36:34.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);
if (cp->protocol != IPPROTO_UDP)
conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
/* Bind with the destination and its corresponding transmitter */
-@@ -840,7 +840,7 @@ ip_vs_conn_new(const struct ip_vs_conn_p
+@@ -861,7 +861,7 @@ ip_vs_conn_new(const struct ip_vs_conn_p
atomic_set(&cp->refcnt, 1);
atomic_set(&cp->n_control, 0);
- atomic_set(&cp->in_pkts, 0);
+ atomic_set_unchecked(&cp->in_pkts, 0);
- atomic_inc(&ip_vs_conn_count);
+ atomic_inc(&ipvs->conn_count);
if (flags & IP_VS_CONN_F_NO_CPORT)
-@@ -1102,7 +1102,7 @@ static inline int todrop_entry(struct ip
+@@ -1141,7 +1141,7 @@ static inline int todrop_entry(struct ip
/* Don't drop the entry if its number of incoming packets is not
located in [0, 8] */
if (i > 8 || i < 0) return 0;
if (!todrop_rate[i]) return 0;
-diff -urNp linux-2.6.38.4/net/netfilter/ipvs/ip_vs_core.c linux-2.6.38.4/net/netfilter/ipvs/ip_vs_core.c
---- linux-2.6.38.4/net/netfilter/ipvs/ip_vs_core.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/ipvs/ip_vs_core.c 2011-04-28 19:57:25.000000000 -0400
-@@ -504,7 +504,7 @@ int ip_vs_leave(struct ip_vs_service *sv
- ret = cp->packet_xmit(skb, cp, pp);
+diff -urNp linux-2.6.39/net/netfilter/ipvs/ip_vs_core.c linux-2.6.39/net/netfilter/ipvs/ip_vs_core.c
+--- linux-2.6.39/net/netfilter/ipvs/ip_vs_core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/netfilter/ipvs/ip_vs_core.c 2011-05-22 19:36:34.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 */
- atomic_inc(&cp->in_pkts);
ip_vs_conn_put(cp);
return ret;
}
-@@ -1536,7 +1536,7 @@ ip_vs_in(unsigned int hooknum, struct sk
- * Sync connection if it is about to close to
- * encorage the standby servers to update the connections timeout
- */
-- pkts = atomic_add_return(1, &cp->in_pkts);
-+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
- if (af == AF_INET && (ip_vs_sync_state & IP_VS_STATE_MASTER) &&
+@@ -1633,7 +1633,7 @@ ip_vs_in(unsigned int hooknum, struct sk
+ if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
+ pkts = sysctl_sync_threshold(ipvs);
+ else
+- pkts = atomic_add_return(1, &cp->in_pkts);
++ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
+
+ if ((ipvs->sync_state & IP_VS_STATE_MASTER) &&
cp->protocol == IPPROTO_SCTP) {
- if ((cp->state == IP_VS_SCTP_S_ESTABLISHED &&
-diff -urNp linux-2.6.38.4/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.38.4/net/netfilter/ipvs/ip_vs_ctl.c
---- linux-2.6.38.4/net/netfilter/ipvs/ip_vs_ctl.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/ipvs/ip_vs_ctl.c 2011-04-28 19:57:25.000000000 -0400
-@@ -787,7 +787,7 @@ __ip_vs_update_dest(struct ip_vs_service
- ip_vs_rs_hash(dest);
- write_unlock_bh(&__ip_vs_rs_lock);
+diff -urNp linux-2.6.39/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.39/net/netfilter/ipvs/ip_vs_ctl.c
+--- linux-2.6.39/net/netfilter/ipvs/ip_vs_ctl.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/netfilter/ipvs/ip_vs_ctl.c 2011-05-22 19:36:34.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);
}
- atomic_set(&dest->conn_flags, conn_flags);
+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
/* bind the service */
if (!dest->svc) {
-@@ -1905,7 +1905,7 @@ static int ip_vs_info_seq_show(struct se
+@@ -2027,7 +2027,7 @@ static int ip_vs_info_seq_show(struct se
" %-7s %-6d %-10d %-10d\n",
&dest->addr.in6,
ntohs(dest->port),
atomic_read(&dest->weight),
atomic_read(&dest->activeconns),
atomic_read(&dest->inactconns));
-@@ -1916,7 +1916,7 @@ static int ip_vs_info_seq_show(struct se
+@@ -2038,7 +2038,7 @@ static int ip_vs_info_seq_show(struct se
"%-7s %-6d %-10d %-10d\n",
ntohl(dest->addr.ip),
ntohs(dest->port),
atomic_read(&dest->weight),
atomic_read(&dest->activeconns),
atomic_read(&dest->inactconns));
-@@ -2315,7 +2315,7 @@ __ip_vs_get_dest_entries(const struct ip
+@@ -2287,6 +2287,8 @@ do_ip_vs_set_ctl(struct sock *sk, int cm
+ struct ip_vs_dest_user *udest_compat;
+ struct ip_vs_dest_user_kern udest;
+
++ pax_track_stack();
++
+ if (!capable(CAP_NET_ADMIN))
+ return -EPERM;
+
+@@ -2501,7 +2503,7 @@ __ip_vs_get_dest_entries(struct net *net
entry.addr = dest->addr.ip;
entry.port = dest->port;
entry.weight = atomic_read(&dest->weight);
entry.u_threshold = dest->u_threshold;
entry.l_threshold = dest->l_threshold;
-@@ -2831,7 +2831,7 @@ static int ip_vs_genl_fill_dest(struct s
+@@ -3029,7 +3031,7 @@ static int ip_vs_genl_fill_dest(struct s
NLA_PUT_U16(skb, IPVS_DEST_ATTR_PORT, dest->port);
NLA_PUT_U32(skb, IPVS_DEST_ATTR_FWD_METHOD,
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.38.4/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.38.4/net/netfilter/ipvs/ip_vs_sync.c
---- linux-2.6.38.4/net/netfilter/ipvs/ip_vs_sync.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/ipvs/ip_vs_sync.c 2011-04-28 19:57:25.000000000 -0400
-@@ -460,7 +460,7 @@ static void ip_vs_process_message(const
-
- if (opt)
- memcpy(&cp->in_seq, opt, sizeof(*opt));
-- atomic_set(&cp->in_pkts, sysctl_ip_vs_sync_threshold[0]);
-+ atomic_set_unchecked(&cp->in_pkts, sysctl_ip_vs_sync_threshold[0]);
- cp->state = state;
- cp->old_state = cp->state;
- /*
-diff -urNp linux-2.6.38.4/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.38.4/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-2.6.38.4/net/netfilter/ipvs/ip_vs_xmit.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/ipvs/ip_vs_xmit.c 2011-04-28 19:57:25.000000000 -0400
-@@ -1116,7 +1116,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str
+diff -urNp linux-2.6.39/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.39/net/netfilter/ipvs/ip_vs_sync.c
+--- linux-2.6.39/net/netfilter/ipvs/ip_vs_sync.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/netfilter/ipvs/ip_vs_sync.c 2011-05-22 19:36:34.000000000 -0400
+@@ -648,7 +648,7 @@ control:
+ * i.e only increment in_pkts for Templates.
+ */
+ if (cp->flags & IP_VS_CONN_F_TEMPLATE) {
+- int pkts = atomic_add_return(1, &cp->in_pkts);
++ int pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
+
+ if (pkts % sysctl_sync_period(ipvs) != 1)
+ return;
+@@ -794,7 +794,7 @@ static void ip_vs_proc_conn(struct net *
+
+ if (opt)
+ memcpy(&cp->in_seq, opt, sizeof(*opt));
+- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
++ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
+ cp->state = state;
+ cp->old_state = cp->state;
+ /*
+diff -urNp linux-2.6.39/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.39/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-2.6.39/net/netfilter/ipvs/ip_vs_xmit.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/netfilter/ipvs/ip_vs_xmit.c 2011-05-22 19:36:34.000000000 -0400
+@@ -1127,7 +1127,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str
else
rc = NF_ACCEPT;
/* do not touch skb anymore */
goto out;
}
-@@ -1230,7 +1230,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb,
+@@ -1245,7 +1245,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb,
else
rc = NF_ACCEPT;
/* do not touch skb anymore */
goto out;
}
-diff -urNp linux-2.6.38.4/net/netfilter/Kconfig linux-2.6.38.4/net/netfilter/Kconfig
---- linux-2.6.38.4/net/netfilter/Kconfig 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/Kconfig 2011-04-28 19:34:15.000000000 -0400
-@@ -709,6 +709,16 @@ config NETFILTER_XT_MATCH_ESP
+diff -urNp linux-2.6.39/net/netfilter/Kconfig linux-2.6.39/net/netfilter/Kconfig
+--- linux-2.6.39/net/netfilter/Kconfig 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/netfilter/Kconfig 2011-05-22 19:41:42.000000000 -0400
+@@ -781,6 +781,16 @@ config NETFILTER_XT_MATCH_ESP
To compile it as a module, choose M here. If unsure, say N.
config NETFILTER_XT_MATCH_HASHLIMIT
tristate '"hashlimit" match support'
depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
-diff -urNp linux-2.6.38.4/net/netfilter/Makefile linux-2.6.38.4/net/netfilter/Makefile
---- linux-2.6.38.4/net/netfilter/Makefile 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/Makefile 2011-04-28 19:34:15.000000000 -0400
-@@ -74,6 +74,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CPU) +=
- obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
+diff -urNp linux-2.6.39/net/netfilter/Makefile linux-2.6.39/net/netfilter/Makefile
+--- linux-2.6.39/net/netfilter/Makefile 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/netfilter/Makefile 2011-05-22 20:40:16.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
obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
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.38.4/net/netfilter/nf_conntrack_netlink.c linux-2.6.38.4/net/netfilter/nf_conntrack_netlink.c
---- linux-2.6.38.4/net/netfilter/nf_conntrack_netlink.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/nf_conntrack_netlink.c 2011-04-28 19:34:15.000000000 -0400
-@@ -761,7 +761,7 @@ static const struct nla_policy tuple_nla
- static int
- ctnetlink_parse_tuple(const struct nlattr * const cda[],
- struct nf_conntrack_tuple *tuple,
-- enum ctattr_tuple type, u_int8_t l3num)
-+ enum ctattr_type type, u_int8_t l3num)
- {
- struct nlattr *tb[CTA_TUPLE_MAX+1];
- int err;
-diff -urNp linux-2.6.38.4/net/netfilter/nfnetlink_log.c linux-2.6.38.4/net/netfilter/nfnetlink_log.c
---- linux-2.6.38.4/net/netfilter/nfnetlink_log.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/nfnetlink_log.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/netfilter/nfnetlink_log.c linux-2.6.39/net/netfilter/nfnetlink_log.c
+--- linux-2.6.39/net/netfilter/nfnetlink_log.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/netfilter/nfnetlink_log.c 2011-05-22 19:36:35.000000000 -0400
@@ -70,7 +70,7 @@ struct nfulnl_instance {
};
#define INSTANCE_BUCKETS 16
static struct hlist_head instance_table[INSTANCE_BUCKETS];
-@@ -507,7 +507,7 @@ __build_packet_message(struct nfulnl_ins
+@@ -506,7 +506,7 @@ __build_packet_message(struct nfulnl_ins
/* global sequence number */
if (inst->flags & NFULNL_CFG_F_SEQ_GLOBAL)
NLA_PUT_BE32(inst->skb, NFULA_SEQ_GLOBAL,
if (data_len) {
struct nlattr *nla;
-diff -urNp linux-2.6.38.4/net/netfilter/nfnetlink_queue.c linux-2.6.38.4/net/netfilter/nfnetlink_queue.c
---- linux-2.6.38.4/net/netfilter/nfnetlink_queue.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/nfnetlink_queue.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/netfilter/nfnetlink_queue.c linux-2.6.39/net/netfilter/nfnetlink_queue.c
+--- linux-2.6.39/net/netfilter/nfnetlink_queue.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/netfilter/nfnetlink_queue.c 2011-05-22 19:36:35.000000000 -0400
@@ -58,7 +58,7 @@ struct nfqnl_instance {
*/
spinlock_t lock;
pmsg.packet_id = htonl(entry->id);
pmsg.hw_protocol = entskb->protocol;
pmsg.hook = entry->hook;
-@@ -863,7 +863,7 @@ static int seq_show(struct seq_file *s,
+@@ -869,7 +869,7 @@ static int seq_show(struct seq_file *s,
inst->peer_pid, inst->queue_total,
inst->copy_mode, inst->copy_range,
inst->queue_dropped, inst->queue_user_dropped,
}
static const struct seq_operations nfqnl_seq_ops = {
-diff -urNp linux-2.6.38.4/net/netfilter/xt_gradm.c linux-2.6.38.4/net/netfilter/xt_gradm.c
---- linux-2.6.38.4/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/net/netfilter/xt_gradm.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/netfilter/xt_gradm.c linux-2.6.39/net/netfilter/xt_gradm.c
+--- linux-2.6.39/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.39/net/netfilter/xt_gradm.c 2011-05-22 19:41:42.000000000 -0400
@@ -0,0 +1,51 @@
+/*
+ * gradm match for netfilter
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_gradm");
+MODULE_ALIAS("ip6t_gradm");
-diff -urNp linux-2.6.38.4/net/netfilter/xt_statistic.c linux-2.6.38.4/net/netfilter/xt_statistic.c
---- linux-2.6.38.4/net/netfilter/xt_statistic.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/xt_statistic.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/netfilter/xt_statistic.c linux-2.6.39/net/netfilter/xt_statistic.c
+--- linux-2.6.39/net/netfilter/xt_statistic.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/netfilter/xt_statistic.c 2011-05-22 19:36:35.000000000 -0400
@@ -18,7 +18,7 @@
#include <linux/netfilter/x_tables.h>
return 0;
}
-diff -urNp linux-2.6.38.4/net/netlink/af_netlink.c linux-2.6.38.4/net/netlink/af_netlink.c
---- linux-2.6.38.4/net/netlink/af_netlink.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netlink/af_netlink.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/netlink/af_netlink.c linux-2.6.39/net/netlink/af_netlink.c
+--- linux-2.6.39/net/netlink/af_netlink.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/netlink/af_netlink.c 2011-05-22 19:41:42.000000000 -0400
@@ -742,7 +742,7 @@ static void netlink_overrun(struct sock
sk->sk_error_report(sk);
}
}
static struct sock *netlink_getsockbypid(struct sock *ssk, u32 pid)
-@@ -2001,15 +2001,23 @@ static int netlink_seq_show(struct seq_f
+@@ -1992,15 +1992,23 @@ static int netlink_seq_show(struct seq_f
struct netlink_sock *nlk = nlk_sk(s);
seq_printf(seq, "%p %-3d %-6d %08x %-8d %-8d %p %-8d %-8d %-8lu\n",
sock_i_ino(s)
);
-diff -urNp linux-2.6.38.4/net/netrom/af_netrom.c linux-2.6.38.4/net/netrom/af_netrom.c
---- linux-2.6.38.4/net/netrom/af_netrom.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netrom/af_netrom.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/netrom/af_netrom.c linux-2.6.39/net/netrom/af_netrom.c
+--- linux-2.6.39/net/netrom/af_netrom.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/netrom/af_netrom.c 2011-05-22 19:41:42.000000000 -0400
@@ -840,6 +840,7 @@ static int nr_getname(struct socket *soc
struct sock *sk = sock->sk;
struct nr_sock *nr = nr_sk(sk);
sax->fsa_ax25.sax25_call = nr->source_addr;
*uaddr_len = sizeof(struct sockaddr_ax25);
}
-diff -urNp linux-2.6.38.4/net/packet/af_packet.c linux-2.6.38.4/net/packet/af_packet.c
---- linux-2.6.38.4/net/packet/af_packet.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/packet/af_packet.c 2011-04-28 19:57:25.000000000 -0400
-@@ -635,14 +635,14 @@ static int packet_rcv(struct sk_buff *sk
+diff -urNp linux-2.6.39/net/packet/af_packet.c linux-2.6.39/net/packet/af_packet.c
+--- linux-2.6.39/net/packet/af_packet.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/packet/af_packet.c 2011-05-22 19:41:42.000000000 -0400
+@@ -647,14 +647,14 @@ static int packet_rcv(struct sk_buff *sk
spin_lock(&sk->sk_receive_queue.lock);
po->stats.tp_packets++;
drop_n_restore:
if (skb_head != skb->data && skb_shared(skb)) {
-@@ -2134,7 +2134,7 @@ static int packet_getsockopt(struct sock
+@@ -2157,7 +2157,7 @@ static int packet_getsockopt(struct sock
case PACKET_HDRLEN:
if (len > sizeof(int))
len = sizeof(int);
return -EFAULT;
switch (val) {
case TPACKET_V1:
-@@ -2172,7 +2172,7 @@ static int packet_getsockopt(struct sock
+@@ -2195,7 +2195,7 @@ static int packet_getsockopt(struct sock
if (put_user(len, optlen))
return -EFAULT;
return -EFAULT;
return 0;
}
-@@ -2684,7 +2684,11 @@ static int packet_seq_show(struct seq_fi
+@@ -2707,7 +2707,11 @@ static int packet_seq_show(struct seq_fi
seq_printf(seq,
"%p %-6d %-4d %04x %-5d %1d %-6u %-6u %-6lu\n",
atomic_read(&s->sk_refcnt),
s->sk_type,
ntohs(po->num),
-diff -urNp linux-2.6.38.4/net/phonet/af_phonet.c linux-2.6.38.4/net/phonet/af_phonet.c
---- linux-2.6.38.4/net/phonet/af_phonet.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/phonet/af_phonet.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/phonet/af_phonet.c linux-2.6.39/net/phonet/af_phonet.c
+--- linux-2.6.39/net/phonet/af_phonet.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/phonet/af_phonet.c 2011-05-22 19:41:42.000000000 -0400
@@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
{
struct phonet_protocol *pp;
return NULL;
rcu_read_lock();
-@@ -463,7 +463,7 @@ int __init_or_module phonet_proto_regist
+@@ -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;
return -EINVAL;
err = proto_register(pp->prot, 1);
-diff -urNp linux-2.6.38.4/net/phonet/pep.c linux-2.6.38.4/net/phonet/pep.c
---- linux-2.6.38.4/net/phonet/pep.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/phonet/pep.c 2011-04-28 19:57:25.000000000 -0400
-@@ -592,7 +592,7 @@ static int pipe_do_rcv(struct sock *sk,
+diff -urNp linux-2.6.39/net/phonet/pep.c linux-2.6.39/net/phonet/pep.c
+--- linux-2.6.39/net/phonet/pep.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/phonet/pep.c 2011-05-22 19:36:35.000000000 -0400
+@@ -387,7 +387,7 @@ static int pipe_do_rcv(struct sock *sk,
case PNS_PEP_CTRL_REQ:
if (skb_queue_len(&pn->ctrlreq_queue) >= PNPIPE_CTRLREQ_MAX) {
break;
}
__skb_pull(skb, 4);
-@@ -612,7 +612,7 @@ static int pipe_do_rcv(struct sock *sk,
+@@ -408,7 +408,7 @@ static int pipe_do_rcv(struct sock *sk,
}
if (pn->rx_credits == 0) {
err = -ENOBUFS;
break;
}
-diff -urNp linux-2.6.38.4/net/phonet/socket.c linux-2.6.38.4/net/phonet/socket.c
---- linux-2.6.38.4/net/phonet/socket.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/phonet/socket.c 2011-04-28 20:09:57.000000000 -0400
-@@ -637,8 +637,13 @@ static int pn_sock_seq_show(struct seq_f
- sk->sk_state,
+@@ -556,7 +556,7 @@ static int pipe_handler_do_rcv(struct so
+ }
+
+ if (pn->rx_credits == 0) {
+- atomic_inc(&sk->sk_drops);
++ atomic_inc_unchecked(&sk->sk_drops);
+ err = NET_RX_DROP;
+ break;
+ }
+diff -urNp linux-2.6.39/net/phonet/socket.c linux-2.6.39/net/phonet/socket.c
+--- linux-2.6.39/net/phonet/socket.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/phonet/socket.c 2011-05-22 20:39:26.000000000 -0400
+@@ -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),
sock_i_uid(sk), sock_i_ino(sk),
- atomic_read(&sk->sk_refcnt), sk,
}
seq_printf(seq, "%*s\n", 127 - len, "");
return 0;
-diff -urNp linux-2.6.38.4/net/rds/cong.c linux-2.6.38.4/net/rds/cong.c
---- linux-2.6.38.4/net/rds/cong.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rds/cong.c 2011-04-28 19:57:25.000000000 -0400
-@@ -78,7 +78,7 @@
+diff -urNp linux-2.6.39/net/rds/cong.c linux-2.6.39/net/rds/cong.c
+--- linux-2.6.39/net/rds/cong.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rds/cong.c 2011-05-22 19:36:35.000000000 -0400
+@@ -77,7 +77,7 @@
* finds that the saved generation number is smaller than the global generation
* number, it wakes up the process.
*/
/*
* Congestion monitoring
-@@ -233,7 +233,7 @@ void rds_cong_map_updated(struct rds_con
+@@ -232,7 +232,7 @@ void rds_cong_map_updated(struct rds_con
rdsdebug("waking map %p for %pI4\n",
map, &map->m_addr);
rds_stats_inc(s_cong_update_received);
if (waitqueue_active(&map->m_waitq))
wake_up(&map->m_waitq);
if (waitqueue_active(&rds_poll_waitq))
-@@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(rds_cong_map_updated);
+@@ -258,7 +258,7 @@ EXPORT_SYMBOL_GPL(rds_cong_map_updated);
int rds_cong_updated_since(unsigned long *recent)
{
if (likely(*recent == gen))
return 0;
-diff -urNp linux-2.6.38.4/net/rxrpc/af_rxrpc.c linux-2.6.38.4/net/rxrpc/af_rxrpc.c
---- linux-2.6.38.4/net/rxrpc/af_rxrpc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/af_rxrpc.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/rds/ib_cm.c linux-2.6.39/net/rds/ib_cm.c
+--- linux-2.6.39/net/rds/ib_cm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rds/ib_cm.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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);
+ #ifdef KERNEL_HAS_ATOMIC64
+- atomic64_set(&ic->i_ack_next, 0);
++ atomic64_set_unchecked(&ic->i_ack_next, 0);
+ #else
+ ic->i_ack_next = 0;
+ #endif
+diff -urNp linux-2.6.39/net/rds/ib.h linux-2.6.39/net/rds/ib.h
+--- linux-2.6.39/net/rds/ib.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rds/ib.h 2011-05-22 19:36:35.000000000 -0400
+@@ -127,7 +127,7 @@ struct rds_ib_connection {
+ /* sending acks */
+ unsigned long i_ack_flags;
+ #ifdef KERNEL_HAS_ATOMIC64
+- atomic64_t i_ack_next; /* next ACK to send */
++ atomic64_unchecked_t i_ack_next; /* next ACK to send */
+ #else
+ spinlock_t i_ack_lock; /* protect i_ack_next */
+ u64 i_ack_next; /* next ACK to send */
+diff -urNp linux-2.6.39/net/rds/ib_recv.c linux-2.6.39/net/rds/ib_recv.c
+--- linux-2.6.39/net/rds/ib_recv.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rds/ib_recv.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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)
+ {
+- atomic64_set(&ic->i_ack_next, seq);
++ atomic64_set_unchecked(&ic->i_ack_next, seq);
+ if (ack_required) {
+ smp_mb__before_clear_bit();
+ set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
+@@ -604,7 +604,7 @@ static u64 rds_ib_get_ack(struct rds_ib_
+ clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
+ smp_mb__after_clear_bit();
+
+- return atomic64_read(&ic->i_ack_next);
++ return atomic64_read_unchecked(&ic->i_ack_next);
+ }
+ #endif
+
+diff -urNp linux-2.6.39/net/rds/iw_cm.c linux-2.6.39/net/rds/iw_cm.c
+--- linux-2.6.39/net/rds/iw_cm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rds/iw_cm.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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);
+ #ifdef KERNEL_HAS_ATOMIC64
+- atomic64_set(&ic->i_ack_next, 0);
++ atomic64_set_unchecked(&ic->i_ack_next, 0);
+ #else
+ ic->i_ack_next = 0;
+ #endif
+diff -urNp linux-2.6.39/net/rds/iw.h linux-2.6.39/net/rds/iw.h
+--- linux-2.6.39/net/rds/iw.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rds/iw.h 2011-05-22 19:36:35.000000000 -0400
+@@ -133,7 +133,7 @@ struct rds_iw_connection {
+ /* sending acks */
+ unsigned long i_ack_flags;
+ #ifdef KERNEL_HAS_ATOMIC64
+- atomic64_t i_ack_next; /* next ACK to send */
++ atomic64_unchecked_t i_ack_next; /* next ACK to send */
+ #else
+ spinlock_t i_ack_lock; /* protect i_ack_next */
+ u64 i_ack_next; /* next ACK to send */
+diff -urNp linux-2.6.39/net/rds/iw_rdma.c linux-2.6.39/net/rds/iw_rdma.c
+--- linux-2.6.39/net/rds/iw_rdma.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rds/iw_rdma.c 2011-05-22 19:36:35.000000000 -0400
+@@ -182,6 +182,8 @@ int rds_iw_update_cm_id(struct rds_iw_de
+ struct rdma_cm_id *pcm_id;
+ int rc;
+
++ pax_track_stack();
++
+ 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/net/rds/iw_recv.c linux-2.6.39/net/rds/iw_recv.c
+--- linux-2.6.39/net/rds/iw_recv.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rds/iw_recv.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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)
+ {
+- atomic64_set(&ic->i_ack_next, seq);
++ atomic64_set_unchecked(&ic->i_ack_next, seq);
+ if (ack_required) {
+ smp_mb__before_clear_bit();
+ set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
+@@ -439,7 +439,7 @@ static u64 rds_iw_get_ack(struct rds_iw_
+ clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
+ smp_mb__after_clear_bit();
+
+- return atomic64_read(&ic->i_ack_next);
++ return atomic64_read_unchecked(&ic->i_ack_next);
+ }
+ #endif
+
+diff -urNp linux-2.6.39/net/rxrpc/af_rxrpc.c linux-2.6.39/net/rxrpc/af_rxrpc.c
+--- linux-2.6.39/net/rxrpc/af_rxrpc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rxrpc/af_rxrpc.c 2011-05-22 19:36:35.000000000 -0400
@@ -39,7 +39,7 @@ static const struct proto_ops rxrpc_rpc_
__be32 rxrpc_epoch;
/* count of skbs currently in use */
atomic_t rxrpc_n_skbs;
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-ack.c linux-2.6.38.4/net/rxrpc/ar-ack.c
---- linux-2.6.38.4/net/rxrpc/ar-ack.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-ack.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/rxrpc/ar-ack.c linux-2.6.39/net/rxrpc/ar-ack.c
+--- linux-2.6.39/net/rxrpc/ar-ack.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rxrpc/ar-ack.c 2011-05-22 19:36:35.000000000 -0400
@@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_ca
_enter("{%d,%d,%d,%d},",
_proto("Rx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
latest,
-@@ -1163,7 +1163,7 @@ void rxrpc_process_call(struct work_stru
+@@ -844,6 +844,8 @@ void rxrpc_process_call(struct work_stru
+ u32 abort_code = RX_PROTOCOL_ERROR;
+ u8 *acks = NULL;
+
++ pax_track_stack();
++
+ //printk("\n--------------------\n");
+ _enter("{%d,%s,%lx} [%lu]",
+ call->debug_id, rxrpc_call_states[call->state], call->events,
+@@ -1163,7 +1165,7 @@ void rxrpc_process_call(struct work_stru
goto maybe_reschedule;
send_ACK_with_skew:
ntohl(ack.serial));
send_ACK:
mtu = call->conn->trans->peer->if_mtu;
-@@ -1175,7 +1175,7 @@ send_ACK:
+@@ -1175,7 +1177,7 @@ send_ACK:
ackinfo.rxMTU = htonl(5692);
ackinfo.jumbo_max = htonl(4);
_proto("Tx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
ntohl(hdr.serial),
ntohs(ack.maxSkew),
-@@ -1193,7 +1193,7 @@ send_ACK:
+@@ -1193,7 +1195,7 @@ send_ACK:
send_message:
_debug("send message");
_proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
send_message_2:
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-call.c linux-2.6.38.4/net/rxrpc/ar-call.c
---- linux-2.6.38.4/net/rxrpc/ar-call.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-call.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/rxrpc/ar-call.c linux-2.6.39/net/rxrpc/ar-call.c
+--- linux-2.6.39/net/rxrpc/ar-call.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rxrpc/ar-call.c 2011-05-22 19:36:35.000000000 -0400
@@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_ca
spin_lock_init(&call->lock);
rwlock_init(&call->state_lock);
call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
memset(&call->sock_node, 0xed, sizeof(call->sock_node));
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-connection.c linux-2.6.38.4/net/rxrpc/ar-connection.c
---- linux-2.6.38.4/net/rxrpc/ar-connection.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-connection.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/rxrpc/ar-connection.c linux-2.6.39/net/rxrpc/ar-connection.c
+--- linux-2.6.39/net/rxrpc/ar-connection.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rxrpc/ar-connection.c 2011-05-22 19:36:35.000000000 -0400
@@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_al
rwlock_init(&conn->lock);
spin_lock_init(&conn->state_lock);
conn->avail_calls = RXRPC_MAXCALLS;
conn->size_align = 4;
conn->header_size = sizeof(struct rxrpc_header);
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-connevent.c linux-2.6.38.4/net/rxrpc/ar-connevent.c
---- linux-2.6.38.4/net/rxrpc/ar-connevent.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-connevent.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/rxrpc/ar-connevent.c linux-2.6.39/net/rxrpc/ar-connevent.c
+--- linux-2.6.39/net/rxrpc/ar-connevent.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rxrpc/ar-connevent.c 2011-05-22 19:36:35.000000000 -0400
@@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct
len = iov[0].iov_len + iov[1].iov_len;
_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.38.4/net/rxrpc/ar-input.c linux-2.6.38.4/net/rxrpc/ar-input.c
---- linux-2.6.38.4/net/rxrpc/ar-input.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-input.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/rxrpc/ar-input.c linux-2.6.39/net/rxrpc/ar-input.c
+--- linux-2.6.39/net/rxrpc/ar-input.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rxrpc/ar-input.c 2011-05-22 19:36:35.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 */
serial);
/* request ACK generation for any ACK or DATA packet that requests
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-internal.h linux-2.6.38.4/net/rxrpc/ar-internal.h
---- linux-2.6.38.4/net/rxrpc/ar-internal.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-internal.h 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/rxrpc/ar-internal.h linux-2.6.39/net/rxrpc/ar-internal.h
+--- linux-2.6.39/net/rxrpc/ar-internal.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rxrpc/ar-internal.h 2011-05-22 19:36:35.000000000 -0400
@@ -272,8 +272,8 @@ struct rxrpc_connection {
int error; /* error code for local abort */
int debug_id; /* debug ID for printks */
extern struct workqueue_struct *rxrpc_workqueue;
/*
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-local.c linux-2.6.38.4/net/rxrpc/ar-local.c
---- linux-2.6.38.4/net/rxrpc/ar-local.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-local.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/rxrpc/ar-local.c linux-2.6.39/net/rxrpc/ar-local.c
+--- linux-2.6.39/net/rxrpc/ar-local.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rxrpc/ar-local.c 2011-05-22 19:36:35.000000000 -0400
@@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(st
spin_lock_init(&local->lock);
rwlock_init(&local->services_lock);
memcpy(&local->srx, srx, sizeof(*srx));
}
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-output.c linux-2.6.38.4/net/rxrpc/ar-output.c
---- linux-2.6.38.4/net/rxrpc/ar-output.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-output.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/rxrpc/ar-output.c linux-2.6.39/net/rxrpc/ar-output.c
+--- linux-2.6.39/net/rxrpc/ar-output.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rxrpc/ar-output.c 2011-05-22 19:36:35.000000000 -0400
@@ -681,9 +681,9 @@ static int rxrpc_send_data(struct kiocb
sp->hdr.cid = call->cid;
sp->hdr.callNumber = call->call_id;
sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
sp->hdr.userStatus = 0;
sp->hdr.securityIndex = conn->security_ix;
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-peer.c linux-2.6.38.4/net/rxrpc/ar-peer.c
---- linux-2.6.38.4/net/rxrpc/ar-peer.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-peer.c 2011-04-28 19:57:25.000000000 -0400
-@@ -87,7 +87,7 @@ static struct rxrpc_peer *rxrpc_alloc_pe
+diff -urNp linux-2.6.39/net/rxrpc/ar-peer.c linux-2.6.39/net/rxrpc/ar-peer.c
+--- linux-2.6.39/net/rxrpc/ar-peer.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rxrpc/ar-peer.c 2011-05-22 19:36:35.000000000 -0400
+@@ -71,7 +71,7 @@ static struct rxrpc_peer *rxrpc_alloc_pe
INIT_LIST_HEAD(&peer->error_targets);
spin_lock_init(&peer->lock);
atomic_set(&peer->usage, 1);
memcpy(&peer->srx, srx, sizeof(*srx));
rxrpc_assess_MTU_size(peer);
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-proc.c linux-2.6.38.4/net/rxrpc/ar-proc.c
---- linux-2.6.38.4/net/rxrpc/ar-proc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-proc.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/rxrpc/ar-proc.c linux-2.6.39/net/rxrpc/ar-proc.c
+--- linux-2.6.39/net/rxrpc/ar-proc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rxrpc/ar-proc.c 2011-05-22 19:36:35.000000000 -0400
@@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(str
atomic_read(&conn->usage),
rxrpc_conn_states[conn->state],
return 0;
}
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-transport.c linux-2.6.38.4/net/rxrpc/ar-transport.c
---- linux-2.6.38.4/net/rxrpc/ar-transport.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-transport.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/rxrpc/ar-transport.c linux-2.6.39/net/rxrpc/ar-transport.c
+--- linux-2.6.39/net/rxrpc/ar-transport.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rxrpc/ar-transport.c 2011-05-22 19:36:35.000000000 -0400
@@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_all
spin_lock_init(&trans->client_lock);
rwlock_init(&trans->conn_lock);
if (peer->srx.transport.family == AF_INET) {
switch (peer->srx.transport_type) {
-diff -urNp linux-2.6.38.4/net/rxrpc/rxkad.c linux-2.6.38.4/net/rxrpc/rxkad.c
---- linux-2.6.38.4/net/rxrpc/rxkad.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/rxkad.c 2011-04-28 19:57:25.000000000 -0400
-@@ -610,7 +610,7 @@ static int rxkad_issue_challenge(struct
+diff -urNp linux-2.6.39/net/rxrpc/rxkad.c linux-2.6.39/net/rxrpc/rxkad.c
+--- linux-2.6.39/net/rxrpc/rxkad.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/rxrpc/rxkad.c 2011-05-22 19:36:35.000000000 -0400
+@@ -211,6 +211,8 @@ static int rxkad_secure_packet_encrypt(c
+ u16 check;
+ int nsg;
+
++ pax_track_stack();
++
+ sp = rxrpc_skb(skb);
+
+ _enter("");
+@@ -338,6 +340,8 @@ static int rxkad_verify_packet_auth(cons
+ u16 check;
+ int nsg;
+
++ pax_track_stack();
++
+ _enter("");
+
+ sp = rxrpc_skb(skb);
+@@ -610,7 +614,7 @@ static int rxkad_issue_challenge(struct
len = iov[0].iov_len + iov[1].iov_len;
_proto("Tx CHALLENGE %%%u", ntohl(hdr.serial));
ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
-@@ -660,7 +660,7 @@ static int rxkad_send_response(struct rx
+@@ -660,7 +664,7 @@ static int rxkad_send_response(struct rx
len = iov[0].iov_len + iov[1].iov_len + iov[2].iov_len;
_proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
-diff -urNp linux-2.6.38.4/net/sctp/proc.c linux-2.6.38.4/net/sctp/proc.c
---- linux-2.6.38.4/net/sctp/proc.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/sctp/proc.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/sched/em_meta.c linux-2.6.39/net/sched/em_meta.c
+--- linux-2.6.39/net/sched/em_meta.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/sched/em_meta.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/net/sctp/proc.c linux-2.6.39/net/sctp/proc.c
+--- linux-2.6.39/net/sctp/proc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/sctp/proc.c 2011-05-22 19:41:42.000000000 -0400
@@ -212,7 +212,12 @@ static int sctp_eps_seq_show(struct seq_
sctp_for_each_hentry(epb, node, &head->chain) {
ep = sctp_ep(epb);
assoc->state, hash,
assoc->assoc_id,
assoc->sndbuf_used,
-diff -urNp linux-2.6.38.4/net/sctp/socket.c linux-2.6.38.4/net/sctp/socket.c
---- linux-2.6.38.4/net/sctp/socket.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/sctp/socket.c 2011-04-28 19:34:15.000000000 -0400
-@@ -4435,7 +4435,7 @@ static int sctp_getsockopt_peer_addrs(st
+diff -urNp linux-2.6.39/net/sctp/socket.c linux-2.6.39/net/sctp/socket.c
+--- linux-2.6.39/net/sctp/socket.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/sctp/socket.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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)
return -ENOMEM;
return -EFAULT;
to += addrlen;
cnt++;
-diff -urNp linux-2.6.38.4/net/socket.c linux-2.6.38.4/net/socket.c
---- linux-2.6.38.4/net/socket.c 2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/net/socket.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/socket.c linux-2.6.39/net/socket.c
+--- linux-2.6.39/net/socket.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/socket.c 2011-05-22 19:41:42.000000000 -0400
@@ -88,6 +88,7 @@
#include <linux/nsproxy.h>
#include <linux/magic.h>
static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
unsigned long nr_segs, loff_t pos);
-@@ -326,7 +329,7 @@ static struct dentry *sockfs_mount(struc
+@@ -330,7 +333,7 @@ static struct dentry *sockfs_mount(struc
&sockfs_dentry_operations, SOCKFS_MAGIC);
}
static struct file_system_type sock_fs_type = {
.name = "sockfs",
-@@ -1174,6 +1177,8 @@ int __sock_create(struct net *net, int f
+@@ -1179,6 +1182,8 @@ int __sock_create(struct net *net, int f
return -EAFNOSUPPORT;
if (type < 0 || type >= SOCK_MAX)
return -EINVAL;
/* Compatibility.
-@@ -1306,6 +1311,16 @@ SYSCALL_DEFINE3(socket, int, family, int
+@@ -1311,6 +1316,16 @@ SYSCALL_DEFINE3(socket, int, family, int
if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK))
flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK;
retval = sock_create(family, type, protocol, &sock);
if (retval < 0)
goto out;
-@@ -1418,6 +1433,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct so
+@@ -1423,6 +1438,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct so
if (sock) {
err = move_addr_to_kernel(umyaddr, addrlen, (struct sockaddr *)&address);
if (err >= 0) {
err = security_socket_bind(sock,
(struct sockaddr *)&address,
addrlen);
-@@ -1426,6 +1449,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct so
+@@ -1431,6 +1454,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct so
(struct sockaddr *)
&address, addrlen);
}
fput_light(sock->file, fput_needed);
}
return err;
-@@ -1449,10 +1473,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, ba
+@@ -1454,10 +1478,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, ba
if ((unsigned)backlog > somaxconn)
backlog = somaxconn;
fput_light(sock->file, fput_needed);
}
return err;
-@@ -1496,6 +1530,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
+@@ -1501,6 +1535,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
newsock->type = sock->type;
newsock->ops = sock->ops;
/*
* We don't need try_module_get here, as the listening socket (sock)
* has the protocol module (sock->ops->owner) held.
-@@ -1534,6 +1580,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
+@@ -1539,6 +1585,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
fd_install(newfd, newfile);
err = newfd;
out_put:
fput_light(sock->file, fput_needed);
out:
-@@ -1566,6 +1614,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct
+@@ -1571,6 +1619,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct
int, addrlen)
{
struct socket *sock;
struct sockaddr_storage address;
int err, fput_needed;
-@@ -1576,6 +1625,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct
+@@ -1581,6 +1630,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct
if (err < 0)
goto out_put;
err =
security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
if (err)
-diff -urNp linux-2.6.38.4/net/sunrpc/sched.c linux-2.6.38.4/net/sunrpc/sched.c
---- linux-2.6.38.4/net/sunrpc/sched.c 2011-04-18 17:27:14.000000000 -0400
-+++ linux-2.6.38.4/net/sunrpc/sched.c 2011-04-28 19:34:15.000000000 -0400
+@@ -1882,6 +1942,8 @@ SYSCALL_DEFINE3(sendmsg, int, fd, struct
+ int err, ctl_len, iov_size, total_len;
+ int fput_needed;
+
++ pax_track_stack();
++
+ err = -EFAULT;
+ if (MSG_CMSG_COMPAT & flags) {
+ if (get_compat_msghdr(&msg_sys, msg_compat))
+diff -urNp linux-2.6.39/net/sunrpc/sched.c linux-2.6.39/net/sunrpc/sched.c
+--- linux-2.6.39/net/sunrpc/sched.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/sunrpc/sched.c 2011-05-22 19:36:35.000000000 -0400
@@ -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)
}
#else
static inline void rpc_task_set_debuginfo(struct rpc_task *task)
-diff -urNp linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma.c
+--- linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma.c 2011-05-22 19:36:35.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;
.mode = 0644,
.proc_handler = read_reset_stat,
},
-diff -urNp linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
---- linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+--- linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-05-22 19:36:35.000000000 -0400
@@ -499,7 +499,7 @@ next_sge:
svc_rdma_put_context(ctxt, 0);
goto out;
/* Build up the XDR from the receive buffers. */
rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
-diff -urNp linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c
---- linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+--- linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-05-22 19:36:35.000000000 -0400
@@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdm
write_wr.wr.rdma.remote_addr = to;
if (svc_rdma_send(xprt, &write_wr))
goto err;
return 0;
-diff -urNp linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_transport.c
---- linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_transport.c
+--- linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-05-22 19:36:35.000000000 -0400
@@ -298,7 +298,7 @@ static void rq_cq_reap(struct svcxprt_rd
return;
/* See if we can opportunistically reap SQ WR to make room */
sq_cq_reap(xprt);
-diff -urNp linux-2.6.38.4/net/sysctl_net.c linux-2.6.38.4/net/sysctl_net.c
---- linux-2.6.38.4/net/sysctl_net.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/sysctl_net.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/sysctl_net.c linux-2.6.39/net/sysctl_net.c
+--- linux-2.6.39/net/sysctl_net.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/sysctl_net.c 2011-05-22 19:41:42.000000000 -0400
@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
struct ctl_table *table)
{
int mode = (table->mode >> 6) & 7;
return (mode << 6) | (mode << 3) | mode;
}
-diff -urNp linux-2.6.38.4/net/unix/af_unix.c linux-2.6.38.4/net/unix/af_unix.c
---- linux-2.6.38.4/net/unix/af_unix.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/unix/af_unix.c 2011-04-28 19:34:15.000000000 -0400
-@@ -765,6 +765,12 @@ static struct sock *unix_find_other(stru
+diff -urNp linux-2.6.39/net/unix/af_unix.c linux-2.6.39/net/unix/af_unix.c
+--- linux-2.6.39/net/unix/af_unix.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/unix/af_unix.c 2011-05-22 19:41:42.000000000 -0400
+@@ -767,6 +767,12 @@ static struct sock *unix_find_other(stru
err = -ECONNREFUSED;
if (!S_ISSOCK(inode->i_mode))
goto put_fail;
u = unix_find_socket_byinode(inode);
if (!u)
goto put_fail;
-@@ -785,6 +791,13 @@ static struct sock *unix_find_other(stru
+@@ -787,6 +793,13 @@ static struct sock *unix_find_other(stru
if (u) {
struct dentry *dentry;
dentry = unix_sk(u)->dentry;
if (dentry)
touch_atime(unix_sk(u)->mnt, dentry);
} else
-@@ -870,11 +883,18 @@ static int unix_bind(struct socket *sock
+@@ -872,11 +885,18 @@ static int unix_bind(struct socket *sock
err = security_path_mknod(&nd.path, dentry, mode, 0);
if (err)
goto out_mknod_drop_write;
mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
dput(nd.path.dentry);
nd.path.dentry = dentry;
-@@ -892,6 +912,11 @@ out_mknod_drop_write:
+@@ -894,6 +914,11 @@ out_mknod_drop_write:
goto out_unlock;
}
list = &unix_socket_table[addr->hash];
} else {
list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
-@@ -2235,7 +2260,11 @@ static int unix_seq_show(struct seq_file
+@@ -2255,7 +2280,11 @@ static int unix_seq_show(struct seq_file
unix_state_lock(s);
seq_printf(seq, "%p: %08X %08X %08X %04X %02X %5lu",
atomic_read(&s->sk_refcnt),
0,
s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
-diff -urNp linux-2.6.38.4/net/wireless/wext-core.c linux-2.6.38.4/net/wireless/wext-core.c
---- linux-2.6.38.4/net/wireless/wext-core.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/wireless/wext-core.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/wireless/wext-core.c linux-2.6.39/net/wireless/wext-core.c
+--- linux-2.6.39/net/wireless/wext-core.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/wireless/wext-core.c 2011-05-22 19:36:35.000000000 -0400
@@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struc
*/
err = handler(dev, info, (union iwreq_data *) iwp, extra);
iwp->length += essid_compat;
-diff -urNp linux-2.6.38.4/net/xfrm/xfrm_policy.c linux-2.6.38.4/net/xfrm/xfrm_policy.c
---- linux-2.6.38.4/net/xfrm/xfrm_policy.c 2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/net/xfrm/xfrm_policy.c 2011-04-28 19:57:25.000000000 -0400
-@@ -296,7 +296,7 @@ static void xfrm_policy_kill(struct xfrm
+diff -urNp linux-2.6.39/net/xfrm/xfrm_policy.c linux-2.6.39/net/xfrm/xfrm_policy.c
+--- linux-2.6.39/net/xfrm/xfrm_policy.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/xfrm/xfrm_policy.c 2011-05-22 19:36:35.000000000 -0400
+@@ -299,7 +299,7 @@ static void xfrm_policy_kill(struct xfrm
{
policy->walk.dead = 1;
if (del_timer(&policy->timer))
xfrm_pol_put(policy);
-@@ -575,7 +575,7 @@ int xfrm_policy_insert(int dir, struct x
+@@ -583,7 +583,7 @@ int xfrm_policy_insert(int dir, struct x
hlist_add_head(&policy->bydst, chain);
xfrm_pol_hold(policy);
net->xfrm.policy_count[dir]++;
if (delpol)
__xfrm_policy_unlink(delpol, dir);
policy->index = delpol ? delpol->index : xfrm_gen_index(net, dir);
-@@ -1507,7 +1507,7 @@ free_dst:
+@@ -1527,7 +1527,7 @@ free_dst:
goto out;
}
-static int inline
+static inline int
- xfrm_dst_alloc_copy(void **target, void *src, int size)
+ xfrm_dst_alloc_copy(void **target, const void *src, int size)
{
if (!*target) {
-@@ -1519,7 +1519,7 @@ xfrm_dst_alloc_copy(void **target, void
+@@ -1539,7 +1539,7 @@ xfrm_dst_alloc_copy(void **target, const
return 0;
}
-static int inline
+static inline int
- xfrm_dst_update_parent(struct dst_entry *dst, struct xfrm_selector *sel)
+ xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
{
#ifdef CONFIG_XFRM_SUB_POLICY
-@@ -1531,7 +1531,7 @@ xfrm_dst_update_parent(struct dst_entry
+@@ -1551,7 +1551,7 @@ xfrm_dst_update_parent(struct dst_entry
#endif
}
-static int inline
+static inline int
- xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
+ xfrm_dst_update_origin(struct dst_entry *dst, const struct flowi *fl)
{
#ifdef CONFIG_XFRM_SUB_POLICY
-@@ -1625,7 +1625,7 @@ xfrm_resolve_and_create_bundle(struct xf
+@@ -1645,7 +1645,7 @@ xfrm_resolve_and_create_bundle(struct xf
xdst->num_pols = num_pols;
memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols);
return xdst;
}
-@@ -2319,7 +2319,7 @@ static int xfrm_bundle_ok(struct xfrm_po
+@@ -2332,7 +2332,7 @@ static int xfrm_bundle_ok(struct xfrm_ds
if (xdst->xfrm_genid != dst->xfrm->genid)
return 0;
if (xdst->num_pols > 0 &&
+ xdst->policy_genid != atomic_read_unchecked(&xdst->pols[0]->genid))
return 0;
- if (strict && fl &&
-@@ -2852,7 +2852,7 @@ static int xfrm_policy_migrate(struct xf
+ mtu = dst_mtu(dst->child);
+@@ -2860,7 +2860,7 @@ static int xfrm_policy_migrate(struct xf
sizeof(pol->xfrm_vec[i].saddr));
pol->xfrm_vec[i].encap_family = mp->new_family;
/* flush bundles */
}
}
-diff -urNp linux-2.6.38.4/scripts/basic/fixdep.c linux-2.6.38.4/scripts/basic/fixdep.c
---- linux-2.6.38.4/scripts/basic/fixdep.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/scripts/basic/fixdep.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/net/xfrm/xfrm_user.c linux-2.6.39/net/xfrm/xfrm_user.c
+--- linux-2.6.39/net/xfrm/xfrm_user.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/net/xfrm/xfrm_user.c 2011-05-22 19:36:35.000000000 -0400
+@@ -1394,6 +1394,8 @@ static int copy_to_user_tmpl(struct xfrm
+ struct xfrm_user_tmpl vec[XFRM_MAX_DEPTH];
+ int i;
+
++ pax_track_stack();
++
+ if (xp->xfrm_nr == 0)
+ return 0;
+
+@@ -2062,6 +2064,8 @@ static int xfrm_do_migrate(struct sk_buf
+ int err;
+ int n = 0;
+
++ pax_track_stack();
++
+ if (attrs[XFRMA_MIGRATE] == NULL)
+ return -EINVAL;
+
+diff -urNp linux-2.6.39/scripts/basic/fixdep.c linux-2.6.39/scripts/basic/fixdep.c
+--- linux-2.6.39/scripts/basic/fixdep.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/scripts/basic/fixdep.c 2011-05-22 19:36:35.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)
if (*p != INT_CONF) {
fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
-diff -urNp linux-2.6.38.4/scripts/mod/file2alias.c linux-2.6.38.4/scripts/mod/file2alias.c
---- linux-2.6.38.4/scripts/mod/file2alias.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/scripts/mod/file2alias.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/scripts/dtc/flattree.c linux-2.6.39/scripts/dtc/flattree.c
+--- linux-2.6.39/scripts/dtc/flattree.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/scripts/mod/file2alias.c linux-2.6.39/scripts/mod/file2alias.c
+--- linux-2.6.39/scripts/mod/file2alias.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/scripts/mod/file2alias.c 2011-05-22 19:36:35.000000000 -0400
@@ -72,7 +72,7 @@ static void device_id_check(const char *
unsigned long size, unsigned long id_size,
void *symval)
sprintf(alias, "dmi*");
-diff -urNp linux-2.6.38.4/scripts/mod/modpost.c linux-2.6.38.4/scripts/mod/modpost.c
---- linux-2.6.38.4/scripts/mod/modpost.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/scripts/mod/modpost.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/scripts/mod/modpost.c linux-2.6.39/scripts/mod/modpost.c
+--- linux-2.6.39/scripts/mod/modpost.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/scripts/mod/modpost.c 2011-05-22 19:36:35.000000000 -0400
@@ -896,6 +896,7 @@ enum mismatch {
ANY_INIT_TO_ANY_EXIT,
ANY_EXIT_TO_ANY_INIT,
if (d < 0)
d = addr - sym->st_value;
if (d < distance) {
-@@ -1401,6 +1408,14 @@ static void report_sec_mismatch(const ch
+@@ -1408,6 +1415,14 @@ static void report_sec_mismatch(const ch
tosym, prl_to, prl_to, tosym);
free(prl_to);
break;
}
fprintf(stderr, "\n");
}
-@@ -1724,7 +1739,7 @@ void __attribute__((format(printf, 2, 3)
+@@ -1731,7 +1746,7 @@ void __attribute__((format(printf, 2, 3)
va_end(ap);
}
{
if (buf->size - buf->pos < len) {
buf->size += len + SZ;
-@@ -1936,7 +1951,7 @@ static void write_if_changed(struct buff
+@@ -1943,7 +1958,7 @@ static void write_if_changed(struct buff
if (fstat(fileno(file), &st) < 0)
goto close_write;
goto close_write;
tmp = NOFAIL(malloc(b->pos));
-diff -urNp linux-2.6.38.4/scripts/mod/modpost.h linux-2.6.38.4/scripts/mod/modpost.h
---- linux-2.6.38.4/scripts/mod/modpost.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/scripts/mod/modpost.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/scripts/mod/modpost.h linux-2.6.39/scripts/mod/modpost.h
+--- linux-2.6.39/scripts/mod/modpost.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/scripts/mod/modpost.h 2011-05-22 19:36:35.000000000 -0400
@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
struct buffer {
struct module {
struct module *next;
-diff -urNp linux-2.6.38.4/scripts/mod/sumversion.c linux-2.6.38.4/scripts/mod/sumversion.c
---- linux-2.6.38.4/scripts/mod/sumversion.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/scripts/mod/sumversion.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/scripts/mod/sumversion.c linux-2.6.39/scripts/mod/sumversion.c
+--- linux-2.6.39/scripts/mod/sumversion.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/scripts/mod/sumversion.c 2011-05-22 19:36:35.000000000 -0400
@@ -470,7 +470,7 @@ static void write_version(const char *fi
goto out;
}
warn("writing sum in %s failed: %s\n",
filename, strerror(errno));
goto out;
-diff -urNp linux-2.6.38.4/scripts/pnmtologo.c linux-2.6.38.4/scripts/pnmtologo.c
---- linux-2.6.38.4/scripts/pnmtologo.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/scripts/pnmtologo.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/scripts/pnmtologo.c linux-2.6.39/scripts/pnmtologo.c
+--- linux-2.6.39/scripts/pnmtologo.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/scripts/pnmtologo.c 2011-05-22 19:36:35.000000000 -0400
@@ -237,14 +237,14 @@ static void write_header(void)
fprintf(out, " * Linux logo %s\n", logoname);
fputs(" */\n\n", out);
logoname);
write_hex_cnt = 0;
for (i = 0; i < logo_clutsize; i++) {
-diff -urNp linux-2.6.38.4/security/apparmor/lsm.c linux-2.6.38.4/security/apparmor/lsm.c
---- linux-2.6.38.4/security/apparmor/lsm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/apparmor/lsm.c 2011-04-28 19:34:15.000000000 -0400
-@@ -619,7 +619,7 @@ static int apparmor_task_setrlimit(struc
+diff -urNp linux-2.6.39/security/apparmor/lsm.c linux-2.6.39/security/apparmor/lsm.c
+--- linux-2.6.39/security/apparmor/lsm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/security/apparmor/lsm.c 2011-05-22 19:41:42.000000000 -0400
+@@ -620,7 +620,7 @@ static int apparmor_task_setrlimit(struc
return error;
}
.name = "apparmor",
.ptrace_access_check = apparmor_ptrace_access_check,
-diff -urNp linux-2.6.38.4/security/commoncap.c linux-2.6.38.4/security/commoncap.c
---- linux-2.6.38.4/security/commoncap.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/commoncap.c 2011-04-28 19:34:15.000000000 -0400
-@@ -27,6 +27,7 @@
- #include <linux/sched.h>
+@@ -671,7 +671,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
+ };
+@@ -679,7 +679,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
+ };
+@@ -687,7 +687,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/security/commoncap.c linux-2.6.39/security/commoncap.c
+--- linux-2.6.39/security/commoncap.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/security/commoncap.c 2011-05-22 20:28:59.000000000 -0400
+@@ -28,6 +28,7 @@
#include <linux/prctl.h>
#include <linux/securebits.h>
+ #include <linux/user_namespace.h>
+#include <net/sock.h>
/*
* If a non-root user executes a setuid-root binary in
-@@ -50,9 +51,11 @@ static void warn_setuid_and_fcaps_mixed(
- }
- }
+@@ -58,7 +59,7 @@ int cap_netlink_send(struct sock *sk, st
-+extern kernel_cap_t gr_cap_rtnetlink(struct sock *sk);
-+
- int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
+ int cap_netlink_recv(struct sk_buff *skb, int cap)
{
-- NETLINK_CB(skb).eff_cap = current_cap();
-+ NETLINK_CB(skb).eff_cap = gr_cap_rtnetlink(sk);
+- if (!cap_raised(current_cap(), cap))
++ if (!cap_raised(current_cap(), cap) || !gr_is_capable(cap))
+ return -EPERM;
return 0;
}
-
-@@ -534,6 +537,9 @@ int cap_bprm_secureexec(struct linux_bin
+@@ -580,6 +581,9 @@ int cap_bprm_secureexec(struct linux_bin
{
const struct cred *cred = current_cred();
if (cred->uid != 0) {
if (bprm->cap_effective)
return 1;
-diff -urNp linux-2.6.38.4/security/integrity/ima/ima_api.c linux-2.6.38.4/security/integrity/ima/ima_api.c
---- linux-2.6.38.4/security/integrity/ima/ima_api.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/integrity/ima/ima_api.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/security/integrity/ima/ima_api.c linux-2.6.39/security/integrity/ima/ima_api.c
+--- linux-2.6.39/security/integrity/ima/ima_api.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/security/integrity/ima/ima_api.c 2011-05-22 19:36:35.000000000 -0400
@@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino
int result;
entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (!entry) {
-diff -urNp linux-2.6.38.4/security/integrity/ima/ima_fs.c linux-2.6.38.4/security/integrity/ima/ima_fs.c
---- linux-2.6.38.4/security/integrity/ima/ima_fs.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/integrity/ima/ima_fs.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/security/integrity/ima/ima_fs.c linux-2.6.39/security/integrity/ima/ima_fs.c
+--- linux-2.6.39/security/integrity/ima/ima_fs.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/security/integrity/ima/ima_fs.c 2011-05-22 19:36:35.000000000 -0400
@@ -28,12 +28,12 @@
static int valid_policy = 1;
#define TMPBUFLEN 12
return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
}
-diff -urNp linux-2.6.38.4/security/integrity/ima/ima.h linux-2.6.38.4/security/integrity/ima/ima.h
---- linux-2.6.38.4/security/integrity/ima/ima.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/integrity/ima/ima.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/security/integrity/ima/ima.h linux-2.6.39/security/integrity/ima/ima.h
+--- linux-2.6.39/security/integrity/ima/ima.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/security/integrity/ima/ima.h 2011-05-22 19:36:35.000000000 -0400
@@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino
extern spinlock_t ima_queue_lock;
struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
};
extern struct ima_h_table ima_htable;
-diff -urNp linux-2.6.38.4/security/integrity/ima/ima_queue.c linux-2.6.38.4/security/integrity/ima/ima_queue.c
---- linux-2.6.38.4/security/integrity/ima/ima_queue.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/integrity/ima/ima_queue.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/security/integrity/ima/ima_queue.c linux-2.6.39/security/integrity/ima/ima_queue.c
+--- linux-2.6.39/security/integrity/ima/ima_queue.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/security/integrity/ima/ima_queue.c 2011-05-22 19:36:35.000000000 -0400
@@ -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);
key = ima_hash_key(entry->digest);
hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
return 0;
-diff -urNp linux-2.6.38.4/security/Kconfig linux-2.6.38.4/security/Kconfig
---- linux-2.6.38.4/security/Kconfig 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/Kconfig 2011-04-30 11:45:44.000000000 -0400
-@@ -4,6 +4,545 @@
+diff -urNp linux-2.6.39/security/Kconfig linux-2.6.39/security/Kconfig
+--- linux-2.6.39/security/Kconfig 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/security/Kconfig 2011-05-22 19:41:42.000000000 -0400
+@@ -4,6 +4,548 @@
menu "Security options"
+ that is, enabling this option will make it harder to inject
+ and execute 'foreign' code in kernel memory itself.
+
++ Note that on x86_64 kernels there is a known regression when
++ this feature and KVM/VMX are both enabled in the host kernel.
++
+config PAX_KERNEXEC_MODULE_TEXT
+ int "Minimum amount of memory reserved for module code"
+ default "4"
config KEYS
bool "Enable access key retention support"
help
-@@ -167,7 +706,7 @@ config INTEL_TXT
+@@ -167,7 +709,7 @@ config INTEL_TXT
config LSM_MMAP_MIN_ADDR
int "Low address space for LSM to protect from user allocation"
depends on SECURITY && SECURITY_SELINUX
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.38.4/security/keys/keyring.c linux-2.6.38.4/security/keys/keyring.c
---- linux-2.6.38.4/security/keys/keyring.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/keys/keyring.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/security/keys/keyring.c linux-2.6.39/security/keys/keyring.c
+--- linux-2.6.39/security/keys/keyring.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/security/keys/keyring.c 2011-05-22 19:36:35.000000000 -0400
@@ -213,15 +213,15 @@ static long keyring_read(const struct ke
ret = -EFAULT;
goto error;
buflen -= tmp;
-diff -urNp linux-2.6.38.4/security/min_addr.c linux-2.6.38.4/security/min_addr.c
---- linux-2.6.38.4/security/min_addr.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/min_addr.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/security/min_addr.c linux-2.6.39/security/min_addr.c
+--- linux-2.6.39/security/min_addr.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/security/min_addr.c 2011-05-22 19:41:42.000000000 -0400
@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
*/
static void update_mmap_min_addr(void)
}
/*
-diff -urNp linux-2.6.38.4/security/security.c linux-2.6.38.4/security/security.c
---- linux-2.6.38.4/security/security.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/security.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/security/security.c linux-2.6.39/security/security.c
+--- linux-2.6.39/security/security.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/security/security.c 2011-05-22 19:41:42.000000000 -0400
@@ -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);
}
/* Save user chosen LSM */
-diff -urNp linux-2.6.38.4/security/selinux/hooks.c linux-2.6.38.4/security/selinux/hooks.c
---- linux-2.6.38.4/security/selinux/hooks.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/selinux/hooks.c 2011-04-28 19:34:15.000000000 -0400
-@@ -90,7 +90,6 @@
+diff -urNp linux-2.6.39/security/selinux/hooks.c linux-2.6.39/security/selinux/hooks.c
+--- linux-2.6.39/security/selinux/hooks.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/security/selinux/hooks.c 2011-05-22 19:41:42.000000000 -0400
+@@ -93,7 +93,6 @@
#define NUM_SEL_MNT_OPTS 5
extern int selinux_nlmsg_lookup(u16 sclass, u16 nlmsg_type, u32 *perm);
/* SECMARK reference count */
atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
-@@ -5395,7 +5394,7 @@ static int selinux_key_getsecurity(struc
+@@ -5431,7 +5430,7 @@ static int selinux_key_getsecurity(struc
#endif
.name = "selinux",
.ptrace_access_check = selinux_ptrace_access_check,
-diff -urNp linux-2.6.38.4/security/smack/smack_lsm.c linux-2.6.38.4/security/smack/smack_lsm.c
---- linux-2.6.38.4/security/smack/smack_lsm.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/smack/smack_lsm.c 2011-04-28 19:34:15.000000000 -0400
-@@ -3179,7 +3179,7 @@ static int smack_inode_getsecctx(struct
+diff -urNp linux-2.6.39/security/selinux/include/xfrm.h linux-2.6.39/security/selinux/include/xfrm.h
+--- linux-2.6.39/security/selinux/include/xfrm.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/security/selinux/include/xfrm.h 2011-05-22 19:36:35.000000000 -0400
+@@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct s
+
+ static inline void selinux_xfrm_notify_policyload(void)
+ {
+- atomic_inc(&flow_cache_genid);
++ atomic_inc_unchecked(&flow_cache_genid);
+ }
+ #else
+ static inline int selinux_xfrm_enabled(void)
+diff -urNp linux-2.6.39/security/selinux/ss/services.c linux-2.6.39/security/selinux/ss/services.c
+--- linux-2.6.39/security/selinux/ss/services.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/security/selinux/ss/services.c 2011-05-22 19:36:35.000000000 -0400
+@@ -1806,6 +1806,8 @@ int security_load_policy(void *data, siz
+ int rc = 0;
+ struct policy_file file = { data, len }, *fp = &file;
+
++ pax_track_stack();
++
+ if (!ss_initialized) {
+ avtab_cache_init();
+ rc = policydb_read(&policydb, fp);
+diff -urNp linux-2.6.39/security/smack/smack_lsm.c linux-2.6.39/security/smack/smack_lsm.c
+--- linux-2.6.39/security/smack/smack_lsm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/security/smack/smack_lsm.c 2011-05-22 19:36:35.000000000 -0400
+@@ -3386,7 +3386,7 @@ static int smack_inode_getsecctx(struct
return 0;
}
.name = "smack",
.ptrace_access_check = smack_ptrace_access_check,
-diff -urNp linux-2.6.38.4/security/tomoyo/tomoyo.c linux-2.6.38.4/security/tomoyo/tomoyo.c
---- linux-2.6.38.4/security/tomoyo/tomoyo.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/tomoyo/tomoyo.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/security/tomoyo/tomoyo.c linux-2.6.39/security/tomoyo/tomoyo.c
+--- linux-2.6.39/security/tomoyo/tomoyo.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/security/tomoyo/tomoyo.c 2011-05-22 19:36:35.000000000 -0400
@@ -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.
.name = "tomoyo",
.cred_alloc_blank = tomoyo_cred_alloc_blank,
.cred_prepare = tomoyo_cred_prepare,
-diff -urNp linux-2.6.38.4/sound/aoa/codecs/onyx.c linux-2.6.38.4/sound/aoa/codecs/onyx.c
---- linux-2.6.38.4/sound/aoa/codecs/onyx.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/sound/aoa/codecs/onyx.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/sound/aoa/aoa.h linux-2.6.39/sound/aoa/aoa.h
+--- linux-2.6.39/sound/aoa/aoa.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/aoa/aoa.h 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/aoa/codecs/onyx.c linux-2.6.39/sound/aoa/codecs/onyx.c
+--- linux-2.6.39/sound/aoa/codecs/onyx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/aoa/codecs/onyx.c 2011-05-22 19:36:35.000000000 -0400
@@ -54,7 +54,7 @@ struct onyx {
spdif_locked:1,
analog_locked:1,
onyx->spdif_locked = onyx->analog_locked = 0;
mutex_unlock(&onyx->mutex);
-diff -urNp linux-2.6.38.4/sound/aoa/codecs/onyx.h linux-2.6.38.4/sound/aoa/codecs/onyx.h
---- linux-2.6.38.4/sound/aoa/codecs/onyx.h 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/sound/aoa/codecs/onyx.h 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/sound/aoa/codecs/onyx.h linux-2.6.39/sound/aoa/codecs/onyx.h
+--- linux-2.6.39/sound/aoa/codecs/onyx.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/aoa/codecs/onyx.h 2011-05-22 19:36:35.000000000 -0400
@@ -11,6 +11,7 @@
#include <linux/i2c.h>
#include <asm/pmac_low_i2c.h>
/* PCM3052 register definitions */
-diff -urNp linux-2.6.38.4/sound/drivers/mts64.c linux-2.6.38.4/sound/drivers/mts64.c
---- linux-2.6.38.4/sound/drivers/mts64.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/sound/drivers/mts64.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/sound/arm/aaci.c linux-2.6.39/sound/arm/aaci.c
+--- linux-2.6.39/sound/arm/aaci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/arm/aaci.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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
+ }
+ };
+
+-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/sound/arm/pxa2xx-ac97.c linux-2.6.39/sound/arm/pxa2xx-ac97.c
+--- linux-2.6.39/sound/arm/pxa2xx-ac97.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/arm/pxa2xx-ac97.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/atmel/abdac.c linux-2.6.39/sound/atmel/abdac.c
+--- linux-2.6.39/sound/atmel/abdac.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/atmel/abdac.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/atmel/ac97c.c linux-2.6.39/sound/atmel/ac97c.c
+--- linux-2.6.39/sound/atmel/ac97c.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/atmel/ac97c.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/core/control.c linux-2.6.39/sound/core/control.c
+--- linux-2.6.39/sound/core/control.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/core/device.c linux-2.6.39/sound/core/device.c
+--- linux-2.6.39/sound/core/device.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/core/device.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/core/hwdep.c linux-2.6.39/sound/core/hwdep.c
+--- linux-2.6.39/sound/core/hwdep.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/core/hwdep.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/core/info.c linux-2.6.39/sound/core/info.c
+--- linux-2.6.39/sound/core/info.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/core/info.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/core/jack.c linux-2.6.39/sound/core/jack.c
+--- linux-2.6.39/sound/core/jack.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/core/jack.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/core/pcm.c linux-2.6.39/sound/core/pcm.c
+--- linux-2.6.39/sound/core/pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/core/pcm.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/core/pcm_lib.c linux-2.6.39/sound/core/pcm_lib.c
+--- linux-2.6.39/sound/core/pcm_lib.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/core/pcm_native.c linux-2.6.39/sound/core/pcm_native.c
+--- linux-2.6.39/sound/core/pcm_native.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/core/pcm_native.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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
+ }
+ }
+
+-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/sound/core/rawmidi.c linux-2.6.39/sound/core/rawmidi.c
+--- linux-2.6.39/sound/core/rawmidi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/core/seq/seq_device.c linux-2.6.39/sound/core/seq/seq_device.c
+--- linux-2.6.39/sound/core/seq/seq_device.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/core/seq/seq_midi.c linux-2.6.39/sound/core/seq/seq_midi.c
+--- linux-2.6.39/sound/core/seq/seq_midi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/core/seq/seq_midi.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/core/seq/seq_virmidi.c linux-2.6.39/sound/core/seq/seq_virmidi.c
+--- linux-2.6.39/sound/core/seq/seq_virmidi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/core/timer.c linux-2.6.39/sound/core/timer.c
+--- linux-2.6.39/sound/core/timer.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/core/timer.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/drivers/aloop.c linux-2.6.39/sound/drivers/aloop.c
+--- linux-2.6.39/sound/drivers/aloop.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/drivers/dummy.c linux-2.6.39/sound/drivers/dummy.c
+--- linux-2.6.39/sound/drivers/dummy.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/drivers/ml403-ac97cr.c linux-2.6.39/sound/drivers/ml403-ac97cr.c
+--- linux-2.6.39/sound/drivers/ml403-ac97cr.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/drivers/mtpav.c linux-2.6.39/sound/drivers/mtpav.c
+--- linux-2.6.39/sound/drivers/mtpav.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/drivers/mts64.c linux-2.6.39/sound/drivers/mts64.c
+--- linux-2.6.39/sound/drivers/mts64.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/drivers/mts64.c 2011-05-22 19:36:35.000000000 -0400
@@ -28,6 +28,7 @@
#include <sound/initval.h>
#include <sound/rawmidi.h>
return 0;
}
-diff -urNp linux-2.6.38.4/sound/drivers/portman2x4.c linux-2.6.38.4/sound/drivers/portman2x4.c
---- linux-2.6.38.4/sound/drivers/portman2x4.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/sound/drivers/portman2x4.c 2011-04-28 19:34:15.000000000 -0400
+@@ -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/sound/drivers/pcsp/pcsp.c linux-2.6.39/sound/drivers/pcsp/pcsp.c
+--- linux-2.6.39/sound/drivers/pcsp/pcsp.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/drivers/pcsp/pcsp.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/drivers/pcsp/pcsp_lib.c linux-2.6.39/sound/drivers/pcsp/pcsp_lib.c
+--- linux-2.6.39/sound/drivers/pcsp/pcsp_lib.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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;
+ }
+
+-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/sound/drivers/portman2x4.c linux-2.6.39/sound/drivers/portman2x4.c
+--- linux-2.6.39/sound/drivers/portman2x4.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/drivers/portman2x4.c 2011-05-22 19:36:35.000000000 -0400
@@ -47,6 +47,7 @@
#include <sound/initval.h>
#include <sound/rawmidi.h>
int mode[PORTMAN_NUM_INPUT_PORTS];
struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
};
-diff -urNp linux-2.6.38.4/sound/oss/sb_audio.c linux-2.6.38.4/sound/oss/sb_audio.c
---- linux-2.6.38.4/sound/oss/sb_audio.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/sound/oss/sb_audio.c 2011-04-28 19:34:15.000000000 -0400
+@@ -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/sound/drivers/serial-u16550.c linux-2.6.39/sound/drivers/serial-u16550.c
+--- linux-2.6.39/sound/drivers/serial-u16550.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/drivers/vx/vx_pcm.c linux-2.6.39/sound/drivers/vx/vx_pcm.c
+--- linux-2.6.39/sound/drivers/vx/vx_pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/drivers/vx/vx_pcm.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/firewire/amdtp.c linux-2.6.39/sound/firewire/amdtp.c
+--- linux-2.6.39/sound/firewire/amdtp.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/firewire/amdtp.c 2011-05-22 19:36:35.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)
+ ptr -= pcm->runtime->buffer_size;
+- ACCESS_ONCE(s->pcm_buffer_pointer) = ptr;
++ ACCESS_ONCE_RW(s->pcm_buffer_pointer) = ptr;
+
+ s->pcm_period_pointer += data_blocks;
+ if (s->pcm_period_pointer >= pcm->runtime->period_size) {
+@@ -510,7 +510,7 @@ EXPORT_SYMBOL(amdtp_out_stream_start);
+ */
+ void amdtp_out_stream_update(struct amdtp_out_stream *s)
+ {
+- ACCESS_ONCE(s->source_node_id_field) =
++ ACCESS_ONCE_RW(s->source_node_id_field) =
+ (fw_parent_device(s->unit)->card->node_id & 0x3f) << 24;
+ }
+ EXPORT_SYMBOL(amdtp_out_stream_update);
+diff -urNp linux-2.6.39/sound/firewire/amdtp.h linux-2.6.39/sound/firewire/amdtp.h
+--- linux-2.6.39/sound/firewire/amdtp.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/firewire/amdtp.h 2011-05-22 19:36:35.000000000 -0400
+@@ -146,7 +146,7 @@ static inline void amdtp_out_stream_pcm_
+ static inline void amdtp_out_stream_pcm_trigger(struct amdtp_out_stream *s,
+ struct snd_pcm_substream *pcm)
+ {
+- ACCESS_ONCE(s->pcm) = pcm;
++ ACCESS_ONCE_RW(s->pcm) = pcm;
+ }
+
+ /**
+diff -urNp linux-2.6.39/sound/i2c/i2c.c linux-2.6.39/sound/i2c/i2c.c
+--- linux-2.6.39/sound/i2c/i2c.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/i2c/i2c.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/i2c/other/ak4113.c linux-2.6.39/sound/i2c/other/ak4113.c
+--- linux-2.6.39/sound/i2c/other/ak4113.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/i2c/other/ak4113.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/i2c/other/ak4114.c linux-2.6.39/sound/i2c/other/ak4114.c
+--- linux-2.6.39/sound/i2c/other/ak4114.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/i2c/other/ak4114.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/i2c/other/ak4117.c linux-2.6.39/sound/i2c/other/ak4117.c
+--- linux-2.6.39/sound/i2c/other/ak4117.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/i2c/other/ak4117.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/isa/ad1816a/ad1816a_lib.c linux-2.6.39/sound/isa/ad1816a/ad1816a_lib.c
+--- linux-2.6.39/sound/isa/ad1816a/ad1816a_lib.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/isa/es1688/es1688_lib.c linux-2.6.39/sound/isa/es1688/es1688_lib.c
+--- linux-2.6.39/sound/isa/es1688/es1688_lib.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/isa/es18xx.c linux-2.6.39/sound/isa/es18xx.c
+--- linux-2.6.39/sound/isa/es18xx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/isa/es18xx.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/isa/gus/gus_main.c linux-2.6.39/sound/isa/gus/gus_main.c
+--- linux-2.6.39/sound/isa/gus/gus_main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/isa/gus/gus_main.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/isa/msnd/msnd.c linux-2.6.39/sound/isa/msnd/msnd.c
+--- linux-2.6.39/sound/isa/msnd/msnd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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
+ }
+
+
+-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/sound/isa/msnd/msnd_midi.c linux-2.6.39/sound/isa/msnd/msnd_midi.c
+--- linux-2.6.39/sound/isa/msnd/msnd_midi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/isa/msnd/msnd_pinnacle.c linux-2.6.39/sound/isa/msnd/msnd_pinnacle.c
+--- linux-2.6.39/sound/isa/msnd/msnd_pinnacle.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/isa/sb/emu8000.c linux-2.6.39/sound/isa/sb/emu8000.c
+--- linux-2.6.39/sound/isa/sb/emu8000.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/isa/sb/emu8000_pcm.c linux-2.6.39/sound/isa/sb/emu8000_pcm.c
+--- linux-2.6.39/sound/isa/sb/emu8000_pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/isa/sb/sb_common.c linux-2.6.39/sound/isa/sb/sb_common.c
+--- linux-2.6.39/sound/isa/sb/sb_common.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/isa/sb/sb_common.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/isa/wavefront/wavefront_midi.c linux-2.6.39/sound/isa/wavefront/wavefront_midi.c
+--- linux-2.6.39/sound/isa/wavefront/wavefront_midi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/isa/wss/wss_lib.c linux-2.6.39/sound/isa/wss/wss_lib.c
+--- linux-2.6.39/sound/isa/wss/wss_lib.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/isa/wss/wss_lib.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/mips/au1x00.c linux-2.6.39/sound/mips/au1x00.c
+--- linux-2.6.39/sound/mips/au1x00.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/mips/au1x00.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/mips/hal2.c linux-2.6.39/sound/mips/hal2.c
+--- linux-2.6.39/sound/mips/hal2.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/mips/hal2.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/mips/sgio2audio.c linux-2.6.39/sound/mips/sgio2audio.c
+--- linux-2.6.39/sound/mips/sgio2audio.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/mips/sgio2audio.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/oss/ac97_codec.c linux-2.6.39/sound/oss/ac97_codec.c
+--- linux-2.6.39/sound/oss/ac97_codec.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/oss/sb_audio.c linux-2.6.39/sound/oss/sb_audio.c
+--- linux-2.6.39/sound/oss/sb_audio.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/oss/sb_audio.c 2011-05-22 19:36:35.000000000 -0400
@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
buf16 = (signed short *)(localbuf + localoffs);
while (c)
if (copy_from_user(lbuf8,
userbuf+useroffs + p,
locallen))
-diff -urNp linux-2.6.38.4/sound/oss/swarm_cs4297a.c linux-2.6.38.4/sound/oss/swarm_cs4297a.c
---- linux-2.6.38.4/sound/oss/swarm_cs4297a.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/sound/oss/swarm_cs4297a.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/sound/oss/swarm_cs4297a.c linux-2.6.39/sound/oss/swarm_cs4297a.c
+--- linux-2.6.39/sound/oss/swarm_cs4297a.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/oss/swarm_cs4297a.c 2011-05-22 19:36:35.000000000 -0400
@@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void)
{
struct cs4297a_state *s;
list_add(&s->list, &cs4297a_devs);
-diff -urNp linux-2.6.38.4/sound/pci/intel8x0m.c linux-2.6.38.4/sound/pci/intel8x0m.c
---- linux-2.6.38.4/sound/pci/intel8x0m.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/sound/pci/intel8x0m.c 2011-04-28 19:34:15.000000000 -0400
-@@ -1264,7 +1264,7 @@ static struct shortname_table {
+diff -urNp linux-2.6.39/sound/parisc/harmony.c linux-2.6.39/sound/parisc/harmony.c
+--- linux-2.6.39/sound/parisc/harmony.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/ac97/ac97_codec.c linux-2.6.39/sound/pci/ac97/ac97_codec.c
+--- linux-2.6.39/sound/pci/ac97/ac97_codec.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/ad1889.c linux-2.6.39/sound/pci/ad1889.c
+--- linux-2.6.39/sound/pci/ad1889.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/ad1889.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/ak4531_codec.c linux-2.6.39/sound/pci/ak4531_codec.c
+--- linux-2.6.39/sound/pci/ak4531_codec.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/ak4531_codec.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/ali5451/ali5451.c linux-2.6.39/sound/pci/ali5451/ali5451.c
+--- linux-2.6.39/sound/pci/ali5451/ali5451.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/als300.c linux-2.6.39/sound/pci/als300.c
+--- linux-2.6.39/sound/pci/als300.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/als300.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/als4000.c linux-2.6.39/sound/pci/als4000.c
+--- linux-2.6.39/sound/pci/als4000.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/als4000.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/asihpi/asihpi.c linux-2.6.39/sound/pci/asihpi/asihpi.c
+--- linux-2.6.39/sound/pci/asihpi/asihpi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/asihpi/asihpi.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/atiixp.c linux-2.6.39/sound/pci/atiixp.c
+--- linux-2.6.39/sound/pci/atiixp.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/atiixp.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/atiixp_modem.c linux-2.6.39/sound/pci/atiixp_modem.c
+--- linux-2.6.39/sound/pci/atiixp_modem.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/atiixp_modem.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/au88x0/au88x0_pcm.c linux-2.6.39/sound/pci/au88x0/au88x0_pcm.c
+--- linux-2.6.39/sound/pci/au88x0/au88x0_pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/aw2/aw2-alsa.c linux-2.6.39/sound/pci/aw2/aw2-alsa.c
+--- linux-2.6.39/sound/pci/aw2/aw2-alsa.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/aw2/aw2-alsa.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/azt3328.c linux-2.6.39/sound/pci/azt3328.c
+--- linux-2.6.39/sound/pci/azt3328.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/azt3328.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/bt87x.c linux-2.6.39/sound/pci/bt87x.c
+--- linux-2.6.39/sound/pci/bt87x.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/bt87x.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/ca0106/ca0106_main.c linux-2.6.39/sound/pci/ca0106/ca0106_main.c
+--- linux-2.6.39/sound/pci/ca0106/ca0106_main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/ca0106/ca_midi.c linux-2.6.39/sound/pci/ca0106/ca_midi.c
+--- linux-2.6.39/sound/pci/ca0106/ca_midi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/cmipci.c linux-2.6.39/sound/pci/cmipci.c
+--- linux-2.6.39/sound/pci/cmipci.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/cmipci.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/cs4281.c linux-2.6.39/sound/pci/cs4281.c
+--- linux-2.6.39/sound/pci/cs4281.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/cs4281.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/cs46xx/cs46xx_lib.c linux-2.6.39/sound/pci/cs46xx/cs46xx_lib.c
+--- linux-2.6.39/sound/pci/cs46xx/cs46xx_lib.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/cs5530.c linux-2.6.39/sound/pci/cs5530.c
+--- linux-2.6.39/sound/pci/cs5530.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/cs5530.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/cs5535audio/cs5535audio.c linux-2.6.39/sound/pci/cs5535audio/cs5535audio.c
+--- linux-2.6.39/sound/pci/cs5535audio/cs5535audio.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/cs5535audio/cs5535audio.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/cs5535audio/cs5535audio_pcm.c linux-2.6.39/sound/pci/cs5535audio/cs5535audio_pcm.c
+--- linux-2.6.39/sound/pci/cs5535audio/cs5535audio_pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/ctxfi/ctpcm.c linux-2.6.39/sound/pci/ctxfi/ctpcm.c
+--- linux-2.6.39/sound/pci/ctxfi/ctpcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/ctxfi/ctpcm.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/echoaudio/echoaudio.c linux-2.6.39/sound/pci/echoaudio/echoaudio.c
+--- linux-2.6.39/sound/pci/echoaudio/echoaudio.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/echoaudio/midi.c linux-2.6.39/sound/pci/echoaudio/midi.c
+--- linux-2.6.39/sound/pci/echoaudio/midi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/emu10k1/emu10k1_main.c linux-2.6.39/sound/pci/emu10k1/emu10k1_main.c
+--- linux-2.6.39/sound/pci/emu10k1/emu10k1_main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/emu10k1/emu10k1x.c linux-2.6.39/sound/pci/emu10k1/emu10k1x.c
+--- linux-2.6.39/sound/pci/emu10k1/emu10k1x.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/emu10k1/p16v.c linux-2.6.39/sound/pci/emu10k1/p16v.c
+--- linux-2.6.39/sound/pci/emu10k1/p16v.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/emu10k1/p16v.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/ens1370.c linux-2.6.39/sound/pci/ens1370.c
+--- linux-2.6.39/sound/pci/ens1370.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/ens1370.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/es1938.c linux-2.6.39/sound/pci/es1938.c
+--- linux-2.6.39/sound/pci/es1938.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/es1938.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/es1968.c linux-2.6.39/sound/pci/es1968.c
+--- linux-2.6.39/sound/pci/es1968.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/es1968.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/fm801.c linux-2.6.39/sound/pci/fm801.c
+--- linux-2.6.39/sound/pci/fm801.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/fm801.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/hda/hda_generic.c linux-2.6.39/sound/pci/hda/hda_generic.c
+--- linux-2.6.39/sound/pci/hda/hda_generic.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/hda/hda_intel.c linux-2.6.39/sound/pci/hda/hda_intel.c
+--- linux-2.6.39/sound/pci/hda/hda_intel.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/hda/hda_intel.c 2011-05-22 19:36:35.000000000 -0400
+@@ -2452,7 +2452,7 @@ static int __devinit azx_create(struct s
+ 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/sound/pci/hda/patch_ca0110.c linux-2.6.39/sound/pci/hda/patch_ca0110.c
+--- linux-2.6.39/sound/pci/hda/patch_ca0110.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/hda/patch_cirrus.c linux-2.6.39/sound/pci/hda/patch_cirrus.c
+--- linux-2.6.39/sound/pci/hda/patch_cirrus.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/hda/patch_cmedia.c linux-2.6.39/sound/pci/hda/patch_cmedia.c
+--- linux-2.6.39/sound/pci/hda/patch_cmedia.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/hda/patch_conexant.c linux-2.6.39/sound/pci/hda/patch_conexant.c
+--- linux-2.6.39/sound/pci/hda/patch_conexant.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/hda/patch_conexant.c 2011-05-22 19:36:35.000000000 -0400
+@@ -546,7 +546,7 @@ static int conexant_suspend(struct hda_c
+ }
+ #endif
+
+-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,
+@@ -3791,7 +3791,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/sound/pci/hda/patch_hdmi.c linux-2.6.39/sound/pci/hda/patch_hdmi.c
+--- linux-2.6.39/sound/pci/hda/patch_hdmi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/hda/patch_realtek.c linux-2.6.39/sound/pci/hda/patch_realtek.c
+--- linux-2.6.39/sound/pci/hda/patch_realtek.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/hda/patch_realtek.c 2011-05-22 19:36:35.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/sound/pci/hda/patch_si3054.c linux-2.6.39/sound/pci/hda/patch_si3054.c
+--- linux-2.6.39/sound/pci/hda/patch_si3054.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/hda/patch_sigmatel.c linux-2.6.39/sound/pci/hda/patch_sigmatel.c
+--- linux-2.6.39/sound/pci/hda/patch_sigmatel.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/hda/patch_sigmatel.c 2011-05-22 19:36:35.000000000 -0400
+@@ -4968,7 +4968,7 @@ static int stac92xx_suspend(struct hda_c
+ }
+ #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/sound/pci/hda/patch_via.c linux-2.6.39/sound/pci/hda/patch_via.c
+--- linux-2.6.39/sound/pci/hda/patch_via.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/hda/patch_via.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/ice1712/ice1712.c linux-2.6.39/sound/pci/ice1712/ice1712.c
+--- linux-2.6.39/sound/pci/ice1712/ice1712.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/ice1712/ice1724.c linux-2.6.39/sound/pci/ice1712/ice1724.c
+--- linux-2.6.39/sound/pci/ice1712/ice1724.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/intel8x0.c linux-2.6.39/sound/pci/intel8x0.c
+--- linux-2.6.39/sound/pci/intel8x0.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/intel8x0m.c linux-2.6.39/sound/pci/intel8x0m.c
+--- linux-2.6.39/sound/pci/intel8x0m.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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] = {
+@@ -1265,7 +1265,7 @@ static struct shortname_table {
{ 0x5455, "ALi M5455" },
{ 0x746d, "AMD AMD8111" },
#endif
};
static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
-diff -urNp linux-2.6.38.4/sound/pci/ymfpci/ymfpci_main.c linux-2.6.38.4/sound/pci/ymfpci/ymfpci_main.c
---- linux-2.6.38.4/sound/pci/ymfpci/ymfpci_main.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/sound/pci/ymfpci/ymfpci_main.c 2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.39/sound/pci/korg1212/korg1212.c linux-2.6.39/sound/pci/korg1212/korg1212.c
+--- linux-2.6.39/sound/pci/korg1212/korg1212.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/maestro3.c linux-2.6.39/sound/pci/maestro3.c
+--- linux-2.6.39/sound/pci/maestro3.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/mixart/mixart.c linux-2.6.39/sound/pci/mixart/mixart.c
+--- linux-2.6.39/sound/pci/mixart/mixart.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/mixart/mixart.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/nm256/nm256.c linux-2.6.39/sound/pci/nm256/nm256.c
+--- linux-2.6.39/sound/pci/nm256/nm256.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/nm256/nm256.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/oxygen/oxygen_pcm.c linux-2.6.39/sound/pci/oxygen/oxygen_pcm.c
+--- linux-2.6.39/sound/pci/oxygen/oxygen_pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/pcxhr/pcxhr.c linux-2.6.39/sound/pci/pcxhr/pcxhr.c
+--- linux-2.6.39/sound/pci/pcxhr/pcxhr.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/pcxhr/pcxhr.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/riptide/riptide.c linux-2.6.39/sound/pci/riptide/riptide.c
+--- linux-2.6.39/sound/pci/riptide/riptide.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/rme32.c linux-2.6.39/sound/pci/rme32.c
+--- linux-2.6.39/sound/pci/rme32.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/rme32.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/rme9652/hdsp.c linux-2.6.39/sound/pci/rme9652/hdsp.c
+--- linux-2.6.39/sound/pci/rme9652/hdsp.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/rme9652/hdsp.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/rme9652/hdspm.c linux-2.6.39/sound/pci/rme9652/hdspm.c
+--- linux-2.6.39/sound/pci/rme9652/hdspm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/rme9652/hdspm.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/rme9652/rme9652.c linux-2.6.39/sound/pci/rme9652/rme9652.c
+--- linux-2.6.39/sound/pci/rme9652/rme9652.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/rme96.c linux-2.6.39/sound/pci/rme96.c
+--- linux-2.6.39/sound/pci/rme96.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/rme96.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/sis7019.c linux-2.6.39/sound/pci/sis7019.c
+--- linux-2.6.39/sound/pci/sis7019.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/sis7019.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/sonicvibes.c linux-2.6.39/sound/pci/sonicvibes.c
+--- linux-2.6.39/sound/pci/sonicvibes.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/trident/trident_main.c linux-2.6.39/sound/pci/trident/trident_main.c
+--- linux-2.6.39/sound/pci/trident/trident_main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/pci/via82xx.c linux-2.6.39/sound/pci/via82xx.c
+--- linux-2.6.39/sound/pci/via82xx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/via82xx.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/via82xx_modem.c linux-2.6.39/sound/pci/via82xx_modem.c
+--- linux-2.6.39/sound/pci/via82xx_modem.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/via82xx_modem.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/vx222/vx222.c linux-2.6.39/sound/pci/vx222/vx222.c
+--- linux-2.6.39/sound/pci/vx222/vx222.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/vx222/vx222.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pci/ymfpci/ymfpci_main.c linux-2.6.39/sound/pci/ymfpci/ymfpci_main.c
+--- linux-2.6.39/sound/pci/ymfpci/ymfpci_main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pci/ymfpci/ymfpci_main.c 2011-05-22 19:36:35.000000000 -0400
@@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct sn
if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
break;
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);
chip->card = card;
chip->pci = pci;
chip->irq = -1;
-diff -urNp linux-2.6.38.4/usr/gen_init_cpio.c linux-2.6.38.4/usr/gen_init_cpio.c
---- linux-2.6.38.4/usr/gen_init_cpio.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/usr/gen_init_cpio.c 2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.39/sound/pcmcia/pdaudiocf/pdaudiocf.c linux-2.6.39/sound/pcmcia/pdaudiocf/pdaudiocf.c
+--- linux-2.6.39/sound/pcmcia/pdaudiocf/pdaudiocf.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/pcmcia/pdaudiocf/pdaudiocf.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/pcmcia/vx/vxpocket.c linux-2.6.39/sound/pcmcia/vx/vxpocket.c
+--- linux-2.6.39/sound/pcmcia/vx/vxpocket.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/ppc/pmac.c linux-2.6.39/sound/ppc/pmac.c
+--- linux-2.6.39/sound/ppc/pmac.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/ppc/pmac.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/ppc/snd_ps3.c linux-2.6.39/sound/ppc/snd_ps3.c
+--- linux-2.6.39/sound/ppc/snd_ps3.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/ppc/snd_ps3.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/sh/aica.c linux-2.6.39/sound/sh/aica.c
+--- linux-2.6.39/sound/sh/aica.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/sh/aica.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/sh/sh_dac_audio.c linux-2.6.39/sound/sh/sh_dac_audio.c
+--- linux-2.6.39/sound/sh/sh_dac_audio.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/sh/sh_dac_audio.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/atmel/atmel-pcm.c linux-2.6.39/sound/soc/atmel/atmel-pcm.c
+--- linux-2.6.39/sound/soc/atmel/atmel-pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/atmel/playpaq_wm8510.c linux-2.6.39/sound/soc/atmel/playpaq_wm8510.c
+--- linux-2.6.39/sound/soc/atmel/playpaq_wm8510.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/atmel/sam9g20_wm8731.c linux-2.6.39/sound/soc/atmel/sam9g20_wm8731.c
+--- linux-2.6.39/sound/soc/atmel/sam9g20_wm8731.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/atmel/snd-soc-afeb9260.c linux-2.6.39/sound/soc/atmel/snd-soc-afeb9260.c
+--- linux-2.6.39/sound/soc/atmel/snd-soc-afeb9260.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/atmel/snd-soc-afeb9260.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/au1x/db1200.c linux-2.6.39/sound/soc/au1x/db1200.c
+--- linux-2.6.39/sound/soc/au1x/db1200.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/au1x/db1200.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/au1x/dbdma2.c linux-2.6.39/sound/soc/au1x/dbdma2.c
+--- linux-2.6.39/sound/soc/au1x/dbdma2.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/au1x/dbdma2.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/blackfin/bf5xx-ac97.c linux-2.6.39/sound/soc/blackfin/bf5xx-ac97.c
+--- linux-2.6.39/sound/soc/blackfin/bf5xx-ac97.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/blackfin/bf5xx-ac97.h linux-2.6.39/sound/soc/blackfin/bf5xx-ac97.h
+--- linux-2.6.39/sound/soc/blackfin/bf5xx-ac97.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/blackfin/bf5xx-ac97-pcm.c linux-2.6.39/sound/soc/blackfin/bf5xx-ac97-pcm.c
+--- linux-2.6.39/sound/soc/blackfin/bf5xx-ac97-pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/blackfin/bf5xx-ac97-pcm.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/blackfin/bf5xx-ad1836.c linux-2.6.39/sound/soc/blackfin/bf5xx-ad1836.c
+--- linux-2.6.39/sound/soc/blackfin/bf5xx-ad1836.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/blackfin/bf5xx-ad193x.c linux-2.6.39/sound/soc/blackfin/bf5xx-ad193x.c
+--- linux-2.6.39/sound/soc/blackfin/bf5xx-ad193x.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/blackfin/bf5xx-ad1980.c linux-2.6.39/sound/soc/blackfin/bf5xx-ad1980.c
+--- linux-2.6.39/sound/soc/blackfin/bf5xx-ad1980.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/blackfin/bf5xx-ad73311.c linux-2.6.39/sound/soc/blackfin/bf5xx-ad73311.c
+--- linux-2.6.39/sound/soc/blackfin/bf5xx-ad73311.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/blackfin/bf5xx-ad73311.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/blackfin/bf5xx-i2s-pcm.c linux-2.6.39/sound/soc/blackfin/bf5xx-i2s-pcm.c
+--- linux-2.6.39/sound/soc/blackfin/bf5xx-i2s-pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/blackfin/bf5xx-i2s-pcm.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/blackfin/bf5xx-ssm2602.c linux-2.6.39/sound/soc/blackfin/bf5xx-ssm2602.c
+--- linux-2.6.39/sound/soc/blackfin/bf5xx-ssm2602.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/blackfin/bf5xx-ssm2602.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/blackfin/bf5xx-tdm-pcm.c linux-2.6.39/sound/soc/blackfin/bf5xx-tdm-pcm.c
+--- linux-2.6.39/sound/soc/blackfin/bf5xx-tdm-pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/blackfin/bf5xx-tdm-pcm.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/davinci/davinci-evm.c linux-2.6.39/sound/soc/davinci/davinci-evm.c
+--- linux-2.6.39/sound/soc/davinci/davinci-evm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/davinci/davinci-pcm.c linux-2.6.39/sound/soc/davinci/davinci-pcm.c
+--- linux-2.6.39/sound/soc/davinci/davinci-pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/davinci/davinci-sffsdr.c linux-2.6.39/sound/soc/davinci/davinci-sffsdr.c
+--- linux-2.6.39/sound/soc/davinci/davinci-sffsdr.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/davinci/davinci-sffsdr.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/ep93xx/edb93xx.c linux-2.6.39/sound/soc/ep93xx/edb93xx.c
+--- linux-2.6.39/sound/soc/ep93xx/edb93xx.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/ep93xx/ep93xx-ac97.c linux-2.6.39/sound/soc/ep93xx/ep93xx-ac97.c
+--- linux-2.6.39/sound/soc/ep93xx/ep93xx-ac97.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/ep93xx/ep93xx-pcm.c linux-2.6.39/sound/soc/ep93xx/ep93xx-pcm.c
+--- linux-2.6.39/sound/soc/ep93xx/ep93xx-pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/ep93xx/snappercl15.c linux-2.6.39/sound/soc/ep93xx/snappercl15.c
+--- linux-2.6.39/sound/soc/ep93xx/snappercl15.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/fsl/fsl_dma.c linux-2.6.39/sound/soc/fsl/fsl_dma.c
+--- linux-2.6.39/sound/soc/fsl/fsl_dma.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/fsl/fsl_dma.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/fsl/mpc8610_hpcd.c linux-2.6.39/sound/soc/fsl/mpc8610_hpcd.c
+--- linux-2.6.39/sound/soc/fsl/mpc8610_hpcd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/fsl/p1022_ds.c linux-2.6.39/sound/soc/fsl/p1022_ds.c
+--- linux-2.6.39/sound/soc/fsl/p1022_ds.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/fsl/p1022_ds.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/imx/eukrea-tlv320.c linux-2.6.39/sound/soc/imx/eukrea-tlv320.c
+--- linux-2.6.39/sound/soc/imx/eukrea-tlv320.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/imx/imx-pcm-dma-mx2.c linux-2.6.39/sound/soc/imx/imx-pcm-dma-mx2.c
+--- linux-2.6.39/sound/soc/imx/imx-pcm-dma-mx2.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/imx/imx-pcm-fiq.c linux-2.6.39/sound/soc/imx/imx-pcm-fiq.c
+--- linux-2.6.39/sound/soc/imx/imx-pcm-fiq.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/imx/mx27vis-aic32x4.c linux-2.6.39/sound/soc/imx/mx27vis-aic32x4.c
+--- linux-2.6.39/sound/soc/imx/mx27vis-aic32x4.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/imx/phycore-ac97.c linux-2.6.39/sound/soc/imx/phycore-ac97.c
+--- linux-2.6.39/sound/soc/imx/phycore-ac97.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/imx/wm1133-ev1.c linux-2.6.39/sound/soc/imx/wm1133-ev1.c
+--- linux-2.6.39/sound/soc/imx/wm1133-ev1.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/jz4740/jz4740-pcm.c linux-2.6.39/sound/soc/jz4740/jz4740-pcm.c
+--- linux-2.6.39/sound/soc/jz4740/jz4740-pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/kirkwood/kirkwood-openrd.c linux-2.6.39/sound/soc/kirkwood/kirkwood-openrd.c
+--- linux-2.6.39/sound/soc/kirkwood/kirkwood-openrd.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/kirkwood/kirkwood-t5325.c linux-2.6.39/sound/soc/kirkwood/kirkwood-t5325.c
+--- linux-2.6.39/sound/soc/kirkwood/kirkwood-t5325.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/kirkwood/kirkwood-t5325.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/mid-x86/sst_platform.c linux-2.6.39/sound/soc/mid-x86/sst_platform.c
+--- linux-2.6.39/sound/soc/mid-x86/sst_platform.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/nuc900/nuc900-pcm.c linux-2.6.39/sound/soc/nuc900/nuc900-pcm.c
+--- linux-2.6.39/sound/soc/nuc900/nuc900-pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/omap/am3517evm.c linux-2.6.39/sound/soc/omap/am3517evm.c
+--- linux-2.6.39/sound/soc/omap/am3517evm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/omap/ams-delta.c linux-2.6.39/sound/soc/omap/ams-delta.c
+--- linux-2.6.39/sound/soc/omap/ams-delta.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/omap/igep0020.c linux-2.6.39/sound/soc/omap/igep0020.c
+--- linux-2.6.39/sound/soc/omap/igep0020.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/omap/igep0020.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/omap/n810.c linux-2.6.39/sound/soc/omap/n810.c
+--- linux-2.6.39/sound/soc/omap/n810.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/omap/omap2evm.c linux-2.6.39/sound/soc/omap/omap2evm.c
+--- linux-2.6.39/sound/soc/omap/omap2evm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/omap/omap2evm.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/omap/omap3beagle.c linux-2.6.39/sound/soc/omap/omap3beagle.c
+--- linux-2.6.39/sound/soc/omap/omap3beagle.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/omap/omap3evm.c linux-2.6.39/sound/soc/omap/omap3evm.c
+--- linux-2.6.39/sound/soc/omap/omap3evm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/omap/omap3evm.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/omap/omap3pandora.c linux-2.6.39/sound/soc/omap/omap3pandora.c
+--- linux-2.6.39/sound/soc/omap/omap3pandora.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/omap/omap-pcm.c linux-2.6.39/sound/soc/omap/omap-pcm.c
+--- linux-2.6.39/sound/soc/omap/omap-pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/omap/omap-pcm.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/omap/osk5912.c linux-2.6.39/sound/soc/omap/osk5912.c
+--- linux-2.6.39/sound/soc/omap/osk5912.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/omap/osk5912.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/omap/overo.c linux-2.6.39/sound/soc/omap/overo.c
+--- linux-2.6.39/sound/soc/omap/overo.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/omap/rx51.c linux-2.6.39/sound/soc/omap/rx51.c
+--- linux-2.6.39/sound/soc/omap/rx51.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/omap/sdp3430.c linux-2.6.39/sound/soc/omap/sdp3430.c
+--- linux-2.6.39/sound/soc/omap/sdp3430.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/omap/sdp3430.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/omap/sdp4430.c linux-2.6.39/sound/soc/omap/sdp4430.c
+--- linux-2.6.39/sound/soc/omap/sdp4430.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/omap/sdp4430.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/omap/zoom2.c linux-2.6.39/sound/soc/omap/zoom2.c
+--- linux-2.6.39/sound/soc/omap/zoom2.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/pxa/corgi.c linux-2.6.39/sound/soc/pxa/corgi.c
+--- linux-2.6.39/sound/soc/pxa/corgi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/pxa/imote2.c linux-2.6.39/sound/soc/pxa/imote2.c
+--- linux-2.6.39/sound/soc/pxa/imote2.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/pxa/magician.c linux-2.6.39/sound/soc/pxa/magician.c
+--- linux-2.6.39/sound/soc/pxa/magician.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/pxa/magician.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/pxa/mioa701_wm9713.c linux-2.6.39/sound/soc/pxa/mioa701_wm9713.c
+--- linux-2.6.39/sound/soc/pxa/mioa701_wm9713.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/pxa/poodle.c linux-2.6.39/sound/soc/pxa/poodle.c
+--- linux-2.6.39/sound/soc/pxa/poodle.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/pxa/pxa2xx-ac97.c linux-2.6.39/sound/soc/pxa/pxa2xx-ac97.c
+--- linux-2.6.39/sound/soc/pxa/pxa2xx-ac97.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/pxa/pxa2xx-ac97.h linux-2.6.39/sound/soc/pxa/pxa2xx-ac97.h
+--- linux-2.6.39/sound/soc/pxa/pxa2xx-ac97.h 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/pxa/raumfeld.c linux-2.6.39/sound/soc/pxa/raumfeld.c
+--- linux-2.6.39/sound/soc/pxa/raumfeld.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/pxa/raumfeld.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/pxa/saarb.c linux-2.6.39/sound/soc/pxa/saarb.c
+--- linux-2.6.39/sound/soc/pxa/saarb.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/pxa/spitz.c linux-2.6.39/sound/soc/pxa/spitz.c
+--- linux-2.6.39/sound/soc/pxa/spitz.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/pxa/tavorevb3.c linux-2.6.39/sound/soc/pxa/tavorevb3.c
+--- linux-2.6.39/sound/soc/pxa/tavorevb3.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/pxa/tavorevb3.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/pxa/tosa.c linux-2.6.39/sound/soc/pxa/tosa.c
+--- linux-2.6.39/sound/soc/pxa/tosa.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/pxa/z2.c linux-2.6.39/sound/soc/pxa/z2.c
+--- linux-2.6.39/sound/soc/pxa/z2.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/pxa/z2.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/pxa/zylonite.c linux-2.6.39/sound/soc/pxa/zylonite.c
+--- linux-2.6.39/sound/soc/pxa/zylonite.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/pxa/zylonite.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/s6000/s6000-pcm.c linux-2.6.39/sound/soc/s6000/s6000-pcm.c
+--- linux-2.6.39/sound/soc/s6000/s6000-pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/s6000/s6105-ipcam.c linux-2.6.39/sound/soc/s6000/s6105-ipcam.c
+--- linux-2.6.39/sound/soc/s6000/s6105-ipcam.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/samsung/goni_wm8994.c linux-2.6.39/sound/soc/samsung/goni_wm8994.c
+--- linux-2.6.39/sound/soc/samsung/goni_wm8994.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/samsung/h1940_uda1380.c linux-2.6.39/sound/soc/samsung/h1940_uda1380.c
+--- linux-2.6.39/sound/soc/samsung/h1940_uda1380.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/samsung/jive_wm8750.c linux-2.6.39/sound/soc/samsung/jive_wm8750.c
+--- linux-2.6.39/sound/soc/samsung/jive_wm8750.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/samsung/neo1973_wm8753.c linux-2.6.39/sound/soc/samsung/neo1973_wm8753.c
+--- linux-2.6.39/sound/soc/samsung/neo1973_wm8753.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/samsung/neo1973_wm8753.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/samsung/rx1950_uda1380.c linux-2.6.39/sound/soc/samsung/rx1950_uda1380.c
+--- linux-2.6.39/sound/soc/samsung/rx1950_uda1380.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/samsung/rx1950_uda1380.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/samsung/s3c24xx_simtec.c linux-2.6.39/sound/soc/samsung/s3c24xx_simtec.c
+--- linux-2.6.39/sound/soc/samsung/s3c24xx_simtec.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/samsung/s3c24xx_simtec.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/samsung/s3c24xx_uda134x.c linux-2.6.39/sound/soc/samsung/s3c24xx_uda134x.c
+--- linux-2.6.39/sound/soc/samsung/s3c24xx_uda134x.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/samsung/s3c24xx_uda134x.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/samsung/smartq_wm8987.c linux-2.6.39/sound/soc/samsung/smartq_wm8987.c
+--- linux-2.6.39/sound/soc/samsung/smartq_wm8987.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/samsung/smdk_spdif.c linux-2.6.39/sound/soc/samsung/smdk_spdif.c
+--- linux-2.6.39/sound/soc/samsung/smdk_spdif.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/samsung/smdk_wm8580.c linux-2.6.39/sound/soc/samsung/smdk_wm8580.c
+--- linux-2.6.39/sound/soc/samsung/smdk_wm8580.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/sh/dma-sh7760.c linux-2.6.39/sound/soc/sh/dma-sh7760.c
+--- linux-2.6.39/sound/soc/sh/dma-sh7760.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/sh/dma-sh7760.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/sh/hac.c linux-2.6.39/sound/soc/sh/hac.c
+--- linux-2.6.39/sound/soc/sh/hac.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/sh/hac.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/sh/migor.c linux-2.6.39/sound/soc/sh/migor.c
+--- linux-2.6.39/sound/soc/sh/migor.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/sh/siu_pcm.c linux-2.6.39/sound/soc/sh/siu_pcm.c
+--- linux-2.6.39/sound/soc/sh/siu_pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/tegra/harmony.c linux-2.6.39/sound/soc/tegra/harmony.c
+--- linux-2.6.39/sound/soc/tegra/harmony.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/tegra/harmony.c 2011-05-22 19:36:35.000000000 -0400
+@@ -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/sound/soc/tegra/tegra_pcm.c linux-2.6.39/sound/soc/tegra/tegra_pcm.c
+--- linux-2.6.39/sound/soc/tegra/tegra_pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/soc/txx9/txx9aclc.c linux-2.6.39/sound/soc/txx9/txx9aclc.c
+--- linux-2.6.39/sound/soc/txx9/txx9aclc.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/soc/txx9/txx9aclc.c 2011-05-22 19:36:36.000000000 -0400
+@@ -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/sound/sparc/amd7930.c linux-2.6.39/sound/sparc/amd7930.c
+--- linux-2.6.39/sound/sparc/amd7930.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/sparc/cs4231.c linux-2.6.39/sound/sparc/cs4231.c
+--- linux-2.6.39/sound/sparc/cs4231.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/sparc/dbri.c linux-2.6.39/sound/sparc/dbri.c
+--- linux-2.6.39/sound/sparc/dbri.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/sparc/dbri.c 2011-05-22 19:36:36.000000000 -0400
+@@ -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/sound/spi/at73c213.c linux-2.6.39/sound/spi/at73c213.c
+--- linux-2.6.39/sound/spi/at73c213.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/usb/6fire/midi.c linux-2.6.39/sound/usb/6fire/midi.c
+--- linux-2.6.39/sound/usb/6fire/midi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/usb/caiaq/audio.c linux-2.6.39/sound/usb/caiaq/audio.c
+--- linux-2.6.39/sound/usb/caiaq/audio.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/usb/caiaq/audio.c 2011-05-22 19:36:36.000000000 -0400
+@@ -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/sound/usb/caiaq/midi.c linux-2.6.39/sound/usb/caiaq/midi.c
+--- linux-2.6.39/sound/usb/caiaq/midi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/sound/usb/card.c linux-2.6.39/sound/usb/card.c
+--- linux-2.6.39/sound/usb/card.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/usb/card.c 2011-05-22 19:36:36.000000000 -0400
+@@ -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/sound/usb/midi.c linux-2.6.39/sound/usb/midi.c
+--- linux-2.6.39/sound/usb/midi.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/usb/midi.c 2011-05-22 19:36:36.000000000 -0400
+@@ -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,
+ };
+
+-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/sound/usb/misc/ua101.c linux-2.6.39/sound/usb/misc/ua101.c
+--- linux-2.6.39/sound/usb/misc/ua101.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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,
+ };
+
+-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/sound/usb/mixer.c linux-2.6.39/sound/usb/mixer.c
+--- linux-2.6.39/sound/usb/mixer.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/usb/mixer.c 2011-05-22 19:36:36.000000000 -0400
+@@ -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/sound/usb/pcm.c linux-2.6.39/sound/usb/pcm.c
+--- linux-2.6.39/sound/usb/pcm.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/sound/usb/pcm.c 2011-05-22 19:36:36.000000000 -0400
+@@ -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/sound/usb/usx2y/usbusx2yaudio.c linux-2.6.39/sound/usb/usx2y/usbusx2yaudio.c
+--- linux-2.6.39/sound/usb/usx2y/usbusx2yaudio.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/tools/perf/builtin-lock.c linux-2.6.39/tools/perf/builtin-lock.c
+--- linux-2.6.39/tools/perf/builtin-lock.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/tools/perf/builtin-lock.c 2011-05-22 19:36:36.000000000 -0400
+@@ -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/tools/perf/builtin-sched.c linux-2.6.39/tools/perf/builtin-sched.c
+--- linux-2.6.39/tools/perf/builtin-sched.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/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/usr/gen_init_cpio.c linux-2.6.39/usr/gen_init_cpio.c
+--- linux-2.6.39/usr/gen_init_cpio.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/usr/gen_init_cpio.c 2011-05-22 19:36:36.000000000 -0400
@@ -305,7 +305,7 @@ static int cpio_mkfile(const char *name,
int retval;
int rc = -1;
} else
break;
}
-diff -urNp linux-2.6.38.4/virt/kvm/kvm_main.c linux-2.6.38.4/virt/kvm/kvm_main.c
---- linux-2.6.38.4/virt/kvm/kvm_main.c 2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/virt/kvm/kvm_main.c 2011-04-28 19:57:25.000000000 -0400
-@@ -74,7 +74,7 @@ LIST_HEAD(vm_list);
+diff -urNp linux-2.6.39/virt/kvm/kvm_main.c linux-2.6.39/virt/kvm/kvm_main.c
+--- linux-2.6.39/virt/kvm/kvm_main.c 2011-05-19 00:06:34.000000000 -0400
++++ linux-2.6.39/virt/kvm/kvm_main.c 2011-05-22 19:36:36.000000000 -0400
+@@ -73,7 +73,7 @@ LIST_HEAD(vm_list);
static cpumask_var_t cpus_hardware_enabled;
static int kvm_usage_count = 0;
struct kmem_cache *kvm_vcpu_cache;
EXPORT_SYMBOL_GPL(kvm_vcpu_cache);
-@@ -1521,7 +1521,7 @@ static int kvm_vcpu_release(struct inode
+@@ -1594,7 +1594,7 @@ static int kvm_vcpu_release(struct inode
return 0;
}
.release = kvm_vcpu_release,
.unlocked_ioctl = kvm_vcpu_ioctl,
.compat_ioctl = kvm_vcpu_ioctl,
-@@ -1990,7 +1990,7 @@ static int kvm_vm_mmap(struct file *file
+@@ -2063,7 +2063,7 @@ static int kvm_vm_mmap(struct file *file
return 0;
}
.release = kvm_vm_release,
.unlocked_ioctl = kvm_vm_ioctl,
#ifdef CONFIG_COMPAT
-@@ -2088,7 +2088,7 @@ out:
+@@ -2161,7 +2161,7 @@ out:
return r;
}
.unlocked_ioctl = kvm_dev_ioctl,
.compat_ioctl = kvm_dev_ioctl,
.llseek = noop_llseek,
-@@ -2114,7 +2114,7 @@ static void hardware_enable_nolock(void
+@@ -2187,7 +2187,7 @@ static void hardware_enable_nolock(void
if (r) {
cpumask_clear_cpu(cpu, cpus_hardware_enabled);
printk(KERN_INFO "kvm: enabling virtualization on "
"CPU%d failed\n", cpu);
}
-@@ -2168,10 +2168,10 @@ static int hardware_enable_all(void)
+@@ -2241,10 +2241,10 @@ static int hardware_enable_all(void)
kvm_usage_count++;
if (kvm_usage_count == 1) {
hardware_disable_all_nolock();
r = -EBUSY;
}
-@@ -2443,7 +2443,7 @@ static void kvm_sched_out(struct preempt
+@@ -2509,7 +2509,7 @@ static void kvm_sched_out(struct preempt
kvm_arch_vcpu_put(vcpu);
}
struct module *module)
{
int r;
-@@ -2514,7 +2514,7 @@ int kvm_init(void *opaque, unsigned vcpu
+@@ -2572,7 +2572,7 @@ int kvm_init(void *opaque, unsigned vcpu
if (!vcpu_align)
vcpu_align = __alignof__(struct kvm_vcpu);
kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align,
+ SLAB_USERCOPY, NULL);
if (!kvm_vcpu_cache) {
r = -ENOMEM;
- goto out_free_5;
-Binary files linux-2.6.38.4/vmlinux.gz and linux-2.6.38.4/vmlinux.gz differ
+ goto out_free_3;
projects / ipfire-3.x.git / commitdiff
