-diff -urNp linux-2.6.35.4/arch/alpha/include/asm/dma-mapping.h linux-2.6.35.4/arch/alpha/include/asm/dma-mapping.h
---- linux-2.6.35.4/arch/alpha/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/alpha/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/alpha/include/asm/dma-mapping.h linux-2.6.36/arch/alpha/include/asm/dma-mapping.h
+--- linux-2.6.36/arch/alpha/include/asm/dma-mapping.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/alpha/include/asm/dma-mapping.h 2010-11-06 18:58:15.000000000 -0400
@@ -3,9 +3,9 @@
#include <linux/dma-attrs.h>
{
return dma_ops;
}
-diff -urNp linux-2.6.35.4/arch/alpha/include/asm/elf.h linux-2.6.35.4/arch/alpha/include/asm/elf.h
---- linux-2.6.35.4/arch/alpha/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/alpha/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/alpha/include/asm/elf.h linux-2.6.36/arch/alpha/include/asm/elf.h
+--- linux-2.6.36/arch/alpha/include/asm/elf.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/alpha/include/asm/elf.h 2010-11-06 18:58:15.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.35.4/arch/alpha/include/asm/pgtable.h linux-2.6.35.4/arch/alpha/include/asm/pgtable.h
---- linux-2.6.35.4/arch/alpha/include/asm/pgtable.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/alpha/include/asm/pgtable.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/alpha/include/asm/pgtable.h linux-2.6.36/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.36/arch/alpha/include/asm/pgtable.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/alpha/include/asm/pgtable.h 2010-11-06 18:58:15.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.35.4/arch/alpha/kernel/module.c linux-2.6.35.4/arch/alpha/kernel/module.c
---- linux-2.6.35.4/arch/alpha/kernel/module.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/alpha/kernel/module.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/alpha/kernel/module.c linux-2.6.36/arch/alpha/kernel/module.c
+--- linux-2.6.36/arch/alpha/kernel/module.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/alpha/kernel/module.c 2010-11-06 18:58:15.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.35.4/arch/alpha/kernel/osf_sys.c linux-2.6.35.4/arch/alpha/kernel/osf_sys.c
---- linux-2.6.35.4/arch/alpha/kernel/osf_sys.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/alpha/kernel/osf_sys.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1170,7 +1170,7 @@ arch_get_unmapped_area_1(unsigned long a
+diff -urNp linux-2.6.36/arch/alpha/kernel/osf_sys.c linux-2.6.36/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.36/arch/alpha/kernel/osf_sys.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/alpha/kernel/osf_sys.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1165,7 +1165,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;
-@@ -1206,6 +1206,10 @@ arch_get_unmapped_area(struct file *filp
+@@ -1201,6 +1201,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)
-@@ -1213,8 +1217,8 @@ arch_get_unmapped_area(struct file *filp
+@@ -1208,8 +1212,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.35.4/arch/alpha/kernel/pci_iommu.c linux-2.6.35.4/arch/alpha/kernel/pci_iommu.c
---- linux-2.6.35.4/arch/alpha/kernel/pci_iommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/alpha/kernel/pci_iommu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/alpha/kernel/pci_iommu.c linux-2.6.36/arch/alpha/kernel/pci_iommu.c
+--- linux-2.6.36/arch/alpha/kernel/pci_iommu.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/alpha/kernel/pci_iommu.c 2010-11-06 18:58:15.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.35.4/arch/alpha/kernel/pci-noop.c linux-2.6.35.4/arch/alpha/kernel/pci-noop.c
---- linux-2.6.35.4/arch/alpha/kernel/pci-noop.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/alpha/kernel/pci-noop.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/alpha/kernel/pci-noop.c linux-2.6.36/arch/alpha/kernel/pci-noop.c
+--- linux-2.6.36/arch/alpha/kernel/pci-noop.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/alpha/kernel/pci-noop.c 2010-11-06 18:58:15.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.35.4/arch/alpha/mm/fault.c linux-2.6.35.4/arch/alpha/mm/fault.c
---- linux-2.6.35.4/arch/alpha/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/alpha/mm/fault.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/alpha/mm/fault.c linux-2.6.36/arch/alpha/mm/fault.c
+--- linux-2.6.36/arch/alpha/mm/fault.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/alpha/mm/fault.c 2010-11-06 18:58:15.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.35.4/arch/arm/include/asm/elf.h linux-2.6.35.4/arch/arm/include/asm/elf.h
---- linux-2.6.35.4/arch/arm/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/arm/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
-@@ -111,7 +111,14 @@ int dump_task_regs(struct task_struct *t
+diff -urNp linux-2.6.36/arch/arm/include/asm/elf.h linux-2.6.36/arch/arm/include/asm/elf.h
+--- linux-2.6.36/arch/arm/include/asm/elf.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/arm/include/asm/elf.h 2010-11-06 18:58:15.000000000 -0400
+@@ -113,7 +113,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. */
/* When the program starts, a1 contains a pointer to a function to be
registered with atexit, as per the SVR4 ABI. A value of 0 means we
-diff -urNp linux-2.6.35.4/arch/arm/include/asm/kmap_types.h linux-2.6.35.4/arch/arm/include/asm/kmap_types.h
---- linux-2.6.35.4/arch/arm/include/asm/kmap_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/arm/include/asm/kmap_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/arm/include/asm/kmap_types.h linux-2.6.36/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.36/arch/arm/include/asm/kmap_types.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/arm/include/asm/kmap_types.h 2010-11-06 18:58:15.000000000 -0400
@@ -21,6 +21,7 @@ enum km_type {
KM_L1_CACHE,
KM_L2_CACHE,
KM_TYPE_NR
};
-diff -urNp linux-2.6.35.4/arch/arm/include/asm/uaccess.h linux-2.6.35.4/arch/arm/include/asm/uaccess.h
---- linux-2.6.35.4/arch/arm/include/asm/uaccess.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/arm/include/asm/uaccess.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/arm/include/asm/uaccess.h linux-2.6.36/arch/arm/include/asm/uaccess.h
+--- linux-2.6.36/arch/arm/include/asm/uaccess.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/arm/include/asm/uaccess.h 2010-11-06 18:58:15.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.35.4/arch/arm/kernel/kgdb.c linux-2.6.35.4/arch/arm/kernel/kgdb.c
---- linux-2.6.35.4/arch/arm/kernel/kgdb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/arm/kernel/kgdb.c 2010-09-17 20:12:09.000000000 -0400
-@@ -208,7 +208,7 @@ void kgdb_arch_exit(void)
+diff -urNp linux-2.6.36/arch/arm/kernel/kgdb.c linux-2.6.36/arch/arm/kernel/kgdb.c
+--- linux-2.6.36/arch/arm/kernel/kgdb.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/arm/kernel/kgdb.c 2010-11-06 18:58:15.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.35.4/arch/arm/mach-at91/pm.c linux-2.6.35.4/arch/arm/mach-at91/pm.c
---- linux-2.6.35.4/arch/arm/mach-at91/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/arm/mach-at91/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/arm/mach-at91/pm.c linux-2.6.36/arch/arm/mach-at91/pm.c
+--- linux-2.6.36/arch/arm/mach-at91/pm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/arm/mach-at91/pm.c 2010-11-06 18:58:15.000000000 -0400
@@ -294,7 +294,7 @@ static void at91_pm_end(void)
}
.valid = at91_pm_valid_state,
.begin = at91_pm_begin,
.enter = at91_pm_enter,
-diff -urNp linux-2.6.35.4/arch/arm/mach-davinci/pm.c linux-2.6.35.4/arch/arm/mach-davinci/pm.c
---- linux-2.6.35.4/arch/arm/mach-davinci/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/arm/mach-davinci/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/arm/mach-davinci/pm.c linux-2.6.36/arch/arm/mach-davinci/pm.c
+--- linux-2.6.36/arch/arm/mach-davinci/pm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/arm/mach-davinci/pm.c 2010-11-06 18:58:15.000000000 -0400
@@ -110,7 +110,7 @@ static int davinci_pm_enter(suspend_stat
return ret;
}
.enter = davinci_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.35.4/arch/arm/mach-msm/last_radio_log.c linux-2.6.35.4/arch/arm/mach-msm/last_radio_log.c
---- linux-2.6.35.4/arch/arm/mach-msm/last_radio_log.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/arm/mach-msm/last_radio_log.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/arm/mach-imx/pm-imx27.c linux-2.6.36/arch/arm/mach-imx/pm-imx27.c
+--- linux-2.6.36/arch/arm/mach-imx/pm-imx27.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/arm/mach-imx/pm-imx27.c 2010-11-06 18:58:15.000000000 -0400
+@@ -32,7 +32,7 @@ static int mx27_suspend_enter(suspend_st
+ return 0;
+ }
+
+-static struct platform_suspend_ops mx27_suspend_ops = {
++static const struct platform_suspend_ops mx27_suspend_ops = {
+ .enter = mx27_suspend_enter,
+ .valid = suspend_valid_only_mem,
+ };
+diff -urNp linux-2.6.36/arch/arm/mach-lpc32xx/pm.c linux-2.6.36/arch/arm/mach-lpc32xx/pm.c
+--- linux-2.6.36/arch/arm/mach-lpc32xx/pm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/arm/mach-lpc32xx/pm.c 2010-11-06 18:58:15.000000000 -0400
+@@ -123,7 +123,7 @@ static int lpc32xx_pm_enter(suspend_stat
+ return 0;
+ }
+
+-static struct platform_suspend_ops lpc32xx_pm_ops = {
++static const struct platform_suspend_ops lpc32xx_pm_ops = {
+ .valid = suspend_valid_only_mem,
+ .enter = lpc32xx_pm_enter,
+ };
+diff -urNp linux-2.6.36/arch/arm/mach-msm/last_radio_log.c linux-2.6.36/arch/arm/mach-msm/last_radio_log.c
+--- linux-2.6.36/arch/arm/mach-msm/last_radio_log.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/arm/mach-msm/last_radio_log.c 2010-11-06 18:58:15.000000000 -0400
@@ -47,6 +47,7 @@ static ssize_t last_radio_log_read(struc
return count;
}
static struct file_operations last_radio_log_fops = {
.read = last_radio_log_read
};
-diff -urNp linux-2.6.35.4/arch/arm/mach-omap1/pm.c linux-2.6.35.4/arch/arm/mach-omap1/pm.c
---- linux-2.6.35.4/arch/arm/mach-omap1/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/arm/mach-omap1/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/arm/mach-omap1/pm.c linux-2.6.36/arch/arm/mach-omap1/pm.c
+--- linux-2.6.36/arch/arm/mach-omap1/pm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/arm/mach-omap1/pm.c 2010-11-06 18:58:15.000000000 -0400
@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
.prepare = omap_pm_prepare,
.enter = omap_pm_enter,
.finish = omap_pm_finish,
-diff -urNp linux-2.6.35.4/arch/arm/mach-omap2/pm24xx.c linux-2.6.35.4/arch/arm/mach-omap2/pm24xx.c
---- linux-2.6.35.4/arch/arm/mach-omap2/pm24xx.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/arm/mach-omap2/pm24xx.c 2010-09-17 20:12:09.000000000 -0400
-@@ -325,7 +325,7 @@ static void omap2_pm_finish(void)
+diff -urNp linux-2.6.36/arch/arm/mach-omap2/pm24xx.c linux-2.6.36/arch/arm/mach-omap2/pm24xx.c
+--- linux-2.6.36/arch/arm/mach-omap2/pm24xx.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/arm/mach-omap2/pm24xx.c 2010-11-06 18:58:15.000000000 -0400
+@@ -324,7 +324,7 @@ static void omap2_pm_finish(void)
enable_hlt();
}
.prepare = omap2_pm_prepare,
.enter = omap2_pm_enter,
.finish = omap2_pm_finish,
-diff -urNp linux-2.6.35.4/arch/arm/mach-omap2/pm34xx.c linux-2.6.35.4/arch/arm/mach-omap2/pm34xx.c
---- linux-2.6.35.4/arch/arm/mach-omap2/pm34xx.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/arm/mach-omap2/pm34xx.c 2010-09-17 20:12:09.000000000 -0400
-@@ -669,7 +669,7 @@ static void omap3_pm_end(void)
+diff -urNp linux-2.6.36/arch/arm/mach-omap2/pm34xx.c linux-2.6.36/arch/arm/mach-omap2/pm34xx.c
+--- linux-2.6.36/arch/arm/mach-omap2/pm34xx.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/arm/mach-omap2/pm34xx.c 2010-11-06 18:58:15.000000000 -0400
+@@ -672,7 +672,7 @@ static void omap3_pm_end(void)
return;
}
.begin = omap3_pm_begin,
.end = omap3_pm_end,
.prepare = omap3_pm_prepare,
-diff -urNp linux-2.6.35.4/arch/arm/mach-pnx4008/pm.c linux-2.6.35.4/arch/arm/mach-pnx4008/pm.c
---- linux-2.6.35.4/arch/arm/mach-pnx4008/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/arm/mach-pnx4008/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/arm/mach-omap2/pm44xx.c linux-2.6.36/arch/arm/mach-omap2/pm44xx.c
+--- linux-2.6.36/arch/arm/mach-omap2/pm44xx.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/arm/mach-omap2/pm44xx.c 2010-11-06 18:58:15.000000000 -0400
+@@ -75,7 +75,7 @@ static void omap4_pm_end(void)
+ return;
+ }
+
+-static struct platform_suspend_ops omap_pm_ops = {
++static const struct platform_suspend_ops omap_pm_ops = {
+ .begin = omap4_pm_begin,
+ .end = omap4_pm_end,
+ .prepare = omap4_pm_prepare,
+diff -urNp linux-2.6.36/arch/arm/mach-pnx4008/pm.c linux-2.6.36/arch/arm/mach-pnx4008/pm.c
+--- linux-2.6.36/arch/arm/mach-pnx4008/pm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/arm/mach-pnx4008/pm.c 2010-11-06 18:58:15.000000000 -0400
@@ -119,7 +119,7 @@ static int pnx4008_pm_valid(suspend_stat
(state == PM_SUSPEND_MEM);
}
.enter = pnx4008_pm_enter,
.valid = pnx4008_pm_valid,
};
-diff -urNp linux-2.6.35.4/arch/arm/mach-pxa/pm.c linux-2.6.35.4/arch/arm/mach-pxa/pm.c
---- linux-2.6.35.4/arch/arm/mach-pxa/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/arm/mach-pxa/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/arm/mach-pxa/pm.c linux-2.6.36/arch/arm/mach-pxa/pm.c
+--- linux-2.6.36/arch/arm/mach-pxa/pm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/arm/mach-pxa/pm.c 2010-11-06 18:58:15.000000000 -0400
@@ -96,7 +96,7 @@ void pxa_pm_finish(void)
pxa_cpu_pm_fns->finish();
}
.valid = pxa_pm_valid,
.enter = pxa_pm_enter,
.prepare = pxa_pm_prepare,
-diff -urNp linux-2.6.35.4/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.35.4/arch/arm/mach-pxa/sharpsl_pm.c
---- linux-2.6.35.4/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/arm/mach-pxa/sharpsl_pm.c 2010-09-17 20:12:09.000000000 -0400
-@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
+diff -urNp linux-2.6.36/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.36/arch/arm/mach-pxa/sharpsl_pm.c
+--- linux-2.6.36/arch/arm/mach-pxa/sharpsl_pm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/arm/mach-pxa/sharpsl_pm.c 2010-11-06 18:58:15.000000000 -0400
+@@ -868,7 +868,7 @@ static void sharpsl_apm_get_power_status
}
#ifdef CONFIG_PM
.prepare = pxa_pm_prepare,
.finish = pxa_pm_finish,
.enter = corgi_pxa_pm_enter,
-diff -urNp linux-2.6.35.4/arch/arm/mach-sa1100/pm.c linux-2.6.35.4/arch/arm/mach-sa1100/pm.c
---- linux-2.6.35.4/arch/arm/mach-sa1100/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/arm/mach-sa1100/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/arm/mach-sa1100/pm.c linux-2.6.36/arch/arm/mach-sa1100/pm.c
+--- linux-2.6.36/arch/arm/mach-sa1100/pm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/arm/mach-sa1100/pm.c 2010-11-06 18:58:15.000000000 -0400
@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
return virt_to_phys(sp);
}
.enter = sa11x0_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.35.4/arch/arm/mm/fault.c linux-2.6.35.4/arch/arm/mm/fault.c
---- linux-2.6.35.4/arch/arm/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/arm/mm/fault.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/arm/mm/fault.c linux-2.6.36/arch/arm/mm/fault.c
+--- linux-2.6.36/arch/arm/mm/fault.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/arm/mm/fault.c 2010-11-06 18:58:15.000000000 -0400
@@ -167,6 +167,13 @@ __do_user_fault(struct task_struct *tsk,
}
#endif
/*
* First Level Translation Fault Handler
*
-diff -urNp linux-2.6.35.4/arch/arm/mm/mmap.c linux-2.6.35.4/arch/arm/mm/mmap.c
---- linux-2.6.35.4/arch/arm/mm/mmap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/arm/mm/mmap.c 2010-09-17 20:12:09.000000000 -0400
-@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
+diff -urNp linux-2.6.36/arch/arm/mm/mmap.c linux-2.6.36/arch/arm/mm/mmap.c
+--- linux-2.6.36/arch/arm/mm/mmap.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/arm/mm/mmap.c 2010-11-06 18:58:15.000000000 -0400
+@@ -64,6 +64,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
if (addr) {
if (do_align)
addr = COLOUR_ALIGN(addr, pgoff);
-@@ -70,15 +74,14 @@ arch_get_unmapped_area(struct file *filp
+@@ -71,15 +75,14 @@ arch_get_unmapped_area(struct file *filp
addr = PAGE_ALIGN(addr);
vma = find_vma(mm, addr);
+ start_addr = addr = mm->mmap_base;
+ mm->cached_hole_size = 0;
}
-
- full_search:
-@@ -94,14 +97,14 @@ full_search:
+ /* 8 bits of randomness in 20 address space bits */
+ if (current->flags & PF_RANDOMIZE)
+@@ -98,14 +101,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.35.4/arch/arm/plat-samsung/pm.c linux-2.6.35.4/arch/arm/plat-samsung/pm.c
---- linux-2.6.35.4/arch/arm/plat-samsung/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/arm/plat-samsung/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/arm/plat-samsung/pm.c linux-2.6.36/arch/arm/plat-samsung/pm.c
+--- linux-2.6.36/arch/arm/plat-samsung/pm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/arm/plat-samsung/pm.c 2010-11-06 18:58:15.000000000 -0400
@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
s3c_pm_check_cleanup();
}
.enter = s3c_pm_enter,
.prepare = s3c_pm_prepare,
.finish = s3c_pm_finish,
-diff -urNp linux-2.6.35.4/arch/avr32/include/asm/elf.h linux-2.6.35.4/arch/avr32/include/asm/elf.h
---- linux-2.6.35.4/arch/avr32/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/avr32/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/avr32/include/asm/elf.h linux-2.6.36/arch/avr32/include/asm/elf.h
+--- linux-2.6.36/arch/avr32/include/asm/elf.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/avr32/include/asm/elf.h 2010-11-06 18:58:15.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.35.4/arch/avr32/include/asm/kmap_types.h linux-2.6.35.4/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.35.4/arch/avr32/include/asm/kmap_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/avr32/include/asm/kmap_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/avr32/include/asm/kmap_types.h linux-2.6.36/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.36/arch/avr32/include/asm/kmap_types.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/avr32/include/asm/kmap_types.h 2010-11-06 18:58:15.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.35.4/arch/avr32/mach-at32ap/pm.c linux-2.6.35.4/arch/avr32/mach-at32ap/pm.c
---- linux-2.6.35.4/arch/avr32/mach-at32ap/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/avr32/mach-at32ap/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/avr32/mach-at32ap/pm.c linux-2.6.36/arch/avr32/mach-at32ap/pm.c
+--- linux-2.6.36/arch/avr32/mach-at32ap/pm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/avr32/mach-at32ap/pm.c 2010-11-06 18:58:15.000000000 -0400
@@ -176,7 +176,7 @@ out:
return 0;
}
.valid = avr32_pm_valid_state,
.enter = avr32_pm_enter,
};
-diff -urNp linux-2.6.35.4/arch/avr32/mm/fault.c linux-2.6.35.4/arch/avr32/mm/fault.c
---- linux-2.6.35.4/arch/avr32/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/avr32/mm/fault.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/avr32/mm/fault.c linux-2.6.36/arch/avr32/mm/fault.c
+--- linux-2.6.36/arch/avr32/mm/fault.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/avr32/mm/fault.c 2010-11-06 18:58:15.000000000 -0400
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
int exception_trace = 1;
/*
* This routine handles page faults. It determines the address and the
* problem, and then passes it off to one of the appropriate routines.
-@@ -157,6 +174,16 @@ bad_area:
+@@ -156,6 +173,16 @@ bad_area:
up_read(&mm->mmap_sem);
if (user_mode(regs)) {
if (exception_trace && printk_ratelimit())
printk("%s%s[%d]: segfault at %08lx pc %08lx "
"sp %08lx ecr %lu\n",
-diff -urNp linux-2.6.35.4/arch/blackfin/kernel/kgdb.c linux-2.6.35.4/arch/blackfin/kernel/kgdb.c
---- linux-2.6.35.4/arch/blackfin/kernel/kgdb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/blackfin/kernel/kgdb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/blackfin/kernel/kgdb.c linux-2.6.36/arch/blackfin/kernel/kgdb.c
+--- linux-2.6.36/arch/blackfin/kernel/kgdb.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/blackfin/kernel/kgdb.c 2010-11-06 18:58:15.000000000 -0400
@@ -397,7 +397,7 @@ int kgdb_arch_handle_exception(int vecto
return -1; /* this means that we do not want to exit from the handler */
}
.gdb_bpt_instr = {0xa1},
#ifdef CONFIG_SMP
.flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
-diff -urNp linux-2.6.35.4/arch/blackfin/mach-common/pm.c linux-2.6.35.4/arch/blackfin/mach-common/pm.c
---- linux-2.6.35.4/arch/blackfin/mach-common/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/blackfin/mach-common/pm.c 2010-09-17 20:12:09.000000000 -0400
-@@ -232,7 +232,7 @@ static int bfin_pm_enter(suspend_state_t
+diff -urNp linux-2.6.36/arch/blackfin/mach-common/pm.c linux-2.6.36/arch/blackfin/mach-common/pm.c
+--- linux-2.6.36/arch/blackfin/mach-common/pm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/blackfin/mach-common/pm.c 2010-11-06 18:58:15.000000000 -0400
+@@ -233,7 +233,7 @@ static int bfin_pm_enter(suspend_state_t
return 0;
}
.enter = bfin_pm_enter,
.valid = bfin_pm_valid,
};
-diff -urNp linux-2.6.35.4/arch/blackfin/mm/maccess.c linux-2.6.35.4/arch/blackfin/mm/maccess.c
---- linux-2.6.35.4/arch/blackfin/mm/maccess.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/blackfin/mm/maccess.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/blackfin/mm/maccess.c linux-2.6.36/arch/blackfin/mm/maccess.c
+--- linux-2.6.36/arch/blackfin/mm/maccess.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/blackfin/mm/maccess.c 2010-11-06 18:58:15.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.35.4/arch/frv/include/asm/kmap_types.h linux-2.6.35.4/arch/frv/include/asm/kmap_types.h
---- linux-2.6.35.4/arch/frv/include/asm/kmap_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/frv/include/asm/kmap_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/frv/include/asm/kmap_types.h linux-2.6.36/arch/frv/include/asm/kmap_types.h
+--- linux-2.6.36/arch/frv/include/asm/kmap_types.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/frv/include/asm/kmap_types.h 2010-11-06 18:58:15.000000000 -0400
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
KM_TYPE_NR
};
-diff -urNp linux-2.6.35.4/arch/frv/mm/elf-fdpic.c linux-2.6.35.4/arch/frv/mm/elf-fdpic.c
---- linux-2.6.35.4/arch/frv/mm/elf-fdpic.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/frv/mm/elf-fdpic.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/frv/mm/elf-fdpic.c linux-2.6.36/arch/frv/mm/elf-fdpic.c
+--- linux-2.6.36/arch/frv/mm/elf-fdpic.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/frv/mm/elf-fdpic.c 2010-11-06 18:58:15.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.35.4/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.35.4/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.35.4/arch/ia64/hp/common/hwsw_iommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/ia64/hp/common/hwsw_iommu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.36/arch/ia64/hp/common/hwsw_iommu.c
+--- linux-2.6.36/arch/ia64/hp/common/hwsw_iommu.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/ia64/hp/common/hwsw_iommu.c 2010-11-06 18:58:15.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.35.4/arch/ia64/hp/common/sba_iommu.c linux-2.6.35.4/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.35.4/arch/ia64/hp/common/sba_iommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/ia64/hp/common/sba_iommu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/ia64/hp/common/sba_iommu.c linux-2.6.36/arch/ia64/hp/common/sba_iommu.c
+--- linux-2.6.36/arch/ia64/hp/common/sba_iommu.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/ia64/hp/common/sba_iommu.c 2010-11-06 18:58:15.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.35.4/arch/ia64/include/asm/compat.h linux-2.6.35.4/arch/ia64/include/asm/compat.h
---- linux-2.6.35.4/arch/ia64/include/asm/compat.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/ia64/include/asm/compat.h 2010-09-17 20:12:37.000000000 -0400
-@@ -199,7 +199,7 @@ ptr_to_compat(void __user *uptr)
- }
-
- static __inline__ void __user *
--compat_alloc_user_space (long len)
-+arch_compat_alloc_user_space (long len)
- {
- struct pt_regs *regs = task_pt_regs(current);
- return (void __user *) (((regs->r12 & 0xffffffff) & -16) - len);
-diff -urNp linux-2.6.35.4/arch/ia64/include/asm/dma-mapping.h linux-2.6.35.4/arch/ia64/include/asm/dma-mapping.h
---- linux-2.6.35.4/arch/ia64/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/ia64/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/ia64/include/asm/dma-mapping.h linux-2.6.36/arch/ia64/include/asm/dma-mapping.h
+--- linux-2.6.36/arch/ia64/include/asm/dma-mapping.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/ia64/include/asm/dma-mapping.h 2010-11-06 18:58:15.000000000 -0400
@@ -12,7 +12,7 @@
#define ARCH_HAS_DMA_GET_REQUIRED_MASK
return ops->dma_supported(dev, mask);
}
-diff -urNp linux-2.6.35.4/arch/ia64/include/asm/elf.h linux-2.6.35.4/arch/ia64/include/asm/elf.h
---- linux-2.6.35.4/arch/ia64/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/ia64/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/ia64/include/asm/elf.h linux-2.6.36/arch/ia64/include/asm/elf.h
+--- linux-2.6.36/arch/ia64/include/asm/elf.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/ia64/include/asm/elf.h 2010-11-06 18:58:15.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.35.4/arch/ia64/include/asm/machvec.h linux-2.6.35.4/arch/ia64/include/asm/machvec.h
---- linux-2.6.35.4/arch/ia64/include/asm/machvec.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/ia64/include/asm/machvec.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/ia64/include/asm/machvec.h linux-2.6.36/arch/ia64/include/asm/machvec.h
+--- linux-2.6.36/arch/ia64/include/asm/machvec.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/ia64/include/asm/machvec.h 2010-11-06 18:58:15.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.35.4/arch/ia64/include/asm/pgtable.h linux-2.6.35.4/arch/ia64/include/asm/pgtable.h
---- linux-2.6.35.4/arch/ia64/include/asm/pgtable.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/ia64/include/asm/pgtable.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/ia64/include/asm/pgtable.h linux-2.6.36/arch/ia64/include/asm/pgtable.h
+--- linux-2.6.36/arch/ia64/include/asm/pgtable.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/ia64/include/asm/pgtable.h 2010-11-06 18:58:15.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.35.4/arch/ia64/include/asm/uaccess.h linux-2.6.35.4/arch/ia64/include/asm/uaccess.h
---- linux-2.6.35.4/arch/ia64/include/asm/uaccess.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/ia64/include/asm/uaccess.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/ia64/include/asm/uaccess.h linux-2.6.36/arch/ia64/include/asm/uaccess.h
+--- linux-2.6.36/arch/ia64/include/asm/uaccess.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/ia64/include/asm/uaccess.h 2010-11-06 18:58:15.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.35.4/arch/ia64/kernel/dma-mapping.c linux-2.6.35.4/arch/ia64/kernel/dma-mapping.c
---- linux-2.6.35.4/arch/ia64/kernel/dma-mapping.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/ia64/kernel/dma-mapping.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/ia64/kernel/dma-mapping.c linux-2.6.36/arch/ia64/kernel/dma-mapping.c
+--- linux-2.6.36/arch/ia64/kernel/dma-mapping.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/ia64/kernel/dma-mapping.c 2010-11-06 18:58:15.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.35.4/arch/ia64/kernel/module.c linux-2.6.35.4/arch/ia64/kernel/module.c
---- linux-2.6.35.4/arch/ia64/kernel/module.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/ia64/kernel/module.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/ia64/kernel/module.c linux-2.6.36/arch/ia64/kernel/module.c
+--- linux-2.6.36/arch/ia64/kernel/module.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/ia64/kernel/module.c 2010-11-06 18:58:15.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.35.4/arch/ia64/kernel/pci-dma.c linux-2.6.35.4/arch/ia64/kernel/pci-dma.c
---- linux-2.6.35.4/arch/ia64/kernel/pci-dma.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/ia64/kernel/pci-dma.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/ia64/kernel/pci-dma.c linux-2.6.36/arch/ia64/kernel/pci-dma.c
+--- linux-2.6.36/arch/ia64/kernel/pci-dma.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/ia64/kernel/pci-dma.c 2010-11-06 18:58:15.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.35.4/arch/ia64/kernel/pci-swiotlb.c linux-2.6.35.4/arch/ia64/kernel/pci-swiotlb.c
---- linux-2.6.35.4/arch/ia64/kernel/pci-swiotlb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/ia64/kernel/pci-swiotlb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/ia64/kernel/pci-swiotlb.c linux-2.6.36/arch/ia64/kernel/pci-swiotlb.c
+--- linux-2.6.36/arch/ia64/kernel/pci-swiotlb.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/ia64/kernel/pci-swiotlb.c 2010-11-06 18:58:15.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.35.4/arch/ia64/kernel/sys_ia64.c linux-2.6.35.4/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.35.4/arch/ia64/kernel/sys_ia64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/ia64/kernel/sys_ia64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/ia64/kernel/sys_ia64.c linux-2.6.36/arch/ia64/kernel/sys_ia64.c
+--- linux-2.6.36/arch/ia64/kernel/sys_ia64.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/ia64/kernel/sys_ia64.c 2010-11-06 18:58:15.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.35.4/arch/ia64/kernel/vmlinux.lds.S linux-2.6.35.4/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.35.4/arch/ia64/kernel/vmlinux.lds.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/ia64/kernel/vmlinux.lds.S 2010-09-17 20:12:09.000000000 -0400
-@@ -196,7 +196,7 @@ SECTIONS
- /* Per-cpu data: */
- . = ALIGN(PERCPU_PAGE_SIZE);
- PERCPU_VADDR(PERCPU_ADDR, :percpu)
-- __phys_per_cpu_start = __per_cpu_load;
-+ __phys_per_cpu_start = per_cpu_load;
- . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
- * into percpu page size
- */
-diff -urNp linux-2.6.35.4/arch/ia64/mm/fault.c linux-2.6.35.4/arch/ia64/mm/fault.c
---- linux-2.6.35.4/arch/ia64/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/ia64/mm/fault.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/ia64/kernel/vmlinux.lds.S linux-2.6.36/arch/ia64/kernel/vmlinux.lds.S
+--- linux-2.6.36/arch/ia64/kernel/vmlinux.lds.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/ia64/kernel/vmlinux.lds.S 2010-11-06 18:58:15.000000000 -0400
+@@ -199,7 +199,7 @@ SECTIONS {
+ /* Per-cpu data: */
+ . = ALIGN(PERCPU_PAGE_SIZE);
+ PERCPU_VADDR(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.36/arch/ia64/mm/fault.c linux-2.6.36/arch/ia64/mm/fault.c
+--- linux-2.6.36/arch/ia64/mm/fault.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/ia64/mm/fault.c 2010-11-06 18:58:15.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.35.4/arch/ia64/mm/hugetlbpage.c linux-2.6.35.4/arch/ia64/mm/hugetlbpage.c
---- linux-2.6.35.4/arch/ia64/mm/hugetlbpage.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/ia64/mm/hugetlbpage.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/ia64/mm/hugetlbpage.c linux-2.6.36/arch/ia64/mm/hugetlbpage.c
+--- linux-2.6.36/arch/ia64/mm/hugetlbpage.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/ia64/mm/hugetlbpage.c 2010-11-06 18:58:15.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.35.4/arch/ia64/mm/init.c linux-2.6.35.4/arch/ia64/mm/init.c
---- linux-2.6.35.4/arch/ia64/mm/init.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/ia64/mm/init.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/ia64/mm/init.c linux-2.6.36/arch/ia64/mm/init.c
+--- linux-2.6.36/arch/ia64/mm/init.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/ia64/mm/init.c 2010-11-06 18:58:15.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.35.4/arch/ia64/sn/pci/pci_dma.c linux-2.6.35.4/arch/ia64/sn/pci/pci_dma.c
---- linux-2.6.35.4/arch/ia64/sn/pci/pci_dma.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/ia64/sn/pci/pci_dma.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/ia64/sn/pci/pci_dma.c linux-2.6.36/arch/ia64/sn/pci/pci_dma.c
+--- linux-2.6.36/arch/ia64/sn/pci/pci_dma.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/ia64/sn/pci/pci_dma.c 2010-11-06 18:58:15.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.35.4/arch/m32r/lib/usercopy.c linux-2.6.35.4/arch/m32r/lib/usercopy.c
---- linux-2.6.35.4/arch/m32r/lib/usercopy.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/m32r/lib/usercopy.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/m32r/lib/usercopy.c linux-2.6.36/arch/m32r/lib/usercopy.c
+--- linux-2.6.36/arch/m32r/lib/usercopy.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/m32r/lib/usercopy.c 2010-11-06 18:58:15.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.35.4/arch/microblaze/include/asm/device.h linux-2.6.35.4/arch/microblaze/include/asm/device.h
---- linux-2.6.35.4/arch/microblaze/include/asm/device.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/microblaze/include/asm/device.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/microblaze/include/asm/device.h linux-2.6.36/arch/microblaze/include/asm/device.h
+--- linux-2.6.36/arch/microblaze/include/asm/device.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/microblaze/include/asm/device.h 2010-11-06 18:58:15.000000000 -0400
@@ -13,7 +13,7 @@ struct device_node;
struct dev_archdata {
void *dma_data;
};
-diff -urNp linux-2.6.35.4/arch/microblaze/include/asm/dma-mapping.h linux-2.6.35.4/arch/microblaze/include/asm/dma-mapping.h
---- linux-2.6.35.4/arch/microblaze/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/microblaze/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/microblaze/include/asm/dma-mapping.h linux-2.6.36/arch/microblaze/include/asm/dma-mapping.h
+--- linux-2.6.36/arch/microblaze/include/asm/dma-mapping.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/microblaze/include/asm/dma-mapping.h 2010-11-06 18:58:15.000000000 -0400
@@ -43,14 +43,14 @@ static inline unsigned long device_to_ma
return 0xfffffffful;
}
if (unlikely(!ops))
return 0;
-@@ -87,7 +87,7 @@ static inline int dma_supported(struct d
+@@ -81,7 +81,7 @@ static inline int dma_supported(struct d
static inline int dma_set_mask(struct device *dev, u64 dma_mask)
{
if (unlikely(ops == NULL))
return -EIO;
-@@ -103,7 +103,7 @@ static inline int dma_set_mask(struct de
+@@ -97,7 +97,7 @@ static inline int dma_set_mask(struct de
static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
{
if (ops->mapping_error)
return ops->mapping_error(dev, dma_addr);
-@@ -117,7 +117,7 @@ static inline int dma_mapping_error(stru
+@@ -110,7 +110,7 @@ static inline int dma_mapping_error(stru
static inline void *dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, gfp_t flag)
{
void *memory;
BUG_ON(!ops);
-@@ -131,7 +131,7 @@ static inline void *dma_alloc_coherent(s
+@@ -124,7 +124,7 @@ static inline void *dma_alloc_coherent(s
static inline void dma_free_coherent(struct device *dev, size_t size,
void *cpu_addr, dma_addr_t dma_handle)
{
BUG_ON(!ops);
debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
-diff -urNp linux-2.6.35.4/arch/microblaze/include/asm/pci.h linux-2.6.35.4/arch/microblaze/include/asm/pci.h
---- linux-2.6.35.4/arch/microblaze/include/asm/pci.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/microblaze/include/asm/pci.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/microblaze/include/asm/pci.h linux-2.6.36/arch/microblaze/include/asm/pci.h
+--- linux-2.6.36/arch/microblaze/include/asm/pci.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/microblaze/include/asm/pci.h 2010-11-06 18:58:15.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.35.4/arch/microblaze/kernel/dma.c linux-2.6.35.4/arch/microblaze/kernel/dma.c
---- linux-2.6.35.4/arch/microblaze/kernel/dma.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/microblaze/kernel/dma.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/microblaze/kernel/dma.c linux-2.6.36/arch/microblaze/kernel/dma.c
+--- linux-2.6.36/arch/microblaze/kernel/dma.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/microblaze/kernel/dma.c 2010-11-06 18:58:15.000000000 -0400
@@ -133,7 +133,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.35.4/arch/microblaze/pci/pci-common.c linux-2.6.35.4/arch/microblaze/pci/pci-common.c
---- linux-2.6.35.4/arch/microblaze/pci/pci-common.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/microblaze/pci/pci-common.c 2010-09-17 20:12:09.000000000 -0400
-@@ -46,14 +46,14 @@ resource_size_t isa_mem_base;
+diff -urNp linux-2.6.36/arch/microblaze/kernel/kgdb.c linux-2.6.36/arch/microblaze/kernel/kgdb.c
+--- linux-2.6.36/arch/microblaze/kernel/kgdb.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/microblaze/kernel/kgdb.c 2010-11-06 18:58:15.000000000 -0400
+@@ -142,6 +142,6 @@ void kgdb_arch_exit(void)
+ /*
+ * Global data
+ */
+-struct kgdb_arch arch_kgdb_ops = {
++const struct kgdb_arch arch_kgdb_ops = {
+ .gdb_bpt_instr = {0xba, 0x0c, 0x00, 0x18}, /* brki r16, 0x18 */
+ };
+diff -urNp linux-2.6.36/arch/microblaze/pci/pci-common.c linux-2.6.36/arch/microblaze/pci/pci-common.c
+--- linux-2.6.36/arch/microblaze/pci/pci-common.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/microblaze/pci/pci-common.c 2010-11-06 18:58:15.000000000 -0400
+@@ -47,14 +47,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.35.4/arch/mips/alchemy/devboards/pm.c linux-2.6.35.4/arch/mips/alchemy/devboards/pm.c
---- linux-2.6.35.4/arch/mips/alchemy/devboards/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/mips/alchemy/devboards/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/mips/alchemy/devboards/pm.c linux-2.6.36/arch/mips/alchemy/devboards/pm.c
+--- linux-2.6.36/arch/mips/alchemy/devboards/pm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/mips/alchemy/devboards/pm.c 2010-11-06 18:58:15.000000000 -0400
@@ -110,7 +110,7 @@ static void db1x_pm_end(void)
}
.valid = suspend_valid_only_mem,
.begin = db1x_pm_begin,
.enter = db1x_pm_enter,
-diff -urNp linux-2.6.35.4/arch/mips/include/asm/compat.h linux-2.6.35.4/arch/mips/include/asm/compat.h
---- linux-2.6.35.4/arch/mips/include/asm/compat.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/mips/include/asm/compat.h 2010-09-17 20:12:37.000000000 -0400
-@@ -145,7 +145,7 @@ static inline compat_uptr_t ptr_to_compa
- return (u32)(unsigned long)uptr;
- }
-
--static inline void __user *compat_alloc_user_space(long len)
-+static inline void __user *arch_compat_alloc_user_space(long len)
- {
- struct pt_regs *regs = (struct pt_regs *)
- ((unsigned long) current_thread_info() + THREAD_SIZE - 32) - 1;
-diff -urNp linux-2.6.35.4/arch/mips/include/asm/elf.h linux-2.6.35.4/arch/mips/include/asm/elf.h
---- linux-2.6.35.4/arch/mips/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/mips/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/mips/include/asm/elf.h linux-2.6.36/arch/mips/include/asm/elf.h
+--- linux-2.6.36/arch/mips/include/asm/elf.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/mips/include/asm/elf.h 2010-11-06 18:58:15.000000000 -0400
@@ -368,6 +368,13 @@ extern const char *__elf_platform;
#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
#endif
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
struct linux_binprm;
extern int arch_setup_additional_pages(struct linux_binprm *bprm,
-diff -urNp linux-2.6.35.4/arch/mips/include/asm/page.h linux-2.6.35.4/arch/mips/include/asm/page.h
---- linux-2.6.35.4/arch/mips/include/asm/page.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/mips/include/asm/page.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/mips/include/asm/page.h linux-2.6.36/arch/mips/include/asm/page.h
+--- linux-2.6.36/arch/mips/include/asm/page.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/mips/include/asm/page.h 2010-11-06 18:58:15.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.35.4/arch/mips/include/asm/system.h linux-2.6.35.4/arch/mips/include/asm/system.h
---- linux-2.6.35.4/arch/mips/include/asm/system.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/mips/include/asm/system.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/mips/include/asm/system.h linux-2.6.36/arch/mips/include/asm/system.h
+--- linux-2.6.36/arch/mips/include/asm/system.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/mips/include/asm/system.h 2010-11-06 18:58:15.000000000 -0400
@@ -234,6 +234,6 @@ extern void per_cpu_trap_init(void);
*/
#define __ARCH_WANT_UNLOCKED_CTXSW
+#define arch_align_stack(x) ((x) & ALMASK)
#endif /* _ASM_SYSTEM_H */
-diff -urNp linux-2.6.35.4/arch/mips/kernel/binfmt_elfn32.c linux-2.6.35.4/arch/mips/kernel/binfmt_elfn32.c
---- linux-2.6.35.4/arch/mips/kernel/binfmt_elfn32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/mips/kernel/binfmt_elfn32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/mips/jz4740/pm.c linux-2.6.36/arch/mips/jz4740/pm.c
+--- linux-2.6.36/arch/mips/jz4740/pm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/mips/jz4740/pm.c 2010-11-06 18:58:15.000000000 -0400
+@@ -42,7 +42,7 @@ static int jz4740_pm_enter(suspend_state
+ return 0;
+ }
+
+-static struct platform_suspend_ops jz4740_pm_ops = {
++static const struct platform_suspend_ops jz4740_pm_ops = {
+ .valid = suspend_valid_only_mem,
+ .enter = jz4740_pm_enter,
+ };
+diff -urNp linux-2.6.36/arch/mips/kernel/binfmt_elfn32.c linux-2.6.36/arch/mips/kernel/binfmt_elfn32.c
+--- linux-2.6.36/arch/mips/kernel/binfmt_elfn32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/mips/kernel/binfmt_elfn32.c 2010-11-06 18:58:15.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)
#include <asm/processor.h>
#include <linux/module.h>
#include <linux/elfcore.h>
-diff -urNp linux-2.6.35.4/arch/mips/kernel/binfmt_elfo32.c linux-2.6.35.4/arch/mips/kernel/binfmt_elfo32.c
---- linux-2.6.35.4/arch/mips/kernel/binfmt_elfo32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/mips/kernel/binfmt_elfo32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/mips/kernel/binfmt_elfo32.c linux-2.6.36/arch/mips/kernel/binfmt_elfo32.c
+--- linux-2.6.36/arch/mips/kernel/binfmt_elfo32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/mips/kernel/binfmt_elfo32.c 2010-11-06 18:58:15.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)
#include <asm/processor.h>
/*
-diff -urNp linux-2.6.35.4/arch/mips/kernel/kgdb.c linux-2.6.35.4/arch/mips/kernel/kgdb.c
---- linux-2.6.35.4/arch/mips/kernel/kgdb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/mips/kernel/kgdb.c 2010-09-17 20:12:09.000000000 -0400
-@@ -270,6 +270,7 @@ int kgdb_arch_handle_exception(int vecto
+diff -urNp linux-2.6.36/arch/mips/kernel/kgdb.c linux-2.6.36/arch/mips/kernel/kgdb.c
+--- linux-2.6.36/arch/mips/kernel/kgdb.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/mips/kernel/kgdb.c 2010-11-06 18:58:15.000000000 -0400
+@@ -351,6 +351,7 @@ int kgdb_arch_handle_exception(int vecto
return -1;
}
struct kgdb_arch arch_kgdb_ops;
/*
-diff -urNp linux-2.6.35.4/arch/mips/kernel/process.c linux-2.6.35.4/arch/mips/kernel/process.c
---- linux-2.6.35.4/arch/mips/kernel/process.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/mips/kernel/process.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/mips/kernel/process.c linux-2.6.36/arch/mips/kernel/process.c
+--- linux-2.6.36/arch/mips/kernel/process.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/mips/kernel/process.c 2010-11-06 18:58:15.000000000 -0400
@@ -474,15 +474,3 @@ unsigned long get_wchan(struct task_stru
out:
return pc;
-
- return sp & ALMASK;
-}
-diff -urNp linux-2.6.35.4/arch/mips/kernel/syscall.c linux-2.6.35.4/arch/mips/kernel/syscall.c
---- linux-2.6.35.4/arch/mips/kernel/syscall.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/mips/kernel/syscall.c 2010-09-17 20:12:09.000000000 -0400
-@@ -106,17 +106,21 @@ unsigned long arch_get_unmapped_area(str
+diff -urNp linux-2.6.36/arch/mips/kernel/syscall.c linux-2.6.36/arch/mips/kernel/syscall.c
+--- linux-2.6.36/arch/mips/kernel/syscall.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/mips/kernel/syscall.c 2010-11-06 18:58:15.000000000 -0400
+@@ -108,14 +108,18 @@ unsigned long arch_get_unmapped_area(str
do_color_align = 0;
if (filp || (flags & MAP_SHARED))
do_color_align = 1;
+ if (task_size - len >= addr && check_heap_stack_gap(vmm, addr, len))
return addr;
}
-- addr = TASK_UNMAPPED_BASE;
-+ addr = current->mm->mmap_base;
- if (do_color_align)
- addr = COLOUR_ALIGN(addr, pgoff);
- else
-@@ -126,7 +130,7 @@ unsigned long arch_get_unmapped_area(str
+ addr = current->mm->mmap_base;
+@@ -128,7 +132,7 @@ unsigned long arch_get_unmapped_area(str
/* At this point: (!vmm || addr < vmm->vm_end). */
if (task_size - len < addr)
return -ENOMEM;
return addr;
addr = vmm->vm_end;
if (do_color_align)
-diff -urNp linux-2.6.35.4/arch/mips/loongson/common/pm.c linux-2.6.35.4/arch/mips/loongson/common/pm.c
---- linux-2.6.35.4/arch/mips/loongson/common/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/mips/loongson/common/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/mips/loongson/common/pm.c linux-2.6.36/arch/mips/loongson/common/pm.c
+--- linux-2.6.36/arch/mips/loongson/common/pm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/mips/loongson/common/pm.c 2010-11-06 18:58:15.000000000 -0400
@@ -147,7 +147,7 @@ static int loongson_pm_valid_state(suspe
}
}
.valid = loongson_pm_valid_state,
.enter = loongson_pm_enter,
};
-diff -urNp linux-2.6.35.4/arch/mips/mm/fault.c linux-2.6.35.4/arch/mips/mm/fault.c
---- linux-2.6.35.4/arch/mips/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/mips/mm/fault.c 2010-09-17 20:12:09.000000000 -0400
-@@ -26,6 +26,23 @@
- #include <asm/ptrace.h>
+diff -urNp linux-2.6.36/arch/mips/mm/fault.c linux-2.6.36/arch/mips/mm/fault.c
+--- linux-2.6.36/arch/mips/mm/fault.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/mips/mm/fault.c 2010-11-06 18:58:15.000000000 -0400
+@@ -27,6 +27,23 @@
#include <asm/highmem.h> /* For VMALLOC_END */
+ #include <linux/kdebug.h>
+#ifdef CONFIG_PAX_PAGEEXEC
-+void pax_report_insns(void *pc)
++void pax_report_insns(void *pc, void *sp)
+{
+ unsigned long i;
+
/*
* 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.35.4/arch/parisc/include/asm/compat.h linux-2.6.35.4/arch/parisc/include/asm/compat.h
---- linux-2.6.35.4/arch/parisc/include/asm/compat.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/parisc/include/asm/compat.h 2010-09-17 20:12:37.000000000 -0400
-@@ -147,7 +147,7 @@ static inline compat_uptr_t ptr_to_compa
- return (u32)(unsigned long)uptr;
- }
-
--static __inline__ void __user *compat_alloc_user_space(long len)
-+static __inline__ void __user *arch_compat_alloc_user_space(long len)
- {
- struct pt_regs *regs = ¤t->thread.regs;
- return (void __user *)regs->gr[30];
-diff -urNp linux-2.6.35.4/arch/parisc/include/asm/elf.h linux-2.6.35.4/arch/parisc/include/asm/elf.h
---- linux-2.6.35.4/arch/parisc/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/parisc/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/parisc/include/asm/elf.h linux-2.6.36/arch/parisc/include/asm/elf.h
+--- linux-2.6.36/arch/parisc/include/asm/elf.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/parisc/include/asm/elf.h 2010-11-06 18:58:15.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.35.4/arch/parisc/include/asm/pgtable.h linux-2.6.35.4/arch/parisc/include/asm/pgtable.h
---- linux-2.6.35.4/arch/parisc/include/asm/pgtable.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/parisc/include/asm/pgtable.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/parisc/include/asm/pgtable.h linux-2.6.36/arch/parisc/include/asm/pgtable.h
+--- linux-2.6.36/arch/parisc/include/asm/pgtable.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/parisc/include/asm/pgtable.h 2010-11-06 18:58:15.000000000 -0400
@@ -207,6 +207,17 @@
#define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
#define PAGE_COPY PAGE_EXECREAD
#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.35.4/arch/parisc/kernel/module.c linux-2.6.35.4/arch/parisc/kernel/module.c
---- linux-2.6.35.4/arch/parisc/kernel/module.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/parisc/kernel/module.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/parisc/kernel/module.c linux-2.6.36/arch/parisc/kernel/module.c
+--- linux-2.6.36/arch/parisc/kernel/module.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/parisc/kernel/module.c 2010-11-06 18:58:15.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.35.4/arch/parisc/kernel/sys_parisc.c linux-2.6.35.4/arch/parisc/kernel/sys_parisc.c
---- linux-2.6.35.4/arch/parisc/kernel/sys_parisc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/parisc/kernel/sys_parisc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/parisc/kernel/sys_parisc.c linux-2.6.36/arch/parisc/kernel/sys_parisc.c
+--- linux-2.6.36/arch/parisc/kernel/sys_parisc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/parisc/kernel/sys_parisc.c 2010-11-06 18:58:15.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.35.4/arch/parisc/kernel/traps.c linux-2.6.35.4/arch/parisc/kernel/traps.c
---- linux-2.6.35.4/arch/parisc/kernel/traps.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/parisc/kernel/traps.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/parisc/kernel/traps.c linux-2.6.36/arch/parisc/kernel/traps.c
+--- linux-2.6.36/arch/parisc/kernel/traps.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/parisc/kernel/traps.c 2010-11-06 18:58:15.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.35.4/arch/parisc/mm/fault.c linux-2.6.35.4/arch/parisc/mm/fault.c
---- linux-2.6.35.4/arch/parisc/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/parisc/mm/fault.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/parisc/mm/fault.c linux-2.6.36/arch/parisc/mm/fault.c
+--- linux-2.6.36/arch/parisc/mm/fault.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/parisc/mm/fault.c 2010-11-06 18:58:15.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.35.4/arch/powerpc/include/asm/compat.h linux-2.6.35.4/arch/powerpc/include/asm/compat.h
---- linux-2.6.35.4/arch/powerpc/include/asm/compat.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/include/asm/compat.h 2010-09-17 20:12:37.000000000 -0400
-@@ -134,7 +134,7 @@ static inline compat_uptr_t ptr_to_compa
- return (u32)(unsigned long)uptr;
- }
-
--static inline void __user *compat_alloc_user_space(long len)
-+static inline void __user *arch_compat_alloc_user_space(long len)
- {
- struct pt_regs *regs = current->thread.regs;
- unsigned long usp = regs->gpr[1];
-diff -urNp linux-2.6.35.4/arch/powerpc/include/asm/device.h linux-2.6.35.4/arch/powerpc/include/asm/device.h
---- linux-2.6.35.4/arch/powerpc/include/asm/device.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/include/asm/device.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/include/asm/device.h linux-2.6.36/arch/powerpc/include/asm/device.h
+--- linux-2.6.36/arch/powerpc/include/asm/device.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/include/asm/device.h 2010-11-06 18:58:15.000000000 -0400
@@ -11,7 +11,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.35.4/arch/powerpc/include/asm/dma-mapping.h linux-2.6.35.4/arch/powerpc/include/asm/dma-mapping.h
---- linux-2.6.35.4/arch/powerpc/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/include/asm/dma-mapping.h linux-2.6.36/arch/powerpc/include/asm/dma-mapping.h
+--- linux-2.6.36/arch/powerpc/include/asm/dma-mapping.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/include/asm/dma-mapping.h 2010-11-06 18:58:15.000000000 -0400
@@ -66,12 +66,13 @@ static inline unsigned long device_to_ma
/*
* Available generic sets of operations
if (dma_ops->mapping_error)
return dma_ops->mapping_error(dev, dma_addr);
-diff -urNp linux-2.6.35.4/arch/powerpc/include/asm/elf.h linux-2.6.35.4/arch/powerpc/include/asm/elf.h
---- linux-2.6.35.4/arch/powerpc/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/include/asm/elf.h linux-2.6.36/arch/powerpc/include/asm/elf.h
+--- linux-2.6.36/arch/powerpc/include/asm/elf.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/include/asm/elf.h 2010-11-06 18:58:15.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.35.4/arch/powerpc/include/asm/iommu.h linux-2.6.35.4/arch/powerpc/include/asm/iommu.h
---- linux-2.6.35.4/arch/powerpc/include/asm/iommu.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/include/asm/iommu.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/include/asm/iommu.h linux-2.6.36/arch/powerpc/include/asm/iommu.h
+--- linux-2.6.36/arch/powerpc/include/asm/iommu.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/include/asm/iommu.h 2010-11-06 18:58:15.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.35.4/arch/powerpc/include/asm/kmap_types.h linux-2.6.35.4/arch/powerpc/include/asm/kmap_types.h
---- linux-2.6.35.4/arch/powerpc/include/asm/kmap_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/include/asm/kmap_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/include/asm/kmap_types.h linux-2.6.36/arch/powerpc/include/asm/kmap_types.h
+--- linux-2.6.36/arch/powerpc/include/asm/kmap_types.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/include/asm/kmap_types.h 2010-11-06 18:58:15.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.35.4/arch/powerpc/include/asm/page_64.h linux-2.6.35.4/arch/powerpc/include/asm/page_64.h
---- linux-2.6.35.4/arch/powerpc/include/asm/page_64.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/include/asm/page_64.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/include/asm/page_64.h linux-2.6.36/arch/powerpc/include/asm/page_64.h
+--- linux-2.6.36/arch/powerpc/include/asm/page_64.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/include/asm/page_64.h 2010-11-06 18:58:15.000000000 -0400
@@ -172,15 +172,18 @@ do { \
* stack by default, so in the absense of a PT_GNU_STACK program header
* we turn execute permission off.
#include <asm-generic/getorder.h>
-diff -urNp linux-2.6.35.4/arch/powerpc/include/asm/page.h linux-2.6.35.4/arch/powerpc/include/asm/page.h
---- linux-2.6.35.4/arch/powerpc/include/asm/page.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/include/asm/page.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/include/asm/page.h linux-2.6.36/arch/powerpc/include/asm/page.h
+--- linux-2.6.36/arch/powerpc/include/asm/page.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/include/asm/page.h 2010-11-06 18:58:15.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.35.4/arch/powerpc/include/asm/pci.h linux-2.6.35.4/arch/powerpc/include/asm/pci.h
---- linux-2.6.35.4/arch/powerpc/include/asm/pci.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/include/asm/pci.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/include/asm/pci.h linux-2.6.36/arch/powerpc/include/asm/pci.h
+--- linux-2.6.36/arch/powerpc/include/asm/pci.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/include/asm/pci.h 2010-11-06 18:58:15.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.35.4/arch/powerpc/include/asm/pte-hash32.h linux-2.6.35.4/arch/powerpc/include/asm/pte-hash32.h
---- linux-2.6.35.4/arch/powerpc/include/asm/pte-hash32.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/include/asm/pte-hash32.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/include/asm/pte-hash32.h linux-2.6.36/arch/powerpc/include/asm/pte-hash32.h
+--- linux-2.6.36/arch/powerpc/include/asm/pte-hash32.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/include/asm/pte-hash32.h 2010-11-06 18:58:15.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.35.4/arch/powerpc/include/asm/reg.h linux-2.6.35.4/arch/powerpc/include/asm/reg.h
---- linux-2.6.35.4/arch/powerpc/include/asm/reg.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/include/asm/reg.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/include/asm/reg.h linux-2.6.36/arch/powerpc/include/asm/reg.h
+--- linux-2.6.36/arch/powerpc/include/asm/reg.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/include/asm/reg.h 2010-11-06 18:58:15.000000000 -0400
@@ -191,6 +191,7 @@
#define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
#define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
#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.35.4/arch/powerpc/include/asm/swiotlb.h linux-2.6.35.4/arch/powerpc/include/asm/swiotlb.h
---- linux-2.6.35.4/arch/powerpc/include/asm/swiotlb.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/include/asm/swiotlb.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/include/asm/swiotlb.h linux-2.6.36/arch/powerpc/include/asm/swiotlb.h
+--- linux-2.6.36/arch/powerpc/include/asm/swiotlb.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/include/asm/swiotlb.h 2010-11-06 18:58:15.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.35.4/arch/powerpc/include/asm/uaccess.h linux-2.6.35.4/arch/powerpc/include/asm/uaccess.h
---- linux-2.6.35.4/arch/powerpc/include/asm/uaccess.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/include/asm/uaccess.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/include/asm/uaccess.h linux-2.6.36/arch/powerpc/include/asm/uaccess.h
+--- linux-2.6.36/arch/powerpc/include/asm/uaccess.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/include/asm/uaccess.h 2010-11-06 18:58:15.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.35.4/arch/powerpc/kernel/dma.c linux-2.6.35.4/arch/powerpc/kernel/dma.c
---- linux-2.6.35.4/arch/powerpc/kernel/dma.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/kernel/dma.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/kernel/dma.c linux-2.6.36/arch/powerpc/kernel/dma.c
+--- linux-2.6.36/arch/powerpc/kernel/dma.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/kernel/dma.c 2010-11-06 18:58:15.000000000 -0400
@@ -135,7 +135,7 @@ static inline void dma_direct_sync_singl
}
#endif
.alloc_coherent = dma_direct_alloc_coherent,
.free_coherent = dma_direct_free_coherent,
.map_sg = dma_direct_map_sg,
-diff -urNp linux-2.6.35.4/arch/powerpc/kernel/dma-iommu.c linux-2.6.35.4/arch/powerpc/kernel/dma-iommu.c
---- linux-2.6.35.4/arch/powerpc/kernel/dma-iommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/kernel/dma-iommu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/kernel/dma-iommu.c linux-2.6.36/arch/powerpc/kernel/dma-iommu.c
+--- linux-2.6.36/arch/powerpc/kernel/dma-iommu.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/kernel/dma-iommu.c 2010-11-06 18:58:15.000000000 -0400
@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
}
{
struct iommu_table *tbl = get_iommu_table_base(dev);
-diff -urNp linux-2.6.35.4/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.35.4/arch/powerpc/kernel/dma-swiotlb.c
---- linux-2.6.35.4/arch/powerpc/kernel/dma-swiotlb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/kernel/dma-swiotlb.c 2010-09-17 20:12:09.000000000 -0400
+@@ -89,6 +89,7 @@ static int dma_iommu_dma_supported(struc
+ return 1;
+ }
+
++/* cannot be const, see arch/powerpc/platforms/cell/iommu.c */
+ struct dma_map_ops dma_iommu_ops = {
+ .alloc_coherent = dma_iommu_alloc_coherent,
+ .free_coherent = dma_iommu_free_coherent,
+diff -urNp linux-2.6.36/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.36/arch/powerpc/kernel/dma-swiotlb.c
+--- linux-2.6.36/arch/powerpc/kernel/dma-swiotlb.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/kernel/dma-swiotlb.c 2010-11-06 18:58:15.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.35.4/arch/powerpc/kernel/exceptions-64e.S linux-2.6.35.4/arch/powerpc/kernel/exceptions-64e.S
---- linux-2.6.35.4/arch/powerpc/kernel/exceptions-64e.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/kernel/exceptions-64e.S 2010-09-17 20:12:09.000000000 -0400
-@@ -455,6 +455,7 @@ storage_fault_common:
+diff -urNp linux-2.6.36/arch/powerpc/kernel/exceptions-64e.S linux-2.6.36/arch/powerpc/kernel/exceptions-64e.S
+--- linux-2.6.36/arch/powerpc/kernel/exceptions-64e.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/kernel/exceptions-64e.S 2010-11-06 18:58:15.000000000 -0400
+@@ -495,6 +495,7 @@ storage_fault_common:
std r14,_DAR(r1)
std r15,_DSISR(r1)
addi r3,r1,STACK_FRAME_OVERHEAD
mr r4,r14
mr r5,r15
ld r14,PACA_EXGEN+EX_R14(r13)
-@@ -464,8 +465,7 @@ storage_fault_common:
+@@ -504,8 +505,7 @@ storage_fault_common:
cmpdi r3,0
bne- 1f
b .ret_from_except_lite
addi r3,r1,STACK_FRAME_OVERHEAD
ld r4,_DAR(r1)
bl .bad_page_fault
-diff -urNp linux-2.6.35.4/arch/powerpc/kernel/exceptions-64s.S linux-2.6.35.4/arch/powerpc/kernel/exceptions-64s.S
---- linux-2.6.35.4/arch/powerpc/kernel/exceptions-64s.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/kernel/exceptions-64s.S 2010-09-17 20:12:09.000000000 -0400
-@@ -840,10 +840,10 @@ handle_page_fault:
+diff -urNp linux-2.6.36/arch/powerpc/kernel/exceptions-64s.S linux-2.6.36/arch/powerpc/kernel/exceptions-64s.S
+--- linux-2.6.36/arch/powerpc/kernel/exceptions-64s.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/kernel/exceptions-64s.S 2010-11-06 18:58:15.000000000 -0400
+@@ -841,10 +841,10 @@ handle_page_fault:
11: ld r4,_DAR(r1)
ld r5,_DSISR(r1)
addi r3,r1,STACK_FRAME_OVERHEAD
mr r5,r3
addi r3,r1,STACK_FRAME_OVERHEAD
lwz r4,_DAR(r1)
-diff -urNp linux-2.6.35.4/arch/powerpc/kernel/ibmebus.c linux-2.6.35.4/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.35.4/arch/powerpc/kernel/ibmebus.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/kernel/ibmebus.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/kernel/ibmebus.c linux-2.6.36/arch/powerpc/kernel/ibmebus.c
+--- linux-2.6.36/arch/powerpc/kernel/ibmebus.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/kernel/ibmebus.c 2010-11-06 18:58:15.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.35.4/arch/powerpc/kernel/kgdb.c linux-2.6.35.4/arch/powerpc/kernel/kgdb.c
---- linux-2.6.35.4/arch/powerpc/kernel/kgdb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/kernel/kgdb.c 2010-09-17 20:12:09.000000000 -0400
-@@ -128,7 +128,7 @@ static int kgdb_handle_breakpoint(struct
- if (kgdb_handle_exception(1, SIGTRAP, 0, regs) != 0)
- return 0;
-
-- if (*(u32 *) (regs->nip) == *(u32 *) (&arch_kgdb_ops.gdb_bpt_instr))
-+ if (*(u32 *) (regs->nip) == *(const u32 *) (&arch_kgdb_ops.gdb_bpt_instr))
- regs->nip += 4;
-
- return 1;
+diff -urNp linux-2.6.36/arch/powerpc/kernel/kgdb.c linux-2.6.36/arch/powerpc/kernel/kgdb.c
+--- linux-2.6.36/arch/powerpc/kernel/kgdb.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/kernel/kgdb.c 2010-11-06 18:58:15.000000000 -0400
@@ -360,7 +360,7 @@ int kgdb_arch_handle_exception(int vecto
/*
* Global data
.gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
};
-diff -urNp linux-2.6.35.4/arch/powerpc/kernel/module_32.c linux-2.6.35.4/arch/powerpc/kernel/module_32.c
---- linux-2.6.35.4/arch/powerpc/kernel/module_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/kernel/module_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/kernel/module_32.c linux-2.6.36/arch/powerpc/kernel/module_32.c
+--- linux-2.6.36/arch/powerpc/kernel/module_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/kernel/module_32.c 2010-11-06 18:58:15.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.35.4/arch/powerpc/kernel/module.c linux-2.6.35.4/arch/powerpc/kernel/module.c
---- linux-2.6.35.4/arch/powerpc/kernel/module.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/kernel/module.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/kernel/module.c linux-2.6.36/arch/powerpc/kernel/module.c
+--- linux-2.6.36/arch/powerpc/kernel/module.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/kernel/module.c 2010-11-06 18:58:15.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.35.4/arch/powerpc/kernel/pci-common.c linux-2.6.35.4/arch/powerpc/kernel/pci-common.c
---- linux-2.6.35.4/arch/powerpc/kernel/pci-common.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/kernel/pci-common.c 2010-09-17 20:12:09.000000000 -0400
-@@ -51,14 +51,14 @@ resource_size_t isa_mem_base;
+diff -urNp linux-2.6.36/arch/powerpc/kernel/pci-common.c linux-2.6.36/arch/powerpc/kernel/pci-common.c
+--- linux-2.6.36/arch/powerpc/kernel/pci-common.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/kernel/pci-common.c 2010-11-06 18:58:15.000000000 -0400
+@@ -52,14 +52,14 @@ resource_size_t isa_mem_base;
unsigned int ppc_pci_flags = 0;
{
return pci_dma_ops;
}
-diff -urNp linux-2.6.35.4/arch/powerpc/kernel/process.c linux-2.6.35.4/arch/powerpc/kernel/process.c
---- linux-2.6.35.4/arch/powerpc/kernel/process.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/kernel/process.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1215,51 +1215,3 @@ unsigned long arch_align_stack(unsigned
- sp -= get_random_int() & ~PAGE_MASK;
+diff -urNp linux-2.6.36/arch/powerpc/kernel/process.c linux-2.6.36/arch/powerpc/kernel/process.c
+--- linux-2.6.36/arch/powerpc/kernel/process.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/kernel/process.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1251,54 +1251,6 @@ unsigned long arch_align_stack(unsigned
return sp & ~0xf;
}
--
+
-static inline unsigned long brk_rnd(void)
-{
- unsigned long rnd = 0;
-
- return ret;
-}
-diff -urNp linux-2.6.35.4/arch/powerpc/kernel/signal_32.c linux-2.6.35.4/arch/powerpc/kernel/signal_32.c
---- linux-2.6.35.4/arch/powerpc/kernel/signal_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/kernel/signal_32.c 2010-09-17 20:12:09.000000000 -0400
-@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
+-
+ #ifdef CONFIG_SMP
+ int arch_sd_sibling_asym_packing(void)
+ {
+diff -urNp linux-2.6.36/arch/powerpc/kernel/signal_32.c linux-2.6.36/arch/powerpc/kernel/signal_32.c
+--- linux-2.6.36/arch/powerpc/kernel/signal_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/kernel/signal_32.c 2010-11-06 18:58:15.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;
addr = frame;
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.35.4/arch/powerpc/kernel/signal_64.c linux-2.6.35.4/arch/powerpc/kernel/signal_64.c
---- linux-2.6.35.4/arch/powerpc/kernel/signal_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/kernel/signal_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/kernel/signal_64.c linux-2.6.36/arch/powerpc/kernel/signal_64.c
+--- linux-2.6.36/arch/powerpc/kernel/signal_64.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/kernel/signal_64.c 2010-11-06 18:58:15.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.35.4/arch/powerpc/kernel/vdso.c linux-2.6.35.4/arch/powerpc/kernel/vdso.c
---- linux-2.6.35.4/arch/powerpc/kernel/vdso.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/kernel/vdso.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/kernel/vdso.c linux-2.6.36/arch/powerpc/kernel/vdso.c
+--- linux-2.6.36/arch/powerpc/kernel/vdso.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/kernel/vdso.c 2010-11-06 18:58:15.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.35.4/arch/powerpc/kernel/vio.c linux-2.6.35.4/arch/powerpc/kernel/vio.c
---- linux-2.6.35.4/arch/powerpc/kernel/vio.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/kernel/vio.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/kernel/vio.c linux-2.6.36/arch/powerpc/kernel/vio.c
+--- linux-2.6.36/arch/powerpc/kernel/vio.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/kernel/vio.c 2010-11-06 18:58:15.000000000 -0400
@@ -602,11 +602,12 @@ static void vio_dma_iommu_unmap_sg(struc
vio_cmo_dealloc(viodev, alloc_size);
}
viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
}
-diff -urNp linux-2.6.35.4/arch/powerpc/lib/usercopy_64.c linux-2.6.35.4/arch/powerpc/lib/usercopy_64.c
---- linux-2.6.35.4/arch/powerpc/lib/usercopy_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/lib/usercopy_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/lib/usercopy_64.c linux-2.6.36/arch/powerpc/lib/usercopy_64.c
+--- linux-2.6.36/arch/powerpc/lib/usercopy_64.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/lib/usercopy_64.c 2010-11-06 18:58:15.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.35.4/arch/powerpc/mm/fault.c linux-2.6.35.4/arch/powerpc/mm/fault.c
---- linux-2.6.35.4/arch/powerpc/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/mm/fault.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/mm/fault.c linux-2.6.36/arch/powerpc/mm/fault.c
+--- linux-2.6.36/arch/powerpc/mm/fault.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/mm/fault.c 2010-11-06 18:58:15.000000000 -0400
@@ -30,6 +30,10 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
_exception(SIGSEGV, regs, code, address);
return 0;
}
-diff -urNp linux-2.6.35.4/arch/powerpc/mm/mmap_64.c linux-2.6.35.4/arch/powerpc/mm/mmap_64.c
---- linux-2.6.35.4/arch/powerpc/mm/mmap_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/mm/mmap_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/mm/mmap_64.c linux-2.6.36/arch/powerpc/mm/mmap_64.c
+--- linux-2.6.36/arch/powerpc/mm/mmap_64.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/mm/mmap_64.c 2010-11-06 18:58:15.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.35.4/arch/powerpc/mm/slice.c linux-2.6.35.4/arch/powerpc/mm/slice.c
---- linux-2.6.35.4/arch/powerpc/mm/slice.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/mm/slice.c 2010-09-17 20:12:09.000000000 -0400
-@@ -98,10 +98,9 @@ static int slice_area_is_free(struct mm_
+diff -urNp linux-2.6.36/arch/powerpc/mm/slice.c linux-2.6.36/arch/powerpc/mm/slice.c
+--- linux-2.6.36/arch/powerpc/mm/slice.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/mm/slice.c 2010-11-06 18:58:15.000000000 -0400
+@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
if ((mm->task_size - len) < addr)
return 0;
vma = find_vma(mm, addr);
+ return check_heap_stack_gap(vma, addr, len);
}
--static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
- {
- return !slice_area_is_free(mm, slice << SLICE_LOW_SHIFT,
- 1ul << SLICE_LOW_SHIFT);
-@@ -256,7 +255,7 @@ full_search:
+ static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
+@@ -256,7 +256,7 @@ full_search:
addr = _ALIGN_UP(addr + 1, 1ul << SLICE_HIGH_SHIFT);
continue;
}
/*
* Remember the place where we stopped the search:
*/
-@@ -336,7 +335,7 @@ static unsigned long slice_find_area_top
+@@ -336,7 +336,7 @@ static unsigned long slice_find_area_top
* return with success:
*/
vma = find_vma(mm, addr);
/* remember the address as a hint for next time */
if (use_cache)
mm->free_area_cache = addr;
-@@ -426,6 +425,11 @@ unsigned long slice_get_unmapped_area(un
+@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un
if (fixed && addr > (mm->task_size - len))
return -EINVAL;
/* If hint, make sure it matches our alignment restrictions */
if (!fixed && addr) {
addr = _ALIGN_UP(addr, 1ul << pshift);
-diff -urNp linux-2.6.35.4/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.35.4/arch/powerpc/platforms/52xx/lite5200_pm.c
---- linux-2.6.35.4/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-09-17 20:12:09.000000000 -0400
-@@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
+diff -urNp linux-2.6.36/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.36/arch/powerpc/platforms/52xx/lite5200_pm.c
+--- linux-2.6.36/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-11-06 18:58:15.000000000 -0400
+@@ -232,7 +232,7 @@ static void lite5200_pm_end(void)
lite5200_pm_target_state = PM_SUSPEND_ON;
}
.valid = lite5200_pm_valid,
.begin = lite5200_pm_begin,
.prepare = lite5200_pm_prepare,
-diff -urNp linux-2.6.35.4/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.35.4/arch/powerpc/platforms/52xx/mpc52xx_pm.c
---- linux-2.6.35.4/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-09-17 20:12:09.000000000 -0400
-@@ -189,7 +189,7 @@ void mpc52xx_pm_finish(void)
+diff -urNp linux-2.6.36/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.36/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+--- linux-2.6.36/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-11-06 18:58:15.000000000 -0400
+@@ -186,7 +186,7 @@ void mpc52xx_pm_finish(void)
iounmap(mbar);
}
.valid = mpc52xx_pm_valid,
.prepare = mpc52xx_pm_prepare,
.enter = mpc52xx_pm_enter,
-diff -urNp linux-2.6.35.4/arch/powerpc/platforms/83xx/suspend.c linux-2.6.35.4/arch/powerpc/platforms/83xx/suspend.c
---- linux-2.6.35.4/arch/powerpc/platforms/83xx/suspend.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/platforms/83xx/suspend.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/platforms/83xx/suspend.c linux-2.6.36/arch/powerpc/platforms/83xx/suspend.c
+--- linux-2.6.36/arch/powerpc/platforms/83xx/suspend.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/platforms/83xx/suspend.c 2010-11-06 18:58:15.000000000 -0400
@@ -311,7 +311,7 @@ static int mpc83xx_is_pci_agent(void)
return ret;
}
.valid = mpc83xx_suspend_valid,
.begin = mpc83xx_suspend_begin,
.enter = mpc83xx_suspend_enter,
-diff -urNp linux-2.6.35.4/arch/powerpc/platforms/cell/iommu.c linux-2.6.35.4/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.35.4/arch/powerpc/platforms/cell/iommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/platforms/cell/iommu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/platforms/cell/iommu.c linux-2.6.36/arch/powerpc/platforms/cell/iommu.c
+--- linux-2.6.36/arch/powerpc/platforms/cell/iommu.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/platforms/cell/iommu.c 2010-11-06 18:58:15.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.35.4/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.35.4/arch/powerpc/platforms/ps3/system-bus.c
---- linux-2.6.35.4/arch/powerpc/platforms/ps3/system-bus.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/platforms/ps3/system-bus.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.36/arch/powerpc/platforms/ps3/system-bus.c
+--- linux-2.6.36/arch/powerpc/platforms/ps3/system-bus.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/platforms/ps3/system-bus.c 2010-11-06 18:58:15.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.35.4/arch/powerpc/sysdev/fsl_pmc.c linux-2.6.35.4/arch/powerpc/sysdev/fsl_pmc.c
---- linux-2.6.35.4/arch/powerpc/sysdev/fsl_pmc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/powerpc/sysdev/fsl_pmc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/powerpc/platforms/pseries/suspend.c linux-2.6.36/arch/powerpc/platforms/pseries/suspend.c
+--- linux-2.6.36/arch/powerpc/platforms/pseries/suspend.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/platforms/pseries/suspend.c 2010-11-06 18:58:15.000000000 -0400
+@@ -153,7 +153,7 @@ static struct sysdev_class suspend_sysde
+ .name = "power",
+ };
+
+-static struct platform_suspend_ops pseries_suspend_ops = {
++static const struct platform_suspend_ops pseries_suspend_ops = {
+ .valid = suspend_valid_only_mem,
+ .begin = pseries_suspend_begin,
+ .prepare_late = pseries_prepare_late,
+diff -urNp linux-2.6.36/arch/powerpc/sysdev/fsl_pmc.c linux-2.6.36/arch/powerpc/sysdev/fsl_pmc.c
+--- linux-2.6.36/arch/powerpc/sysdev/fsl_pmc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/powerpc/sysdev/fsl_pmc.c 2010-11-06 18:58:15.000000000 -0400
@@ -53,7 +53,7 @@ static int pmc_suspend_valid(suspend_sta
return 1;
}
.valid = pmc_suspend_valid,
.enter = pmc_suspend_enter,
};
-diff -urNp linux-2.6.35.4/arch/s390/include/asm/compat.h linux-2.6.35.4/arch/s390/include/asm/compat.h
---- linux-2.6.35.4/arch/s390/include/asm/compat.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/s390/include/asm/compat.h 2010-09-17 20:12:37.000000000 -0400
-@@ -181,7 +181,7 @@ static inline int is_compat_task(void)
-
- #endif
-
--static inline void __user *compat_alloc_user_space(long len)
-+static inline void __user *arch_compat_alloc_user_space(long len)
- {
- unsigned long stack;
-
-diff -urNp linux-2.6.35.4/arch/s390/include/asm/elf.h linux-2.6.35.4/arch/s390/include/asm/elf.h
---- linux-2.6.35.4/arch/s390/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/s390/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/s390/include/asm/elf.h linux-2.6.36/arch/s390/include/asm/elf.h
+--- linux-2.6.36/arch/s390/include/asm/elf.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/s390/include/asm/elf.h 2010-11-06 18:58:15.000000000 -0400
@@ -163,6 +163,13 @@ extern unsigned int vdso_enabled;
that it will "exec", and that there is sufficient room for the brk. */
#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
/* This yields a mask that user programs can use to figure out what
instruction set this CPU supports. */
-diff -urNp linux-2.6.35.4/arch/s390/include/asm/uaccess.h linux-2.6.35.4/arch/s390/include/asm/uaccess.h
---- linux-2.6.35.4/arch/s390/include/asm/uaccess.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/s390/include/asm/uaccess.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/s390/include/asm/uaccess.h linux-2.6.36/arch/s390/include/asm/uaccess.h
+--- linux-2.6.36/arch/s390/include/asm/uaccess.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/s390/include/asm/uaccess.h 2010-11-06 18:58:15.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.35.4/arch/s390/Kconfig linux-2.6.35.4/arch/s390/Kconfig
---- linux-2.6.35.4/arch/s390/Kconfig 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/s390/Kconfig 2010-09-17 20:12:09.000000000 -0400
-@@ -230,13 +230,12 @@ config AUDIT_ARCH
+diff -urNp linux-2.6.36/arch/s390/Kconfig linux-2.6.36/arch/s390/Kconfig
+--- linux-2.6.36/arch/s390/Kconfig 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/s390/Kconfig 2010-11-06 18:58:15.000000000 -0400
+@@ -227,13 +227,12 @@ config AUDIT_ARCH
config S390_EXEC_PROTECT
bool "Data execute protection"
comment "Code generation options"
-diff -urNp linux-2.6.35.4/arch/s390/kernel/module.c linux-2.6.35.4/arch/s390/kernel/module.c
---- linux-2.6.35.4/arch/s390/kernel/module.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/s390/kernel/module.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/s390/kernel/module.c linux-2.6.36/arch/s390/kernel/module.c
+--- linux-2.6.36/arch/s390/kernel/module.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/s390/kernel/module.c 2010-11-06 18:58:15.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.35.4/arch/s390/kernel/setup.c linux-2.6.35.4/arch/s390/kernel/setup.c
---- linux-2.6.35.4/arch/s390/kernel/setup.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/s390/kernel/setup.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/s390/kernel/setup.c linux-2.6.36/arch/s390/kernel/setup.c
+--- linux-2.6.36/arch/s390/kernel/setup.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/s390/kernel/setup.c 2010-11-06 18:58:15.000000000 -0400
@@ -281,7 +281,7 @@ static int __init early_parse_mem(char *
}
early_param("mem", early_parse_mem);
static void setup_addressing_mode(void)
{
if (user_mode == SECONDARY_SPACE_MODE) {
-diff -urNp linux-2.6.35.4/arch/s390/mm/maccess.c linux-2.6.35.4/arch/s390/mm/maccess.c
---- linux-2.6.35.4/arch/s390/mm/maccess.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/s390/mm/maccess.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/s390/mm/maccess.c linux-2.6.36/arch/s390/mm/maccess.c
+--- linux-2.6.36/arch/s390/mm/maccess.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/s390/mm/maccess.c 2010-11-06 18:58:15.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.35.4/arch/s390/mm/mmap.c linux-2.6.35.4/arch/s390/mm/mmap.c
---- linux-2.6.35.4/arch/s390/mm/mmap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/s390/mm/mmap.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/s390/mm/mmap.c linux-2.6.36/arch/s390/mm/mmap.c
+--- linux-2.6.36/arch/s390/mm/mmap.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/s390/mm/mmap.c 2010-11-06 18:58:15.000000000 -0400
@@ -78,10 +78,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.35.4/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.35.4/arch/sh/boards/mach-hp6xx/pm.c
---- linux-2.6.35.4/arch/sh/boards/mach-hp6xx/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sh/boards/mach-hp6xx/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.36/arch/sh/boards/mach-hp6xx/pm.c
+--- linux-2.6.36/arch/sh/boards/mach-hp6xx/pm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sh/boards/mach-hp6xx/pm.c 2010-11-06 18:58:15.000000000 -0400
@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
return 0;
}
.enter = hp6x0_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.35.4/arch/sh/include/asm/dma-mapping.h linux-2.6.35.4/arch/sh/include/asm/dma-mapping.h
---- linux-2.6.35.4/arch/sh/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sh/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sh/include/asm/dma-mapping.h linux-2.6.36/arch/sh/include/asm/dma-mapping.h
+--- linux-2.6.36/arch/sh/include/asm/dma-mapping.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sh/include/asm/dma-mapping.h 2010-11-06 18:58:15.000000000 -0400
@@ -1,10 +1,10 @@
#ifndef __ASM_SH_DMA_MAPPING_H
#define __ASM_SH_DMA_MAPPING_H
if (!dev->dma_mask || !dma_supported(dev, mask))
return -EIO;
-@@ -59,7 +59,7 @@ static inline int dma_get_cache_alignmen
+@@ -44,7 +44,7 @@ void dma_cache_sync(struct device *dev,
static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
{
if (ops->mapping_error)
return ops->mapping_error(dev, dma_addr);
-@@ -70,7 +70,7 @@ static inline int dma_mapping_error(stru
+@@ -55,7 +55,7 @@ static inline int dma_mapping_error(stru
static inline void *dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, gfp_t gfp)
{
void *memory;
if (dma_alloc_from_coherent(dev, size, dma_handle, &memory))
-@@ -87,7 +87,7 @@ static inline void *dma_alloc_coherent(s
+@@ -72,7 +72,7 @@ static inline void *dma_alloc_coherent(s
static inline void dma_free_coherent(struct device *dev, size_t size,
void *vaddr, dma_addr_t dma_handle)
{
if (dma_release_from_coherent(dev, get_order(size), vaddr))
return;
-diff -urNp linux-2.6.35.4/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.35.4/arch/sh/kernel/cpu/shmobile/pm.c
---- linux-2.6.35.4/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sh/kernel/cpu/shmobile/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.36/arch/sh/kernel/cpu/shmobile/pm.c
+--- linux-2.6.36/arch/sh/kernel/cpu/shmobile/pm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sh/kernel/cpu/shmobile/pm.c 2010-11-06 18:58:15.000000000 -0400
@@ -141,7 +141,7 @@ static int sh_pm_enter(suspend_state_t s
return 0;
}
.enter = sh_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.35.4/arch/sh/kernel/dma-nommu.c linux-2.6.35.4/arch/sh/kernel/dma-nommu.c
---- linux-2.6.35.4/arch/sh/kernel/dma-nommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sh/kernel/dma-nommu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sh/kernel/dma-nommu.c linux-2.6.36/arch/sh/kernel/dma-nommu.c
+--- linux-2.6.36/arch/sh/kernel/dma-nommu.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sh/kernel/dma-nommu.c 2010-11-06 18:58:15.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.35.4/arch/sh/kernel/kgdb.c linux-2.6.35.4/arch/sh/kernel/kgdb.c
---- linux-2.6.35.4/arch/sh/kernel/kgdb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sh/kernel/kgdb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sh/kernel/kgdb.c linux-2.6.36/arch/sh/kernel/kgdb.c
+--- linux-2.6.36/arch/sh/kernel/kgdb.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sh/kernel/kgdb.c 2010-11-06 18:58:15.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.35.4/arch/sh/mm/consistent.c linux-2.6.35.4/arch/sh/mm/consistent.c
---- linux-2.6.35.4/arch/sh/mm/consistent.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sh/mm/consistent.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sh/mm/consistent.c linux-2.6.36/arch/sh/mm/consistent.c
+--- linux-2.6.36/arch/sh/mm/consistent.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sh/mm/consistent.c 2010-11-06 18:58:15.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.35.4/arch/sh/mm/mmap.c linux-2.6.35.4/arch/sh/mm/mmap.c
---- linux-2.6.35.4/arch/sh/mm/mmap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sh/mm/mmap.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sh/mm/mmap.c linux-2.6.36/arch/sh/mm/mmap.c
+--- linux-2.6.36/arch/sh/mm/mmap.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sh/mm/mmap.c 2010-11-06 18:58:15.000000000 -0400
@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
addr = PAGE_ALIGN(addr);
/* remember the address as a hint for next time */
return (mm->free_area_cache = addr);
}
-diff -urNp linux-2.6.35.4/arch/sparc/include/asm/atomic_64.h linux-2.6.35.4/arch/sparc/include/asm/atomic_64.h
---- linux-2.6.35.4/arch/sparc/include/asm/atomic_64.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/include/asm/atomic_64.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/include/asm/atomic_64.h linux-2.6.36/arch/sparc/include/asm/atomic_64.h
+--- linux-2.6.36/arch/sparc/include/asm/atomic_64.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/include/asm/atomic_64.h 2010-11-06 18:58:15.000000000 -0400
@@ -14,18 +14,40 @@
#define ATOMIC64_INIT(i) { (i) }
extern int atomic_sub_ret(int, atomic_t *);
extern long atomic64_sub_ret(long, atomic64_t *);
-@@ -33,7 +55,15 @@ extern long atomic64_sub_ret(long, atomi
+@@ -33,12 +55,24 @@ extern long atomic64_sub_ret(long, atomi
#define atomic64_dec_return(v) atomic64_sub_ret(1, v)
#define atomic_inc_return(v) atomic_add_ret(1, v)
#define atomic_sub_return(i, v) atomic_sub_ret(i, v)
#define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
-@@ -59,10 +89,26 @@ extern long atomic64_sub_ret(long, atomi
+
+ #define atomic_add_return(i, v) atomic_add_ret(i, v)
++static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
++{
++ return atomic_add_ret_unchecked(i, v);
++}
+ #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
+
+ /*
+@@ -59,10 +93,26 @@ extern long atomic64_sub_ret(long, atomi
#define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
#define atomic_inc(v) atomic_add(1, v)
#define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
#define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
-@@ -72,17 +118,28 @@ extern long atomic64_sub_ret(long, atomi
+@@ -72,17 +122,28 @@ extern long atomic64_sub_ret(long, atomi
static inline int atomic_add_unless(atomic_t *v, int a, int u)
{
}
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-@@ -93,17 +150,28 @@ static inline int atomic_add_unless(atom
+@@ -93,17 +154,28 @@ static inline int atomic_add_unless(atom
static inline long 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.35.4/arch/sparc/include/asm/compat.h linux-2.6.35.4/arch/sparc/include/asm/compat.h
---- linux-2.6.35.4/arch/sparc/include/asm/compat.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/include/asm/compat.h 2010-09-17 20:12:37.000000000 -0400
-@@ -167,7 +167,7 @@ static inline compat_uptr_t ptr_to_compa
- return (u32)(unsigned long)uptr;
- }
-
--static inline void __user *compat_alloc_user_space(long len)
-+static inline void __user *arch_compat_alloc_user_space(long len)
- {
- struct pt_regs *regs = current_thread_info()->kregs;
- unsigned long usp = regs->u_regs[UREG_I6];
-diff -urNp linux-2.6.35.4/arch/sparc/include/asm/dma-mapping.h linux-2.6.35.4/arch/sparc/include/asm/dma-mapping.h
---- linux-2.6.35.4/arch/sparc/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
-@@ -13,10 +13,10 @@ extern int dma_supported(struct device *
+diff -urNp linux-2.6.36/arch/sparc/include/asm/dma-mapping.h linux-2.6.36/arch/sparc/include/asm/dma-mapping.h
+--- linux-2.6.36/arch/sparc/include/asm/dma-mapping.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/include/asm/dma-mapping.h 2010-11-06 18:58:15.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)
- #define dma_is_consistent(d, h) (1)
-extern struct dma_map_ops *dma_ops, pci32_dma_ops;
+extern const struct dma_map_ops *dma_ops, pci32_dma_ops;
{
#if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
if (dev->bus == &pci_bus_type)
-@@ -30,7 +30,7 @@ static inline struct dma_map_ops *get_dm
+@@ -29,7 +29,7 @@ static inline struct dma_map_ops *get_dm
static inline void *dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, gfp_t flag)
{
void *cpu_addr;
cpu_addr = ops->alloc_coherent(dev, size, dma_handle, flag);
-@@ -41,7 +41,7 @@ static inline void *dma_alloc_coherent(s
+@@ -40,7 +40,7 @@ static inline void *dma_alloc_coherent(s
static inline void dma_free_coherent(struct device *dev, size_t size,
void *cpu_addr, dma_addr_t dma_handle)
{
debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
ops->free_coherent(dev, size, cpu_addr, dma_handle);
-diff -urNp linux-2.6.35.4/arch/sparc/include/asm/elf_32.h linux-2.6.35.4/arch/sparc/include/asm/elf_32.h
---- linux-2.6.35.4/arch/sparc/include/asm/elf_32.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/include/asm/elf_32.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/include/asm/elf_32.h linux-2.6.36/arch/sparc/include/asm/elf_32.h
+--- linux-2.6.36/arch/sparc/include/asm/elf_32.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/include/asm/elf_32.h 2010-11-06 18:58:15.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.35.4/arch/sparc/include/asm/elf_64.h linux-2.6.35.4/arch/sparc/include/asm/elf_64.h
---- linux-2.6.35.4/arch/sparc/include/asm/elf_64.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/include/asm/elf_64.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/include/asm/elf_64.h linux-2.6.36/arch/sparc/include/asm/elf_64.h
+--- linux-2.6.36/arch/sparc/include/asm/elf_64.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/include/asm/elf_64.h 2010-11-06 18:58:15.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.35.4/arch/sparc/include/asm/pgtable_32.h linux-2.6.35.4/arch/sparc/include/asm/pgtable_32.h
---- linux-2.6.35.4/arch/sparc/include/asm/pgtable_32.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/include/asm/pgtable_32.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/include/asm/pgtable_32.h linux-2.6.36/arch/sparc/include/asm/pgtable_32.h
+--- linux-2.6.36/arch/sparc/include/asm/pgtable_32.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/include/asm/pgtable_32.h 2010-11-06 18:58:15.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.35.4/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.35.4/arch/sparc/include/asm/pgtsrmmu.h
---- linux-2.6.35.4/arch/sparc/include/asm/pgtsrmmu.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/include/asm/pgtsrmmu.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.36/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-2.6.36/arch/sparc/include/asm/pgtsrmmu.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/include/asm/pgtsrmmu.h 2010-11-06 18:58:15.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.35.4/arch/sparc/include/asm/spinlock_64.h linux-2.6.35.4/arch/sparc/include/asm/spinlock_64.h
---- linux-2.6.35.4/arch/sparc/include/asm/spinlock_64.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/include/asm/spinlock_64.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/include/asm/spinlock_64.h linux-2.6.36/arch/sparc/include/asm/spinlock_64.h
+--- linux-2.6.36/arch/sparc/include/asm/spinlock_64.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/include/asm/spinlock_64.h 2010-11-06 18:58:15.000000000 -0400
@@ -99,7 +99,12 @@ static void inline arch_read_lock(arch_r
__asm__ __volatile__ (
"1: ldsw [%2], %0\n"
" cas [%2], %0, %1\n"
" cmp %0, %1\n"
" bne,pn %%xcc, 1b\n"
-diff -urNp linux-2.6.35.4/arch/sparc/include/asm/uaccess_32.h linux-2.6.35.4/arch/sparc/include/asm/uaccess_32.h
---- linux-2.6.35.4/arch/sparc/include/asm/uaccess_32.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/include/asm/uaccess_32.h 2010-09-17 20:12:09.000000000 -0400
-@@ -249,14 +249,25 @@ extern unsigned long __copy_user(void __
+diff -urNp linux-2.6.36/arch/sparc/include/asm/uaccess_32.h linux-2.6.36/arch/sparc/include/asm/uaccess_32.h
+--- linux-2.6.36/arch/sparc/include/asm/uaccess_32.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/include/asm/uaccess_32.h 2010-11-06 18:58:15.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(to, (__force void __user *) from, n);
}
-@@ -272,19 +283,27 @@ static inline unsigned long copy_from_us
+ static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
{
- int sz = __compiletime_object_size(to);
-
+- if (n && __access_ok((unsigned long) from, n))
+ if ((long)n < 0)
+ return n;
+
- if (unlikely(sz != -1 && sz < n)) {
- copy_from_user_overflow();
- return n;
- }
-
-- if (n && __access_ok((unsigned long) from, n))
+ if (n && __access_ok((unsigned long) from, n)) {
+ if (!__builtin_constant_p(n))
+ check_object_size(to, n, false);
return __copy_user((__force void __user *) to, from, n);
}
-diff -urNp linux-2.6.35.4/arch/sparc/include/asm/uaccess_64.h linux-2.6.35.4/arch/sparc/include/asm/uaccess_64.h
---- linux-2.6.35.4/arch/sparc/include/asm/uaccess_64.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/include/asm/uaccess_64.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/include/asm/uaccess_64.h linux-2.6.36/arch/sparc/include/asm/uaccess_64.h
+--- linux-2.6.36/arch/sparc/include/asm/uaccess_64.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/include/asm/uaccess_64.h 2010-11-06 18:58:15.000000000 -0400
@@ -10,6 +10,7 @@
#include <linux/compiler.h>
#include <linux/string.h>
#include <asm/asi.h>
#include <asm/system.h>
#include <asm/spitfire.h>
-@@ -224,6 +225,12 @@ copy_from_user(void *to, const void __us
- int sz = __compiletime_object_size(to);
- unsigned long ret = size;
+@@ -213,8 +214,15 @@ extern unsigned long copy_from_user_fixu
+ static inline unsigned long __must_check
+ copy_from_user(void *to, const void __user *from, unsigned long size)
+ {
+- unsigned long ret = ___copy_from_user(to, from, size);
++ unsigned long ret;
+ if ((long)size < 0 || size > INT_MAX)
+ return size;
+ if (!__builtin_constant_p(size))
+ check_object_size(to, size, false);
+
- if (likely(sz == -1 || sz >= size)) {
- ret = ___copy_from_user(to, from, size);
- if (unlikely(ret))
-@@ -243,8 +250,15 @@ extern unsigned long copy_to_user_fixup(
++ ret = ___copy_from_user(to, from, size);
+ if (unlikely(ret))
+ ret = copy_from_user_fixup(to, from, size);
+
+@@ -230,8 +238,15 @@ extern unsigned long copy_to_user_fixup(
static inline unsigned long __must_check
copy_to_user(void __user *to, const void *from, unsigned long size)
{
if (unlikely(ret))
ret = copy_to_user_fixup(to, from, size);
return ret;
-diff -urNp linux-2.6.35.4/arch/sparc/include/asm/uaccess.h linux-2.6.35.4/arch/sparc/include/asm/uaccess.h
---- linux-2.6.35.4/arch/sparc/include/asm/uaccess.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/include/asm/uaccess.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/include/asm/uaccess.h linux-2.6.36/arch/sparc/include/asm/uaccess.h
+--- linux-2.6.36/arch/sparc/include/asm/uaccess.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/include/asm/uaccess.h 2010-11-06 18:58:15.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.35.4/arch/sparc/kernel/iommu.c linux-2.6.35.4/arch/sparc/kernel/iommu.c
---- linux-2.6.35.4/arch/sparc/kernel/iommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/kernel/iommu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/kernel/iommu.c linux-2.6.36/arch/sparc/kernel/iommu.c
+--- linux-2.6.36/arch/sparc/kernel/iommu.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/kernel/iommu.c 2010-11-06 18:58:15.000000000 -0400
@@ -828,7 +828,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.35.4/arch/sparc/kernel/ioport.c linux-2.6.35.4/arch/sparc/kernel/ioport.c
---- linux-2.6.35.4/arch/sparc/kernel/ioport.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/kernel/ioport.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/kernel/ioport.c linux-2.6.36/arch/sparc/kernel/ioport.c
+--- linux-2.6.36/arch/sparc/kernel/ioport.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/kernel/ioport.c 2010-11-06 18:58:15.000000000 -0400
@@ -397,7 +397,7 @@ static void sbus_sync_sg_for_device(stru
BUG();
}
.alloc_coherent = pci32_alloc_coherent,
.free_coherent = pci32_free_coherent,
.map_page = pci32_map_page,
-diff -urNp linux-2.6.35.4/arch/sparc/kernel/kgdb_32.c linux-2.6.35.4/arch/sparc/kernel/kgdb_32.c
---- linux-2.6.35.4/arch/sparc/kernel/kgdb_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/kernel/kgdb_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/kernel/kgdb_32.c linux-2.6.36/arch/sparc/kernel/kgdb_32.c
+--- linux-2.6.36/arch/sparc/kernel/kgdb_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/kernel/kgdb_32.c 2010-11-06 18:58:15.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.35.4/arch/sparc/kernel/kgdb_64.c linux-2.6.35.4/arch/sparc/kernel/kgdb_64.c
---- linux-2.6.35.4/arch/sparc/kernel/kgdb_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/kernel/kgdb_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/kernel/kgdb_64.c linux-2.6.36/arch/sparc/kernel/kgdb_64.c
+--- linux-2.6.36/arch/sparc/kernel/kgdb_64.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/kernel/kgdb_64.c 2010-11-06 18:58:15.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.35.4/arch/sparc/kernel/Makefile linux-2.6.35.4/arch/sparc/kernel/Makefile
---- linux-2.6.35.4/arch/sparc/kernel/Makefile 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/kernel/Makefile 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/kernel/Makefile linux-2.6.36/arch/sparc/kernel/Makefile
+--- linux-2.6.36/arch/sparc/kernel/Makefile 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/kernel/Makefile 2010-11-06 18:58:15.000000000 -0400
@@ -3,7 +3,7 @@
#
extra-y := head_$(BITS).o
extra-y += init_task.o
-diff -urNp linux-2.6.35.4/arch/sparc/kernel/pci_sun4v.c linux-2.6.35.4/arch/sparc/kernel/pci_sun4v.c
---- linux-2.6.35.4/arch/sparc/kernel/pci_sun4v.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/kernel/pci_sun4v.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/kernel/pci_sun4v.c linux-2.6.36/arch/sparc/kernel/pci_sun4v.c
+--- linux-2.6.36/arch/sparc/kernel/pci_sun4v.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/kernel/pci_sun4v.c 2010-11-06 18:58:15.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.35.4/arch/sparc/kernel/sys_sparc_32.c linux-2.6.35.4/arch/sparc/kernel/sys_sparc_32.c
---- linux-2.6.35.4/arch/sparc/kernel/sys_sparc_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/kernel/sys_sparc_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/kernel/sys_sparc_32.c linux-2.6.36/arch/sparc/kernel/sys_sparc_32.c
+--- linux-2.6.36/arch/sparc/kernel/sys_sparc_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/kernel/sys_sparc_32.c 2010-11-06 18:58:15.000000000 -0400
@@ -57,7 +57,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.35.4/arch/sparc/kernel/sys_sparc_64.c linux-2.6.35.4/arch/sparc/kernel/sys_sparc_64.c
---- linux-2.6.35.4/arch/sparc/kernel/sys_sparc_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/kernel/sys_sparc_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/kernel/sys_sparc_64.c linux-2.6.36/arch/sparc/kernel/sys_sparc_64.c
+--- linux-2.6.36/arch/sparc/kernel/sys_sparc_64.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/kernel/sys_sparc_64.c 2010-11-06 18:58:15.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.
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.35.4/arch/sparc/kernel/traps_64.c linux-2.6.35.4/arch/sparc/kernel/traps_64.c
---- linux-2.6.35.4/arch/sparc/kernel/traps_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/kernel/traps_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/kernel/traps_64.c linux-2.6.36/arch/sparc/kernel/traps_64.c
+--- linux-2.6.36/arch/sparc/kernel/traps_64.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/kernel/traps_64.c 2010-11-06 18:58:15.000000000 -0400
@@ -95,6 +95,12 @@ void bad_trap(struct pt_regs *regs, long
lvl -= 0x100;
dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
sprintf (buffer, "Bad trap %lx at tl>0", lvl);
-diff -urNp linux-2.6.35.4/arch/sparc/lib/atomic_64.S linux-2.6.35.4/arch/sparc/lib/atomic_64.S
---- linux-2.6.35.4/arch/sparc/lib/atomic_64.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/lib/atomic_64.S 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/lib/atomic_64.S linux-2.6.36/arch/sparc/lib/atomic_64.S
+--- linux-2.6.36/arch/sparc/lib/atomic_64.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/lib/atomic_64.S 2010-11-06 18:58:15.000000000 -0400
@@ -18,7 +18,12 @@
atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
+
cas [%o1], %g1, %g7
cmp %g1, %g7
- bne,pn %icc, 2f
+ bne,pn %icc, BACKOFF_LABEL(2f, 1b)
@@ -28,12 +33,32 @@ atomic_add: /* %o0 = increment, %o1 = at
2: BACKOFF_SPIN(%o2, %o3, 1b)
.size atomic_add, .-atomic_add
+
cas [%o1], %g1, %g7
cmp %g1, %g7
- bne,pn %icc, 2f
+ bne,pn %icc, BACKOFF_LABEL(2f, 1b)
@@ -43,12 +68,32 @@ atomic_sub: /* %o0 = decrement, %o1 = at
2: BACKOFF_SPIN(%o2, %o3, 1b)
.size atomic_sub, .-atomic_sub
+
cas [%o1], %g1, %g7
cmp %g1, %g7
- bne,pn %icc, 2f
-@@ -59,12 +104,33 @@ atomic_add_ret: /* %o0 = increment, %o1
+ bne,pn %icc, BACKOFF_LABEL(2f, 1b)
+@@ -58,12 +103,33 @@ atomic_add_ret: /* %o0 = increment, %o1
2: BACKOFF_SPIN(%o2, %o3, 1b)
.size atomic_add_ret, .-atomic_add_ret
+
cas [%o1], %g1, %g7
cmp %g1, %g7
- bne,pn %icc, 2f
-@@ -80,7 +146,12 @@ atomic_sub_ret: /* %o0 = decrement, %o1
+ bne,pn %icc, BACKOFF_LABEL(2f, 1b)
+@@ -78,7 +144,12 @@ atomic_sub_ret: /* %o0 = decrement, %o1
atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
1: ldx [%o1], %g1
+
casx [%o1], %g1, %g7
cmp %g1, %g7
- bne,pn %xcc, 2f
-@@ -90,12 +161,32 @@ atomic64_add: /* %o0 = increment, %o1 =
+ bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
+@@ -88,12 +159,32 @@ atomic64_add: /* %o0 = increment, %o1 =
2: BACKOFF_SPIN(%o2, %o3, 1b)
.size atomic64_add, .-atomic64_add
+
casx [%o1], %g1, %g7
cmp %g1, %g7
- bne,pn %xcc, 2f
-@@ -105,12 +196,32 @@ atomic64_sub: /* %o0 = decrement, %o1 =
+ bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
+@@ -103,12 +194,32 @@ atomic64_sub: /* %o0 = decrement, %o1 =
2: BACKOFF_SPIN(%o2, %o3, 1b)
.size atomic64_sub, .-atomic64_sub
+
casx [%o1], %g1, %g7
cmp %g1, %g7
- bne,pn %xcc, 2f
-@@ -121,12 +232,33 @@ atomic64_add_ret: /* %o0 = increment, %o
+ bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
+@@ -118,12 +229,33 @@ atomic64_add_ret: /* %o0 = increment, %o
2: BACKOFF_SPIN(%o2, %o3, 1b)
.size atomic64_add_ret, .-atomic64_add_ret
+
casx [%o1], %g1, %g7
cmp %g1, %g7
- bne,pn %xcc, 2f
-diff -urNp linux-2.6.35.4/arch/sparc/lib/ksyms.c linux-2.6.35.4/arch/sparc/lib/ksyms.c
---- linux-2.6.35.4/arch/sparc/lib/ksyms.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/lib/ksyms.c 2010-09-17 20:12:09.000000000 -0400
+ bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
+diff -urNp linux-2.6.36/arch/sparc/lib/ksyms.c linux-2.6.36/arch/sparc/lib/ksyms.c
+--- linux-2.6.36/arch/sparc/lib/ksyms.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/lib/ksyms.c 2010-11-06 18:58:15.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.35.4/arch/sparc/lib/rwsem_64.S linux-2.6.35.4/arch/sparc/lib/rwsem_64.S
---- linux-2.6.35.4/arch/sparc/lib/rwsem_64.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/lib/rwsem_64.S 2010-09-17 20:12:09.000000000 -0400
-@@ -11,7 +11,12 @@
- .globl __down_read
- __down_read:
- 1: lduw [%o0], %g1
-- add %g1, 1, %g7
-+ addcc %g1, 1, %g7
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ tvs %icc, 6
-+#endif
-+
- cas [%o0], %g1, %g7
- cmp %g1, %g7
- bne,pn %icc, 1b
-@@ -33,7 +38,12 @@ __down_read:
- .globl __down_read_trylock
- __down_read_trylock:
- 1: lduw [%o0], %g1
-- add %g1, 1, %g7
-+ addcc %g1, 1, %g7
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ tvs %icc, 6
-+#endif
-+
- cmp %g7, 0
- bl,pn %icc, 2f
- mov 0, %o1
-@@ -51,7 +61,12 @@ __down_write:
- or %g1, %lo(RWSEM_ACTIVE_WRITE_BIAS), %g1
- 1:
- lduw [%o0], %g3
-- add %g3, %g1, %g7
-+ addcc %g3, %g1, %g7
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ tvs %icc, 6
-+#endif
-+
- cas [%o0], %g3, %g7
- cmp %g3, %g7
- bne,pn %icc, 1b
-@@ -77,7 +92,12 @@ __down_write_trylock:
- cmp %g3, 0
- bne,pn %icc, 2f
- mov 0, %o1
-- add %g3, %g1, %g7
-+ addcc %g3, %g1, %g7
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ tvs %icc, 6
-+#endif
-+
- cas [%o0], %g3, %g7
- cmp %g3, %g7
- bne,pn %icc, 1b
-@@ -90,7 +110,12 @@ __down_write_trylock:
- __up_read:
- 1:
- lduw [%o0], %g1
-- sub %g1, 1, %g7
-+ subcc %g1, 1, %g7
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ tvs %icc, 6
-+#endif
-+
- cas [%o0], %g1, %g7
- cmp %g1, %g7
- bne,pn %icc, 1b
-@@ -118,7 +143,12 @@ __up_write:
- or %g1, %lo(RWSEM_ACTIVE_WRITE_BIAS), %g1
- 1:
- lduw [%o0], %g3
-- sub %g3, %g1, %g7
-+ subcc %g3, %g1, %g7
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ tvs %icc, 6
-+#endif
-+
- cas [%o0], %g3, %g7
- cmp %g3, %g7
- bne,pn %icc, 1b
-@@ -143,7 +173,12 @@ __downgrade_write:
- or %g1, %lo(RWSEM_WAITING_BIAS), %g1
- 1:
- lduw [%o0], %g3
-- sub %g3, %g1, %g7
-+ subcc %g3, %g1, %g7
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ tvs %icc, 6
-+#endif
-+
- cas [%o0], %g3, %g7
- cmp %g3, %g7
- bne,pn %icc, 1b
-diff -urNp linux-2.6.35.4/arch/sparc/Makefile linux-2.6.35.4/arch/sparc/Makefile
---- linux-2.6.35.4/arch/sparc/Makefile 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/Makefile 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/Makefile linux-2.6.36/arch/sparc/Makefile
+--- linux-2.6.36/arch/sparc/Makefile 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/Makefile 2010-11-06 18:58:50.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.35.4/arch/sparc/mm/fault_32.c linux-2.6.35.4/arch/sparc/mm/fault_32.c
---- linux-2.6.35.4/arch/sparc/mm/fault_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/mm/fault_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/mm/fault_32.c linux-2.6.36/arch/sparc/mm/fault_32.c
+--- linux-2.6.36/arch/sparc/mm/fault_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/mm/fault_32.c 2010-11-06 18:58:15.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.35.4/arch/sparc/mm/fault_64.c linux-2.6.35.4/arch/sparc/mm/fault_64.c
---- linux-2.6.35.4/arch/sparc/mm/fault_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/mm/fault_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/mm/fault_64.c linux-2.6.36/arch/sparc/mm/fault_64.c
+--- linux-2.6.36/arch/sparc/mm/fault_64.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/mm/fault_64.c 2010-11-06 18:58:15.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.35.4/arch/sparc/mm/hugetlbpage.c linux-2.6.35.4/arch/sparc/mm/hugetlbpage.c
---- linux-2.6.35.4/arch/sparc/mm/hugetlbpage.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/mm/hugetlbpage.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/mm/hugetlbpage.c linux-2.6.36/arch/sparc/mm/hugetlbpage.c
+--- linux-2.6.36/arch/sparc/mm/hugetlbpage.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/mm/hugetlbpage.c 2010-11-06 18:58:15.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.35.4/arch/sparc/mm/init_32.c linux-2.6.35.4/arch/sparc/mm/init_32.c
---- linux-2.6.35.4/arch/sparc/mm/init_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/mm/init_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/mm/init_32.c linux-2.6.36/arch/sparc/mm/init_32.c
+--- linux-2.6.36/arch/sparc/mm/init_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/mm/init_32.c 2010-11-06 18:58:15.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.35.4/arch/sparc/mm/Makefile linux-2.6.35.4/arch/sparc/mm/Makefile
---- linux-2.6.35.4/arch/sparc/mm/Makefile 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/mm/Makefile 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/mm/Makefile linux-2.6.36/arch/sparc/mm/Makefile
+--- linux-2.6.36/arch/sparc/mm/Makefile 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/mm/Makefile 2010-11-06 18:58:15.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.35.4/arch/sparc/mm/srmmu.c linux-2.6.35.4/arch/sparc/mm/srmmu.c
---- linux-2.6.35.4/arch/sparc/mm/srmmu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/sparc/mm/srmmu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/sparc/mm/srmmu.c linux-2.6.36/arch/sparc/mm/srmmu.c
+--- linux-2.6.36/arch/sparc/mm/srmmu.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/sparc/mm/srmmu.c 2010-11-06 18:58:15.000000000 -0400
@@ -2198,6 +2198,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.35.4/arch/um/include/asm/kmap_types.h linux-2.6.35.4/arch/um/include/asm/kmap_types.h
---- linux-2.6.35.4/arch/um/include/asm/kmap_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/um/include/asm/kmap_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/um/include/asm/kmap_types.h linux-2.6.36/arch/um/include/asm/kmap_types.h
+--- linux-2.6.36/arch/um/include/asm/kmap_types.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/um/include/asm/kmap_types.h 2010-11-06 18:58:15.000000000 -0400
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
KM_TYPE_NR
};
-diff -urNp linux-2.6.35.4/arch/um/include/asm/page.h linux-2.6.35.4/arch/um/include/asm/page.h
---- linux-2.6.35.4/arch/um/include/asm/page.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/um/include/asm/page.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/um/include/asm/page.h linux-2.6.36/arch/um/include/asm/page.h
+--- linux-2.6.36/arch/um/include/asm/page.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/um/include/asm/page.h 2010-11-06 18:58:15.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.35.4/arch/um/sys-i386/syscalls.c linux-2.6.35.4/arch/um/sys-i386/syscalls.c
---- linux-2.6.35.4/arch/um/sys-i386/syscalls.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/um/sys-i386/syscalls.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/um/sys-i386/syscalls.c linux-2.6.36/arch/um/sys-i386/syscalls.c
+--- linux-2.6.36/arch/um/sys-i386/syscalls.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/um/sys-i386/syscalls.c 2010-11-06 18:58:15.000000000 -0400
@@ -11,6 +11,21 @@
#include "asm/uaccess.h"
#include "asm/unistd.h"
/*
* The prototype on i386 is:
*
-diff -urNp linux-2.6.35.4/arch/x86/boot/bitops.h linux-2.6.35.4/arch/x86/boot/bitops.h
---- linux-2.6.35.4/arch/x86/boot/bitops.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/boot/bitops.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/boot/bitops.h linux-2.6.36/arch/x86/boot/bitops.h
+--- linux-2.6.36/arch/x86/boot/bitops.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/boot/bitops.h 2010-11-06 18:58:15.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.35.4/arch/x86/boot/boot.h linux-2.6.35.4/arch/x86/boot/boot.h
---- linux-2.6.35.4/arch/x86/boot/boot.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/boot/boot.h 2010-09-17 20:12:09.000000000 -0400
-@@ -82,7 +82,7 @@ static inline void io_delay(void)
+diff -urNp linux-2.6.36/arch/x86/boot/boot.h linux-2.6.36/arch/x86/boot/boot.h
+--- linux-2.6.36/arch/x86/boot/boot.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/boot/boot.h 2010-11-06 18:58:15.000000000 -0400
+@@ -85,7 +85,7 @@ static inline void io_delay(void)
static inline u16 ds(void)
{
u16 seg;
return seg;
}
-@@ -178,7 +178,7 @@ static inline void wrgs32(u32 v, addr_t
+@@ -181,7 +181,7 @@ static inline void wrgs32(u32 v, addr_t
static inline int memcmp(const void *s1, const void *s2, size_t len)
{
u8 diff;
: "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
return diff;
}
-diff -urNp linux-2.6.35.4/arch/x86/boot/compressed/head_32.S linux-2.6.35.4/arch/x86/boot/compressed/head_32.S
---- linux-2.6.35.4/arch/x86/boot/compressed/head_32.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/boot/compressed/head_32.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/boot/compressed/head_32.S linux-2.6.36/arch/x86/boot/compressed/head_32.S
+--- linux-2.6.36/arch/x86/boot/compressed/head_32.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/boot/compressed/head_32.S 2010-11-06 18:58:15.000000000 -0400
@@ -76,7 +76,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
#endif
/* Target address to relocate to for decompression */
-@@ -149,7 +149,7 @@ relocated:
+@@ -162,7 +162,7 @@ relocated:
* and where it was actually loaded.
*/
movl %ebp, %ebx
jz 2f /* Nothing to be done if loaded at compiled addr. */
/*
* Process relocations.
-@@ -157,8 +157,7 @@ relocated:
+@@ -170,8 +170,7 @@ relocated:
1: subl $4, %edi
movl (%edi), %ecx
addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
jmp 1b
2:
-diff -urNp linux-2.6.35.4/arch/x86/boot/compressed/head_64.S linux-2.6.35.4/arch/x86/boot/compressed/head_64.S
---- linux-2.6.35.4/arch/x86/boot/compressed/head_64.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/boot/compressed/head_64.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/boot/compressed/head_64.S linux-2.6.36/arch/x86/boot/compressed/head_64.S
+--- linux-2.6.36/arch/x86/boot/compressed/head_64.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/boot/compressed/head_64.S 2010-11-06 18:58:15.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.35.4/arch/x86/boot/compressed/misc.c linux-2.6.35.4/arch/x86/boot/compressed/misc.c
---- linux-2.6.35.4/arch/x86/boot/compressed/misc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/boot/compressed/misc.c 2010-09-17 20:12:09.000000000 -0400
-@@ -285,7 +285,7 @@ static void parse_elf(void *output)
+diff -urNp linux-2.6.36/arch/x86/boot/compressed/misc.c linux-2.6.36/arch/x86/boot/compressed/misc.c
+--- linux-2.6.36/arch/x86/boot/compressed/misc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/boot/compressed/misc.c 2010-11-06 18:58:15.000000000 -0400
+@@ -289,7 +289,7 @@ static void parse_elf(void *output)
case PT_LOAD:
#ifdef CONFIG_RELOCATABLE
dest = output;
#else
dest = (void *)(phdr->p_paddr);
#endif
-@@ -332,7 +332,7 @@ asmlinkage void decompress_kernel(void *
+@@ -342,7 +342,7 @@ asmlinkage void decompress_kernel(void *
error("Destination address too large");
#endif
#ifndef CONFIG_RELOCATABLE
error("Wrong destination address");
#endif
-diff -urNp linux-2.6.35.4/arch/x86/boot/compressed/mkpiggy.c linux-2.6.35.4/arch/x86/boot/compressed/mkpiggy.c
---- linux-2.6.35.4/arch/x86/boot/compressed/mkpiggy.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/boot/compressed/mkpiggy.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/boot/compressed/mkpiggy.c linux-2.6.36/arch/x86/boot/compressed/mkpiggy.c
+--- linux-2.6.36/arch/x86/boot/compressed/mkpiggy.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/boot/compressed/mkpiggy.c 2010-11-06 18:58:15.000000000 -0400
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
offs = (olen > ilen) ? olen - ilen : 0;
offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
printf(".section \".rodata..compressed\",\"a\",@progbits\n");
-diff -urNp linux-2.6.35.4/arch/x86/boot/compressed/relocs.c linux-2.6.35.4/arch/x86/boot/compressed/relocs.c
---- linux-2.6.35.4/arch/x86/boot/compressed/relocs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/boot/compressed/relocs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/boot/compressed/relocs.c linux-2.6.36/arch/x86/boot/compressed/relocs.c
+--- linux-2.6.36/arch/x86/boot/compressed/relocs.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/boot/compressed/relocs.c 2010-11-06 18:58:15.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.35.4/arch/x86/boot/cpucheck.c linux-2.6.35.4/arch/x86/boot/cpucheck.c
---- linux-2.6.35.4/arch/x86/boot/cpucheck.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/boot/cpucheck.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/boot/cpucheck.c linux-2.6.36/arch/x86/boot/cpucheck.c
+--- linux-2.6.36/arch/x86/boot/cpucheck.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/boot/cpucheck.c 2010-11-06 18:58:15.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.35.4/arch/x86/boot/header.S linux-2.6.35.4/arch/x86/boot/header.S
---- linux-2.6.35.4/arch/x86/boot/header.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/boot/header.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/boot/header.S linux-2.6.36/arch/x86/boot/header.S
+--- linux-2.6.36/arch/x86/boot/header.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/boot/header.S 2010-11-06 18:58:15.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.35.4/arch/x86/boot/memory.c linux-2.6.35.4/arch/x86/boot/memory.c
---- linux-2.6.35.4/arch/x86/boot/memory.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/boot/memory.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/boot/memory.c linux-2.6.36/arch/x86/boot/memory.c
+--- linux-2.6.36/arch/x86/boot/memory.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/boot/memory.c 2010-11-06 18:58:15.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.35.4/arch/x86/boot/video.c linux-2.6.35.4/arch/x86/boot/video.c
---- linux-2.6.35.4/arch/x86/boot/video.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/boot/video.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/boot/video.c linux-2.6.36/arch/x86/boot/video.c
+--- linux-2.6.36/arch/x86/boot/video.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/boot/video.c 2010-11-06 18:58:15.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.35.4/arch/x86/boot/video-vesa.c linux-2.6.35.4/arch/x86/boot/video-vesa.c
---- linux-2.6.35.4/arch/x86/boot/video-vesa.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/boot/video-vesa.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/boot/video-vesa.c linux-2.6.36/arch/x86/boot/video-vesa.c
+--- linux-2.6.36/arch/x86/boot/video-vesa.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/boot/video-vesa.c 2010-11-06 18:58:15.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.35.4/arch/x86/ia32/ia32entry.S linux-2.6.35.4/arch/x86/ia32/ia32entry.S
---- linux-2.6.35.4/arch/x86/ia32/ia32entry.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/ia32/ia32entry.S 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/ia32/ia32_aout.c linux-2.6.36/arch/x86/ia32/ia32_aout.c
+--- linux-2.6.36/arch/x86/ia32/ia32_aout.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/ia32/ia32_aout.c 2010-11-06 18:58:50.000000000 -0400
+@@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st
+ unsigned long dump_start, dump_size;
+ struct user32 dump;
+
++ memset(&dump, 0, sizeof(dump));
++
+ fs = get_fs();
+ set_fs(KERNEL_DS);
+ has_dumped = 1;
+diff -urNp linux-2.6.36/arch/x86/ia32/ia32entry.S linux-2.6.36/arch/x86/ia32/ia32entry.S
+--- linux-2.6.36/arch/x86/ia32/ia32entry.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/ia32/ia32entry.S 2010-11-06 18:58:15.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. */
-@@ -50,7 +51,12 @@
- /*
- * Reload arg registers from stack in case ptrace changed them.
- * We don't reload %eax because syscall_trace_enter() returned
-- * the value it wants us to use in the table lookup.
-+ * the %rax value we should see. Instead, we just truncate that
-+ * value to 32 bits again as we did on entry from user mode.
-+ * If it's a new value set by user_regset during entry tracing,
-+ * this matches the normal truncation of the user-mode value.
-+ * If it's -1 to make us punt the syscall, then (u32)-1 is still
-+ * an appropriately invalid value.
- */
- .macro LOAD_ARGS32 offset, _r9=0
- .if \_r9
-@@ -60,6 +66,7 @@
- movl \offset+48(%rsp),%edx
- movl \offset+56(%rsp),%esi
- movl \offset+64(%rsp),%edi
-+ movl %eax,%eax /* zero extension */
- .endm
-
- .macro CFI_STARTPROC32 simple
-@@ -114,6 +121,11 @@ ENTRY(ia32_sysenter_target)
+@@ -120,6 +121,11 @@ ENTRY(ia32_sysenter_target)
SWAPGS_UNSAFE_STACK
movq PER_CPU_VAR(kernel_stack), %rsp
addq $(KERNEL_STACK_OFFSET),%rsp
/*
* No need to follow this irqs on/off section: the syscall
* disabled irqs, here we enable it straight after entry:
-@@ -144,6 +156,12 @@ ENTRY(ia32_sysenter_target)
+@@ -150,6 +156,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
-@@ -153,7 +171,7 @@ ENTRY(ia32_sysenter_target)
- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
- CFI_REMEMBER_STATE
- jnz sysenter_tracesys
-- cmpl $(IA32_NR_syscalls-1),%eax
-+ cmpq $(IA32_NR_syscalls-1),%rax
- ja ia32_badsys
- sysenter_do_call:
- IA32_ARG_FIXUP
-@@ -166,6 +184,11 @@ sysenter_dispatch:
+@@ -172,6 +184,11 @@ 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)
-@@ -195,7 +218,7 @@ sysexit_from_sys_call:
- movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
- call audit_syscall_entry
- movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
-- cmpl $(IA32_NR_syscalls-1),%eax
-+ cmpq $(IA32_NR_syscalls-1),%rax
- ja ia32_badsys
- movl %ebx,%edi /* reload 1st syscall arg */
- movl RCX-ARGOFFSET(%rsp),%esi /* reload 2nd syscall arg */
-@@ -248,7 +271,7 @@ sysenter_tracesys:
- call syscall_trace_enter
- LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
- RESTORE_REST
-- cmpl $(IA32_NR_syscalls-1),%eax
-+ cmpq $(IA32_NR_syscalls-1),%rax
- ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
- jmp sysenter_do_call
- CFI_ENDPROC
-@@ -284,6 +307,11 @@ ENTRY(ia32_cstar_target)
+@@ -290,6 +307,11 @@ ENTRY(ia32_cstar_target)
movl %esp,%r8d
CFI_REGISTER rsp,r8
movq PER_CPU_VAR(kernel_stack),%rsp
/*
* No need to follow this irqs on/off section: the syscall
* disabled irqs and here we enable it straight after entry:
-@@ -305,6 +333,12 @@ ENTRY(ia32_cstar_target)
+@@ -311,6 +333,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
-@@ -314,7 +348,7 @@ ENTRY(ia32_cstar_target)
- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
- CFI_REMEMBER_STATE
- jnz cstar_tracesys
-- cmpl $IA32_NR_syscalls-1,%eax
-+ cmpq $IA32_NR_syscalls-1,%rax
- ja ia32_badsys
- cstar_do_call:
- IA32_ARG_FIXUP 1
-@@ -327,6 +361,11 @@ cstar_dispatch:
+@@ -333,6 +361,11 @@ 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
-@@ -367,7 +406,7 @@ cstar_tracesys:
- LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */
- RESTORE_REST
- xchgl %ebp,%r9d
-- cmpl $(IA32_NR_syscalls-1),%eax
-+ cmpq $(IA32_NR_syscalls-1),%rax
- ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
- jmp cstar_do_call
- END(ia32_cstar_target)
-@@ -409,6 +448,11 @@ ENTRY(ia32_syscall)
+@@ -415,6 +448,11 @@ 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:
-@@ -425,7 +469,7 @@ ENTRY(ia32_syscall)
- orl $TS_COMPAT,TI_status(%r10)
- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
- jnz ia32_tracesys
-- cmpl $(IA32_NR_syscalls-1),%eax
-+ cmpq $(IA32_NR_syscalls-1),%rax
- ja ia32_badsys
- ia32_do_call:
- IA32_ARG_FIXUP
-@@ -444,7 +488,7 @@ ia32_tracesys:
- call syscall_trace_enter
- LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
- RESTORE_REST
-- cmpl $(IA32_NR_syscalls-1),%eax
-+ cmpq $(IA32_NR_syscalls-1),%rax
- ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
- jmp ia32_do_call
- END(ia32_syscall)
-diff -urNp linux-2.6.35.4/arch/x86/ia32/ia32_signal.c linux-2.6.35.4/arch/x86/ia32/ia32_signal.c
---- linux-2.6.35.4/arch/x86/ia32/ia32_signal.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/ia32/ia32_signal.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/ia32/ia32_signal.c linux-2.6.36/arch/x86/ia32/ia32_signal.c
+--- linux-2.6.36/arch/x86/ia32/ia32_signal.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/ia32/ia32_signal.c 2010-11-06 18:58:15.000000000 -0400
@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
sp -= frame_size;
/* Align the stack pointer according to the i386 ABI,
};
frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/alternative.h linux-2.6.35.4/arch/x86/include/asm/alternative.h
---- linux-2.6.35.4/arch/x86/include/asm/alternative.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/alternative.h 2010-09-17 20:12:09.000000000 -0400
-@@ -91,7 +91,7 @@ static inline int alternatives_text_rese
- " .byte 664f-663f\n" /* replacementlen */ \
+@@ -533,9 +533,11 @@ int ia32_setup_rt_frame(int sig, struct
+
+ if (ka->sa.sa_flags & SA_RESTORER)
+ restorer = ka->sa.sa_restorer;
++ else if (current->mm->context.vdso)
++ /* Return stub is in 32bit vsyscall page */
++ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
+ else
+- restorer = VDSO32_SYMBOL(current->mm->context.vdso,
+- rt_sigreturn);
++ restorer = &frame->retcode;
+ put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
+
+ /*
+diff -urNp linux-2.6.36/arch/x86/include/asm/alternative.h linux-2.6.36/arch/x86/include/asm/alternative.h
+--- linux-2.6.36/arch/x86/include/asm/alternative.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/alternative.h 2010-11-06 18:58:15.000000000 -0400
+@@ -92,7 +92,7 @@ static inline int alternatives_text_rese
+ ".section .discard,\"aw\",@progbits\n" \
" .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \
".previous\n" \
- ".section .altinstr_replacement, \"ax\"\n" \
"663:\n\t" newinstr "\n664:\n" /* replacement */ \
".previous"
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/apm.h linux-2.6.35.4/arch/x86/include/asm/apm.h
---- linux-2.6.35.4/arch/x86/include/asm/apm.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/apm.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/apm.h linux-2.6.36/arch/x86/include/asm/apm.h
+--- linux-2.6.36/arch/x86/include/asm/apm.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/apm.h 2010-11-06 18:58:15.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.35.4/arch/x86/include/asm/asm.h linux-2.6.35.4/arch/x86/include/asm/asm.h
---- linux-2.6.35.4/arch/x86/include/asm/asm.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/asm.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/asm.h linux-2.6.36/arch/x86/include/asm/asm.h
+--- linux-2.6.36/arch/x86/include/asm/asm.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/asm.h 2010-11-06 18:58:15.000000000 -0400
@@ -37,6 +37,12 @@
#define _ASM_SI __ASM_REG(si)
#define _ASM_DI __ASM_REG(di)
/* Exception table entry */
#ifdef __ASSEMBLY__
# define _ASM_EXTABLE(from,to) \
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/atomic64_32.h linux-2.6.35.4/arch/x86/include/asm/atomic64_32.h
---- linux-2.6.35.4/arch/x86/include/asm/atomic64_32.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/atomic64_32.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/atomic64_32.h linux-2.6.36/arch/x86/include/asm/atomic64_32.h
+--- linux-2.6.36/arch/x86/include/asm/atomic64_32.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/atomic64_32.h 2010-11-06 18:58:15.000000000 -0400
@@ -12,6 +12,14 @@ typedef struct {
u64 __aligned(8) counter;
} atomic64_t;
#define ATOMIC64_INIT(val) { (val) }
#ifdef CONFIG_X86_CMPXCHG64
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/atomic64_64.h linux-2.6.35.4/arch/x86/include/asm/atomic64_64.h
---- linux-2.6.35.4/arch/x86/include/asm/atomic64_64.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/atomic64_64.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/atomic64_64.h linux-2.6.36/arch/x86/include/asm/atomic64_64.h
+--- linux-2.6.36/arch/x86/include/asm/atomic64_64.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/atomic64_64.h 2010-11-06 18:58:15.000000000 -0400
@@ -22,6 +22,18 @@ static inline long atomic64_read(const a
}
asm volatile(LOCK_PREFIX "addq %1,%0"
: "=m" (v->counter)
: "er" (i), "m" (v->counter));
-@@ -56,7 +102,15 @@ static inline void atomic64_add(long i,
+@@ -56,7 +102,29 @@ static inline void atomic64_add(long i,
*/
static inline void atomic64_sub(long i, atomic64_t *v)
{
+ _ASM_EXTABLE(0b, 0b)
+#endif
+
++ : "=m" (v->counter)
++ : "er" (i), "m" (v->counter));
++}
++
++/**
++ * atomic64_sub_unchecked - subtract the atomic64 variable
++ * @i: integer value to subtract
++ * @v: pointer to type atomic64_unchecked_t
++ *
++ * Atomically subtracts @i from @v.
++ */
++static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
++{
++ asm volatile(LOCK_PREFIX "subq %1,%0\n"
: "=m" (v->counter)
: "er" (i), "m" (v->counter));
}
-@@ -74,7 +128,16 @@ static inline int atomic64_sub_and_test(
+@@ -74,7 +142,16 @@ static inline int atomic64_sub_and_test(
{
unsigned char c;
: "=m" (v->counter), "=qm" (c)
: "er" (i), "m" (v->counter) : "memory");
return c;
-@@ -88,6 +151,31 @@ static inline int atomic64_sub_and_test(
+@@ -88,6 +165,27 @@ static inline int atomic64_sub_and_test(
*/
static inline void atomic64_inc(atomic64_t *v)
{
+
+#ifdef CONFIG_PAX_REFCOUNT
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1:\n"
+ LOCK_PREFIX "decq %0\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
+ : "=m" (v->counter)
asm volatile(LOCK_PREFIX "incq %0"
: "=m" (v->counter)
: "m" (v->counter));
-@@ -101,7 +189,32 @@ static inline void atomic64_inc(atomic64
+@@ -101,7 +199,28 @@ static inline void atomic64_inc(atomic64
*/
static inline void atomic64_dec(atomic64_t *v)
{
+
+#ifdef CONFIG_PAX_REFCOUNT
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1: \n"
+ LOCK_PREFIX "incq %0\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
+ : "=m" (v->counter)
: "=m" (v->counter)
: "m" (v->counter));
}
-@@ -118,7 +231,20 @@ static inline int atomic64_dec_and_test(
+@@ -118,7 +237,16 @@ static inline int atomic64_dec_and_test(
{
unsigned char c;
+
+#ifdef CONFIG_PAX_REFCOUNT
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1: \n"
+ LOCK_PREFIX "incq %0\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
+ "sete %1\n"
: "=m" (v->counter), "=qm" (c)
: "m" (v->counter) : "memory");
return c != 0;
-@@ -136,7 +262,20 @@ static inline int atomic64_inc_and_test(
+@@ -136,7 +264,16 @@ static inline int atomic64_inc_and_test(
{
unsigned char c;
+
+#ifdef CONFIG_PAX_REFCOUNT
+ "jno 0f\n"
-+ "int $4\n0:\n"
-+ ".pushsection .fixup,\"ax\"\n"
-+ "1: \n"
+ LOCK_PREFIX "decq %0\n"
-+ "jmp 0b\n"
-+ ".popsection\n"
-+ _ASM_EXTABLE(0b, 1b)
++ "int $4\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
+#endif
+
+ "sete %1\n"
: "=m" (v->counter), "=qm" (c)
: "m" (v->counter) : "memory");
return c != 0;
-@@ -155,7 +294,16 @@ static inline int atomic64_add_negative(
+@@ -155,7 +292,16 @@ static inline int atomic64_add_negative(
{
unsigned char c;
: "=m" (v->counter), "=qm" (c)
: "er" (i), "m" (v->counter) : "memory");
return c;
-@@ -171,7 +319,31 @@ static inline int atomic64_add_negative(
+@@ -171,7 +317,31 @@ static inline int atomic64_add_negative(
static inline long atomic64_add_return(long i, atomic64_t *v)
{
long __i = i;
: "+r" (i), "+m" (v->counter)
: : "memory");
return i + __i;
-@@ -183,6 +355,10 @@ static inline long atomic64_sub_return(l
+@@ -183,6 +353,10 @@ static inline long atomic64_sub_return(l
}
#define atomic64_inc_return(v) (atomic64_add_return(1, (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 +382,29 @@ static inline long atomic64_xchg(atomic6
+@@ -206,17 +380,30 @@ static inline long atomic64_xchg(atomic6
*/
static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
{
+
+#ifdef CONFIG_PAX_REFCOUNT
+ "jno 0f\n"
++ "sub %2,%0\n"
+ "int $4\n0:\n"
+ _ASM_EXTABLE(0b, 0b)
+#endif
}
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/atomic.h linux-2.6.35.4/arch/x86/include/asm/atomic.h
---- linux-2.6.35.4/arch/x86/include/asm/atomic.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/atomic.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/atomic.h linux-2.6.36/arch/x86/include/asm/atomic.h
+--- linux-2.6.36/arch/x86/include/asm/atomic.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/atomic.h 2010-11-06 18:58:15.000000000 -0400
@@ -26,6 +26,17 @@ static inline int atomic_read(const atom
}
#define atomic_dec_return(v) (atomic_sub_return(1, v))
static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
-@@ -231,17 +418,29 @@ static inline int atomic_xchg(atomic_t *
+@@ -231,17 +418,30 @@ static inline int atomic_xchg(atomic_t *
*/
static inline int atomic_add_unless(atomic_t *v, int a, int u)
{
+
+#ifdef CONFIG_PAX_REFCOUNT
+ "jno 0f\n"
++ "subl %2,%0\n"
+ _ASM_INTO "\n0:\n"
+ _ASM_EXTABLE(0b, 0b)
+#endif
}
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/boot.h linux-2.6.35.4/arch/x86/include/asm/boot.h
---- linux-2.6.35.4/arch/x86/include/asm/boot.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/boot.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/boot.h linux-2.6.36/arch/x86/include/asm/boot.h
+--- linux-2.6.36/arch/x86/include/asm/boot.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/boot.h 2010-11-06 18:58:15.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.35.4/arch/x86/include/asm/cacheflush.h linux-2.6.35.4/arch/x86/include/asm/cacheflush.h
---- linux-2.6.35.4/arch/x86/include/asm/cacheflush.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/cacheflush.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/cacheflush.h linux-2.6.36/arch/x86/include/asm/cacheflush.h
+--- linux-2.6.36/arch/x86/include/asm/cacheflush.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/cacheflush.h 2010-11-06 18:58:15.000000000 -0400
@@ -66,7 +66,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.35.4/arch/x86/include/asm/cache.h linux-2.6.35.4/arch/x86/include/asm/cache.h
---- linux-2.6.35.4/arch/x86/include/asm/cache.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/cache.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/cache.h linux-2.6.36/arch/x86/include/asm/cache.h
+--- linux-2.6.36/arch/x86/include/asm/cache.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/cache.h 2010-11-06 18:58:15.000000000 -0400
@@ -8,6 +8,7 @@
#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
#define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/checksum_32.h linux-2.6.35.4/arch/x86/include/asm/checksum_32.h
---- linux-2.6.35.4/arch/x86/include/asm/checksum_32.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/checksum_32.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/checksum_32.h linux-2.6.36/arch/x86/include/asm/checksum_32.h
+--- linux-2.6.36/arch/x86/include/asm/checksum_32.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/checksum_32.h 2010-11-06 18:58:15.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.35.4/arch/x86/include/asm/compat.h linux-2.6.35.4/arch/x86/include/asm/compat.h
---- linux-2.6.35.4/arch/x86/include/asm/compat.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/compat.h 2010-09-17 20:12:37.000000000 -0400
-@@ -205,7 +205,7 @@ static inline compat_uptr_t ptr_to_compa
- return (u32)(unsigned long)uptr;
- }
-
--static inline void __user *compat_alloc_user_space(long len)
-+static inline void __user *arch_compat_alloc_user_space(long len)
- {
- struct pt_regs *regs = task_pt_regs(current);
- return (void __user *)regs->sp - len;
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/cpufeature.h linux-2.6.35.4/arch/x86/include/asm/cpufeature.h
---- linux-2.6.35.4/arch/x86/include/asm/cpufeature.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/cpufeature.h 2010-09-17 20:12:09.000000000 -0400
-@@ -323,7 +323,7 @@ static __always_inline __pure bool __sta
- " .byte 4f - 3f\n" /* replacement len */
- " .byte 0xff + (4f-3f) - (2b-1b)\n" /* padding */
+diff -urNp linux-2.6.36/arch/x86/include/asm/cpufeature.h linux-2.6.36/arch/x86/include/asm/cpufeature.h
+--- linux-2.6.36/arch/x86/include/asm/cpufeature.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/cpufeature.h 2010-11-06 18:58:15.000000000 -0400
+@@ -338,7 +338,7 @@ static __always_inline __pure bool __sta
+ ".section .discard,\"aw\",@progbits\n"
+ " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
".previous\n"
- ".section .altinstr_replacement,\"ax\"\n"
+ ".section .altinstr_replacement,\"a\"\n"
"3: movb $1,%0\n"
"4:\n"
".previous\n"
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/desc.h linux-2.6.35.4/arch/x86/include/asm/desc.h
---- linux-2.6.35.4/arch/x86/include/asm/desc.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/desc.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/desc.h linux-2.6.36/arch/x86/include/asm/desc.h
+--- linux-2.6.36/arch/x86/include/asm/desc.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/desc.h 2010-11-06 18:58:15.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.35.4/arch/x86/include/asm/device.h linux-2.6.35.4/arch/x86/include/asm/device.h
---- linux-2.6.35.4/arch/x86/include/asm/device.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/device.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/device.h linux-2.6.36/arch/x86/include/asm/device.h
+--- linux-2.6.36/arch/x86/include/asm/device.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/device.h 2010-11-06 18:58:15.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.35.4/arch/x86/include/asm/dma-mapping.h linux-2.6.35.4/arch/x86/include/asm/dma-mapping.h
---- linux-2.6.35.4/arch/x86/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/dma-mapping.h linux-2.6.36/arch/x86/include/asm/dma-mapping.h
+--- linux-2.6.36/arch/x86/include/asm/dma-mapping.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/dma-mapping.h 2010-11-06 18:58:15.000000000 -0400
@@ -26,9 +26,9 @@ extern int iommu_merge;
extern struct device x86_dma_fallback_dev;
extern int panic_on_overflow;
if (ops->mapping_error)
return ops->mapping_error(dev, dma_addr);
-@@ -123,7 +123,7 @@ static inline void *
+@@ -115,7 +115,7 @@ static inline void *
dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
gfp_t gfp)
{
void *memory;
gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
-@@ -150,7 +150,7 @@ dma_alloc_coherent(struct device *dev, s
+@@ -142,7 +142,7 @@ dma_alloc_coherent(struct device *dev, s
static inline void dma_free_coherent(struct device *dev, size_t size,
void *vaddr, dma_addr_t bus)
{
WARN_ON(irqs_disabled()); /* for portability */
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/e820.h linux-2.6.35.4/arch/x86/include/asm/e820.h
---- linux-2.6.35.4/arch/x86/include/asm/e820.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/e820.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/e820.h linux-2.6.36/arch/x86/include/asm/e820.h
+--- linux-2.6.36/arch/x86/include/asm/e820.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/e820.h 2010-11-06 18:58:15.000000000 -0400
@@ -69,7 +69,7 @@ struct e820map {
#define ISA_START_ADDRESS 0xa0000
#define ISA_END_ADDRESS 0x100000
#define BIOS_END 0x00100000
#ifdef __KERNEL__
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/elf.h linux-2.6.35.4/arch/x86/include/asm/elf.h
---- linux-2.6.35.4/arch/x86/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/elf.h linux-2.6.36/arch/x86/include/asm/elf.h
+--- linux-2.6.36/arch/x86/include/asm/elf.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/elf.h 2010-11-06 18:58:15.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.35.4/arch/x86/include/asm/futex.h linux-2.6.35.4/arch/x86/include/asm/futex.h
---- linux-2.6.35.4/arch/x86/include/asm/futex.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/futex.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/futex.h linux-2.6.36/arch/x86/include/asm/futex.h
+--- linux-2.6.36/arch/x86/include/asm/futex.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/futex.h 2010-11-06 18:58:15.000000000 -0400
@@ -11,17 +11,54 @@
#include <asm/processor.h>
#include <asm/system.h>
: "memory"
);
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/i387.h linux-2.6.35.4/arch/x86/include/asm/i387.h
---- linux-2.6.35.4/arch/x86/include/asm/i387.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/i387.h 2010-09-17 20:12:09.000000000 -0400
-@@ -77,6 +77,11 @@ static inline int fxrstor_checking(struc
+diff -urNp linux-2.6.36/arch/x86/include/asm/i387.h linux-2.6.36/arch/x86/include/asm/i387.h
+--- linux-2.6.36/arch/x86/include/asm/i387.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/i387.h 2010-11-06 18:58:15.000000000 -0400
+@@ -90,6 +90,11 @@ static inline int fxrstor_checking(struc
{
int err;
asm volatile("1: rex64/fxrstor (%[fx])\n\t"
"2:\n"
".section .fixup,\"ax\"\n"
-@@ -127,6 +132,11 @@ static inline int fxsave_user(struct i38
+@@ -140,6 +145,11 @@ static inline int fxsave_user(struct i38
{
int err;
+ fx = (struct i387_fxsave_struct __user *)((void __user *)fx + PAX_USER_SHADOW_BASE);
+#endif
+
- asm volatile("1: rex64/fxsave (%[fx])\n\t"
- "2:\n"
- ".section .fixup,\"ax\"\n"
-@@ -220,13 +230,8 @@ static inline int fxrstor_checking(struc
+ /*
+ * Clear the bytes not touched by the fxsave and reserved
+ * for the SW usage.
+@@ -242,13 +252,8 @@ static inline int fxrstor_checking(struc
}
/* We need a safe address that is cheap to find and that is already
/*
* These must be called with preempt disabled
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/io.h linux-2.6.35.4/arch/x86/include/asm/io.h
---- linux-2.6.35.4/arch/x86/include/asm/io.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/io.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/io.h linux-2.6.36/arch/x86/include/asm/io.h
+--- linux-2.6.36/arch/x86/include/asm/io.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/io.h 2010-11-06 18:58:15.000000000 -0400
@@ -213,6 +213,17 @@ extern void iounmap(volatile void __iome
#include <linux/vmalloc.h>
/*
* Convert a virtual cached pointer to an uncached pointer
*/
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/iommu.h linux-2.6.35.4/arch/x86/include/asm/iommu.h
---- linux-2.6.35.4/arch/x86/include/asm/iommu.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/iommu.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/iommu.h linux-2.6.36/arch/x86/include/asm/iommu.h
+--- linux-2.6.36/arch/x86/include/asm/iommu.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/iommu.h 2010-11-06 18:58:15.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.35.4/arch/x86/include/asm/irqflags.h linux-2.6.35.4/arch/x86/include/asm/irqflags.h
---- linux-2.6.35.4/arch/x86/include/asm/irqflags.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/irqflags.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/irqflags.h linux-2.6.36/arch/x86/include/asm/irqflags.h
+--- linux-2.6.36/arch/x86/include/asm/irqflags.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/irqflags.h 2010-11-06 18:58:15.000000000 -0400
@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_
sti; \
sysexit
#else
#define INTERRUPT_RETURN iret
#define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/kvm_host.h linux-2.6.35.4/arch/x86/include/asm/kvm_host.h
---- linux-2.6.35.4/arch/x86/include/asm/kvm_host.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/kvm_host.h 2010-09-17 20:12:09.000000000 -0400
-@@ -536,7 +536,7 @@ struct kvm_x86_ops {
+diff -urNp linux-2.6.36/arch/x86/include/asm/kvm_host.h linux-2.6.36/arch/x86/include/asm/kvm_host.h
+--- linux-2.6.36/arch/x86/include/asm/kvm_host.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/kvm_host.h 2010-11-06 18:58:15.000000000 -0400
+@@ -525,7 +525,7 @@ struct kvm_x86_ops {
const struct trace_print_flags *exit_reasons_str;
};
int kvm_mmu_module_init(void);
void kvm_mmu_module_exit(void);
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/local.h linux-2.6.35.4/arch/x86/include/asm/local.h
---- linux-2.6.35.4/arch/x86/include/asm/local.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/local.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/local.h linux-2.6.36/arch/x86/include/asm/local.h
+--- linux-2.6.36/arch/x86/include/asm/local.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/local.h 2010-11-06 18:58:15.000000000 -0400
@@ -18,26 +18,90 @@ 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.35.4/arch/x86/include/asm/mc146818rtc.h linux-2.6.35.4/arch/x86/include/asm/mc146818rtc.h
---- linux-2.6.35.4/arch/x86/include/asm/mc146818rtc.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/mc146818rtc.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/mc146818rtc.h linux-2.6.36/arch/x86/include/asm/mc146818rtc.h
+--- linux-2.6.36/arch/x86/include/asm/mc146818rtc.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/mc146818rtc.h 2010-11-06 18:58:15.000000000 -0400
@@ -81,8 +81,8 @@ static inline unsigned char current_lock
#else
#define lock_cmos_prefix(reg) do {} while (0)
#define do_i_have_lock_cmos() 0
#define current_lock_cmos_reg() 0
#endif
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/microcode.h linux-2.6.35.4/arch/x86/include/asm/microcode.h
---- linux-2.6.35.4/arch/x86/include/asm/microcode.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/microcode.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/microcode.h linux-2.6.36/arch/x86/include/asm/microcode.h
+--- linux-2.6.36/arch/x86/include/asm/microcode.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/microcode.h 2010-11-06 18:58:15.000000000 -0400
@@ -12,13 +12,13 @@ struct device;
enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
{
return NULL;
}
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/mman.h linux-2.6.35.4/arch/x86/include/asm/mman.h
---- linux-2.6.35.4/arch/x86/include/asm/mman.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/mman.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/mman.h linux-2.6.36/arch/x86/include/asm/mman.h
+--- linux-2.6.36/arch/x86/include/asm/mman.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/mman.h 2010-11-06 18:58:15.000000000 -0400
@@ -5,4 +5,14 @@
#include <asm-generic/mman.h>
+#endif
+
#endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/mmu_context.h linux-2.6.35.4/arch/x86/include/asm/mmu_context.h
---- linux-2.6.35.4/arch/x86/include/asm/mmu_context.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/mmu_context.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/mmu_context.h linux-2.6.36/arch/x86/include/asm/mmu_context.h
+--- linux-2.6.36/arch/x86/include/asm/mmu_context.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/mmu_context.h 2010-11-06 18:58:15.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.35.4/arch/x86/include/asm/mmu.h linux-2.6.35.4/arch/x86/include/asm/mmu.h
---- linux-2.6.35.4/arch/x86/include/asm/mmu.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/mmu.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/mmu.h linux-2.6.36/arch/x86/include/asm/mmu.h
+--- linux-2.6.36/arch/x86/include/asm/mmu.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/mmu.h 2010-11-06 18:58:15.000000000 -0400
@@ -9,10 +9,23 @@
* we put the segment information here.
*/
} mm_context_t;
#ifdef CONFIG_SMP
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/module.h linux-2.6.35.4/arch/x86/include/asm/module.h
---- linux-2.6.35.4/arch/x86/include/asm/module.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/module.h 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/module.h linux-2.6.36/arch/x86/include/asm/module.h
+--- linux-2.6.36/arch/x86/include/asm/module.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/module.h 2010-11-06 18:58:50.000000000 -0400
@@ -59,13 +59,31 @@
#error unknown processor family
#endif
#endif
#endif /* _ASM_X86_MODULE_H */
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/page_32_types.h linux-2.6.35.4/arch/x86/include/asm/page_32_types.h
---- linux-2.6.35.4/arch/x86/include/asm/page_32_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/page_32_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/page_32_types.h linux-2.6.36/arch/x86/include/asm/page_32_types.h
+--- linux-2.6.36/arch/x86/include/asm/page_32_types.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/page_32_types.h 2010-11-06 18:58:15.000000000 -0400
@@ -15,6 +15,10 @@
*/
#define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)
#ifdef CONFIG_4KSTACKS
#define THREAD_ORDER 0
#else
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/paravirt.h linux-2.6.35.4/arch/x86/include/asm/paravirt.h
---- linux-2.6.35.4/arch/x86/include/asm/paravirt.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/paravirt.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/paravirt.h linux-2.6.36/arch/x86/include/asm/paravirt.h
+--- linux-2.6.36/arch/x86/include/asm/paravirt.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/paravirt.h 2010-11-06 18:58:15.000000000 -0400
@@ -720,6 +720,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.35.4/arch/x86/include/asm/paravirt_types.h linux-2.6.35.4/arch/x86/include/asm/paravirt_types.h
---- linux-2.6.35.4/arch/x86/include/asm/paravirt_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/paravirt_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/paravirt_types.h linux-2.6.36/arch/x86/include/asm/paravirt_types.h
+--- linux-2.6.36/arch/x86/include/asm/paravirt_types.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/paravirt_types.h 2010-11-06 18:58:15.000000000 -0400
@@ -312,6 +312,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.35.4/arch/x86/include/asm/pci_x86.h linux-2.6.35.4/arch/x86/include/asm/pci_x86.h
---- linux-2.6.35.4/arch/x86/include/asm/pci_x86.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/pci_x86.h 2010-09-17 20:12:09.000000000 -0400
-@@ -91,16 +91,16 @@ extern int (*pcibios_enable_irq)(struct
+diff -urNp linux-2.6.36/arch/x86/include/asm/pci_x86.h linux-2.6.36/arch/x86/include/asm/pci_x86.h
+--- linux-2.6.36/arch/x86/include/asm/pci_x86.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/pci_x86.h 2010-11-06 18:58:15.000000000 -0400
+@@ -92,16 +92,16 @@ extern int (*pcibios_enable_irq)(struct
extern void (*pcibios_disable_irq)(struct pci_dev *dev);
struct pci_raw_ops {
extern bool port_cf9_safe;
/* arch_initcall level */
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/pgalloc.h linux-2.6.35.4/arch/x86/include/asm/pgalloc.h
---- linux-2.6.35.4/arch/x86/include/asm/pgalloc.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/pgalloc.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/pgalloc.h linux-2.6.36/arch/x86/include/asm/pgalloc.h
+--- linux-2.6.36/arch/x86/include/asm/pgalloc.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/pgalloc.h 2010-11-06 18:58:15.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.35.4/arch/x86/include/asm/pgtable-2level.h linux-2.6.35.4/arch/x86/include/asm/pgtable-2level.h
---- linux-2.6.35.4/arch/x86/include/asm/pgtable-2level.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/pgtable-2level.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable-2level.h linux-2.6.36/arch/x86/include/asm/pgtable-2level.h
+--- linux-2.6.36/arch/x86/include/asm/pgtable-2level.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/pgtable-2level.h 2010-11-06 18:58:15.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.35.4/arch/x86/include/asm/pgtable_32.h linux-2.6.35.4/arch/x86/include/asm/pgtable_32.h
---- linux-2.6.35.4/arch/x86/include/asm/pgtable_32.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/pgtable_32.h 2010-09-17 20:12:09.000000000 -0400
-@@ -25,8 +25,6 @@
+diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable_32.h linux-2.6.36/arch/x86/include/asm/pgtable_32.h
+--- linux-2.6.36/arch/x86/include/asm/pgtable_32.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/pgtable_32.h 2010-11-06 18:58:15.000000000 -0400
+@@ -25,9 +25,6 @@
struct mm_struct;
struct vm_area_struct;
-extern pgd_t swapper_pg_dir[1024];
+-extern pgd_t trampoline_pg_dir[1024];
-
static inline void pgtable_cache_init(void) { }
static inline void check_pgt_cache(void) { }
void paging_init(void);
-@@ -47,6 +45,11 @@ extern void set_pmd_pfn(unsigned long, u
+@@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, u
# include <asm/pgtable-2level.h>
#endif
+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
++extern pgd_t trampoline_pg_dir[PTRS_PER_PGD];
+#ifdef CONFIG_X86_PAE
+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
+#endif
#if defined(CONFIG_HIGHPTE)
#define __KM_PTE \
(in_nmi() ? KM_NMI_PTE : \
-@@ -71,7 +74,9 @@ extern void set_pmd_pfn(unsigned long, u
+@@ -72,7 +75,9 @@ extern void set_pmd_pfn(unsigned long, u
/* Clear a kernel PTE and flush it from the TLB */
#define kpte_clear_flush(ptep, vaddr) \
do { \
__flush_tlb_one((vaddr)); \
} while (0)
-@@ -83,6 +88,9 @@ do { \
+@@ -84,6 +89,9 @@ do { \
#endif /* !__ASSEMBLY__ */
/*
* kern_addr_valid() is (1) for FLATMEM and (0) for
* SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/pgtable_32_types.h linux-2.6.35.4/arch/x86/include/asm/pgtable_32_types.h
---- linux-2.6.35.4/arch/x86/include/asm/pgtable_32_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/pgtable_32_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable_32_types.h linux-2.6.36/arch/x86/include/asm/pgtable_32_types.h
+--- linux-2.6.36/arch/x86/include/asm/pgtable_32_types.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/pgtable_32_types.h 2010-11-06 18:58:15.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.35.4/arch/x86/include/asm/pgtable-3level.h linux-2.6.35.4/arch/x86/include/asm/pgtable-3level.h
---- linux-2.6.35.4/arch/x86/include/asm/pgtable-3level.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/pgtable-3level.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable-3level.h linux-2.6.36/arch/x86/include/asm/pgtable-3level.h
+--- linux-2.6.36/arch/x86/include/asm/pgtable-3level.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/pgtable-3level.h 2010-11-06 18:58:15.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.35.4/arch/x86/include/asm/pgtable_64.h linux-2.6.35.4/arch/x86/include/asm/pgtable_64.h
---- linux-2.6.35.4/arch/x86/include/asm/pgtable_64.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/pgtable_64.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable_64.h linux-2.6.36/arch/x86/include/asm/pgtable_64.h
+--- linux-2.6.36/arch/x86/include/asm/pgtable_64.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/pgtable_64.h 2010-11-06 18:58:15.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.35.4/arch/x86/include/asm/pgtable_64_types.h linux-2.6.35.4/arch/x86/include/asm/pgtable_64_types.h
---- linux-2.6.35.4/arch/x86/include/asm/pgtable_64_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/pgtable_64_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable_64_types.h linux-2.6.36/arch/x86/include/asm/pgtable_64_types.h
+--- linux-2.6.36/arch/x86/include/asm/pgtable_64_types.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/pgtable_64_types.h 2010-11-06 18:58:15.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.35.4/arch/x86/include/asm/pgtable.h linux-2.6.35.4/arch/x86/include/asm/pgtable.h
---- linux-2.6.35.4/arch/x86/include/asm/pgtable.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/pgtable.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable.h linux-2.6.36/arch/x86/include/asm/pgtable.h
+--- linux-2.6.36/arch/x86/include/asm/pgtable.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/pgtable.h 2010-11-06 18:58:15.000000000 -0400
@@ -76,12 +76,51 @@ extern struct list_head pgd_list;
#define arch_end_context_switch(prev) do {} while(0)
#include <asm-generic/pgtable.h>
#endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/pgtable_types.h linux-2.6.35.4/arch/x86/include/asm/pgtable_types.h
---- linux-2.6.35.4/arch/x86/include/asm/pgtable_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/pgtable_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable_types.h linux-2.6.36/arch/x86/include/asm/pgtable_types.h
+--- linux-2.6.36/arch/x86/include/asm/pgtable_types.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/pgtable_types.h 2010-11-06 18:58:15.000000000 -0400
@@ -16,12 +16,11 @@
#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.35.4/arch/x86/include/asm/processor.h linux-2.6.35.4/arch/x86/include/asm/processor.h
---- linux-2.6.35.4/arch/x86/include/asm/processor.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/processor.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/processor.h linux-2.6.36/arch/x86/include/asm/processor.h
+--- linux-2.6.36/arch/x86/include/asm/processor.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/processor.h 2010-11-06 18:58:15.000000000 -0400
@@ -269,7 +269,7 @@ struct tss_struct {
} ____cacheline_aligned;
/*
* Save the original ist values for checking stack pointers during debugging
-@@ -884,8 +884,15 @@ static inline void spin_lock_prefetch(co
+@@ -885,8 +885,15 @@ static inline void spin_lock_prefetch(co
*/
#define TASK_SIZE PAGE_OFFSET
#define TASK_SIZE_MAX TASK_SIZE
#define INIT_THREAD { \
.sp0 = sizeof(init_stack) + (long)&init_stack, \
-@@ -902,7 +909,7 @@ static inline void spin_lock_prefetch(co
+@@ -903,7 +910,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, \
-@@ -913,11 +920,7 @@ static inline void spin_lock_prefetch(co
+@@ -914,11 +921,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.
-@@ -932,7 +935,7 @@ extern unsigned long thread_saved_pc(str
+@@ -933,7 +936,7 @@ extern unsigned long thread_saved_pc(str
#define task_pt_regs(task) \
({ \
struct pt_regs *__regs__; \
__regs__ - 1; \
})
-@@ -942,13 +945,13 @@ extern unsigned long thread_saved_pc(str
+@@ -943,13 +946,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)
-@@ -985,6 +988,10 @@ extern void start_thread(struct pt_regs
+@@ -986,6 +989,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.35.4/arch/x86/include/asm/ptrace.h linux-2.6.35.4/arch/x86/include/asm/ptrace.h
---- linux-2.6.35.4/arch/x86/include/asm/ptrace.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/ptrace.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/ptrace.h linux-2.6.36/arch/x86/include/asm/ptrace.h
+--- linux-2.6.36/arch/x86/include/asm/ptrace.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/ptrace.h 2010-11-06 18:58:15.000000000 -0400
@@ -152,28 +152,29 @@ static inline unsigned long regs_return_
}
#endif
}
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/reboot.h linux-2.6.35.4/arch/x86/include/asm/reboot.h
---- linux-2.6.35.4/arch/x86/include/asm/reboot.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/reboot.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/reboot.h linux-2.6.36/arch/x86/include/asm/reboot.h
+--- linux-2.6.36/arch/x86/include/asm/reboot.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/reboot.h 2010-11-06 18:58:15.000000000 -0400
@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
void native_machine_crash_shutdown(struct pt_regs *regs);
typedef void (*nmi_shootdown_cb)(int, struct die_args*);
void nmi_shootdown_cpus(nmi_shootdown_cb callback);
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/rwsem.h linux-2.6.35.4/arch/x86/include/asm/rwsem.h
---- linux-2.6.35.4/arch/x86/include/asm/rwsem.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/rwsem.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/rwsem.h linux-2.6.36/arch/x86/include/asm/rwsem.h
+--- linux-2.6.36/arch/x86/include/asm/rwsem.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/rwsem.h 2010-11-06 18:58:15.000000000 -0400
@@ -118,10 +118,26 @@ static inline void __down_read(struct rw
{
asm volatile("# beginning down_read\n\t"
+ _ASM_EXTABLE(0b, 1b)
+#endif
+
- /* adds 0x00000001, returns the old value */
+ /* adds 0x00000001 */
- " jns 1f\n"
+ " jns 2f\n"
" call call_rwsem_down_read_failed\n"
"# ending __down_read_trylock\n\t"
: "+m" (sem->count), "=&a" (result), "=&r" (tmp)
: "i" (RWSEM_ACTIVE_READ_BIAS)
-@@ -160,12 +192,28 @@ static inline void __down_write_nested(s
- tmp = RWSEM_ACTIVE_WRITE_BIAS;
+@@ -158,12 +190,28 @@ static inline void __down_write_nested(s
+ rwsem_count_t tmp;
asm volatile("# beginning down_write\n\t"
LOCK_PREFIX " xadd %1,(%2)\n\t"
+
+ _ASM_EXTABLE(0b, 1b)
+#endif
+
- /* subtract 0x0000ffff, returns the old value */
+ /* adds 0xffff0001, returns the old value */
" test %1,%1\n\t"
/* was the count 0 before? */
- " jz 1f\n"
+ "2:\n"
"# ending down_write"
: "+m" (sem->count), "=d" (tmp)
- : "a" (sem), "1" (tmp)
-@@ -198,10 +246,26 @@ static inline void __up_read(struct rw_s
- rwsem_count_t tmp = -RWSEM_ACTIVE_READ_BIAS;
+ : "a" (sem), "1" (RWSEM_ACTIVE_WRITE_BIAS)
+@@ -196,10 +244,26 @@ static inline void __up_read(struct rw_s
+ rwsem_count_t 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"
+ " jns 2f\n\t"
- " call call_rwsem_wake\n"
+ " call call_rwsem_wake\n" /* expects old value in %edx */
- "1:\n"
+ "2:\n"
"# ending __up_read\n"
: "+m" (sem->count), "=d" (tmp)
- : "a" (sem), "1" (tmp)
-@@ -216,11 +280,27 @@ static inline void __up_write(struct rw_
+ : "a" (sem), "1" (-RWSEM_ACTIVE_READ_BIAS)
+@@ -214,10 +278,26 @@ static inline void __up_write(struct rw_
rwsem_count_t tmp;
asm volatile("# beginning __up_write\n\t"
LOCK_PREFIX " xadd %1,(%2)\n\t"
+ _ASM_EXTABLE(0b, 1b)
+#endif
+
- /* tries to transition
- 0xffff0001 -> 0x00000000 */
-- " jz 1f\n"
-+ " jz 2f\n"
- " call call_rwsem_wake\n"
+ /* subtracts 0xffff0001, returns the old value */
+- " jns 1f\n\t"
++ " jns 2f\n\t"
+ " call call_rwsem_wake\n" /* expects old value in %edx */
- "1:\n\t"
+ "2:\n\t"
"# ending __up_write\n"
: "+m" (sem->count), "=d" (tmp)
: "a" (sem), "1" (-RWSEM_ACTIVE_WRITE_BIAS)
-@@ -234,13 +314,29 @@ static inline void __downgrade_write(str
+@@ -231,13 +311,29 @@ static inline void __downgrade_write(str
{
asm volatile("# beginning __downgrade_write\n\t"
LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
"# ending __downgrade_write\n"
: "+m" (sem->count)
: "a" (sem), "er" (-RWSEM_WAITING_BIAS)
-@@ -253,7 +349,23 @@ static inline void __downgrade_write(str
+@@ -250,7 +346,23 @@ static inline void __downgrade_write(str
static inline void rwsem_atomic_add(rwsem_count_t delta,
struct rw_semaphore *sem)
{
: "+m" (sem->count)
: "er" (delta));
}
-@@ -266,7 +378,23 @@ static inline rwsem_count_t rwsem_atomic
+@@ -263,7 +375,23 @@ static inline rwsem_count_t rwsem_atomic
{
rwsem_count_t tmp = delta;
: "+r" (tmp), "+m" (sem->count)
: : "memory");
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/segment.h linux-2.6.35.4/arch/x86/include/asm/segment.h
---- linux-2.6.35.4/arch/x86/include/asm/segment.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/segment.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/segment.h linux-2.6.36/arch/x86/include/asm/segment.h
+--- linux-2.6.36/arch/x86/include/asm/segment.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/segment.h 2010-11-06 18:58:15.000000000 -0400
@@ -62,8 +62,8 @@
* 26 - ESPFIX small SS
* 27 - per-cpu [ offset to per-cpu data area ]
#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.35.4/arch/x86/include/asm/spinlock.h linux-2.6.35.4/arch/x86/include/asm/spinlock.h
---- linux-2.6.35.4/arch/x86/include/asm/spinlock.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/spinlock.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/smp.h linux-2.6.36/arch/x86/include/asm/smp.h
+--- linux-2.6.36/arch/x86/include/asm/smp.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/smp.h 2010-11-06 18:58:15.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);
+ 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)
+ {
+diff -urNp linux-2.6.36/arch/x86/include/asm/spinlock.h linux-2.6.36/arch/x86/include/asm/spinlock.h
+--- linux-2.6.36/arch/x86/include/asm/spinlock.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/spinlock.h 2010-11-06 18:58:15.000000000 -0400
@@ -249,18 +249,50 @@ 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.35.4/arch/x86/include/asm/system.h linux-2.6.35.4/arch/x86/include/asm/system.h
---- linux-2.6.35.4/arch/x86/include/asm/system.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/system.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/system.h linux-2.6.36/arch/x86/include/asm/system.h
+--- linux-2.6.36/arch/x86/include/asm/system.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/system.h 2010-11-06 18:58:15.000000000 -0400
@@ -202,7 +202,7 @@ static inline unsigned long get_limit(un
{
unsigned long __limit;
extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
void default_idle(void);
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/uaccess_32.h linux-2.6.35.4/arch/x86/include/asm/uaccess_32.h
---- linux-2.6.35.4/arch/x86/include/asm/uaccess_32.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/uaccess_32.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess_32.h linux-2.6.36/arch/x86/include/asm/uaccess_32.h
+--- linux-2.6.36/arch/x86/include/asm/uaccess_32.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/uaccess_32.h 2010-11-06 18:58:15.000000000 -0400
@@ -44,6 +44,9 @@ 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)
return n;
}
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/uaccess_64.h linux-2.6.35.4/arch/x86/include/asm/uaccess_64.h
---- linux-2.6.35.4/arch/x86/include/asm/uaccess_64.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/uaccess_64.h 2010-09-17 20:12:37.000000000 -0400
-@@ -11,6 +11,11 @@
+diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess_64.h linux-2.6.36/arch/x86/include/asm/uaccess_64.h
+--- linux-2.6.36/arch/x86/include/asm/uaccess_64.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/uaccess_64.h 2010-11-06 18:58:15.000000000 -0400
+@@ -11,6 +11,9 @@
#include <asm/alternative.h>
#include <asm/cpufeature.h>
#include <asm/page.h>
+#include <asm/pgtable.h>
+
+#define set_fs(x) (current_thread_info()->addr_limit = (x))
-+
-+extern void check_object_size(const void *ptr, unsigned long n, bool to);
/*
* Copy To/From Userspace
-@@ -37,26 +42,26 @@ copy_user_generic(void *to, const void *
+@@ -37,26 +40,26 @@ copy_user_generic(void *to, const void *
return ret;
}
return n;
}
-@@ -65,17 +70,35 @@ int copy_to_user(void __user *dst, const
+@@ -65,17 +68,35 @@ int copy_to_user(void __user *dst, const
{
might_fault();
switch (size) {
case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
ret, "b", "b", "=q", 1);
-@@ -108,18 +131,36 @@ int __copy_from_user(void *dst, const vo
+@@ -108,18 +129,36 @@ int __copy_from_user(void *dst, const vo
ret, "q", "", "=r", 8);
return ret;
default:
switch (size) {
case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
ret, "b", "b", "iq", 1);
-@@ -152,19 +193,30 @@ int __copy_to_user(void __user *dst, con
+@@ -152,19 +191,30 @@ int __copy_to_user(void __user *dst, con
ret, "q", "", "er", 8);
return ret;
default:
switch (size) {
case 1: {
u8 tmp;
-@@ -204,6 +256,10 @@ int __copy_in_user(void __user *dst, con
+@@ -204,6 +254,10 @@ int __copy_in_user(void __user *dst, con
return ret;
}
default:
return copy_user_generic((__force void *)dst,
(__force void *)src, size);
}
-@@ -222,33 +278,45 @@ __must_check unsigned long __clear_user(
+@@ -222,33 +276,45 @@ __must_check unsigned long __clear_user(
static __must_check __always_inline int
__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
{
copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
#endif /* _ASM_X86_UACCESS_64_H */
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/uaccess.h linux-2.6.35.4/arch/x86/include/asm/uaccess.h
---- linux-2.6.35.4/arch/x86/include/asm/uaccess.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/uaccess.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess.h linux-2.6.36/arch/x86/include/asm/uaccess.h
+--- linux-2.6.36/arch/x86/include/asm/uaccess.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/uaccess.h 2010-11-06 18:58:15.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.35.4/arch/x86/include/asm/vgtod.h linux-2.6.35.4/arch/x86/include/asm/vgtod.h
---- linux-2.6.35.4/arch/x86/include/asm/vgtod.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/vgtod.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/vgtod.h linux-2.6.36/arch/x86/include/asm/vgtod.h
+--- linux-2.6.36/arch/x86/include/asm/vgtod.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/vgtod.h 2010-11-06 18:58:15.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.35.4/arch/x86/include/asm/vmi.h linux-2.6.35.4/arch/x86/include/asm/vmi.h
---- linux-2.6.35.4/arch/x86/include/asm/vmi.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/vmi.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/vmi.h linux-2.6.36/arch/x86/include/asm/vmi.h
+--- linux-2.6.36/arch/x86/include/asm/vmi.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/vmi.h 2010-11-06 18:58:15.000000000 -0400
@@ -191,6 +191,7 @@ struct vrom_header {
u8 reserved[96]; /* Reserved for headers */
char vmi_init[8]; /* VMI_Init jump point */
} __attribute__((packed));
struct pnp_header {
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/vsyscall.h linux-2.6.35.4/arch/x86/include/asm/vsyscall.h
---- linux-2.6.35.4/arch/x86/include/asm/vsyscall.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/vsyscall.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/include/asm/vsyscall.h linux-2.6.36/arch/x86/include/asm/vsyscall.h
+--- linux-2.6.36/arch/x86/include/asm/vsyscall.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/vsyscall.h 2010-11-06 18:58:15.000000000 -0400
@@ -15,9 +15,10 @@ enum vsyscall_num {
#ifdef __KERNEL__
#endif /* __KERNEL__ */
#endif /* _ASM_X86_VSYSCALL_H */
-diff -urNp linux-2.6.35.4/arch/x86/include/asm/xsave.h linux-2.6.35.4/arch/x86/include/asm/xsave.h
---- linux-2.6.35.4/arch/x86/include/asm/xsave.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/include/asm/xsave.h 2010-09-17 20:12:09.000000000 -0400
-@@ -59,6 +59,12 @@ static inline int fpu_xrstor_checking(st
- static inline int xsave_user(struct xsave_struct __user *buf)
+diff -urNp linux-2.6.36/arch/x86/include/asm/xsave.h linux-2.6.36/arch/x86/include/asm/xsave.h
+--- linux-2.6.36/arch/x86/include/asm/xsave.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/include/asm/xsave.h 2010-11-06 18:58:15.000000000 -0400
+@@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav
{
int err;
-+
+
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
+ if ((unsigned long)buf < PAX_USER_SHADOW_BASE)
+ buf = (struct xsave_struct __user *)((void __user*)buf + PAX_USER_SHADOW_BASE);
+#endif
+
- __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x27\n"
- "2:\n"
- ".section .fixup,\"ax\"\n"
-@@ -85,6 +91,11 @@ static inline int xrestore_user(struct x
+ /*
+ * Clear the xsave header first, so that reserved fields are
+ * initialized to zero.
+@@ -100,6 +105,11 @@ static inline int xrestore_user(struct x
u32 lmask = mask;
u32 hmask = mask >> 32;
__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
"2:\n"
".section .fixup,\"ax\"\n"
-diff -urNp linux-2.6.35.4/arch/x86/Kconfig linux-2.6.35.4/arch/x86/Kconfig
---- linux-2.6.35.4/arch/x86/Kconfig 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/Kconfig 2010-09-17 20:12:37.000000000 -0400
-@@ -1038,7 +1038,7 @@ choice
+diff -urNp linux-2.6.36/arch/x86/Kconfig linux-2.6.36/arch/x86/Kconfig
+--- linux-2.6.36/arch/x86/Kconfig 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/Kconfig 2010-11-06 18:58:50.000000000 -0400
+@@ -1036,7 +1036,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
-@@ -1075,7 +1075,7 @@ config NOHIGHMEM
+@@ -1073,7 +1073,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.
-@@ -1129,7 +1129,7 @@ config PAGE_OFFSET
+@@ -1127,7 +1127,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
-@@ -1461,7 +1461,7 @@ config ARCH_USES_PG_UNCACHED
+@@ -1459,7 +1459,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).
-@@ -1548,6 +1548,7 @@ config KEXEC_JUMP
+@@ -1546,6 +1546,7 @@ config KEXEC_JUMP
config PHYSICAL_START
hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
default "0x1000000"
---help---
This gives the physical address where the kernel is loaded.
-@@ -1611,6 +1612,7 @@ config X86_NEED_RELOCS
+@@ -1609,6 +1610,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
-@@ -1642,9 +1644,10 @@ config HOTPLUG_CPU
+@@ -1640,9 +1642,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.35.4/arch/x86/Kconfig.cpu linux-2.6.35.4/arch/x86/Kconfig.cpu
---- linux-2.6.35.4/arch/x86/Kconfig.cpu 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/Kconfig.cpu 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/Kconfig.cpu linux-2.6.36/arch/x86/Kconfig.cpu
+--- linux-2.6.36/arch/x86/Kconfig.cpu 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/Kconfig.cpu 2010-11-06 18:58:15.000000000 -0400
@@ -336,7 +336,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
config X86_MINIMUM_CPU_FAMILY
int
-diff -urNp linux-2.6.35.4/arch/x86/Kconfig.debug linux-2.6.35.4/arch/x86/Kconfig.debug
---- linux-2.6.35.4/arch/x86/Kconfig.debug 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/Kconfig.debug 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/Kconfig.debug linux-2.6.36/arch/x86/Kconfig.debug
+--- linux-2.6.36/arch/x86/Kconfig.debug 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/Kconfig.debug 2010-11-06 18:58:15.000000000 -0400
@@ -97,7 +97,7 @@ config X86_PTDUMP
config DEBUG_RODATA
bool "Write protect kernel read-only data structures"
---help---
Mark the kernel read-only data as write-protected in the pagetables,
in order to catch accidental (and incorrect) writes to such const
-diff -urNp linux-2.6.35.4/arch/x86/kernel/acpi/boot.c linux-2.6.35.4/arch/x86/kernel/acpi/boot.c
---- linux-2.6.35.4/arch/x86/kernel/acpi/boot.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/acpi/boot.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/acpi/boot.c linux-2.6.36/arch/x86/kernel/acpi/boot.c
+--- linux-2.6.36/arch/x86/kernel/acpi/boot.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/acpi/boot.c 2010-11-06 18:58:15.000000000 -0400
@@ -1472,7 +1472,7 @@ static struct dmi_system_id __initdata a
DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
},
};
/*
-diff -urNp linux-2.6.35.4/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.35.4/arch/x86/kernel/acpi/realmode/wakeup.S
---- linux-2.6.35.4/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/acpi/realmode/wakeup.S 2010-09-17 20:12:09.000000000 -0400
-@@ -104,7 +104,7 @@ _start:
- movl %eax, %ecx
- orl %edx, %ecx
- jz 1f
-- movl $0xc0000080, %ecx
-+ mov $MSR_EFER, %ecx
- wrmsr
- 1:
-
-diff -urNp linux-2.6.35.4/arch/x86/kernel/acpi/sleep.c linux-2.6.35.4/arch/x86/kernel/acpi/sleep.c
---- linux-2.6.35.4/arch/x86/kernel/acpi/sleep.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/acpi/sleep.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/acpi/sleep.c linux-2.6.36/arch/x86/kernel/acpi/sleep.c
+--- linux-2.6.36/arch/x86/kernel/acpi/sleep.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/acpi/sleep.c 2010-11-06 18:58:15.000000000 -0400
@@ -11,11 +11,12 @@
#include <linux/cpumask.h>
#include <asm/segment.h>
initial_gs = per_cpu_offset(smp_processor_id());
#endif
initial_code = (unsigned long)wakeup_long64;
-diff -urNp linux-2.6.35.4/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.35.4/arch/x86/kernel/acpi/wakeup_32.S
---- linux-2.6.35.4/arch/x86/kernel/acpi/wakeup_32.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/acpi/wakeup_32.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.36/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-2.6.36/arch/x86/kernel/acpi/wakeup_32.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/acpi/wakeup_32.S 2010-11-06 18:58:15.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.35.4/arch/x86/kernel/alternative.c linux-2.6.35.4/arch/x86/kernel/alternative.c
---- linux-2.6.35.4/arch/x86/kernel/alternative.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/alternative.c 2010-09-17 20:12:09.000000000 -0400
-@@ -247,7 +247,7 @@ static void alternatives_smp_lock(const
+diff -urNp linux-2.6.36/arch/x86/kernel/alternative.c linux-2.6.36/arch/x86/kernel/alternative.c
+--- linux-2.6.36/arch/x86/kernel/alternative.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/alternative.c 2010-11-06 18:58:15.000000000 -0400
+@@ -248,7 +248,7 @@ static void alternatives_smp_lock(const
if (!*poff || ptr < text || ptr >= text_end)
continue;
/* turn DS segment override prefix into lock prefix */
text_poke(ptr, ((unsigned char []){0xf0}), 1);
};
mutex_unlock(&text_mutex);
-@@ -268,7 +268,7 @@ static void alternatives_smp_unlock(cons
+@@ -269,7 +269,7 @@ static void alternatives_smp_unlock(cons
if (!*poff || ptr < text || ptr >= text_end)
continue;
/* turn lock prefix into DS segment override prefix */
text_poke(ptr, ((unsigned char []){0x3E}), 1);
};
mutex_unlock(&text_mutex);
-@@ -436,7 +436,7 @@ void __init_or_module apply_paravirt(str
+@@ -437,7 +437,7 @@ void __init_or_module apply_paravirt(str
BUG_ON(p->len > MAX_PATCH_LEN);
/* prep the buffer with the original instructions */
used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
(unsigned long)p->instr, p->len);
-@@ -504,7 +504,7 @@ void __init alternative_instructions(voi
+@@ -505,7 +505,7 @@ void __init alternative_instructions(voi
if (smp_alt_once)
free_init_pages("SMP alternatives",
(unsigned long)__smp_locks,
restart_nmi();
}
-@@ -521,13 +521,17 @@ void __init alternative_instructions(voi
+@@ -522,13 +522,17 @@ void __init alternative_instructions(voi
* instructions. And on the local CPU you need to be protected again NMI or MCE
* handlers seeing an inconsistent instruction while you patch.
*/
local_irq_restore(flags);
/* Could also do a CLFLUSH here to speed up CPU recovery; but
that causes hangs on some VIA CPUs. */
-@@ -549,36 +553,22 @@ static void *__init_or_module text_poke_
+@@ -550,36 +554,22 @@ static void *__init_or_module text_poke_
*/
void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
{
return addr;
}
-diff -urNp linux-2.6.35.4/arch/x86/kernel/amd_iommu.c linux-2.6.35.4/arch/x86/kernel/amd_iommu.c
---- linux-2.6.35.4/arch/x86/kernel/amd_iommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/amd_iommu.c 2010-09-17 20:12:09.000000000 -0400
-@@ -2284,7 +2284,7 @@ static void prealloc_protection_domains(
+diff -urNp linux-2.6.36/arch/x86/kernel/amd_iommu.c linux-2.6.36/arch/x86/kernel/amd_iommu.c
+--- linux-2.6.36/arch/x86/kernel/amd_iommu.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/amd_iommu.c 2010-11-06 18:58:15.000000000 -0400
+@@ -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.35.4/arch/x86/kernel/apic/io_apic.c linux-2.6.35.4/arch/x86/kernel/apic/io_apic.c
---- linux-2.6.35.4/arch/x86/kernel/apic/io_apic.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/apic/io_apic.c 2010-09-17 20:12:09.000000000 -0400
-@@ -691,7 +691,7 @@ struct IO_APIC_route_entry **alloc_ioapi
+diff -urNp linux-2.6.36/arch/x86/kernel/apic/io_apic.c linux-2.6.36/arch/x86/kernel/apic/io_apic.c
+--- linux-2.6.36/arch/x86/kernel/apic/io_apic.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/apic/io_apic.c 2010-11-06 18:58:15.000000000 -0400
+@@ -696,7 +696,7 @@ struct IO_APIC_route_entry **alloc_ioapi
ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
GFP_ATOMIC);
if (!ioapic_entries)
for (apic = 0; apic < nr_ioapics; apic++) {
ioapic_entries[apic] =
-@@ -708,7 +708,7 @@ nomem:
+@@ -713,7 +713,7 @@ nomem:
kfree(ioapic_entries[apic]);
kfree(ioapic_entries);
}
/*
-@@ -1118,7 +1118,7 @@ int IO_APIC_get_PCI_irq_vector(int bus,
+@@ -1123,7 +1123,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.
-@@ -1126,7 +1126,7 @@ void lock_vector_lock(void)
+@@ -1131,7 +1131,7 @@ void lock_vector_lock(void)
raw_spin_lock(&vector_lock);
}
{
raw_spin_unlock(&vector_lock);
}
-diff -urNp linux-2.6.35.4/arch/x86/kernel/apm_32.c linux-2.6.35.4/arch/x86/kernel/apm_32.c
---- linux-2.6.35.4/arch/x86/kernel/apm_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/apm_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/apm_32.c linux-2.6.36/arch/x86/kernel/apm_32.c
+--- linux-2.6.36/arch/x86/kernel/apm_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/apm_32.c 2010-11-06 18:58:15.000000000 -0400
@@ -410,7 +410,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.
proc_create("apm", 0, NULL, &apm_file_ops);
-diff -urNp linux-2.6.35.4/arch/x86/kernel/asm-offsets_32.c linux-2.6.35.4/arch/x86/kernel/asm-offsets_32.c
---- linux-2.6.35.4/arch/x86/kernel/asm-offsets_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/asm-offsets_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/asm-offsets_32.c linux-2.6.36/arch/x86/kernel/asm-offsets_32.c
+--- linux-2.6.36/arch/x86/kernel/asm-offsets_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/asm-offsets_32.c 2010-11-06 18:58:15.000000000 -0400
@@ -115,6 +115,11 @@ void foo(void)
OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
#endif
#ifdef CONFIG_XEN
-diff -urNp linux-2.6.35.4/arch/x86/kernel/asm-offsets_64.c linux-2.6.35.4/arch/x86/kernel/asm-offsets_64.c
---- linux-2.6.35.4/arch/x86/kernel/asm-offsets_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/asm-offsets_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/asm-offsets_64.c linux-2.6.36/arch/x86/kernel/asm-offsets_64.c
+--- linux-2.6.36/arch/x86/kernel/asm-offsets_64.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/asm-offsets_64.c 2010-11-06 18:58:15.000000000 -0400
@@ -63,6 +63,18 @@ int main(void)
OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
BLANK();
DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
-diff -urNp linux-2.6.35.4/arch/x86/kernel/cpu/common.c linux-2.6.35.4/arch/x86/kernel/cpu/common.c
---- linux-2.6.35.4/arch/x86/kernel/cpu/common.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/cpu/common.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/cpu/common.c linux-2.6.36/arch/x86/kernel/cpu/common.c
+--- linux-2.6.36/arch/x86/kernel/cpu/common.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/cpu/common.c 2010-11-06 18:58:15.000000000 -0400
@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
static int __init x86_xsave_setup(char *s)
{
setup_clear_cpu_cap(X86_FEATURE_XSAVE);
-@@ -344,7 +290,7 @@ void switch_to_new_gdt(int cpu)
+@@ -352,7 +298,7 @@ void switch_to_new_gdt(int cpu)
{
struct desc_ptr gdt_descr;
gdt_descr.size = GDT_SIZE - 1;
load_gdt(&gdt_descr);
/* Reload the per-cpu base */
-@@ -802,6 +748,10 @@ static void __cpuinit identify_cpu(struc
+@@ -820,6 +766,10 @@ static void __cpuinit identify_cpu(struc
/* Filter out anything that depends on CPUID levels we don't have */
filter_cpuid_features(c, true);
/* If the model name is still unset, do table lookup. */
if (!c->x86_model_id[0]) {
const char *p;
-@@ -1117,7 +1067,7 @@ void __cpuinit cpu_init(void)
+@@ -1135,7 +1085,7 @@ void __cpuinit cpu_init(void)
int i;
cpu = stack_smp_processor_id();
oist = &per_cpu(orig_ist, cpu);
#ifdef CONFIG_NUMA
-@@ -1143,7 +1093,7 @@ void __cpuinit cpu_init(void)
+@@ -1161,7 +1111,7 @@ void __cpuinit cpu_init(void)
switch_to_new_gdt(cpu);
loadsegment(fs, 0);
memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
syscall_init();
-@@ -1205,7 +1155,7 @@ void __cpuinit cpu_init(void)
+@@ -1224,7 +1174,7 @@ void __cpuinit cpu_init(void)
{
int cpu = smp_processor_id();
struct task_struct *curr = current;
struct thread_struct *thread = &curr->thread;
if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-2.6.35.4/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.35.4/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
---- linux-2.6.35.4/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-09-17 20:12:09.000000000 -0400
-@@ -484,7 +484,7 @@ static const struct dmi_system_id sw_any
+diff -urNp linux-2.6.36/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.36/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+--- linux-2.6.36/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-11-06 18:58:15.000000000 -0400
+@@ -481,7 +481,7 @@ static const struct dmi_system_id sw_any
DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
},
},
};
static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
-diff -urNp linux-2.6.35.4/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.35.4/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
---- linux-2.6.35.4/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.36/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
+--- linux-2.6.36/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-11-06 18:58:15.000000000 -0400
@@ -226,7 +226,7 @@ static struct cpu_model models[] =
{ &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
{ &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
};
#undef _BANIAS
#undef BANIAS
-diff -urNp linux-2.6.35.4/arch/x86/kernel/cpu/intel.c linux-2.6.35.4/arch/x86/kernel/cpu/intel.c
---- linux-2.6.35.4/arch/x86/kernel/cpu/intel.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/cpu/intel.c 2010-09-17 20:12:09.000000000 -0400
-@@ -160,7 +160,7 @@ static void __cpuinit trap_init_f00f_bug
+diff -urNp linux-2.6.36/arch/x86/kernel/cpu/intel.c linux-2.6.36/arch/x86/kernel/cpu/intel.c
+--- linux-2.6.36/arch/x86/kernel/cpu/intel.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/cpu/intel.c 2010-11-06 18:58:15.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.35.4/arch/x86/kernel/cpu/Makefile linux-2.6.35.4/arch/x86/kernel/cpu/Makefile
---- linux-2.6.35.4/arch/x86/kernel/cpu/Makefile 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/cpu/Makefile 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/cpu/Makefile linux-2.6.36/arch/x86/kernel/cpu/Makefile
+--- linux-2.6.36/arch/x86/kernel/cpu/Makefile 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/cpu/Makefile 2010-11-06 18:58:15.000000000 -0400
@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
CFLAGS_REMOVE_perf_event.o = -pg
endif
-nostackp := $(call cc-option, -fno-stack-protector)
-CFLAGS_common.o := $(nostackp)
-
- obj-y := intel_cacheinfo.o addon_cpuid_features.o
+ 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.35.4/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.35.4/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-2.6.35.4/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/cpu/mcheck/mce.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.36/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-2.6.36/arch/x86/kernel/cpu/mcheck/mce.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/cpu/mcheck/mce.c 2010-11-06 18:58:15.000000000 -0400
@@ -219,7 +219,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");
}
-@@ -1471,14 +1471,14 @@ void __cpuinit mcheck_cpu_init(struct cp
+@@ -1460,14 +1460,14 @@ void __cpuinit mcheck_cpu_init(struct cp
*/
static DEFINE_SPINLOCK(mce_state_lock);
spin_unlock(&mce_state_lock);
return -EBUSY;
-@@ -1486,7 +1486,7 @@ static int mce_open(struct inode *inode,
+@@ -1475,7 +1475,7 @@ static int mce_open(struct inode *inode,
if (file->f_flags & O_EXCL)
open_exclu = 1;
spin_unlock(&mce_state_lock);
-@@ -1497,7 +1497,7 @@ static int mce_release(struct inode *ino
+@@ -1486,7 +1486,7 @@ static int mce_release(struct inode *ino
{
spin_lock(&mce_state_lock);
open_exclu = 0;
spin_unlock(&mce_state_lock);
-@@ -1683,6 +1683,7 @@ static struct miscdevice mce_log_device
+@@ -1672,6 +1672,7 @@ static struct miscdevice mce_log_device
MISC_MCELOG_MINOR,
"mcelog",
&mce_chrdev_ops,
};
/*
-diff -urNp linux-2.6.35.4/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.35.4/arch/x86/kernel/cpu/mtrr/generic.c
---- linux-2.6.35.4/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/cpu/mtrr/generic.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.36/arch/x86/kernel/cpu/mtrr/generic.c
+--- linux-2.6.36/arch/x86/kernel/cpu/mtrr/generic.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/cpu/mtrr/generic.c 2010-11-06 18:58:15.000000000 -0400
@@ -28,7 +28,7 @@ static struct fixed_range_block fixed_ra
{ MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */
{ MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */
};
static unsigned long smp_changes_mask;
-diff -urNp linux-2.6.35.4/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.35.4/arch/x86/kernel/cpu/mtrr/main.c
---- linux-2.6.35.4/arch/x86/kernel/cpu/mtrr/main.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/cpu/mtrr/main.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.36/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-2.6.36/arch/x86/kernel/cpu/mtrr/main.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/cpu/mtrr/main.c 2010-11-06 18:58:15.000000000 -0400
@@ -61,7 +61,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.35.4/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.35.4/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-2.6.35.4/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.36/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-2.6.36/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-11-06 18:58:15.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.35.4/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.35.4/arch/x86/kernel/cpu/perfctr-watchdog.c
---- linux-2.6.35.4/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.36/arch/x86/kernel/cpu/perfctr-watchdog.c
+--- linux-2.6.36/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-11-06 18:58:15.000000000 -0400
@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
/* Interface defining a CPU specific perfctr watchdog */
static struct wd_ops intel_arch_wd_ops __read_mostly = {
.reserve = single_msr_reserve,
.unreserve = single_msr_unreserve,
-diff -urNp linux-2.6.35.4/arch/x86/kernel/cpu/perf_event.c linux-2.6.35.4/arch/x86/kernel/cpu/perf_event.c
---- linux-2.6.35.4/arch/x86/kernel/cpu/perf_event.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/cpu/perf_event.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1685,7 +1685,7 @@ perf_callchain_user(struct pt_regs *regs
+diff -urNp linux-2.6.36/arch/x86/kernel/cpu/perf_event.c linux-2.6.36/arch/x86/kernel/cpu/perf_event.c
+--- linux-2.6.36/arch/x86/kernel/cpu/perf_event.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/cpu/perf_event.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1732,7 +1732,7 @@ perf_callchain_user(struct pt_regs *regs
break;
callchain_store(entry, frame.return_address);
}
}
-diff -urNp linux-2.6.35.4/arch/x86/kernel/crash.c linux-2.6.35.4/arch/x86/kernel/crash.c
---- linux-2.6.35.4/arch/x86/kernel/crash.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/crash.c 2010-09-17 20:12:09.000000000 -0400
-@@ -40,7 +40,7 @@ static void kdump_nmi_callback(int cpu,
+diff -urNp linux-2.6.36/arch/x86/kernel/crash.c linux-2.6.36/arch/x86/kernel/crash.c
+--- linux-2.6.36/arch/x86/kernel/crash.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/crash.c 2010-11-06 18:58:15.000000000 -0400
+@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu,
regs = args->regs;
#ifdef CONFIG_X86_32
crash_fixup_ss_esp(&fixed_regs, regs);
regs = &fixed_regs;
}
-diff -urNp linux-2.6.35.4/arch/x86/kernel/doublefault_32.c linux-2.6.35.4/arch/x86/kernel/doublefault_32.c
---- linux-2.6.35.4/arch/x86/kernel/doublefault_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/doublefault_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/doublefault_32.c linux-2.6.36/arch/x86/kernel/doublefault_32.c
+--- linux-2.6.36/arch/x86/kernel/doublefault_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/doublefault_32.c 2010-11-06 18:58:15.000000000 -0400
@@ -11,7 +11,7 @@
#define DOUBLEFAULT_STACKSIZE (1024)
.fs = __KERNEL_PERCPU,
.__cr3 = __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-2.6.35.4/arch/x86/kernel/dumpstack_32.c linux-2.6.35.4/arch/x86/kernel/dumpstack_32.c
---- linux-2.6.35.4/arch/x86/kernel/dumpstack_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/dumpstack_32.c 2010-09-17 20:12:09.000000000 -0400
-@@ -107,11 +107,12 @@ void show_registers(struct pt_regs *regs
+diff -urNp linux-2.6.36/arch/x86/kernel/dumpstack_32.c linux-2.6.36/arch/x86/kernel/dumpstack_32.c
+--- linux-2.6.36/arch/x86/kernel/dumpstack_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/dumpstack_32.c 2010-11-06 18:58:15.000000000 -0400
+@@ -105,11 +105,12 @@ void show_registers(struct pt_regs *regs
* When in-kernel, we also print out the stack and code at the
* time of the fault..
*/
printk(KERN_EMERG "Stack:\n");
show_stack_log_lvl(NULL, regs, ®s->sp,
-@@ -119,10 +120,10 @@ void show_registers(struct pt_regs *regs
+@@ -117,10 +118,10 @@ void show_registers(struct pt_regs *regs
printk(KERN_EMERG "Code: ");
code_len = code_len - code_prologue + 1;
}
for (i = 0; i < code_len; i++, ip++) {
-@@ -131,7 +132,7 @@ void show_registers(struct pt_regs *regs
+@@ -129,7 +130,7 @@ void show_registers(struct pt_regs *regs
printk(" Bad EIP value.");
break;
}
printk("<%02x> ", c);
else
printk("%02x ", c);
-@@ -144,6 +145,7 @@ int is_valid_bugaddr(unsigned long ip)
+@@ -142,6 +143,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.35.4/arch/x86/kernel/dumpstack.c linux-2.6.35.4/arch/x86/kernel/dumpstack.c
---- linux-2.6.35.4/arch/x86/kernel/dumpstack.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/dumpstack.c 2010-09-17 20:12:09.000000000 -0400
-@@ -207,7 +207,7 @@ void dump_stack(void)
+diff -urNp linux-2.6.36/arch/x86/kernel/dumpstack.c linux-2.6.36/arch/x86/kernel/dumpstack.c
+--- linux-2.6.36/arch/x86/kernel/dumpstack.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/dumpstack.c 2010-11-06 18:58:15.000000000 -0400
+@@ -206,7 +206,7 @@ void dump_stack(void)
#endif
printk("Pid: %d, comm: %.20s %s %s %.*s\n",
init_utsname()->release,
(int)strcspn(init_utsname()->version, " "),
init_utsname()->version);
-@@ -263,7 +263,7 @@ void __kprobes oops_end(unsigned long fl
+@@ -262,7 +262,7 @@ 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)
-@@ -290,7 +290,7 @@ int __kprobes __die(const char *str, str
+@@ -289,7 +289,7 @@ int __kprobes __die(const char *str, str
show_registers(regs);
#ifdef CONFIG_X86_32
sp = regs->sp;
ss = regs->ss & 0xffff;
} else {
-@@ -318,7 +318,7 @@ void die(const char *str, struct pt_regs
+@@ -317,7 +317,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.35.4/arch/x86/kernel/efi_32.c linux-2.6.35.4/arch/x86/kernel/efi_32.c
---- linux-2.6.35.4/arch/x86/kernel/efi_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/efi_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/efi_32.c linux-2.6.36/arch/x86/kernel/efi_32.c
+--- linux-2.6.36/arch/x86/kernel/efi_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/efi_32.c 2010-11-06 18:58:15.000000000 -0400
@@ -38,70 +38,38 @@
*/
/*
* After the lock is released, the original page table is restored.
-diff -urNp linux-2.6.35.4/arch/x86/kernel/efi_stub_32.S linux-2.6.35.4/arch/x86/kernel/efi_stub_32.S
---- linux-2.6.35.4/arch/x86/kernel/efi_stub_32.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/efi_stub_32.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/efi_stub_32.S linux-2.6.36/arch/x86/kernel/efi_stub_32.S
+--- linux-2.6.36/arch/x86/kernel/efi_stub_32.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/efi_stub_32.S 2010-11-06 18:58:15.000000000 -0400
@@ -6,6 +6,7 @@
*/
saved_return_addr:
.long 0
efi_rt_function_ptr:
-diff -urNp linux-2.6.35.4/arch/x86/kernel/entry_32.S linux-2.6.35.4/arch/x86/kernel/entry_32.S
---- linux-2.6.35.4/arch/x86/kernel/entry_32.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/entry_32.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/entry_32.S linux-2.6.36/arch/x86/kernel/entry_32.S
+--- linux-2.6.36/arch/x86/kernel/entry_32.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/entry_32.S 2010-11-06 18:58:15.000000000 -0400
@@ -192,7 +192,67 @@
#endif /* CONFIG_X86_32_LAZY_GS */
restore_all:
TRACE_IRQS_IRET
restore_all_notrace:
-@@ -615,7 +722,13 @@ ldt_ss:
+@@ -611,14 +718,21 @@ ldt_ss:
+ * compensating for the offset by changing to the ESPFIX segment with
+ * a base address that matches for the difference.
+ */
+-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
++#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
+ mov %esp, %edx /* load kernel esp */
mov PT_OLDESP(%esp), %eax /* load userspace esp */
mov %dx, %ax /* eax: new kernel esp */
sub %eax, %edx /* offset (low word is 0) */
-- PER_CPU(gdt_page, %ebx)
+#ifdef CONFIG_SMP
+ movl PER_CPU_VAR(cpu_number), %ebx
+ shll $PAGE_SHIFT_asm, %ebx
+ movl $cpu_gdt_table, %ebx
+#endif
shr $16, %edx
- mov %dl, GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx) /* bits 16..23 */
- mov %dh, GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx) /* bits 24..31 */
-@@ -655,25 +768,19 @@ work_resched:
+- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
+- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
++ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
++ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
+ pushl $__ESPFIX_SS
+ CFI_ADJUST_CFA_OFFSET 4
+ push %eax /* new kernel esp */
+@@ -655,25 +769,19 @@ work_resched:
work_notifysig: # deal with pending signals and
# notify-resume requests
#endif
xorl %edx, %edx
call do_notify_resume
-@@ -708,6 +815,10 @@ END(syscall_exit_work)
+@@ -708,6 +816,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
-@@ -791,7 +902,13 @@ ptregs_clone:
+@@ -791,8 +903,15 @@ ptregs_clone:
* normal stack and adjusts ESP with the matching offset.
*/
/* fixup the stack */
-- PER_CPU(gdt_page, %ebx)
+- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
+- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
+#ifdef CONFIG_SMP
+ movl PER_CPU_VAR(cpu_number), %ebx
+ shll $PAGE_SHIFT_asm, %ebx
+#else
+ movl $cpu_gdt_table, %ebx
+#endif
- mov GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx), %al /* bits 16..23 */
- mov GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx), %ah /* bits 24..31 */
++ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
++ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
shl $16, %eax
-@@ -1273,7 +1390,6 @@ return_to_handler:
+ addl %esp, %eax /* the adjusted stack pointer */
+ pushl $__KERNEL_DS
+@@ -1275,7 +1394,6 @@ return_to_handler:
jmp *%ecx
#endif
#include "syscall_table_32.S"
syscall_table_size=(.-sys_call_table)
-@@ -1330,9 +1446,12 @@ error_code:
+@@ -1332,9 +1450,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
-@@ -1426,6 +1545,9 @@ nmi_stack_correct:
+@@ -1428,6 +1549,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
-@@ -1466,6 +1588,9 @@ nmi_espfix_stack:
+@@ -1468,6 +1592,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.35.4/arch/x86/kernel/entry_64.S linux-2.6.35.4/arch/x86/kernel/entry_64.S
---- linux-2.6.35.4/arch/x86/kernel/entry_64.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/entry_64.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/entry_64.S
+--- linux-2.6.36/arch/x86/kernel/entry_64.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/entry_64.S 2010-11-06 18:58:15.000000000 -0400
@@ -53,6 +53,7 @@
#include <asm/paravirt.h>
#include <asm/ftrace.h>
movq %rsp,%rdi /* pt_regs pointer */
xorl %esi,%esi /* no error code */
call \do_sym
-@@ -1074,9 +1304,24 @@ ENTRY(\sym)
+@@ -1065,7 +1295,7 @@ ENTRY(\sym)
+ END(\sym)
+ .endm
+
+-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
++#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r12)
+ .macro paranoidzeroentry_ist sym do_sym ist
+ ENTRY(\sym)
+ INTR_FRAME
+@@ -1075,8 +1305,24 @@ ENTRY(\sym)
subq $15*8, %rsp
call save_paranoid
TRACE_IRQS_OFF
+#endif
movq %rsp,%rdi /* pt_regs pointer */
xorl %esi,%esi /* no error code */
-- PER_CPU(init_tss, %r12)
+#ifdef CONFIG_SMP
+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r12d
+ lea init_tss(%r12), %r12
+#else
+ lea init_tss(%rip), %r12
+#endif
- subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%r12)
+ subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
call \do_sym
- addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%r12)
-@@ -1093,6 +1338,16 @@ ENTRY(\sym)
+ addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
+@@ -1093,6 +1339,16 @@ ENTRY(\sym)
CFI_ADJUST_CFA_OFFSET 15*8
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 */
-@@ -1112,6 +1367,16 @@ ENTRY(\sym)
+@@ -1112,6 +1368,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 */
-@@ -1370,14 +1635,27 @@ ENTRY(paranoid_exit)
+@@ -1373,14 +1639,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
-@@ -1435,7 +1713,7 @@ ENTRY(error_entry)
+@@ -1438,7 +1717,7 @@ ENTRY(error_entry)
movq_cfi r14, R14+8
movq_cfi r15, R15+8
xorl %ebx,%ebx
je error_kernelspace
error_swapgs:
SWAPGS
-@@ -1499,6 +1777,16 @@ ENTRY(nmi)
+@@ -1502,6 +1781,16 @@ ENTRY(nmi)
CFI_ADJUST_CFA_OFFSET 15*8
call save_paranoid
DEFAULT_FRAME 0
/* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
movq %rsp,%rdi
movq $-1,%rsi
-@@ -1509,11 +1797,12 @@ ENTRY(nmi)
+@@ -1512,11 +1801,12 @@ 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.35.4/arch/x86/kernel/ftrace.c linux-2.6.35.4/arch/x86/kernel/ftrace.c
---- linux-2.6.35.4/arch/x86/kernel/ftrace.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/ftrace.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/ftrace.c linux-2.6.36/arch/x86/kernel/ftrace.c
+--- linux-2.6.36/arch/x86/kernel/ftrace.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/ftrace.c 2010-11-06 18:58:15.000000000 -0400
@@ -174,7 +174,9 @@ void ftrace_nmi_enter(void)
if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
return -EFAULT;
-diff -urNp linux-2.6.35.4/arch/x86/kernel/head32.c linux-2.6.35.4/arch/x86/kernel/head32.c
---- linux-2.6.35.4/arch/x86/kernel/head32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/head32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/head32.c linux-2.6.36/arch/x86/kernel/head32.c
+--- linux-2.6.36/arch/x86/kernel/head32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/head32.c 2010-11-06 18:58:15.000000000 -0400
@@ -17,6 +17,7 @@
#include <asm/apic.h>
#include <asm/io_apic.h>
#ifdef CONFIG_BLK_DEV_INITRD
/* Reserve INITRD */
-diff -urNp linux-2.6.35.4/arch/x86/kernel/head_32.S linux-2.6.35.4/arch/x86/kernel/head_32.S
---- linux-2.6.35.4/arch/x86/kernel/head_32.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/head_32.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/head_32.S
+--- linux-2.6.36/arch/x86/kernel/head_32.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/head_32.S 2010-11-06 18:58:15.000000000 -0400
@@ -25,6 +25,12 @@
/* Physical address */
#define pa(X) ((X) - __PAGE_OFFSET)
/*
* Clear BSS first so that there are no surprises...
*/
-@@ -142,9 +206,7 @@ ENTRY(startup_32)
+@@ -148,9 +212,7 @@ ENTRY(startup_32)
cmpl $num_subarch_entries, %eax
jae bad_subarch
bad_subarch:
WEAK(lguest_entry)
-@@ -156,10 +218,10 @@ WEAK(xen_entry)
+@@ -162,10 +224,10 @@ WEAK(xen_entry)
__INITDATA
subarch_entries:
num_subarch_entries = (. - subarch_entries) / 4
.previous
#endif /* CONFIG_PARAVIRT */
-@@ -220,8 +282,11 @@ default_entry:
+@@ -226,8 +288,11 @@ default_entry:
movl %eax, pa(max_pfn_mapped)
/* Do early initialization of the fixmap area */
#else /* Not PAE */
page_pde_offset = (__PAGE_OFFSET >> 20);
-@@ -251,8 +316,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
+@@ -257,8 +322,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
movl %eax, pa(max_pfn_mapped)
/* Do early initialization of the fixmap area */
#endif
jmp 3f
/*
-@@ -299,6 +367,7 @@ ENTRY(startup_32_smp)
+@@ -305,6 +373,7 @@ ENTRY(startup_32_smp)
orl %edx,%eax
movl %eax,%cr4
testb $X86_CR4_PAE, %al # check if PAE is enabled
jz 6f
-@@ -323,6 +392,9 @@ ENTRY(startup_32_smp)
+@@ -329,6 +398,9 @@ ENTRY(startup_32_smp)
/* Make changes effective */
wrmsr
6:
/*
-@@ -348,9 +420,7 @@ ENTRY(startup_32_smp)
+@@ -354,9 +426,7 @@ ENTRY(startup_32_smp)
#ifdef CONFIG_SMP
cmpb $0, ready
#endif /* CONFIG_SMP */
/*
-@@ -428,7 +498,7 @@ is386: movl $2,%ecx # set MP
+@@ -434,7 +504,7 @@ is386: movl $2,%ecx # set MP
1: movl $(__KERNEL_DS),%eax # reload all the segment registers
movl %eax,%ss # after changing gdt.
movl %eax,%ds
movl %eax,%es
-@@ -442,8 +512,11 @@ is386: movl $2,%ecx # set MP
+@@ -448,8 +518,11 @@ is386: movl $2,%ecx # set MP
*/
cmpb $0,ready
jne 1f
movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
shrl $16, %ecx
movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
-@@ -461,10 +534,6 @@ is386: movl $2,%ecx # set MP
+@@ -467,10 +540,6 @@ is386: movl $2,%ecx # set MP
#ifdef CONFIG_SMP
movb ready, %cl
movb $1, ready
#endif /* CONFIG_SMP */
jmp *(initial_code)
-@@ -550,22 +619,22 @@ early_page_fault:
+@@ -556,22 +625,22 @@ early_page_fault:
jmp early_fault
early_fault:
hlt_loop:
hlt
jmp hlt_loop
-@@ -573,8 +642,11 @@ hlt_loop:
+@@ -579,8 +648,11 @@ hlt_loop:
/* This is the default interrupt "handler" :-) */
ALIGN
ignore_int:
pushl %eax
pushl %ecx
pushl %edx
-@@ -583,9 +655,6 @@ ignore_int:
+@@ -589,9 +661,6 @@ ignore_int:
movl $(__KERNEL_DS),%eax
movl %eax,%ds
movl %eax,%es
pushl 16(%esp)
pushl 24(%esp)
pushl 32(%esp)
-@@ -612,27 +681,38 @@ ENTRY(initial_code)
+@@ -620,31 +689,47 @@ ENTRY(initial_page_table)
/*
* BSS section
*/
ENTRY(swapper_pg_dir)
.fill 1024,4,0
#endif
-+
++.section .swapper_pg_fixmap,"a",@progbits
swapper_pg_fixmap:
.fill 1024,4,0
+ #ifdef CONFIG_X86_TRAMPOLINE
++.section .trampoline_pg_dir,"a",@progbits
+ ENTRY(trampoline_pg_dir)
++#ifdef CONFIG_X86_PAE
++ .fill 4,8,0
++#else
+ .fill 1024,4,0
+ #endif
++#endif
+
+.section .empty_zero_page,"a",@progbits
ENTRY(empty_zero_page)
ENTRY(swapper_pg_dir)
.long pa(swapper_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
# if KPMDS == 3
-@@ -651,15 +731,24 @@ ENTRY(swapper_pg_dir)
+@@ -663,15 +748,24 @@ ENTRY(swapper_pg_dir)
# error "Kernel PMDs should be 1, 2 or 3"
# endif
.align PAGE_SIZE_asm /* needs to be page-sized too */
early_recursion_flag:
.long 0
-@@ -695,7 +784,7 @@ fault_msg:
+@@ -707,7 +801,7 @@ fault_msg:
.word 0 # 32 bit align gdt_desc.address
boot_gdt_descr:
.word __BOOT_DS+7
.word 0 # 32-bit align idt_desc.address
idt_descr:
-@@ -706,7 +795,7 @@ idt_descr:
+@@ -718,7 +812,7 @@ idt_descr:
.word 0 # 32 bit align gdt_desc.address
ENTRY(early_gdt_descr)
.word GDT_ENTRIES*8-1
/*
* The boot_gdt must mirror the equivalent in setup.S and is
-@@ -715,5 +804,65 @@ ENTRY(early_gdt_descr)
+@@ -727,5 +821,65 @@ ENTRY(early_gdt_descr)
.align L1_CACHE_BYTES
ENTRY(boot_gdt)
.fill GDT_ENTRY_BOOT_CS,8,0
+ /* 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.35.4/arch/x86/kernel/head_64.S linux-2.6.35.4/arch/x86/kernel/head_64.S
---- linux-2.6.35.4/arch/x86/kernel/head_64.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/head_64.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/head_64.S linux-2.6.36/arch/x86/kernel/head_64.S
+--- linux-2.6.36/arch/x86/kernel/head_64.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/head_64.S 2010-11-06 18:58:15.000000000 -0400
@@ -19,6 +19,7 @@
#include <asm/cache.h>
#include <asm/processor-flags.h>
1: wrmsr /* Make changes effective */
/* Setup cr0 */
-@@ -271,7 +268,7 @@ ENTRY(secondary_startup_64)
+@@ -270,7 +267,7 @@ ENTRY(secondary_startup_64)
bad_address:
jmp bad_address
#ifdef CONFIG_EARLY_PRINTK
.globl early_idt_handlers
early_idt_handlers:
-@@ -316,18 +313,23 @@ ENTRY(early_idt_handler)
+@@ -315,18 +312,23 @@ ENTRY(early_idt_handler)
#endif /* EARLY_PRINTK */
1: hlt
jmp 1b
#define NEXT_PAGE(name) \
.balign PAGE_SIZE; \
ENTRY(name)
-@@ -351,13 +353,36 @@ NEXT_PAGE(init_level4_pgt)
+@@ -350,13 +352,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
-@@ -365,20 +390,23 @@ NEXT_PAGE(level3_kernel_pgt)
+@@ -364,20 +389,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)
/*
-@@ -391,33 +419,55 @@ NEXT_PAGE(level2_kernel_pgt)
+@@ -390,33 +418,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.35.4/arch/x86/kernel/i386_ksyms_32.c linux-2.6.35.4/arch/x86/kernel/i386_ksyms_32.c
---- linux-2.6.35.4/arch/x86/kernel/i386_ksyms_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/i386_ksyms_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/i386_ksyms_32.c linux-2.6.36/arch/x86/kernel/i386_ksyms_32.c
+--- linux-2.6.36/arch/x86/kernel/i386_ksyms_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/i386_ksyms_32.c 2010-11-06 18:58:15.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.35.4/arch/x86/kernel/init_task.c linux-2.6.35.4/arch/x86/kernel/init_task.c
---- linux-2.6.35.4/arch/x86/kernel/init_task.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/init_task.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/init_task.c linux-2.6.36/arch/x86/kernel/init_task.c
+--- linux-2.6.36/arch/x86/kernel/init_task.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/init_task.c 2010-11-06 18:58:15.000000000 -0400
@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
* section. Since TSS's are completely CPU-local, we want them
* on exact cacheline boundaries, to eliminate cacheline ping-pong.
-
+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.35.4/arch/x86/kernel/ioport.c linux-2.6.35.4/arch/x86/kernel/ioport.c
---- linux-2.6.35.4/arch/x86/kernel/ioport.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/ioport.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/ioport.c linux-2.6.36/arch/x86/kernel/ioport.c
+--- linux-2.6.36/arch/x86/kernel/ioport.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/ioport.c 2010-11-06 18:58:50.000000000 -0400
@@ -6,6 +6,7 @@
#include <linux/sched.h>
#include <linux/kernel.h>
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
}
-diff -urNp linux-2.6.35.4/arch/x86/kernel/irq_32.c linux-2.6.35.4/arch/x86/kernel/irq_32.c
---- linux-2.6.35.4/arch/x86/kernel/irq_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/irq_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/irq_32.c linux-2.6.36/arch/x86/kernel/irq_32.c
+--- linux-2.6.36/arch/x86/kernel/irq_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/irq_32.c 2010-11-06 18:58:15.000000000 -0400
@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
return 0;
call_on_stack(__do_softirq, isp);
/*
-diff -urNp linux-2.6.35.4/arch/x86/kernel/kgdb.c linux-2.6.35.4/arch/x86/kernel/kgdb.c
---- linux-2.6.35.4/arch/x86/kernel/kgdb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/kgdb.c 2010-09-17 20:12:09.000000000 -0400
-@@ -77,7 +77,7 @@ void pt_regs_to_gdb_regs(unsigned long *
- gdb_regs[GDB_CS] = regs->cs;
- gdb_regs[GDB_FS] = 0xFFFF;
- gdb_regs[GDB_GS] = 0xFFFF;
-- if (user_mode_vm(regs)) {
-+ if (user_mode(regs)) {
- gdb_regs[GDB_SS] = regs->ss;
- gdb_regs[GDB_SP] = regs->sp;
- } else {
-@@ -720,7 +720,7 @@ void kgdb_arch_set_pc(struct pt_regs *re
+diff -urNp linux-2.6.36/arch/x86/kernel/kgdb.c linux-2.6.36/arch/x86/kernel/kgdb.c
+--- linux-2.6.36/arch/x86/kernel/kgdb.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/kgdb.c 2010-11-06 18:58:15.000000000 -0400
+@@ -123,11 +123,11 @@ char *dbg_get_reg(int regno, void *mem,
+ switch (regno) {
+ #ifdef CONFIG_X86_32
+ case GDB_SS:
+- if (!user_mode_vm(regs))
++ if (!user_mode(regs))
+ *(unsigned long *)mem = __KERNEL_DS;
+ break;
+ case GDB_SP:
+- if (!user_mode_vm(regs))
++ if (!user_mode(regs))
+ *(unsigned long *)mem = kernel_stack_pointer(regs);
+ break;
+ case GDB_GS:
+@@ -715,7 +715,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.35.4/arch/x86/kernel/kprobes.c linux-2.6.35.4/arch/x86/kernel/kprobes.c
---- linux-2.6.35.4/arch/x86/kernel/kprobes.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/kprobes.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/kprobes.c linux-2.6.36/arch/x86/kernel/kprobes.c
+--- linux-2.6.36/arch/x86/kernel/kprobes.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/kprobes.c 2010-11-06 18:58:15.000000000 -0400
@@ -114,9 +114,12 @@ static void __kprobes __synthesize_relat
s32 raddr;
} __attribute__((packed)) *insn;
}
/* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
-@@ -315,7 +318,9 @@ static int __kprobes __copy_instruction(
+@@ -317,7 +320,9 @@ static int __kprobes __copy_instruction(
}
}
insn_get_length(&insn);
#ifdef CONFIG_X86_64
if (insn_rip_relative(&insn)) {
-@@ -339,7 +344,9 @@ static int __kprobes __copy_instruction(
+@@ -341,7 +346,9 @@ static int __kprobes __copy_instruction(
(u8 *) dest;
BUG_ON((s64) (s32) newdisp != newdisp); /* Sanity check. */
disp = (u8 *) dest + insn_offset_displacement(&insn);
}
#endif
return insn.length;
-@@ -353,12 +360,12 @@ static void __kprobes arch_copy_kprobe(s
+@@ -355,12 +362,12 @@ static void __kprobes arch_copy_kprobe(s
*/
__copy_instruction(p->ainsn.insn, p->addr, 0);
}
int __kprobes arch_prepare_kprobe(struct kprobe *p)
-@@ -475,7 +482,7 @@ static void __kprobes setup_singlestep(s
+@@ -477,7 +484,7 @@ static void __kprobes setup_singlestep(s
* nor set current_kprobe, because it doesn't use single
* stepping.
*/
preempt_enable_no_resched();
return;
}
-@@ -494,7 +501,7 @@ static void __kprobes setup_singlestep(s
+@@ -496,7 +503,7 @@ static void __kprobes setup_singlestep(s
if (p->opcode == BREAKPOINT_INSTRUCTION)
regs->ip = (unsigned long)p->addr;
else
}
/*
-@@ -573,7 +580,7 @@ static int __kprobes kprobe_handler(stru
+@@ -575,7 +582,7 @@ static int __kprobes kprobe_handler(stru
setup_singlestep(p, regs, kcb, 0);
return 1;
}
/*
* The breakpoint instruction was removed right
* after we hit it. Another cpu has removed
-@@ -799,7 +806,7 @@ static void __kprobes resume_execution(s
+@@ -820,7 +827,7 @@ static void __kprobes resume_execution(s
struct pt_regs *regs, struct kprobe_ctlblk *kcb)
{
unsigned long *tos = stack_addr(regs);
unsigned long orig_ip = (unsigned long)p->addr;
kprobe_opcode_t *insn = p->ainsn.insn;
-@@ -982,7 +989,7 @@ int __kprobes kprobe_exceptions_notify(s
+@@ -1002,7 +1009,7 @@ int __kprobes kprobe_exceptions_notify(s
struct die_args *args = data;
int ret = NOTIFY_DONE;
return ret;
switch (val) {
-diff -urNp linux-2.6.35.4/arch/x86/kernel/ldt.c linux-2.6.35.4/arch/x86/kernel/ldt.c
---- linux-2.6.35.4/arch/x86/kernel/ldt.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/ldt.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/ldt.c linux-2.6.36/arch/x86/kernel/ldt.c
+--- linux-2.6.36/arch/x86/kernel/ldt.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/ldt.c 2010-11-06 18:58:15.000000000 -0400
@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i
if (reload) {
#ifdef CONFIG_SMP
}
+
+ if (tsk == current) {
-+ mm->context.vdso = ~0UL;
++ mm->context.vdso = 0;
+
+#ifdef CONFIG_X86_32
+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
fill_ldt(&ldt, &ldt_info);
if (oldmode)
ldt.avl = 0;
-diff -urNp linux-2.6.35.4/arch/x86/kernel/machine_kexec_32.c linux-2.6.35.4/arch/x86/kernel/machine_kexec_32.c
---- linux-2.6.35.4/arch/x86/kernel/machine_kexec_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/machine_kexec_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/machine_kexec_32.c linux-2.6.36/arch/x86/kernel/machine_kexec_32.c
+--- linux-2.6.36/arch/x86/kernel/machine_kexec_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/machine_kexec_32.c 2010-11-06 18:58:15.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.35.4/arch/x86/kernel/microcode_amd.c linux-2.6.35.4/arch/x86/kernel/microcode_amd.c
---- linux-2.6.35.4/arch/x86/kernel/microcode_amd.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/microcode_amd.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/microcode_amd.c linux-2.6.36/arch/x86/kernel/microcode_amd.c
+--- linux-2.6.36/arch/x86/kernel/microcode_amd.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/microcode_amd.c 2010-11-06 18:58:15.000000000 -0400
@@ -331,7 +331,7 @@ static void microcode_fini_cpu_amd(int c
uci->mc = NULL;
}
{
return µcode_amd_ops;
}
-diff -urNp linux-2.6.35.4/arch/x86/kernel/microcode_core.c linux-2.6.35.4/arch/x86/kernel/microcode_core.c
---- linux-2.6.35.4/arch/x86/kernel/microcode_core.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/microcode_core.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/microcode_core.c linux-2.6.36/arch/x86/kernel/microcode_core.c
+--- linux-2.6.36/arch/x86/kernel/microcode_core.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/microcode_core.c 2010-11-06 18:58:15.000000000 -0400
@@ -92,7 +92,7 @@ MODULE_LICENSE("GPL");
#define MICROCODE_VERSION "2.00"
/*
* Synchronization.
-diff -urNp linux-2.6.35.4/arch/x86/kernel/microcode_intel.c linux-2.6.35.4/arch/x86/kernel/microcode_intel.c
---- linux-2.6.35.4/arch/x86/kernel/microcode_intel.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/microcode_intel.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/microcode_intel.c linux-2.6.36/arch/x86/kernel/microcode_intel.c
+--- linux-2.6.36/arch/x86/kernel/microcode_intel.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/microcode_intel.c 2010-11-06 18:58:15.000000000 -0400
@@ -446,13 +446,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.35.4/arch/x86/kernel/module.c linux-2.6.35.4/arch/x86/kernel/module.c
---- linux-2.6.35.4/arch/x86/kernel/module.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/module.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/module.c linux-2.6.36/arch/x86/kernel/module.c
+--- linux-2.6.36/arch/x86/kernel/module.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/module.c 2010-11-06 18:58:15.000000000 -0400
@@ -35,7 +35,7 @@
#define DEBUGP(fmt...)
#endif
#if 0
if ((s64)val != *(s32 *)loc)
goto overflow;
-diff -urNp linux-2.6.35.4/arch/x86/kernel/paravirt.c linux-2.6.35.4/arch/x86/kernel/paravirt.c
---- linux-2.6.35.4/arch/x86/kernel/paravirt.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/paravirt.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/paravirt.c linux-2.6.36/arch/x86/kernel/paravirt.c
+--- linux-2.6.36/arch/x86/kernel/paravirt.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/paravirt.c 2010-11-06 18:58:15.000000000 -0400
@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
* corresponding structure. */
static void *get_call_destination(u8 type)
};
EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-2.6.35.4/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.35.4/arch/x86/kernel/paravirt-spinlocks.c
---- linux-2.6.35.4/arch/x86/kernel/paravirt-spinlocks.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/paravirt-spinlocks.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.36/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-2.6.36/arch/x86/kernel/paravirt-spinlocks.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/paravirt-spinlocks.c 2010-11-06 18:58:15.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.35.4/arch/x86/kernel/pci-calgary_64.c linux-2.6.35.4/arch/x86/kernel/pci-calgary_64.c
---- linux-2.6.35.4/arch/x86/kernel/pci-calgary_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/pci-calgary_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/pci-calgary_64.c linux-2.6.36/arch/x86/kernel/pci-calgary_64.c
+--- linux-2.6.36/arch/x86/kernel/pci-calgary_64.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/pci-calgary_64.c 2010-11-06 18:58:15.000000000 -0400
@@ -475,7 +475,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.35.4/arch/x86/kernel/pci-dma.c linux-2.6.35.4/arch/x86/kernel/pci-dma.c
---- linux-2.6.35.4/arch/x86/kernel/pci-dma.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/pci-dma.c 2010-09-17 20:12:09.000000000 -0400
-@@ -16,7 +16,7 @@
+diff -urNp linux-2.6.36/arch/x86/kernel/pci-dma.c linux-2.6.36/arch/x86/kernel/pci-dma.c
+--- linux-2.6.36/arch/x86/kernel/pci-dma.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/pci-dma.c 2010-11-06 18:58:15.000000000 -0400
+@@ -17,7 +17,7 @@
static int forbid_dac __read_mostly;
EXPORT_SYMBOL(dma_ops);
static int iommu_sac_force __read_mostly;
-@@ -248,7 +248,7 @@ early_param("iommu", iommu_setup);
+@@ -251,7 +251,7 @@ early_param("iommu", iommu_setup);
int dma_supported(struct device *dev, u64 mask)
{
#ifdef CONFIG_PCI
if (mask > 0xffffffff && forbid_dac > 0) {
-diff -urNp linux-2.6.35.4/arch/x86/kernel/pci-gart_64.c linux-2.6.35.4/arch/x86/kernel/pci-gart_64.c
---- linux-2.6.35.4/arch/x86/kernel/pci-gart_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/pci-gart_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/pci-gart_64.c linux-2.6.36/arch/x86/kernel/pci-gart_64.c
+--- linux-2.6.36/arch/x86/kernel/pci-gart_64.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/pci-gart_64.c 2010-11-06 18:58:15.000000000 -0400
@@ -699,7 +699,7 @@ static __init int init_k8_gatt(struct ag
return -1;
}
.map_sg = gart_map_sg,
.unmap_sg = gart_unmap_sg,
.map_page = gart_map_page,
-diff -urNp linux-2.6.35.4/arch/x86/kernel/pci-nommu.c linux-2.6.35.4/arch/x86/kernel/pci-nommu.c
---- linux-2.6.35.4/arch/x86/kernel/pci-nommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/pci-nommu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/pci-nommu.c linux-2.6.36/arch/x86/kernel/pci-nommu.c
+--- linux-2.6.36/arch/x86/kernel/pci-nommu.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/pci-nommu.c 2010-11-06 18:58:15.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.35.4/arch/x86/kernel/pci-swiotlb.c linux-2.6.35.4/arch/x86/kernel/pci-swiotlb.c
---- linux-2.6.35.4/arch/x86/kernel/pci-swiotlb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/pci-swiotlb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/pci-swiotlb.c linux-2.6.36/arch/x86/kernel/pci-swiotlb.c
+--- linux-2.6.36/arch/x86/kernel/pci-swiotlb.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/pci-swiotlb.c 2010-11-06 18:58:15.000000000 -0400
@@ -25,7 +25,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.35.4/arch/x86/kernel/process_32.c linux-2.6.35.4/arch/x86/kernel/process_32.c
---- linux-2.6.35.4/arch/x86/kernel/process_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/process_32.c 2010-09-17 20:12:09.000000000 -0400
-@@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __as
+diff -urNp linux-2.6.36/arch/x86/kernel/process_32.c linux-2.6.36/arch/x86/kernel/process_32.c
+--- linux-2.6.36/arch/x86/kernel/process_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/process_32.c 2010-11-06 18:58:15.000000000 -0400
+@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
unsigned long thread_saved_pc(struct task_struct *tsk)
{
return ((unsigned long *)tsk->thread.sp)[3];
}
#ifndef CONFIG_SMP
-@@ -126,7 +127,7 @@ void __show_regs(struct pt_regs *regs, i
+@@ -130,7 +131,7 @@ void __show_regs(struct pt_regs *regs, i
unsigned long sp;
unsigned short ss, gs;
sp = regs->sp;
ss = regs->ss & 0xffff;
gs = get_user_gs(regs);
-@@ -196,7 +197,7 @@ int copy_thread(unsigned long clone_flag
+@@ -200,7 +201,7 @@ int copy_thread(unsigned long clone_flag
struct task_struct *tsk;
int err;
*childregs = *regs;
childregs->ax = 0;
childregs->sp = sp;
-@@ -230,6 +231,7 @@ int copy_thread(unsigned long clone_flag
+@@ -234,6 +235,7 @@ int copy_thread(unsigned long clone_flag
* Set a new TLS for the child thread?
*/
if (clone_flags & CLONE_SETTLS)
err = do_set_thread_area(p, -1,
(struct user_desc __user *)childregs->si, 0);
-@@ -293,7 +295,7 @@ __switch_to(struct task_struct *prev_p,
+@@ -297,7 +299,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 +330,11 @@ __switch_to(struct task_struct *prev_p,
+@@ -332,6 +334,11 @@ __switch_to(struct task_struct *prev_p,
*/
lazy_save_gs(prev->gs);
/*
* Load the per-thread Thread-Local Storage descriptor.
*/
-@@ -404,3 +411,27 @@ unsigned long get_wchan(struct task_stru
+@@ -408,3 +415,27 @@ unsigned long get_wchan(struct task_stru
return 0;
}
+ load_sp0(init_tss + smp_processor_id(), thread);
+}
+#endif
-diff -urNp linux-2.6.35.4/arch/x86/kernel/process_64.c linux-2.6.35.4/arch/x86/kernel/process_64.c
---- linux-2.6.35.4/arch/x86/kernel/process_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/process_64.c 2010-09-17 20:12:09.000000000 -0400
-@@ -87,7 +87,7 @@ static void __exit_idle(void)
+diff -urNp linux-2.6.36/arch/x86/kernel/process_64.c linux-2.6.36/arch/x86/kernel/process_64.c
+--- linux-2.6.36/arch/x86/kernel/process_64.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/process_64.c 2010-11-06 18:58:15.000000000 -0400
+@@ -89,7 +89,7 @@ static void __exit_idle(void)
void exit_idle(void)
{
/* idle loop has pid 0 */
return;
__exit_idle();
}
-@@ -375,7 +375,7 @@ __switch_to(struct task_struct *prev_p,
+@@ -380,7 +380,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;
-@@ -528,12 +528,11 @@ unsigned long get_wchan(struct task_stru
+@@ -533,12 +533,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);
return 0;
ip = *(u64 *)(fp+8);
if (!in_sched_functions(ip))
-diff -urNp linux-2.6.35.4/arch/x86/kernel/process.c linux-2.6.35.4/arch/x86/kernel/process.c
---- linux-2.6.35.4/arch/x86/kernel/process.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/process.c 2010-09-17 20:12:09.000000000 -0400
-@@ -73,7 +73,7 @@ void exit_thread(void)
+diff -urNp linux-2.6.36/arch/x86/kernel/process.c linux-2.6.36/arch/x86/kernel/process.c
+--- linux-2.6.36/arch/x86/kernel/process.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/process.c 2010-11-06 18:58:15.000000000 -0400
+@@ -74,7 +74,7 @@ void exit_thread(void)
unsigned long *bp = t->io_bitmap_ptr;
if (bp) {
t->io_bitmap_ptr = NULL;
clear_thread_flag(TIF_IO_BITMAP);
-@@ -107,7 +107,7 @@ void show_regs_common(void)
+@@ -108,7 +108,7 @@ void show_regs_common(void)
printk(KERN_CONT "\n");
printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s %s/%s\n",
init_utsname()->release,
(int)strcspn(init_utsname()->version, " "),
init_utsname()->version, board, product);
-@@ -117,6 +117,9 @@ void flush_thread(void)
+@@ -118,6 +118,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));
/*
-@@ -279,8 +282,8 @@ int kernel_thread(int (*fn)(void *), voi
+@@ -280,8 +283,8 @@ int kernel_thread(int (*fn)(void *), voi
regs.di = (unsigned long) arg;
#ifdef CONFIG_X86_32
regs.fs = __KERNEL_PERCPU;
regs.gs = __KERNEL_STACK_CANARY;
#else
-@@ -689,17 +692,3 @@ static int __init idle_setup(char *str)
+@@ -658,17 +661,3 @@ static int __init idle_setup(char *str)
return 0;
}
early_param("idle", idle_setup);
- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
-}
-
-diff -urNp linux-2.6.35.4/arch/x86/kernel/ptrace.c linux-2.6.35.4/arch/x86/kernel/ptrace.c
---- linux-2.6.35.4/arch/x86/kernel/ptrace.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/ptrace.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/ptrace.c linux-2.6.36/arch/x86/kernel/ptrace.c
+--- linux-2.6.36/arch/x86/kernel/ptrace.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/ptrace.c 2010-11-06 18:58:15.000000000 -0400
@@ -804,7 +804,7 @@ static const struct user_regset_view use
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
{
}
void user_single_step_siginfo(struct task_struct *tsk,
-diff -urNp linux-2.6.35.4/arch/x86/kernel/reboot.c linux-2.6.35.4/arch/x86/kernel/reboot.c
---- linux-2.6.35.4/arch/x86/kernel/reboot.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/reboot.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/reboot.c linux-2.6.36/arch/x86/kernel/reboot.c
+--- linux-2.6.36/arch/x86/kernel/reboot.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/reboot.c 2010-11-06 18:58:15.000000000 -0400
@@ -33,7 +33,7 @@ void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);
/* Set up the IDT for real mode. */
load_idt(&real_mode_idt);
-diff -urNp linux-2.6.35.4/arch/x86/kernel/setup.c linux-2.6.35.4/arch/x86/kernel/setup.c
---- linux-2.6.35.4/arch/x86/kernel/setup.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/setup.c 2010-09-17 20:12:09.000000000 -0400
-@@ -704,7 +704,7 @@ static void __init trim_bios_range(void)
+diff -urNp linux-2.6.36/arch/x86/kernel/setup.c linux-2.6.36/arch/x86/kernel/setup.c
+--- linux-2.6.36/arch/x86/kernel/setup.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/setup.c 2010-11-06 18:58:15.000000000 -0400
+@@ -705,7 +705,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);
}
-@@ -791,14 +791,14 @@ void __init setup_arch(char **cmdline_p)
+@@ -797,14 +797,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.35.4/arch/x86/kernel/setup_percpu.c linux-2.6.35.4/arch/x86/kernel/setup_percpu.c
---- linux-2.6.35.4/arch/x86/kernel/setup_percpu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/setup_percpu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/setup_percpu.c linux-2.6.36/arch/x86/kernel/setup_percpu.c
+--- linux-2.6.36/arch/x86/kernel/setup_percpu.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/setup_percpu.c 2010-11-06 18:58:15.000000000 -0400
@@ -21,19 +21,17 @@
#include <asm/cpu.h>
#include <asm/stackprotector.h>
+-DEFINE_PER_CPU(int, cpu_number);
+#ifdef CONFIG_SMP
- DEFINE_PER_CPU(int, cpu_number);
++DEFINE_PER_CPU(unsigned int, cpu_number);
EXPORT_PER_CPU_SYMBOL(cpu_number);
+#endif
/*
* Up to this point, the boot CPU has been using .init.data
* area. Reload any changed state for the boot CPU.
-diff -urNp linux-2.6.35.4/arch/x86/kernel/signal.c linux-2.6.35.4/arch/x86/kernel/signal.c
---- linux-2.6.35.4/arch/x86/kernel/signal.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/signal.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/signal.c linux-2.6.36/arch/x86/kernel/signal.c
+--- linux-2.6.36/arch/x86/kernel/signal.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/signal.c 2010-11-06 18:58:15.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.
if (err)
return -EFAULT;
-@@ -378,7 +378,7 @@ static int __setup_rt_frame(int sig, str
+@@ -378,7 +378,10 @@ static int __setup_rt_frame(int sig, str
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
/* Set up to return from userspace. */
- restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
-+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
++ if (current->mm->context.vdso)
++ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
++ else
++ restorer = (void __user *)&frame->retcode;
if (ka->sa.sa_flags & SA_RESTORER)
restorer = ka->sa.sa_restorer;
put_user_ex(restorer, &frame->pretcode);
-@@ -390,7 +390,7 @@ static int __setup_rt_frame(int sig, str
+@@ -390,7 +393,7 @@ static int __setup_rt_frame(int sig, str
* reasons and because gdb uses it as a signature to notice
* signal handler stack frames.
*/
} put_user_catch(err);
if (err)
-@@ -780,7 +780,7 @@ static void do_signal(struct pt_regs *re
+@@ -780,7 +783,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.35.4/arch/x86/kernel/smpboot.c linux-2.6.35.4/arch/x86/kernel/smpboot.c
---- linux-2.6.35.4/arch/x86/kernel/smpboot.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/smpboot.c 2010-09-17 20:12:09.000000000 -0400
-@@ -780,7 +780,11 @@ do_rest:
+diff -urNp linux-2.6.36/arch/x86/kernel/smpboot.c linux-2.6.36/arch/x86/kernel/smpboot.c
+--- linux-2.6.36/arch/x86/kernel/smpboot.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/smpboot.c 2010-11-06 18:58:15.000000000 -0400
+@@ -782,7 +782,11 @@ do_rest:
(unsigned long)task_stack_page(c_idle.idle) -
KERNEL_STACK_OFFSET + THREAD_SIZE;
#endif
initial_code = (unsigned long)start_secondary;
stack_start.sp = (void *) c_idle.idle->thread.sp;
-@@ -920,6 +924,12 @@ int __cpuinit native_cpu_up(unsigned int
+@@ -922,6 +926,12 @@ int __cpuinit native_cpu_up(unsigned int
per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
+ KERNEL_PGD_PTRS);
+#endif
+
- #ifdef CONFIG_X86_32
- /* init low mem mapping */
- clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
-diff -urNp linux-2.6.35.4/arch/x86/kernel/step.c linux-2.6.35.4/arch/x86/kernel/step.c
---- linux-2.6.35.4/arch/x86/kernel/step.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/step.c 2010-09-17 20:12:09.000000000 -0400
+ err = do_boot_cpu(apicid, cpu);
+
+ if (err) {
+diff -urNp linux-2.6.36/arch/x86/kernel/step.c linux-2.6.36/arch/x86/kernel/step.c
+--- linux-2.6.36/arch/x86/kernel/step.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/step.c 2010-11-06 18:58:15.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.35.4/arch/x86/kernel/syscall_table_32.S linux-2.6.35.4/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.35.4/arch/x86/kernel/syscall_table_32.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/syscall_table_32.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/syscall_table_32.S linux-2.6.36/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.36/arch/x86/kernel/syscall_table_32.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/syscall_table_32.S 2010-11-06 18:58:15.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.35.4/arch/x86/kernel/sys_i386_32.c linux-2.6.35.4/arch/x86/kernel/sys_i386_32.c
---- linux-2.6.35.4/arch/x86/kernel/sys_i386_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/sys_i386_32.c 2010-09-17 20:12:09.000000000 -0400
-@@ -24,6 +24,224 @@
+diff -urNp linux-2.6.36/arch/x86/kernel/sys_i386_32.c linux-2.6.36/arch/x86/kernel/sys_i386_32.c
+--- linux-2.6.36/arch/x86/kernel/sys_i386_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/sys_i386_32.c 2010-11-06 18:58:15.000000000 -0400
+@@ -24,6 +24,228 @@
#include <asm/syscalls.h>
+ pax_task_size = SEGMEXEC_TASK_SIZE;
+#endif
+
++ pax_task_size -= PAGE_SIZE;
++
+ if (len > pax_task_size)
+ return -ENOMEM;
+
+ pax_task_size = SEGMEXEC_TASK_SIZE;
+#endif
+
++ pax_task_size -= PAGE_SIZE;
++
+ /* requested length too big for entire address space */
+ if (len > pax_task_size)
+ return -ENOMEM;
/*
* Do a system call from kernel instead of calling sys_execve so we
* end up with proper pt_regs.
-diff -urNp linux-2.6.35.4/arch/x86/kernel/sys_x86_64.c linux-2.6.35.4/arch/x86/kernel/sys_x86_64.c
---- linux-2.6.35.4/arch/x86/kernel/sys_x86_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/sys_x86_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/sys_x86_64.c linux-2.6.36/arch/x86/kernel/sys_x86_64.c
+--- linux-2.6.36/arch/x86/kernel/sys_x86_64.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/sys_x86_64.c 2010-11-06 18:58:15.000000000 -0400
@@ -32,8 +32,8 @@ out:
return error;
}
mm->cached_hole_size = ~0UL;
return addr;
-diff -urNp linux-2.6.35.4/arch/x86/kernel/time.c linux-2.6.35.4/arch/x86/kernel/time.c
---- linux-2.6.35.4/arch/x86/kernel/time.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/time.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/time.c linux-2.6.36/arch/x86/kernel/time.c
+--- linux-2.6.36/arch/x86/kernel/time.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/time.c 2010-11-06 18:58:15.000000000 -0400
@@ -26,17 +26,13 @@
int timer_ack;
#endif
}
return pc;
}
-diff -urNp linux-2.6.35.4/arch/x86/kernel/tls.c linux-2.6.35.4/arch/x86/kernel/tls.c
---- linux-2.6.35.4/arch/x86/kernel/tls.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/tls.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/tls.c linux-2.6.36/arch/x86/kernel/tls.c
+--- linux-2.6.36/arch/x86/kernel/tls.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/tls.c 2010-11-06 18:58:15.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.35.4/arch/x86/kernel/trampoline_32.S linux-2.6.35.4/arch/x86/kernel/trampoline_32.S
---- linux-2.6.35.4/arch/x86/kernel/trampoline_32.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/trampoline_32.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/trampoline_32.S linux-2.6.36/arch/x86/kernel/trampoline_32.S
+--- linux-2.6.36/arch/x86/kernel/trampoline_32.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/trampoline_32.S 2010-11-06 18:58:15.000000000 -0400
@@ -32,6 +32,12 @@
#include <asm/segment.h>
#include <asm/page_types.h>
# 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.35.4/arch/x86/kernel/traps.c linux-2.6.35.4/arch/x86/kernel/traps.c
---- linux-2.6.35.4/arch/x86/kernel/traps.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/traps.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/trampoline_64.S linux-2.6.36/arch/x86/kernel/trampoline_64.S
+--- linux-2.6.36/arch/x86/kernel/trampoline_64.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/trampoline_64.S 2010-11-06 18:58:15.000000000 -0400
+@@ -91,7 +91,7 @@ startup_32:
+ movl $__KERNEL_DS, %eax # Initialize the %ds segment register
+ movl %eax, %ds
+
+- movl $X86_CR4_PAE, %eax
++ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
+ movl %eax, %cr4 # Enable PAE mode
+
+ # Setup trampoline 4 level pagetables
+@@ -138,7 +138,7 @@ tidt:
+ # so the kernel can live anywhere
+ .balign 4
+ tgdt:
+- .short tgdt_end - tgdt # gdt limit
++ .short tgdt_end - tgdt - 1 # gdt limit
+ .long tgdt - r_base
+ .short 0
+ .quad 0x00cf9b000000ffff # __KERNEL32_CS
+diff -urNp linux-2.6.36/arch/x86/kernel/traps.c linux-2.6.36/arch/x86/kernel/traps.c
+--- linux-2.6.36/arch/x86/kernel/traps.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/traps.c 2010-11-06 18:58:15.000000000 -0400
@@ -70,12 +70,6 @@ asmlinkage int system_call(void);
/* Do we ignore FPU interrupts ? */
die("general protection fault", regs, error_code);
}
-@@ -565,7 +594,7 @@ dotraplinkage void __kprobes do_debug(st
+@@ -572,7 +601,7 @@ dotraplinkage void __kprobes do_debug(st
/* It's safe to allow irq's after DR6 has been saved */
preempt_conditional_sti(regs);
handle_vm86_trap((struct kernel_vm86_regs *) regs,
error_code, 1);
return;
-@@ -578,7 +607,7 @@ dotraplinkage void __kprobes do_debug(st
+@@ -585,7 +614,7 @@ dotraplinkage void __kprobes do_debug(st
* We already checked v86 mode above, so we can check for kernel mode
* by just checking the CPL of CS.
*/
tsk->thread.debugreg6 &= ~DR_STEP;
set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
regs->flags &= ~X86_EFLAGS_TF;
-@@ -607,7 +636,7 @@ void math_error(struct pt_regs *regs, in
+@@ -614,7 +643,7 @@ void math_error(struct pt_regs *regs, in
return;
conditional_sti(regs);
{
if (!fixup_exception(regs)) {
task->thread.error_code = error_code;
-diff -urNp linux-2.6.35.4/arch/x86/kernel/tsc.c linux-2.6.35.4/arch/x86/kernel/tsc.c
---- linux-2.6.35.4/arch/x86/kernel/tsc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/tsc.c 2010-09-17 20:12:09.000000000 -0400
-@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b
+diff -urNp linux-2.6.36/arch/x86/kernel/tsc.c linux-2.6.36/arch/x86/kernel/tsc.c
+--- linux-2.6.36/arch/x86/kernel/tsc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/tsc.c 2010-11-06 18:58:15.000000000 -0400
+@@ -832,7 +832,7 @@ static struct dmi_system_id __initdata b
DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
},
},
};
static void __init check_system_tsc_reliable(void)
-diff -urNp linux-2.6.35.4/arch/x86/kernel/vm86_32.c linux-2.6.35.4/arch/x86/kernel/vm86_32.c
---- linux-2.6.35.4/arch/x86/kernel/vm86_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/vm86_32.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/vm86_32.c linux-2.6.36/arch/x86/kernel/vm86_32.c
+--- linux-2.6.36/arch/x86/kernel/vm86_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/vm86_32.c 2010-11-06 18:58:50.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.35.4/arch/x86/kernel/vmi_32.c linux-2.6.35.4/arch/x86/kernel/vmi_32.c
---- linux-2.6.35.4/arch/x86/kernel/vmi_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/vmi_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/vmi_32.c linux-2.6.36/arch/x86/kernel/vmi_32.c
+--- linux-2.6.36/arch/x86/kernel/vmi_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/vmi_32.c 2010-11-06 18:58:15.000000000 -0400
@@ -46,12 +46,17 @@ typedef u32 __attribute__((regparm(1)))
typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
return;
local_irq_save(flags);
-diff -urNp linux-2.6.35.4/arch/x86/kernel/vmlinux.lds.S linux-2.6.35.4/arch/x86/kernel/vmlinux.lds.S
---- linux-2.6.35.4/arch/x86/kernel/vmlinux.lds.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/vmlinux.lds.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/vmlinux.lds.S linux-2.6.36/arch/x86/kernel/vmlinux.lds.S
+--- linux-2.6.36/arch/x86/kernel/vmlinux.lds.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/vmlinux.lds.S 2010-11-06 18:58:15.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 +130,50 @@ SECTIONS
+@@ -108,13 +130,52 @@ SECTIONS
IRQENTRY_TEXT
*(.fixup)
*(.gnu.warning)
+ *(.idt)
+ . = ALIGN(PAGE_SIZE);
+ *(.empty_zero_page)
++ *(.swapper_pg_fixmap)
+ *(.swapper_pg_pmd)
+ *(.swapper_pg_dir)
++ *(.trampoline_pg_dir)
+ } :rodata
+#endif
+
X64_ALIGN_DEBUG_RODATA_BEGIN
RO_DATA(PAGE_SIZE)
-@@ -122,16 +181,20 @@ SECTIONS
+@@ -122,16 +183,20 @@ SECTIONS
/* Data */
.data : AT(ADDR(.data) - LOAD_OFFSET) {
PAGE_ALIGNED_DATA(PAGE_SIZE)
-@@ -194,12 +257,6 @@ SECTIONS
+@@ -194,12 +259,6 @@ SECTIONS
}
vgetcpu_mode = VVIRT(.vgetcpu_mode);
.vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) {
*(.vsyscall_3)
}
-@@ -215,12 +272,19 @@ SECTIONS
+@@ -215,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
-@@ -229,12 +293,27 @@ SECTIONS
+@@ -229,12 +295,27 @@ SECTIONS
PERCPU_VADDR(0, :percpu)
#endif
.x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
__x86_cpu_dev_start = .;
-@@ -260,19 +339,11 @@ SECTIONS
+@@ -260,19 +341,11 @@ SECTIONS
*(.altinstr_replacement)
}
PERCPU(PAGE_SIZE)
#endif
-@@ -291,16 +362,10 @@ SECTIONS
+@@ -291,16 +364,10 @@ SECTIONS
.smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
__smp_locks = .;
*(.smp_locks)
/* BSS */
. = ALIGN(PAGE_SIZE);
.bss : AT(ADDR(.bss) - LOAD_OFFSET) {
-@@ -316,6 +381,7 @@ SECTIONS
+@@ -316,6 +383,7 @@ SECTIONS
__brk_base = .;
. += 64 * 1024; /* 64k alignment slop space */
*(.brk_reservation) /* areas brk users have reserved */
__brk_limit = .;
}
-@@ -342,13 +408,12 @@ SECTIONS
+@@ -342,13 +410,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.35.4/arch/x86/kernel/vsyscall_64.c linux-2.6.35.4/arch/x86/kernel/vsyscall_64.c
---- linux-2.6.35.4/arch/x86/kernel/vsyscall_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/vsyscall_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/vsyscall_64.c linux-2.6.36/arch/x86/kernel/vsyscall_64.c
+--- linux-2.6.36/arch/x86/kernel/vsyscall_64.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/vsyscall_64.c 2010-11-06 18:58:15.000000000 -0400
@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
vsyscall_gtod_data.clock.vread = clock->vread;
vsyscall_gtod_data.clock.cycle_last = clock->cycle_last;
vsyscall_gtod_data.clock.mask = clock->mask;
-@@ -203,7 +204,7 @@ vgetcpu(unsigned *cpu, unsigned *node, s
+@@ -208,7 +209,7 @@ vgetcpu(unsigned *cpu, unsigned *node, s
We do this here because otherwise user space would do it on
its own in a likely inferior way (no access to jiffies).
If you don't like it pass NULL. */
p = tcache->blob[1];
} else if (__vgetcpu_mode == VGETCPU_RDTSCP) {
/* Load per CPU data from RDTSCP */
-diff -urNp linux-2.6.35.4/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.35.4/arch/x86/kernel/x8664_ksyms_64.c
---- linux-2.6.35.4/arch/x86/kernel/x8664_ksyms_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/x8664_ksyms_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.36/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-2.6.36/arch/x86/kernel/x8664_ksyms_64.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/x8664_ksyms_64.c 2010-11-06 18:58:15.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.35.4/arch/x86/kernel/xsave.c linux-2.6.35.4/arch/x86/kernel/xsave.c
---- linux-2.6.35.4/arch/x86/kernel/xsave.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kernel/xsave.c 2010-09-17 20:12:09.000000000 -0400
-@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
+diff -urNp linux-2.6.36/arch/x86/kernel/xsave.c linux-2.6.36/arch/x86/kernel/xsave.c
+--- linux-2.6.36/arch/x86/kernel/xsave.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kernel/xsave.c 2010-11-06 18:58:15.000000000 -0400
+@@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_
fx_sw_user->xstate_size > fx_sw_user->extended_size)
- return -1;
+ return -EINVAL;
- err = __get_user(magic2, (__u32 *) (((void *)fpstate) +
+ err = __get_user(magic2, (__u32 __user *) (((void __user *)fpstate) +
fx_sw_user->extended_size -
FP_XSTATE_MAGIC2_SIZE));
- /*
-@@ -196,7 +196,7 @@ fx_only:
+ if (err)
+@@ -267,7 +267,7 @@ fx_only:
* the other extended state.
*/
xrstor_state(init_xstate_buf, pcntxt_mask & ~XSTATE_FPSSE);
}
/*
-@@ -228,7 +228,7 @@ int restore_i387_xstate(void __user *buf
+@@ -299,7 +299,7 @@ int restore_i387_xstate(void __user *buf
if (use_xsave())
err = restore_user_xstate(buf);
else
buf);
if (unlikely(err)) {
/*
-diff -urNp linux-2.6.35.4/arch/x86/kvm/emulate.c linux-2.6.35.4/arch/x86/kvm/emulate.c
---- linux-2.6.35.4/arch/x86/kvm/emulate.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kvm/emulate.c 2010-09-17 20:12:09.000000000 -0400
-@@ -88,11 +88,11 @@
+diff -urNp linux-2.6.36/arch/x86/kvm/emulate.c linux-2.6.36/arch/x86/kvm/emulate.c
+--- linux-2.6.36/arch/x86/kvm/emulate.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kvm/emulate.c 2010-11-06 18:58:15.000000000 -0400
+@@ -92,7 +92,7 @@
#define Src2CL (1<<29)
#define Src2ImmByte (2<<29)
#define Src2One (3<<29)
--#define Src2Imm16 (4<<29)
--#define Src2Mem16 (5<<29) /* Used for Ep encoding. First argument has to be
-+#define Src2Imm16 (4U<<29)
-+#define Src2Mem16 (5U<<29) /* Used for Ep encoding. First argument has to be
- in memory and second argument is located
- immediately after the first one in memory. */
-#define Src2Mask (7<<29)
+#define Src2Mask (7U<<29)
switch ((_dst).bytes) { \
case 1: \
____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
-diff -urNp linux-2.6.35.4/arch/x86/kvm/lapic.c linux-2.6.35.4/arch/x86/kvm/lapic.c
---- linux-2.6.35.4/arch/x86/kvm/lapic.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kvm/lapic.c 2010-09-17 20:12:09.000000000 -0400
-@@ -52,7 +52,7 @@
+diff -urNp linux-2.6.36/arch/x86/kvm/lapic.c linux-2.6.36/arch/x86/kvm/lapic.c
+--- linux-2.6.36/arch/x86/kvm/lapic.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kvm/lapic.c 2010-11-06 18:58:15.000000000 -0400
+@@ -53,7 +53,7 @@
#define APIC_BUS_CYCLE_NS 1
/* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
#define APIC_LVT_NUM 6
/* 14 is the version for Xeon and Pentium 8.4.8*/
-diff -urNp linux-2.6.35.4/arch/x86/kvm/svm.c linux-2.6.35.4/arch/x86/kvm/svm.c
---- linux-2.6.35.4/arch/x86/kvm/svm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kvm/svm.c 2010-09-17 20:12:09.000000000 -0400
-@@ -2796,7 +2796,11 @@ static void reload_tss(struct kvm_vcpu *
+diff -urNp linux-2.6.36/arch/x86/kvm/svm.c linux-2.6.36/arch/x86/kvm/svm.c
+--- linux-2.6.36/arch/x86/kvm/svm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kvm/svm.c 2010-11-06 18:58:15.000000000 -0400
+@@ -2892,7 +2892,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();
}
-@@ -3337,7 +3341,7 @@ static void svm_fpu_deactivate(struct kv
+@@ -3443,7 +3447,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.35.4/arch/x86/kvm/vmx.c linux-2.6.35.4/arch/x86/kvm/vmx.c
---- linux-2.6.35.4/arch/x86/kvm/vmx.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kvm/vmx.c 2010-09-17 20:12:09.000000000 -0400
-@@ -653,7 +653,11 @@ static void reload_tss(void)
+diff -urNp linux-2.6.36/arch/x86/kvm/vmx.c linux-2.6.36/arch/x86/kvm/vmx.c
+--- linux-2.6.36/arch/x86/kvm/vmx.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kvm/vmx.c 2010-11-06 18:58:15.000000000 -0400
+@@ -711,7 +711,11 @@ static void reload_tss(void)
native_store_gdt(&gdt);
descs = (void *)gdt.address;
load_TR_desc();
}
-@@ -1550,8 +1554,11 @@ static __init int hardware_setup(void)
+@@ -1616,8 +1620,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();
-@@ -2533,7 +2540,7 @@ static int vmx_vcpu_setup(struct vcpu_vm
+@@ -2602,7 +2609,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));
-@@ -3909,6 +3916,12 @@ static void vmx_vcpu_run(struct kvm_vcpu
+@@ -3985,6 +3992,12 @@ static void vmx_vcpu_run(struct kvm_vcpu
"jmp .Lkvm_vmx_return \n\t"
".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
".Lkvm_vmx_return: "
/* Save guest registers, load host registers, keep flags */
"xchg %0, (%%"R"sp) \n\t"
"mov %%"R"ax, %c[rax](%0) \n\t"
-@@ -3955,8 +3968,13 @@ static void vmx_vcpu_run(struct kvm_vcpu
+@@ -4031,8 +4044,13 @@ static void vmx_vcpu_run(struct kvm_vcpu
[r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])),
#endif
[cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2))
#ifdef CONFIG_X86_64
, "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15"
#endif
-@@ -3970,7 +3988,7 @@ static void vmx_vcpu_run(struct kvm_vcpu
+@@ -4046,7 +4064,7 @@ static void vmx_vcpu_run(struct kvm_vcpu
if (vmx->rmode.irq.pending)
fixup_rmode_irq(vmx);
- asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
-+ asm("mov %0, %%ds; mov %0, %%es" : : "r"(__KERNEL_DS));
++ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS));
vmx->launched = 1;
vmx_complete_interrupts(vmx);
-@@ -4191,7 +4209,7 @@ static void vmx_set_supported_cpuid(u32
+@@ -4280,7 +4298,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.35.4/arch/x86/kvm/x86.c linux-2.6.35.4/arch/x86/kvm/x86.c
---- linux-2.6.35.4/arch/x86/kvm/x86.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/kvm/x86.c 2010-09-17 20:12:09.000000000 -0400
-@@ -86,7 +86,7 @@ static void update_cr8_intercept(struct
+diff -urNp linux-2.6.36/arch/x86/kvm/x86.c linux-2.6.36/arch/x86/kvm/x86.c
+--- linux-2.6.36/arch/x86/kvm/x86.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/kvm/x86.c 2010-11-06 18:58:15.000000000 -0400
+@@ -90,7 +90,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;
-@@ -112,38 +112,38 @@ static struct kvm_shared_msrs_global __r
+@@ -116,38 +116,38 @@ static struct kvm_shared_msrs_global __r
static DEFINE_PER_CPU(struct kvm_shared_msrs, shared_msrs);
struct kvm_stats_debugfs_item debugfs_entries[] = {
{ NULL }
};
-@@ -1672,6 +1672,8 @@ long kvm_arch_dev_ioctl(struct file *fil
+@@ -1740,6 +1740,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;
-@@ -2103,7 +2105,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
+@@ -2197,7 +2199,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;
-@@ -4070,10 +4072,10 @@ void kvm_after_handle_nmi(struct kvm_vcp
+@@ -4214,10 +4216,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.35.4/arch/x86/lib/checksum_32.S linux-2.6.35.4/arch/x86/lib/checksum_32.S
---- linux-2.6.35.4/arch/x86/lib/checksum_32.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/lib/checksum_32.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/lib/atomic64_cx8_32.S linux-2.6.36/arch/x86/lib/atomic64_cx8_32.S
+--- linux-2.6.36/arch/x86/lib/atomic64_cx8_32.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/lib/atomic64_cx8_32.S 2010-11-06 18:58:15.000000000 -0400
+@@ -86,13 +86,23 @@ ENTRY(atomic64_\func\()_return_cx8)
+ movl %edx, %ecx
+ \ins\()l %esi, %ebx
+ \insc\()l %edi, %ecx
++
++#ifdef CONFIG_PAX_REFCOUNT
++ into
++2:
++ _ASM_EXTABLE(2b, 3f)
++#endif
++
+ LOCK_PREFIX
+ cmpxchg8b (%ebp)
+ jne 1b
+-
+-10:
+ movl %ebx, %eax
+ movl %ecx, %edx
++
++#ifdef CONFIG_PAX_REFCOUNT
++3:
++#endif
++
+ RESTORE edi
+ RESTORE esi
+ RESTORE ebx
+@@ -116,13 +126,24 @@ ENTRY(atomic64_\func\()_return_cx8)
+ movl %edx, %ecx
+ \ins\()l $1, %ebx
+ \insc\()l $0, %ecx
++
++#ifdef CONFIG_PAX_REFCOUNT
++ into
++2:
++ _ASM_EXTABLE(2b, 3f)
++#endif
++
+ LOCK_PREFIX
+ cmpxchg8b (%esi)
+ jne 1b
+
+-10:
+ movl %ebx, %eax
+ movl %ecx, %edx
++
++#ifdef CONFIG_PAX_REFCOUNT
++3:
++#endif
++
+ RESTORE ebx
+ ret
+ CFI_ENDPROC
+@@ -176,6 +197,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)
++#endif
++
+ LOCK_PREFIX
+ cmpxchg8b (%ebp)
+ jne 1b
+@@ -208,6 +236,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)
++#endif
++
+ LOCK_PREFIX
+ cmpxchg8b (%esi)
+ jne 1b
+diff -urNp linux-2.6.36/arch/x86/lib/checksum_32.S linux-2.6.36/arch/x86/lib/checksum_32.S
+--- linux-2.6.36/arch/x86/lib/checksum_32.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/lib/checksum_32.S 2010-11-06 18:58:15.000000000 -0400
@@ -28,7 +28,8 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
#undef ROUND
#undef ROUND1
-diff -urNp linux-2.6.35.4/arch/x86/lib/clear_page_64.S linux-2.6.35.4/arch/x86/lib/clear_page_64.S
---- linux-2.6.35.4/arch/x86/lib/clear_page_64.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/lib/clear_page_64.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/lib/clear_page_64.S linux-2.6.36/arch/x86/lib/clear_page_64.S
+--- linux-2.6.36/arch/x86/lib/clear_page_64.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/lib/clear_page_64.S 2010-11-06 18:58:15.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.35.4/arch/x86/lib/copy_page_64.S linux-2.6.35.4/arch/x86/lib/copy_page_64.S
---- linux-2.6.35.4/arch/x86/lib/copy_page_64.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/lib/copy_page_64.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/lib/copy_page_64.S linux-2.6.36/arch/x86/lib/copy_page_64.S
+--- linux-2.6.36/arch/x86/lib/copy_page_64.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/lib/copy_page_64.S 2010-11-06 18:58:15.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.35.4/arch/x86/lib/copy_user_64.S linux-2.6.35.4/arch/x86/lib/copy_user_64.S
---- linux-2.6.35.4/arch/x86/lib/copy_user_64.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/lib/copy_user_64.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/lib/copy_user_64.S linux-2.6.36/arch/x86/lib/copy_user_64.S
+--- linux-2.6.36/arch/x86/lib/copy_user_64.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/lib/copy_user_64.S 2010-11-06 18:58:15.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.35.4/arch/x86/lib/copy_user_nocache_64.S linux-2.6.35.4/arch/x86/lib/copy_user_nocache_64.S
---- linux-2.6.35.4/arch/x86/lib/copy_user_nocache_64.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/lib/copy_user_nocache_64.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/lib/copy_user_nocache_64.S linux-2.6.36/arch/x86/lib/copy_user_nocache_64.S
+--- linux-2.6.36/arch/x86/lib/copy_user_nocache_64.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/lib/copy_user_nocache_64.S 2010-11-06 18:58:15.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.35.4/arch/x86/lib/csum-wrappers_64.c linux-2.6.35.4/arch/x86/lib/csum-wrappers_64.c
---- linux-2.6.35.4/arch/x86/lib/csum-wrappers_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/lib/csum-wrappers_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/lib/csum-wrappers_64.c linux-2.6.36/arch/x86/lib/csum-wrappers_64.c
+--- linux-2.6.36/arch/x86/lib/csum-wrappers_64.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/lib/csum-wrappers_64.c 2010-11-06 18:58:15.000000000 -0400
@@ -52,6 +52,8 @@ 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.35.4/arch/x86/lib/getuser.S linux-2.6.35.4/arch/x86/lib/getuser.S
---- linux-2.6.35.4/arch/x86/lib/getuser.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/lib/getuser.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/lib/getuser.S linux-2.6.36/arch/x86/lib/getuser.S
+--- linux-2.6.36/arch/x86/lib/getuser.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/lib/getuser.S 2010-11-06 18:58:15.000000000 -0400
@@ -33,14 +33,38 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
xor %edx,%edx
mov $(-EFAULT),%_ASM_AX
ret
-diff -urNp linux-2.6.35.4/arch/x86/lib/insn.c linux-2.6.35.4/arch/x86/lib/insn.c
---- linux-2.6.35.4/arch/x86/lib/insn.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/lib/insn.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/lib/insn.c linux-2.6.36/arch/x86/lib/insn.c
+--- linux-2.6.36/arch/x86/lib/insn.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/lib/insn.c 2010-11-06 18:58:15.000000000 -0400
@@ -21,6 +21,7 @@
#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.35.4/arch/x86/lib/mmx_32.c linux-2.6.35.4/arch/x86/lib/mmx_32.c
---- linux-2.6.35.4/arch/x86/lib/mmx_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/lib/mmx_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/lib/mmx_32.c linux-2.6.36/arch/x86/lib/mmx_32.c
+--- linux-2.6.36/arch/x86/lib/mmx_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/lib/mmx_32.c 2010-11-06 18:58:15.000000000 -0400
@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
{
void *p;
from += 64;
to += 64;
-diff -urNp linux-2.6.35.4/arch/x86/lib/putuser.S linux-2.6.35.4/arch/x86/lib/putuser.S
---- linux-2.6.35.4/arch/x86/lib/putuser.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/lib/putuser.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/lib/putuser.S linux-2.6.36/arch/x86/lib/putuser.S
+--- linux-2.6.36/arch/x86/lib/putuser.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/lib/putuser.S 2010-11-06 18:58:15.000000000 -0400
@@ -15,7 +15,8 @@
#include <asm/thread_info.h>
#include <asm/errno.h>
movl $-EFAULT,%eax
EXIT
END(bad_put_user)
-diff -urNp linux-2.6.35.4/arch/x86/lib/usercopy_32.c linux-2.6.35.4/arch/x86/lib/usercopy_32.c
---- linux-2.6.35.4/arch/x86/lib/usercopy_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/lib/usercopy_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/lib/usercopy_32.c linux-2.6.36/arch/x86/lib/usercopy_32.c
+--- linux-2.6.36/arch/x86/lib/usercopy_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/lib/usercopy_32.c 2010-11-06 18:58:15.000000000 -0400
@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned
* Copy a null terminated string from userspace.
*/
+#endif
+
+EXPORT_SYMBOL(set_fs);
-diff -urNp linux-2.6.35.4/arch/x86/lib/usercopy_64.c linux-2.6.35.4/arch/x86/lib/usercopy_64.c
---- linux-2.6.35.4/arch/x86/lib/usercopy_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/lib/usercopy_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/lib/usercopy_64.c linux-2.6.36/arch/x86/lib/usercopy_64.c
+--- linux-2.6.36/arch/x86/lib/usercopy_64.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/lib/usercopy_64.c 2010-11-06 18:58:15.000000000 -0400
@@ -42,6 +42,8 @@ long
__strncpy_from_user(char *dst, const char __user *src, long count)
{
}
EXPORT_SYMBOL(copy_in_user);
-diff -urNp linux-2.6.35.4/arch/x86/Makefile linux-2.6.35.4/arch/x86/Makefile
---- linux-2.6.35.4/arch/x86/Makefile 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/Makefile 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/Makefile linux-2.6.36/arch/x86/Makefile
+--- linux-2.6.36/arch/x86/Makefile 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/Makefile 2010-11-06 18:58:15.000000000 -0400
@@ -191,3 +191,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.35.4/arch/x86/mm/extable.c linux-2.6.35.4/arch/x86/mm/extable.c
---- linux-2.6.35.4/arch/x86/mm/extable.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/mm/extable.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/mm/extable.c linux-2.6.36/arch/x86/mm/extable.c
+--- linux-2.6.36/arch/x86/mm/extable.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/mm/extable.c 2010-11-06 18:58:15.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.35.4/arch/x86/mm/fault.c linux-2.6.35.4/arch/x86/mm/fault.c
---- linux-2.6.35.4/arch/x86/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/mm/fault.c 2010-09-17 20:12:37.000000000 -0400
-@@ -11,10 +11,19 @@
+diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
+--- linux-2.6.36/arch/x86/mm/fault.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/mm/fault.c 2010-11-06 18:58:50.000000000 -0400
+@@ -11,10 +11,18 @@
#include <linux/kprobes.h> /* __kprobes, ... */
#include <linux/mmiotrace.h> /* kmmio_handler, ... */
#include <linux/perf_event.h> /* perf_sw_event */
+
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
+#include <asm/stacktrace.h>
-+#include "../kernel/dumpstack.h"
+#endif
/*
* Page fault error code bits:
-@@ -52,7 +61,7 @@ static inline int __kprobes notify_page_
+@@ -52,7 +60,7 @@ static inline int __kprobes notify_page_
int ret = 0;
/* kprobe_running() needs smp_processor_id() */
preempt_disable();
if (kprobe_running() && kprobe_fault_handler(regs, 14))
ret = 1;
-@@ -173,6 +182,30 @@ force_sig_info_fault(int si_signo, int s
+@@ -173,6 +181,30 @@ force_sig_info_fault(int si_signo, int s
force_sig_info(si_signo, &info, tsk);
}
DEFINE_SPINLOCK(pgd_lock);
LIST_HEAD(pgd_list);
-@@ -225,11 +258,24 @@ void vmalloc_sync_all(void)
+@@ -225,11 +257,24 @@ void vmalloc_sync_all(void)
address += PMD_SIZE) {
unsigned long flags;
break;
}
spin_unlock_irqrestore(&pgd_lock, flags);
-@@ -259,6 +305,11 @@ static noinline __kprobes int vmalloc_fa
+@@ -259,6 +304,11 @@ static noinline __kprobes int vmalloc_fa
* an interrupt in the middle of a task switch..
*/
pgd_paddr = read_cr3();
pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
if (!pmd_k)
return -1;
-@@ -333,15 +384,27 @@ void vmalloc_sync_all(void)
+@@ -333,15 +383,27 @@ void vmalloc_sync_all(void)
const pgd_t *pgd_ref = pgd_offset_k(address);
unsigned long flags;
if (pgd_none(*pgd))
set_pgd(pgd, *pgd_ref);
else
-@@ -374,7 +437,14 @@ static noinline __kprobes int vmalloc_fa
+@@ -374,7 +436,14 @@ static noinline __kprobes int vmalloc_fa
* happen within a race in page table update. In the later
* case just flush:
*/
pgd_ref = pgd_offset_k(address);
if (pgd_none(*pgd_ref))
return -1;
-@@ -536,7 +606,7 @@ static int is_errata93(struct pt_regs *r
+@@ -536,7 +605,7 @@ static int is_errata93(struct pt_regs *r
static int is_errata100(struct pt_regs *regs, unsigned long address)
{
#ifdef CONFIG_X86_64
return 1;
#endif
return 0;
-@@ -563,7 +633,7 @@ static int is_f00f_bug(struct pt_regs *r
+@@ -563,7 +632,7 @@ static int is_f00f_bug(struct pt_regs *r
}
static const char nx_warning[] = KERN_CRIT
static void
show_fault_oops(struct pt_regs *regs, unsigned long error_code,
-@@ -572,15 +642,26 @@ show_fault_oops(struct pt_regs *regs, un
+@@ -572,15 +641,26 @@ show_fault_oops(struct pt_regs *regs, un
if (!oops_may_print())
return;
printk(KERN_ALERT "BUG: unable to handle kernel ");
if (address < PAGE_SIZE)
printk(KERN_CONT "NULL pointer dereference");
-@@ -705,6 +786,68 @@ __bad_area_nosemaphore(struct pt_regs *r
+@@ -705,6 +785,68 @@ __bad_area_nosemaphore(struct pt_regs *r
unsigned long address, int si_code)
{
struct task_struct *tsk = current;
+ struct mm_struct *mm = tsk->mm;
+
+#ifdef CONFIG_X86_64
-+ if (mm && (error_code & PF_INSTR)) {
++ if (mm && (error_code & PF_INSTR) && mm->context.vdso) {
+ if (regs->ip == (unsigned long)vgettimeofday) {
+ regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback_gettimeofday);
+ return;
+ unsigned long ip = regs->ip;
+
+ if (v8086_mode(regs))
-+ ip = ((regs->cs & 0xffff) << 4) + (regs->ip & 0xffff);
++ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
+
+ /*
+ * It's possible to have interrupts off here:
+
+#ifdef CONFIG_PAX_PAGEEXEC
+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) &&
-+ (((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) || (!(error_code & (PF_PROT | PF_WRITE)) && regs->ip == address))) {
++ (((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) || (!(error_code & (PF_PROT | PF_WRITE)) && ip == address))) {
+
+#ifdef CONFIG_PAX_EMUTRAMP
+ switch (pax_handle_fetch_fault(regs)) {
+ }
+#endif
+
-+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
++ pax_report_fault(regs, (void *)ip, (void *)regs->sp);
+ do_group_exit(SIGKILL);
+ }
+#endif
+
+#ifdef CONFIG_PAX_SEGMEXEC
-+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && !(error_code & (PF_PROT | PF_WRITE)) && (regs->ip + SEGMEXEC_TASK_SIZE == address)) {
++ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && !(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address)) {
+
+#ifdef CONFIG_PAX_EMUTRAMP
+ switch (pax_handle_fetch_fault(regs)) {
+ }
+#endif
+
-+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
++ pax_report_fault(regs, (void *)ip, (void *)regs->sp);
+ do_group_exit(SIGKILL);
+ }
+#endif
/* User mode accesses just cause a SIGSEGV */
if (error_code & PF_USER) {
-@@ -851,6 +994,106 @@ static int spurious_fault_check(unsigned
+@@ -851,6 +993,106 @@ static int spurious_fault_check(unsigned
return 1;
}
/*
* Handle a spurious fault caused by a stale TLB entry.
*
-@@ -917,6 +1160,9 @@ int show_unhandled_signals = 1;
+@@ -917,6 +1159,9 @@ int show_unhandled_signals = 1;
static inline int
access_error(unsigned long error_code, int write, struct vm_area_struct *vma)
{
if (write) {
/* write, present and write, not present: */
if (unlikely(!(vma->vm_flags & VM_WRITE)))
-@@ -950,17 +1196,31 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -950,17 +1195,31 @@ do_page_fault(struct pt_regs *regs, unsi
{
struct vm_area_struct *vma;
struct task_struct *tsk;
/*
* Detect and handle instructions that would cause a page fault for
* both a tracked kernel page and a userspace page.
-@@ -1020,7 +1280,7 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1020,7 +1279,7 @@ do_page_fault(struct pt_regs *regs, unsi
* User-mode registers count as a user access even for any
* potential system fault or CPU buglet:
*/
local_irq_enable();
error_code |= PF_USER;
} else {
-@@ -1074,6 +1334,11 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1074,6 +1333,11 @@ do_page_fault(struct pt_regs *regs, unsi
might_sleep();
}
vma = find_vma(mm, address);
if (unlikely(!vma)) {
bad_area(regs, error_code, address);
-@@ -1085,18 +1350,24 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1085,18 +1349,24 @@ do_page_fault(struct pt_regs *regs, unsi
bad_area(regs, error_code, address);
return;
}
if (unlikely(expand_stack(vma, address))) {
bad_area(regs, error_code, address);
return;
-@@ -1140,3 +1411,199 @@ good_area:
+@@ -1140,3 +1410,199 @@ good_area:
up_read(&mm->mmap_sem);
}
+
+ return ret ? -EFAULT : 0;
+}
-diff -urNp linux-2.6.35.4/arch/x86/mm/gup.c linux-2.6.35.4/arch/x86/mm/gup.c
---- linux-2.6.35.4/arch/x86/mm/gup.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/mm/gup.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/mm/gup.c linux-2.6.36/arch/x86/mm/gup.c
+--- linux-2.6.36/arch/x86/mm/gup.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/mm/gup.c 2010-11-06 18:58:15.000000000 -0400
@@ -237,7 +237,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.35.4/arch/x86/mm/highmem_32.c linux-2.6.35.4/arch/x86/mm/highmem_32.c
---- linux-2.6.35.4/arch/x86/mm/highmem_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/mm/highmem_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/mm/highmem_32.c linux-2.6.36/arch/x86/mm/highmem_32.c
+--- linux-2.6.36/arch/x86/mm/highmem_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/mm/highmem_32.c 2010-11-06 18:58:15.000000000 -0400
@@ -43,7 +43,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.35.4/arch/x86/mm/hugetlbpage.c linux-2.6.35.4/arch/x86/mm/hugetlbpage.c
---- linux-2.6.35.4/arch/x86/mm/hugetlbpage.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/mm/hugetlbpage.c 2010-09-17 20:12:09.000000000 -0400
-@@ -266,13 +266,18 @@ static unsigned long hugetlb_get_unmappe
+diff -urNp linux-2.6.36/arch/x86/mm/hugetlbpage.c linux-2.6.36/arch/x86/mm/hugetlbpage.c
+--- linux-2.6.36/arch/x86/mm/hugetlbpage.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/mm/hugetlbpage.c 2010-11-06 18:58:15.000000000 -0400
+@@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
struct vm_area_struct *vma;
+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
+ pax_task_size = SEGMEXEC_TASK_SIZE;
+#endif
++
++ pax_task_size -= PAGE_SIZE;
if (len > mm->cached_hole_size) {
- start_addr = mm->free_area_cache;
}
full_search:
-@@ -280,26 +285,27 @@ full_search:
+@@ -280,26 +287,27 @@ full_search:
for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
/* At this point: (!vma || addr < vma->vm_end). */
}
static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
-@@ -308,10 +314,9 @@ static unsigned long hugetlb_get_unmappe
+@@ -308,10 +316,9 @@ static unsigned long hugetlb_get_unmappe
{
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
/* don't allow allocations above current base */
if (mm->free_area_cache > base)
-@@ -321,7 +326,7 @@ static unsigned long hugetlb_get_unmappe
+@@ -321,7 +328,7 @@ static unsigned long hugetlb_get_unmappe
largest_hole = 0;
mm->free_area_cache = base;
}
/* make sure it can fit in the remaining address space */
if (mm->free_area_cache < len)
goto fail;
-@@ -329,33 +334,27 @@ try_again:
+@@ -329,33 +336,27 @@ try_again:
/* either no address requested or cant fit in requested address hole */
addr = (mm->free_area_cache - len) & huge_page_mask(h);
do {
/* try just below the current vma->vm_start */
addr = (vma->vm_start - len) & huge_page_mask(h);
-@@ -363,22 +362,26 @@ try_again:
+@@ -363,22 +364,26 @@ try_again:
fail:
/*
mm->cached_hole_size = ~0UL;
addr = hugetlb_get_unmapped_area_bottomup(file, addr0,
len, pgoff, flags);
-@@ -386,6 +389,7 @@ fail:
+@@ -386,6 +391,7 @@ fail:
/*
* Restore the topdown base:
*/
mm->free_area_cache = base;
mm->cached_hole_size = ~0UL;
-@@ -399,10 +403,17 @@ hugetlb_get_unmapped_area(struct file *f
+@@ -399,10 +405,19 @@ hugetlb_get_unmapped_area(struct file *f
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
struct vm_area_struct *vma;
+ pax_task_size = SEGMEXEC_TASK_SIZE;
+#endif
+
++ pax_task_size -= PAGE_SIZE;
++
+ if (len > pax_task_size)
return -ENOMEM;
if (flags & MAP_FIXED) {
-@@ -414,8 +425,7 @@ hugetlb_get_unmapped_area(struct file *f
+@@ -414,8 +429,7 @@ hugetlb_get_unmapped_area(struct file *f
if (addr) {
addr = ALIGN(addr, huge_page_size(h));
vma = find_vma(mm, addr);
return addr;
}
if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-2.6.35.4/arch/x86/mm/init_32.c linux-2.6.35.4/arch/x86/mm/init_32.c
---- linux-2.6.35.4/arch/x86/mm/init_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/mm/init_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
+--- linux-2.6.36/arch/x86/mm/init_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/mm/init_32.c 2010-11-06 18:58:15.000000000 -0400
@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
}
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.35.4/arch/x86/mm/init_64.c linux-2.6.35.4/arch/x86/mm/init_64.c
---- linux-2.6.35.4/arch/x86/mm/init_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/mm/init_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/mm/init_64.c linux-2.6.36/arch/x86/mm/init_64.c
+--- linux-2.6.36/arch/x86/mm/init_64.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/mm/init_64.c 2010-11-06 18:58:15.000000000 -0400
@@ -50,7 +50,6 @@
#include <asm/numa.h>
#include <asm/cacheflush.h>
return "[vdso]";
if (vma == &gate_vma)
return "[vsyscall]";
-diff -urNp linux-2.6.35.4/arch/x86/mm/init.c linux-2.6.35.4/arch/x86/mm/init.c
---- linux-2.6.35.4/arch/x86/mm/init.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/mm/init.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/mm/init.c linux-2.6.36/arch/x86/mm/init.c
+--- linux-2.6.36/arch/x86/mm/init.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/mm/init.c 2010-11-06 18:58:15.000000000 -0400
@@ -70,11 +70,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.
free_init_pages("unused kernel memory",
(unsigned long)(&__init_begin),
(unsigned long)(&__init_end));
-diff -urNp linux-2.6.35.4/arch/x86/mm/iomap_32.c linux-2.6.35.4/arch/x86/mm/iomap_32.c
---- linux-2.6.35.4/arch/x86/mm/iomap_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/mm/iomap_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/mm/iomap_32.c linux-2.6.36/arch/x86/mm/iomap_32.c
+--- linux-2.6.36/arch/x86/mm/iomap_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/mm/iomap_32.c 2010-11-06 18:58:15.000000000 -0400
@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
debug_kmap_atomic(type);
idx = type + KM_TYPE_NR * smp_processor_id();
arch_flush_lazy_mmu_mode();
return (void *)vaddr;
-diff -urNp linux-2.6.35.4/arch/x86/mm/ioremap.c linux-2.6.35.4/arch/x86/mm/ioremap.c
---- linux-2.6.35.4/arch/x86/mm/ioremap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/mm/ioremap.c 2010-09-17 20:12:09.000000000 -0400
-@@ -100,13 +100,10 @@ static void __iomem *__ioremap_caller(re
- /*
- * Don't allow anybody to remap normal RAM that we're using..
- */
-- for (pfn = phys_addr >> PAGE_SHIFT;
-- (pfn << PAGE_SHIFT) < (last_addr & PAGE_MASK);
-- pfn++) {
--
-+ for (pfn = phys_addr >> PAGE_SHIFT; ((resource_size_t)pfn << PAGE_SHIFT) < (last_addr & PAGE_MASK); pfn++) {
+diff -urNp linux-2.6.36/arch/x86/mm/ioremap.c linux-2.6.36/arch/x86/mm/ioremap.c
+--- linux-2.6.36/arch/x86/mm/ioremap.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/mm/ioremap.c 2010-11-06 18:58:15.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);
- if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
return NULL;
WARN_ON_ONCE(is_ram);
}
-@@ -346,7 +343,7 @@ static int __init early_ioremap_debug_se
+@@ -344,7 +344,7 @@ static int __init early_ioremap_debug_se
early_param("early_ioremap_debug", early_ioremap_debug_setup);
static __initdata int after_paging_init;
static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
{
-@@ -378,8 +375,7 @@ void __init early_ioremap_init(void)
+@@ -376,8 +376,7 @@ void __init early_ioremap_init(void)
slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
/*
* The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-2.6.35.4/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.35.4/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-2.6.35.4/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/mm/kmemcheck/kmemcheck.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.36/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-2.6.36/arch/x86/mm/kmemcheck/kmemcheck.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/mm/kmemcheck/kmemcheck.c 2010-11-06 18:58:15.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.35.4/arch/x86/mm/mmap.c linux-2.6.35.4/arch/x86/mm/mmap.c
---- linux-2.6.35.4/arch/x86/mm/mmap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/mm/mmap.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/mm/mmap.c linux-2.6.36/arch/x86/mm/mmap.c
+--- linux-2.6.36/arch/x86/mm/mmap.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/mm/mmap.c 2010-11-06 18:58:15.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.35.4/arch/x86/mm/numa_32.c linux-2.6.35.4/arch/x86/mm/numa_32.c
---- linux-2.6.35.4/arch/x86/mm/numa_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/mm/numa_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/mm/numa_32.c linux-2.6.36/arch/x86/mm/numa_32.c
+--- linux-2.6.36/arch/x86/mm/numa_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/mm/numa_32.c 2010-11-06 18:58:15.000000000 -0400
@@ -98,7 +98,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.35.4/arch/x86/mm/pageattr.c linux-2.6.35.4/arch/x86/mm/pageattr.c
---- linux-2.6.35.4/arch/x86/mm/pageattr.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/mm/pageattr.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/mm/pageattr.c linux-2.6.36/arch/x86/mm/pageattr.c
+--- linux-2.6.36/arch/x86/mm/pageattr.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/mm/pageattr.c 2010-11-06 18:58:15.000000000 -0400
@@ -261,16 +261,17 @@ static inline pgprot_t static_protection
* PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
*/
}
static int
-diff -urNp linux-2.6.35.4/arch/x86/mm/pageattr-test.c linux-2.6.35.4/arch/x86/mm/pageattr-test.c
---- linux-2.6.35.4/arch/x86/mm/pageattr-test.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/mm/pageattr-test.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/mm/pageattr-test.c linux-2.6.36/arch/x86/mm/pageattr-test.c
+--- linux-2.6.36/arch/x86/mm/pageattr-test.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/mm/pageattr-test.c 2010-11-06 18:58:15.000000000 -0400
@@ -36,7 +36,7 @@ enum {
static int pte_testbit(pte_t pte)
}
struct split_state {
-diff -urNp linux-2.6.35.4/arch/x86/mm/pat.c linux-2.6.35.4/arch/x86/mm/pat.c
---- linux-2.6.35.4/arch/x86/mm/pat.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/mm/pat.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/mm/pat.c linux-2.6.36/arch/x86/mm/pat.c
+--- linux-2.6.36/arch/x86/mm/pat.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/mm/pat.c 2010-11-06 18:58:15.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.35.4/arch/x86/mm/pgtable_32.c linux-2.6.35.4/arch/x86/mm/pgtable_32.c
---- linux-2.6.35.4/arch/x86/mm/pgtable_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/mm/pgtable_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/mm/pgtable_32.c linux-2.6.36/arch/x86/mm/pgtable_32.c
+--- linux-2.6.36/arch/x86/mm/pgtable_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/mm/pgtable_32.c 2010-11-06 18:58:15.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.35.4/arch/x86/mm/pgtable.c linux-2.6.35.4/arch/x86/mm/pgtable.c
---- linux-2.6.35.4/arch/x86/mm/pgtable.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/mm/pgtable.c 2010-09-17 20:12:09.000000000 -0400
-@@ -84,8 +84,59 @@ static inline void pgd_list_del(pgd_t *p
+diff -urNp linux-2.6.36/arch/x86/mm/pgtable.c linux-2.6.36/arch/x86/mm/pgtable.c
+--- linux-2.6.36/arch/x86/mm/pgtable.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/mm/pgtable.c 2010-11-06 18:58:15.000000000 -0400
+@@ -84,8 +84,58 @@ static inline void pgd_list_del(pgd_t *p
list_del(&page->lru);
}
+{
+ while (count--)
+ *dst++ = __pgd((pgd_val(*src++) | _PAGE_NX) & ~_PAGE_USER);
-+
+}
+#endif
+
static void pgd_ctor(pgd_t *pgd)
{
-@@ -120,6 +171,7 @@ static void pgd_dtor(pgd_t *pgd)
+@@ -120,6 +170,7 @@ static void pgd_dtor(pgd_t *pgd)
pgd_list_del(pgd);
spin_unlock_irqrestore(&pgd_lock, flags);
}
/*
* List of all pgd's needed for non-PAE so it can invalidate entries
-@@ -132,7 +184,7 @@ static void pgd_dtor(pgd_t *pgd)
+@@ -132,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
-@@ -144,7 +196,7 @@ static void pgd_dtor(pgd_t *pgd)
+@@ -144,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)
{
-@@ -163,36 +215,38 @@ void pud_populate(struct mm_struct *mm,
+@@ -163,36 +214,38 @@ void pud_populate(struct mm_struct *mm,
if (mm == current->active_mm)
write_cr3(read_cr3());
}
return -ENOMEM;
}
-@@ -205,51 +259,56 @@ static int preallocate_pmds(pmd_t *pmds[
+@@ -205,51 +258,56 @@ static int preallocate_pmds(pmd_t *pmds[
* preallocate which never got a corresponding vma will need to be
* freed manually.
*/
unsigned long flags;
pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
-@@ -259,11 +318,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -259,11 +317,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
mm->pgd = pgd;
/*
* Make sure that pre-populating the pmds is atomic with
-@@ -273,14 +332,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -273,14 +331,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
spin_lock_irqsave(&pgd_lock, flags);
pgd_ctor(pgd);
out_free_pgd:
free_page((unsigned long)pgd);
out:
-@@ -289,7 +348,7 @@ out:
+@@ -289,7 +347,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.35.4/arch/x86/mm/setup_nx.c linux-2.6.35.4/arch/x86/mm/setup_nx.c
---- linux-2.6.35.4/arch/x86/mm/setup_nx.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/mm/setup_nx.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/mm/setup_nx.c linux-2.6.36/arch/x86/mm/setup_nx.c
+--- linux-2.6.36/arch/x86/mm/setup_nx.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/mm/setup_nx.c 2010-11-06 18:58:15.000000000 -0400
@@ -5,8 +5,10 @@
#include <asm/pgtable.h>
#include <asm/proto.h>
__supported_pte_mask &= ~_PAGE_NX;
}
-diff -urNp linux-2.6.35.4/arch/x86/mm/tlb.c linux-2.6.35.4/arch/x86/mm/tlb.c
---- linux-2.6.35.4/arch/x86/mm/tlb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/mm/tlb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/mm/tlb.c linux-2.6.36/arch/x86/mm/tlb.c
+--- linux-2.6.36/arch/x86/mm/tlb.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/mm/tlb.c 2010-11-06 18:58:15.000000000 -0400
@@ -13,7 +13,7 @@
#include <asm/uv/uv.h>
}
EXPORT_SYMBOL_GPL(leave_mm);
-diff -urNp linux-2.6.35.4/arch/x86/oprofile/backtrace.c linux-2.6.35.4/arch/x86/oprofile/backtrace.c
---- linux-2.6.35.4/arch/x86/oprofile/backtrace.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/oprofile/backtrace.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/oprofile/backtrace.c linux-2.6.36/arch/x86/oprofile/backtrace.c
+--- linux-2.6.36/arch/x86/oprofile/backtrace.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/oprofile/backtrace.c 2010-11-06 18:58:15.000000000 -0400
@@ -58,7 +58,7 @@ static struct frame_head *dump_user_back
struct frame_head bufhead[2];
unsigned long stack = kernel_stack_pointer(regs);
if (depth)
dump_trace(NULL, regs, (unsigned long *)stack, 0,
-diff -urNp linux-2.6.35.4/arch/x86/oprofile/op_model_p4.c linux-2.6.35.4/arch/x86/oprofile/op_model_p4.c
---- linux-2.6.35.4/arch/x86/oprofile/op_model_p4.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/oprofile/op_model_p4.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/oprofile/op_model_p4.c linux-2.6.36/arch/x86/oprofile/op_model_p4.c
+--- linux-2.6.36/arch/x86/oprofile/op_model_p4.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/oprofile/op_model_p4.c 2010-11-06 18:58:15.000000000 -0400
@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
#endif
}
{
#ifdef CONFIG_SMP
return smp_num_siblings == 2 ? 2 : 1;
-diff -urNp linux-2.6.35.4/arch/x86/pci/common.c linux-2.6.35.4/arch/x86/pci/common.c
---- linux-2.6.35.4/arch/x86/pci/common.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/pci/common.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/pci/common.c linux-2.6.36/arch/x86/pci/common.c
+--- linux-2.6.36/arch/x86/pci/common.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/pci/common.c 2010-11-06 18:58:15.000000000 -0400
@@ -32,8 +32,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)
-@@ -365,7 +365,7 @@ static const struct dmi_system_id __devi
+@@ -382,7 +382,7 @@ static const struct dmi_system_id __devi
DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"),
},
},
};
void __init dmi_check_pciprobe(void)
-diff -urNp linux-2.6.35.4/arch/x86/pci/direct.c linux-2.6.35.4/arch/x86/pci/direct.c
---- linux-2.6.35.4/arch/x86/pci/direct.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/pci/direct.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/pci/direct.c linux-2.6.36/arch/x86/pci/direct.c
+--- linux-2.6.36/arch/x86/pci/direct.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/pci/direct.c 2010-11-06 18:58:15.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.35.4/arch/x86/pci/fixup.c linux-2.6.35.4/arch/x86/pci/fixup.c
---- linux-2.6.35.4/arch/x86/pci/fixup.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/pci/fixup.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/pci/fixup.c linux-2.6.36/arch/x86/pci/fixup.c
+--- linux-2.6.36/arch/x86/pci/fixup.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/pci/fixup.c 2010-11-06 18:58:15.000000000 -0400
@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
},
};
static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
-diff -urNp linux-2.6.35.4/arch/x86/pci/irq.c linux-2.6.35.4/arch/x86/pci/irq.c
---- linux-2.6.35.4/arch/x86/pci/irq.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/pci/irq.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/pci/irq.c linux-2.6.36/arch/x86/pci/irq.c
+--- linux-2.6.36/arch/x86/pci/irq.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/pci/irq.c 2010-11-06 18:58:15.000000000 -0400
@@ -542,7 +542,7 @@ static __init int intel_router_probe(str
static struct pci_device_id __initdata pirq_440gx[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) },
};
void __init pcibios_irq_init(void)
-diff -urNp linux-2.6.35.4/arch/x86/pci/mmconfig_32.c linux-2.6.35.4/arch/x86/pci/mmconfig_32.c
---- linux-2.6.35.4/arch/x86/pci/mmconfig_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/pci/mmconfig_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/pci/mmconfig_32.c linux-2.6.36/arch/x86/pci/mmconfig_32.c
+--- linux-2.6.36/arch/x86/pci/mmconfig_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/pci/mmconfig_32.c 2010-11-06 18:58:15.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.35.4/arch/x86/pci/mmconfig_64.c linux-2.6.35.4/arch/x86/pci/mmconfig_64.c
---- linux-2.6.35.4/arch/x86/pci/mmconfig_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/pci/mmconfig_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/pci/mmconfig_64.c linux-2.6.36/arch/x86/pci/mmconfig_64.c
+--- linux-2.6.36/arch/x86/pci/mmconfig_64.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/pci/mmconfig_64.c 2010-11-06 18:58:15.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.35.4/arch/x86/pci/numaq_32.c linux-2.6.35.4/arch/x86/pci/numaq_32.c
---- linux-2.6.35.4/arch/x86/pci/numaq_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/pci/numaq_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/pci/numaq_32.c linux-2.6.36/arch/x86/pci/numaq_32.c
+--- linux-2.6.36/arch/x86/pci/numaq_32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/pci/numaq_32.c 2010-11-06 18:58:15.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.35.4/arch/x86/pci/olpc.c linux-2.6.35.4/arch/x86/pci/olpc.c
---- linux-2.6.35.4/arch/x86/pci/olpc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/pci/olpc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/pci/olpc.c linux-2.6.36/arch/x86/pci/olpc.c
+--- linux-2.6.36/arch/x86/pci/olpc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/pci/olpc.c 2010-11-06 18:58:15.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.35.4/arch/x86/pci/pcbios.c linux-2.6.35.4/arch/x86/pci/pcbios.c
---- linux-2.6.35.4/arch/x86/pci/pcbios.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/pci/pcbios.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/pci/pcbios.c linux-2.6.36/arch/x86/pci/pcbios.c
+--- linux-2.6.36/arch/x86/pci/pcbios.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/pci/pcbios.c 2010-11-06 18:58:15.000000000 -0400
@@ -57,50 +57,93 @@ union bios32 {
static struct {
unsigned long address;
return !(ret & 0xff00);
}
EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff -urNp linux-2.6.35.4/arch/x86/power/cpu.c linux-2.6.35.4/arch/x86/power/cpu.c
---- linux-2.6.35.4/arch/x86/power/cpu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/power/cpu.c 2010-09-17 20:12:09.000000000 -0400
-@@ -129,7 +129,7 @@ static void do_fpu_end(void)
+diff -urNp linux-2.6.36/arch/x86/power/cpu.c linux-2.6.36/arch/x86/power/cpu.c
+--- linux-2.6.36/arch/x86/power/cpu.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/power/cpu.c 2010-11-06 18:58:15.000000000 -0400
+@@ -130,7 +130,7 @@ static void do_fpu_end(void)
static void fix_processor_context(void)
{
int cpu = smp_processor_id();
set_tss_desc(cpu, t); /*
* This just modifies memory; should not be
-@@ -139,7 +139,9 @@ static void fix_processor_context(void)
+@@ -140,7 +140,9 @@ static void fix_processor_context(void)
*/
#ifdef CONFIG_X86_64
syscall_init(); /* This sets MSR_*STAR and related */
#endif
-diff -urNp linux-2.6.35.4/arch/x86/vdso/Makefile linux-2.6.35.4/arch/x86/vdso/Makefile
---- linux-2.6.35.4/arch/x86/vdso/Makefile 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/vdso/Makefile 2010-09-17 20:12:09.000000000 -0400
-@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
- $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
- -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
+diff -urNp linux-2.6.36/arch/x86/vdso/Makefile linux-2.6.36/arch/x86/vdso/Makefile
+--- linux-2.6.36/arch/x86/vdso/Makefile 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/vdso/Makefile 2010-11-06 18:58:15.000000000 -0400
+@@ -123,7 +123,7 @@ quiet_cmd_vdso = VDSO $@
+ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
+ sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
+VDSO_LDFLAGS = -fPIC -shared --no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
GCOV_PROFILE := n
#
-diff -urNp linux-2.6.35.4/arch/x86/vdso/vclock_gettime.c linux-2.6.35.4/arch/x86/vdso/vclock_gettime.c
---- linux-2.6.35.4/arch/x86/vdso/vclock_gettime.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/vdso/vclock_gettime.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/vdso/vclock_gettime.c linux-2.6.36/arch/x86/vdso/vclock_gettime.c
+--- linux-2.6.36/arch/x86/vdso/vclock_gettime.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/vdso/vclock_gettime.c 2010-11-06 18:58:15.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.35.4/arch/x86/vdso/vdso32-setup.c linux-2.6.35.4/arch/x86/vdso/vdso32-setup.c
---- linux-2.6.35.4/arch/x86/vdso/vdso32-setup.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/vdso/vdso32-setup.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/vdso/vdso32-setup.c linux-2.6.36/arch/x86/vdso/vdso32-setup.c
+--- linux-2.6.36/arch/x86/vdso/vdso32-setup.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/vdso/vdso32-setup.c 2010-11-06 18:58:15.000000000 -0400
@@ -25,6 +25,7 @@
#include <asm/tlbflush.h>
#include <asm/vdso.h>
return &gate_vma;
return NULL;
}
-diff -urNp linux-2.6.35.4/arch/x86/vdso/vdso.lds.S linux-2.6.35.4/arch/x86/vdso/vdso.lds.S
---- linux-2.6.35.4/arch/x86/vdso/vdso.lds.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/vdso/vdso.lds.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/vdso/vdso.lds.S linux-2.6.36/arch/x86/vdso/vdso.lds.S
+--- linux-2.6.36/arch/x86/vdso/vdso.lds.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/vdso/vdso.lds.S 2010-11-06 18:58:15.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.35.4/arch/x86/vdso/vextern.h linux-2.6.35.4/arch/x86/vdso/vextern.h
---- linux-2.6.35.4/arch/x86/vdso/vextern.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/vdso/vextern.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/vdso/vextern.h linux-2.6.36/arch/x86/vdso/vextern.h
+--- linux-2.6.36/arch/x86/vdso/vextern.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/vdso/vextern.h 2010-11-06 18:58:15.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.35.4/arch/x86/vdso/vma.c linux-2.6.35.4/arch/x86/vdso/vma.c
---- linux-2.6.35.4/arch/x86/vdso/vma.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/vdso/vma.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/vdso/vma.c linux-2.6.36/arch/x86/vdso/vma.c
+--- linux-2.6.36/arch/x86/vdso/vma.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/vdso/vma.c 2010-11-06 18:58:15.000000000 -0400
@@ -58,7 +58,7 @@ static int __init init_vdso_vars(void)
if (!vbase)
goto oom;
printk("VDSO: I'm broken; not ELF\n");
vdso_enabled = 0;
}
-@@ -67,6 +67,7 @@ static int __init init_vdso_vars(void)
- *(typeof(__ ## x) **) var_ref(VDSO64_SYMBOL(vbase, x), #x) = &__ ## x;
- #include "vextern.h"
- #undef VEXTERN
-+ vunmap(vbase);
- return 0;
-
- oom:
-@@ -117,7 +118,7 @@ int arch_setup_additional_pages(struct l
+@@ -118,7 +118,7 @@ int arch_setup_additional_pages(struct l
goto up_fail;
}
ret = install_special_mapping(mm, addr, vdso_size,
VM_READ|VM_EXEC|
-@@ -125,7 +126,7 @@ int arch_setup_additional_pages(struct l
+@@ -126,7 +126,7 @@ int arch_setup_additional_pages(struct l
VM_ALWAYSDUMP,
vdso_pages);
if (ret) {
goto up_fail;
}
-@@ -133,10 +134,3 @@ up_fail:
+@@ -134,10 +134,3 @@ up_fail:
up_write(&mm->mmap_sem);
return ret;
}
- return 0;
-}
-__setup("vdso=", vdso_setup);
-diff -urNp linux-2.6.35.4/arch/x86/xen/enlighten.c linux-2.6.35.4/arch/x86/xen/enlighten.c
---- linux-2.6.35.4/arch/x86/xen/enlighten.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/xen/enlighten.c 2010-09-17 20:12:09.000000000 -0400
-@@ -74,8 +74,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
+diff -urNp linux-2.6.36/arch/x86/xen/enlighten.c linux-2.6.36/arch/x86/xen/enlighten.c
+--- linux-2.6.36/arch/x86/xen/enlighten.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/xen/enlighten.c 2010-11-06 18:58:15.000000000 -0400
+@@ -79,8 +79,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
struct shared_info xen_dummy_shared_info;
-void *xen_initial_gdt;
-
- /*
- * Point at some empty memory to start with. We map the real shared_info
- * page as soon as fixmap is up and running.
-@@ -551,7 +549,7 @@ static void xen_write_idt_entry(gate_des
+ RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
+ __read_mostly int xen_have_vector_callback;
+ EXPORT_SYMBOL_GPL(xen_have_vector_callback);
+@@ -573,7 +571,7 @@ static void xen_write_idt_entry(gate_des
preempt_disable();
end = start + __get_cpu_var(idt_desc).size + 1;
xen_mc_flush();
-@@ -1103,7 +1101,17 @@ asmlinkage void __init xen_start_kernel(
+@@ -1130,7 +1128,17 @@ asmlinkage void __init xen_start_kernel(
__userpte_alloc_gfp &= ~__GFP_HIGHMEM;
/* Work out if we support NX */
xen_setup_features();
-@@ -1134,13 +1142,6 @@ asmlinkage void __init xen_start_kernel(
+@@ -1161,13 +1169,6 @@ asmlinkage void __init xen_start_kernel(
machine_ops = xen_machine_ops;
xen_smp_init();
pgd = (pgd_t *)xen_start_info->pt_base;
-diff -urNp linux-2.6.35.4/arch/x86/xen/mmu.c linux-2.6.35.4/arch/x86/xen/mmu.c
---- linux-2.6.35.4/arch/x86/xen/mmu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/xen/mmu.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1694,6 +1694,8 @@ __init pgd_t *xen_setup_kernel_pagetable
+diff -urNp linux-2.6.36/arch/x86/xen/mmu.c linux-2.6.36/arch/x86/xen/mmu.c
+--- linux-2.6.36/arch/x86/xen/mmu.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/xen/mmu.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1773,6 +1773,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);
-@@ -1712,7 +1714,10 @@ __init pgd_t *xen_setup_kernel_pagetable
+@@ -1791,7 +1793,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.35.4/arch/x86/xen/smp.c linux-2.6.35.4/arch/x86/xen/smp.c
---- linux-2.6.35.4/arch/x86/xen/smp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/xen/smp.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.36/arch/x86/xen/pci-swiotlb-xen.c
+--- linux-2.6.36/arch/x86/xen/pci-swiotlb-xen.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/xen/pci-swiotlb-xen.c 2010-11-06 18:58:15.000000000 -0400
+@@ -8,7 +8,7 @@
+
+ int xen_swiotlb __read_mostly;
+
+-static struct dma_map_ops xen_swiotlb_dma_ops = {
++static const struct dma_map_ops xen_swiotlb_dma_ops = {
+ .mapping_error = xen_swiotlb_dma_mapping_error,
+ .alloc_coherent = xen_swiotlb_alloc_coherent,
+ .free_coherent = xen_swiotlb_free_coherent,
+diff -urNp linux-2.6.36/arch/x86/xen/smp.c linux-2.6.36/arch/x86/xen/smp.c
+--- linux-2.6.36/arch/x86/xen/smp.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/xen/smp.c 2010-11-06 18:58:15.000000000 -0400
@@ -169,11 +169,6 @@ static void __init xen_smp_prepare_boot_
{
BUG_ON(smp_processor_id() != 0);
ctxt->user_regs.ss = __KERNEL_DS;
#ifdef CONFIG_X86_32
ctxt->user_regs.fs = __KERNEL_PERCPU;
-diff -urNp linux-2.6.35.4/arch/x86/xen/xen-head.S linux-2.6.35.4/arch/x86/xen/xen-head.S
---- linux-2.6.35.4/arch/x86/xen/xen-head.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/xen/xen-head.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/xen/xen-head.S linux-2.6.36/arch/x86/xen/xen-head.S
+--- linux-2.6.36/arch/x86/xen/xen-head.S 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/xen/xen-head.S 2010-11-06 18:58:15.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.35.4/arch/x86/xen/xen-ops.h linux-2.6.35.4/arch/x86/xen/xen-ops.h
---- linux-2.6.35.4/arch/x86/xen/xen-ops.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/arch/x86/xen/xen-ops.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/arch/x86/xen/xen-ops.h linux-2.6.36/arch/x86/xen/xen-ops.h
+--- linux-2.6.36/arch/x86/xen/xen-ops.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/arch/x86/xen/xen-ops.h 2010-11-06 18:58:15.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.35.4/block/blk-iopoll.c linux-2.6.35.4/block/blk-iopoll.c
---- linux-2.6.35.4/block/blk-iopoll.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/block/blk-iopoll.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/block/blk-iopoll.c linux-2.6.36/block/blk-iopoll.c
+--- linux-2.6.36/block/blk-iopoll.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/block/blk-iopoll.c 2010-11-06 18:58:15.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.35.4/block/blk-map.c linux-2.6.35.4/block/blk-map.c
---- linux-2.6.35.4/block/blk-map.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/block/blk-map.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/block/blk-map.c linux-2.6.36/block/blk-map.c
+--- linux-2.6.36/block/blk-map.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/block/blk-map.c 2010-11-06 18:58:15.000000000 -0400
@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
* direct dma. else, set up kernel bounce buffers
*/
if (do_copy)
bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
else
-diff -urNp linux-2.6.35.4/block/blk-softirq.c linux-2.6.35.4/block/blk-softirq.c
---- linux-2.6.35.4/block/blk-softirq.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/block/blk-softirq.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/block/blk-softirq.c linux-2.6.36/block/blk-softirq.c
+--- linux-2.6.36/block/blk-softirq.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/block/blk-softirq.c 2010-11-06 18:58:15.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.35.4/crypto/lrw.c linux-2.6.35.4/crypto/lrw.c
---- linux-2.6.35.4/crypto/lrw.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/crypto/lrw.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/crypto/lrw.c linux-2.6.36/crypto/lrw.c
+--- linux-2.6.36/crypto/lrw.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/crypto/lrw.c 2010-11-06 18:58:15.000000000 -0400
@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
struct priv *ctx = crypto_tfm_ctx(parent);
struct crypto_cipher *child = ctx->child;
int bsize = crypto_cipher_blocksize(child);
crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
-diff -urNp linux-2.6.35.4/Documentation/dontdiff linux-2.6.35.4/Documentation/dontdiff
---- linux-2.6.35.4/Documentation/dontdiff 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/Documentation/dontdiff 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/Documentation/dontdiff linux-2.6.36/Documentation/dontdiff
+--- linux-2.6.36/Documentation/dontdiff 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/Documentation/dontdiff 2010-11-06 18:58:15.000000000 -0400
@@ -3,6 +3,7 @@
*.bin
*.cpio
zImage*
zconf.hash.c
+zoffset.h
-diff -urNp linux-2.6.35.4/Documentation/filesystems/sysfs.txt linux-2.6.35.4/Documentation/filesystems/sysfs.txt
---- linux-2.6.35.4/Documentation/filesystems/sysfs.txt 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/Documentation/filesystems/sysfs.txt 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/Documentation/filesystems/sysfs.txt linux-2.6.36/Documentation/filesystems/sysfs.txt
+--- linux-2.6.36/Documentation/filesystems/sysfs.txt 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/Documentation/filesystems/sysfs.txt 2010-11-06 18:58:15.000000000 -0400
@@ -123,8 +123,8 @@ set of sysfs operations for forwarding r
show and store methods of the attribute owners.
struct sysfs_ops {
- ssize_t (*show)(struct kobject *, struct attribute *, char *);
-- ssize_t (*store)(struct kobject *, struct attribute *, const char *);
+- ssize_t (*store)(struct kobject *, struct attribute *, const char *, size_t);
+ ssize_t (* const show)(struct kobject *, struct attribute *, char *);
-+ ssize_t (* const store)(struct kobject *, struct attribute *, const char *);
++ ssize_t (* const store)(struct kobject *, struct attribute *, const char *, size_t);
};
[ Subsystems should have already defined a struct kobj_type as a
-diff -urNp linux-2.6.35.4/Documentation/kernel-parameters.txt linux-2.6.35.4/Documentation/kernel-parameters.txt
---- linux-2.6.35.4/Documentation/kernel-parameters.txt 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/Documentation/kernel-parameters.txt 2010-09-17 20:12:09.000000000 -0400
-@@ -1910,6 +1910,12 @@ and is between 256 and 4096 characters.
+diff -urNp linux-2.6.36/Documentation/kernel-parameters.txt linux-2.6.36/Documentation/kernel-parameters.txt
+--- linux-2.6.36/Documentation/kernel-parameters.txt 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/Documentation/kernel-parameters.txt 2010-11-06 18:58:15.000000000 -0400
+@@ -1835,6 +1835,12 @@ and is between 256 and 4096 characters.
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.35.4/drivers/acpi/battery.c linux-2.6.35.4/drivers/acpi/battery.c
---- linux-2.6.35.4/drivers/acpi/battery.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/acpi/battery.c 2010-09-17 20:12:09.000000000 -0400
-@@ -810,7 +810,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
+diff -urNp linux-2.6.36/drivers/acpi/battery.c linux-2.6.36/drivers/acpi/battery.c
+--- linux-2.6.36/drivers/acpi/battery.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/acpi/battery.c 2010-11-06 18:58:15.000000000 -0400
+@@ -809,7 +809,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
}
static struct battery_file {
mode_t mode;
const char *name;
} acpi_battery_file[] = {
-diff -urNp linux-2.6.35.4/drivers/acpi/blacklist.c linux-2.6.35.4/drivers/acpi/blacklist.c
---- linux-2.6.35.4/drivers/acpi/blacklist.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/acpi/blacklist.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/acpi/blacklist.c linux-2.6.36/drivers/acpi/blacklist.c
+--- linux-2.6.36/drivers/acpi/blacklist.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/acpi/blacklist.c 2010-11-06 18:58:15.000000000 -0400
@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
{"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
"Incorrect _ADR", 1},
};
#if CONFIG_ACPI_BLACKLIST_YEAR
-diff -urNp linux-2.6.35.4/drivers/acpi/dock.c linux-2.6.35.4/drivers/acpi/dock.c
---- linux-2.6.35.4/drivers/acpi/dock.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/acpi/dock.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/acpi/dock.c linux-2.6.36/drivers/acpi/dock.c
+--- linux-2.6.36/drivers/acpi/dock.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/acpi/dock.c 2010-11-06 18:58:15.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.35.4/drivers/acpi/osl.c linux-2.6.35.4/drivers/acpi/osl.c
---- linux-2.6.35.4/drivers/acpi/osl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/acpi/osl.c 2010-09-17 20:12:09.000000000 -0400
-@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
+diff -urNp linux-2.6.36/drivers/acpi/osl.c linux-2.6.36/drivers/acpi/osl.c
+--- linux-2.6.36/drivers/acpi/osl.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/acpi/osl.c 2010-11-06 18:58:15.000000000 -0400
+@@ -497,6 +497,8 @@ acpi_os_read_memory(acpi_physical_addres
void __iomem *virt_addr;
virt_addr = ioremap(phys_addr, width);
if (!value)
value = &dummy;
-@@ -551,6 +553,8 @@ acpi_os_write_memory(acpi_physical_addre
+@@ -525,6 +527,8 @@ acpi_os_write_memory(acpi_physical_addre
void __iomem *virt_addr;
virt_addr = ioremap(phys_addr, width);
switch (width) {
case 8:
-diff -urNp linux-2.6.35.4/drivers/acpi/power_meter.c linux-2.6.35.4/drivers/acpi/power_meter.c
---- linux-2.6.35.4/drivers/acpi/power_meter.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/acpi/power_meter.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/acpi/power_meter.c linux-2.6.36/drivers/acpi/power_meter.c
+--- linux-2.6.36/drivers/acpi/power_meter.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/acpi/power_meter.c 2010-11-06 18:58:15.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.35.4/drivers/acpi/proc.c linux-2.6.35.4/drivers/acpi/proc.c
---- linux-2.6.35.4/drivers/acpi/proc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/acpi/proc.c 2010-09-17 20:12:09.000000000 -0400
-@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
+diff -urNp linux-2.6.36/drivers/acpi/proc.c linux-2.6.36/drivers/acpi/proc.c
+--- linux-2.6.36/drivers/acpi/proc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/acpi/proc.c 2010-11-06 18:58:15.000000000 -0400
+@@ -338,20 +338,15 @@ acpi_system_write_wakeup_device(struct f
size_t count, loff_t * ppos)
{
struct list_head *node, *next;
mutex_lock(&acpi_device_lock);
list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-@@ -413,7 +408,7 @@ acpi_system_write_wakeup_device(struct f
+@@ -360,7 +355,7 @@ acpi_system_write_wakeup_device(struct f
if (!dev->wakeup.flags.valid)
continue;
dev->wakeup.state.enabled =
dev->wakeup.state.enabled ? 0 : 1;
found_dev = dev;
-diff -urNp linux-2.6.35.4/drivers/acpi/processor_driver.c linux-2.6.35.4/drivers/acpi/processor_driver.c
---- linux-2.6.35.4/drivers/acpi/processor_driver.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/acpi/processor_driver.c 2010-09-17 20:12:09.000000000 -0400
-@@ -586,7 +586,7 @@ static int __cpuinit acpi_processor_add(
+diff -urNp linux-2.6.36/drivers/acpi/processor_driver.c linux-2.6.36/drivers/acpi/processor_driver.c
+--- linux-2.6.36/drivers/acpi/processor_driver.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/acpi/processor_driver.c 2010-11-06 18:58:15.000000000 -0400
+@@ -507,7 +507,7 @@ static int __cpuinit acpi_processor_add(
return 0;
#endif
/*
* Buggy BIOS check
-diff -urNp linux-2.6.35.4/drivers/acpi/processor_idle.c linux-2.6.35.4/drivers/acpi/processor_idle.c
---- linux-2.6.35.4/drivers/acpi/processor_idle.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/acpi/processor_idle.c 2010-09-17 20:12:09.000000000 -0400
-@@ -124,7 +124,7 @@ static struct dmi_system_id __cpuinitdat
+diff -urNp linux-2.6.36/drivers/acpi/processor_idle.c linux-2.6.36/drivers/acpi/processor_idle.c
+--- linux-2.6.36/drivers/acpi/processor_idle.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/acpi/processor_idle.c 2010-11-06 18:58:15.000000000 -0400
+@@ -115,7 +115,7 @@ static struct dmi_system_id __cpuinitdat
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
(void *)1},
};
-diff -urNp linux-2.6.35.4/drivers/acpi/sleep.c linux-2.6.35.4/drivers/acpi/sleep.c
---- linux-2.6.35.4/drivers/acpi/sleep.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/acpi/sleep.c 2010-09-17 20:12:09.000000000 -0400
-@@ -318,7 +318,7 @@ static int acpi_suspend_state_valid(susp
+diff -urNp linux-2.6.36/drivers/acpi/sleep.c linux-2.6.36/drivers/acpi/sleep.c
+--- linux-2.6.36/drivers/acpi/sleep.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/acpi/sleep.c 2010-11-06 18:58:15.000000000 -0400
+@@ -319,7 +319,7 @@ static int acpi_suspend_state_valid(susp
}
}
.valid = acpi_suspend_state_valid,
.begin = acpi_suspend_begin,
.prepare_late = acpi_pm_prepare,
-@@ -346,7 +346,7 @@ static int acpi_suspend_begin_old(suspen
+@@ -347,7 +347,7 @@ static int acpi_suspend_begin_old(suspen
* The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
* been requested.
*/
+static const struct platform_suspend_ops acpi_suspend_ops_old = {
.valid = acpi_suspend_state_valid,
.begin = acpi_suspend_begin_old,
- .prepare_late = acpi_pm_freeze,
-@@ -478,7 +478,7 @@ static void acpi_pm_thaw(void)
+ .prepare_late = acpi_pm_pre_suspend,
+@@ -490,7 +490,7 @@ static void acpi_pm_thaw(void)
acpi_enable_all_runtime_gpes();
}
+static const struct platform_hibernation_ops acpi_hibernation_ops = {
.begin = acpi_hibernation_begin,
.end = acpi_pm_end,
- .pre_snapshot = acpi_hibernation_pre_snapshot,
-@@ -528,7 +528,7 @@ static int acpi_hibernation_pre_snapshot
+ .pre_snapshot = acpi_pm_prepare,
+@@ -533,7 +533,7 @@ static int acpi_hibernation_begin_old(vo
* The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
* been requested.
*/
+static const struct platform_hibernation_ops acpi_hibernation_ops_old = {
.begin = acpi_hibernation_begin_old,
.end = acpi_pm_end,
- .pre_snapshot = acpi_hibernation_pre_snapshot_old,
-diff -urNp linux-2.6.35.4/drivers/acpi/video.c linux-2.6.35.4/drivers/acpi/video.c
---- linux-2.6.35.4/drivers/acpi/video.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/acpi/video.c 2010-09-17 20:12:09.000000000 -0400
-@@ -363,7 +363,7 @@ static int acpi_video_set_brightness(str
+ .pre_snapshot = acpi_pm_pre_suspend,
+diff -urNp linux-2.6.36/drivers/acpi/video.c linux-2.6.36/drivers/acpi/video.c
+--- linux-2.6.36/drivers/acpi/video.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/acpi/video.c 2010-11-06 18:58:15.000000000 -0400
+@@ -367,7 +367,7 @@ static int acpi_video_set_brightness(str
vd->brightness->levels[request_level]);
}
.get_brightness = acpi_video_get_brightness,
.update_status = acpi_video_set_brightness,
};
-diff -urNp linux-2.6.35.4/drivers/ata/ahci.c linux-2.6.35.4/drivers/ata/ahci.c
---- linux-2.6.35.4/drivers/ata/ahci.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/ahci.c 2010-09-17 20:12:09.000000000 -0400
-@@ -89,17 +89,17 @@ static int ahci_pci_device_suspend(struc
- static int ahci_pci_device_resume(struct pci_dev *pdev);
- #endif
+diff -urNp linux-2.6.36/drivers/ata/ahci.c linux-2.6.36/drivers/ata/ahci.c
+--- linux-2.6.36/drivers/ata/ahci.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/ahci.c 2010-11-06 18:58:15.000000000 -0400
+@@ -94,17 +94,17 @@ static struct scsi_host_template ahci_sh
+ AHCI_SHT("ahci"),
+ };
-static struct ata_port_operations ahci_vt8251_ops = {
+static const struct ata_port_operations ahci_vt8251_ops = {
.inherits = &ahci_ops,
.softreset = ahci_sb600_softreset,
.pmp_softreset = ahci_sb600_softreset,
-@@ -370,7 +370,7 @@ static const struct pci_device_id ahci_p
+@@ -388,7 +388,7 @@ static const struct pci_device_id ahci_p
{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci },
};
-diff -urNp linux-2.6.35.4/drivers/ata/ahci.h linux-2.6.35.4/drivers/ata/ahci.h
---- linux-2.6.35.4/drivers/ata/ahci.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/ahci.h 2010-09-17 20:12:09.000000000 -0400
-@@ -298,7 +298,7 @@ struct ahci_host_priv {
- extern int ahci_ignore_sss;
+diff -urNp linux-2.6.36/drivers/ata/ahci.h linux-2.6.36/drivers/ata/ahci.h
+--- linux-2.6.36/drivers/ata/ahci.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/ahci.h 2010-11-06 18:58:15.000000000 -0400
+@@ -309,7 +309,7 @@ extern struct device_attribute *ahci_sde
+ .shost_attrs = ahci_shost_attrs, \
+ .sdev_attrs = ahci_sdev_attrs
- extern struct scsi_host_template ahci_sht;
-extern struct ata_port_operations ahci_ops;
+extern const struct ata_port_operations ahci_ops;
void ahci_save_initial_config(struct device *dev,
struct ahci_host_priv *hpriv,
-diff -urNp linux-2.6.35.4/drivers/ata/ata_generic.c linux-2.6.35.4/drivers/ata/ata_generic.c
---- linux-2.6.35.4/drivers/ata/ata_generic.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/ata_generic.c 2010-09-17 20:12:09.000000000 -0400
-@@ -104,7 +104,7 @@ static struct scsi_host_template generic
+diff -urNp linux-2.6.36/drivers/ata/ata_generic.c linux-2.6.36/drivers/ata/ata_generic.c
+--- linux-2.6.36/drivers/ata/ata_generic.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/ata_generic.c 2010-11-06 18:58:15.000000000 -0400
+@@ -100,7 +100,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.35.4/drivers/ata/ata_piix.c linux-2.6.35.4/drivers/ata/ata_piix.c
---- linux-2.6.35.4/drivers/ata/ata_piix.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/ata_piix.c 2010-09-17 20:12:09.000000000 -0400
-@@ -302,7 +302,7 @@ static const struct pci_device_id piix_p
- { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
- /* SATA Controller IDE (CPT) */
- { 0x8086, 0x1c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+diff -urNp linux-2.6.36/drivers/ata/ata_piix.c linux-2.6.36/drivers/ata/ata_piix.c
+--- linux-2.6.36/drivers/ata/ata_piix.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/ata_piix.c 2010-11-06 18:58:15.000000000 -0400
+@@ -306,7 +306,7 @@ static const struct pci_device_id piix_p
+ { 0x8086, 0x1d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+ /* SATA Controller IDE (PBG) */
+ { 0x8086, 0x1d08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
- { } /* terminate list */
+ { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */
};
static struct pci_driver piix_pci_driver = {
-@@ -320,12 +320,12 @@ static struct scsi_host_template piix_sh
+@@ -324,12 +324,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,
-@@ -333,18 +333,18 @@ static struct ata_port_operations piix_p
+@@ -337,18 +337,18 @@ static struct ata_port_operations piix_p
.prereset = piix_pata_prereset,
};
.inherits = &piix_sata_ops,
.hardreset = sata_std_hardreset,
.scr_read = piix_sidpr_scr_read,
-@@ -620,7 +620,7 @@ static const struct ich_laptop ich_lapto
+@@ -624,7 +624,7 @@ static const struct ich_laptop ich_lapto
{ 0x2653, 0x1043, 0x82D8 }, /* ICH6M on Asus Eee 701 */
{ 0x27df, 0x104d, 0x900e }, /* ICH7 on Sony TZ-90 */
/* end marker */
};
/**
-@@ -1112,7 +1112,7 @@ static int piix_broken_suspend(void)
+@@ -1116,7 +1116,7 @@ static int piix_broken_suspend(void)
},
},
};
static const char *oemstrs[] = {
"Tecra M3,",
-diff -urNp linux-2.6.35.4/drivers/ata/libahci.c linux-2.6.35.4/drivers/ata/libahci.c
---- linux-2.6.35.4/drivers/ata/libahci.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/libahci.c 2010-09-17 20:12:09.000000000 -0400
-@@ -149,7 +149,7 @@ struct scsi_host_template ahci_sht = {
+diff -urNp linux-2.6.36/drivers/ata/libahci.c linux-2.6.36/drivers/ata/libahci.c
+--- linux-2.6.36/drivers/ata/libahci.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/libahci.c 2010-11-06 18:58:15.000000000 -0400
+@@ -141,7 +141,7 @@ struct device_attribute *ahci_sdev_attrs
};
- EXPORT_SYMBOL_GPL(ahci_sht);
+ EXPORT_SYMBOL_GPL(ahci_sdev_attrs);
-struct ata_port_operations ahci_ops = {
+const struct ata_port_operations ahci_ops = {
.inherits = &sata_pmp_port_ops,
.qc_defer = ahci_pmp_qc_defer,
-diff -urNp linux-2.6.35.4/drivers/ata/libata-acpi.c linux-2.6.35.4/drivers/ata/libata-acpi.c
---- linux-2.6.35.4/drivers/ata/libata-acpi.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/libata-acpi.c 2010-09-17 20:12:09.000000000 -0400
-@@ -224,12 +224,12 @@ static void ata_acpi_dev_uevent(acpi_han
+diff -urNp linux-2.6.36/drivers/ata/libata-acpi.c linux-2.6.36/drivers/ata/libata-acpi.c
+--- linux-2.6.36/drivers/ata/libata-acpi.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/libata-acpi.c 2010-11-06 18:58:15.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.35.4/drivers/ata/libata-core.c linux-2.6.35.4/drivers/ata/libata-core.c
---- linux-2.6.35.4/drivers/ata/libata-core.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/libata-core.c 2010-09-17 20:12:09.000000000 -0400
-@@ -901,7 +901,7 @@ static const struct ata_xfer_ent {
+diff -urNp linux-2.6.36/drivers/ata/libata-core.c linux-2.6.36/drivers/ata/libata-core.c
+--- linux-2.6.36/drivers/ata/libata-core.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/libata-core.c 2010-11-06 18:58:15.000000000 -0400
+@@ -899,7 +899,7 @@ static const struct ata_xfer_ent {
{ ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
{ ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 },
{ ATA_SHIFT_UDMA, ATA_NR_UDMA_MODES, XFER_UDMA_0 },
};
/**
-@@ -3073,7 +3073,7 @@ static const struct ata_timing ata_timin
+@@ -3071,7 +3071,7 @@ static const struct ata_timing ata_timin
{ XFER_UDMA_5, 0, 0, 0, 0, 0, 0, 0, 0, 20 },
{ XFER_UDMA_6, 0, 0, 0, 0, 0, 0, 0, 0, 15 },
};
#define ENOUGH(v, unit) (((v)-1)/(unit)+1)
-@@ -4323,7 +4323,7 @@ static const struct ata_blacklist_entry
+@@ -4260,7 +4260,7 @@ static const struct ata_blacklist_entry
{ "PIONEER DVD-RW DVRTD08", "1.00", ATA_HORKAGE_NOSETXFER },
/* End Marker */
+ { NULL, NULL, 0 }
};
- static int strn_pattern_cmp(const char *patt, const char *name, int wildchar)
-@@ -5869,7 +5869,7 @@ static void ata_host_stop(struct device
+ /**
+@@ -4865,7 +4865,7 @@ void ata_qc_free(struct ata_queued_cmd *
+ struct ata_port *ap;
+ unsigned int tag;
+
+- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
++ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
+ ap = qc->ap;
+
+ qc->flags = 0;
+@@ -4881,7 +4881,7 @@ void __ata_qc_complete(struct ata_queued
+ struct ata_port *ap;
+ struct ata_link *link;
+
+- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
++ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
+ WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
+ ap = qc->ap;
+ link = qc->dev->link;
+@@ -5866,7 +5866,7 @@ static void ata_host_stop(struct device
* LOCKING:
* None.
*/
{
static DEFINE_SPINLOCK(lock);
const struct ata_port_operations *cur;
-@@ -5881,6 +5881,7 @@ static void ata_finalize_port_ops(struct
+@@ -5878,6 +5878,7 @@ static void ata_finalize_port_ops(struct
return;
spin_lock(&lock);
for (cur = ops->inherits; cur; cur = cur->inherits) {
void **inherit = (void **)cur;
-@@ -5894,8 +5895,9 @@ static void ata_finalize_port_ops(struct
+@@ -5891,8 +5892,9 @@ static void ata_finalize_port_ops(struct
if (IS_ERR(*pp))
*pp = NULL;
spin_unlock(&lock);
}
-@@ -5992,7 +5994,7 @@ int ata_host_start(struct ata_host *host
+@@ -5989,7 +5991,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);
host->dev = dev;
-@@ -6642,7 +6644,7 @@ static void ata_dummy_error_handler(stru
+@@ -6630,7 +6632,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.35.4/drivers/ata/libata-eh.c linux-2.6.35.4/drivers/ata/libata-eh.c
---- linux-2.6.35.4/drivers/ata/libata-eh.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/libata-eh.c 2010-09-17 20:12:09.000000000 -0400
-@@ -3680,7 +3680,7 @@ void ata_do_eh(struct ata_port *ap, ata_
+diff -urNp linux-2.6.36/drivers/ata/libata-eh.c linux-2.6.36/drivers/ata/libata-eh.c
+--- linux-2.6.36/drivers/ata/libata-eh.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/libata-eh.c 2010-11-06 18:58:15.000000000 -0400
+@@ -3685,7 +3685,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.35.4/drivers/ata/libata-pmp.c linux-2.6.35.4/drivers/ata/libata-pmp.c
---- linux-2.6.35.4/drivers/ata/libata-pmp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/libata-pmp.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/libata-pmp.c linux-2.6.36/drivers/ata/libata-pmp.c
+--- linux-2.6.36/drivers/ata/libata-pmp.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/libata-pmp.c 2010-11-06 18:58:15.000000000 -0400
@@ -868,7 +868,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.35.4/drivers/ata/pata_acpi.c linux-2.6.35.4/drivers/ata/pata_acpi.c
---- linux-2.6.35.4/drivers/ata/pata_acpi.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_acpi.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_acpi.c linux-2.6.36/drivers/ata/pata_acpi.c
+--- linux-2.6.36/drivers/ata/pata_acpi.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_acpi.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_ali.c linux-2.6.35.4/drivers/ata/pata_ali.c
---- linux-2.6.35.4/drivers/ata/pata_ali.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_ali.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_ali.c linux-2.6.36/drivers/ata/pata_ali.c
+--- linux-2.6.36/drivers/ata/pata_ali.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_ali.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_amd.c linux-2.6.35.4/drivers/ata/pata_amd.c
---- linux-2.6.35.4/drivers/ata/pata_amd.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_amd.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_amd.c linux-2.6.36/drivers/ata/pata_amd.c
+--- linux-2.6.36/drivers/ata/pata_amd.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_amd.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_artop.c linux-2.6.35.4/drivers/ata/pata_artop.c
---- linux-2.6.35.4/drivers/ata/pata_artop.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_artop.c 2010-09-17 20:12:09.000000000 -0400
-@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
+diff -urNp linux-2.6.36/drivers/ata/pata_artop.c linux-2.6.36/drivers/ata/pata_artop.c
+--- linux-2.6.36/drivers/ata/pata_artop.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_artop.c 2010-11-06 18:58:15.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 = ata_cable_40wire,
.set_piomode = artop6210_set_piomode,
-@@ -320,7 +320,7 @@ static struct ata_port_operations artop6
+@@ -321,7 +321,7 @@ static struct ata_port_operations artop6
.qc_defer = artop6210_qc_defer,
};
.inherits = &ata_bmdma_port_ops,
.cable_detect = artop6260_cable_detect,
.set_piomode = artop6260_set_piomode,
-diff -urNp linux-2.6.35.4/drivers/ata/pata_at32.c linux-2.6.35.4/drivers/ata/pata_at32.c
---- linux-2.6.35.4/drivers/ata/pata_at32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_at32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_at32.c linux-2.6.36/drivers/ata/pata_at32.c
+--- linux-2.6.36/drivers/ata/pata_at32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_at32.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_at91.c linux-2.6.35.4/drivers/ata/pata_at91.c
---- linux-2.6.35.4/drivers/ata/pata_at91.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_at91.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_at91.c linux-2.6.36/drivers/ata/pata_at91.c
+--- linux-2.6.36/drivers/ata/pata_at91.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_at91.c 2010-11-06 18:58:15.000000000 -0400
@@ -196,7 +196,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.35.4/drivers/ata/pata_atiixp.c linux-2.6.35.4/drivers/ata/pata_atiixp.c
---- linux-2.6.35.4/drivers/ata/pata_atiixp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_atiixp.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_atiixp.c linux-2.6.36/drivers/ata/pata_atiixp.c
+--- linux-2.6.36/drivers/ata/pata_atiixp.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_atiixp.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_atp867x.c linux-2.6.35.4/drivers/ata/pata_atp867x.c
---- linux-2.6.35.4/drivers/ata/pata_atp867x.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_atp867x.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_atp867x.c linux-2.6.36/drivers/ata/pata_atp867x.c
+--- linux-2.6.36/drivers/ata/pata_atp867x.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_atp867x.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_bf54x.c linux-2.6.35.4/drivers/ata/pata_bf54x.c
---- linux-2.6.35.4/drivers/ata/pata_bf54x.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_bf54x.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_bf54x.c linux-2.6.36/drivers/ata/pata_bf54x.c
+--- linux-2.6.36/drivers/ata/pata_bf54x.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_bf54x.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_cmd640.c linux-2.6.35.4/drivers/ata/pata_cmd640.c
---- linux-2.6.35.4/drivers/ata/pata_cmd640.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_cmd640.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_cmd640.c linux-2.6.36/drivers/ata/pata_cmd640.c
+--- linux-2.6.36/drivers/ata/pata_cmd640.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_cmd640.c 2010-11-06 18:58:15.000000000 -0400
@@ -165,7 +165,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.35.4/drivers/ata/pata_cmd64x.c linux-2.6.35.4/drivers/ata/pata_cmd64x.c
---- linux-2.6.35.4/drivers/ata/pata_cmd64x.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_cmd64x.c 2010-09-17 20:12:09.000000000 -0400
-@@ -274,18 +274,18 @@ static const struct ata_port_operations
+diff -urNp linux-2.6.36/drivers/ata/pata_cmd64x.c linux-2.6.36/drivers/ata/pata_cmd64x.c
+--- linux-2.6.36/drivers/ata/pata_cmd64x.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_cmd64x.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_cs5520.c linux-2.6.35.4/drivers/ata/pata_cs5520.c
---- linux-2.6.35.4/drivers/ata/pata_cs5520.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_cs5520.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_cs5520.c linux-2.6.36/drivers/ata/pata_cs5520.c
+--- linux-2.6.36/drivers/ata/pata_cs5520.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_cs5520.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_cs5530.c linux-2.6.35.4/drivers/ata/pata_cs5530.c
---- linux-2.6.35.4/drivers/ata/pata_cs5530.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_cs5530.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_cs5530.c linux-2.6.36/drivers/ata/pata_cs5530.c
+--- linux-2.6.36/drivers/ata/pata_cs5530.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_cs5530.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_cs5535.c linux-2.6.35.4/drivers/ata/pata_cs5535.c
---- linux-2.6.35.4/drivers/ata/pata_cs5535.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_cs5535.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_cs5535.c linux-2.6.36/drivers/ata/pata_cs5535.c
+--- linux-2.6.36/drivers/ata/pata_cs5535.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_cs5535.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_cs5536.c linux-2.6.35.4/drivers/ata/pata_cs5536.c
---- linux-2.6.35.4/drivers/ata/pata_cs5536.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_cs5536.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_cs5536.c linux-2.6.36/drivers/ata/pata_cs5536.c
+--- linux-2.6.36/drivers/ata/pata_cs5536.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_cs5536.c 2010-11-06 18:58:15.000000000 -0400
@@ -223,7 +223,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.35.4/drivers/ata/pata_cypress.c linux-2.6.35.4/drivers/ata/pata_cypress.c
---- linux-2.6.35.4/drivers/ata/pata_cypress.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_cypress.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_cypress.c linux-2.6.36/drivers/ata/pata_cypress.c
+--- linux-2.6.36/drivers/ata/pata_cypress.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_cypress.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_efar.c linux-2.6.35.4/drivers/ata/pata_efar.c
---- linux-2.6.35.4/drivers/ata/pata_efar.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_efar.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_efar.c linux-2.6.36/drivers/ata/pata_efar.c
+--- linux-2.6.36/drivers/ata/pata_efar.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_efar.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_hpt366.c linux-2.6.35.4/drivers/ata/pata_hpt366.c
---- linux-2.6.35.4/drivers/ata/pata_hpt366.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_hpt366.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_hpt366.c linux-2.6.36/drivers/ata/pata_hpt366.c
+--- linux-2.6.36/drivers/ata/pata_hpt366.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_hpt366.c 2010-11-06 18:58:15.000000000 -0400
@@ -269,7 +269,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.35.4/drivers/ata/pata_hpt37x.c linux-2.6.35.4/drivers/ata/pata_hpt37x.c
---- linux-2.6.35.4/drivers/ata/pata_hpt37x.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_hpt37x.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_hpt37x.c linux-2.6.36/drivers/ata/pata_hpt37x.c
+--- linux-2.6.36/drivers/ata/pata_hpt37x.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_hpt37x.c 2010-11-06 18:58:15.000000000 -0400
@@ -564,7 +564,7 @@ static struct scsi_host_template hpt37x_
* Configuration for HPT370
*/
.inherits = &hpt372_port_ops,
.cable_detect = hpt374_fn1_cable_detect,
.prereset = hpt37x_pre_reset,
-diff -urNp linux-2.6.35.4/drivers/ata/pata_hpt3x2n.c linux-2.6.35.4/drivers/ata/pata_hpt3x2n.c
---- linux-2.6.35.4/drivers/ata/pata_hpt3x2n.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_hpt3x2n.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_hpt3x2n.c linux-2.6.36/drivers/ata/pata_hpt3x2n.c
+--- linux-2.6.36/drivers/ata/pata_hpt3x2n.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_hpt3x2n.c 2010-11-06 18:58:15.000000000 -0400
@@ -331,7 +331,7 @@ static struct scsi_host_template hpt3x2n
* Configuration for HPT3x2n.
*/
.inherits = &ata_bmdma_port_ops,
.bmdma_stop = hpt3x2n_bmdma_stop,
-diff -urNp linux-2.6.35.4/drivers/ata/pata_hpt3x3.c linux-2.6.35.4/drivers/ata/pata_hpt3x3.c
---- linux-2.6.35.4/drivers/ata/pata_hpt3x3.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_hpt3x3.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_hpt3x3.c linux-2.6.36/drivers/ata/pata_hpt3x3.c
+--- linux-2.6.36/drivers/ata/pata_hpt3x3.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_hpt3x3.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_icside.c linux-2.6.35.4/drivers/ata/pata_icside.c
---- linux-2.6.35.4/drivers/ata/pata_icside.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_icside.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_icside.c linux-2.6.36/drivers/ata/pata_icside.c
+--- linux-2.6.36/drivers/ata/pata_icside.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_icside.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_isapnp.c linux-2.6.35.4/drivers/ata/pata_isapnp.c
---- linux-2.6.35.4/drivers/ata/pata_isapnp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_isapnp.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_isapnp.c linux-2.6.36/drivers/ata/pata_isapnp.c
+--- linux-2.6.36/drivers/ata/pata_isapnp.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_isapnp.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_it8213.c linux-2.6.35.4/drivers/ata/pata_it8213.c
---- linux-2.6.35.4/drivers/ata/pata_it8213.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_it8213.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_it8213.c linux-2.6.36/drivers/ata/pata_it8213.c
+--- linux-2.6.36/drivers/ata/pata_it8213.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_it8213.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_it821x.c linux-2.6.35.4/drivers/ata/pata_it821x.c
---- linux-2.6.35.4/drivers/ata/pata_it821x.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_it821x.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_it821x.c linux-2.6.36/drivers/ata/pata_it821x.c
+--- linux-2.6.36/drivers/ata/pata_it821x.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_it821x.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_ixp4xx_cf.c linux-2.6.35.4/drivers/ata/pata_ixp4xx_cf.c
---- linux-2.6.35.4/drivers/ata/pata_ixp4xx_cf.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_ixp4xx_cf.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_ixp4xx_cf.c linux-2.6.36/drivers/ata/pata_ixp4xx_cf.c
+--- linux-2.6.36/drivers/ata/pata_ixp4xx_cf.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_ixp4xx_cf.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_jmicron.c linux-2.6.35.4/drivers/ata/pata_jmicron.c
---- linux-2.6.35.4/drivers/ata/pata_jmicron.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_jmicron.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_jmicron.c linux-2.6.36/drivers/ata/pata_jmicron.c
+--- linux-2.6.36/drivers/ata/pata_jmicron.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_jmicron.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_legacy.c linux-2.6.35.4/drivers/ata/pata_legacy.c
---- linux-2.6.35.4/drivers/ata/pata_legacy.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_legacy.c 2010-09-17 20:12:09.000000000 -0400
-@@ -113,7 +113,7 @@ struct legacy_probe {
+diff -urNp linux-2.6.36/drivers/ata/pata_legacy.c linux-2.6.36/drivers/ata/pata_legacy.c
+--- linux-2.6.36/drivers/ata/pata_legacy.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_legacy.c 2010-11-06 18:58:15.000000000 -0400
+@@ -116,7 +116,7 @@ struct legacy_probe {
struct legacy_controller {
const char *name;
unsigned int pio_mask;
unsigned int flags;
unsigned int pflags;
-@@ -230,12 +230,12 @@ static const struct ata_port_operations
+@@ -239,12 +239,12 @@ static const struct ata_port_operations
* pio_mask as well.
*/
.inherits = &legacy_base_port_ops,
.sff_data_xfer = ata_sff_data_xfer_noirq,
.set_mode = legacy_set_mode,
-@@ -331,7 +331,7 @@ static unsigned int pdc_data_xfer_vlb(st
+@@ -340,7 +340,7 @@ static unsigned int pdc_data_xfer_vlb(st
return buflen;
}
.inherits = &legacy_base_port_ops,
.set_piomode = pdc20230_set_piomode,
.sff_data_xfer = pdc_data_xfer_vlb,
-@@ -364,7 +364,7 @@ static void ht6560a_set_piomode(struct a
+@@ -373,7 +373,7 @@ static void ht6560a_set_piomode(struct a
ioread8(ap->ioaddr.status_addr);
}
.inherits = &legacy_base_port_ops,
.set_piomode = ht6560a_set_piomode,
};
-@@ -407,7 +407,7 @@ static void ht6560b_set_piomode(struct a
+@@ -416,7 +416,7 @@ static void ht6560b_set_piomode(struct a
ioread8(ap->ioaddr.status_addr);
}
.inherits = &legacy_base_port_ops,
.set_piomode = ht6560b_set_piomode,
};
-@@ -506,7 +506,7 @@ static void opti82c611a_set_piomode(stru
+@@ -515,7 +515,7 @@ static void opti82c611a_set_piomode(stru
}
.inherits = &legacy_base_port_ops,
.set_piomode = opti82c611a_set_piomode,
};
-@@ -616,7 +616,7 @@ static unsigned int opti82c46x_qc_issue(
+@@ -625,7 +625,7 @@ static unsigned int opti82c46x_qc_issue(
return ata_sff_qc_issue(qc);
}
.inherits = &legacy_base_port_ops,
.set_piomode = opti82c46x_set_piomode,
.qc_issue = opti82c46x_qc_issue,
-@@ -778,20 +778,20 @@ static int qdi_port(struct platform_devi
+@@ -787,20 +787,20 @@ static int qdi_port(struct platform_devi
return 0;
}
.inherits = &legacy_base_port_ops,
.set_piomode = qdi6580dp_set_piomode,
.qc_issue = qdi_qc_issue,
-@@ -863,7 +863,7 @@ static int winbond_port(struct platform_
+@@ -872,7 +872,7 @@ static int winbond_port(struct platform_
return 0;
}
.inherits = &legacy_base_port_ops,
.set_piomode = winbond_set_piomode,
.sff_data_xfer = vlb32_data_xfer,
-@@ -986,7 +986,7 @@ static __init int legacy_init_one(struct
+@@ -995,7 +995,7 @@ static __init int legacy_init_one(struct
int pio_modes = controller->pio_mask;
unsigned long io = probe->port;
u32 mask = (1 << probe->slot);
struct legacy_data *ld = &legacy_data[probe->slot];
struct ata_host *host = NULL;
struct ata_port *ap;
-diff -urNp linux-2.6.35.4/drivers/ata/pata_macio.c linux-2.6.35.4/drivers/ata/pata_macio.c
---- linux-2.6.35.4/drivers/ata/pata_macio.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_macio.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_macio.c linux-2.6.36/drivers/ata/pata_macio.c
+--- linux-2.6.36/drivers/ata/pata_macio.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_macio.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_marvell.c linux-2.6.35.4/drivers/ata/pata_marvell.c
---- linux-2.6.35.4/drivers/ata/pata_marvell.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_marvell.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_marvell.c linux-2.6.36/drivers/ata/pata_marvell.c
+--- linux-2.6.36/drivers/ata/pata_marvell.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_marvell.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_mpc52xx.c linux-2.6.35.4/drivers/ata/pata_mpc52xx.c
---- linux-2.6.35.4/drivers/ata/pata_mpc52xx.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_mpc52xx.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_mpc52xx.c linux-2.6.36/drivers/ata/pata_mpc52xx.c
+--- linux-2.6.36/drivers/ata/pata_mpc52xx.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_mpc52xx.c 2010-11-06 18:58:15.000000000 -0400
@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
ATA_PIO_SHT(DRV_NAME),
};
.inherits = &ata_sff_port_ops,
.sff_dev_select = mpc52xx_ata_dev_select,
.set_piomode = mpc52xx_ata_set_piomode,
-diff -urNp linux-2.6.35.4/drivers/ata/pata_mpiix.c linux-2.6.35.4/drivers/ata/pata_mpiix.c
---- linux-2.6.35.4/drivers/ata/pata_mpiix.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_mpiix.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_mpiix.c linux-2.6.36/drivers/ata/pata_mpiix.c
+--- linux-2.6.36/drivers/ata/pata_mpiix.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_mpiix.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_netcell.c linux-2.6.35.4/drivers/ata/pata_netcell.c
---- linux-2.6.35.4/drivers/ata/pata_netcell.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_netcell.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_netcell.c linux-2.6.36/drivers/ata/pata_netcell.c
+--- linux-2.6.36/drivers/ata/pata_netcell.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_netcell.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_ninja32.c linux-2.6.35.4/drivers/ata/pata_ninja32.c
---- linux-2.6.35.4/drivers/ata/pata_ninja32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_ninja32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_ninja32.c linux-2.6.36/drivers/ata/pata_ninja32.c
+--- linux-2.6.36/drivers/ata/pata_ninja32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_ninja32.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_ns87410.c linux-2.6.35.4/drivers/ata/pata_ns87410.c
---- linux-2.6.35.4/drivers/ata/pata_ns87410.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_ns87410.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_ns87410.c linux-2.6.36/drivers/ata/pata_ns87410.c
+--- linux-2.6.36/drivers/ata/pata_ns87410.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_ns87410.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_ns87415.c linux-2.6.35.4/drivers/ata/pata_ns87415.c
---- linux-2.6.35.4/drivers/ata/pata_ns87415.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_ns87415.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_ns87415.c linux-2.6.36/drivers/ata/pata_ns87415.c
+--- linux-2.6.36/drivers/ata/pata_ns87415.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_ns87415.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_octeon_cf.c linux-2.6.35.4/drivers/ata/pata_octeon_cf.c
---- linux-2.6.35.4/drivers/ata/pata_octeon_cf.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_octeon_cf.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_octeon_cf.c linux-2.6.36/drivers/ata/pata_octeon_cf.c
+--- linux-2.6.36/drivers/ata/pata_octeon_cf.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_octeon_cf.c 2010-11-06 18:58:15.000000000 -0400
@@ -782,6 +782,7 @@ static unsigned int octeon_cf_qc_issue(s
return 0;
}
static struct ata_port_operations octeon_cf_ops = {
.inherits = &ata_sff_port_ops,
.check_atapi_dma = octeon_cf_check_atapi_dma,
-diff -urNp linux-2.6.35.4/drivers/ata/pata_oldpiix.c linux-2.6.35.4/drivers/ata/pata_oldpiix.c
---- linux-2.6.35.4/drivers/ata/pata_oldpiix.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_oldpiix.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_oldpiix.c linux-2.6.36/drivers/ata/pata_oldpiix.c
+--- linux-2.6.36/drivers/ata/pata_oldpiix.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_oldpiix.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_opti.c linux-2.6.35.4/drivers/ata/pata_opti.c
---- linux-2.6.35.4/drivers/ata/pata_opti.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_opti.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_opti.c linux-2.6.36/drivers/ata/pata_opti.c
+--- linux-2.6.36/drivers/ata/pata_opti.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_opti.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_optidma.c linux-2.6.35.4/drivers/ata/pata_optidma.c
---- linux-2.6.35.4/drivers/ata/pata_optidma.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_optidma.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_optidma.c linux-2.6.36/drivers/ata/pata_optidma.c
+--- linux-2.6.36/drivers/ata/pata_optidma.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_optidma.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_palmld.c linux-2.6.35.4/drivers/ata/pata_palmld.c
---- linux-2.6.35.4/drivers/ata/pata_palmld.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_palmld.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_palmld.c linux-2.6.36/drivers/ata/pata_palmld.c
+--- linux-2.6.36/drivers/ata/pata_palmld.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_palmld.c 2010-11-06 18:58:15.000000000 -0400
@@ -37,7 +37,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.35.4/drivers/ata/pata_pcmcia.c linux-2.6.35.4/drivers/ata/pata_pcmcia.c
---- linux-2.6.35.4/drivers/ata/pata_pcmcia.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_pcmcia.c 2010-09-17 20:12:09.000000000 -0400
-@@ -153,14 +153,14 @@ static struct scsi_host_template pcmcia_
+diff -urNp linux-2.6.36/drivers/ata/pata_pcmcia.c linux-2.6.36/drivers/ata/pata_pcmcia.c
+--- linux-2.6.36/drivers/ata/pata_pcmcia.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_pcmcia.c 2010-11-06 18:58:15.000000000 -0400
+@@ -152,14 +152,14 @@ static struct scsi_host_template pcmcia_
ATA_PIO_SHT(DRV_NAME),
};
.inherits = &ata_sff_port_ops,
.sff_data_xfer = ata_data_xfer_8bit,
.cable_detect = ata_cable_40wire,
-@@ -243,7 +243,7 @@ static int pcmcia_init_one(struct pcmcia
+@@ -244,7 +244,7 @@ static int pcmcia_init_one(struct pcmcia
unsigned long io_base, ctl_base;
void __iomem *io_addr, *ctl_addr;
int n_ports = 1;
+ const struct ata_port_operations *ops = &pcmcia_port_ops;
/* Set up attributes in order to probe card and get resources */
- pdev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-diff -urNp linux-2.6.35.4/drivers/ata/pata_pdc2027x.c linux-2.6.35.4/drivers/ata/pata_pdc2027x.c
---- linux-2.6.35.4/drivers/ata/pata_pdc2027x.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_pdc2027x.c 2010-09-17 20:12:09.000000000 -0400
+ pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
+diff -urNp linux-2.6.36/drivers/ata/pata_pdc2027x.c linux-2.6.36/drivers/ata/pata_pdc2027x.c
+--- linux-2.6.36/drivers/ata/pata_pdc2027x.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_pdc2027x.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_pdc202xx_old.c linux-2.6.35.4/drivers/ata/pata_pdc202xx_old.c
---- linux-2.6.35.4/drivers/ata/pata_pdc202xx_old.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_pdc202xx_old.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_pdc202xx_old.c linux-2.6.36/drivers/ata/pata_pdc202xx_old.c
+--- linux-2.6.36/drivers/ata/pata_pdc202xx_old.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_pdc202xx_old.c 2010-11-06 18:58:15.000000000 -0400
@@ -274,7 +274,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.35.4/drivers/ata/pata_piccolo.c linux-2.6.35.4/drivers/ata/pata_piccolo.c
---- linux-2.6.35.4/drivers/ata/pata_piccolo.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_piccolo.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_piccolo.c linux-2.6.36/drivers/ata/pata_piccolo.c
+--- linux-2.6.36/drivers/ata/pata_piccolo.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_piccolo.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_platform.c linux-2.6.35.4/drivers/ata/pata_platform.c
---- linux-2.6.35.4/drivers/ata/pata_platform.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_platform.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_platform.c linux-2.6.36/drivers/ata/pata_platform.c
+--- linux-2.6.36/drivers/ata/pata_platform.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_platform.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_qdi.c linux-2.6.35.4/drivers/ata/pata_qdi.c
---- linux-2.6.35.4/drivers/ata/pata_qdi.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_qdi.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_pxa.c linux-2.6.36/drivers/ata/pata_pxa.c
+--- linux-2.6.36/drivers/ata/pata_pxa.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_pxa.c 2010-11-06 18:58:15.000000000 -0400
+@@ -198,7 +198,7 @@ static struct scsi_host_template pxa_ata
+ ATA_BMDMA_SHT(DRV_NAME),
+ };
+
+-static struct ata_port_operations pxa_ata_port_ops = {
++static const struct ata_port_operations pxa_ata_port_ops = {
+ .inherits = &ata_bmdma_port_ops,
+ .cable_detect = ata_cable_40wire,
+
+diff -urNp linux-2.6.36/drivers/ata/pata_qdi.c linux-2.6.36/drivers/ata/pata_qdi.c
+--- linux-2.6.36/drivers/ata/pata_qdi.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_qdi.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_radisys.c linux-2.6.35.4/drivers/ata/pata_radisys.c
---- linux-2.6.35.4/drivers/ata/pata_radisys.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_radisys.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_radisys.c linux-2.6.36/drivers/ata/pata_radisys.c
+--- linux-2.6.36/drivers/ata/pata_radisys.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_radisys.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_rb532_cf.c linux-2.6.35.4/drivers/ata/pata_rb532_cf.c
---- linux-2.6.35.4/drivers/ata/pata_rb532_cf.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_rb532_cf.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_rb532_cf.c linux-2.6.36/drivers/ata/pata_rb532_cf.c
+--- linux-2.6.36/drivers/ata/pata_rb532_cf.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_rb532_cf.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_rdc.c linux-2.6.35.4/drivers/ata/pata_rdc.c
---- linux-2.6.35.4/drivers/ata/pata_rdc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_rdc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_rdc.c linux-2.6.36/drivers/ata/pata_rdc.c
+--- linux-2.6.36/drivers/ata/pata_rdc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_rdc.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_rz1000.c linux-2.6.35.4/drivers/ata/pata_rz1000.c
---- linux-2.6.35.4/drivers/ata/pata_rz1000.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_rz1000.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_rz1000.c linux-2.6.36/drivers/ata/pata_rz1000.c
+--- linux-2.6.36/drivers/ata/pata_rz1000.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_rz1000.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_sc1200.c linux-2.6.35.4/drivers/ata/pata_sc1200.c
---- linux-2.6.35.4/drivers/ata/pata_sc1200.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_sc1200.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_samsung_cf.c linux-2.6.36/drivers/ata/pata_samsung_cf.c
+--- linux-2.6.36/drivers/ata/pata_samsung_cf.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_samsung_cf.c 2010-11-06 18:58:15.000000000 -0400
+@@ -399,7 +399,7 @@ static struct scsi_host_template pata_s3
+ ATA_PIO_SHT(DRV_NAME),
+ };
+
+-static struct ata_port_operations pata_s3c_port_ops = {
++static const struct ata_port_operations pata_s3c_port_ops = {
+ .inherits = &ata_sff_port_ops,
+ .sff_check_status = pata_s3c_check_status,
+ .sff_check_altstatus = pata_s3c_check_altstatus,
+@@ -413,7 +413,7 @@ static struct ata_port_operations pata_s
+ .set_piomode = pata_s3c_set_piomode,
+ };
+
+-static struct ata_port_operations pata_s5p_port_ops = {
++static const struct ata_port_operations pata_s5p_port_ops = {
+ .inherits = &ata_sff_port_ops,
+ .set_piomode = pata_s3c_set_piomode,
+ };
+diff -urNp linux-2.6.36/drivers/ata/pata_sc1200.c linux-2.6.36/drivers/ata/pata_sc1200.c
+--- linux-2.6.36/drivers/ata/pata_sc1200.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_sc1200.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_scc.c linux-2.6.35.4/drivers/ata/pata_scc.c
---- linux-2.6.35.4/drivers/ata/pata_scc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_scc.c 2010-09-17 20:12:09.000000000 -0400
-@@ -927,7 +927,7 @@ static struct scsi_host_template scc_sht
+diff -urNp linux-2.6.36/drivers/ata/pata_scc.c linux-2.6.36/drivers/ata/pata_scc.c
+--- linux-2.6.36/drivers/ata/pata_scc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_scc.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_sch.c linux-2.6.35.4/drivers/ata/pata_sch.c
---- linux-2.6.35.4/drivers/ata/pata_sch.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_sch.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_sch.c linux-2.6.36/drivers/ata/pata_sch.c
+--- linux-2.6.36/drivers/ata/pata_sch.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_sch.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_serverworks.c linux-2.6.35.4/drivers/ata/pata_serverworks.c
---- linux-2.6.35.4/drivers/ata/pata_serverworks.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_serverworks.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_serverworks.c linux-2.6.36/drivers/ata/pata_serverworks.c
+--- linux-2.6.36/drivers/ata/pata_serverworks.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_serverworks.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_sil680.c linux-2.6.35.4/drivers/ata/pata_sil680.c
---- linux-2.6.35.4/drivers/ata/pata_sil680.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_sil680.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_sil680.c linux-2.6.36/drivers/ata/pata_sil680.c
+--- linux-2.6.36/drivers/ata/pata_sil680.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_sil680.c 2010-11-06 18:58:15.000000000 -0400
@@ -214,8 +214,7 @@ static struct scsi_host_template sil680_
ATA_BMDMA_SHT(DRV_NAME),
};
.inherits = &ata_bmdma32_port_ops,
.sff_exec_command = sil680_sff_exec_command,
.cable_detect = sil680_cable_detect,
-diff -urNp linux-2.6.35.4/drivers/ata/pata_sis.c linux-2.6.35.4/drivers/ata/pata_sis.c
---- linux-2.6.35.4/drivers/ata/pata_sis.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_sis.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_sis.c linux-2.6.36/drivers/ata/pata_sis.c
+--- linux-2.6.36/drivers/ata/pata_sis.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_sis.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_sl82c105.c linux-2.6.35.4/drivers/ata/pata_sl82c105.c
---- linux-2.6.35.4/drivers/ata/pata_sl82c105.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_sl82c105.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_sl82c105.c linux-2.6.36/drivers/ata/pata_sl82c105.c
+--- linux-2.6.36/drivers/ata/pata_sl82c105.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_sl82c105.c 2010-11-06 18:58:15.000000000 -0400
@@ -231,7 +231,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.35.4/drivers/ata/pata_triflex.c linux-2.6.35.4/drivers/ata/pata_triflex.c
---- linux-2.6.35.4/drivers/ata/pata_triflex.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_triflex.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pata_triflex.c linux-2.6.36/drivers/ata/pata_triflex.c
+--- linux-2.6.36/drivers/ata/pata_triflex.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_triflex.c 2010-11-06 18:58:15.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.35.4/drivers/ata/pata_via.c linux-2.6.35.4/drivers/ata/pata_via.c
---- linux-2.6.35.4/drivers/ata/pata_via.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_via.c 2010-09-17 20:12:09.000000000 -0400
-@@ -439,7 +439,7 @@ static struct scsi_host_template via_sht
+diff -urNp linux-2.6.36/drivers/ata/pata_via.c linux-2.6.36/drivers/ata/pata_via.c
+--- linux-2.6.36/drivers/ata/pata_via.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pata_via.c 2010-11-06 18:58:15.000000000 -0400
+@@ -441,7 +441,7 @@ static struct scsi_host_template via_sht
ATA_BMDMA_SHT(DRV_NAME),
};
.inherits = &ata_bmdma_port_ops,
.cable_detect = via_cable_detect,
.set_piomode = via_set_piomode,
-@@ -450,7 +450,7 @@ static struct ata_port_operations via_po
+@@ -452,7 +452,7 @@ static struct ata_port_operations via_po
.mode_filter = via_mode_filter,
};
.inherits = &via_port_ops,
.sff_data_xfer = ata_sff_data_xfer_noirq,
};
-diff -urNp linux-2.6.35.4/drivers/ata/pata_winbond.c linux-2.6.35.4/drivers/ata/pata_winbond.c
---- linux-2.6.35.4/drivers/ata/pata_winbond.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pata_winbond.c 2010-09-17 20:12:09.000000000 -0400
-@@ -125,7 +125,7 @@ static struct scsi_host_template winbond
- ATA_PIO_SHT(DRV_NAME),
- };
-
--static struct ata_port_operations winbond_port_ops = {
-+static const struct ata_port_operations winbond_port_ops = {
- .inherits = &ata_sff_port_ops,
- .sff_data_xfer = winbond_data_xfer,
- .cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.35.4/drivers/ata/pdc_adma.c linux-2.6.35.4/drivers/ata/pdc_adma.c
---- linux-2.6.35.4/drivers/ata/pdc_adma.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/pdc_adma.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/pdc_adma.c linux-2.6.36/drivers/ata/pdc_adma.c
+--- linux-2.6.36/drivers/ata/pdc_adma.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/pdc_adma.c 2010-11-06 18:58:15.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.35.4/drivers/ata/sata_fsl.c linux-2.6.35.4/drivers/ata/sata_fsl.c
---- linux-2.6.35.4/drivers/ata/sata_fsl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/sata_fsl.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/sata_dwc_460ex.c linux-2.6.36/drivers/ata/sata_dwc_460ex.c
+--- linux-2.6.36/drivers/ata/sata_dwc_460ex.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/sata_dwc_460ex.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1560,7 +1560,7 @@ static struct scsi_host_template sata_dw
+ .dma_boundary = ATA_DMA_BOUNDARY,
+ };
+
+-static struct ata_port_operations sata_dwc_ops = {
++static const struct ata_port_operations sata_dwc_ops = {
+ .inherits = &ata_sff_port_ops,
+
+ .error_handler = sata_dwc_error_handler,
+diff -urNp linux-2.6.36/drivers/ata/sata_fsl.c linux-2.6.36/drivers/ata/sata_fsl.c
+--- linux-2.6.36/drivers/ata/sata_fsl.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/sata_fsl.c 2010-11-06 18:58:15.000000000 -0400
@@ -1261,7 +1261,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.35.4/drivers/ata/sata_inic162x.c linux-2.6.35.4/drivers/ata/sata_inic162x.c
---- linux-2.6.35.4/drivers/ata/sata_inic162x.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/sata_inic162x.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/sata_inic162x.c linux-2.6.36/drivers/ata/sata_inic162x.c
+--- linux-2.6.36/drivers/ata/sata_inic162x.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/sata_inic162x.c 2010-11-06 18:58:15.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.35.4/drivers/ata/sata_mv.c linux-2.6.35.4/drivers/ata/sata_mv.c
---- linux-2.6.35.4/drivers/ata/sata_mv.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/sata_mv.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/sata_mv.c linux-2.6.36/drivers/ata/sata_mv.c
+--- linux-2.6.36/drivers/ata/sata_mv.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/sata_mv.c 2010-11-06 18:58:15.000000000 -0400
@@ -663,7 +663,7 @@ static struct scsi_host_template mv6_sht
.dma_boundary = MV_DMA_BOUNDARY,
};
.inherits = &mv6_ops,
.dev_config = ATA_OP_NULL,
.qc_prep = mv_qc_prep_iie,
-diff -urNp linux-2.6.35.4/drivers/ata/sata_nv.c linux-2.6.35.4/drivers/ata/sata_nv.c
---- linux-2.6.35.4/drivers/ata/sata_nv.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/sata_nv.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/sata_nv.c linux-2.6.36/drivers/ata/sata_nv.c
+--- linux-2.6.36/drivers/ata/sata_nv.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/sata_nv.c 2010-11-06 18:58:15.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.35.4/drivers/ata/sata_promise.c linux-2.6.35.4/drivers/ata/sata_promise.c
---- linux-2.6.35.4/drivers/ata/sata_promise.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/sata_promise.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/sata_promise.c linux-2.6.36/drivers/ata/sata_promise.c
+--- linux-2.6.36/drivers/ata/sata_promise.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/sata_promise.c 2010-11-06 18:58:15.000000000 -0400
@@ -196,7 +196,7 @@ static const struct ata_port_operations
.error_handler = pdc_error_handler,
};
.inherits = &pdc_common_ops,
.cable_detect = pdc_pata_cable_detect,
.freeze = pdc_freeze,
-diff -urNp linux-2.6.35.4/drivers/ata/sata_qstor.c linux-2.6.35.4/drivers/ata/sata_qstor.c
---- linux-2.6.35.4/drivers/ata/sata_qstor.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/sata_qstor.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/sata_qstor.c linux-2.6.36/drivers/ata/sata_qstor.c
+--- linux-2.6.36/drivers/ata/sata_qstor.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/sata_qstor.c 2010-11-06 18:58:15.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.35.4/drivers/ata/sata_sil24.c linux-2.6.35.4/drivers/ata/sata_sil24.c
---- linux-2.6.35.4/drivers/ata/sata_sil24.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/sata_sil24.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/sata_sil24.c linux-2.6.36/drivers/ata/sata_sil24.c
+--- linux-2.6.36/drivers/ata/sata_sil24.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/sata_sil24.c 2010-11-06 18:58:15.000000000 -0400
@@ -389,7 +389,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.35.4/drivers/ata/sata_sil.c linux-2.6.35.4/drivers/ata/sata_sil.c
---- linux-2.6.35.4/drivers/ata/sata_sil.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/sata_sil.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/sata_sil.c linux-2.6.36/drivers/ata/sata_sil.c
+--- linux-2.6.36/drivers/ata/sata_sil.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/sata_sil.c 2010-11-06 18:58:15.000000000 -0400
@@ -182,7 +182,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.35.4/drivers/ata/sata_sis.c linux-2.6.35.4/drivers/ata/sata_sis.c
---- linux-2.6.35.4/drivers/ata/sata_sis.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/sata_sis.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/sata_sis.c linux-2.6.36/drivers/ata/sata_sis.c
+--- linux-2.6.36/drivers/ata/sata_sis.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/sata_sis.c 2010-11-06 18:58:15.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.35.4/drivers/ata/sata_svw.c linux-2.6.35.4/drivers/ata/sata_svw.c
---- linux-2.6.35.4/drivers/ata/sata_svw.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/sata_svw.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/sata_svw.c linux-2.6.36/drivers/ata/sata_svw.c
+--- linux-2.6.36/drivers/ata/sata_svw.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/sata_svw.c 2010-11-06 18:58:15.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.35.4/drivers/ata/sata_sx4.c linux-2.6.35.4/drivers/ata/sata_sx4.c
---- linux-2.6.35.4/drivers/ata/sata_sx4.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/sata_sx4.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/sata_sx4.c linux-2.6.36/drivers/ata/sata_sx4.c
+--- linux-2.6.36/drivers/ata/sata_sx4.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/sata_sx4.c 2010-11-06 18:58:15.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.35.4/drivers/ata/sata_uli.c linux-2.6.35.4/drivers/ata/sata_uli.c
---- linux-2.6.35.4/drivers/ata/sata_uli.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/sata_uli.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/sata_uli.c linux-2.6.36/drivers/ata/sata_uli.c
+--- linux-2.6.36/drivers/ata/sata_uli.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/sata_uli.c 2010-11-06 18:58:15.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.35.4/drivers/ata/sata_via.c linux-2.6.35.4/drivers/ata/sata_via.c
---- linux-2.6.35.4/drivers/ata/sata_via.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/sata_via.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/sata_via.c linux-2.6.36/drivers/ata/sata_via.c
+--- linux-2.6.36/drivers/ata/sata_via.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/sata_via.c 2010-11-06 18:58:15.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.35.4/drivers/ata/sata_vsc.c linux-2.6.35.4/drivers/ata/sata_vsc.c
---- linux-2.6.35.4/drivers/ata/sata_vsc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ata/sata_vsc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ata/sata_vsc.c linux-2.6.36/drivers/ata/sata_vsc.c
+--- linux-2.6.36/drivers/ata/sata_vsc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ata/sata_vsc.c 2010-11-06 18:58:15.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.35.4/drivers/atm/adummy.c linux-2.6.35.4/drivers/atm/adummy.c
---- linux-2.6.35.4/drivers/atm/adummy.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/atm/adummy.c 2010-09-17 20:12:09.000000000 -0400
-@@ -78,7 +78,7 @@ adummy_send(struct atm_vcc *vcc, struct
+diff -urNp linux-2.6.36/drivers/atm/adummy.c linux-2.6.36/drivers/atm/adummy.c
+--- linux-2.6.36/drivers/atm/adummy.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/atm/adummy.c 2010-11-06 18:58:15.000000000 -0400
+@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct
vcc->pop(vcc, skb);
else
dev_kfree_skb_any(skb);
return 0;
}
-diff -urNp linux-2.6.35.4/drivers/atm/ambassador.c linux-2.6.35.4/drivers/atm/ambassador.c
---- linux-2.6.35.4/drivers/atm/ambassador.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/atm/ambassador.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/atm/ambassador.c linux-2.6.36/drivers/atm/ambassador.c
+--- linux-2.6.36/drivers/atm/ambassador.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/atm/ambassador.c 2010-11-06 18:58:15.000000000 -0400
@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev,
PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
return -ENOMEM; // ?
}
-diff -urNp linux-2.6.35.4/drivers/atm/atmtcp.c linux-2.6.35.4/drivers/atm/atmtcp.c
---- linux-2.6.35.4/drivers/atm/atmtcp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/atm/atmtcp.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/atm/atmtcp.c linux-2.6.36/drivers/atm/atmtcp.c
+--- linux-2.6.36/drivers/atm/atmtcp.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/atm/atmtcp.c 2010-11-06 18:58:15.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.35.4/drivers/atm/eni.c linux-2.6.35.4/drivers/atm/eni.c
---- linux-2.6.35.4/drivers/atm/eni.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/atm/eni.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/atm/eni.c linux-2.6.36/drivers/atm/eni.c
+--- linux-2.6.36/drivers/atm/eni.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/atm/eni.c 2010-11-06 18:58:15.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.35.4/drivers/atm/firestream.c linux-2.6.35.4/drivers/atm/firestream.c
---- linux-2.6.35.4/drivers/atm/firestream.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/atm/firestream.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/atm/firestream.c linux-2.6.36/drivers/atm/firestream.c
+--- linux-2.6.36/drivers/atm/firestream.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/atm/firestream.c 2010-11-06 18:58:15.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.35.4/drivers/atm/fore200e.c linux-2.6.35.4/drivers/atm/fore200e.c
---- linux-2.6.35.4/drivers/atm/fore200e.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/atm/fore200e.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/atm/fore200e.c linux-2.6.36/drivers/atm/fore200e.c
+--- linux-2.6.36/drivers/atm/fore200e.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/atm/fore200e.c 2010-11-06 18:58:15.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.35.4/drivers/atm/he.c linux-2.6.35.4/drivers/atm/he.c
---- linux-2.6.35.4/drivers/atm/he.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/atm/he.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1770,7 +1770,7 @@ he_service_rbrq(struct he_dev *he_dev, i
+diff -urNp linux-2.6.36/drivers/atm/he.c linux-2.6.36/drivers/atm/he.c
+--- linux-2.6.36/drivers/atm/he.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/atm/he.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i
if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
goto return_host_buffers;
}
-@@ -1803,7 +1803,7 @@ he_service_rbrq(struct he_dev *he_dev, i
+@@ -1736,7 +1736,7 @@ he_service_rbrq(struct he_dev *he_dev, i
RBRQ_LEN_ERR(he_dev->rbrq_head)
? "LEN_ERR" : "",
vcc->vpi, vcc->vci);
goto return_host_buffers;
}
-@@ -1862,7 +1862,7 @@ he_service_rbrq(struct he_dev *he_dev, i
+@@ -1788,7 +1788,7 @@ he_service_rbrq(struct he_dev *he_dev, i
vcc->push(vcc, skb);
spin_lock(&he_dev->global_lock);
return_host_buffers:
++pdus_assembled;
-@@ -2207,7 +2207,7 @@ __enqueue_tpd(struct he_dev *he_dev, str
+@@ -2114,7 +2114,7 @@ __enqueue_tpd(struct he_dev *he_dev, str
tpd->vcc->pop(tpd->vcc, tpd->skb);
else
dev_kfree_skb_any(tpd->skb);
}
pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
return;
-@@ -2619,7 +2619,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
+@@ -2526,7 +2526,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
vcc->pop(vcc, skb);
else
dev_kfree_skb_any(skb);
return -EINVAL;
}
-@@ -2630,7 +2630,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
+@@ -2537,7 +2537,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
vcc->pop(vcc, skb);
else
dev_kfree_skb_any(skb);
return -EINVAL;
}
#endif
-@@ -2642,7 +2642,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
+@@ -2549,7 +2549,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
vcc->pop(vcc, skb);
else
dev_kfree_skb_any(skb);
spin_unlock_irqrestore(&he_dev->global_lock, flags);
return -ENOMEM;
}
-@@ -2684,7 +2684,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
+@@ -2591,7 +2591,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
vcc->pop(vcc, skb);
else
dev_kfree_skb_any(skb);
spin_unlock_irqrestore(&he_dev->global_lock, flags);
return -ENOMEM;
}
-@@ -2715,7 +2715,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
+@@ -2622,7 +2622,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
__enqueue_tpd(he_dev, tpd, cid);
spin_unlock_irqrestore(&he_dev->global_lock, flags);
return 0;
}
-diff -urNp linux-2.6.35.4/drivers/atm/horizon.c linux-2.6.35.4/drivers/atm/horizon.c
---- linux-2.6.35.4/drivers/atm/horizon.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/atm/horizon.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/atm/horizon.c linux-2.6.36/drivers/atm/horizon.c
+--- linux-2.6.36/drivers/atm/horizon.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/atm/horizon.c 2010-11-06 18:58:15.000000000 -0400
@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev,
{
struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
// free the skb
hrz_kfree_skb (skb);
-diff -urNp linux-2.6.35.4/drivers/atm/idt77252.c linux-2.6.35.4/drivers/atm/idt77252.c
---- linux-2.6.35.4/drivers/atm/idt77252.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/atm/idt77252.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/atm/idt77252.c linux-2.6.36/drivers/atm/idt77252.c
+--- linux-2.6.36/drivers/atm/idt77252.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/atm/idt77252.c 2010-11-06 18:58:15.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.35.4/drivers/atm/iphase.c linux-2.6.35.4/drivers/atm/iphase.c
---- linux-2.6.35.4/drivers/atm/iphase.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/atm/iphase.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/atm/iphase.c linux-2.6.36/drivers/atm/iphase.c
+--- linux-2.6.36/drivers/atm/iphase.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/atm/iphase.c 2010-11-06 18:58:15.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.35.4/drivers/atm/lanai.c linux-2.6.35.4/drivers/atm/lanai.c
---- linux-2.6.35.4/drivers/atm/lanai.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/atm/lanai.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/atm/lanai.c linux-2.6.36/drivers/atm/lanai.c
+--- linux-2.6.36/drivers/atm/lanai.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/atm/lanai.c 2010-11-06 18:58:15.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.35.4/drivers/atm/nicstar.c linux-2.6.35.4/drivers/atm/nicstar.c
---- linux-2.6.35.4/drivers/atm/nicstar.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/atm/nicstar.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1722,7 +1722,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", card->index);
-- atomic_inc(&vcc->stats->tx_err);
-+ atomic_inc_unchecked(&vcc->stats->tx_err);
- dev_kfree_skb_any(skb);
- return -EINVAL;
- }
-@@ -1730,7 +1730,7 @@ static int ns_send(struct atm_vcc *vcc,
- if (!vc->tx)
- {
- printk("nicstar%d: Trying to transmit on a non-tx VC.\n", card->index);
-- atomic_inc(&vcc->stats->tx_err);
-+ atomic_inc_unchecked(&vcc->stats->tx_err);
- dev_kfree_skb_any(skb);
- return -EINVAL;
- }
-@@ -1738,7 +1738,7 @@ static int ns_send(struct atm_vcc *vcc,
- if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0)
- {
- printk("nicstar%d: Only AAL0 and AAL5 are supported.\n", card->index);
-- atomic_inc(&vcc->stats->tx_err);
-+ atomic_inc_unchecked(&vcc->stats->tx_err);
- dev_kfree_skb_any(skb);
- return -EINVAL;
- }
-@@ -1746,7 +1746,7 @@ static int ns_send(struct atm_vcc *vcc,
- if (skb_shinfo(skb)->nr_frags != 0)
- {
- printk("nicstar%d: No scatter-gather yet.\n", card->index);
-- atomic_inc(&vcc->stats->tx_err);
-+ atomic_inc_unchecked(&vcc->stats->tx_err);
- dev_kfree_skb_any(skb);
- return -EINVAL;
- }
-@@ -1791,11 +1791,11 @@ static int ns_send(struct atm_vcc *vcc,
-
- if (push_scqe(card, vc, scq, &scqe, skb) != 0)
- {
-- atomic_inc(&vcc->stats->tx_err);
-+ atomic_inc_unchecked(&vcc->stats->tx_err);
- dev_kfree_skb_any(skb);
- return -EIO;
- }
-- atomic_inc(&vcc->stats->tx);
-+ atomic_inc_unchecked(&vcc->stats->tx);
-
- return 0;
- }
-@@ -2110,14 +2110,14 @@ static void dequeue_rx(ns_dev *card, ns_
- {
- printk("nicstar%d: Can't allocate buffers for aal0.\n",
- card->index);
-- atomic_add(i,&vcc->stats->rx_drop);
-+ atomic_add_unchecked(i,&vcc->stats->rx_drop);
- break;
- }
- if (!atm_charge(vcc, sb->truesize))
- {
- RXPRINTK("nicstar%d: atm_charge() dropped aal0 packets.\n",
- card->index);
-- atomic_add(i-1,&vcc->stats->rx_drop); /* already increased by 1 */
-+ atomic_add_unchecked(i-1,&vcc->stats->rx_drop); /* already increased by 1 */
- dev_kfree_skb_any(sb);
- break;
- }
-@@ -2132,7 +2132,7 @@ static void dequeue_rx(ns_dev *card, ns_
- ATM_SKB(sb)->vcc = vcc;
- __net_timestamp(sb);
- vcc->push(vcc, sb);
-- atomic_inc(&vcc->stats->rx);
-+ atomic_inc_unchecked(&vcc->stats->rx);
- cell += ATM_CELL_PAYLOAD;
- }
+diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
+--- linux-2.6.36/drivers/atm/nicstar.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/atm/nicstar.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1653,7 +1653,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",
+ card->index);
+- atomic_inc(&vcc->stats->tx_err);
++ atomic_inc_unchecked(&vcc->stats->tx_err);
+ dev_kfree_skb_any(skb);
+ return -EINVAL;
+ }
+@@ -1661,7 +1661,7 @@ static int ns_send(struct atm_vcc *vcc,
+ if (!vc->tx) {
+ printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
+ card->index);
+- atomic_inc(&vcc->stats->tx_err);
++ atomic_inc_unchecked(&vcc->stats->tx_err);
+ dev_kfree_skb_any(skb);
+ return -EINVAL;
+ }
+@@ -1669,14 +1669,14 @@ static int ns_send(struct atm_vcc *vcc,
+ if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
+ printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
+ card->index);
+- atomic_inc(&vcc->stats->tx_err);
++ atomic_inc_unchecked(&vcc->stats->tx_err);
+ dev_kfree_skb_any(skb);
+ return -EINVAL;
+ }
-@@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev *card, ns_
- if (iovb == NULL)
- {
- printk("nicstar%d: Out of iovec buffers.\n", card->index);
-- atomic_inc(&vcc->stats->rx_drop);
-+ atomic_inc_unchecked(&vcc->stats->rx_drop);
- recycle_rx_buf(card, skb);
- return;
- }
-@@ -2181,7 +2181,7 @@ static void dequeue_rx(ns_dev *card, ns_
- else if (NS_SKB(iovb)->iovcnt >= NS_MAX_IOVECS)
- {
- printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
-- atomic_inc(&vcc->stats->rx_err);
-+ atomic_inc_unchecked(&vcc->stats->rx_err);
- recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data, NS_MAX_IOVECS);
- NS_SKB(iovb)->iovcnt = 0;
- iovb->len = 0;
-@@ -2201,7 +2201,7 @@ static void dequeue_rx(ns_dev *card, ns_
- printk("nicstar%d: Expected a small buffer, and this is not one.\n",
- card->index);
- which_list(card, skb);
-- atomic_inc(&vcc->stats->rx_err);
-+ atomic_inc_unchecked(&vcc->stats->rx_err);
- recycle_rx_buf(card, skb);
- vc->rx_iov = NULL;
- recycle_iov_buf(card, iovb);
-@@ -2215,7 +2215,7 @@ static void dequeue_rx(ns_dev *card, ns_
- printk("nicstar%d: Expected a large buffer, and this is not one.\n",
- card->index);
- which_list(card, skb);
-- atomic_inc(&vcc->stats->rx_err);
-+ atomic_inc_unchecked(&vcc->stats->rx_err);
- recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
- NS_SKB(iovb)->iovcnt);
- vc->rx_iov = NULL;
-@@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev *card, ns_
- printk(" - PDU size mismatch.\n");
- else
- printk(".\n");
-- atomic_inc(&vcc->stats->rx_err);
-+ atomic_inc_unchecked(&vcc->stats->rx_err);
- recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
- NS_SKB(iovb)->iovcnt);
- vc->rx_iov = NULL;
-@@ -2255,7 +2255,7 @@ static void dequeue_rx(ns_dev *card, ns_
- if (!atm_charge(vcc, skb->truesize))
- {
- push_rxbufs(card, skb);
-- atomic_inc(&vcc->stats->rx_drop);
-+ atomic_inc_unchecked(&vcc->stats->rx_drop);
- }
- else
- {
-@@ -2267,7 +2267,7 @@ static void dequeue_rx(ns_dev *card, ns_
- ATM_SKB(skb)->vcc = vcc;
- __net_timestamp(skb);
- vcc->push(vcc, skb);
-- atomic_inc(&vcc->stats->rx);
-+ atomic_inc_unchecked(&vcc->stats->rx);
- }
- }
- else if (NS_SKB(iovb)->iovcnt == 2) /* One small plus one large buffer */
-@@ -2282,7 +2282,7 @@ static void dequeue_rx(ns_dev *card, ns_
- if (!atm_charge(vcc, sb->truesize))
- {
- push_rxbufs(card, sb);
-- atomic_inc(&vcc->stats->rx_drop);
-+ atomic_inc_unchecked(&vcc->stats->rx_drop);
- }
- else
- {
-@@ -2294,7 +2294,7 @@ static void dequeue_rx(ns_dev *card, ns_
- ATM_SKB(sb)->vcc = vcc;
- __net_timestamp(sb);
- vcc->push(vcc, sb);
-- atomic_inc(&vcc->stats->rx);
-+ atomic_inc_unchecked(&vcc->stats->rx);
- }
-
- push_rxbufs(card, skb);
-@@ -2305,7 +2305,7 @@ static void dequeue_rx(ns_dev *card, ns_
- if (!atm_charge(vcc, skb->truesize))
- {
- push_rxbufs(card, skb);
-- atomic_inc(&vcc->stats->rx_drop);
-+ atomic_inc_unchecked(&vcc->stats->rx_drop);
- }
- else
- {
-@@ -2319,7 +2319,7 @@ static void dequeue_rx(ns_dev *card, ns_
- ATM_SKB(skb)->vcc = vcc;
- __net_timestamp(skb);
- vcc->push(vcc, skb);
-- atomic_inc(&vcc->stats->rx);
-+ atomic_inc_unchecked(&vcc->stats->rx);
- }
-
- push_rxbufs(card, sb);
-@@ -2341,7 +2341,7 @@ static void dequeue_rx(ns_dev *card, ns_
- if (hb == NULL)
- {
- printk("nicstar%d: Out of huge buffers.\n", card->index);
-- atomic_inc(&vcc->stats->rx_drop);
-+ atomic_inc_unchecked(&vcc->stats->rx_drop);
- recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
- NS_SKB(iovb)->iovcnt);
- vc->rx_iov = NULL;
-@@ -2392,7 +2392,7 @@ static void dequeue_rx(ns_dev *card, ns_
- }
- else
- dev_kfree_skb_any(hb);
-- atomic_inc(&vcc->stats->rx_drop);
-+ atomic_inc_unchecked(&vcc->stats->rx_drop);
- }
- else
- {
-@@ -2426,7 +2426,7 @@ static void dequeue_rx(ns_dev *card, ns_
+ if (skb_shinfo(skb)->nr_frags != 0) {
+ printk("nicstar%d: No scatter-gather yet.\n", card->index);
+- atomic_inc(&vcc->stats->tx_err);
++ atomic_inc_unchecked(&vcc->stats->tx_err);
+ dev_kfree_skb_any(skb);
+ return -EINVAL;
+ }
+@@ -1724,11 +1724,11 @@ static int ns_send(struct atm_vcc *vcc,
+ }
+
+ if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
+- atomic_inc(&vcc->stats->tx_err);
++ atomic_inc_unchecked(&vcc->stats->tx_err);
+ dev_kfree_skb_any(skb);
+ return -EIO;
+ }
+- atomic_inc(&vcc->stats->tx);
++ atomic_inc_unchecked(&vcc->stats->tx);
+
+ return 0;
+ }
+@@ -2045,14 +2045,14 @@ static void dequeue_rx(ns_dev * card, ns
+ printk
+ ("nicstar%d: Can't allocate buffers for aal0.\n",
+ card->index);
+- atomic_add(i, &vcc->stats->rx_drop);
++ atomic_add_unchecked(i, &vcc->stats->rx_drop);
+ break;
+ }
+ if (!atm_charge(vcc, sb->truesize)) {
+ RXPRINTK
+ ("nicstar%d: atm_charge() dropped aal0 packets.\n",
+ card->index);
+- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
++ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
+ dev_kfree_skb_any(sb);
+ break;
+ }
+@@ -2067,7 +2067,7 @@ static void dequeue_rx(ns_dev * card, ns
+ ATM_SKB(sb)->vcc = vcc;
+ __net_timestamp(sb);
+ vcc->push(vcc, sb);
+- atomic_inc(&vcc->stats->rx);
++ atomic_inc_unchecked(&vcc->stats->rx);
+ cell += ATM_CELL_PAYLOAD;
+ }
+
+@@ -2084,7 +2084,7 @@ static void dequeue_rx(ns_dev * card, ns
+ if (iovb == NULL) {
+ printk("nicstar%d: Out of iovec buffers.\n",
+ card->index);
+- atomic_inc(&vcc->stats->rx_drop);
++ atomic_inc_unchecked(&vcc->stats->rx_drop);
+ recycle_rx_buf(card, skb);
+ return;
+ }
+@@ -2108,7 +2108,7 @@ static void dequeue_rx(ns_dev * card, ns
+ small or large buffer itself. */
+ } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
+ printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
+- atomic_inc(&vcc->stats->rx_err);
++ atomic_inc_unchecked(&vcc->stats->rx_err);
+ recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
+ NS_MAX_IOVECS);
+ NS_PRV_IOVCNT(iovb) = 0;
+@@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns
+ ("nicstar%d: Expected a small buffer, and this is not one.\n",
+ card->index);
+ which_list(card, skb);
+- atomic_inc(&vcc->stats->rx_err);
++ atomic_inc_unchecked(&vcc->stats->rx_err);
+ recycle_rx_buf(card, skb);
+ vc->rx_iov = NULL;
+ recycle_iov_buf(card, iovb);
+@@ -2141,7 +2141,7 @@ static void dequeue_rx(ns_dev * card, ns
+ ("nicstar%d: Expected a large buffer, and this is not one.\n",
+ card->index);
+ which_list(card, skb);
+- atomic_inc(&vcc->stats->rx_err);
++ atomic_inc_unchecked(&vcc->stats->rx_err);
+ recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
+ NS_PRV_IOVCNT(iovb));
+ vc->rx_iov = NULL;
+@@ -2164,7 +2164,7 @@ static void dequeue_rx(ns_dev * card, ns
+ printk(" - PDU size mismatch.\n");
+ else
+ printk(".\n");
+- atomic_inc(&vcc->stats->rx_err);
++ atomic_inc_unchecked(&vcc->stats->rx_err);
+ recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
+ NS_PRV_IOVCNT(iovb));
+ vc->rx_iov = NULL;
+@@ -2178,7 +2178,7 @@ static void dequeue_rx(ns_dev * card, ns
+ /* skb points to a small buffer */
+ if (!atm_charge(vcc, skb->truesize)) {
+ push_rxbufs(card, skb);
+- atomic_inc(&vcc->stats->rx_drop);
++ atomic_inc_unchecked(&vcc->stats->rx_drop);
+ } else {
+ skb_put(skb, len);
+ dequeue_sm_buf(card, skb);
+@@ -2188,7 +2188,7 @@ static void dequeue_rx(ns_dev * card, ns
+ ATM_SKB(skb)->vcc = vcc;
+ __net_timestamp(skb);
+ vcc->push(vcc, skb);
+- atomic_inc(&vcc->stats->rx);
++ atomic_inc_unchecked(&vcc->stats->rx);
+ }
+ } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
+ struct sk_buff *sb;
+@@ -2199,7 +2199,7 @@ static void dequeue_rx(ns_dev * card, ns
+ if (len <= NS_SMBUFSIZE) {
+ if (!atm_charge(vcc, sb->truesize)) {
+ push_rxbufs(card, sb);
+- atomic_inc(&vcc->stats->rx_drop);
++ atomic_inc_unchecked(&vcc->stats->rx_drop);
+ } else {
+ skb_put(sb, len);
+ dequeue_sm_buf(card, sb);
+@@ -2209,7 +2209,7 @@ static void dequeue_rx(ns_dev * card, ns
+ ATM_SKB(sb)->vcc = vcc;
+ __net_timestamp(sb);
+ vcc->push(vcc, sb);
+- atomic_inc(&vcc->stats->rx);
++ atomic_inc_unchecked(&vcc->stats->rx);
+ }
+
+ push_rxbufs(card, skb);
+@@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns
+
+ if (!atm_charge(vcc, skb->truesize)) {
+ push_rxbufs(card, skb);
+- atomic_inc(&vcc->stats->rx_drop);
++ atomic_inc_unchecked(&vcc->stats->rx_drop);
+ } else {
+ dequeue_lg_buf(card, skb);
+ #ifdef NS_USE_DESTRUCTORS
+@@ -2231,7 +2231,7 @@ static void dequeue_rx(ns_dev * card, ns
+ ATM_SKB(skb)->vcc = vcc;
+ __net_timestamp(skb);
+ vcc->push(vcc, skb);
+- atomic_inc(&vcc->stats->rx);
++ atomic_inc_unchecked(&vcc->stats->rx);
+ }
+
+ push_rxbufs(card, sb);
+@@ -2252,7 +2252,7 @@ static void dequeue_rx(ns_dev * card, ns
+ printk
+ ("nicstar%d: Out of huge buffers.\n",
+ card->index);
+- atomic_inc(&vcc->stats->rx_drop);
++ atomic_inc_unchecked(&vcc->stats->rx_drop);
+ recycle_iovec_rx_bufs(card,
+ (struct iovec *)
+ iovb->data,
+@@ -2303,7 +2303,7 @@ static void dequeue_rx(ns_dev * card, ns
+ card->hbpool.count++;
+ } else
+ dev_kfree_skb_any(hb);
+- atomic_inc(&vcc->stats->rx_drop);
++ atomic_inc_unchecked(&vcc->stats->rx_drop);
+ } else {
+ /* Copy the small buffer to the huge buffer */
+ sb = (struct sk_buff *)iov->iov_base;
+@@ -2340,7 +2340,7 @@ static void dequeue_rx(ns_dev * card, ns
#endif /* NS_USE_DESTRUCTORS */
- __net_timestamp(hb);
- vcc->push(vcc, hb);
-- atomic_inc(&vcc->stats->rx);
-+ atomic_inc_unchecked(&vcc->stats->rx);
- }
- }
+ __net_timestamp(hb);
+ vcc->push(vcc, hb);
+- atomic_inc(&vcc->stats->rx);
++ atomic_inc_unchecked(&vcc->stats->rx);
+ }
+ }
-diff -urNp linux-2.6.35.4/drivers/atm/solos-pci.c linux-2.6.35.4/drivers/atm/solos-pci.c
---- linux-2.6.35.4/drivers/atm/solos-pci.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/atm/solos-pci.c 2010-09-17 20:12:09.000000000 -0400
-@@ -715,7 +715,7 @@ void solos_bh(unsigned long card_arg)
+diff -urNp linux-2.6.36/drivers/atm/solos-pci.c linux-2.6.36/drivers/atm/solos-pci.c
+--- linux-2.6.36/drivers/atm/solos-pci.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/atm/solos-pci.c 2010-11-06 18:58:15.000000000 -0400
+@@ -717,7 +717,7 @@ void solos_bh(unsigned long card_arg)
}
atm_charge(vcc, skb->truesize);
vcc->push(vcc, skb);
break;
case PKT_STATUS:
-@@ -1023,7 +1023,7 @@ static uint32_t fpga_tx(struct solos_car
+@@ -1025,7 +1025,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.35.4/drivers/atm/suni.c linux-2.6.35.4/drivers/atm/suni.c
---- linux-2.6.35.4/drivers/atm/suni.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/atm/suni.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/atm/suni.c linux-2.6.36/drivers/atm/suni.c
+--- linux-2.6.36/drivers/atm/suni.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/atm/suni.c 2010-11-06 18:58:15.000000000 -0400
@@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
static void suni_hz(unsigned long from_timer)
-diff -urNp linux-2.6.35.4/drivers/atm/uPD98402.c linux-2.6.35.4/drivers/atm/uPD98402.c
---- linux-2.6.35.4/drivers/atm/uPD98402.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/atm/uPD98402.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/atm/uPD98402.c linux-2.6.36/drivers/atm/uPD98402.c
+--- linux-2.6.36/drivers/atm/uPD98402.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/atm/uPD98402.c 2010-11-06 18:58:15.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.35.4/drivers/atm/zatm.c linux-2.6.35.4/drivers/atm/zatm.c
---- linux-2.6.35.4/drivers/atm/zatm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/atm/zatm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/atm/zatm.c linux-2.6.36/drivers/atm/zatm.c
+--- linux-2.6.36/drivers/atm/zatm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/atm/zatm.c 2010-11-06 18:58:15.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.35.4/drivers/char/agp/frontend.c linux-2.6.35.4/drivers/char/agp/frontend.c
---- linux-2.6.35.4/drivers/char/agp/frontend.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/char/agp/frontend.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/char/agp/frontend.c linux-2.6.36/drivers/char/agp/frontend.c
+--- linux-2.6.36/drivers/char/agp/frontend.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/char/agp/frontend.c 2010-11-06 18:58:15.000000000 -0400
@@ -818,7 +818,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.35.4/drivers/char/agp/intel-agp.c linux-2.6.35.4/drivers/char/agp/intel-agp.c
---- linux-2.6.35.4/drivers/char/agp/intel-agp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/char/agp/intel-agp.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1036,7 +1036,7 @@ static struct pci_device_id agp_intel_pc
- ID(PCI_DEVICE_ID_INTEL_IRONLAKE_MC2_HB),
+diff -urNp linux-2.6.36/drivers/char/agp/intel-agp.c linux-2.6.36/drivers/char/agp/intel-agp.c
+--- linux-2.6.36/drivers/char/agp/intel-agp.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/char/agp/intel-agp.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1056,7 +1056,7 @@ static struct pci_device_id agp_intel_pc
ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB),
ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB),
+ ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_HB),
- { }
+ { 0, 0, 0, 0, 0, 0, 0 }
};
MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
-diff -urNp linux-2.6.35.4/drivers/char/hpet.c linux-2.6.35.4/drivers/char/hpet.c
---- linux-2.6.35.4/drivers/char/hpet.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/char/hpet.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/char/hpet.c linux-2.6.36/drivers/char/hpet.c
+--- linux-2.6.36/drivers/char/hpet.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/char/hpet.c 2010-11-06 18:58:50.000000000 -0400
@@ -429,7 +429,7 @@ static int hpet_release(struct inode *in
return 0;
}
{
struct hpet_timer __iomem *timer;
struct hpet __iomem *hpet;
+@@ -596,11 +596,11 @@ hpet_ioctl_common(struct hpet_dev *devp,
+ {
+ struct hpet_info info;
+
++ memset(&info, 0, sizeof(info));
++
+ if (devp->hd_ireqfreq)
+ info.hi_ireqfreq =
+ hpet_time_div(hpetp, devp->hd_ireqfreq);
+- else
+- info.hi_ireqfreq = 0;
+ info.hi_flags =
+ readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK;
+ info.hi_hpet = hpetp->hp_which;
@@ -998,7 +998,7 @@ static struct acpi_driver hpet_acpi_driv
},
};
static int __init hpet_init(void)
{
-diff -urNp linux-2.6.35.4/drivers/char/hvc_console.h linux-2.6.35.4/drivers/char/hvc_console.h
---- linux-2.6.35.4/drivers/char/hvc_console.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/char/hvc_console.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/char/hvc_console.h linux-2.6.36/drivers/char/hvc_console.h
+--- linux-2.6.36/drivers/char/hvc_console.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/char/hvc_console.h 2010-11-06 18:58:15.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.35.4/drivers/char/hvcs.c linux-2.6.35.4/drivers/char/hvcs.c
---- linux-2.6.35.4/drivers/char/hvcs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/char/hvcs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/char/hvcs.c linux-2.6.36/drivers/char/hvcs.c
+--- linux-2.6.36/drivers/char/hvcs.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/char/hvcs.c 2010-11-06 18:58:15.000000000 -0400
@@ -270,7 +270,7 @@ struct hvcs_struct {
unsigned int index;
return 0;
return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-2.6.35.4/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.35.4/drivers/char/ipmi/ipmi_msghandler.c
---- linux-2.6.35.4/drivers/char/ipmi/ipmi_msghandler.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/char/ipmi/ipmi_msghandler.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.36/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-2.6.36/drivers/char/ipmi/ipmi_msghandler.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/char/ipmi/ipmi_msghandler.c 2010-11-06 18:58:15.000000000 -0400
@@ -414,7 +414,7 @@ struct ipmi_smi {
struct proc_dir_entry *proc_dir;
char proc_dir_name[10];
intf->proc_dir = NULL;
-diff -urNp linux-2.6.35.4/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.35.4/drivers/char/ipmi/ipmi_si_intf.c
---- linux-2.6.35.4/drivers/char/ipmi/ipmi_si_intf.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/char/ipmi/ipmi_si_intf.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.36/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-2.6.36/drivers/char/ipmi/ipmi_si_intf.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/char/ipmi/ipmi_si_intf.c 2010-11-06 18:58:15.000000000 -0400
@@ -286,7 +286,7 @@ struct smi_info {
unsigned char slave_addr;
#define SI_MAX_PARMS 4
-@@ -3143,7 +3143,7 @@ static int try_smi_init(struct smi_info
+@@ -3171,7 +3171,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.35.4/drivers/char/keyboard.c linux-2.6.35.4/drivers/char/keyboard.c
---- linux-2.6.35.4/drivers/char/keyboard.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/char/keyboard.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/drivers/char/keyboard.c linux-2.6.36/drivers/char/keyboard.c
+--- linux-2.6.36/drivers/char/keyboard.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/char/keyboard.c 2010-11-06 18:58:50.000000000 -0400
@@ -640,6 +640,16 @@ static void k_spec(struct vc_data *vc, u
kbd->kbdmode == VC_MEDIUMRAW) &&
value != KVAL(K_SAK))
fn_handler[value](vc);
}
-@@ -1392,7 +1402,7 @@ static const struct input_device_id kbd_
+@@ -1396,7 +1406,7 @@ static const struct input_device_id kbd_
.evbit = { BIT_MASK(EV_SND) },
},
};
MODULE_DEVICE_TABLE(input, kbd_ids);
-diff -urNp linux-2.6.35.4/drivers/char/mem.c linux-2.6.35.4/drivers/char/mem.c
---- linux-2.6.35.4/drivers/char/mem.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/char/mem.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/drivers/char/mem.c linux-2.6.36/drivers/char/mem.c
+--- linux-2.6.36/drivers/char/mem.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/char/mem.c 2010-11-06 18:58:50.000000000 -0400
@@ -18,6 +18,7 @@
#include <linux/raw.h>
#include <linux/tty.h>
#define open_kmem open_mem
#define open_oldmem open_mem
-@@ -854,6 +916,9 @@ static const struct memdev {
+@@ -855,6 +917,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.35.4/drivers/char/n_tty.c linux-2.6.35.4/drivers/char/n_tty.c
---- linux-2.6.35.4/drivers/char/n_tty.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/char/n_tty.c 2010-09-17 20:12:09.000000000 -0400
-@@ -2105,6 +2105,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
+diff -urNp linux-2.6.36/drivers/char/n_gsm.c linux-2.6.36/drivers/char/n_gsm.c
+--- linux-2.6.36/drivers/char/n_gsm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/char/n_gsm.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1577,7 +1577,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s
+ return NULL;
+ spin_lock_init(&dlci->lock);
+ dlci->fifo = &dlci->_fifo;
+- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
++ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
+ kfree(dlci);
+ return NULL;
+ }
+diff -urNp linux-2.6.36/drivers/char/n_tty.c linux-2.6.36/drivers/char/n_tty.c
+--- linux-2.6.36/drivers/char/n_tty.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/char/n_tty.c 2010-11-06 18:58:15.000000000 -0400
+@@ -2116,6 +2116,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.35.4/drivers/char/nvram.c linux-2.6.35.4/drivers/char/nvram.c
---- linux-2.6.35.4/drivers/char/nvram.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/char/nvram.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/char/nvram.c linux-2.6.36/drivers/char/nvram.c
+--- linux-2.6.36/drivers/char/nvram.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/char/nvram.c 2010-11-06 18:58:15.000000000 -0400
@@ -245,7 +245,7 @@ static ssize_t nvram_read(struct file *f
spin_unlock_irq(&rtc_lock);
};
static int __init nvram_init(void)
-diff -urNp linux-2.6.35.4/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.35.4/drivers/char/pcmcia/ipwireless/tty.c
---- linux-2.6.35.4/drivers/char/pcmcia/ipwireless/tty.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/char/pcmcia/ipwireless/tty.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.36/drivers/char/pcmcia/ipwireless/tty.c
+--- linux-2.6.36/drivers/char/pcmcia/ipwireless/tty.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/char/pcmcia/ipwireless/tty.c 2010-11-06 18:58:15.000000000 -0400
@@ -51,7 +51,7 @@ struct ipw_tty {
int tty_type;
struct ipw_network *network;
do_ipw_close(ttyj);
ipwireless_disassociate_network_ttys(network,
ttyj->channel_idx);
-diff -urNp linux-2.6.35.4/drivers/char/pty.c linux-2.6.35.4/drivers/char/pty.c
---- linux-2.6.35.4/drivers/char/pty.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/char/pty.c 2010-09-17 20:12:09.000000000 -0400
-@@ -677,7 +677,18 @@ static int ptmx_open(struct inode *inode
- return ret;
+diff -urNp linux-2.6.36/drivers/char/pty.c linux-2.6.36/drivers/char/pty.c
+--- linux-2.6.36/drivers/char/pty.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/char/pty.c 2010-11-06 18:58:15.000000000 -0400
+@@ -698,7 +698,18 @@ out:
+ return retval;
}
-static struct file_operations ptmx_fops;
static void __init unix98_pty_init(void)
{
-@@ -731,9 +742,6 @@ static void __init unix98_pty_init(void)
+@@ -752,9 +763,6 @@ static void __init unix98_pty_init(void)
register_sysctl_table(pty_root_table);
/* Now create the /dev/ptmx special device */
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.35.4/drivers/char/random.c linux-2.6.35.4/drivers/char/random.c
---- linux-2.6.35.4/drivers/char/random.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/char/random.c 2010-09-17 20:24:41.000000000 -0400
+diff -urNp linux-2.6.36/drivers/char/random.c linux-2.6.36/drivers/char/random.c
+--- linux-2.6.36/drivers/char/random.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/char/random.c 2010-11-06 18:58:50.000000000 -0400
@@ -254,8 +254,13 @@
/*
* Configuration information
static int max_write_thresh = INPUT_POOL_WORDS * 32;
static char sysctl_bootid[16];
-diff -urNp linux-2.6.35.4/drivers/char/sonypi.c linux-2.6.35.4/drivers/char/sonypi.c
---- linux-2.6.35.4/drivers/char/sonypi.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/char/sonypi.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/char/sonypi.c linux-2.6.36/drivers/char/sonypi.c
+--- linux-2.6.36/drivers/char/sonypi.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/char/sonypi.c 2010-11-06 18:58:15.000000000 -0400
@@ -491,7 +491,7 @@ static struct sonypi_device {
spinlock_t fifo_lock;
wait_queue_head_t fifo_proc_list;
mutex_unlock(&sonypi_device.lock);
return 0;
-diff -urNp linux-2.6.35.4/drivers/char/tpm/tpm_bios.c linux-2.6.35.4/drivers/char/tpm/tpm_bios.c
---- linux-2.6.35.4/drivers/char/tpm/tpm_bios.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/char/tpm/tpm_bios.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/char/tpm/tpm_bios.c linux-2.6.36/drivers/char/tpm/tpm_bios.c
+--- linux-2.6.36/drivers/char/tpm/tpm_bios.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/char/tpm/tpm_bios.c 2010-11-06 18:58:15.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.35.4/drivers/char/tty_io.c linux-2.6.35.4/drivers/char/tty_io.c
---- linux-2.6.35.4/drivers/char/tty_io.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/char/tty_io.c 2010-09-17 20:12:09.000000000 -0400
-@@ -136,20 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list
- DEFINE_MUTEX(tty_mutex);
- EXPORT_SYMBOL(tty_mutex);
+diff -urNp linux-2.6.36/drivers/char/tty_io.c linux-2.6.36/drivers/char/tty_io.c
+--- linux-2.6.36/drivers/char/tty_io.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/char/tty_io.c 2010-11-06 18:58:15.000000000 -0400
+@@ -139,21 +139,11 @@ EXPORT_SYMBOL(tty_mutex);
+ /* Spinlock to protect the tty->tty_files list */
+ DEFINE_SPINLOCK(tty_files_lock);
-static ssize_t tty_read(struct file *, char __user *, size_t, loff_t *);
-static ssize_t tty_write(struct file *, const char __user *, size_t, loff_t *);
-#else
-#define tty_compat_ioctl NULL
-#endif
+ static int __tty_fasync(int fd, struct file *filp, int on);
-static int tty_fasync(int fd, struct file *filp, int on);
static void release_tty(struct tty_struct *tty, int idx);
static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
-@@ -871,7 +861,7 @@ EXPORT_SYMBOL(start_tty);
+@@ -925,7 +915,7 @@ EXPORT_SYMBOL(start_tty);
* read calls may be outstanding in parallel.
*/
loff_t *ppos)
{
int i;
-@@ -899,6 +889,8 @@ static ssize_t tty_read(struct file *fil
+@@ -951,6 +941,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);
-@@ -1048,7 +1040,7 @@ void tty_write_message(struct tty_struct
+@@ -1100,7 +1092,7 @@ void tty_write_message(struct tty_struct
* write method will not be invoked in parallel for each device.
*/
+ssize_t tty_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
{
- struct tty_struct *tty;
-@@ -1075,6 +1067,8 @@ static ssize_t tty_write(struct file *fi
+ struct inode *inode = file->f_path.dentry->d_inode;
+@@ -1126,6 +1118,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)
{
-@@ -1897,6 +1891,8 @@ got_driver:
+@@ -1938,6 +1932,8 @@ got_driver:
/**
* tty_poll - check tty status
* @filp: file being polled
-@@ -1909,7 +1905,7 @@ got_driver:
+@@ -1950,7 +1946,7 @@ got_driver:
* may be re-entered freely by other callers.
*/
-static unsigned int tty_poll(struct file *filp, poll_table *wait)
+unsigned int tty_poll(struct file *filp, poll_table *wait)
{
- struct tty_struct *tty;
+ struct tty_struct *tty = file_tty(filp);
struct tty_ldisc *ld;
-@@ -1926,7 +1922,9 @@ static unsigned int tty_poll(struct file
- return ret;
+@@ -2007,7 +2003,9 @@ out:
+ return retval;
}
-static int tty_fasync(int fd, struct file *filp, int on)
+
+int tty_fasync(int fd, struct file *filp, int on)
{
- struct tty_struct *tty;
- unsigned long flags;
-@@ -1970,6 +1968,8 @@ out:
+ int retval;
+ tty_lock();
+@@ -2016,6 +2014,8 @@ static int tty_fasync(int fd, struct fil
return retval;
}
/**
* tiocsti - fake input character
* @tty: tty to fake input into
-@@ -2602,8 +2602,10 @@ long tty_ioctl(struct file *file, unsign
+@@ -2648,8 +2648,10 @@ long tty_ioctl(struct file *file, unsign
return retval;
}
unsigned long arg)
{
struct inode *inode = file->f_dentry->d_inode;
-@@ -2627,6 +2629,9 @@ static long tty_compat_ioctl(struct file
+@@ -2673,6 +2675,9 @@ static long tty_compat_ioctl(struct file
return retval;
}
#endif
/*
-@@ -3070,11 +3075,6 @@ struct tty_struct *get_current_tty(void)
+@@ -3116,11 +3121,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.35.4/drivers/char/tty_ldisc.c linux-2.6.35.4/drivers/char/tty_ldisc.c
---- linux-2.6.35.4/drivers/char/tty_ldisc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/char/tty_ldisc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/char/tty_ldisc.c linux-2.6.36/drivers/char/tty_ldisc.c
+--- linux-2.6.36/drivers/char/tty_ldisc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/char/tty_ldisc.c 2010-11-06 18:58:15.000000000 -0400
@@ -75,7 +75,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(ldops->owner);
spin_unlock_irqrestore(&tty_ldisc_lock, flags);
}
-diff -urNp linux-2.6.35.4/drivers/char/vt_ioctl.c linux-2.6.35.4/drivers/char/vt_ioctl.c
---- linux-2.6.35.4/drivers/char/vt_ioctl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/char/vt_ioctl.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/drivers/char/vt_ioctl.c linux-2.6.36/drivers/char/vt_ioctl.c
+--- linux-2.6.36/drivers/char/vt_ioctl.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/char/vt_ioctl.c 2010-11-06 18:58:50.000000000 -0400
@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
return -EFAULT;
if (!perm) {
ret = -EPERM;
goto reterr;
-diff -urNp linux-2.6.35.4/drivers/cpuidle/sysfs.c linux-2.6.35.4/drivers/cpuidle/sysfs.c
---- linux-2.6.35.4/drivers/cpuidle/sysfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/cpuidle/sysfs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/cpuidle/sysfs.c linux-2.6.36/drivers/cpuidle/sysfs.c
+--- linux-2.6.36/drivers/cpuidle/sysfs.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/cpuidle/sysfs.c 2010-11-06 18:58:15.000000000 -0400
@@ -300,7 +300,7 @@ static struct kobj_type ktype_state_cpui
.release = cpuidle_state_sysfs_release,
};
{
kobject_put(&device->kobjs[i]->kobj);
wait_for_completion(&device->kobjs[i]->kobj_unregister);
-diff -urNp linux-2.6.35.4/drivers/edac/edac_core.h linux-2.6.35.4/drivers/edac/edac_core.h
---- linux-2.6.35.4/drivers/edac/edac_core.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/edac/edac_core.h 2010-09-17 20:12:09.000000000 -0400
-@@ -100,11 +100,11 @@ extern const char *edac_mem_types[];
+diff -urNp linux-2.6.36/drivers/edac/edac_core.h linux-2.6.36/drivers/edac/edac_core.h
+--- linux-2.6.36/drivers/edac/edac_core.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/edac/edac_core.h 2010-11-06 18:58:15.000000000 -0400
+@@ -85,11 +85,11 @@ extern const char *edac_mem_types[];
#else /* !CONFIG_EDAC_DEBUG */
#endif /* !CONFIG_EDAC_DEBUG */
-diff -urNp linux-2.6.35.4/drivers/edac/edac_mc_sysfs.c linux-2.6.35.4/drivers/edac/edac_mc_sysfs.c
---- linux-2.6.35.4/drivers/edac/edac_mc_sysfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/edac/edac_mc_sysfs.c 2010-09-17 20:12:09.000000000 -0400
-@@ -776,7 +776,7 @@ static void edac_inst_grp_release(struct
+diff -urNp linux-2.6.36/drivers/edac/edac_mc_sysfs.c linux-2.6.36/drivers/edac/edac_mc_sysfs.c
+--- linux-2.6.36/drivers/edac/edac_mc_sysfs.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/edac/edac_mc_sysfs.c 2010-11-06 18:58:15.000000000 -0400
+@@ -764,7 +764,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.35.4/drivers/firewire/core-cdev.c linux-2.6.35.4/drivers/firewire/core-cdev.c
---- linux-2.6.35.4/drivers/firewire/core-cdev.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/firewire/core-cdev.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1195,8 +1195,7 @@ static int init_iso_resource(struct clie
+diff -urNp linux-2.6.36/drivers/firewire/core-cdev.c linux-2.6.36/drivers/firewire/core-cdev.c
+--- linux-2.6.36/drivers/firewire/core-cdev.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/firewire/core-cdev.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1329,8 +1329,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.35.4/drivers/firmware/dmi_scan.c linux-2.6.35.4/drivers/firmware/dmi_scan.c
---- linux-2.6.35.4/drivers/firmware/dmi_scan.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/firmware/dmi_scan.c 2010-09-17 20:12:09.000000000 -0400
-@@ -387,11 +387,6 @@ void __init dmi_scan_machine(void)
+diff -urNp linux-2.6.36/drivers/firmware/dmi_scan.c linux-2.6.36/drivers/firmware/dmi_scan.c
+--- linux-2.6.36/drivers/firmware/dmi_scan.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/firmware/dmi_scan.c 2010-11-06 18:58:15.000000000 -0400
+@@ -412,11 +412,6 @@ void __init dmi_scan_machine(void)
}
}
else {
p = dmi_ioremap(0xF0000, 0x10000);
if (p == NULL)
goto error;
-diff -urNp linux-2.6.35.4/drivers/gpu/drm/drm_drv.c linux-2.6.35.4/drivers/gpu/drm/drm_drv.c
---- linux-2.6.35.4/drivers/gpu/drm/drm_drv.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/drm_drv.c 2010-09-17 20:12:09.000000000 -0400
-@@ -449,7 +449,7 @@ long drm_ioctl(struct file *filp,
+diff -urNp linux-2.6.36/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.36/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-2.6.36/drivers/gpu/drm/drm_crtc_helper.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/drm_crtc_helper.c 2010-11-06 18:58:15.000000000 -0400
+@@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d
+ struct drm_crtc *tmp;
+ int crtc_mask = 1;
+
+- WARN(!crtc, "checking null crtc?");
++ BUG_ON(!crtc);
+
+ dev = crtc->dev;
+
+diff -urNp linux-2.6.36/drivers/gpu/drm/drm_drv.c linux-2.6.36/drivers/gpu/drm/drm_drv.c
+--- linux-2.6.36/drivers/gpu/drm/drm_drv.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/drm_drv.c 2010-11-06 18:58:15.000000000 -0400
+@@ -428,7 +428,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.35.4/drivers/gpu/drm/drm_fops.c linux-2.6.35.4/drivers/gpu/drm/drm_fops.c
---- linux-2.6.35.4/drivers/gpu/drm/drm_fops.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/drm_fops.c 2010-09-17 20:12:09.000000000 -0400
-@@ -67,7 +67,7 @@ static int drm_setup(struct drm_device *
+diff -urNp linux-2.6.36/drivers/gpu/drm/drm_fops.c linux-2.6.36/drivers/gpu/drm/drm_fops.c
+--- linux-2.6.36/drivers/gpu/drm/drm_fops.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/drm_fops.c 2010-11-06 18:58:15.000000000 -0400
+@@ -71,7 +71,7 @@ static int drm_setup(struct drm_device *
}
for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
dev->sigdata.lock = NULL;
-@@ -131,9 +131,9 @@ int drm_open(struct inode *inode, struct
+@@ -135,8 +135,8 @@ int drm_open(struct inode *inode, struct
retcode = drm_open_helper(inode, filp, dev);
if (!retcode) {
- atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
+- if (!dev->open_count++)
+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]);
- spin_lock(&dev->count_lock);
-- if (!dev->open_count++) {
-+ if (atomic_inc_return(&dev->open_count) == 1) {
- spin_unlock(&dev->count_lock);
++ if (atomic_inc_return(&dev->open_count) == 1)
retcode = drm_setup(dev);
- goto out;
-@@ -474,7 +474,7 @@ int drm_release(struct inode *inode, str
+ }
+ if (!retcode) {
+@@ -471,7 +471,7 @@ int drm_release(struct inode *inode, str
- lock_kernel();
+ mutex_lock(&drm_global_mutex);
- DRM_DEBUG("open_count = %d\n", dev->open_count);
+ DRM_DEBUG("open_count = %d\n", atomic_read(&dev->open_count));
if (dev->driver->preclose)
dev->driver->preclose(dev, file_priv);
-@@ -486,7 +486,7 @@ int drm_release(struct inode *inode, str
+@@ -483,7 +483,7 @@ int drm_release(struct inode *inode, str
DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
task_pid_nr(current),
(long)old_encode_dev(file_priv->minor->device),
/* if the master has gone away we can't do anything with the lock */
if (file_priv->minor->master)
-@@ -567,9 +567,9 @@ int drm_release(struct inode *inode, str
+@@ -564,8 +564,8 @@ int drm_release(struct inode *inode, str
* End inline drm_release
*/
- atomic_inc(&dev->counts[_DRM_STAT_CLOSES]);
-+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_CLOSES]);
- spin_lock(&dev->count_lock);
- if (!--dev->open_count) {
++ atomic_inc_unchecked(&dev->counts[_DRM_STAT_CLOSES]);
+ if (atomic_dec_and_test(&dev->open_count)) {
if (atomic_read(&dev->ioctl_count)) {
DRM_ERROR("Device busy: %d\n",
atomic_read(&dev->ioctl_count));
-diff -urNp linux-2.6.35.4/drivers/gpu/drm/drm_ioctl.c linux-2.6.35.4/drivers/gpu/drm/drm_ioctl.c
---- linux-2.6.35.4/drivers/gpu/drm/drm_ioctl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/drm_ioctl.c 2010-09-17 20:12:09.000000000 -0400
-@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev,
+diff -urNp linux-2.6.36/drivers/gpu/drm/drm_global.c linux-2.6.36/drivers/gpu/drm/drm_global.c
+--- linux-2.6.36/drivers/gpu/drm/drm_global.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/drm_global.c 2010-11-06 18:58:15.000000000 -0400
+@@ -36,7 +36,7 @@
+ struct drm_global_item {
+ struct mutex mutex;
+ void *object;
+- int refcount;
++ atomic_t refcount;
+ };
+
+ static struct drm_global_item glob[DRM_GLOBAL_NUM];
+@@ -49,7 +49,7 @@ void drm_global_init(void)
+ struct drm_global_item *item = &glob[i];
+ mutex_init(&item->mutex);
+ item->object = NULL;
+- item->refcount = 0;
++ atomic_set(&item->refcount, 0);
+ }
+ }
+
+@@ -59,7 +59,7 @@ void drm_global_release(void)
+ for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
+ struct drm_global_item *item = &glob[i];
+ BUG_ON(item->object != NULL);
+- BUG_ON(item->refcount != 0);
++ BUG_ON(atomic_read(&item->refcount) != 0);
+ }
+ }
+
+@@ -70,7 +70,7 @@ int drm_global_item_ref(struct drm_globa
+ void *object;
+
+ mutex_lock(&item->mutex);
+- if (item->refcount == 0) {
++ if (atomic_read(&item->refcount) == 0) {
+ item->object = kzalloc(ref->size, GFP_KERNEL);
+ if (unlikely(item->object == NULL)) {
+ ret = -ENOMEM;
+@@ -83,7 +83,7 @@ int drm_global_item_ref(struct drm_globa
+ goto out_err;
+
+ }
+- ++item->refcount;
++ atomic_inc(&item->refcount);
+ ref->object = item->object;
+ object = item->object;
+ mutex_unlock(&item->mutex);
+@@ -100,9 +100,9 @@ void drm_global_item_unref(struct drm_gl
+ struct drm_global_item *item = &glob[ref->global_type];
+
+ mutex_lock(&item->mutex);
+- BUG_ON(item->refcount == 0);
++ BUG_ON(atomic_read(&item->refcount) == 0);
+ BUG_ON(ref->object != item->object);
+- if (--item->refcount == 0) {
++ if (atomic_dec_and_test(&item->refcount)) {
+ ref->release(ref);
+ item->object = NULL;
+ }
+diff -urNp linux-2.6.36/drivers/gpu/drm/drm_info.c linux-2.6.36/drivers/gpu/drm/drm_info.c
+--- linux-2.6.36/drivers/gpu/drm/drm_info.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/drm_info.c 2010-11-06 18:58:15.000000000 -0400
+@@ -86,10 +86,14 @@ int drm_vm_info(struct seq_file *m, void
+ struct drm_local_map *map;
+ struct drm_map_list *r_list;
+
+- /* Hardcoded from _DRM_FRAME_BUFFER,
+- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
+- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
+- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
++ static const char * const types[] = {
++ [_DRM_FRAME_BUFFER] = "FB",
++ [_DRM_REGISTERS] = "REG",
++ [_DRM_SHM] = "SHM",
++ [_DRM_AGP] = "AGP",
++ [_DRM_SCATTER_GATHER] = "SG",
++ [_DRM_CONSISTENT] = "PCI",
++ [_DRM_GEM] = "GEM" };
+ const char *type;
+ int i;
+
+@@ -100,7 +104,7 @@ int drm_vm_info(struct seq_file *m, void
+ map = r_list->map;
+ if (!map)
+ continue;
+- if (map->type < 0 || map->type > 5)
++ if (map->type >= ARRAY_SIZE(types))
+ type = "??";
+ else
+ type = types[map->type];
+diff -urNp linux-2.6.36/drivers/gpu/drm/drm_ioctl.c linux-2.6.36/drivers/gpu/drm/drm_ioctl.c
+--- linux-2.6.36/drivers/gpu/drm/drm_ioctl.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/drm_ioctl.c 2010-11-06 18:58:15.000000000 -0400
+@@ -353,7 +353,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.35.4/drivers/gpu/drm/drm_lock.c linux-2.6.35.4/drivers/gpu/drm/drm_lock.c
---- linux-2.6.35.4/drivers/gpu/drm/drm_lock.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/drm_lock.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/gpu/drm/drm_lock.c linux-2.6.36/drivers/gpu/drm/drm_lock.c
+--- linux-2.6.36/drivers/gpu/drm/drm_lock.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/drm_lock.c 2010-11-06 18:58:15.000000000 -0400
@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
if (drm_lock_take(&master->lock, lock->context)) {
master->lock.file_priv = file_priv;
break; /* Got lock */
}
-@@ -165,7 +165,7 @@ int drm_unlock(struct drm_device *dev, v
+@@ -167,7 +167,7 @@ int drm_unlock(struct drm_device *dev, v
return -EINVAL;
}
/* kernel_context_switch isn't used by any of the x86 drm
* modules but is required by the Sparc driver.
-diff -urNp linux-2.6.35.4/drivers/gpu/drm/i810/i810_dma.c linux-2.6.35.4/drivers/gpu/drm/i810/i810_dma.c
---- linux-2.6.35.4/drivers/gpu/drm/i810/i810_dma.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/i810/i810_dma.c 2010-09-17 20:12:09.000000000 -0400
-@@ -953,8 +953,8 @@ static int i810_dma_vertex(struct drm_de
+diff -urNp linux-2.6.36/drivers/gpu/drm/i810/i810_dma.c linux-2.6.36/drivers/gpu/drm/i810/i810_dma.c
+--- linux-2.6.36/drivers/gpu/drm/i810/i810_dma.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/i810/i810_dma.c 2010-11-06 18:58:15.000000000 -0400
+@@ -952,8 +952,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];
-@@ -1116,8 +1116,8 @@ static int i810_dma_mc(struct drm_device
+@@ -1113,8 +1113,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.35.4/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.35.4/drivers/gpu/drm/i915/dvo_ch7017.c
---- linux-2.6.35.4/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/i915/dvo_ch7017.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.36/drivers/gpu/drm/i915/dvo_ch7017.c
+--- linux-2.6.36/drivers/gpu/drm/i915/dvo_ch7017.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/i915/dvo_ch7017.c 2010-11-06 18:58:15.000000000 -0400
@@ -402,7 +402,7 @@ static void ch7017_destroy(struct intel_
}
}
.init = ch7017_init,
.detect = ch7017_detect,
.mode_valid = ch7017_mode_valid,
-diff -urNp linux-2.6.35.4/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.35.4/drivers/gpu/drm/i915/dvo_ch7xxx.c
---- linux-2.6.35.4/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.36/drivers/gpu/drm/i915/dvo_ch7xxx.c
+--- linux-2.6.36/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-11-06 18:58:15.000000000 -0400
@@ -322,7 +322,7 @@ static void ch7xxx_destroy(struct intel_
}
}
.init = ch7xxx_init,
.detect = ch7xxx_detect,
.mode_valid = ch7xxx_mode_valid,
-diff -urNp linux-2.6.35.4/drivers/gpu/drm/i915/dvo.h linux-2.6.35.4/drivers/gpu/drm/i915/dvo.h
---- linux-2.6.35.4/drivers/gpu/drm/i915/dvo.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/i915/dvo.h 2010-09-17 20:12:09.000000000 -0400
-@@ -125,23 +125,23 @@ struct intel_dvo_dev_ops {
+diff -urNp linux-2.6.36/drivers/gpu/drm/i915/dvo.h linux-2.6.36/drivers/gpu/drm/i915/dvo.h
+--- linux-2.6.36/drivers/gpu/drm/i915/dvo.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/i915/dvo.h 2010-11-06 18:58:15.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.35.4/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.35.4/drivers/gpu/drm/i915/dvo_ivch.c
---- linux-2.6.35.4/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/i915/dvo_ivch.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.36/drivers/gpu/drm/i915/dvo_ivch.c
+--- linux-2.6.36/drivers/gpu/drm/i915/dvo_ivch.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/i915/dvo_ivch.c 2010-11-06 18:58:15.000000000 -0400
@@ -412,7 +412,7 @@ static void ivch_destroy(struct intel_dv
}
}
.init = ivch_init,
.dpms = ivch_dpms,
.mode_valid = ivch_mode_valid,
-diff -urNp linux-2.6.35.4/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.35.4/drivers/gpu/drm/i915/dvo_sil164.c
---- linux-2.6.35.4/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/i915/dvo_sil164.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.36/drivers/gpu/drm/i915/dvo_sil164.c
+--- linux-2.6.36/drivers/gpu/drm/i915/dvo_sil164.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/i915/dvo_sil164.c 2010-11-06 18:58:15.000000000 -0400
@@ -254,7 +254,7 @@ static void sil164_destroy(struct intel_
}
}
.init = sil164_init,
.detect = sil164_detect,
.mode_valid = sil164_mode_valid,
-diff -urNp linux-2.6.35.4/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.35.4/drivers/gpu/drm/i915/dvo_tfp410.c
---- linux-2.6.35.4/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/i915/dvo_tfp410.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.36/drivers/gpu/drm/i915/dvo_tfp410.c
+--- linux-2.6.36/drivers/gpu/drm/i915/dvo_tfp410.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/i915/dvo_tfp410.c 2010-11-06 18:58:15.000000000 -0400
@@ -295,7 +295,7 @@ static void tfp410_destroy(struct intel_
}
}
.init = tfp410_init,
.detect = tfp410_detect,
.mode_valid = tfp410_mode_valid,
-diff -urNp linux-2.6.35.4/drivers/gpu/drm/i915/i915_dma.c linux-2.6.35.4/drivers/gpu/drm/i915/i915_dma.c
---- linux-2.6.35.4/drivers/gpu/drm/i915/i915_dma.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/i915/i915_dma.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1342,7 +1342,7 @@ static bool i915_switcheroo_can_switch(s
+diff -urNp linux-2.6.36/drivers/gpu/drm/i915/i915_dma.c linux-2.6.36/drivers/gpu/drm/i915/i915_dma.c
+--- linux-2.6.36/drivers/gpu/drm/i915/i915_dma.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/i915/i915_dma.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1357,7 +1357,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.35.4/drivers/gpu/drm/i915/i915_drv.c linux-2.6.35.4/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.35.4/drivers/gpu/drm/i915/i915_drv.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/i915/i915_drv.c 2010-09-17 20:12:09.000000000 -0400
-@@ -491,7 +491,7 @@ const struct dev_pm_ops i915_pm_ops = {
+diff -urNp linux-2.6.36/drivers/gpu/drm/i915/i915_drv.c linux-2.6.36/drivers/gpu/drm/i915/i915_drv.c
+--- linux-2.6.36/drivers/gpu/drm/i915/i915_drv.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/i915/i915_drv.c 2010-11-06 18:58:15.000000000 -0400
+@@ -492,7 +492,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.35.4/drivers/gpu/drm/nouveau/nouveau_backlight.c linux-2.6.35.4/drivers/gpu/drm/nouveau/nouveau_backlight.c
---- linux-2.6.35.4/drivers/gpu/drm/nouveau/nouveau_backlight.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/nouveau/nouveau_backlight.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/gpu/drm/i915/i915_gem.c linux-2.6.36/drivers/gpu/drm/i915/i915_gem.c
+--- linux-2.6.36/drivers/gpu/drm/i915/i915_gem.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/i915/i915_gem.c 2010-11-06 18:58:50.000000000 -0400
+@@ -476,12 +476,17 @@ i915_gem_pread_ioctl(struct drm_device *
+ }
+
+ if (!access_ok(VERIFY_WRITE,
+- (char __user *)(uintptr_t)args->data_ptr,
++ (char __user *) (uintptr_t)args->data_ptr,
+ args->size)) {
+ ret = -EFAULT;
+ goto err;
+ }
+
++ if (!access_ok(VERIFY_WRITE, (char __user *) (uintptr_t)args->data_ptr, args->size)) {
++ drm_gem_object_unreference_unlocked(obj);
++ return -EFAULT;
++ }
++
+ if (i915_gem_object_needs_bit17_swizzle(obj)) {
+ ret = i915_gem_shmem_pread_slow(dev, obj, args, file_priv);
+ } else {
+@@ -940,12 +945,17 @@ i915_gem_pwrite_ioctl(struct drm_device
+ }
+
+ if (!access_ok(VERIFY_READ,
+- (char __user *)(uintptr_t)args->data_ptr,
++ (char __user *) (uintptr_t)args->data_ptr,
+ args->size)) {
+ ret = -EFAULT;
+ goto err;
+ }
+
++ if (!access_ok(VERIFY_READ, (char __user *) (uintptr_t)args->data_ptr, args->size)) {
++ drm_gem_object_unreference_unlocked(obj);
++ return -EFAULT;
++ }
++
+ /* We can only do the GTT pwrite on untiled buffers, as otherwise
+ * it would end up going through the fenced access, and we'll get
+ * different detiling behavior between reading and writing.
+diff -urNp linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_backlight.c linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_backlight.c
+--- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_backlight.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_backlight.c 2010-11-06 18:58:15.000000000 -0400
@@ -58,7 +58,7 @@ static int nv40_set_intensity(struct bac
return 0;
}
.options = BL_CORE_SUSPENDRESUME,
.get_brightness = nv50_get_intensity,
.update_status = nv50_set_intensity,
-diff -urNp linux-2.6.35.4/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.35.4/drivers/gpu/drm/nouveau/nouveau_state.c
---- linux-2.6.35.4/drivers/gpu/drm/nouveau/nouveau_state.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/nouveau/nouveau_state.c 2010-09-17 20:12:09.000000000 -0400
-@@ -395,7 +395,7 @@ static bool nouveau_switcheroo_can_switc
+diff -urNp linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_state.c
+--- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_state.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_state.c 2010-11-06 18:58:15.000000000 -0400
+@@ -501,7 +501,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.35.4/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.35.4/drivers/gpu/drm/radeon/mkregtable.c
---- linux-2.6.35.4/drivers/gpu/drm/radeon/mkregtable.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/radeon/mkregtable.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.36/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-2.6.36/drivers/gpu/drm/radeon/mkregtable.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/radeon/mkregtable.c 2010-11-06 18:58:15.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.35.4/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.35.4/drivers/gpu/drm/radeon/radeon_device.c
---- linux-2.6.35.4/drivers/gpu/drm/radeon/radeon_device.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/radeon/radeon_device.c 2010-09-17 20:12:09.000000000 -0400
-@@ -562,7 +562,7 @@ static bool radeon_switcheroo_can_switch
+diff -urNp linux-2.6.36/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.36/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-2.6.36/drivers/gpu/drm/radeon/radeon_device.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/radeon/radeon_device.c 2010-11-06 18:58:15.000000000 -0400
+@@ -578,7 +578,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.35.4/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.35.4/drivers/gpu/drm/radeon/radeon_display.c
---- linux-2.6.35.4/drivers/gpu/drm/radeon/radeon_display.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/radeon/radeon_display.c 2010-09-17 20:12:09.000000000 -0400
-@@ -559,7 +559,7 @@ static void radeon_compute_pll_legacy(st
-
- if (pll->flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
- error = freq - current_freq;
-- error = error < 0 ? 0xffffffff : error;
-+ error = (int32_t)error < 0 ? 0xffffffff : error;
- } else
- error = abs(current_freq - freq);
- vco_diff = abs(vco - best_vco);
-diff -urNp linux-2.6.35.4/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.35.4/drivers/gpu/drm/radeon/radeon_state.c
---- linux-2.6.35.4/drivers/gpu/drm/radeon/radeon_state.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/radeon/radeon_state.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.36/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-2.6.36/drivers/gpu/drm/radeon/radeon_state.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/radeon/radeon_state.c 2010-11-06 18:58:15.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.35.4/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.35.4/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-2.6.35.4/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/radeon/radeon_ttm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.36/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-2.6.36/drivers/gpu/drm/radeon/radeon_ttm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/radeon/radeon_ttm.c 2010-11-06 18:58:15.000000000 -0400
@@ -601,8 +601,9 @@ void radeon_ttm_fini(struct radeon_devic
DRM_INFO("radeon: ttm finalized\n");
}
vma->vm_ops = &radeon_ttm_vm_ops;
return 0;
}
-diff -urNp linux-2.6.35.4/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.35.4/drivers/gpu/drm/ttm/ttm_bo.c
---- linux-2.6.35.4/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/ttm/ttm_bo.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo.c
+--- linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo.c 2010-11-06 18:58:15.000000000 -0400
@@ -47,7 +47,7 @@
#include <linux/module.h>
#define TTM_BO_HASH_ORDER 13
static int ttm_bo_setup_vm(struct ttm_buffer_object *bo);
-diff -urNp linux-2.6.35.4/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.35.4/drivers/gpu/drm/ttm/ttm_bo_vm.c
---- linux-2.6.35.4/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo_vm.c
+--- linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-11-06 18:58:15.000000000 -0400
@@ -69,11 +69,11 @@ static struct ttm_buffer_object *ttm_bo_
return best_bo;
}
/*
* Work around locking order reversal in fault / nopfn
* between mmap_sem and bo_reserve: Perform a trylock operation
-@@ -213,7 +217,7 @@ out_unlock:
+@@ -212,22 +216,25 @@ out_unlock:
+ ttm_bo_unreserve(bo);
return retval;
}
++EXPORT_SYMBOL(ttm_bo_vm_fault);
-static void ttm_bo_vm_open(struct vm_area_struct *vma)
+void ttm_bo_vm_open(struct vm_area_struct *vma)
{
struct ttm_buffer_object *bo =
(struct ttm_buffer_object *)vma->vm_private_data;
-@@ -221,7 +225,7 @@ static void ttm_bo_vm_open(struct vm_are
+
(void)ttm_bo_reference(bo);
}
++EXPORT_SYMBOL(ttm_bo_vm_open);
-static void ttm_bo_vm_close(struct vm_area_struct *vma)
+void ttm_bo_vm_close(struct vm_area_struct *vma)
{
struct ttm_buffer_object *bo = (struct ttm_buffer_object *)vma->vm_private_data;
-diff -urNp linux-2.6.35.4/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.35.4/drivers/gpu/drm/ttm/ttm_global.c
---- linux-2.6.35.4/drivers/gpu/drm/ttm/ttm_global.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/gpu/drm/ttm/ttm_global.c 2010-09-17 20:12:09.000000000 -0400
-@@ -36,7 +36,7 @@
- struct ttm_global_item {
- struct mutex mutex;
- void *object;
-- int refcount;
-+ atomic_t refcount;
- };
-
- static struct ttm_global_item glob[TTM_GLOBAL_NUM];
-@@ -49,7 +49,7 @@ void ttm_global_init(void)
- struct ttm_global_item *item = &glob[i];
- mutex_init(&item->mutex);
- item->object = NULL;
-- item->refcount = 0;
-+ atomic_set(&item->refcount, 0);
- }
+ ttm_bo_unref(&bo);
+ vma->vm_private_data = NULL;
}
++EXPORT_SYMBOL(ttm_bo_vm_close);
-@@ -59,7 +59,7 @@ void ttm_global_release(void)
- for (i = 0; i < TTM_GLOBAL_NUM; ++i) {
- struct ttm_global_item *item = &glob[i];
- BUG_ON(item->object != NULL);
-- BUG_ON(item->refcount != 0);
-+ BUG_ON(atomic_read(&item->refcount) != 0);
- }
- }
+ static const struct vm_operations_struct ttm_bo_vm_ops = {
+ .fault = ttm_bo_vm_fault,
+diff -urNp linux-2.6.36/drivers/hid/hidraw.c linux-2.6.36/drivers/hid/hidraw.c
+--- linux-2.6.36/drivers/hid/hidraw.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/hid/hidraw.c 2010-11-06 18:58:50.000000000 -0400
+@@ -250,7 +250,7 @@ static long hidraw_ioctl(struct file *fi
-@@ -70,7 +70,7 @@ int ttm_global_item_ref(struct ttm_globa
- void *object;
-
- mutex_lock(&item->mutex);
-- if (item->refcount == 0) {
-+ if (atomic_read(&item->refcount) == 0) {
- item->object = kzalloc(ref->size, GFP_KERNEL);
- if (unlikely(item->object == NULL)) {
- ret = -ENOMEM;
-@@ -83,7 +83,7 @@ int ttm_global_item_ref(struct ttm_globa
- goto out_err;
-
- }
-- ++item->refcount;
-+ atomic_inc(&item->refcount);
- ref->object = item->object;
- object = item->object;
- mutex_unlock(&item->mutex);
-@@ -100,9 +100,9 @@ void ttm_global_item_unref(struct ttm_gl
- struct ttm_global_item *item = &glob[ref->global_type];
-
- mutex_lock(&item->mutex);
-- BUG_ON(item->refcount == 0);
-+ BUG_ON(atomic_read(&item->refcount) == 0);
- BUG_ON(ref->object != item->object);
-- if (--item->refcount == 0) {
-+ if (atomic_dec_and_test(&item->refcount)) {
- ref->release(ref);
- item->object = NULL;
+ mutex_lock(&minors_lock);
+ dev = hidraw_table[minor];
+- if (!dev) {
++ if (dev == NULL) {
+ ret = -ENODEV;
+ goto out;
}
-diff -urNp linux-2.6.35.4/drivers/hid/usbhid/hiddev.c linux-2.6.35.4/drivers/hid/usbhid/hiddev.c
---- linux-2.6.35.4/drivers/hid/usbhid/hiddev.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/hid/usbhid/hiddev.c 2010-09-17 20:12:09.000000000 -0400
-@@ -616,7 +616,7 @@ static long hiddev_ioctl(struct file *fi
+diff -urNp linux-2.6.36/drivers/hid/usbhid/hiddev.c linux-2.6.36/drivers/hid/usbhid/hiddev.c
+--- linux-2.6.36/drivers/hid/usbhid/hiddev.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/hid/usbhid/hiddev.c 2010-11-06 18:58:15.000000000 -0400
+@@ -614,7 +614,7 @@ static long hiddev_ioctl(struct file *fi
return put_user(HID_VERSION, (int __user *)arg);
case HIDIOCAPPLICATION:
return -EINVAL;
for (i = 0; i < hid->maxcollection; i++)
-diff -urNp linux-2.6.35.4/drivers/hwmon/k8temp.c linux-2.6.35.4/drivers/hwmon/k8temp.c
---- linux-2.6.35.4/drivers/hwmon/k8temp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/hwmon/k8temp.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/hwmon/k8temp.c linux-2.6.36/drivers/hwmon/k8temp.c
+--- linux-2.6.36/drivers/hwmon/k8temp.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/hwmon/k8temp.c 2010-11-06 18:58:15.000000000 -0400
@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
static const struct pci_device_id k8temp_ids[] = {
};
MODULE_DEVICE_TABLE(pci, k8temp_ids);
-diff -urNp linux-2.6.35.4/drivers/hwmon/sis5595.c linux-2.6.35.4/drivers/hwmon/sis5595.c
---- linux-2.6.35.4/drivers/hwmon/sis5595.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/hwmon/sis5595.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/hwmon/sis5595.c linux-2.6.36/drivers/hwmon/sis5595.c
+--- linux-2.6.36/drivers/hwmon/sis5595.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/hwmon/sis5595.c 2010-11-06 18:58:15.000000000 -0400
@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
static const struct pci_device_id sis5595_pci_ids[] = {
};
MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
-diff -urNp linux-2.6.35.4/drivers/hwmon/via686a.c linux-2.6.35.4/drivers/hwmon/via686a.c
---- linux-2.6.35.4/drivers/hwmon/via686a.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/hwmon/via686a.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/hwmon/via686a.c linux-2.6.36/drivers/hwmon/via686a.c
+--- linux-2.6.36/drivers/hwmon/via686a.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/hwmon/via686a.c 2010-11-06 18:58:15.000000000 -0400
@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda
static const struct pci_device_id via686a_pci_ids[] = {
};
MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
-diff -urNp linux-2.6.35.4/drivers/hwmon/vt8231.c linux-2.6.35.4/drivers/hwmon/vt8231.c
---- linux-2.6.35.4/drivers/hwmon/vt8231.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/hwmon/vt8231.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/hwmon/vt8231.c linux-2.6.36/drivers/hwmon/vt8231.c
+--- linux-2.6.36/drivers/hwmon/vt8231.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/hwmon/vt8231.c 2010-11-06 18:58:15.000000000 -0400
@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
static const struct pci_device_id vt8231_pci_ids[] = {
};
MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
-diff -urNp linux-2.6.35.4/drivers/hwmon/w83791d.c linux-2.6.35.4/drivers/hwmon/w83791d.c
---- linux-2.6.35.4/drivers/hwmon/w83791d.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/hwmon/w83791d.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/hwmon/w83791d.c linux-2.6.36/drivers/hwmon/w83791d.c
+--- linux-2.6.36/drivers/hwmon/w83791d.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/hwmon/w83791d.c 2010-11-06 18:58:15.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.35.4/drivers/i2c/busses/i2c-i801.c linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c
---- linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/i2c/busses/i2c-i801.c linux-2.6.36/drivers/i2c/busses/i2c-i801.c
+--- linux-2.6.36/drivers/i2c/busses/i2c-i801.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/i2c/busses/i2c-i801.c 2010-11-06 18:58:15.000000000 -0400
@@ -592,7 +592,7 @@ static const struct pci_device_id i801_i
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
};
MODULE_DEVICE_TABLE(pci, i801_ids);
-diff -urNp linux-2.6.35.4/drivers/i2c/busses/i2c-piix4.c linux-2.6.35.4/drivers/i2c/busses/i2c-piix4.c
---- linux-2.6.35.4/drivers/i2c/busses/i2c-piix4.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/i2c/busses/i2c-piix4.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/i2c/busses/i2c-piix4.c linux-2.6.36/drivers/i2c/busses/i2c-piix4.c
+--- linux-2.6.36/drivers/i2c/busses/i2c-piix4.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/i2c/busses/i2c-piix4.c 2010-11-06 18:58:15.000000000 -0400
@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
.ident = "IBM",
.matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
};
MODULE_DEVICE_TABLE (pci, piix4_ids);
-diff -urNp linux-2.6.35.4/drivers/i2c/busses/i2c-sis630.c linux-2.6.35.4/drivers/i2c/busses/i2c-sis630.c
---- linux-2.6.35.4/drivers/i2c/busses/i2c-sis630.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/i2c/busses/i2c-sis630.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/i2c/busses/i2c-sis630.c linux-2.6.36/drivers/i2c/busses/i2c-sis630.c
+--- linux-2.6.36/drivers/i2c/busses/i2c-sis630.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/i2c/busses/i2c-sis630.c 2010-11-06 18:58:15.000000000 -0400
@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
static const struct pci_device_id sis630_ids[] __devinitconst = {
{ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
};
MODULE_DEVICE_TABLE (pci, sis630_ids);
-diff -urNp linux-2.6.35.4/drivers/i2c/busses/i2c-sis96x.c linux-2.6.35.4/drivers/i2c/busses/i2c-sis96x.c
---- linux-2.6.35.4/drivers/i2c/busses/i2c-sis96x.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/i2c/busses/i2c-sis96x.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/i2c/busses/i2c-sis96x.c linux-2.6.36/drivers/i2c/busses/i2c-sis96x.c
+--- linux-2.6.36/drivers/i2c/busses/i2c-sis96x.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/i2c/busses/i2c-sis96x.c 2010-11-06 18:58:15.000000000 -0400
@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
static const struct pci_device_id sis96x_ids[] = {
};
MODULE_DEVICE_TABLE (pci, sis96x_ids);
-diff -urNp linux-2.6.35.4/drivers/ide/ide-cd.c linux-2.6.35.4/drivers/ide/ide-cd.c
---- linux-2.6.35.4/drivers/ide/ide-cd.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ide/ide-cd.c 2010-09-17 20:12:09.000000000 -0400
-@@ -774,7 +774,7 @@ static void cdrom_do_block_pc(ide_drive_
+diff -urNp linux-2.6.36/drivers/ide/ide-cd.c linux-2.6.36/drivers/ide/ide-cd.c
+--- linux-2.6.36/drivers/ide/ide-cd.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ide/ide-cd.c 2010-11-06 18:58:15.000000000 -0400
+@@ -776,7 +776,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.35.4/drivers/ieee1394/dv1394.c linux-2.6.35.4/drivers/ieee1394/dv1394.c
---- linux-2.6.35.4/drivers/ieee1394/dv1394.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ieee1394/dv1394.c 2010-09-17 20:12:09.000000000 -0400
-@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
+diff -urNp linux-2.6.36/drivers/ieee1394/dv1394.c linux-2.6.36/drivers/ieee1394/dv1394.c
+--- linux-2.6.36/drivers/ieee1394/dv1394.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ieee1394/dv1394.c 2010-11-06 18:58:15.000000000 -0400
+@@ -738,7 +738,7 @@ static void frame_prepare(struct video_c
based upon DIF section and sequence
*/
frame_put_packet (struct frame *f, struct packet *p)
{
int section_type = p->data[0] >> 5; /* section type is in bits 5 - 7 */
-@@ -2179,7 +2179,7 @@ static const struct ieee1394_device_id d
+@@ -2173,7 +2173,7 @@ static const struct ieee1394_device_id d
.specifier_id = AVC_UNIT_SPEC_ID_ENTRY & 0xffffff,
.version = AVC_SW_VERSION_ENTRY & 0xffffff
},
};
MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
-diff -urNp linux-2.6.35.4/drivers/ieee1394/eth1394.c linux-2.6.35.4/drivers/ieee1394/eth1394.c
---- linux-2.6.35.4/drivers/ieee1394/eth1394.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ieee1394/eth1394.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ieee1394/eth1394.c linux-2.6.36/drivers/ieee1394/eth1394.c
+--- linux-2.6.36/drivers/ieee1394/eth1394.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ieee1394/eth1394.c 2010-11-06 18:58:15.000000000 -0400
@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
.specifier_id = ETHER1394_GASP_SPECIFIER_ID,
.version = ETHER1394_GASP_VERSION,
};
MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
-diff -urNp linux-2.6.35.4/drivers/ieee1394/hosts.c linux-2.6.35.4/drivers/ieee1394/hosts.c
---- linux-2.6.35.4/drivers/ieee1394/hosts.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ieee1394/hosts.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ieee1394/hosts.c linux-2.6.36/drivers/ieee1394/hosts.c
+--- linux-2.6.36/drivers/ieee1394/hosts.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ieee1394/hosts.c 2010-11-06 18:58:15.000000000 -0400
@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso
}
.transmit_packet = dummy_transmit_packet,
.devctl = dummy_devctl,
.isoctl = dummy_isoctl
-diff -urNp linux-2.6.35.4/drivers/ieee1394/ohci1394.c linux-2.6.35.4/drivers/ieee1394/ohci1394.c
---- linux-2.6.35.4/drivers/ieee1394/ohci1394.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ieee1394/ohci1394.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ieee1394/ohci1394.c linux-2.6.36/drivers/ieee1394/ohci1394.c
+--- linux-2.6.36/drivers/ieee1394/ohci1394.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ieee1394/ohci1394.c 2010-11-06 18:58:15.000000000 -0400
@@ -148,9 +148,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
};
MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
-diff -urNp linux-2.6.35.4/drivers/ieee1394/raw1394.c linux-2.6.35.4/drivers/ieee1394/raw1394.c
---- linux-2.6.35.4/drivers/ieee1394/raw1394.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ieee1394/raw1394.c 2010-09-17 20:12:09.000000000 -0400
-@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r
+diff -urNp linux-2.6.36/drivers/ieee1394/raw1394.c linux-2.6.36/drivers/ieee1394/raw1394.c
+--- linux-2.6.36/drivers/ieee1394/raw1394.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ieee1394/raw1394.c 2010-11-06 18:58:15.000000000 -0400
+@@ -3001,7 +3001,7 @@ static const struct ieee1394_device_id r
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
.specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
.version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff},
};
MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
-diff -urNp linux-2.6.35.4/drivers/ieee1394/sbp2.c linux-2.6.35.4/drivers/ieee1394/sbp2.c
---- linux-2.6.35.4/drivers/ieee1394/sbp2.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ieee1394/sbp2.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/ieee1394/sbp2.c linux-2.6.36/drivers/ieee1394/sbp2.c
+--- linux-2.6.36/drivers/ieee1394/sbp2.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ieee1394/sbp2.c 2010-11-06 18:58:15.000000000 -0400
@@ -289,7 +289,7 @@ static const struct ieee1394_device_id s
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
.specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff,
};
MODULE_DEVICE_TABLE(ieee1394, sbp2_id_table);
-@@ -2110,7 +2110,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 prot
+@@ -2107,7 +2107,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 prot
MODULE_SUPPORTED_DEVICE(SBP2_DEVICE_NAME);
MODULE_LICENSE("GPL");
{
int ret;
-diff -urNp linux-2.6.35.4/drivers/ieee1394/video1394.c linux-2.6.35.4/drivers/ieee1394/video1394.c
---- linux-2.6.35.4/drivers/ieee1394/video1394.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/ieee1394/video1394.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1312,7 +1312,7 @@ static const struct ieee1394_device_id v
+diff -urNp linux-2.6.36/drivers/ieee1394/video1394.c linux-2.6.36/drivers/ieee1394/video1394.c
+--- linux-2.6.36/drivers/ieee1394/video1394.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/ieee1394/video1394.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1307,7 +1307,7 @@ static const struct ieee1394_device_id v
.specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
.version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff
},
};
MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
-diff -urNp linux-2.6.35.4/drivers/infiniband/core/cm.c linux-2.6.35.4/drivers/infiniband/core/cm.c
---- linux-2.6.35.4/drivers/infiniband/core/cm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/infiniband/core/cm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/infiniband/core/cm.c linux-2.6.36/drivers/infiniband/core/cm.c
+--- linux-2.6.36/drivers/infiniband/core/cm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/infiniband/core/cm.c 2010-11-06 18:58:15.000000000 -0400
@@ -113,7 +113,7 @@ static char const counter_group_names[CM
struct cm_counter_group {
counter[CM_DREQ_COUNTER]);
goto unlock;
default:
-@@ -2502,7 +2502,7 @@ static int cm_mra_handler(struct cm_work
+@@ -2504,7 +2504,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;
-@@ -2511,7 +2511,7 @@ static int cm_mra_handler(struct cm_work
+@@ -2513,7 +2513,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:
-@@ -2673,7 +2673,7 @@ static int cm_lap_handler(struct cm_work
+@@ -2675,7 +2675,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;
-@@ -2689,7 +2689,7 @@ static int cm_lap_handler(struct cm_work
+@@ -2691,7 +2691,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:
-@@ -2973,7 +2973,7 @@ static int cm_sidr_req_handler(struct cm
+@@ -2975,7 +2975,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. */
}
-@@ -3184,10 +3184,10 @@ static void cm_send_handler(struct ib_ma
+@@ -3186,10 +3186,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]);
-@@ -3397,7 +3397,7 @@ static void cm_recv_handler(struct ib_ma
+@@ -3399,7 +3399,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,
-@@ -3595,7 +3595,7 @@ static ssize_t cm_show_counter(struct ko
+@@ -3597,7 +3597,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.35.4/drivers/infiniband/hw/qib/qib.h linux-2.6.35.4/drivers/infiniband/hw/qib/qib.h
---- linux-2.6.35.4/drivers/infiniband/hw/qib/qib.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/infiniband/hw/qib/qib.h 2010-09-17 20:12:09.000000000 -0400
-@@ -50,6 +50,7 @@
+diff -urNp linux-2.6.36/drivers/infiniband/hw/qib/qib.h linux-2.6.36/drivers/infiniband/hw/qib/qib.h
+--- linux-2.6.36/drivers/infiniband/hw/qib/qib.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/infiniband/hw/qib/qib.h 2010-11-06 18:58:15.000000000 -0400
+@@ -51,6 +51,7 @@
#include <linux/completion.h>
#include <linux/kref.h>
#include <linux/sched.h>
#include "qib_common.h"
#include "qib_verbs.h"
-diff -urNp linux-2.6.35.4/drivers/input/keyboard/atkbd.c linux-2.6.35.4/drivers/input/keyboard/atkbd.c
---- linux-2.6.35.4/drivers/input/keyboard/atkbd.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/input/keyboard/atkbd.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/input/keyboard/atkbd.c linux-2.6.36/drivers/input/keyboard/atkbd.c
+--- linux-2.6.36/drivers/input/keyboard/atkbd.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/input/keyboard/atkbd.c 2010-11-06 18:58:15.000000000 -0400
@@ -1240,7 +1240,7 @@ static struct serio_device_id atkbd_seri
.id = SERIO_ANY,
.extra = SERIO_ANY,
};
MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
-diff -urNp linux-2.6.35.4/drivers/input/mouse/lifebook.c linux-2.6.35.4/drivers/input/mouse/lifebook.c
---- linux-2.6.35.4/drivers/input/mouse/lifebook.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/input/mouse/lifebook.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/input/mouse/lifebook.c linux-2.6.36/drivers/input/mouse/lifebook.c
+--- linux-2.6.36/drivers/input/mouse/lifebook.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/input/mouse/lifebook.c 2010-11-06 18:58:15.000000000 -0400
@@ -123,7 +123,7 @@ static const struct dmi_system_id __init
DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
},
};
void __init lifebook_module_init(void)
-diff -urNp linux-2.6.35.4/drivers/input/mouse/psmouse-base.c linux-2.6.35.4/drivers/input/mouse/psmouse-base.c
---- linux-2.6.35.4/drivers/input/mouse/psmouse-base.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/input/mouse/psmouse-base.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1460,7 +1460,7 @@ static struct serio_device_id psmouse_se
+diff -urNp linux-2.6.36/drivers/input/mouse/psmouse-base.c linux-2.6.36/drivers/input/mouse/psmouse-base.c
+--- linux-2.6.36/drivers/input/mouse/psmouse-base.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/input/mouse/psmouse-base.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1462,7 +1462,7 @@ static struct serio_device_id psmouse_se
.id = SERIO_ANY,
.extra = SERIO_ANY,
},
};
MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
-diff -urNp linux-2.6.35.4/drivers/input/mouse/synaptics.c linux-2.6.35.4/drivers/input/mouse/synaptics.c
---- linux-2.6.35.4/drivers/input/mouse/synaptics.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/input/mouse/synaptics.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/input/mouse/synaptics.c linux-2.6.36/drivers/input/mouse/synaptics.c
+--- linux-2.6.36/drivers/input/mouse/synaptics.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/input/mouse/synaptics.c 2010-11-06 18:58:15.000000000 -0400
@@ -476,7 +476,7 @@ static void synaptics_process_packet(str
break;
case 2:
break;
case 4 ... 15:
if (SYN_CAP_PALMDETECT(priv->capabilities))
-@@ -701,7 +701,6 @@ static const struct dmi_system_id __init
+@@ -705,7 +705,6 @@ static const struct dmi_system_id __init
DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M300"),
},
},
{
/* Toshiba Portege M300 */
-@@ -710,9 +709,8 @@ static const struct dmi_system_id __init
+@@ -714,9 +713,8 @@ static const struct dmi_system_id __init
DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"),
DMI_MATCH(DMI_PRODUCT_VERSION, "Version 1.0"),
},
#endif
};
-diff -urNp linux-2.6.35.4/drivers/input/mousedev.c linux-2.6.35.4/drivers/input/mousedev.c
---- linux-2.6.35.4/drivers/input/mousedev.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/input/mousedev.c 2010-09-17 20:12:09.000000000 -0400
-@@ -754,7 +754,7 @@ static ssize_t mousedev_read(struct file
+diff -urNp linux-2.6.36/drivers/input/mousedev.c linux-2.6.36/drivers/input/mousedev.c
+--- linux-2.6.36/drivers/input/mousedev.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/input/mousedev.c 2010-11-06 18:58:15.000000000 -0400
+@@ -762,7 +762,7 @@ static ssize_t mousedev_read(struct file
spin_unlock_irq(&client->packet_lock);
return -EFAULT;
return count;
-@@ -1051,7 +1051,7 @@ static struct input_handler mousedev_han
+@@ -1064,7 +1064,7 @@ static struct input_handler mousedev_han
#ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
static struct miscdevice psaux_mouse = {
};
static int psaux_registered;
#endif
-diff -urNp linux-2.6.35.4/drivers/input/serio/i8042-x86ia64io.h linux-2.6.35.4/drivers/input/serio/i8042-x86ia64io.h
---- linux-2.6.35.4/drivers/input/serio/i8042-x86ia64io.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/input/serio/i8042-x86ia64io.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/input/serio/i8042-x86ia64io.h linux-2.6.36/drivers/input/serio/i8042-x86ia64io.h
+--- linux-2.6.36/drivers/input/serio/i8042-x86ia64io.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/input/serio/i8042-x86ia64io.h 2010-11-06 18:58:15.000000000 -0400
@@ -183,7 +183,7 @@ static const struct dmi_system_id __init
DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
},
};
#endif /* CONFIG_X86 */
-diff -urNp linux-2.6.35.4/drivers/input/serio/serio_raw.c linux-2.6.35.4/drivers/input/serio/serio_raw.c
---- linux-2.6.35.4/drivers/input/serio/serio_raw.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/input/serio/serio_raw.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/input/serio/serio_raw.c linux-2.6.36/drivers/input/serio/serio_raw.c
+--- linux-2.6.36/drivers/input/serio/serio_raw.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/input/serio/serio_raw.c 2010-11-06 18:58:15.000000000 -0400
@@ -376,7 +376,7 @@ static struct serio_device_id serio_raw_
.id = SERIO_ANY,
.extra = SERIO_ANY,
};
MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
-diff -urNp linux-2.6.35.4/drivers/isdn/gigaset/common.c linux-2.6.35.4/drivers/isdn/gigaset/common.c
---- linux-2.6.35.4/drivers/isdn/gigaset/common.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/isdn/gigaset/common.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/isdn/gigaset/common.c linux-2.6.36/drivers/isdn/gigaset/common.c
+--- linux-2.6.36/drivers/isdn/gigaset/common.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/isdn/gigaset/common.c 2010-11-06 18:58:15.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.35.4/drivers/isdn/gigaset/gigaset.h linux-2.6.35.4/drivers/isdn/gigaset/gigaset.h
---- linux-2.6.35.4/drivers/isdn/gigaset/gigaset.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/isdn/gigaset/gigaset.h 2010-09-17 20:12:09.000000000 -0400
-@@ -442,7 +442,7 @@ struct cardstate {
+diff -urNp linux-2.6.36/drivers/isdn/gigaset/gigaset.h linux-2.6.36/drivers/isdn/gigaset/gigaset.h
+--- linux-2.6.36/drivers/isdn/gigaset/gigaset.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/isdn/gigaset/gigaset.h 2010-11-06 18:58:15.000000000 -0400
+@@ -434,7 +434,7 @@ struct cardstate {
spinlock_t cmdlock;
unsigned curlen, cmdbytes;
struct tty_struct *tty;
struct tasklet_struct if_wake_tasklet;
unsigned control_state;
-diff -urNp linux-2.6.35.4/drivers/isdn/gigaset/interface.c linux-2.6.35.4/drivers/isdn/gigaset/interface.c
---- linux-2.6.35.4/drivers/isdn/gigaset/interface.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/isdn/gigaset/interface.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/isdn/gigaset/interface.c linux-2.6.36/drivers/isdn/gigaset/interface.c
+--- linux-2.6.36/drivers/isdn/gigaset/interface.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/isdn/gigaset/interface.c 2010-11-06 18:58:15.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__);
else {
retval = 0;
-@@ -355,7 +353,7 @@ static int if_write(struct tty_struct *t
- if (!cs->connected) {
- gig_dbg(DEBUG_IF, "not connected");
+@@ -358,7 +356,7 @@ static int if_write(struct tty_struct *t
retval = -ENODEV;
-- } else if (!cs->open_count)
-+ } else if (!atomic_read(&cs->open_count))
+ goto done;
+ }
+- if (!cs->open_count) {
++ if (!atomic_read(&cs->open_count)) {
dev_warn(cs->dev, "%s: device not opened\n", __func__);
- else if (cs->mstate != MS_LOCKED) {
- dev_warn(cs->dev, "can't write to unlocked device\n");
-@@ -389,7 +387,7 @@ static int if_write_room(struct tty_stru
+ retval = -ENODEV;
+ goto done;
+@@ -411,7 +409,7 @@ static int if_write_room(struct tty_stru
if (!cs->connected) {
gig_dbg(DEBUG_IF, "not connected");
retval = -ENODEV;
dev_warn(cs->dev, "%s: device not opened\n", __func__);
else if (cs->mstate != MS_LOCKED) {
dev_warn(cs->dev, "can't write to unlocked device\n");
-@@ -419,7 +417,7 @@ static int if_chars_in_buffer(struct tty
+@@ -441,7 +439,7 @@ static int if_chars_in_buffer(struct tty
if (!cs->connected)
gig_dbg(DEBUG_IF, "not connected");
dev_warn(cs->dev, "%s: device not opened\n", __func__);
else if (cs->mstate != MS_LOCKED)
dev_warn(cs->dev, "can't write to unlocked device\n");
-@@ -447,7 +445,7 @@ static void if_throttle(struct tty_struc
+@@ -469,7 +467,7 @@ static void if_throttle(struct tty_struc
if (!cs->connected)
gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
dev_warn(cs->dev, "%s: device not opened\n", __func__);
else
gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
-@@ -471,7 +469,7 @@ static void if_unthrottle(struct tty_str
+@@ -493,7 +491,7 @@ static void if_unthrottle(struct tty_str
if (!cs->connected)
gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
dev_warn(cs->dev, "%s: device not opened\n", __func__);
else
gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
-@@ -502,7 +500,7 @@ static void if_set_termios(struct tty_st
+@@ -524,7 +522,7 @@ static void if_set_termios(struct tty_st
goto out;
}
dev_warn(cs->dev, "%s: device not opened\n", __func__);
goto out;
}
-diff -urNp linux-2.6.35.4/drivers/isdn/hardware/avm/b1.c linux-2.6.35.4/drivers/isdn/hardware/avm/b1.c
---- linux-2.6.35.4/drivers/isdn/hardware/avm/b1.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/isdn/hardware/avm/b1.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/drivers/isdn/hardware/avm/b1.c linux-2.6.36/drivers/isdn/hardware/avm/b1.c
+--- linux-2.6.36/drivers/isdn/hardware/avm/b1.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/isdn/hardware/avm/b1.c 2010-11-06 18:58:50.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.35.4/drivers/isdn/icn/icn.c linux-2.6.35.4/drivers/isdn/icn/icn.c
---- linux-2.6.35.4/drivers/isdn/icn/icn.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/isdn/icn/icn.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/drivers/isdn/icn/icn.c linux-2.6.36/drivers/isdn/icn/icn.c
+--- linux-2.6.36/drivers/isdn/icn/icn.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/isdn/icn/icn.c 2010-11-06 18:58:50.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.35.4/drivers/lguest/core.c linux-2.6.35.4/drivers/lguest/core.c
---- linux-2.6.35.4/drivers/lguest/core.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/lguest/core.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/lguest/core.c linux-2.6.36/drivers/lguest/core.c
+--- linux-2.6.36/drivers/lguest/core.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/lguest/core.c 2010-11-06 18:58:15.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.
if (!switcher_vma) {
err = -ENOMEM;
printk("lguest: could not map switcher pages high\n");
-diff -urNp linux-2.6.35.4/drivers/macintosh/via-pmu-backlight.c linux-2.6.35.4/drivers/macintosh/via-pmu-backlight.c
---- linux-2.6.35.4/drivers/macintosh/via-pmu-backlight.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/macintosh/via-pmu-backlight.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/macintosh/via-pmu-backlight.c linux-2.6.36/drivers/macintosh/via-pmu-backlight.c
+--- linux-2.6.36/drivers/macintosh/via-pmu-backlight.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/macintosh/via-pmu-backlight.c 2010-11-06 18:58:15.000000000 -0400
@@ -15,7 +15,7 @@
#define MAX_PMU_LEVEL 0xFF
.get_brightness = pmu_backlight_get_brightness,
.update_status = pmu_backlight_update_status,
-diff -urNp linux-2.6.35.4/drivers/macintosh/via-pmu.c linux-2.6.35.4/drivers/macintosh/via-pmu.c
---- linux-2.6.35.4/drivers/macintosh/via-pmu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/macintosh/via-pmu.c 2010-09-17 20:12:09.000000000 -0400
-@@ -2254,7 +2254,7 @@ static int pmu_sleep_valid(suspend_state
+diff -urNp linux-2.6.36/drivers/macintosh/via-pmu.c linux-2.6.36/drivers/macintosh/via-pmu.c
+--- linux-2.6.36/drivers/macintosh/via-pmu.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/macintosh/via-pmu.c 2010-11-06 18:58:15.000000000 -0400
+@@ -2256,7 +2256,7 @@ static int pmu_sleep_valid(suspend_state
&& (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
}
.enter = powerbook_sleep,
.valid = pmu_sleep_valid,
};
-diff -urNp linux-2.6.35.4/drivers/md/bitmap.c linux-2.6.35.4/drivers/md/bitmap.c
---- linux-2.6.35.4/drivers/md/bitmap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/md/bitmap.c 2010-09-17 20:12:09.000000000 -0400
-@@ -58,7 +58,7 @@
+diff -urNp linux-2.6.36/drivers/md/bitmap.c linux-2.6.36/drivers/md/bitmap.c
+--- linux-2.6.36/drivers/md/bitmap.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/md/bitmap.c 2010-11-06 18:58:15.000000000 -0400
+@@ -55,7 +55,7 @@
# if DEBUG > 0
# define PRINTK(x...) printk(KERN_DEBUG x)
# else
# endif
#endif
-diff -urNp linux-2.6.35.4/drivers/md/dm-table.c linux-2.6.35.4/drivers/md/dm-table.c
---- linux-2.6.35.4/drivers/md/dm-table.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/md/dm-table.c 2010-09-17 20:12:09.000000000 -0400
-@@ -363,7 +363,7 @@ static int device_area_is_invalid(struct
+diff -urNp linux-2.6.36/drivers/md/dm-table.c linux-2.6.36/drivers/md/dm-table.c
+--- linux-2.6.36/drivers/md/dm-table.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/md/dm-table.c 2010-11-06 18:58:15.000000000 -0400
+@@ -366,7 +366,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.35.4/drivers/md/md.c linux-2.6.35.4/drivers/md/md.c
---- linux-2.6.35.4/drivers/md/md.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/md/md.c 2010-09-17 20:12:09.000000000 -0400
-@@ -6352,7 +6352,7 @@ static int md_seq_show(struct seq_file *
+diff -urNp linux-2.6.36/drivers/md/md.c linux-2.6.36/drivers/md/md.c
+--- linux-2.6.36/drivers/md/md.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/md/md.c 2010-11-06 18:58:15.000000000 -0400
+@@ -6403,7 +6403,7 @@ static int md_seq_show(struct seq_file *
chunk_kb ? "KB" : "B");
if (bitmap->file) {
seq_printf(seq, ", file: ");
}
seq_printf(seq, "\n");
-@@ -6446,7 +6446,7 @@ static int is_mddev_idle(mddev_t *mddev,
+@@ -6497,7 +6497,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.35.4/drivers/md/md.h linux-2.6.35.4/drivers/md/md.h
---- linux-2.6.35.4/drivers/md/md.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/md/md.h 2010-09-17 20:12:09.000000000 -0400
-@@ -334,7 +334,7 @@ static inline void rdev_dec_pending(mdk_
+diff -urNp linux-2.6.36/drivers/md/md.h linux-2.6.36/drivers/md/md.h
+--- linux-2.6.36/drivers/md/md.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/md/md.h 2010-11-06 18:58:15.000000000 -0400
+@@ -362,7 +362,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.35.4/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.35.4/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-2.6.35.4/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/media/dvb/dvb-core/dvbdev.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.36/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-2.6.36/drivers/media/dvb/dvb-core/dvbdev.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/media/dvb/dvb-core/dvbdev.c 2010-11-06 18:58:15.000000000 -0400
@@ -196,6 +196,7 @@ int dvb_register_device(struct dvb_adapt
const struct dvb_device *template, void *priv, int type)
{
struct file_operations *dvbdevfops;
struct device *clsdev;
int minor;
-diff -urNp linux-2.6.35.4/drivers/media/radio/radio-cadet.c linux-2.6.35.4/drivers/media/radio/radio-cadet.c
---- linux-2.6.35.4/drivers/media/radio/radio-cadet.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/media/radio/radio-cadet.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/drivers/media/IR/lirc_dev.c linux-2.6.36/drivers/media/IR/lirc_dev.c
+--- linux-2.6.36/drivers/media/IR/lirc_dev.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/media/IR/lirc_dev.c 2010-11-06 18:58:15.000000000 -0400
+@@ -155,7 +155,7 @@ static int lirc_thread(void *irctl)
+ }
+
+
+-static struct file_operations fops = {
++static const struct file_operations fops = {
+ .owner = THIS_MODULE,
+ .read = lirc_dev_fop_read,
+ .write = lirc_dev_fop_write,
+diff -urNp linux-2.6.36/drivers/media/radio/radio-cadet.c linux-2.6.36/drivers/media/radio/radio-cadet.c
+--- linux-2.6.36/drivers/media/radio/radio-cadet.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/media/radio/radio-cadet.c 2010-11-06 18:58:50.000000000 -0400
@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f
while (i < count && dev->rdsin != dev->rdsout)
readbuf[i++] = dev->rdsbuf[dev->rdsout++];
return -EFAULT;
return i;
}
-diff -urNp linux-2.6.35.4/drivers/message/fusion/mptbase.c linux-2.6.35.4/drivers/message/fusion/mptbase.c
---- linux-2.6.35.4/drivers/message/fusion/mptbase.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/message/fusion/mptbase.c 2010-09-17 20:12:37.000000000 -0400
-@@ -6715,8 +6715,14 @@ procmpt_iocinfo_read(char *buf, char **s
- len += sprintf(buf+len, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
- len += sprintf(buf+len, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
+diff -urNp linux-2.6.36/drivers/message/fusion/mptbase.c linux-2.6.36/drivers/message/fusion/mptbase.c
+--- linux-2.6.36/drivers/message/fusion/mptbase.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/message/fusion/mptbase.c 2010-11-06 19:06:37.000000000 -0400
+@@ -6681,8 +6681,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);
+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+ len += sprintf(buf+len, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
-+ NULL, NULL);
++ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
+#else
- len += sprintf(buf+len, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
(void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
+#endif
+
/*
* Rounding UP to nearest 4-kB boundary here...
*/
-diff -urNp linux-2.6.35.4/drivers/message/fusion/mptdebug.h linux-2.6.35.4/drivers/message/fusion/mptdebug.h
---- linux-2.6.35.4/drivers/message/fusion/mptdebug.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/message/fusion/mptdebug.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/message/fusion/mptdebug.h linux-2.6.36/drivers/message/fusion/mptdebug.h
+--- linux-2.6.36/drivers/message/fusion/mptdebug.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/message/fusion/mptdebug.h 2010-11-06 18:58:15.000000000 -0400
@@ -71,7 +71,7 @@
CMD; \
}
#endif
-diff -urNp linux-2.6.35.4/drivers/message/fusion/mptsas.c linux-2.6.35.4/drivers/message/fusion/mptsas.c
---- linux-2.6.35.4/drivers/message/fusion/mptsas.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/message/fusion/mptsas.c 2010-09-17 20:12:09.000000000 -0400
-@@ -437,6 +437,23 @@ mptsas_is_end_device(struct mptsas_devin
+diff -urNp linux-2.6.36/drivers/message/fusion/mptsas.c linux-2.6.36/drivers/message/fusion/mptsas.c
+--- linux-2.6.36/drivers/message/fusion/mptsas.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/message/fusion/mptsas.c 2010-11-06 18:58:15.000000000 -0400
+@@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin
return 0;
}
/* no mutex */
static void
mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
-@@ -475,23 +492,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *p
+@@ -477,23 +494,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *p
return NULL;
}
static inline struct sas_port *
mptsas_get_port(struct mptsas_phyinfo *phy_info)
{
-diff -urNp linux-2.6.35.4/drivers/message/i2o/i2o_proc.c linux-2.6.35.4/drivers/message/i2o/i2o_proc.c
---- linux-2.6.35.4/drivers/message/i2o/i2o_proc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/message/i2o/i2o_proc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/message/fusion/mptscsih.c linux-2.6.36/drivers/message/fusion/mptscsih.c
+--- linux-2.6.36/drivers/message/fusion/mptscsih.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/message/fusion/mptscsih.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost)
+
+ h = shost_priv(SChost);
+
+- if (h) {
+- if (h->info_kbuf == NULL)
+- if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
+- return h->info_kbuf;
+- h->info_kbuf[0] = '\0';
++ if (!h)
++ return NULL;
+
+- mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
+- h->info_kbuf[size-1] = '\0';
+- }
++ if (h->info_kbuf == NULL)
++ if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
++ return h->info_kbuf;
++ h->info_kbuf[0] = '\0';
++
++ mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
++ h->info_kbuf[size-1] = '\0';
+
+ return h->info_kbuf;
+ }
+diff -urNp linux-2.6.36/drivers/message/i2o/i2o_proc.c linux-2.6.36/drivers/message/i2o/i2o_proc.c
+--- linux-2.6.36/drivers/message/i2o/i2o_proc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/message/i2o/i2o_proc.c 2010-11-06 18:58:15.000000000 -0400
@@ -255,13 +255,6 @@ static char *scsi_devices[] = {
"Array Controller Device"
};
return 0;
}
-diff -urNp linux-2.6.35.4/drivers/mfd/janz-cmodio.c linux-2.6.35.4/drivers/mfd/janz-cmodio.c
---- linux-2.6.35.4/drivers/mfd/janz-cmodio.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/mfd/janz-cmodio.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/mfd/janz-cmodio.c linux-2.6.36/drivers/mfd/janz-cmodio.c
+--- linux-2.6.36/drivers/mfd/janz-cmodio.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/mfd/janz-cmodio.c 2010-11-06 18:58:15.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.35.4/drivers/misc/kgdbts.c linux-2.6.35.4/drivers/misc/kgdbts.c
---- linux-2.6.35.4/drivers/misc/kgdbts.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/misc/kgdbts.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/misc/kgdbts.c linux-2.6.36/drivers/misc/kgdbts.c
+--- linux-2.6.36/drivers/misc/kgdbts.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/misc/kgdbts.c 2010-11-06 18:58:15.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.35.4/drivers/misc/sgi-gru/gruhandles.c linux-2.6.35.4/drivers/misc/sgi-gru/gruhandles.c
---- linux-2.6.35.4/drivers/misc/sgi-gru/gruhandles.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/misc/sgi-gru/gruhandles.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/misc/sgi-gru/gruhandles.c linux-2.6.36/drivers/misc/sgi-gru/gruhandles.c
+--- linux-2.6.36/drivers/misc/sgi-gru/gruhandles.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/misc/sgi-gru/gruhandles.c 2010-11-06 18:58:15.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.35.4/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.35.4/drivers/misc/sgi-gru/gruprocfs.c
---- linux-2.6.35.4/drivers/misc/sgi-gru/gruprocfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/misc/sgi-gru/gruprocfs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.36/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-2.6.36/drivers/misc/sgi-gru/gruprocfs.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/misc/sgi-gru/gruprocfs.c 2010-11-06 18:58:15.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.35.4/drivers/misc/sgi-gru/grutables.h linux-2.6.35.4/drivers/misc/sgi-gru/grutables.h
---- linux-2.6.35.4/drivers/misc/sgi-gru/grutables.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/misc/sgi-gru/grutables.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/misc/sgi-gru/grutables.h linux-2.6.36/drivers/misc/sgi-gru/grutables.h
+--- linux-2.6.36/drivers/misc/sgi-gru/grutables.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/misc/sgi-gru/grutables.h 2010-11-06 18:58:15.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.35.4/drivers/mtd/devices/doc2000.c linux-2.6.35.4/drivers/mtd/devices/doc2000.c
---- linux-2.6.35.4/drivers/mtd/devices/doc2000.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/mtd/devices/doc2000.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/mtd/devices/doc2000.c linux-2.6.36/drivers/mtd/devices/doc2000.c
+--- linux-2.6.36/drivers/mtd/devices/doc2000.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/mtd/devices/doc2000.c 2010-11-06 18:58:15.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.35.4/drivers/mtd/devices/doc2001.c linux-2.6.35.4/drivers/mtd/devices/doc2001.c
---- linux-2.6.35.4/drivers/mtd/devices/doc2001.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/mtd/devices/doc2001.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/mtd/devices/doc2001.c linux-2.6.36/drivers/mtd/devices/doc2001.c
+--- linux-2.6.36/drivers/mtd/devices/doc2001.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/mtd/devices/doc2001.c 2010-11-06 18:58:15.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.35.4/drivers/mtd/nand/denali.c linux-2.6.35.4/drivers/mtd/nand/denali.c
---- linux-2.6.35.4/drivers/mtd/nand/denali.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/mtd/nand/denali.c 2010-09-17 20:12:09.000000000 -0400
-@@ -24,6 +24,7 @@
+diff -urNp linux-2.6.36/drivers/mtd/nand/denali.c linux-2.6.36/drivers/mtd/nand/denali.c
+--- linux-2.6.36/drivers/mtd/nand/denali.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/mtd/nand/denali.c 2010-11-06 18:58:15.000000000 -0400
+@@ -25,6 +25,7 @@
#include <linux/pci.h>
#include <linux/mtd/mtd.h>
#include <linux/module.h>
#include "denali.h"
-diff -urNp linux-2.6.35.4/drivers/mtd/ubi/build.c linux-2.6.35.4/drivers/mtd/ubi/build.c
---- linux-2.6.35.4/drivers/mtd/ubi/build.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/mtd/ubi/build.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1282,7 +1282,7 @@ module_exit(ubi_exit);
+diff -urNp linux-2.6.36/drivers/mtd/ubi/build.c linux-2.6.36/drivers/mtd/ubi/build.c
+--- linux-2.6.36/drivers/mtd/ubi/build.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/mtd/ubi/build.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1283,7 +1283,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) {
-@@ -1293,11 +1293,11 @@ static int __init bytes_str_to_int(const
+@@ -1294,11 +1294,11 @@ static int __init bytes_str_to_int(const
switch (*endp) {
case 'G':
if (endp[1] == 'i' && endp[2] == 'B')
endp += 2;
case '\0':
-@@ -1308,7 +1308,13 @@ static int __init bytes_str_to_int(const
+@@ -1309,7 +1309,13 @@ static int __init bytes_str_to_int(const
return -EINVAL;
}
}
/**
-diff -urNp linux-2.6.35.4/drivers/net/cxgb3/cxgb3_main.c linux-2.6.35.4/drivers/net/cxgb3/cxgb3_main.c
---- linux-2.6.35.4/drivers/net/cxgb3/cxgb3_main.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/cxgb3/cxgb3_main.c 2010-09-17 20:12:37.000000000 -0400
-@@ -2296,6 +2296,8 @@ static int cxgb_extension_ioctl(struct n
+diff -urNp linux-2.6.36/drivers/net/cxgb3/cxgb3_main.c linux-2.6.36/drivers/net/cxgb3/cxgb3_main.c
+--- linux-2.6.36/drivers/net/cxgb3/cxgb3_main.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/cxgb3/cxgb3_main.c 2010-11-06 18:58:50.000000000 -0400
+@@ -2296,7 +2296,7 @@ static int cxgb_extension_ioctl(struct n
case CHELSIO_GET_QSET_NUM:{
struct ch_reg edata;
+- memset(&edata, 0, sizeof(struct ch_reg));
+ memset(&edata, 0, sizeof(edata));
-+
+
edata.cmd = CHELSIO_GET_QSET_NUM;
edata.val = pi->nqsets;
- if (copy_to_user(useraddr, &edata, sizeof(edata)))
-diff -urNp linux-2.6.35.4/drivers/net/e1000e/82571.c linux-2.6.35.4/drivers/net/e1000e/82571.c
---- linux-2.6.35.4/drivers/net/e1000e/82571.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/e1000e/82571.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/net/e1000e/82571.c linux-2.6.36/drivers/net/e1000e/82571.c
+--- linux-2.6.36/drivers/net/e1000e/82571.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/e1000e/82571.c 2010-11-06 18:58:15.000000000 -0400
@@ -207,6 +207,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.35.4/drivers/net/e1000e/e1000.h linux-2.6.35.4/drivers/net/e1000e/e1000.h
---- linux-2.6.35.4/drivers/net/e1000e/e1000.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/e1000e/e1000.h 2010-09-17 20:12:09.000000000 -0400
-@@ -377,9 +377,9 @@ struct e1000_info {
+diff -urNp linux-2.6.36/drivers/net/e1000e/e1000.h linux-2.6.36/drivers/net/e1000e/e1000.h
+--- linux-2.6.36/drivers/net/e1000e/e1000.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/e1000e/e1000.h 2010-11-06 18:58:15.000000000 -0400
+@@ -379,9 +379,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.35.4/drivers/net/e1000e/es2lan.c linux-2.6.35.4/drivers/net/e1000e/es2lan.c
---- linux-2.6.35.4/drivers/net/e1000e/es2lan.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/e1000e/es2lan.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/net/e1000e/es2lan.c linux-2.6.36/drivers/net/e1000e/es2lan.c
+--- linux-2.6.36/drivers/net/e1000e/es2lan.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/e1000e/es2lan.c 2010-11-06 18:58:15.000000000 -0400
@@ -205,6 +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.35.4/drivers/net/e1000e/hw.h linux-2.6.35.4/drivers/net/e1000e/hw.h
---- linux-2.6.35.4/drivers/net/e1000e/hw.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/e1000e/hw.h 2010-09-17 20:12:09.000000000 -0400
-@@ -791,13 +791,13 @@ struct e1000_phy_operations {
+diff -urNp linux-2.6.36/drivers/net/e1000e/hw.h linux-2.6.36/drivers/net/e1000e/hw.h
+--- linux-2.6.36/drivers/net/e1000e/hw.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/e1000e/hw.h 2010-11-06 18:58:15.000000000 -0400
+@@ -800,13 +800,13 @@ struct e1000_phy_operations {
/* Function pointers for the NVM. */
struct e1000_nvm_operations {
};
struct e1000_mac_info {
-@@ -877,6 +877,7 @@ struct e1000_phy_info {
+@@ -886,6 +886,7 @@ struct e1000_phy_info {
};
struct e1000_nvm_info {
struct e1000_nvm_operations ops;
enum e1000_nvm_type type;
-diff -urNp linux-2.6.35.4/drivers/net/e1000e/ich8lan.c linux-2.6.35.4/drivers/net/e1000e/ich8lan.c
---- linux-2.6.35.4/drivers/net/e1000e/ich8lan.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/e1000e/ich8lan.c 2010-09-17 20:12:09.000000000 -0400
-@@ -3388,7 +3388,7 @@ static void e1000_clear_hw_cntrs_ich8lan
+diff -urNp linux-2.6.36/drivers/net/e1000e/ich8lan.c linux-2.6.36/drivers/net/e1000e/ich8lan.c
+--- linux-2.6.36/drivers/net/e1000e/ich8lan.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/e1000e/ich8lan.c 2010-11-06 18:58:15.000000000 -0400
+@@ -3856,7 +3856,7 @@ static void e1000_clear_hw_cntrs_ich8lan
}
}
-static struct e1000_mac_operations ich8_mac_ops = {
+static const struct e1000_mac_operations ich8_mac_ops = {
.id_led_init = e1000e_id_led_init,
- .check_mng_mode = e1000_check_mng_mode_ich8lan,
+ /* check_mng_mode dependent on mac type */
.check_for_link = e1000_check_for_copper_link_ich8lan,
-@@ -3407,7 +3407,7 @@ static struct e1000_mac_operations ich8_
+@@ -3875,7 +3875,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,
-@@ -3421,7 +3421,7 @@ static struct e1000_phy_operations ich8_
+@@ -3889,7 +3889,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.35.4/drivers/net/eql.c linux-2.6.35.4/drivers/net/eql.c
---- linux-2.6.35.4/drivers/net/eql.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/eql.c 2010-09-17 20:12:37.000000000 -0400
-@@ -555,6 +555,8 @@ static int eql_g_master_cfg(struct net_d
+diff -urNp linux-2.6.36/drivers/net/eql.c linux-2.6.36/drivers/net/eql.c
+--- linux-2.6.36/drivers/net/eql.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/eql.c 2010-11-06 18:58:50.000000000 -0400
+@@ -555,7 +555,7 @@ static int eql_g_master_cfg(struct net_d
equalizer_t *eql;
master_config_t mc;
+- memset(&mc, 0, sizeof(master_config_t));
+ memset(&mc, 0, sizeof(mc));
-+
+
if (eql_is_master(dev)) {
eql = netdev_priv(dev);
- mc.max_slaves = eql->max_slaves;
-diff -urNp linux-2.6.35.4/drivers/net/igb/e1000_82575.c linux-2.6.35.4/drivers/net/igb/e1000_82575.c
---- linux-2.6.35.4/drivers/net/igb/e1000_82575.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/igb/e1000_82575.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1597,7 +1597,7 @@ u16 igb_rxpbs_adjust_82580(u32 data)
+diff -urNp linux-2.6.36/drivers/net/igb/e1000_82575.c linux-2.6.36/drivers/net/igb/e1000_82575.c
+--- linux-2.6.36/drivers/net/igb/e1000_82575.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/igb/e1000_82575.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1698,7 +1698,7 @@ u16 igb_rxpbs_adjust_82580(u32 data)
return ret_val;
}
.init_hw = igb_init_hw_82575,
.check_for_link = igb_check_for_link_82575,
.rar_set = igb_rar_set,
-@@ -1605,13 +1605,13 @@ static struct e1000_mac_operations e1000
+@@ -1706,13 +1706,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.35.4/drivers/net/igb/e1000_hw.h linux-2.6.35.4/drivers/net/igb/e1000_hw.h
---- linux-2.6.35.4/drivers/net/igb/e1000_hw.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/igb/e1000_hw.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/net/igb/e1000_hw.h linux-2.6.36/drivers/net/igb/e1000_hw.h
+--- linux-2.6.36/drivers/net/igb/e1000_hw.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/igb/e1000_hw.h 2010-11-06 18:58:15.000000000 -0400
@@ -323,17 +323,17 @@ struct e1000_phy_operations {
};
struct e1000_nvm_operations ops;
enum e1000_nvm_type type;
-diff -urNp linux-2.6.35.4/drivers/net/irda/vlsi_ir.c linux-2.6.35.4/drivers/net/irda/vlsi_ir.c
---- linux-2.6.35.4/drivers/net/irda/vlsi_ir.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/irda/vlsi_ir.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/net/irda/vlsi_ir.c linux-2.6.36/drivers/net/irda/vlsi_ir.c
+--- linux-2.6.36/drivers/net/irda/vlsi_ir.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/irda/vlsi_ir.c 2010-11-06 18:58:15.000000000 -0400
@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
/* no race - tx-ring already empty */
vlsi_set_baud(idev, iobase);
spin_unlock_irqrestore(&idev->lock, flags);
dev_kfree_skb_any(skb);
return NETDEV_TX_OK;
-diff -urNp linux-2.6.35.4/drivers/net/pcnet32.c linux-2.6.35.4/drivers/net/pcnet32.c
---- linux-2.6.35.4/drivers/net/pcnet32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/pcnet32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/net/pcnet32.c linux-2.6.36/drivers/net/pcnet32.c
+--- linux-2.6.36/drivers/net/pcnet32.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/pcnet32.c 2010-11-06 18:58:15.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.35.4/drivers/net/ppp_generic.c linux-2.6.35.4/drivers/net/ppp_generic.c
---- linux-2.6.35.4/drivers/net/ppp_generic.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/ppp_generic.c 2010-09-17 20:12:09.000000000 -0400
-@@ -992,7 +992,6 @@ ppp_net_ioctl(struct net_device *dev, st
+diff -urNp linux-2.6.36/drivers/net/ppp_generic.c linux-2.6.36/drivers/net/ppp_generic.c
+--- linux-2.6.36/drivers/net/ppp_generic.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/ppp_generic.c 2010-11-06 18:58:15.000000000 -0400
+@@ -985,7 +985,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:
-@@ -1014,8 +1013,7 @@ ppp_net_ioctl(struct net_device *dev, st
+@@ -1007,8 +1006,7 @@ ppp_net_ioctl(struct net_device *dev, st
break;
case SIOCGPPPVER:
break;
err = 0;
break;
-diff -urNp linux-2.6.35.4/drivers/net/tg3.c linux-2.6.35.4/drivers/net/tg3.c
---- linux-2.6.35.4/drivers/net/tg3.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/tg3.c 2010-09-17 20:12:09.000000000 -0400
-@@ -12410,7 +12410,7 @@ static void __devinit tg3_read_vpd(struc
+diff -urNp linux-2.6.36/drivers/net/tg3.c linux-2.6.36/drivers/net/tg3.c
+--- linux-2.6.36/drivers/net/tg3.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/tg3.c 2010-11-06 18:58:15.000000000 -0400
+@@ -12433,7 +12433,7 @@ static void __devinit tg3_read_vpd(struc
cnt = pci_read_vpd(tp->pdev, pos,
TG3_NVM_VPD_LEN - pos,
&vpd_data[pos]);
cnt = 0;
else if (cnt < 0)
goto out_not_found;
-diff -urNp linux-2.6.35.4/drivers/net/tg3.h linux-2.6.35.4/drivers/net/tg3.h
---- linux-2.6.35.4/drivers/net/tg3.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/tg3.h 2010-09-17 20:12:09.000000000 -0400
-@@ -130,6 +130,7 @@
+diff -urNp linux-2.6.36/drivers/net/tg3.h linux-2.6.36/drivers/net/tg3.h
+--- linux-2.6.36/drivers/net/tg3.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/tg3.h 2010-11-06 18:58:15.000000000 -0400
+@@ -131,6 +131,7 @@
#define CHIPREV_ID_5750_A0 0x4000
#define CHIPREV_ID_5750_A1 0x4001
#define CHIPREV_ID_5750_A3 0x4003
#define CHIPREV_ID_5750_C2 0x4202
#define CHIPREV_ID_5752_A0_HW 0x5000
#define CHIPREV_ID_5752_A0 0x6000
-diff -urNp linux-2.6.35.4/drivers/net/tulip/de4x5.c linux-2.6.35.4/drivers/net/tulip/de4x5.c
---- linux-2.6.35.4/drivers/net/tulip/de4x5.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/tulip/de4x5.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/drivers/net/tulip/de4x5.c linux-2.6.36/drivers/net/tulip/de4x5.c
+--- linux-2.6.36/drivers/net/tulip/de4x5.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/tulip/de4x5.c 2010-11-06 18:58:50.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];
break;
#define DE4X5_DUMP 0x0f /* Dump the DE4X5 Status */
-diff -urNp linux-2.6.35.4/drivers/net/usb/hso.c linux-2.6.35.4/drivers/net/usb/hso.c
---- linux-2.6.35.4/drivers/net/usb/hso.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/usb/hso.c 2010-09-17 20:12:37.000000000 -0400
-@@ -258,7 +258,7 @@ struct hso_serial {
+diff -urNp linux-2.6.36/drivers/net/usb/hso.c linux-2.6.36/drivers/net/usb/hso.c
+--- linux-2.6.36/drivers/net/usb/hso.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/usb/hso.c 2010-11-06 18:58:50.000000000 -0400
+@@ -257,7 +257,7 @@ struct hso_serial {
/* from usb_serial_port */
struct tty_struct *tty;
spinlock_t serial_lock;
int (*write_data) (struct hso_serial *serial);
-@@ -1201,7 +1201,7 @@ static void put_rxbuf_data_and_resubmit_
+@@ -1200,7 +1200,7 @@ static void put_rxbuf_data_and_resubmit_
struct urb *urb;
urb = serial->rx_urb[0];
count = put_rxbuf_data(urb, serial);
if (count == -1)
return;
-@@ -1237,7 +1237,7 @@ static void hso_std_serial_read_bulk_cal
+@@ -1236,7 +1236,7 @@ static void hso_std_serial_read_bulk_cal
DUMP1(urb->transfer_buffer, urb->actual_length);
/* Anyone listening? */
return;
if (status == 0) {
-@@ -1332,8 +1332,7 @@ static int hso_serial_open(struct tty_st
+@@ -1331,8 +1331,7 @@ static int hso_serial_open(struct tty_st
spin_unlock_irq(&serial->serial_lock);
/* check for port already opened, if not set the termios */
serial->rx_state = RX_IDLE;
/* Force default termio settings */
_hso_serial_set_termios(tty, NULL);
-@@ -1345,7 +1344,7 @@ static int hso_serial_open(struct tty_st
+@@ -1344,7 +1343,7 @@ static int hso_serial_open(struct tty_st
result = hso_start_serial_device(serial->parent, GFP_KERNEL);
if (result) {
hso_stop_serial_device(serial->parent);
kref_put(&serial->parent->ref, hso_serial_ref_free);
}
} else {
-@@ -1382,10 +1381,10 @@ static void hso_serial_close(struct tty_
+@@ -1381,10 +1380,10 @@ static void hso_serial_close(struct tty_
/* reset the rts and dtr */
/* do the actual close */
spin_lock_irq(&serial->serial_lock);
if (serial->tty == tty) {
serial->tty->driver_data = NULL;
-@@ -1467,7 +1466,7 @@ static void hso_serial_set_termios(struc
+@@ -1466,7 +1465,7 @@ static void hso_serial_set_termios(struc
/* the actual setup */
spin_lock_irqsave(&serial->serial_lock, flags);
_hso_serial_set_termios(tty, old);
else
tty->termios = old;
-@@ -1655,6 +1654,9 @@ static int hso_get_count(struct hso_seri
+@@ -1652,10 +1651,11 @@ static int hso_get_count(struct hso_seri
+ struct uart_icount cnow;
+ struct hso_tiocmget *tiocmget = serial->tiocmget;
+- memset(&icount, 0, sizeof(struct serial_icounter_struct));
+-
if (!tiocmget)
return -ENOENT;
+
spin_lock_irq(&serial->serial_lock);
memcpy(&cnow, &tiocmget->icount, sizeof(struct uart_icount));
spin_unlock_irq(&serial->serial_lock);
-@@ -1929,7 +1931,7 @@ static void intr_callback(struct urb *ur
+@@ -1930,7 +1930,7 @@ static void intr_callback(struct urb *ur
D1("Pending read interrupt on port %d\n", i);
spin_lock(&serial->serial_lock);
if (serial->rx_state == RX_IDLE &&
/* Setup and send a ctrl req read on
* port i */
if (!serial->rx_urb_filled[0]) {
-@@ -3119,7 +3121,7 @@ static int hso_resume(struct usb_interfa
+@@ -3120,7 +3120,7 @@ static int hso_resume(struct usb_interfa
/* Start all serial ports */
for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
if (serial_table[i] && (serial_table[i]->interface == iface)) {
result =
hso_start_serial_device(serial_table[i], GFP_NOIO);
hso_kick_transmit(dev2ser(serial_table[i]));
-diff -urNp linux-2.6.35.4/drivers/net/wireless/b43/debugfs.c linux-2.6.35.4/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.35.4/drivers/net/wireless/b43/debugfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/wireless/b43/debugfs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/net/wireless/b43/debugfs.c linux-2.6.36/drivers/net/wireless/b43/debugfs.c
+--- linux-2.6.36/drivers/net/wireless/b43/debugfs.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/wireless/b43/debugfs.c 2010-11-06 18:58:15.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.35.4/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.35.4/drivers/net/wireless/b43legacy/debugfs.c
---- linux-2.6.35.4/drivers/net/wireless/b43legacy/debugfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/wireless/b43legacy/debugfs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.36/drivers/net/wireless/b43legacy/debugfs.c
+--- linux-2.6.36/drivers/net/wireless/b43legacy/debugfs.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/wireless/b43legacy/debugfs.c 2010-11-06 18:58:15.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.35.4/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.35.4/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-2.6.35.4/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.36/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-2.6.36/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-11-06 18:58:15.000000000 -0400
@@ -68,8 +68,8 @@ do {
} while (0)
+#define IWL_DEBUG(__priv, level, fmt, args...) do {} while (0)
+#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) do {} while (0)
static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
- void *p, u32 len)
+ const void *p, u32 len)
{}
-diff -urNp linux-2.6.35.4/drivers/net/wireless/libertas/debugfs.c linux-2.6.35.4/drivers/net/wireless/libertas/debugfs.c
---- linux-2.6.35.4/drivers/net/wireless/libertas/debugfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/wireless/libertas/debugfs.c 2010-09-17 20:12:09.000000000 -0400
-@@ -718,7 +718,7 @@ out_unlock:
+diff -urNp linux-2.6.36/drivers/net/wireless/libertas/debugfs.c linux-2.6.36/drivers/net/wireless/libertas/debugfs.c
+--- linux-2.6.36/drivers/net/wireless/libertas/debugfs.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/wireless/libertas/debugfs.c 2010-11-06 18:58:15.000000000 -0400
+@@ -701,7 +701,7 @@ out_unlock:
struct lbs_debugfs_files {
const char *name;
int perm;
};
static const struct lbs_debugfs_files debugfs_files[] = {
-diff -urNp linux-2.6.35.4/drivers/net/wireless/rndis_wlan.c linux-2.6.35.4/drivers/net/wireless/rndis_wlan.c
---- linux-2.6.35.4/drivers/net/wireless/rndis_wlan.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/net/wireless/rndis_wlan.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1235,7 +1235,7 @@ static int set_rts_threshold(struct usbn
+diff -urNp linux-2.6.36/drivers/net/wireless/rndis_wlan.c linux-2.6.36/drivers/net/wireless/rndis_wlan.c
+--- linux-2.6.36/drivers/net/wireless/rndis_wlan.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/net/wireless/rndis_wlan.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1236,7 +1236,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.35.4/drivers/oprofile/buffer_sync.c linux-2.6.35.4/drivers/oprofile/buffer_sync.c
---- linux-2.6.35.4/drivers/oprofile/buffer_sync.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/oprofile/buffer_sync.c 2010-09-17 20:12:09.000000000 -0400
-@@ -341,7 +341,7 @@ static void add_data(struct op_entry *en
+diff -urNp linux-2.6.36/drivers/oprofile/buffer_sync.c linux-2.6.36/drivers/oprofile/buffer_sync.c
+--- linux-2.6.36/drivers/oprofile/buffer_sync.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/oprofile/buffer_sync.c 2010-11-06 18:58:15.000000000 -0400
+@@ -342,7 +342,7 @@ static void add_data(struct op_entry *en
if (cookie == NO_COOKIE)
offset = pc;
if (cookie == INVALID_COOKIE) {
offset = pc;
}
if (cookie != last_cookie) {
-@@ -385,14 +385,14 @@ add_sample(struct mm_struct *mm, struct
+@@ -386,14 +386,14 @@ add_sample(struct mm_struct *mm, struct
/* add userspace sample */
if (!mm) {
return 0;
}
-@@ -561,7 +561,7 @@ void sync_buffer(int cpu)
+@@ -562,7 +562,7 @@ void sync_buffer(int cpu)
/* ignore backtraces if failed to add a sample */
if (state == sb_bt_start) {
state = sb_bt_ignore;
}
}
release_mm(mm);
-diff -urNp linux-2.6.35.4/drivers/oprofile/event_buffer.c linux-2.6.35.4/drivers/oprofile/event_buffer.c
---- linux-2.6.35.4/drivers/oprofile/event_buffer.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/oprofile/event_buffer.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/oprofile/event_buffer.c linux-2.6.36/drivers/oprofile/event_buffer.c
+--- linux-2.6.36/drivers/oprofile/event_buffer.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/oprofile/event_buffer.c 2010-11-06 18:58:15.000000000 -0400
@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
}
return;
}
-diff -urNp linux-2.6.35.4/drivers/oprofile/oprof.c linux-2.6.35.4/drivers/oprofile/oprof.c
---- linux-2.6.35.4/drivers/oprofile/oprof.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/oprofile/oprof.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/oprofile/oprof.c linux-2.6.36/drivers/oprofile/oprof.c
+--- linux-2.6.36/drivers/oprofile/oprof.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/oprofile/oprof.c 2010-11-06 18:58:15.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.35.4/drivers/oprofile/oprofilefs.c linux-2.6.35.4/drivers/oprofile/oprofilefs.c
---- linux-2.6.35.4/drivers/oprofile/oprofilefs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/oprofile/oprofilefs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/oprofile/oprofilefs.c linux-2.6.36/drivers/oprofile/oprofilefs.c
+--- linux-2.6.36/drivers/oprofile/oprofilefs.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/oprofile/oprofilefs.c 2010-11-06 18:58:15.000000000 -0400
@@ -187,7 +187,7 @@ static const struct file_operations atom
{
struct dentry *d = __oprofilefs_create_file(sb, root, name,
&atomic_ro_fops, 0444);
-diff -urNp linux-2.6.35.4/drivers/oprofile/oprofile_stats.c linux-2.6.35.4/drivers/oprofile/oprofile_stats.c
---- linux-2.6.35.4/drivers/oprofile/oprofile_stats.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/oprofile/oprofile_stats.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/oprofile/oprofile_stats.c linux-2.6.36/drivers/oprofile/oprofile_stats.c
+--- linux-2.6.36/drivers/oprofile/oprofile_stats.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/oprofile/oprofile_stats.c 2010-11-06 18:58:15.000000000 -0400
@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
cpu_buf->sample_invalid_eip = 0;
}
}
-diff -urNp linux-2.6.35.4/drivers/oprofile/oprofile_stats.h linux-2.6.35.4/drivers/oprofile/oprofile_stats.h
---- linux-2.6.35.4/drivers/oprofile/oprofile_stats.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/oprofile/oprofile_stats.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/oprofile/oprofile_stats.h linux-2.6.36/drivers/oprofile/oprofile_stats.h
+--- linux-2.6.36/drivers/oprofile/oprofile_stats.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/oprofile/oprofile_stats.h 2010-11-06 18:58:15.000000000 -0400
@@ -13,11 +13,11 @@
#include <asm/atomic.h>
};
extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-2.6.35.4/drivers/parport/procfs.c linux-2.6.35.4/drivers/parport/procfs.c
---- linux-2.6.35.4/drivers/parport/procfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/parport/procfs.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/drivers/parport/procfs.c linux-2.6.36/drivers/parport/procfs.c
+--- linux-2.6.36/drivers/parport/procfs.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/parport/procfs.c 2010-11-06 18:58:50.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.35.4/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.35.4/drivers/pci/hotplug/acpiphp_glue.c
---- linux-2.6.35.4/drivers/pci/hotplug/acpiphp_glue.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/pci/hotplug/acpiphp_glue.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.36/drivers/pci/hotplug/acpiphp_glue.c
+--- linux-2.6.36/drivers/pci/hotplug/acpiphp_glue.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/pci/hotplug/acpiphp_glue.c 2010-11-06 18:58:15.000000000 -0400
@@ -110,7 +110,7 @@ static int post_dock_fixups(struct notif
}
.handler = handle_hotplug_event_func,
};
-diff -urNp linux-2.6.35.4/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.35.4/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-2.6.35.4/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/pci/hotplug/cpqphp_nvram.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.36/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-2.6.36/drivers/pci/hotplug/cpqphp_nvram.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/pci/hotplug/cpqphp_nvram.c 2010-11-06 18:58:15.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.35.4/drivers/pci/intel-iommu.c linux-2.6.35.4/drivers/pci/intel-iommu.c
---- linux-2.6.35.4/drivers/pci/intel-iommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/pci/intel-iommu.c 2010-09-17 20:12:09.000000000 -0400
-@@ -2938,7 +2938,7 @@ static int intel_mapping_error(struct de
+diff -urNp linux-2.6.36/drivers/pci/intel-iommu.c linux-2.6.36/drivers/pci/intel-iommu.c
+--- linux-2.6.36/drivers/pci/intel-iommu.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/pci/intel-iommu.c 2010-11-06 18:58:15.000000000 -0400
+@@ -2934,7 +2934,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.35.4/drivers/pci/pcie/portdrv_pci.c linux-2.6.35.4/drivers/pci/pcie/portdrv_pci.c
---- linux-2.6.35.4/drivers/pci/pcie/portdrv_pci.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/pci/pcie/portdrv_pci.c 2010-09-17 20:12:09.000000000 -0400
-@@ -250,7 +250,7 @@ static void pcie_portdrv_err_resume(stru
+diff -urNp linux-2.6.36/drivers/pci/pcie/portdrv_pci.c linux-2.6.36/drivers/pci/pcie/portdrv_pci.c
+--- linux-2.6.36/drivers/pci/pcie/portdrv_pci.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/pci/pcie/portdrv_pci.c 2010-11-06 18:58:15.000000000 -0400
+@@ -276,7 +276,7 @@ static void pcie_portdrv_err_resume(stru
static const struct pci_device_id port_pci_ids[] = { {
/* handle any PCI-Express port */
PCI_DEVICE_CLASS(((PCI_CLASS_BRIDGE_PCI << 8) | 0x00), ~0),
};
MODULE_DEVICE_TABLE(pci, port_pci_ids);
-diff -urNp linux-2.6.35.4/drivers/pci/probe.c linux-2.6.35.4/drivers/pci/probe.c
---- linux-2.6.35.4/drivers/pci/probe.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/pci/probe.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/pci/probe.c linux-2.6.36/drivers/pci/probe.c
+--- linux-2.6.36/drivers/pci/probe.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/pci/probe.c 2010-11-06 18:58:15.000000000 -0400
@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
return ret;
}
struct device_attribute *attr,
char *buf)
{
-diff -urNp linux-2.6.35.4/drivers/pci/proc.c linux-2.6.35.4/drivers/pci/proc.c
---- linux-2.6.35.4/drivers/pci/proc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/pci/proc.c 2010-09-17 20:12:37.000000000 -0400
-@@ -481,7 +481,16 @@ static const struct file_operations proc
+diff -urNp linux-2.6.36/drivers/pci/proc.c linux-2.6.36/drivers/pci/proc.c
+--- linux-2.6.36/drivers/pci/proc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/pci/proc.c 2010-11-06 18:58:50.000000000 -0400
+@@ -479,7 +479,16 @@ static const struct file_operations proc
static int __init pci_proc_init(void)
{
struct pci_dev *dev = NULL;
proc_create("devices", 0, proc_bus_pci_dir,
&proc_bus_pci_dev_operations);
proc_initialized = 1;
-diff -urNp linux-2.6.35.4/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.35.4/drivers/pcmcia/pcmcia_ioctl.c
---- linux-2.6.35.4/drivers/pcmcia/pcmcia_ioctl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/pcmcia/pcmcia_ioctl.c 2010-09-17 20:12:09.000000000 -0400
-@@ -850,7 +850,7 @@ static int ds_ioctl(struct file *file, u
- return -EFAULT;
- }
- }
-- buf = kmalloc(sizeof(ds_ioctl_arg_t), GFP_KERNEL);
-+ buf = kzalloc(sizeof(ds_ioctl_arg_t), GFP_KERNEL);
- if (!buf)
- return -ENOMEM;
-
-diff -urNp linux-2.6.35.4/drivers/pcmcia/ti113x.h linux-2.6.35.4/drivers/pcmcia/ti113x.h
---- linux-2.6.35.4/drivers/pcmcia/ti113x.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/pcmcia/ti113x.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/pcmcia/ti113x.h linux-2.6.36/drivers/pcmcia/ti113x.h
+--- linux-2.6.36/drivers/pcmcia/ti113x.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/pcmcia/ti113x.h 2010-11-06 18:58:15.000000000 -0400
@@ -936,7 +936,7 @@ static struct pci_device_id ene_tune_tbl
DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID,
ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE),
};
static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
-diff -urNp linux-2.6.35.4/drivers/pcmcia/yenta_socket.c linux-2.6.35.4/drivers/pcmcia/yenta_socket.c
---- linux-2.6.35.4/drivers/pcmcia/yenta_socket.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/pcmcia/yenta_socket.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1428,7 +1428,7 @@ static struct pci_device_id yenta_table[
+diff -urNp linux-2.6.36/drivers/pcmcia/yenta_socket.c linux-2.6.36/drivers/pcmcia/yenta_socket.c
+--- linux-2.6.36/drivers/pcmcia/yenta_socket.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/pcmcia/yenta_socket.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1427,7 +1427,7 @@ static struct pci_device_id yenta_table[
/* match any cardbus bridge */
CB_ID(PCI_ANY_ID, PCI_ANY_ID, DEFAULT),
};
MODULE_DEVICE_TABLE(pci, yenta_table);
-diff -urNp linux-2.6.35.4/drivers/platform/x86/acer-wmi.c linux-2.6.35.4/drivers/platform/x86/acer-wmi.c
---- linux-2.6.35.4/drivers/platform/x86/acer-wmi.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/platform/x86/acer-wmi.c 2010-09-17 20:12:09.000000000 -0400
-@@ -916,7 +916,7 @@ static int update_bl_status(struct backl
+diff -urNp linux-2.6.36/drivers/platform/x86/acer-wmi.c linux-2.6.36/drivers/platform/x86/acer-wmi.c
+--- linux-2.6.36/drivers/platform/x86/acer-wmi.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/platform/x86/acer-wmi.c 2010-11-06 18:58:15.000000000 -0400
+@@ -915,7 +915,7 @@ static int update_bl_status(struct backl
return 0;
}
.get_brightness = read_brightness,
.update_status = update_bl_status,
};
-diff -urNp linux-2.6.35.4/drivers/platform/x86/asus_acpi.c linux-2.6.35.4/drivers/platform/x86/asus_acpi.c
---- linux-2.6.35.4/drivers/platform/x86/asus_acpi.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/platform/x86/asus_acpi.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1464,7 +1464,7 @@ static int asus_hotk_remove(struct acpi_
+diff -urNp linux-2.6.36/drivers/platform/x86/asus_acpi.c linux-2.6.36/drivers/platform/x86/asus_acpi.c
+--- linux-2.6.36/drivers/platform/x86/asus_acpi.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/platform/x86/asus_acpi.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1467,7 +1467,7 @@ static int asus_hotk_remove(struct acpi_
return 0;
}
.get_brightness = read_brightness,
.update_status = set_brightness_status,
};
-diff -urNp linux-2.6.35.4/drivers/platform/x86/asus-laptop.c linux-2.6.35.4/drivers/platform/x86/asus-laptop.c
---- linux-2.6.35.4/drivers/platform/x86/asus-laptop.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/platform/x86/asus-laptop.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/platform/x86/asus-laptop.c linux-2.6.36/drivers/platform/x86/asus-laptop.c
+--- linux-2.6.36/drivers/platform/x86/asus-laptop.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/platform/x86/asus-laptop.c 2010-11-06 18:58:15.000000000 -0400
@@ -224,7 +224,6 @@ struct asus_laptop {
struct asus_led gled;
struct asus_led kled;
.get_brightness = asus_read_brightness,
.update_status = update_bl_status,
};
-diff -urNp linux-2.6.35.4/drivers/platform/x86/compal-laptop.c linux-2.6.35.4/drivers/platform/x86/compal-laptop.c
---- linux-2.6.35.4/drivers/platform/x86/compal-laptop.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/platform/x86/compal-laptop.c 2010-09-17 20:12:09.000000000 -0400
-@@ -168,7 +168,7 @@ static int bl_update_status(struct backl
- return set_lcd_level(b->props.brightness);
- }
-
--static struct backlight_ops compalbl_ops = {
-+static const struct backlight_ops compalbl_ops = {
- .get_brightness = bl_get_brightness,
- .update_status = bl_update_status,
- };
-diff -urNp linux-2.6.35.4/drivers/platform/x86/dell-laptop.c linux-2.6.35.4/drivers/platform/x86/dell-laptop.c
---- linux-2.6.35.4/drivers/platform/x86/dell-laptop.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/platform/x86/dell-laptop.c 2010-09-17 20:12:09.000000000 -0400
-@@ -469,7 +469,7 @@ out:
+diff -urNp linux-2.6.36/drivers/platform/x86/dell-laptop.c linux-2.6.36/drivers/platform/x86/dell-laptop.c
+--- linux-2.6.36/drivers/platform/x86/dell-laptop.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/platform/x86/dell-laptop.c 2010-11-06 18:58:15.000000000 -0400
+@@ -475,7 +475,7 @@ out:
return buffer->output[1];
}
.get_brightness = dell_get_intensity,
.update_status = dell_send_intensity,
};
-diff -urNp linux-2.6.35.4/drivers/platform/x86/eeepc-laptop.c linux-2.6.35.4/drivers/platform/x86/eeepc-laptop.c
---- linux-2.6.35.4/drivers/platform/x86/eeepc-laptop.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/platform/x86/eeepc-laptop.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/platform/x86/eeepc-laptop.c linux-2.6.36/drivers/platform/x86/eeepc-laptop.c
+--- linux-2.6.36/drivers/platform/x86/eeepc-laptop.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/platform/x86/eeepc-laptop.c 2010-11-06 18:58:15.000000000 -0400
@@ -1114,7 +1114,7 @@ static int update_bl_status(struct backl
return set_brightness(bd, bd->props.brightness);
}
.get_brightness = read_brightness,
.update_status = update_bl_status,
};
-diff -urNp linux-2.6.35.4/drivers/platform/x86/fujitsu-laptop.c linux-2.6.35.4/drivers/platform/x86/fujitsu-laptop.c
---- linux-2.6.35.4/drivers/platform/x86/fujitsu-laptop.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/platform/x86/fujitsu-laptop.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/platform/x86/fujitsu-laptop.c linux-2.6.36/drivers/platform/x86/fujitsu-laptop.c
+--- linux-2.6.36/drivers/platform/x86/fujitsu-laptop.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/platform/x86/fujitsu-laptop.c 2010-11-06 18:58:15.000000000 -0400
@@ -437,7 +437,7 @@ static int bl_update_status(struct backl
return ret;
}
.get_brightness = bl_get_brightness,
.update_status = bl_update_status,
};
-diff -urNp linux-2.6.35.4/drivers/platform/x86/sony-laptop.c linux-2.6.35.4/drivers/platform/x86/sony-laptop.c
---- linux-2.6.35.4/drivers/platform/x86/sony-laptop.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/platform/x86/sony-laptop.c 2010-09-17 20:12:09.000000000 -0400
-@@ -857,7 +857,7 @@ static int sony_backlight_get_brightness
+diff -urNp linux-2.6.36/drivers/platform/x86/sony-laptop.c linux-2.6.36/drivers/platform/x86/sony-laptop.c
+--- linux-2.6.36/drivers/platform/x86/sony-laptop.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/platform/x86/sony-laptop.c 2010-11-06 18:58:15.000000000 -0400
+@@ -856,7 +856,7 @@ static int sony_backlight_get_brightness
}
static struct backlight_device *sony_backlight_device;
.update_status = sony_backlight_update_status,
.get_brightness = sony_backlight_get_brightness,
};
-diff -urNp linux-2.6.35.4/drivers/platform/x86/thinkpad_acpi.c linux-2.6.35.4/drivers/platform/x86/thinkpad_acpi.c
---- linux-2.6.35.4/drivers/platform/x86/thinkpad_acpi.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/platform/x86/thinkpad_acpi.c 2010-09-17 20:12:09.000000000 -0400
-@@ -6142,7 +6142,7 @@ static void tpacpi_brightness_notify_cha
+diff -urNp linux-2.6.36/drivers/platform/x86/thinkpad_acpi.c linux-2.6.36/drivers/platform/x86/thinkpad_acpi.c
+--- linux-2.6.36/drivers/platform/x86/thinkpad_acpi.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/platform/x86/thinkpad_acpi.c 2010-11-06 18:58:15.000000000 -0400
+@@ -6109,7 +6109,7 @@ static void tpacpi_brightness_notify_cha
BACKLIGHT_UPDATE_HOTKEY);
}
.get_brightness = brightness_get,
.update_status = brightness_update_status,
};
-diff -urNp linux-2.6.35.4/drivers/platform/x86/toshiba_acpi.c linux-2.6.35.4/drivers/platform/x86/toshiba_acpi.c
---- linux-2.6.35.4/drivers/platform/x86/toshiba_acpi.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/platform/x86/toshiba_acpi.c 2010-09-17 20:12:09.000000000 -0400
-@@ -741,7 +741,7 @@ static acpi_status remove_device(void)
- return AE_OK;
+diff -urNp linux-2.6.36/drivers/platform/x86/toshiba_acpi.c linux-2.6.36/drivers/platform/x86/toshiba_acpi.c
+--- linux-2.6.36/drivers/platform/x86/toshiba_acpi.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/platform/x86/toshiba_acpi.c 2010-11-06 18:58:15.000000000 -0400
+@@ -847,7 +847,7 @@ static void remove_toshiba_proc_entries(
+ remove_proc_entry("version", toshiba_proc_dir);
}
-static struct backlight_ops toshiba_backlight_data = {
.get_brightness = get_lcd,
.update_status = set_lcd_status,
};
-diff -urNp linux-2.6.35.4/drivers/pnp/pnpbios/bioscalls.c linux-2.6.35.4/drivers/pnp/pnpbios/bioscalls.c
---- linux-2.6.35.4/drivers/pnp/pnpbios/bioscalls.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/pnp/pnpbios/bioscalls.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/pnp/pnpbios/bioscalls.c linux-2.6.36/drivers/pnp/pnpbios/bioscalls.c
+--- linux-2.6.36/drivers/pnp/pnpbios/bioscalls.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/pnp/pnpbios/bioscalls.c 2010-11-06 18:58:15.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.35.4/drivers/pnp/quirks.c linux-2.6.35.4/drivers/pnp/quirks.c
---- linux-2.6.35.4/drivers/pnp/quirks.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/pnp/quirks.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/pnp/quirks.c linux-2.6.36/drivers/pnp/quirks.c
+--- linux-2.6.36/drivers/pnp/quirks.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/pnp/quirks.c 2010-11-06 18:58:15.000000000 -0400
@@ -322,7 +322,7 @@ static struct pnp_fixup pnp_fixups[] = {
/* PnP resources that might overlap PCI BARs */
{"PNP0c01", quirk_system_pci_resources},
};
void pnp_fixup_device(struct pnp_dev *dev)
-diff -urNp linux-2.6.35.4/drivers/pnp/resource.c linux-2.6.35.4/drivers/pnp/resource.c
---- linux-2.6.35.4/drivers/pnp/resource.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/pnp/resource.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/pnp/resource.c linux-2.6.36/drivers/pnp/resource.c
+--- linux-2.6.36/drivers/pnp/resource.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/pnp/resource.c 2010-11-06 18:58:15.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.35.4/drivers/s390/cio/qdio_debug.c linux-2.6.35.4/drivers/s390/cio/qdio_debug.c
---- linux-2.6.35.4/drivers/s390/cio/qdio_debug.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/s390/cio/qdio_debug.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/s390/cio/qdio_debug.c linux-2.6.36/drivers/s390/cio/qdio_debug.c
+--- linux-2.6.36/drivers/s390/cio/qdio_debug.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/s390/cio/qdio_debug.c 2010-11-06 18:58:15.000000000 -0400
@@ -233,7 +233,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.35.4/drivers/scsi/ipr.c linux-2.6.35.4/drivers/scsi/ipr.c
---- linux-2.6.35.4/drivers/scsi/ipr.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/scsi/ipr.c 2010-09-17 20:12:09.000000000 -0400
-@@ -6091,7 +6091,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
+diff -urNp linux-2.6.36/drivers/scsi/ipr.c linux-2.6.36/drivers/scsi/ipr.c
+--- linux-2.6.36/drivers/scsi/ipr.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/scsi/ipr.c 2010-11-06 18:58:15.000000000 -0400
+@@ -6156,7 +6156,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.35.4/drivers/scsi/libfc/fc_exch.c linux-2.6.35.4/drivers/scsi/libfc/fc_exch.c
---- linux-2.6.35.4/drivers/scsi/libfc/fc_exch.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/scsi/libfc/fc_exch.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/scsi/libfc/fc_exch.c linux-2.6.36/drivers/scsi/libfc/fc_exch.c
+--- linux-2.6.36/drivers/scsi/libfc/fc_exch.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/scsi/libfc/fc_exch.c 2010-11-06 18:58:15.000000000 -0400
@@ -100,12 +100,12 @@ struct fc_exch_mgr {
* all together if not used XXX
*/
} stats;
};
#define fc_seq_exch(sp) container_of(sp, struct fc_exch, seq)
-@@ -671,7 +671,7 @@ static struct fc_exch *fc_exch_em_alloc(
+@@ -670,7 +670,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));
-@@ -719,7 +719,7 @@ out:
+@@ -718,7 +718,7 @@ out:
return ep;
err:
spin_unlock_bh(&pool->lock);
mempool_free(ep, mp->ep_pool);
return NULL;
}
-@@ -864,7 +864,7 @@ static enum fc_pf_rjt_reason fc_seq_look
+@@ -863,7 +863,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;
}
-@@ -894,7 +894,7 @@ static enum fc_pf_rjt_reason fc_seq_look
+@@ -893,7 +893,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;
}
-@@ -905,7 +905,7 @@ static enum fc_pf_rjt_reason fc_seq_look
+@@ -904,7 +904,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;
}
-@@ -922,7 +922,7 @@ static enum fc_pf_rjt_reason fc_seq_look
+@@ -921,7 +921,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;
}
-@@ -1303,22 +1303,22 @@ static void fc_exch_recv_seq_resp(struct
+@@ -1338,22 +1338,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);
-@@ -1327,7 +1327,7 @@ static void fc_exch_recv_seq_resp(struct
+@@ -1362,7 +1362,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;
}
-@@ -1390,9 +1390,9 @@ static void fc_exch_recv_resp(struct fc_
+@@ -1425,9 +1425,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.35.4/drivers/scsi/libsas/sas_ata.c linux-2.6.35.4/drivers/scsi/libsas/sas_ata.c
---- linux-2.6.35.4/drivers/scsi/libsas/sas_ata.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/scsi/libsas/sas_ata.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/scsi/libsas/sas_ata.c linux-2.6.36/drivers/scsi/libsas/sas_ata.c
+--- linux-2.6.36/drivers/scsi/libsas/sas_ata.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/scsi/libsas/sas_ata.c 2010-11-06 18:58:15.000000000 -0400
@@ -344,7 +344,7 @@ static int sas_ata_scr_read(struct ata_l
}
}
.phy_reset = sas_ata_phy_reset,
.post_internal_cmd = sas_ata_post_internal,
.qc_prep = ata_noop_qc_prep,
-diff -urNp linux-2.6.35.4/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.35.4/drivers/scsi/mpt2sas/mpt2sas_debug.h
---- linux-2.6.35.4/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.36/drivers/scsi/mpt2sas/mpt2sas_debug.h
+--- linux-2.6.36/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-11-06 18:58:15.000000000 -0400
@@ -79,7 +79,7 @@
CMD; \
}
#endif /* CONFIG_SCSI_MPT2SAS_LOGGING */
-diff -urNp linux-2.6.35.4/drivers/scsi/qla2xxx/qla_os.c linux-2.6.35.4/drivers/scsi/qla2xxx/qla_os.c
---- linux-2.6.35.4/drivers/scsi/qla2xxx/qla_os.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/scsi/qla2xxx/qla_os.c 2010-09-17 20:12:09.000000000 -0400
-@@ -3899,7 +3899,7 @@ static struct pci_driver qla2xxx_pci_dri
+diff -urNp linux-2.6.36/drivers/scsi/qla2xxx/qla_os.c linux-2.6.36/drivers/scsi/qla2xxx/qla_os.c
+--- linux-2.6.36/drivers/scsi/qla2xxx/qla_os.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/scsi/qla2xxx/qla_os.c 2010-11-06 18:58:15.000000000 -0400
+@@ -3946,7 +3946,7 @@ static struct pci_driver qla2xxx_pci_dri
.err_handler = &qla2xxx_err_handler,
};
.owner = THIS_MODULE,
};
-diff -urNp linux-2.6.35.4/drivers/scsi/scsi_logging.h linux-2.6.35.4/drivers/scsi/scsi_logging.h
---- linux-2.6.35.4/drivers/scsi/scsi_logging.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/scsi/scsi_logging.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/scsi/scsi_logging.h linux-2.6.36/drivers/scsi/scsi_logging.h
+--- linux-2.6.36/drivers/scsi/scsi_logging.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/scsi/scsi_logging.h 2010-11-06 18:58:15.000000000 -0400
@@ -51,7 +51,7 @@ do { \
} while (0); \
} while (0)
#endif /* CONFIG_SCSI_LOGGING */
/*
-diff -urNp linux-2.6.35.4/drivers/scsi/sg.c linux-2.6.35.4/drivers/scsi/sg.c
---- linux-2.6.35.4/drivers/scsi/sg.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/scsi/sg.c 2010-09-17 20:12:09.000000000 -0400
-@@ -2302,7 +2302,7 @@ struct sg_proc_leaf {
+diff -urNp linux-2.6.36/drivers/scsi/sg.c linux-2.6.36/drivers/scsi/sg.c
+--- linux-2.6.36/drivers/scsi/sg.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/scsi/sg.c 2010-11-06 18:58:15.000000000 -0400
+@@ -2307,7 +2307,7 @@ struct sg_proc_leaf {
const struct file_operations * fops;
};
{"allow_dio", &adio_fops},
{"debug", &debug_fops},
{"def_reserved_size", &dressz_fops},
-@@ -2317,7 +2317,7 @@ sg_proc_init(void)
+@@ -2322,7 +2322,7 @@ sg_proc_init(void)
{
int k, mask;
int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);
sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
if (!sg_proc_sgp)
-diff -urNp linux-2.6.35.4/drivers/serial/8250_pci.c linux-2.6.35.4/drivers/serial/8250_pci.c
---- linux-2.6.35.4/drivers/serial/8250_pci.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/serial/8250_pci.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/serial/8250_pci.c linux-2.6.36/drivers/serial/8250_pci.c
+--- linux-2.6.36/drivers/serial/8250_pci.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/serial/8250_pci.c 2010-11-06 18:58:15.000000000 -0400
@@ -3777,7 +3777,7 @@ static struct pci_device_id serial_pci_t
PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
};
static struct pci_driver serial_pci_driver = {
-diff -urNp linux-2.6.35.4/drivers/serial/kgdboc.c linux-2.6.35.4/drivers/serial/kgdboc.c
---- linux-2.6.35.4/drivers/serial/kgdboc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/serial/kgdboc.c 2010-09-17 20:12:09.000000000 -0400
-@@ -20,7 +20,7 @@
+diff -urNp linux-2.6.36/drivers/serial/kgdboc.c linux-2.6.36/drivers/serial/kgdboc.c
+--- linux-2.6.36/drivers/serial/kgdboc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/serial/kgdboc.c 2010-11-06 18:58:15.000000000 -0400
+@@ -21,7 +21,8 @@
#define MAX_CONFIG_LEN 40
-static struct kgdb_io kgdboc_io_ops;
++/* cannot be const, see configure_kgdboc() */
+static struct kgdb_io kgdboc_io_ops;
/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
static int configured = -1;
-diff -urNp linux-2.6.35.4/drivers/staging/comedi/comedi_fops.c linux-2.6.35.4/drivers/staging/comedi/comedi_fops.c
---- linux-2.6.35.4/drivers/staging/comedi/comedi_fops.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/comedi/comedi_fops.c 2010-09-17 20:12:09.000000000 -0400
+@@ -233,6 +234,7 @@ static void kgdboc_post_exp_handler(void
+ }
+ }
+
++/* cannot be const, see configure_kgdboc() */
+ static struct kgdb_io kgdboc_io_ops = {
+ .name = "kgdboc",
+ .read_char = kgdboc_get_char,
+diff -urNp linux-2.6.36/drivers/staging/comedi/comedi_fops.c linux-2.6.36/drivers/staging/comedi/comedi_fops.c
+--- linux-2.6.36/drivers/staging/comedi/comedi_fops.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/comedi/comedi_fops.c 2010-11-06 18:58:15.000000000 -0400
@@ -1425,7 +1425,7 @@ static void comedi_unmap(struct vm_area_
mutex_unlock(&dev->mutex);
}
.close = comedi_unmap,
};
-diff -urNp linux-2.6.35.4/drivers/staging/dream/pmem.c linux-2.6.35.4/drivers/staging/dream/pmem.c
---- linux-2.6.35.4/drivers/staging/dream/pmem.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/dream/pmem.c 2010-09-17 20:12:09.000000000 -0400
-@@ -175,7 +175,7 @@ static int pmem_mmap(struct file *, stru
- static int pmem_open(struct inode *, struct file *);
- static long pmem_ioctl(struct file *, unsigned int, unsigned long);
-
--struct file_operations pmem_fops = {
-+const struct file_operations pmem_fops = {
- .release = pmem_release,
- .mmap = pmem_mmap,
- .open = pmem_open,
+diff -urNp linux-2.6.36/drivers/staging/dream/pmem.c linux-2.6.36/drivers/staging/dream/pmem.c
+--- linux-2.6.36/drivers/staging/dream/pmem.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/dream/pmem.c 2010-11-06 18:58:15.000000000 -0400
@@ -1201,7 +1201,7 @@ static ssize_t debug_read(struct file *f
return simple_read_from_buffer(buf, count, ppos, buffer, n);
}
.read = debug_read,
.open = debug_open,
};
-diff -urNp linux-2.6.35.4/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.35.4/drivers/staging/dream/qdsp5/adsp_driver.c
---- linux-2.6.35.4/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/dream/qdsp5/adsp_driver.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.36/drivers/staging/dream/qdsp5/adsp_driver.c
+--- linux-2.6.36/drivers/staging/dream/qdsp5/adsp_driver.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/dream/qdsp5/adsp_driver.c 2010-11-06 18:58:15.000000000 -0400
@@ -577,7 +577,7 @@ static struct adsp_device *inode_to_devi
static dev_t adsp_devno;
static struct class *adsp_class;
.owner = THIS_MODULE,
.open = adsp_open,
.unlocked_ioctl = adsp_ioctl,
-diff -urNp linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_aac.c
---- linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_aac.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.36/drivers/staging/dream/qdsp5/audio_aac.c
+--- linux-2.6.36/drivers/staging/dream/qdsp5/audio_aac.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/dream/qdsp5/audio_aac.c 2010-11-06 18:58:15.000000000 -0400
@@ -1023,7 +1023,7 @@ done:
return rc;
}
.owner = THIS_MODULE,
.open = audio_open,
.release = audio_release,
-diff -urNp linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_amrnb.c
---- linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.36/drivers/staging/dream/qdsp5/audio_amrnb.c
+--- linux-2.6.36/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-11-06 18:58:15.000000000 -0400
@@ -834,7 +834,7 @@ done:
return rc;
}
.owner = THIS_MODULE,
.open = audamrnb_open,
.release = audamrnb_release,
-diff -urNp linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_evrc.c
---- linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_evrc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.36/drivers/staging/dream/qdsp5/audio_evrc.c
+--- linux-2.6.36/drivers/staging/dream/qdsp5/audio_evrc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/dream/qdsp5/audio_evrc.c 2010-11-06 18:58:15.000000000 -0400
@@ -806,7 +806,7 @@ dma_fail:
return rc;
}
.owner = THIS_MODULE,
.open = audevrc_open,
.release = audevrc_release,
-diff -urNp linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_in.c
---- linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_in.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_in.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.36/drivers/staging/dream/qdsp5/audio_in.c
+--- linux-2.6.36/drivers/staging/dream/qdsp5/audio_in.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/dream/qdsp5/audio_in.c 2010-11-06 18:58:15.000000000 -0400
@@ -914,7 +914,7 @@ static int audpre_open(struct inode *ino
return 0;
}
.owner = THIS_MODULE,
.open = audpre_open,
.unlocked_ioctl = audpre_ioctl,
-diff -urNp linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_mp3.c
---- linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_mp3.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.36/drivers/staging/dream/qdsp5/audio_mp3.c
+--- linux-2.6.36/drivers/staging/dream/qdsp5/audio_mp3.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/dream/qdsp5/audio_mp3.c 2010-11-06 18:58:15.000000000 -0400
@@ -941,7 +941,7 @@ done:
return rc;
}
.owner = THIS_MODULE,
.open = audio_open,
.release = audio_release,
-diff -urNp linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_out.c
---- linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_out.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_out.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.36/drivers/staging/dream/qdsp5/audio_out.c
+--- linux-2.6.36/drivers/staging/dream/qdsp5/audio_out.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/dream/qdsp5/audio_out.c 2010-11-06 18:58:15.000000000 -0400
@@ -800,7 +800,7 @@ static int audpp_open(struct inode *inod
return 0;
}
.owner = THIS_MODULE,
.open = audpp_open,
.unlocked_ioctl = audpp_ioctl,
-diff -urNp linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_qcelp.c
---- linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.36/drivers/staging/dream/qdsp5/audio_qcelp.c
+--- linux-2.6.36/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-11-06 18:58:15.000000000 -0400
@@ -817,7 +817,7 @@ err:
return rc;
}
.owner = THIS_MODULE,
.open = audqcelp_open,
.release = audqcelp_release,
-diff -urNp linux-2.6.35.4/drivers/staging/dream/qdsp5/snd.c linux-2.6.35.4/drivers/staging/dream/qdsp5/snd.c
---- linux-2.6.35.4/drivers/staging/dream/qdsp5/snd.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/dream/qdsp5/snd.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/staging/dream/qdsp5/snd.c linux-2.6.36/drivers/staging/dream/qdsp5/snd.c
+--- linux-2.6.36/drivers/staging/dream/qdsp5/snd.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/dream/qdsp5/snd.c 2010-11-06 18:58:15.000000000 -0400
@@ -242,7 +242,7 @@ err:
return rc;
}
.owner = THIS_MODULE,
.open = snd_open,
.release = snd_release,
-diff -urNp linux-2.6.35.4/drivers/staging/dt3155/dt3155_drv.c linux-2.6.35.4/drivers/staging/dt3155/dt3155_drv.c
---- linux-2.6.35.4/drivers/staging/dt3155/dt3155_drv.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/dt3155/dt3155_drv.c 2010-09-17 20:12:09.000000000 -0400
-@@ -853,7 +853,7 @@ dt3155_unlocked_ioctl(struct file *file,
- * needed by init_module
- * register_chrdev
- *****************************************************/
--static struct file_operations dt3155_fops = {
-+static const struct file_operations dt3155_fops = {
- .read = dt3155_read,
- .unlocked_ioctl = dt3155_unlocked_ioctl,
- .mmap = dt3155_mmap,
-diff -urNp linux-2.6.35.4/drivers/staging/go7007/go7007-v4l2.c linux-2.6.35.4/drivers/staging/go7007/go7007-v4l2.c
---- linux-2.6.35.4/drivers/staging/go7007/go7007-v4l2.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/go7007/go7007-v4l2.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/staging/go7007/go7007-v4l2.c linux-2.6.36/drivers/staging/go7007/go7007-v4l2.c
+--- linux-2.6.36/drivers/staging/go7007/go7007-v4l2.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/go7007/go7007-v4l2.c 2010-11-06 18:58:15.000000000 -0400
@@ -1673,7 +1673,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.35.4/drivers/staging/hv/hv.c linux-2.6.35.4/drivers/staging/hv/hv.c
---- linux-2.6.35.4/drivers/staging/hv/hv.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/hv/hv.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/staging/hv/hv.c linux-2.6.36/drivers/staging/hv/hv.c
+--- linux-2.6.36/drivers/staging/hv/hv.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/hv/hv.c 2010-11-06 18:58:15.000000000 -0400
@@ -162,7 +162,7 @@ static u64 HvDoHypercall(u64 Control, vo
u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
u32 outputAddressHi = outputAddress >> 32;
DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
Control, Input, Output);
-diff -urNp linux-2.6.35.4/drivers/staging/msm/msm_fb_bl.c linux-2.6.35.4/drivers/staging/msm/msm_fb_bl.c
---- linux-2.6.35.4/drivers/staging/msm/msm_fb_bl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/msm/msm_fb_bl.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/staging/msm/msm_fb_bl.c linux-2.6.36/drivers/staging/msm/msm_fb_bl.c
+--- linux-2.6.36/drivers/staging/msm/msm_fb_bl.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/msm/msm_fb_bl.c 2010-11-06 18:58:15.000000000 -0400
@@ -42,7 +42,7 @@ static int msm_fb_bl_update_status(struc
return 0;
}
.get_brightness = msm_fb_bl_get_brightness,
.update_status = msm_fb_bl_update_status,
};
-diff -urNp linux-2.6.35.4/drivers/staging/panel/panel.c linux-2.6.35.4/drivers/staging/panel/panel.c
---- linux-2.6.35.4/drivers/staging/panel/panel.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/panel/panel.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1304,7 +1304,7 @@ static int lcd_release(struct inode *ino
- return 0;
- }
-
--static struct file_operations lcd_fops = {
-+static const struct file_operations lcd_fops = {
- .write = lcd_write,
- .open = lcd_open,
- .release = lcd_release,
-@@ -1564,7 +1564,7 @@ static int keypad_release(struct inode *
- return 0;
- }
-
--static struct file_operations keypad_fops = {
-+static const struct file_operations keypad_fops = {
- .read = keypad_read, /* read */
- .open = keypad_open, /* open */
- .release = keypad_release, /* close */
-diff -urNp linux-2.6.35.4/drivers/staging/phison/phison.c linux-2.6.35.4/drivers/staging/phison/phison.c
---- linux-2.6.35.4/drivers/staging/phison/phison.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/phison/phison.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/staging/phison/phison.c linux-2.6.36/drivers/staging/phison/phison.c
+--- linux-2.6.36/drivers/staging/phison/phison.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/phison/phison.c 2010-11-06 18:58:15.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.35.4/drivers/staging/pohmelfs/inode.c linux-2.6.35.4/drivers/staging/pohmelfs/inode.c
---- linux-2.6.35.4/drivers/staging/pohmelfs/inode.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/pohmelfs/inode.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1846,7 +1846,7 @@ static int pohmelfs_fill_super(struct su
+diff -urNp linux-2.6.36/drivers/staging/pohmelfs/inode.c linux-2.6.36/drivers/staging/pohmelfs/inode.c
+--- linux-2.6.36/drivers/staging/pohmelfs/inode.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/pohmelfs/inode.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1852,7 +1852,7 @@ static int pohmelfs_fill_super(struct su
mutex_init(&psb->mcache_lock);
psb->mcache_root = RB_ROOT;
psb->mcache_timeout = msecs_to_jiffies(5000);
psb->trans_max_pages = 100;
-diff -urNp linux-2.6.35.4/drivers/staging/pohmelfs/mcache.c linux-2.6.35.4/drivers/staging/pohmelfs/mcache.c
---- linux-2.6.35.4/drivers/staging/pohmelfs/mcache.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/pohmelfs/mcache.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/staging/pohmelfs/mcache.c linux-2.6.36/drivers/staging/pohmelfs/mcache.c
+--- linux-2.6.36/drivers/staging/pohmelfs/mcache.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/pohmelfs/mcache.c 2010-11-06 18:58:15.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.35.4/drivers/staging/pohmelfs/netfs.h linux-2.6.35.4/drivers/staging/pohmelfs/netfs.h
---- linux-2.6.35.4/drivers/staging/pohmelfs/netfs.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/pohmelfs/netfs.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/staging/pohmelfs/netfs.h linux-2.6.36/drivers/staging/pohmelfs/netfs.h
+--- linux-2.6.36/drivers/staging/pohmelfs/netfs.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/pohmelfs/netfs.h 2010-11-06 18:58:15.000000000 -0400
@@ -571,7 +571,7 @@ struct pohmelfs_config;
struct pohmelfs_sb {
struct rb_root mcache_root;
unsigned long mcache_timeout;
unsigned int idx;
-diff -urNp linux-2.6.35.4/drivers/staging/ramzswap/ramzswap_drv.c linux-2.6.35.4/drivers/staging/ramzswap/ramzswap_drv.c
---- linux-2.6.35.4/drivers/staging/ramzswap/ramzswap_drv.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/ramzswap/ramzswap_drv.c 2010-09-17 20:12:09.000000000 -0400
-@@ -693,7 +693,7 @@ void ramzswap_slot_free_notify(struct bl
- return;
- }
-
--static struct block_device_operations ramzswap_devops = {
-+static const struct block_device_operations ramzswap_devops = {
- .ioctl = ramzswap_ioctl,
- .swap_slot_free_notify = ramzswap_slot_free_notify,
- .owner = THIS_MODULE
-diff -urNp linux-2.6.35.4/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.35.4/drivers/staging/rtl8192u/ieee80211/proc.c
---- linux-2.6.35.4/drivers/staging/rtl8192u/ieee80211/proc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/rtl8192u/ieee80211/proc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.36/drivers/staging/rtl8192u/ieee80211/proc.c
+--- linux-2.6.36/drivers/staging/rtl8192u/ieee80211/proc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/rtl8192u/ieee80211/proc.c 2010-11-06 18:58:15.000000000 -0400
@@ -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.35.4/drivers/staging/samsung-laptop/samsung-laptop.c linux-2.6.35.4/drivers/staging/samsung-laptop/samsung-laptop.c
---- linux-2.6.35.4/drivers/staging/samsung-laptop/samsung-laptop.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/samsung-laptop/samsung-laptop.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/staging/samsung-laptop/samsung-laptop.c linux-2.6.36/drivers/staging/samsung-laptop/samsung-laptop.c
+--- linux-2.6.36/drivers/staging/samsung-laptop/samsung-laptop.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/samsung-laptop/samsung-laptop.c 2010-11-06 18:58:15.000000000 -0400
@@ -269,7 +269,7 @@ static int update_status(struct backligh
return 0;
}
.get_brightness = get_brightness,
.update_status = update_status,
};
-diff -urNp linux-2.6.35.4/drivers/staging/sep/sep_driver.c linux-2.6.35.4/drivers/staging/sep/sep_driver.c
---- linux-2.6.35.4/drivers/staging/sep/sep_driver.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/sep/sep_driver.c 2010-09-17 20:12:09.000000000 -0400
-@@ -2637,7 +2637,7 @@ static struct pci_driver sep_pci_driver
- static dev_t sep_devno;
+diff -urNp linux-2.6.36/drivers/staging/spectra/ffsport.c linux-2.6.36/drivers/staging/spectra/ffsport.c
+--- linux-2.6.36/drivers/staging/spectra/ffsport.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/spectra/ffsport.c 2010-11-06 18:58:15.000000000 -0400
+@@ -602,7 +602,7 @@ int GLOB_SBD_unlocked_ioctl(struct block
+ return ret;
+ }
- /* the files operations structure of the driver */
--static struct file_operations sep_file_operations = {
-+static const struct file_operations sep_file_operations = {
+-static struct block_device_operations GLOB_SBD_ops = {
++static const struct block_device_operations GLOB_SBD_ops = {
.owner = THIS_MODULE,
- .unlocked_ioctl = sep_ioctl,
- .poll = sep_poll,
-diff -urNp linux-2.6.35.4/drivers/staging/vme/devices/vme_user.c linux-2.6.35.4/drivers/staging/vme/devices/vme_user.c
---- linux-2.6.35.4/drivers/staging/vme/devices/vme_user.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/staging/vme/devices/vme_user.c 2010-09-17 20:12:09.000000000 -0400
-@@ -136,7 +136,7 @@ static long vme_user_unlocked_ioctl(stru
+ .open = GLOB_SBD_open,
+ .release = GLOB_SBD_release,
+diff -urNp linux-2.6.36/drivers/staging/vme/devices/vme_user.c linux-2.6.36/drivers/staging/vme/devices/vme_user.c
+--- linux-2.6.36/drivers/staging/vme/devices/vme_user.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/staging/vme/devices/vme_user.c 2010-11-06 18:58:15.000000000 -0400
+@@ -137,7 +137,7 @@ static long vme_user_unlocked_ioctl(stru
static int __init vme_user_probe(struct device *, int, int);
static int __exit vme_user_remove(struct device *, int, int);
-static struct file_operations vme_user_fops = {
+static const struct file_operations vme_user_fops = {
- .open = vme_user_open,
- .release = vme_user_release,
- .read = vme_user_read,
-diff -urNp linux-2.6.35.4/drivers/usb/atm/usbatm.c linux-2.6.35.4/drivers/usb/atm/usbatm.c
---- linux-2.6.35.4/drivers/usb/atm/usbatm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/usb/atm/usbatm.c 2010-09-17 20:12:09.000000000 -0400
-@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
+ .open = vme_user_open,
+ .release = vme_user_release,
+ .read = vme_user_read,
+diff -urNp linux-2.6.36/drivers/usb/atm/cxacru.c linux-2.6.36/drivers/usb/atm/cxacru.c
+--- linux-2.6.36/drivers/usb/atm/cxacru.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/usb/atm/cxacru.c 2010-11-06 18:58:15.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;
+- if (index < 0 || index > 0x7f)
++ if (index > 0x7f)
+ return -EINVAL;
+ pos += tmp;
+
+diff -urNp linux-2.6.36/drivers/usb/atm/usbatm.c linux-2.6.36/drivers/usb/atm/usbatm.c
+--- linux-2.6.36/drivers/usb/atm/usbatm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/usb/atm/usbatm.c 2010-11-06 18:58:15.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",
__func__, vpi, vci);
return;
}
-@@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(stru
+@@ -360,7 +360,7 @@ static void usbatm_extract_one_cell(stru
if (length > ATM_MAX_AAL5_PDU) {
atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
__func__, length, vcc);
goto out;
}
-@@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(stru
+@@ -369,14 +369,14 @@ static void usbatm_extract_one_cell(stru
if (sarb->len < pdu_length) {
atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
__func__, pdu_length, sarb->len, vcc);
goto out;
}
-@@ -387,7 +387,7 @@ static void usbatm_extract_one_cell(stru
+@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(stru
if (printk_ratelimit())
atm_err(instance, "%s: no memory for skb (length: %u)!\n",
__func__, length);
goto out;
}
-@@ -412,7 +412,7 @@ static void usbatm_extract_one_cell(stru
+@@ -411,7 +411,7 @@ static void usbatm_extract_one_cell(stru
vcc->push(vcc, skb);
out:
skb_trim(sarb, 0);
}
-@@ -616,7 +616,7 @@ static void usbatm_tx_process(unsigned l
+@@ -614,7 +614,7 @@ static void usbatm_tx_process(unsigned l
struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
usbatm_pop(vcc, skb);
skb = skb_dequeue(&instance->sndqueue);
}
-@@ -775,11 +775,11 @@ static int usbatm_atm_proc_read(struct a
+@@ -773,11 +773,11 @@ static int usbatm_atm_proc_read(struct a
if (!left--)
return sprintf(page,
"AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
if (!left--) {
if (instance->disconnected)
-diff -urNp linux-2.6.35.4/drivers/usb/class/cdc-acm.c linux-2.6.35.4/drivers/usb/class/cdc-acm.c
---- linux-2.6.35.4/drivers/usb/class/cdc-acm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/usb/class/cdc-acm.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1619,7 +1619,7 @@ static const struct usb_device_id acm_id
+diff -urNp linux-2.6.36/drivers/usb/class/cdc-acm.c linux-2.6.36/drivers/usb/class/cdc-acm.c
+--- linux-2.6.36/drivers/usb/class/cdc-acm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/usb/class/cdc-acm.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1634,7 +1634,7 @@ static const struct usb_device_id acm_id
{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
USB_CDC_ACM_PROTO_AT_CDMA) },
};
MODULE_DEVICE_TABLE(usb, acm_ids);
-diff -urNp linux-2.6.35.4/drivers/usb/class/cdc-wdm.c linux-2.6.35.4/drivers/usb/class/cdc-wdm.c
---- linux-2.6.35.4/drivers/usb/class/cdc-wdm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/usb/class/cdc-wdm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/usb/class/cdc-wdm.c linux-2.6.36/drivers/usb/class/cdc-wdm.c
+--- linux-2.6.36/drivers/usb/class/cdc-wdm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/usb/class/cdc-wdm.c 2010-11-06 18:58:15.000000000 -0400
@@ -342,7 +342,7 @@ static ssize_t wdm_write
goto outnp;
}
r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
&desc->flags));
else
-diff -urNp linux-2.6.35.4/drivers/usb/class/usblp.c linux-2.6.35.4/drivers/usb/class/usblp.c
---- linux-2.6.35.4/drivers/usb/class/usblp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/usb/class/usblp.c 2010-09-17 20:12:09.000000000 -0400
-@@ -226,7 +226,7 @@ static const struct quirk_printer_struct
+diff -urNp linux-2.6.36/drivers/usb/class/usblp.c linux-2.6.36/drivers/usb/class/usblp.c
+--- linux-2.6.36/drivers/usb/class/usblp.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/usb/class/usblp.c 2010-11-06 18:58:15.000000000 -0400
+@@ -227,7 +227,7 @@ static const struct quirk_printer_struct
{ 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */
{ 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */
{ 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt Printer M129C */
};
static int usblp_wwait(struct usblp *usblp, int nonblock);
-@@ -1398,7 +1398,7 @@ static const struct usb_device_id usblp_
+@@ -1397,7 +1397,7 @@ static const struct usb_device_id usblp_
{ USB_INTERFACE_INFO(7, 1, 2) },
{ USB_INTERFACE_INFO(7, 1, 3) },
{ USB_DEVICE(0x04b8, 0x0202) }, /* Seiko Epson Receipt Printer M129C */
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* Terminating entry */
};
- MODULE_DEVICE_TABLE (usb, usblp_ids);
-diff -urNp linux-2.6.35.4/drivers/usb/core/hcd.c linux-2.6.35.4/drivers/usb/core/hcd.c
---- linux-2.6.35.4/drivers/usb/core/hcd.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/usb/core/hcd.c 2010-09-17 20:12:09.000000000 -0400
-@@ -2381,7 +2381,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
+ MODULE_DEVICE_TABLE(usb, usblp_ids);
+diff -urNp linux-2.6.36/drivers/usb/core/hcd.c linux-2.6.36/drivers/usb/core/hcd.c
+--- linux-2.6.36/drivers/usb/core/hcd.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/usb/core/hcd.c 2010-11-06 18:58:15.000000000 -0400
+@@ -2420,7 +2420,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
/*
* The registration is unlocked.
-@@ -2391,7 +2391,7 @@ struct usb_mon_operations *mon_ops;
+@@ -2430,7 +2430,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.35.4/drivers/usb/core/hub.c linux-2.6.35.4/drivers/usb/core/hub.c
---- linux-2.6.35.4/drivers/usb/core/hub.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/usb/core/hub.c 2010-09-17 20:12:09.000000000 -0400
-@@ -3453,7 +3453,7 @@ static const struct usb_device_id hub_id
+diff -urNp linux-2.6.36/drivers/usb/core/hub.c linux-2.6.36/drivers/usb/core/hub.c
+--- linux-2.6.36/drivers/usb/core/hub.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/usb/core/hub.c 2010-11-06 18:58:15.000000000 -0400
+@@ -3456,7 +3456,7 @@ static const struct usb_device_id hub_id
.bDeviceClass = USB_CLASS_HUB},
{ .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
.bInterfaceClass = USB_CLASS_HUB},
};
MODULE_DEVICE_TABLE (usb, hub_id_table);
-diff -urNp linux-2.6.35.4/drivers/usb/core/message.c linux-2.6.35.4/drivers/usb/core/message.c
---- linux-2.6.35.4/drivers/usb/core/message.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/usb/core/message.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/usb/core/message.c linux-2.6.36/drivers/usb/core/message.c
+--- linux-2.6.36/drivers/usb/core/message.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/usb/core/message.c 2010-11-06 18:58:15.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.35.4/drivers/usb/early/ehci-dbgp.c linux-2.6.35.4/drivers/usb/early/ehci-dbgp.c
---- linux-2.6.35.4/drivers/usb/early/ehci-dbgp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/usb/early/ehci-dbgp.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1026,6 +1026,7 @@ static void kgdbdbgp_write_char(u8 chr)
+diff -urNp linux-2.6.36/drivers/usb/early/ehci-dbgp.c linux-2.6.36/drivers/usb/early/ehci-dbgp.c
+--- linux-2.6.36/drivers/usb/early/ehci-dbgp.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/usb/early/ehci-dbgp.c 2010-11-06 18:58:15.000000000 -0400
+@@ -96,6 +96,7 @@ static inline u32 dbgp_len_update(u32 x,
+ }
+
+ #ifdef CONFIG_KGDB
++/* cannot be const, see kgdbdbgp_parse_config */
+ static struct kgdb_io kgdbdbgp_io_ops;
+ #define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
+ #else
+@@ -1026,6 +1027,7 @@ static void kgdbdbgp_write_char(u8 chr)
early_dbgp_write(NULL, &chr, 1);
}
static struct kgdb_io kgdbdbgp_io_ops = {
.name = "kgdbdbgp",
.read_char = kgdbdbgp_read_char,
-diff -urNp linux-2.6.35.4/drivers/usb/host/ehci-pci.c linux-2.6.35.4/drivers/usb/host/ehci-pci.c
---- linux-2.6.35.4/drivers/usb/host/ehci-pci.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/usb/host/ehci-pci.c 2010-09-17 20:12:09.000000000 -0400
-@@ -419,7 +419,7 @@ static const struct pci_device_id pci_id
+diff -urNp linux-2.6.36/drivers/usb/host/ehci-pci.c linux-2.6.36/drivers/usb/host/ehci-pci.c
+--- linux-2.6.36/drivers/usb/host/ehci-pci.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/usb/host/ehci-pci.c 2010-11-06 18:58:15.000000000 -0400
+@@ -445,7 +445,7 @@ static const struct pci_device_id pci_id
PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
.driver_data = (unsigned long) &ehci_pci_hc_driver,
},
};
MODULE_DEVICE_TABLE(pci, pci_ids);
-diff -urNp linux-2.6.35.4/drivers/usb/host/uhci-hcd.c linux-2.6.35.4/drivers/usb/host/uhci-hcd.c
---- linux-2.6.35.4/drivers/usb/host/uhci-hcd.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/usb/host/uhci-hcd.c 2010-09-17 20:12:09.000000000 -0400
-@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p
+diff -urNp linux-2.6.36/drivers/usb/host/uhci-hcd.c linux-2.6.36/drivers/usb/host/uhci-hcd.c
+--- linux-2.6.36/drivers/usb/host/uhci-hcd.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/usb/host/uhci-hcd.c 2010-11-06 18:58:15.000000000 -0400
+@@ -948,7 +948,7 @@ static const struct pci_device_id uhci_p
/* handle any USB UHCI controller */
PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
.driver_data = (unsigned long) &uhci_driver,
};
MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
-diff -urNp linux-2.6.35.4/drivers/usb/mon/mon_main.c linux-2.6.35.4/drivers/usb/mon/mon_main.c
---- linux-2.6.35.4/drivers/usb/mon/mon_main.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/usb/mon/mon_main.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/usb/mon/mon_main.c linux-2.6.36/drivers/usb/mon/mon_main.c
+--- linux-2.6.36/drivers/usb/mon/mon_main.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/usb/mon/mon_main.c 2010-11-06 18:58:15.000000000 -0400
@@ -240,7 +240,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.35.4/drivers/usb/storage/debug.h linux-2.6.35.4/drivers/usb/storage/debug.h
---- linux-2.6.35.4/drivers/usb/storage/debug.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/usb/storage/debug.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/usb/storage/debug.h linux-2.6.36/drivers/usb/storage/debug.h
+--- linux-2.6.36/drivers/usb/storage/debug.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/usb/storage/debug.h 2010-11-06 18:58:15.000000000 -0400
@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
#define US_DEBUGPX(x...) printk( x )
#define US_DEBUG(x) x
#endif
#endif
-diff -urNp linux-2.6.35.4/drivers/usb/storage/usb.c linux-2.6.35.4/drivers/usb/storage/usb.c
---- linux-2.6.35.4/drivers/usb/storage/usb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/usb/storage/usb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/usb/storage/usb.c linux-2.6.36/drivers/usb/storage/usb.c
+--- linux-2.6.36/drivers/usb/storage/usb.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/usb/storage/usb.c 2010-11-06 18:58:15.000000000 -0400
@@ -122,7 +122,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
static struct us_unusual_dev us_unusual_dev_list[] = {
};
#undef UNUSUAL_DEV
-diff -urNp linux-2.6.35.4/drivers/usb/storage/usual-tables.c linux-2.6.35.4/drivers/usb/storage/usual-tables.c
---- linux-2.6.35.4/drivers/usb/storage/usual-tables.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/usb/storage/usual-tables.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/usb/storage/usual-tables.c linux-2.6.36/drivers/usb/storage/usual-tables.c
+--- linux-2.6.36/drivers/usb/storage/usual-tables.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/usb/storage/usual-tables.c 2010-11-06 18:58:15.000000000 -0400
@@ -48,7 +48,7 @@
struct usb_device_id usb_storage_usb_ids[] = {
};
EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
-diff -urNp linux-2.6.35.4/drivers/uwb/wlp/messages.c linux-2.6.35.4/drivers/uwb/wlp/messages.c
---- linux-2.6.35.4/drivers/uwb/wlp/messages.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/uwb/wlp/messages.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/uwb/wlp/messages.c linux-2.6.36/drivers/uwb/wlp/messages.c
+--- linux-2.6.36/drivers/uwb/wlp/messages.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/uwb/wlp/messages.c 2010-11-06 18:58:15.000000000 -0400
@@ -920,7 +920,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
size_t len = skb->len;
size_t used;
enum wlp_assc_error assc_err;
char enonce_buf[WLP_WSS_NONCE_STRSIZE];
char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
-diff -urNp linux-2.6.35.4/drivers/vhost/vhost.c linux-2.6.35.4/drivers/vhost/vhost.c
---- linux-2.6.35.4/drivers/vhost/vhost.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/vhost/vhost.c 2010-09-17 20:12:09.000000000 -0400
-@@ -357,7 +357,7 @@ static int init_used(struct vhost_virtqu
+diff -urNp linux-2.6.36/drivers/vhost/vhost.c linux-2.6.36/drivers/vhost/vhost.c
+--- linux-2.6.36/drivers/vhost/vhost.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/vhost/vhost.c 2010-11-06 18:58:15.000000000 -0400
+@@ -503,7 +503,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.35.4/drivers/video/atmel_lcdfb.c linux-2.6.35.4/drivers/video/atmel_lcdfb.c
---- linux-2.6.35.4/drivers/video/atmel_lcdfb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/video/atmel_lcdfb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/video/atmel_lcdfb.c linux-2.6.36/drivers/video/atmel_lcdfb.c
+--- linux-2.6.36/drivers/video/atmel_lcdfb.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/video/atmel_lcdfb.c 2010-11-06 18:58:15.000000000 -0400
@@ -111,7 +111,7 @@ static int atmel_bl_get_brightness(struc
return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
}
.update_status = atmel_bl_update_status,
.get_brightness = atmel_bl_get_brightness,
};
-diff -urNp linux-2.6.35.4/drivers/video/aty/aty128fb.c linux-2.6.35.4/drivers/video/aty/aty128fb.c
---- linux-2.6.35.4/drivers/video/aty/aty128fb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/video/aty/aty128fb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/video/aty/aty128fb.c linux-2.6.36/drivers/video/aty/aty128fb.c
+--- linux-2.6.36/drivers/video/aty/aty128fb.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/video/aty/aty128fb.c 2010-11-06 18:58:15.000000000 -0400
@@ -1786,7 +1786,7 @@ static int aty128_bl_get_brightness(stru
return bd->props.brightness;
}
.get_brightness = aty128_bl_get_brightness,
.update_status = aty128_bl_update_status,
};
-diff -urNp linux-2.6.35.4/drivers/video/aty/atyfb_base.c linux-2.6.35.4/drivers/video/aty/atyfb_base.c
---- linux-2.6.35.4/drivers/video/aty/atyfb_base.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/video/aty/atyfb_base.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/video/aty/atyfb_base.c linux-2.6.36/drivers/video/aty/atyfb_base.c
+--- linux-2.6.36/drivers/video/aty/atyfb_base.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/video/aty/atyfb_base.c 2010-11-06 18:58:15.000000000 -0400
@@ -2221,7 +2221,7 @@ static int aty_bl_get_brightness(struct
return bd->props.brightness;
}
.get_brightness = aty_bl_get_brightness,
.update_status = aty_bl_update_status,
};
-diff -urNp linux-2.6.35.4/drivers/video/aty/radeon_backlight.c linux-2.6.35.4/drivers/video/aty/radeon_backlight.c
---- linux-2.6.35.4/drivers/video/aty/radeon_backlight.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/video/aty/radeon_backlight.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/video/aty/radeon_backlight.c linux-2.6.36/drivers/video/aty/radeon_backlight.c
+--- linux-2.6.36/drivers/video/aty/radeon_backlight.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/video/aty/radeon_backlight.c 2010-11-06 18:58:15.000000000 -0400
@@ -128,7 +128,7 @@ static int radeon_bl_get_brightness(stru
return bd->props.brightness;
}
.get_brightness = radeon_bl_get_brightness,
.update_status = radeon_bl_update_status,
};
-diff -urNp linux-2.6.35.4/drivers/video/backlight/88pm860x_bl.c linux-2.6.35.4/drivers/video/backlight/88pm860x_bl.c
---- linux-2.6.35.4/drivers/video/backlight/88pm860x_bl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/video/backlight/88pm860x_bl.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/video/backlight/88pm860x_bl.c linux-2.6.36/drivers/video/backlight/88pm860x_bl.c
+--- linux-2.6.36/drivers/video/backlight/88pm860x_bl.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/video/backlight/88pm860x_bl.c 2010-11-06 18:58:15.000000000 -0400
@@ -155,7 +155,7 @@ out:
return -EINVAL;
}
.options = BL_CORE_SUSPENDRESUME,
.update_status = pm860x_backlight_update_status,
.get_brightness = pm860x_backlight_get_brightness,
-diff -urNp linux-2.6.35.4/drivers/video/backlight/max8925_bl.c linux-2.6.35.4/drivers/video/backlight/max8925_bl.c
---- linux-2.6.35.4/drivers/video/backlight/max8925_bl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/video/backlight/max8925_bl.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/video/backlight/max8925_bl.c linux-2.6.36/drivers/video/backlight/max8925_bl.c
+--- linux-2.6.36/drivers/video/backlight/max8925_bl.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/video/backlight/max8925_bl.c 2010-11-06 18:58:15.000000000 -0400
@@ -92,7 +92,7 @@ static int max8925_backlight_get_brightn
return ret;
}
.options = BL_CORE_SUSPENDRESUME,
.update_status = max8925_backlight_update_status,
.get_brightness = max8925_backlight_get_brightness,
-diff -urNp linux-2.6.35.4/drivers/video/fbcmap.c linux-2.6.35.4/drivers/video/fbcmap.c
---- linux-2.6.35.4/drivers/video/fbcmap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/video/fbcmap.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/video/fbcmap.c linux-2.6.36/drivers/video/fbcmap.c
+--- linux-2.6.36/drivers/video/fbcmap.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/video/fbcmap.c 2010-11-06 18:58:15.000000000 -0400
@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
rc = -ENODEV;
goto out;
rc = -EINVAL;
goto out1;
}
-diff -urNp linux-2.6.35.4/drivers/video/fbmem.c linux-2.6.35.4/drivers/video/fbmem.c
---- linux-2.6.35.4/drivers/video/fbmem.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/video/fbmem.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/video/fbmem.c linux-2.6.36/drivers/video/fbmem.c
+--- linux-2.6.36/drivers/video/fbmem.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/video/fbmem.c 2010-11-06 18:58:15.000000000 -0400
@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
image->dx += image->width + 8;
}
return -EINVAL;
if (!registered_fb[con2fb.framebuffer])
request_module("fb%d", con2fb.framebuffer);
-diff -urNp linux-2.6.35.4/drivers/video/fbmon.c linux-2.6.35.4/drivers/video/fbmon.c
---- linux-2.6.35.4/drivers/video/fbmon.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/video/fbmon.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/video/fbmon.c linux-2.6.36/drivers/video/fbmon.c
+--- linux-2.6.36/drivers/video/fbmon.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/video/fbmon.c 2010-11-06 18:58:15.000000000 -0400
@@ -46,7 +46,7 @@
#ifdef DEBUG
#define DPRINTK(fmt, args...) printk(fmt,## args)
#endif
#define FBMON_FIX_HEADER 1
-diff -urNp linux-2.6.35.4/drivers/video/i810/i810_accel.c linux-2.6.35.4/drivers/video/i810/i810_accel.c
---- linux-2.6.35.4/drivers/video/i810/i810_accel.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/video/i810/i810_accel.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/video/i810/i810_accel.c linux-2.6.36/drivers/video/i810/i810_accel.c
+--- linux-2.6.36/drivers/video/i810/i810_accel.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/video/i810/i810_accel.c 2010-11-06 18:58:15.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.35.4/drivers/video/i810/i810_main.c linux-2.6.35.4/drivers/video/i810/i810_main.c
---- linux-2.6.35.4/drivers/video/i810/i810_main.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/video/i810/i810_main.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/video/i810/i810_main.c linux-2.6.36/drivers/video/i810/i810_main.c
+--- linux-2.6.36/drivers/video/i810/i810_main.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/video/i810/i810_main.c 2010-11-06 18:58:15.000000000 -0400
@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
};
static struct pci_driver i810fb_driver = {
-diff -urNp linux-2.6.35.4/drivers/video/modedb.c linux-2.6.35.4/drivers/video/modedb.c
---- linux-2.6.35.4/drivers/video/modedb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/video/modedb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/video/modedb.c linux-2.6.36/drivers/video/modedb.c
+--- linux-2.6.36/drivers/video/modedb.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/video/modedb.c 2010-11-06 18:58:15.000000000 -0400
@@ -40,240 +40,240 @@ static const struct fb_videomode modedb[
{
/* 640x400 @ 70 Hz, 31.5 kHz hsync */
},
};
-diff -urNp linux-2.6.35.4/drivers/video/nvidia/nv_backlight.c linux-2.6.35.4/drivers/video/nvidia/nv_backlight.c
---- linux-2.6.35.4/drivers/video/nvidia/nv_backlight.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/video/nvidia/nv_backlight.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/video/nvidia/nv_backlight.c linux-2.6.36/drivers/video/nvidia/nv_backlight.c
+--- linux-2.6.36/drivers/video/nvidia/nv_backlight.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/video/nvidia/nv_backlight.c 2010-11-06 18:58:15.000000000 -0400
@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
return bd->props.brightness;
}
.get_brightness = nvidia_bl_get_brightness,
.update_status = nvidia_bl_update_status,
};
-diff -urNp linux-2.6.35.4/drivers/video/omap2/displays/panel-taal.c linux-2.6.35.4/drivers/video/omap2/displays/panel-taal.c
---- linux-2.6.35.4/drivers/video/omap2/displays/panel-taal.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/video/omap2/displays/panel-taal.c 2010-09-17 20:12:09.000000000 -0400
-@@ -319,7 +319,7 @@ static int taal_bl_get_intensity(struct
+diff -urNp linux-2.6.36/drivers/video/omap2/displays/panel-taal.c linux-2.6.36/drivers/video/omap2/displays/panel-taal.c
+--- linux-2.6.36/drivers/video/omap2/displays/panel-taal.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/video/omap2/displays/panel-taal.c 2010-11-06 18:58:15.000000000 -0400
+@@ -465,7 +465,7 @@ static int taal_bl_get_intensity(struct
return 0;
}
.get_brightness = taal_bl_get_intensity,
.update_status = taal_bl_update_status,
};
-diff -urNp linux-2.6.35.4/drivers/video/riva/fbdev.c linux-2.6.35.4/drivers/video/riva/fbdev.c
---- linux-2.6.35.4/drivers/video/riva/fbdev.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/video/riva/fbdev.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/video/riva/fbdev.c linux-2.6.36/drivers/video/riva/fbdev.c
+--- linux-2.6.36/drivers/video/riva/fbdev.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/video/riva/fbdev.c 2010-11-06 18:58:15.000000000 -0400
@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
return bd->props.brightness;
}
.get_brightness = riva_bl_get_brightness,
.update_status = riva_bl_update_status,
};
-diff -urNp linux-2.6.35.4/drivers/video/uvesafb.c linux-2.6.35.4/drivers/video/uvesafb.c
---- linux-2.6.35.4/drivers/video/uvesafb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/video/uvesafb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/video/uvesafb.c linux-2.6.36/drivers/video/uvesafb.c
+--- linux-2.6.36/drivers/video/uvesafb.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/video/uvesafb.c 2010-11-06 18:58:15.000000000 -0400
@@ -19,6 +19,7 @@
#include <linux/io.h>
#include <linux/mutex.h>
}
framebuffer_release(info);
-diff -urNp linux-2.6.35.4/drivers/video/vesafb.c linux-2.6.35.4/drivers/video/vesafb.c
---- linux-2.6.35.4/drivers/video/vesafb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/drivers/video/vesafb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/drivers/video/vesafb.c linux-2.6.36/drivers/video/vesafb.c
+--- linux-2.6.36/drivers/video/vesafb.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/drivers/video/vesafb.c 2010-11-06 18:58:15.000000000 -0400
@@ -9,6 +9,7 @@
*/
if (info->screen_base)
iounmap(info->screen_base);
framebuffer_release(info);
-diff -urNp linux-2.6.35.4/fs/9p/vfs_inode.c linux-2.6.35.4/fs/9p/vfs_inode.c
---- linux-2.6.35.4/fs/9p/vfs_inode.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/9p/vfs_inode.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1087,7 +1087,7 @@ static void *v9fs_vfs_follow_link(struct
+diff -urNp linux-2.6.36/fs/9p/vfs_inode.c linux-2.6.36/fs/9p/vfs_inode.c
+--- linux-2.6.36/fs/9p/vfs_inode.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/9p/vfs_inode.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1539,7 +1539,7 @@ static void *v9fs_vfs_follow_link(struct
static 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.35.4/fs/aio.c linux-2.6.35.4/fs/aio.c
---- linux-2.6.35.4/fs/aio.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/aio.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/aio.c linux-2.6.36/fs/aio.c
+--- linux-2.6.36/fs/aio.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/aio.c 2010-11-06 18:58:15.000000000 -0400
@@ -130,7 +130,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.35.4/fs/attr.c linux-2.6.35.4/fs/attr.c
---- linux-2.6.35.4/fs/attr.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/attr.c 2010-09-17 20:12:37.000000000 -0400
-@@ -82,6 +82,7 @@ int inode_newsize_ok(const struct inode
+diff -urNp linux-2.6.36/fs/attr.c linux-2.6.36/fs/attr.c
+--- linux-2.6.36/fs/attr.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/attr.c 2010-11-06 18:58:50.000000000 -0400
+@@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode
unsigned long limit;
limit = rlimit(RLIMIT_FSIZE);
if (limit != RLIM_INFINITY && offset > limit)
goto out_sig;
if (offset > inode->i_sb->s_maxbytes)
-diff -urNp linux-2.6.35.4/fs/autofs/root.c linux-2.6.35.4/fs/autofs/root.c
---- linux-2.6.35.4/fs/autofs/root.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/autofs/root.c 2010-09-17 20:12:09.000000000 -0400
-@@ -301,7 +301,8 @@ static int autofs_root_symlink(struct in
+diff -urNp linux-2.6.36/fs/autofs/root.c linux-2.6.36/fs/autofs/root.c
+--- linux-2.6.36/fs/autofs/root.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/autofs/root.c 2010-11-06 19:50:37.000000000 -0400
+@@ -27,7 +27,9 @@ static int autofs_root_unlink(struct ino
+ static int autofs_root_rmdir(struct inode *,struct dentry *);
+ static int autofs_root_mkdir(struct inode *,struct dentry *,int);
+ static long autofs_root_ioctl(struct file *,unsigned int,unsigned long);
++#ifdef CONFIG_COMPAT
+ static long autofs_root_compat_ioctl(struct file *,unsigned int,unsigned long);
++#endif
+
+ const struct file_operations autofs_root_operations = {
+ .llseek = generic_file_llseek,
+@@ -306,7 +308,8 @@ static int autofs_root_symlink(struct in
set_bit(n,sbi->symlink_bitmap);
sl = &sbi->symlink[n];
sl->len = strlen(symname);
if (!sl->data) {
clear_bit(n,sbi->symlink_bitmap);
unlock_kernel();
-diff -urNp linux-2.6.35.4/fs/autofs4/symlink.c linux-2.6.35.4/fs/autofs4/symlink.c
---- linux-2.6.35.4/fs/autofs4/symlink.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/autofs4/symlink.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/autofs4/root.c linux-2.6.36/fs/autofs4/root.c
+--- linux-2.6.36/fs/autofs4/root.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/autofs4/root.c 2010-11-06 19:50:56.000000000 -0400
+@@ -28,7 +28,9 @@ static int autofs4_dir_unlink(struct ino
+ static int autofs4_dir_rmdir(struct inode *,struct dentry *);
+ static int autofs4_dir_mkdir(struct inode *,struct dentry *,int);
+ static long autofs4_root_ioctl(struct file *,unsigned int,unsigned long);
++#ifdef CONFIG_COMPAT
+ static long autofs4_root_compat_ioctl(struct file *,unsigned int,unsigned long);
++#endif
+ static int autofs4_dir_open(struct inode *inode, struct file *file);
+ static struct dentry *autofs4_lookup(struct inode *,struct dentry *, struct nameidata *);
+ static void *autofs4_follow_link(struct dentry *, struct nameidata *);
+diff -urNp linux-2.6.36/fs/autofs4/symlink.c linux-2.6.36/fs/autofs4/symlink.c
+--- linux-2.6.36/fs/autofs4/symlink.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/autofs4/symlink.c 2010-11-06 18:58:15.000000000 -0400
@@ -15,7 +15,7 @@
static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
{
return NULL;
}
-diff -urNp linux-2.6.35.4/fs/befs/linuxvfs.c linux-2.6.35.4/fs/befs/linuxvfs.c
---- linux-2.6.35.4/fs/befs/linuxvfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/befs/linuxvfs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/befs/linuxvfs.c linux-2.6.36/fs/befs/linuxvfs.c
+--- linux-2.6.36/fs/befs/linuxvfs.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/befs/linuxvfs.c 2010-11-06 18:58:15.000000000 -0400
@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry
{
befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
if (!IS_ERR(link))
kfree(link);
}
-diff -urNp linux-2.6.35.4/fs/binfmt_aout.c linux-2.6.35.4/fs/binfmt_aout.c
---- linux-2.6.35.4/fs/binfmt_aout.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/binfmt_aout.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/fs/binfmt_aout.c linux-2.6.36/fs/binfmt_aout.c
+--- linux-2.6.36/fs/binfmt_aout.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/binfmt_aout.c 2010-11-06 18:58:50.000000000 -0400
@@ -16,6 +16,7 @@
#include <linux/string.h>
#include <linux/fs.h>
#include <linux/stat.h>
#include <linux/fcntl.h>
#include <linux/ptrace.h>
-@@ -97,10 +98,12 @@ static int aout_core_dump(struct coredum
+@@ -86,6 +87,8 @@ static int aout_core_dump(struct coredum
+ #endif
+ # define START_STACK(u) ((void __user *)u.start_stack)
+
++ memset(&dump, 0, sizeof(dump));
++
+ fs = get_fs();
+ set_fs(KERNEL_DS);
+ has_dumped = 1;
+@@ -97,10 +100,12 @@ static int aout_core_dump(struct coredum
/* If the size of the dump file exceeds the rlimit, then see what would happen
if we wrote the stack, but not the data area. */
if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
dump.u_ssize = 0;
-@@ -238,6 +241,8 @@ static int load_aout_binary(struct linux
+@@ -234,6 +239,8 @@ static int load_aout_binary(struct linux
rlim = rlimit(RLIMIT_DATA);
if (rlim >= RLIM_INFINITY)
rlim = ~0;
if (ex.a_data + ex.a_bss > rlim)
return -ENOMEM;
-@@ -266,6 +271,27 @@ static int load_aout_binary(struct linux
+@@ -262,6 +269,27 @@ static int load_aout_binary(struct linux
install_exec_creds(bprm);
current->flags &= ~PF_FORKNOEXEC;
if (N_MAGIC(ex) == OMAGIC) {
unsigned long text_addr, map_size;
loff_t pos;
-@@ -338,7 +364,7 @@ static int load_aout_binary(struct linux
+@@ -334,7 +362,7 @@ static int load_aout_binary(struct linux
down_write(¤t->mm->mmap_sem);
error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
fd_offset + ex.a_text);
up_write(¤t->mm->mmap_sem);
-diff -urNp linux-2.6.35.4/fs/binfmt_elf.c linux-2.6.35.4/fs/binfmt_elf.c
---- linux-2.6.35.4/fs/binfmt_elf.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/binfmt_elf.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/fs/binfmt_elf.c linux-2.6.36/fs/binfmt_elf.c
+--- linux-2.6.36/fs/binfmt_elf.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/binfmt_elf.c 2010-11-06 18:58:50.000000000 -0400
@@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump
#define elf_core_dump NULL
#endif
static int __init init_elf_binfmt(void)
{
return register_binfmt(&elf_format);
-diff -urNp linux-2.6.35.4/fs/binfmt_flat.c linux-2.6.35.4/fs/binfmt_flat.c
---- linux-2.6.35.4/fs/binfmt_flat.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/binfmt_flat.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/binfmt_flat.c linux-2.6.36/fs/binfmt_flat.c
+--- linux-2.6.36/fs/binfmt_flat.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/binfmt_flat.c 2010-11-06 18:58:15.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.35.4/fs/binfmt_misc.c linux-2.6.35.4/fs/binfmt_misc.c
---- linux-2.6.35.4/fs/binfmt_misc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/binfmt_misc.c 2010-09-17 20:12:09.000000000 -0400
-@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl
+diff -urNp linux-2.6.36/fs/binfmt_misc.c linux-2.6.36/fs/binfmt_misc.c
+--- linux-2.6.36/fs/binfmt_misc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/binfmt_misc.c 2010-11-06 18:58:15.000000000 -0400
+@@ -694,7 +694,7 @@ static int bm_fill_super(struct super_bl
static struct tree_descr bm_files[] = {
[2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
[3] = {"register", &bm_register_operations, S_IWUSR},
};
int err = simple_fill_super(sb, 0x42494e4d, bm_files);
if (!err)
-diff -urNp linux-2.6.35.4/fs/bio.c linux-2.6.35.4/fs/bio.c
---- linux-2.6.35.4/fs/bio.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/bio.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1213,7 +1213,7 @@ static void bio_copy_kern_endio(struct b
+diff -urNp linux-2.6.36/fs/bio.c linux-2.6.36/fs/bio.c
+--- linux-2.6.36/fs/bio.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/bio.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1214,7 +1214,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;
int i;
__bio_for_each_segment(bvec, bio, i, 0) {
char *addr = page_address(bvec->bv_page);
-diff -urNp linux-2.6.35.4/fs/block_dev.c linux-2.6.35.4/fs/block_dev.c
---- linux-2.6.35.4/fs/block_dev.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/block_dev.c 2010-09-17 20:12:09.000000000 -0400
-@@ -647,7 +647,7 @@ static bool bd_may_claim(struct block_de
+diff -urNp linux-2.6.36/fs/block_dev.c linux-2.6.36/fs/block_dev.c
+--- linux-2.6.36/fs/block_dev.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/block_dev.c 2010-11-06 18:58:15.000000000 -0400
+@@ -648,7 +648,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.35.4/fs/btrfs/ctree.c linux-2.6.35.4/fs/btrfs/ctree.c
---- linux-2.6.35.4/fs/btrfs/ctree.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/btrfs/ctree.c 2010-09-17 20:12:09.000000000 -0400
-@@ -3763,7 +3763,6 @@ setup_items_for_insert(struct btrfs_tran
+diff -urNp linux-2.6.36/fs/btrfs/ctree.c linux-2.6.36/fs/btrfs/ctree.c
+--- linux-2.6.36/fs/btrfs/ctree.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/btrfs/ctree.c 2010-11-06 18:58:15.000000000 -0400
+@@ -468,9 +468,12 @@ static noinline int __btrfs_cow_block(st
+ free_extent_buffer(buf);
+ add_root_to_dirty_list(root);
+ } else {
+- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
+- parent_start = parent->start;
+- else
++ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
++ if (parent)
++ parent_start = parent->start;
++ else
++ parent_start = 0;
++ } else
+ parent_start = 0;
+
+ WARN_ON(trans->transid != btrfs_header_generation(parent));
+@@ -3763,7 +3766,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.35.4/fs/btrfs/disk-io.c linux-2.6.35.4/fs/btrfs/disk-io.c
---- linux-2.6.35.4/fs/btrfs/disk-io.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/btrfs/disk-io.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/btrfs/disk-io.c linux-2.6.36/fs/btrfs/disk-io.c
+--- linux-2.6.36/fs/btrfs/disk-io.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/btrfs/disk-io.c 2010-11-06 18:58:15.000000000 -0400
@@ -40,7 +40,7 @@
#include "tree-log.h"
#include "free-space-cache.h"
.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.35.4/fs/btrfs/extent_io.h linux-2.6.35.4/fs/btrfs/extent_io.h
---- linux-2.6.35.4/fs/btrfs/extent_io.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/btrfs/extent_io.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/btrfs/extent_io.h linux-2.6.36/fs/btrfs/extent_io.h
+--- linux-2.6.36/fs/btrfs/extent_io.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/btrfs/extent_io.h 2010-11-06 18:58:15.000000000 -0400
@@ -51,36 +51,36 @@ typedef int (extent_submit_bio_hook_t)(s
struct bio *bio, int mirror_num,
unsigned long bio_flags, u64 bio_offset);
};
struct extent_state {
-diff -urNp linux-2.6.35.4/fs/btrfs/free-space-cache.c linux-2.6.35.4/fs/btrfs/free-space-cache.c
---- linux-2.6.35.4/fs/btrfs/free-space-cache.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/btrfs/free-space-cache.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/btrfs/free-space-cache.c linux-2.6.36/fs/btrfs/free-space-cache.c
+--- linux-2.6.36/fs/btrfs/free-space-cache.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/btrfs/free-space-cache.c 2010-11-06 18:58:15.000000000 -0400
@@ -1075,8 +1075,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
while(1) {
if (entry->bitmap && entry->bytes > bytes + empty_size) {
ret = btrfs_bitmap_cluster(block_group, entry, cluster,
-diff -urNp linux-2.6.35.4/fs/btrfs/inode.c linux-2.6.35.4/fs/btrfs/inode.c
---- linux-2.6.35.4/fs/btrfs/inode.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/btrfs/inode.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/btrfs/inode.c linux-2.6.36/fs/btrfs/inode.c
+--- linux-2.6.36/fs/btrfs/inode.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/btrfs/inode.c 2010-11-06 18:58:15.000000000 -0400
@@ -64,7 +64,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 struct kmem_cache *btrfs_inode_cachep;
struct kmem_cache *btrfs_trans_handle_cachep;
-@@ -6958,7 +6958,7 @@ static const struct file_operations btrf
+@@ -6964,7 +6964,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.35.4/fs/buffer.c linux-2.6.35.4/fs/buffer.c
---- linux-2.6.35.4/fs/buffer.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/buffer.c 2010-09-17 20:12:37.000000000 -0400
-@@ -25,6 +25,7 @@
- #include <linux/percpu.h>
- #include <linux/slab.h>
- #include <linux/capability.h>
-+#include <linux/security.h>
- #include <linux/blkdev.h>
- #include <linux/file.h>
- #include <linux/quotaops.h>
-diff -urNp linux-2.6.35.4/fs/cachefiles/bind.c linux-2.6.35.4/fs/cachefiles/bind.c
---- linux-2.6.35.4/fs/cachefiles/bind.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/cachefiles/bind.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/btrfs/relocation.c linux-2.6.36/fs/btrfs/relocation.c
+--- linux-2.6.36/fs/btrfs/relocation.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/btrfs/relocation.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1239,7 +1239,7 @@ static int __update_reloc_root(struct bt
+ }
+ spin_unlock(&rc->reloc_root_tree.lock);
+
+- BUG_ON((struct btrfs_root *)node->data != root);
++ BUG_ON(!node || (struct btrfs_root *)node->data != root);
+
+ if (!del) {
+ spin_lock(&rc->reloc_root_tree.lock);
+diff -urNp linux-2.6.36/fs/cachefiles/bind.c linux-2.6.36/fs/cachefiles/bind.c
+--- linux-2.6.36/fs/cachefiles/bind.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/cachefiles/bind.c 2010-11-06 18:58:15.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.35.4/fs/cachefiles/daemon.c linux-2.6.35.4/fs/cachefiles/daemon.c
---- linux-2.6.35.4/fs/cachefiles/daemon.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/cachefiles/daemon.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/cachefiles/daemon.c linux-2.6.36/fs/cachefiles/daemon.c
+--- linux-2.6.36/fs/cachefiles/daemon.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/cachefiles/daemon.c 2010-11-06 18:58:15.000000000 -0400
@@ -195,7 +195,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.35.4/fs/cachefiles/rdwr.c linux-2.6.35.4/fs/cachefiles/rdwr.c
---- linux-2.6.35.4/fs/cachefiles/rdwr.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/cachefiles/rdwr.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/cachefiles/rdwr.c linux-2.6.36/fs/cachefiles/rdwr.c
+--- linux-2.6.36/fs/cachefiles/rdwr.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/cachefiles/rdwr.c 2010-11-06 18:58:15.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.35.4/fs/cifs/cifs_uniupr.h linux-2.6.35.4/fs/cifs/cifs_uniupr.h
---- linux-2.6.35.4/fs/cifs/cifs_uniupr.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/cifs/cifs_uniupr.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/ceph/dir.c linux-2.6.36/fs/ceph/dir.c
+--- linux-2.6.36/fs/ceph/dir.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/ceph/dir.c 2010-11-06 18:58:15.000000000 -0400
+@@ -230,7 +230,7 @@ static int ceph_readdir(struct file *fil
+ struct ceph_client *client = ceph_inode_to_client(inode);
+ struct ceph_mds_client *mdsc = &client->mdsc;
+ unsigned frag = fpos_frag(filp->f_pos);
+- int off = fpos_off(filp->f_pos);
++ unsigned int off = fpos_off(filp->f_pos);
+ int err;
+ u32 ftype;
+ struct ceph_mds_reply_info_parsed *rinfo;
+@@ -359,7 +359,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);
+- while (off - fi->offset >= 0 && off - fi->offset < rinfo->dir_nr) {
++ while (off >= fi->offset && off - fi->offset < rinfo->dir_nr) {
+ 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.36/fs/cifs/cifs_uniupr.h linux-2.6.36/fs/cifs/cifs_uniupr.h
+--- linux-2.6.36/fs/cifs/cifs_uniupr.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/cifs/cifs_uniupr.h 2010-11-06 18:58:15.000000000 -0400
@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
{0x0490, 0x04cc, UniCaseRangeU0490},
{0x1e00, 0x1ffc, UniCaseRangeU1e00},
};
#endif
-diff -urNp linux-2.6.35.4/fs/cifs/link.c linux-2.6.35.4/fs/cifs/link.c
---- linux-2.6.35.4/fs/cifs/link.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/cifs/link.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/cifs/link.c linux-2.6.36/fs/cifs/link.c
+--- linux-2.6.36/fs/cifs/link.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/cifs/link.c 2010-11-06 18:58:15.000000000 -0400
@@ -216,7 +216,7 @@ cifs_symlink(struct inode *inode, struct
void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
if (!IS_ERR(p))
kfree(p);
}
-diff -urNp linux-2.6.35.4/fs/compat_binfmt_elf.c linux-2.6.35.4/fs/compat_binfmt_elf.c
---- linux-2.6.35.4/fs/compat_binfmt_elf.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/compat_binfmt_elf.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/compat_binfmt_elf.c linux-2.6.36/fs/compat_binfmt_elf.c
+--- linux-2.6.36/fs/compat_binfmt_elf.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/compat_binfmt_elf.c 2010-11-06 18:58:15.000000000 -0400
@@ -30,11 +30,13 @@
#undef elf_phdr
#undef elf_shdr
#define elf_addr_t Elf32_Addr
/*
-diff -urNp linux-2.6.35.4/fs/compat.c linux-2.6.35.4/fs/compat.c
---- linux-2.6.35.4/fs/compat.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/compat.c 2010-09-17 20:12:37.000000000 -0400
-@@ -1433,14 +1433,12 @@ static int compat_copy_strings(int argc,
+diff -urNp linux-2.6.36/fs/compat.c linux-2.6.36/fs/compat.c
+--- linux-2.6.36/fs/compat.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/compat.c 2010-11-06 18:58:50.000000000 -0400
+@@ -593,7 +593,7 @@ ssize_t compat_rw_copy_check_uvector(int
+ goto out;
+
+ ret = -EINVAL;
+- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
++ if (nr_segs > UIO_MAXIOV)
+ goto out;
+ if (nr_segs > fast_segs) {
+ ret = -ENOMEM;
+@@ -1435,14 +1435,12 @@ static int compat_copy_strings(int argc,
if (!kmapped_page || kpos != (pos & PAGE_MASK)) {
struct page *page;
ret = get_user_pages(current, bprm->mm, pos,
1, 1, 1, &page, NULL);
if (ret <= 0) {
-@@ -1486,6 +1484,11 @@ int compat_do_execve(char * filename,
+@@ -1488,6 +1486,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;
-@@ -1522,6 +1525,14 @@ int compat_do_execve(char * filename,
+@@ -1524,6 +1527,14 @@ int compat_do_execve(char * filename,
bprm->filename = filename;
bprm->interp = filename;
retval = bprm_mm_init(bprm);
if (retval)
goto out_file;
-@@ -1551,9 +1562,40 @@ int compat_do_execve(char * filename,
+@@ -1553,9 +1564,40 @@ int compat_do_execve(char * filename,
if (retval < 0)
goto out;
/* execve succeeded */
current->fs->in_exec = 0;
-@@ -1564,6 +1606,14 @@ int compat_do_execve(char * filename,
+@@ -1566,6 +1608,14 @@ int compat_do_execve(char * filename,
put_files_struct(displaced);
return retval;
out:
if (bprm->mm)
mmput(bprm->mm);
-diff -urNp linux-2.6.35.4/fs/debugfs/inode.c linux-2.6.35.4/fs/debugfs/inode.c
---- linux-2.6.35.4/fs/debugfs/inode.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/debugfs/inode.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/compat_ioctl.c linux-2.6.36/fs/compat_ioctl.c
+--- linux-2.6.36/fs/compat_ioctl.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/compat_ioctl.c 2010-11-06 18:58:15.000000000 -0400
+@@ -210,6 +210,8 @@ static int do_video_set_spu_palette(unsi
+
+ err = get_user(palp, &up->palette);
+ err |= get_user(length, &up->length);
++ if (err)
++ return -EFAULT;
+
+ up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
+ err = put_user(compat_ptr(palp), &up_native->palette);
+diff -urNp linux-2.6.36/fs/debugfs/inode.c linux-2.6.36/fs/debugfs/inode.c
+--- linux-2.6.36/fs/debugfs/inode.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/debugfs/inode.c 2010-11-06 18:58:15.000000000 -0400
@@ -129,7 +129,7 @@ static inline int debugfs_positive(struc
static int debug_fill_super(struct super_block *sb, void *data, int silent)
return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
}
-diff -urNp linux-2.6.35.4/fs/dlm/lockspace.c linux-2.6.35.4/fs/dlm/lockspace.c
---- linux-2.6.35.4/fs/dlm/lockspace.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/dlm/lockspace.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/dlm/lockspace.c linux-2.6.36/fs/dlm/lockspace.c
+--- linux-2.6.36/fs/dlm/lockspace.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/dlm/lockspace.c 2010-11-06 18:58:15.000000000 -0400
@@ -200,7 +200,7 @@ static int dlm_uevent(struct kset *kset,
return 0;
}
.uevent = dlm_uevent,
};
-diff -urNp linux-2.6.35.4/fs/ecryptfs/inode.c linux-2.6.35.4/fs/ecryptfs/inode.c
---- linux-2.6.35.4/fs/ecryptfs/inode.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/ecryptfs/inode.c 2010-09-17 20:12:09.000000000 -0400
-@@ -658,7 +658,7 @@ static int ecryptfs_readlink_lower(struc
+diff -urNp linux-2.6.36/fs/ecryptfs/inode.c linux-2.6.36/fs/ecryptfs/inode.c
+--- linux-2.6.36/fs/ecryptfs/inode.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/ecryptfs/inode.c 2010-11-06 18:58:15.000000000 -0400
+@@ -740,7 +740,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
+@@ -786,7 +786,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:
+@@ -801,7 +801,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.35.4/fs/ecryptfs/miscdev.c linux-2.6.35.4/fs/ecryptfs/miscdev.c
---- linux-2.6.35.4/fs/ecryptfs/miscdev.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/ecryptfs/miscdev.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/ecryptfs/miscdev.c linux-2.6.36/fs/ecryptfs/miscdev.c
+--- linux-2.6.36/fs/ecryptfs/miscdev.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/ecryptfs/miscdev.c 2010-11-06 18:58:15.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.35.4/fs/exec.c linux-2.6.35.4/fs/exec.c
---- linux-2.6.35.4/fs/exec.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/exec.c 2010-09-17 20:12:37.000000000 -0400
-@@ -55,12 +55,24 @@
+diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
+--- linux-2.6.36/fs/exec.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/exec.c 2010-11-06 19:14:10.000000000 -0400
+@@ -54,12 +54,24 @@
#include <linux/fsnotify.h>
#include <linux/fs_struct.h>
#include <linux/pipe_fs_i.h>
int core_uses_pid;
char core_pattern[CORENAME_MAX_SIZE] = "core";
unsigned int core_pipe_limit;
-@@ -114,7 +126,7 @@ SYSCALL_DEFINE1(uselib, const char __use
+@@ -113,7 +125,7 @@ SYSCALL_DEFINE1(uselib, const char __use
goto out;
file = do_filp_open(AT_FDCWD, tmp,
MAY_READ | MAY_EXEC | MAY_OPEN);
putname(tmp);
error = PTR_ERR(file);
-@@ -162,18 +174,10 @@ static struct page *get_arg_page(struct
+@@ -161,18 +173,10 @@ static struct page *get_arg_page(struct
int write)
{
struct page *page;
return NULL;
if (write) {
-@@ -246,6 +250,11 @@ static int __bprm_mm_init(struct linux_b
+@@ -245,6 +249,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);
err = insert_vm_struct(mm, vma);
-@@ -255,6 +264,12 @@ static int __bprm_mm_init(struct linux_b
+@@ -254,6 +263,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);
-@@ -476,7 +491,7 @@ int copy_strings_kernel(int argc,char **
+@@ -485,7 +500,7 @@ int copy_strings_kernel(int argc, const
int r;
mm_segment_t oldfs = get_fs();
set_fs(KERNEL_DS);
-- r = copy_strings(argc, (char __user * __user *)argv, bprm);
-+ r = copy_strings(argc, (__force char __user * __user *)argv, bprm);
+- r = copy_strings(argc, (const char __user *const __user *)argv, bprm);
++ r = copy_strings(argc, (__force const char __user *const __user *)argv, bprm);
set_fs(oldfs);
return r;
}
-@@ -506,7 +521,8 @@ static int shift_arg_pages(struct vm_are
+@@ -515,7 +530,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
-@@ -515,6 +531,10 @@ static int shift_arg_pages(struct vm_are
+@@ -524,6 +540,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)
*/
-@@ -605,8 +625,28 @@ int setup_arg_pages(struct linux_binprm
+@@ -619,8 +639,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
-@@ -625,13 +665,6 @@ int setup_arg_pages(struct linux_binprm
+@@ -639,13 +679,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;
-@@ -671,7 +704,7 @@ struct file *open_exec(const char *name)
+@@ -686,7 +719,7 @@ struct file *open_exec(const char *name)
int err;
file = do_filp_open(AT_FDCWD, name,
MAY_EXEC | MAY_OPEN);
if (IS_ERR(file))
goto out;
-@@ -708,7 +741,7 @@ int kernel_read(struct file *file, loff_
+@@ -723,7 +756,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;
}
-@@ -1125,7 +1158,7 @@ int check_unsafe_exec(struct linux_binpr
+@@ -1140,7 +1173,7 @@ int check_unsafe_exec(struct linux_binpr
}
rcu_read_unlock();
bprm->unsafe |= LSM_UNSAFE_SHARE;
} else {
res = -EAGAIN;
-@@ -1321,6 +1354,11 @@ int do_execve(char * filename,
- char __user *__user *envp,
+@@ -1336,6 +1369,11 @@ int do_execve(const char * filename,
+ const char __user *const __user *envp,
struct pt_regs * regs)
{
+#ifdef CONFIG_GRKERNSEC
struct linux_binprm *bprm;
struct file *file;
struct files_struct *displaced;
-@@ -1357,6 +1395,18 @@ int do_execve(char * filename,
+@@ -1372,6 +1410,18 @@ int do_execve(const char * filename,
bprm->filename = filename;
bprm->interp = filename;
retval = bprm_mm_init(bprm);
if (retval)
goto out_file;
-@@ -1386,10 +1436,41 @@ int do_execve(char * filename,
+@@ -1401,10 +1451,41 @@ int do_execve(const char * filename,
if (retval < 0)
goto out;
/* execve succeeded */
current->fs->in_exec = 0;
-@@ -1400,6 +1481,14 @@ int do_execve(char * filename,
+@@ -1415,6 +1496,14 @@ int do_execve(const char * filename,
put_files_struct(displaced);
return retval;
out:
if (bprm->mm)
mmput (bprm->mm);
-@@ -1563,6 +1652,225 @@ out:
+@@ -1578,6 +1667,217 @@ out:
return ispipe;
}
+#endif
+
+#ifdef CONFIG_PAX_USERCOPY
++/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
++int object_is_on_stack(const void *obj, unsigned long len)
++{
++ const void * const stack = task_stack_page(current);
++ const void * const stackend = stack + THREAD_SIZE;
++
+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
-+struct stack_frame {
-+ struct stack_frame *next_frame;
-+ unsigned long return_address;
-+};
++ const void *frame = NULL;
++ const void *oldframe;
+#endif
+
-+/* 0: not at all, 1: fully, 2: fully inside frame,
-+ -1: partially (implies an error) */
++ if (obj + len < obj)
++ return -1;
+
-+int object_is_on_stack(const void *obj, unsigned long len)
-+{
-+ const void *stack = task_stack_page(current);
-+ const void *stackend = stack + THREAD_SIZE;
++ if (obj + len <= stack || stackend <= obj)
++ return 0;
+
-+ if (obj + len < obj)
++ if (obj < stack || stackend < obj + len)
+ return -1;
+
-+ if (stack <= obj && obj + len <= stackend) {
+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
-+ void *frame = __builtin_frame_address(2);
-+ void *oldframe = __builtin_frame_address(1);
-+ /*
-+ bottom ----------------------------------------------> top
-+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
-+ ^----------------^
-+ allow copies only within here
++ oldframe = __builtin_frame_address(1);
++ if (oldframe)
++ frame = __builtin_frame_address(2);
++ /*
++ low ----------------------------------------------> high
++ [saved bp][saved ip][args][local vars][saved bp][saved ip]
++ ^----------------^
++ allow copies only within here
++ */
++ while (stack <= frame && frame < stackend) {
++ /* if obj + len extends past the last frame, this
++ check won't pass and the next frame will be 0,
++ causing us to bail out and correctly report
++ the copy as invalid
+ */
-+ while (frame) {
-+ /* if obj + len extends past the last frame, this
-+ check won't pass and the next frame will be 0,
-+ causing us to bail out and correctly report
-+ the copy as invalid
-+ */
-+ if (obj + len <= frame) {
-+ if (obj >= (oldframe + (2 * sizeof(void *))))
-+ return 2;
-+ else
-+ return -1;
-+ }
-+ oldframe = frame;
-+ frame = ((struct stack_frame *)frame)->next_frame;
-+ }
-+ return -1;
-+#else
-+ return 1;
-+#endif
++ if (obj + len <= frame)
++ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
++ oldframe = frame;
++ frame = *(const void * const *)frame;
+ }
-+
-+ if (obj + len <= stack || stackend <= obj)
-+ return 0;
-+
+ return -1;
++#else
++ return 1;
++#endif
+}
+
+
static int zap_process(struct task_struct *start, int exit_code)
{
struct task_struct *t;
-@@ -1773,17 +2081,17 @@ static void wait_for_dump_helpers(struct
+@@ -1788,17 +2088,17 @@ static void wait_for_dump_helpers(struct
pipe = file->f_path.dentry->d_inode->i_pipe;
pipe_lock(pipe);
pipe_unlock(pipe);
}
-@@ -1891,6 +2199,10 @@ void do_coredump(long signr, int exit_co
+@@ -1906,6 +2206,10 @@ void do_coredump(long signr, int exit_co
*/
clear_thread_flag(TIF_SIGPENDING);
+ gr_handle_brute_attach(current);
+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
+
- /*
- * lock_kernel() because format_corename() is controlled by sysctl, which
- * uses lock_kernel()
-diff -urNp linux-2.6.35.4/fs/ext2/balloc.c linux-2.6.35.4/fs/ext2/balloc.c
---- linux-2.6.35.4/fs/ext2/balloc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/ext2/balloc.c 2010-09-17 20:12:37.000000000 -0400
+ ispipe = format_corename(corename, signr);
+
+ if (ispipe) {
+diff -urNp linux-2.6.36/fs/ext2/balloc.c linux-2.6.36/fs/ext2/balloc.c
+--- linux-2.6.36/fs/ext2/balloc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/ext2/balloc.c 2010-11-06 18:58:50.000000000 -0400
@@ -1193,7 +1193,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.35.4/fs/ext2/xattr.c linux-2.6.35.4/fs/ext2/xattr.c
---- linux-2.6.35.4/fs/ext2/xattr.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/ext2/xattr.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/ext2/xattr.c linux-2.6.36/fs/ext2/xattr.c
+--- linux-2.6.36/fs/ext2/xattr.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/ext2/xattr.c 2010-11-06 18:58:15.000000000 -0400
@@ -86,8 +86,8 @@
printk("\n"); \
} while (0)
#endif
static int ext2_xattr_set2(struct inode *, struct buffer_head *,
-diff -urNp linux-2.6.35.4/fs/ext3/balloc.c linux-2.6.35.4/fs/ext3/balloc.c
---- linux-2.6.35.4/fs/ext3/balloc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/ext3/balloc.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/fs/ext3/balloc.c linux-2.6.36/fs/ext3/balloc.c
+--- linux-2.6.36/fs/ext3/balloc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/ext3/balloc.c 2010-11-06 18:58:50.000000000 -0400
@@ -1422,7 +1422,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.35.4/fs/ext3/namei.c linux-2.6.35.4/fs/ext3/namei.c
---- linux-2.6.35.4/fs/ext3/namei.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/ext3/namei.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/ext3/namei.c linux-2.6.36/fs/ext3/namei.c
+--- linux-2.6.36/fs/ext3/namei.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/ext3/namei.c 2010-11-06 18:58:15.000000000 -0400
@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
char *data1 = (*bh)->b_data, *data2;
unsigned split, move, size;
bh2 = ext3_append (handle, dir, &newblock, &err);
if (!(bh2)) {
-diff -urNp linux-2.6.35.4/fs/ext3/xattr.c linux-2.6.35.4/fs/ext3/xattr.c
---- linux-2.6.35.4/fs/ext3/xattr.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/ext3/xattr.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/ext3/xattr.c linux-2.6.36/fs/ext3/xattr.c
+--- linux-2.6.36/fs/ext3/xattr.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/ext3/xattr.c 2010-11-06 18:58:15.000000000 -0400
@@ -89,8 +89,8 @@
printk("\n"); \
} while (0)
#endif
static void ext3_xattr_cache_insert(struct buffer_head *);
-diff -urNp linux-2.6.35.4/fs/ext4/balloc.c linux-2.6.35.4/fs/ext4/balloc.c
---- linux-2.6.35.4/fs/ext4/balloc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/ext4/balloc.c 2010-09-17 20:12:37.000000000 -0400
-@@ -522,7 +522,7 @@ int ext4_has_free_blocks(struct ext4_sb_
+diff -urNp linux-2.6.36/fs/ext4/balloc.c linux-2.6.36/fs/ext4/balloc.c
+--- linux-2.6.36/fs/ext4/balloc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/ext4/balloc.c 2010-11-06 18:58:50.000000000 -0400
+@@ -518,7 +518,7 @@ int ext4_has_free_blocks(struct ext4_sb_
/* 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.35.4/fs/ext4/namei.c linux-2.6.35.4/fs/ext4/namei.c
---- linux-2.6.35.4/fs/ext4/namei.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/ext4/namei.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1197,7 +1197,7 @@ static struct ext4_dir_entry_2 *do_split
+diff -urNp linux-2.6.36/fs/ext4/namei.c linux-2.6.36/fs/ext4/namei.c
+--- linux-2.6.36/fs/ext4/namei.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/ext4/namei.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1170,7 +1170,7 @@ static struct ext4_dir_entry_2 *do_split
char *data1 = (*bh)->b_data, *data2;
unsigned split, move, size;
struct ext4_dir_entry_2 *de = NULL, *de2;
bh2 = ext4_append (handle, dir, &newblock, &err);
if (!(bh2)) {
-diff -urNp linux-2.6.35.4/fs/ext4/xattr.c linux-2.6.35.4/fs/ext4/xattr.c
---- linux-2.6.35.4/fs/ext4/xattr.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/ext4/xattr.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/ext4/xattr.c linux-2.6.36/fs/ext4/xattr.c
+--- linux-2.6.36/fs/ext4/xattr.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/ext4/xattr.c 2010-11-06 18:58:15.000000000 -0400
@@ -82,8 +82,8 @@
printk("\n"); \
} while (0)
#endif
static void ext4_xattr_cache_insert(struct buffer_head *);
-diff -urNp linux-2.6.35.4/fs/fcntl.c linux-2.6.35.4/fs/fcntl.c
---- linux-2.6.35.4/fs/fcntl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/fcntl.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/fs/fcntl.c linux-2.6.36/fs/fcntl.c
+--- linux-2.6.36/fs/fcntl.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/fcntl.c 2010-11-06 18:58: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);
-diff -urNp linux-2.6.35.4/fs/fifo.c linux-2.6.35.4/fs/fifo.c
---- linux-2.6.35.4/fs/fifo.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/fifo.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/fifo.c linux-2.6.36/fs/fifo.c
+--- linux-2.6.36/fs/fifo.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/fifo.c 2010-11-06 18:58:15.000000000 -0400
@@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode
*/
filp->f_op = &read_pipefifo_fops;
free_pipe_info(inode);
err_nocleanup:
-diff -urNp linux-2.6.35.4/fs/file.c linux-2.6.35.4/fs/file.c
---- linux-2.6.35.4/fs/file.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/file.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/fs/file.c linux-2.6.36/fs/file.c
+--- linux-2.6.36/fs/file.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/file.c 2010-11-06 18:58:50.000000000 -0400
@@ -14,6 +14,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/fdtable.h>
#include <linux/bitops.h>
#include <linux/interrupt.h>
-@@ -257,6 +258,7 @@ int expand_files(struct files_struct *fi
+@@ -250,6 +251,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.35.4/fs/fs_struct.c linux-2.6.35.4/fs/fs_struct.c
---- linux-2.6.35.4/fs/fs_struct.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/fs_struct.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/fs/fs_struct.c linux-2.6.36/fs/fs_struct.c
+--- linux-2.6.36/fs/fs_struct.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/fs_struct.c 2010-11-06 19:16:06.000000000 -0400
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
fs->root = *path;
path_get(path);
+ gr_set_chroot_entries(current, path);
- write_unlock(&fs->lock);
+ spin_unlock(&fs->lock);
if (old_root.dentry)
path_put(&old_root);
@@ -56,6 +58,7 @@ void chroot_fs_refs(struct path *old_roo
if (fs->pwd.dentry == old_root->dentry
@@ -89,7 +92,8 @@ void exit_fs(struct task_struct *tsk)
task_lock(tsk);
- write_lock(&fs->lock);
+ spin_lock(&fs->lock);
tsk->fs = NULL;
- kill = !--fs->users;
+ gr_clear_chroot_entries(tsk);
+ kill = !atomic_dec_return(&fs->users);
- write_unlock(&fs->lock);
+ spin_unlock(&fs->lock);
task_unlock(tsk);
if (kill)
@@ -102,7 +106,7 @@ struct fs_struct *copy_fs_struct(struct
- fs->users = 1;
+ atomic_set(&fs->users, 1);
fs->in_exec = 0;
- rwlock_init(&fs->lock);
+ spin_lock_init(&fs->lock);
fs->umask = old->umask;
-@@ -127,8 +131,9 @@ int unshare_fs_struct(void)
+@@ -122,8 +126,9 @@ int unshare_fs_struct(void)
task_lock(current);
- write_lock(&fs->lock);
+ spin_lock(&fs->lock);
- kill = !--fs->users;
+ kill = !atomic_dec_return(&fs->users);
current->fs = new_fs;
+ gr_set_chroot_entries(current, &new_fs->root);
- write_unlock(&fs->lock);
+ spin_unlock(&fs->lock);
task_unlock(current);
-@@ -147,7 +152,7 @@ EXPORT_SYMBOL(current_umask);
+@@ -142,7 +147,7 @@ EXPORT_SYMBOL(current_umask);
/* to be mentioned only in INIT_TASK */
struct fs_struct init_fs = {
- .users = 1,
+ .users = ATOMIC_INIT(1),
- .lock = __RW_LOCK_UNLOCKED(init_fs.lock),
+ .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
.umask = 0022,
};
-@@ -162,12 +167,13 @@ void daemonize_fs_struct(void)
+@@ -157,12 +162,13 @@ void daemonize_fs_struct(void)
task_lock(current);
- write_lock(&init_fs.lock);
+ spin_lock(&init_fs.lock);
- init_fs.users++;
+ atomic_inc(&init_fs.users);
- write_unlock(&init_fs.lock);
+ spin_unlock(&init_fs.lock);
- write_lock(&fs->lock);
+ spin_lock(&fs->lock);
current->fs = &init_fs;
- kill = !--fs->users;
+ gr_set_chroot_entries(current, ¤t->fs->root);
+ kill = !atomic_dec_return(&fs->users);
- write_unlock(&fs->lock);
+ spin_unlock(&fs->lock);
task_unlock(current);
-diff -urNp linux-2.6.35.4/fs/fuse/control.c linux-2.6.35.4/fs/fuse/control.c
---- linux-2.6.35.4/fs/fuse/control.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/fuse/control.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/fuse/control.c linux-2.6.36/fs/fuse/control.c
+--- linux-2.6.36/fs/fuse/control.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/fuse/control.c 2010-11-06 18:58:15.000000000 -0400
@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co
static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
struct fuse_conn *fc;
int err;
-diff -urNp linux-2.6.35.4/fs/fuse/cuse.c linux-2.6.35.4/fs/fuse/cuse.c
---- linux-2.6.35.4/fs/fuse/cuse.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/fuse/cuse.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/fuse/cuse.c linux-2.6.36/fs/fuse/cuse.c
+--- linux-2.6.36/fs/fuse/cuse.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/fuse/cuse.c 2010-11-06 18:58:15.000000000 -0400
@@ -529,8 +529,18 @@ static int cuse_channel_release(struct i
return rc;
}
cuse_class = class_create(THIS_MODULE, "cuse");
if (IS_ERR(cuse_class))
return PTR_ERR(cuse_class);
-diff -urNp linux-2.6.35.4/fs/fuse/dev.c linux-2.6.35.4/fs/fuse/dev.c
---- linux-2.6.35.4/fs/fuse/dev.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/fuse/dev.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1031,7 +1031,7 @@ static ssize_t fuse_dev_do_read(struct f
+diff -urNp linux-2.6.36/fs/fuse/dev.c linux-2.6.36/fs/fuse/dev.c
+--- linux-2.6.36/fs/fuse/dev.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/fuse/dev.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1049,7 +1049,7 @@ static ssize_t fuse_dev_do_read(struct f
return err;
}
unsigned long nr_segs, loff_t pos)
{
struct fuse_copy_state cs;
-@@ -1045,6 +1045,8 @@ static ssize_t fuse_dev_read(struct kioc
+@@ -1063,6 +1063,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)
{
-@@ -1088,7 +1090,7 @@ static ssize_t fuse_dev_splice_read(stru
+@@ -1106,7 +1108,7 @@ static ssize_t fuse_dev_splice_read(stru
ret = 0;
pipe_lock(pipe);
send_sig(SIGPIPE, current, 0);
if (!ret)
ret = -EPIPE;
-@@ -1387,7 +1389,7 @@ static ssize_t fuse_dev_do_write(struct
+@@ -1604,7 +1606,7 @@ static ssize_t fuse_dev_do_write(struct
return err;
}
unsigned long nr_segs, loff_t pos)
{
struct fuse_copy_state cs;
-@@ -1400,6 +1402,8 @@ static ssize_t fuse_dev_write(struct kio
+@@ -1617,6 +1619,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)
-@@ -1478,7 +1482,7 @@ out:
+@@ -1695,7 +1699,7 @@ out:
return ret;
}
{
unsigned mask = POLLOUT | POLLWRNORM;
struct fuse_conn *fc = fuse_get_conn(file);
-@@ -1497,6 +1501,8 @@ static unsigned fuse_dev_poll(struct fil
+@@ -1714,6 +1718,8 @@ static unsigned fuse_dev_poll(struct fil
return mask;
}
/*
* Abort all requests on the given list (pending or processing)
*
-@@ -1604,7 +1610,7 @@ int fuse_dev_release(struct inode *inode
+@@ -1831,7 +1837,7 @@ int fuse_dev_release(struct inode *inode
}
EXPORT_SYMBOL_GPL(fuse_dev_release);
{
struct fuse_conn *fc = fuse_get_conn(file);
if (!fc)
-@@ -1614,6 +1620,8 @@ static int fuse_dev_fasync(int fd, struc
+@@ -1841,6 +1847,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.35.4/fs/fuse/dir.c linux-2.6.35.4/fs/fuse/dir.c
---- linux-2.6.35.4/fs/fuse/dir.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/fuse/dir.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/fuse/dir.c linux-2.6.36/fs/fuse/dir.c
+--- linux-2.6.36/fs/fuse/dir.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/fuse/dir.c 2010-11-06 18:58:15.000000000 -0400
@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
return link;
}
{
if (!IS_ERR(link))
free_page((unsigned long) link);
-diff -urNp linux-2.6.35.4/fs/fuse/fuse_i.h linux-2.6.35.4/fs/fuse/fuse_i.h
---- linux-2.6.35.4/fs/fuse/fuse_i.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/fuse/fuse_i.h 2010-09-17 20:12:09.000000000 -0400
-@@ -524,6 +524,16 @@ extern const struct file_operations fuse
+diff -urNp linux-2.6.36/fs/fuse/fuse_i.h linux-2.6.36/fs/fuse/fuse_i.h
+--- linux-2.6.36/fs/fuse/fuse_i.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/fuse/fuse_i.h 2010-11-06 18:58:15.000000000 -0400
+@@ -525,6 +525,16 @@ extern const struct file_operations fuse
extern const struct dentry_operations fuse_dentry_operations;
/**
* Inode to nodeid comparison.
*/
-diff -urNp linux-2.6.35.4/fs/hfs/inode.c linux-2.6.35.4/fs/hfs/inode.c
---- linux-2.6.35.4/fs/hfs/inode.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/hfs/inode.c 2010-09-17 20:12:09.000000000 -0400
-@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
+diff -urNp linux-2.6.36/fs/hfs/inode.c linux-2.6.36/fs/hfs/inode.c
+--- linux-2.6.36/fs/hfs/inode.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/hfs/inode.c 2010-11-06 18:58:15.000000000 -0400
+@@ -447,7 +447,7 @@ int hfs_write_inode(struct inode *inode,
if (S_ISDIR(main_inode->i_mode)) {
if (fd.entrylength < sizeof(struct hfs_cat_dir))
hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
sizeof(struct hfs_cat_dir));
if (rec.type != HFS_CDR_DIR ||
-@@ -444,7 +444,7 @@ int hfs_write_inode(struct inode *inode,
+@@ -468,7 +468,7 @@ int hfs_write_inode(struct inode *inode,
sizeof(struct hfs_cat_file));
} else {
if (fd.entrylength < sizeof(struct hfs_cat_file))
hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
sizeof(struct hfs_cat_file));
if (rec.type != HFS_CDR_FIL ||
-diff -urNp linux-2.6.35.4/fs/hfsplus/inode.c linux-2.6.35.4/fs/hfsplus/inode.c
---- linux-2.6.35.4/fs/hfsplus/inode.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/hfsplus/inode.c 2010-09-17 20:12:09.000000000 -0400
-@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode
+diff -urNp linux-2.6.36/fs/hfsplus/inode.c linux-2.6.36/fs/hfsplus/inode.c
+--- linux-2.6.36/fs/hfsplus/inode.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/hfsplus/inode.c 2010-11-06 18:58:15.000000000 -0400
+@@ -477,7 +477,7 @@ int hfsplus_cat_read_inode(struct inode
struct hfsplus_cat_folder *folder = &entry.folder;
if (fd->entrylength < sizeof(struct hfsplus_cat_folder))
hfs_bnode_read(fd->bnode, &entry, fd->entryoffset,
sizeof(struct hfsplus_cat_folder));
hfsplus_get_perms(inode, &folder->permissions, 1);
-@@ -423,7 +423,7 @@ int hfsplus_cat_read_inode(struct inode
+@@ -494,7 +494,7 @@ int hfsplus_cat_read_inode(struct inode
struct hfsplus_cat_file *file = &entry.file;
if (fd->entrylength < sizeof(struct hfsplus_cat_file))
hfs_bnode_read(fd->bnode, &entry, fd->entryoffset,
sizeof(struct hfsplus_cat_file));
-@@ -479,7 +479,7 @@ int hfsplus_cat_write_inode(struct inode
+@@ -550,7 +550,7 @@ int hfsplus_cat_write_inode(struct inode
struct hfsplus_cat_folder *folder = &entry.folder;
if (fd.entrylength < sizeof(struct hfsplus_cat_folder))
hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
sizeof(struct hfsplus_cat_folder));
/* simple node checks? */
-@@ -501,7 +501,7 @@ int hfsplus_cat_write_inode(struct inode
+@@ -572,7 +572,7 @@ int hfsplus_cat_write_inode(struct inode
struct hfsplus_cat_file *file = &entry.file;
if (fd.entrylength < sizeof(struct hfsplus_cat_file))
hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
sizeof(struct hfsplus_cat_file));
hfsplus_inode_write_fork(inode, &file->data_fork);
-diff -urNp linux-2.6.35.4/fs/hugetlbfs/inode.c linux-2.6.35.4/fs/hugetlbfs/inode.c
---- linux-2.6.35.4/fs/hugetlbfs/inode.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/hugetlbfs/inode.c 2010-09-17 20:12:37.000000000 -0400
-@@ -908,7 +908,7 @@ static struct file_system_type hugetlbfs
+diff -urNp linux-2.6.36/fs/hugetlbfs/inode.c linux-2.6.36/fs/hugetlbfs/inode.c
+--- linux-2.6.36/fs/hugetlbfs/inode.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/hugetlbfs/inode.c 2010-11-06 18:58:50.000000000 -0400
+@@ -891,7 +891,7 @@ static struct file_system_type hugetlbfs
.kill_sb = kill_litter_super,
};
static int can_do_hugetlb_shm(void)
{
-diff -urNp linux-2.6.35.4/fs/ioctl.c linux-2.6.35.4/fs/ioctl.c
---- linux-2.6.35.4/fs/ioctl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/ioctl.c 2010-09-17 20:12:09.000000000 -0400
-@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
+diff -urNp linux-2.6.36/fs/ioctl.c linux-2.6.36/fs/ioctl.c
+--- linux-2.6.36/fs/ioctl.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/ioctl.c 2010-11-06 18:58:15.000000000 -0400
+@@ -87,7 +87,7 @@ int fiemap_fill_next_extent(struct fiema
u64 phys, u64 len, u32 flags)
{
struct fiemap_extent extent;
/* only count the extents */
if (fieinfo->fi_extents_max == 0) {
-@@ -207,7 +207,7 @@ static int ioctl_fiemap(struct file *fil
+@@ -197,7 +197,7 @@ static int ioctl_fiemap(struct file *fil
fieinfo.fi_flags = fiemap.fm_flags;
fieinfo.fi_extents_max = fiemap.fm_extent_count;
if (fiemap.fm_extent_count != 0 &&
!access_ok(VERIFY_WRITE, fieinfo.fi_extents_start,
-@@ -220,7 +220,7 @@ static int ioctl_fiemap(struct file *fil
+@@ -210,7 +210,7 @@ static int ioctl_fiemap(struct file *fil
error = inode->i_op->fiemap(inode, &fieinfo, fiemap.fm_start, len);
fiemap.fm_flags = fieinfo.fi_flags;
fiemap.fm_mapped_extents = fieinfo.fi_extents_mapped;
error = -EFAULT;
return error;
-diff -urNp linux-2.6.35.4/fs/jffs2/debug.h linux-2.6.35.4/fs/jffs2/debug.h
---- linux-2.6.35.4/fs/jffs2/debug.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/jffs2/debug.h 2010-09-17 20:12:09.000000000 -0400
-@@ -52,13 +52,13 @@
+diff -urNp linux-2.6.36/fs/jffs2/debug.h linux-2.6.36/fs/jffs2/debug.h
+--- linux-2.6.36/fs/jffs2/debug.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/jffs2/debug.h 2010-11-06 18:58:15.000000000 -0400
+@@ -53,13 +53,13 @@
#if CONFIG_JFFS2_FS_DEBUG > 0
#define D1(x) x
#else
#endif
/* The prefixes of JFFS2 messages */
-@@ -114,73 +114,73 @@
+@@ -115,73 +115,73 @@
#ifdef JFFS2_DBG_READINODE_MESSAGES
#define dbg_readinode(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__)
#else
#endif
/* "Sanity" checks */
-diff -urNp linux-2.6.35.4/fs/jffs2/erase.c linux-2.6.35.4/fs/jffs2/erase.c
---- linux-2.6.35.4/fs/jffs2/erase.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/jffs2/erase.c 2010-09-17 20:12:09.000000000 -0400
-@@ -438,7 +438,8 @@ static void jffs2_mark_erased_block(stru
+diff -urNp linux-2.6.36/fs/jffs2/erase.c linux-2.6.36/fs/jffs2/erase.c
+--- linux-2.6.36/fs/jffs2/erase.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/jffs2/erase.c 2010-11-06 18:58:15.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),
.nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
};
jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-2.6.35.4/fs/jffs2/summary.h linux-2.6.35.4/fs/jffs2/summary.h
---- linux-2.6.35.4/fs/jffs2/summary.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/jffs2/summary.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/jffs2/summary.h linux-2.6.36/fs/jffs2/summary.h
+--- linux-2.6.36/fs/jffs2/summary.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/jffs2/summary.h 2010-11-06 18:58:15.000000000 -0400
@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
#define jffs2_sum_active() (0)
#define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
#endif /* CONFIG_JFFS2_SUMMARY */
-diff -urNp linux-2.6.35.4/fs/jffs2/wbuf.c linux-2.6.35.4/fs/jffs2/wbuf.c
---- linux-2.6.35.4/fs/jffs2/wbuf.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/jffs2/wbuf.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/jffs2/wbuf.c linux-2.6.36/fs/jffs2/wbuf.c
+--- linux-2.6.36/fs/jffs2/wbuf.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/jffs2/wbuf.c 2010-11-06 18:58:15.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.35.4/fs/lockd/svc.c linux-2.6.35.4/fs/lockd/svc.c
---- linux-2.6.35.4/fs/lockd/svc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/lockd/svc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/Kconfig.binfmt linux-2.6.36/fs/Kconfig.binfmt
+--- linux-2.6.36/fs/Kconfig.binfmt 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/Kconfig.binfmt 2010-11-06 18:58:15.000000000 -0400
+@@ -86,7 +86,7 @@ config HAVE_AOUT
+
+ config BINFMT_AOUT
+ tristate "Kernel support for a.out and ECOFF binaries"
+- depends on HAVE_AOUT
++ depends on HAVE_AOUT && BROKEN
+ ---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.36/fs/lockd/svc.c linux-2.6.36/fs/lockd/svc.c
+--- linux-2.6.36/fs/lockd/svc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/lockd/svc.c 2010-11-06 18:58:15.000000000 -0400
@@ -42,7 +42,7 @@
static struct svc_program nlmsvc_program;
EXPORT_SYMBOL_GPL(nlmsvc_ops);
static DEFINE_MUTEX(nlmsvc_mutex);
-diff -urNp linux-2.6.35.4/fs/locks.c linux-2.6.35.4/fs/locks.c
---- linux-2.6.35.4/fs/locks.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/locks.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/locks.c linux-2.6.36/fs/locks.c
+--- linux-2.6.36/fs/locks.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/locks.c 2010-11-06 18:58:15.000000000 -0400
@@ -2008,16 +2008,16 @@ void locks_remove_flock(struct file *fil
return;
}
lock_kernel();
-diff -urNp linux-2.6.35.4/fs/namei.c linux-2.6.35.4/fs/namei.c
---- linux-2.6.35.4/fs/namei.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/namei.c 2010-09-17 20:12:37.000000000 -0400
-@@ -548,7 +548,7 @@ __do_follow_link(struct path *path, stru
+diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
+--- linux-2.6.36/fs/namei.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/namei.c 2010-11-06 18:58:50.000000000 -0400
+@@ -542,7 +542,7 @@ __do_follow_link(struct path *path, stru
*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);
-@@ -581,6 +581,13 @@ static inline int do_follow_link(struct
+@@ -575,6 +575,13 @@ static inline int do_follow_link(struct
err = security_inode_follow_link(path->dentry, nd);
if (err)
goto loop;
current->link_count++;
current->total_link_count++;
nd->depth++;
-@@ -965,11 +972,18 @@ return_reval:
+@@ -967,11 +974,18 @@ return_reval:
break;
}
return_base:
path_put(&nd->path);
return_err:
return err;
-@@ -1506,12 +1520,19 @@ static int __open_namei_create(struct na
+@@ -1486,12 +1500,19 @@ static int __open_namei_create(struct na
int error;
struct dentry *dir = nd->path.dentry;
out_unlock:
mutex_unlock(&dir->d_inode->i_mutex);
dput(nd->path.dentry);
-@@ -1614,6 +1635,7 @@ static struct file *do_last(struct namei
+@@ -1594,6 +1615,7 @@ static struct file *do_last(struct namei
int mode, const char *pathname)
{
struct dentry *dir = nd->path.dentry;
struct file *filp;
int error = -EISDIR;
-@@ -1662,6 +1684,22 @@ static struct file *do_last(struct namei
+@@ -1642,6 +1664,22 @@ static struct file *do_last(struct namei
}
path_to_nameidata(path, nd);
audit_inode(pathname, nd->path.dentry);
goto ok;
}
-@@ -1714,6 +1752,24 @@ static struct file *do_last(struct namei
+@@ -1694,6 +1732,24 @@ static struct file *do_last(struct namei
/*
* It already exists.
*/
mutex_unlock(&dir->d_inode->i_mutex);
audit_inode(pathname, path->dentry);
-@@ -2034,6 +2090,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+@@ -2014,6 +2070,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;
-@@ -2054,6 +2121,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+@@ -2034,6 +2101,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
}
out_drop_write:
mnt_drop_write(nd.path.mnt);
out_dput:
dput(dentry);
out_unlock:
-@@ -2106,6 +2176,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+@@ -2086,6 +2156,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);
-@@ -2117,6 +2192,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+@@ -2097,6 +2172,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:
-@@ -2198,6 +2277,8 @@ static long do_rmdir(int dfd, const char
+@@ -2178,6 +2257,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)
-@@ -2222,6 +2303,19 @@ static long do_rmdir(int dfd, const char
+@@ -2202,6 +2283,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;
-@@ -2229,6 +2323,8 @@ static long do_rmdir(int dfd, const char
+@@ -2209,6 +2303,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:
-@@ -2291,6 +2387,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2271,6 +2367,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)
-@@ -2310,8 +2408,19 @@ static long do_unlinkat(int dfd, const c
+@@ -2290,8 +2388,19 @@ 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;
-@@ -2319,6 +2428,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2299,6 +2408,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:
-@@ -2396,6 +2507,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -2376,6 +2487,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;
-@@ -2403,6 +2519,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -2383,6 +2499,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:
-@@ -2495,6 +2613,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -2475,6 +2593,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;
-@@ -2502,6 +2634,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -2482,6 +2614,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:
-@@ -2735,6 +2869,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -2715,6 +2849,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
if (new_dentry == trap)
goto exit5;
error = mnt_want_write(oldnd.path.mnt);
if (error)
goto exit5;
-@@ -2744,6 +2884,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -2724,6 +2864,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:
-diff -urNp linux-2.6.35.4/fs/namespace.c linux-2.6.35.4/fs/namespace.c
---- linux-2.6.35.4/fs/namespace.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/namespace.c 2010-09-17 20:21:58.000000000 -0400
-@@ -1099,6 +1099,9 @@ static int do_umount(struct vfsmount *mn
+diff -urNp linux-2.6.36/fs/namespace.c linux-2.6.36/fs/namespace.c
+--- linux-2.6.36/fs/namespace.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/namespace.c 2010-11-06 19:18:03.000000000 -0400
+@@ -1142,6 +1142,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;
}
-@@ -1118,6 +1121,9 @@ static int do_umount(struct vfsmount *mn
- spin_unlock(&vfsmount_lock);
+@@ -1161,6 +1164,9 @@ static int do_umount(struct vfsmount *mn
+ br_write_unlock(vfsmount_lock);
up_write(&namespace_sem);
release_mounts(&umount_list);
+
return retval;
}
-@@ -1988,6 +1994,16 @@ long do_mount(char *dev_name, char *dir_
+@@ -2056,6 +2062,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);
-@@ -2002,6 +2018,9 @@ long do_mount(char *dev_name, char *dir_
+@@ -2070,6 +2086,9 @@ long do_mount(char *dev_name, char *dir_
dev_name, data_page);
dput_out:
path_put(&path);
return retval;
}
-@@ -2208,6 +2227,12 @@ SYSCALL_DEFINE2(pivot_root, const char _
+@@ -2276,6 +2295,12 @@ SYSCALL_DEFINE2(pivot_root, const char _
goto out1;
}
+ goto out1;
+ }
+
- read_lock(¤t->fs->lock);
- root = current->fs->root;
- path_get(¤t->fs->root);
-diff -urNp linux-2.6.35.4/fs/nfs/inode.c linux-2.6.35.4/fs/nfs/inode.c
---- linux-2.6.35.4/fs/nfs/inode.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/nfs/inode.c 2010-09-17 20:12:09.000000000 -0400
-@@ -915,16 +915,16 @@ static int nfs_size_need_update(const st
+ get_fs_root(current->fs, &root);
+ down_write(&namespace_sem);
+ mutex_lock(&old.dentry->d_inode->i_mutex);
+diff -urNp linux-2.6.36/fs/nfs/inode.c linux-2.6.36/fs/nfs/inode.c
+--- linux-2.6.36/fs/nfs/inode.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/nfs/inode.c 2010-11-06 18:58:15.000000000 -0400
+@@ -982,16 +982,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.35.4/fs/nfs/nfs4proc.c linux-2.6.35.4/fs/nfs/nfs4proc.c
---- linux-2.6.35.4/fs/nfs/nfs4proc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/nfs/nfs4proc.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1166,7 +1166,7 @@ static int _nfs4_do_open_reclaim(struct
+diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
+--- linux-2.6.36/fs/nfs/nfs4proc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/nfs/nfs4proc.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1184,7 +1184,7 @@ static int _nfs4_do_open_reclaim(struct
static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
{
struct nfs_server *server = NFS_SERVER(state->inode);
int err;
do {
err = _nfs4_do_open_reclaim(ctx, state);
-@@ -1208,7 +1208,7 @@ static int _nfs4_open_delegation_recall(
+@@ -1226,7 +1226,7 @@ static int _nfs4_open_delegation_recall(
int nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state *state, const nfs4_stateid *stateid)
{
struct nfs_server *server = NFS_SERVER(state->inode);
int err;
do {
-@@ -1581,7 +1581,7 @@ static int _nfs4_open_expired(struct nfs
+@@ -1595,7 +1595,7 @@ static int _nfs4_open_expired(struct nfs
static int nfs4_do_open_expired(struct nfs_open_context *ctx, struct nfs4_state *state)
{
struct nfs_server *server = NFS_SERVER(state->inode);
int err;
do {
-@@ -1697,7 +1697,7 @@ out_err:
+@@ -1711,7 +1711,7 @@ out_err:
static struct nfs4_state *nfs4_do_open(struct inode *dir, struct path *path, fmode_t fmode, int flags, struct iattr *sattr, struct rpc_cred *cred)
{
struct nfs4_state *res;
int status;
-@@ -1788,7 +1788,7 @@ static int nfs4_do_setattr(struct inode
+@@ -1802,7 +1802,7 @@ static int nfs4_do_setattr(struct inode
struct nfs4_state *state)
{
struct nfs_server *server = NFS_SERVER(inode);
int err;
do {
err = nfs4_handle_exception(server,
-@@ -2166,7 +2166,7 @@ static int _nfs4_server_capabilities(str
+@@ -2179,7 +2179,7 @@ static int _nfs4_server_capabilities(str
int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle)
{
int err;
do {
err = nfs4_handle_exception(server,
-@@ -2200,7 +2200,7 @@ static int _nfs4_lookup_root(struct nfs_
+@@ -2213,7 +2213,7 @@ static int _nfs4_lookup_root(struct nfs_
static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle,
struct nfs_fsinfo *info)
{
int err;
do {
err = nfs4_handle_exception(server,
-@@ -2289,7 +2289,7 @@ static int _nfs4_proc_getattr(struct nfs
+@@ -2301,7 +2301,7 @@ static int _nfs4_proc_getattr(struct nfs
static int nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr)
{
int err;
do {
err = nfs4_handle_exception(server,
-@@ -2377,7 +2377,7 @@ static int nfs4_proc_lookupfh(struct nfs
+@@ -2389,7 +2389,7 @@ static int nfs4_proc_lookupfh(struct nfs
struct qstr *name, struct nfs_fh *fhandle,
struct nfs_fattr *fattr)
{
int err;
do {
err = _nfs4_proc_lookupfh(server, dirfh, name, fhandle, fattr);
-@@ -2406,7 +2406,7 @@ static int _nfs4_proc_lookup(struct inod
+@@ -2418,7 +2418,7 @@ static int _nfs4_proc_lookup(struct inod
static int nfs4_proc_lookup(struct inode *dir, struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr)
{
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2473,7 +2473,7 @@ static int _nfs4_proc_access(struct inod
+@@ -2485,7 +2485,7 @@ static int _nfs4_proc_access(struct inod
static int nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry)
{
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(inode),
-@@ -2529,7 +2529,7 @@ static int _nfs4_proc_readlink(struct in
+@@ -2541,7 +2541,7 @@ static int _nfs4_proc_readlink(struct in
static int nfs4_proc_readlink(struct inode *inode, struct page *page,
unsigned int pgbase, unsigned int pglen)
{
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(inode),
-@@ -2625,7 +2625,7 @@ out:
+@@ -2637,7 +2637,7 @@ out:
static int nfs4_proc_remove(struct inode *dir, struct qstr *name)
{
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2700,7 +2700,7 @@ out:
+@@ -2713,7 +2713,7 @@ out:
static int nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name,
struct inode *new_dir, struct qstr *new_name)
{
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(old_dir),
-@@ -2749,7 +2749,7 @@ out:
+@@ -2762,7 +2762,7 @@ out:
static int nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *name)
{
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(inode),
-@@ -2841,7 +2841,7 @@ out:
+@@ -2854,7 +2854,7 @@ out:
static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry,
struct page *page, unsigned int len, struct iattr *sattr)
{
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2872,7 +2872,7 @@ out:
+@@ -2885,7 +2885,7 @@ out:
static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,
struct iattr *sattr)
{
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2921,7 +2921,7 @@ static int _nfs4_proc_readdir(struct den
+@@ -2934,7 +2934,7 @@ static int _nfs4_proc_readdir(struct den
static int nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred,
u64 cookie, struct page *page, unsigned int count, int plus)
{
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(dentry->d_inode),
-@@ -2969,7 +2969,7 @@ out:
+@@ -2982,7 +2982,7 @@ out:
static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry,
struct iattr *sattr, dev_t rdev)
{
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -3001,7 +3001,7 @@ static int _nfs4_proc_statfs(struct nfs_
+@@ -3014,7 +3014,7 @@ static int _nfs4_proc_statfs(struct nfs_
static int nfs4_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsstat *fsstat)
{
int err;
do {
err = nfs4_handle_exception(server,
-@@ -3032,7 +3032,7 @@ static int _nfs4_do_fsinfo(struct nfs_se
+@@ -3045,7 +3045,7 @@ static int _nfs4_do_fsinfo(struct nfs_se
static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *fsinfo)
{
int err;
do {
-@@ -3078,7 +3078,7 @@ static int _nfs4_proc_pathconf(struct nf
+@@ -3091,7 +3091,7 @@ static int _nfs4_proc_pathconf(struct nf
static int nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle,
struct nfs_pathconf *pathconf)
{
int err;
do {
-@@ -3399,7 +3399,7 @@ out_free:
+@@ -3408,7 +3408,7 @@ out_free:
static ssize_t nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t buflen)
{
ssize_t ret;
do {
ret = __nfs4_get_acl_uncached(inode, buf, buflen);
-@@ -3455,7 +3455,7 @@ static int __nfs4_proc_set_acl(struct in
+@@ -3464,7 +3464,7 @@ static int __nfs4_proc_set_acl(struct in
static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen)
{
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(inode),
-@@ -3745,7 +3745,7 @@ out:
+@@ -3749,7 +3749,7 @@ out:
int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid, int issync)
{
struct nfs_server *server = NFS_SERVER(inode);
int err;
do {
err = _nfs4_proc_delegreturn(inode, cred, stateid, issync);
-@@ -3818,7 +3818,7 @@ out:
+@@ -3822,7 +3822,7 @@ out:
static int nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock *request)
{
int err;
do {
-@@ -4232,7 +4232,7 @@ static int _nfs4_do_setlk(struct nfs4_st
+@@ -4233,7 +4233,7 @@ static int _nfs4_do_setlk(struct nfs4_st
static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request)
{
struct nfs_server *server = NFS_SERVER(state->inode);
int err;
do {
-@@ -4250,7 +4250,7 @@ static int nfs4_lock_reclaim(struct nfs4
+@@ -4251,7 +4251,7 @@ static int nfs4_lock_reclaim(struct nfs4
static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request)
{
struct nfs_server *server = NFS_SERVER(state->inode);
int err;
err = nfs4_set_lock_state(state, request);
-@@ -4315,7 +4315,7 @@ out:
+@@ -4316,7 +4316,7 @@ out:
static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request)
{
int err;
do {
-@@ -4375,7 +4375,7 @@ nfs4_proc_lock(struct file *filp, int cm
+@@ -4376,7 +4376,7 @@ nfs4_proc_lock(struct file *filp, int cm
int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl)
{
struct nfs_server *server = NFS_SERVER(state->inode);
int err;
err = nfs4_set_lock_state(state, fl);
-diff -urNp linux-2.6.35.4/fs/nfsd/lockd.c linux-2.6.35.4/fs/nfsd/lockd.c
---- linux-2.6.35.4/fs/nfsd/lockd.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/nfsd/lockd.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/nfsd/lockd.c linux-2.6.36/fs/nfsd/lockd.c
+--- linux-2.6.36/fs/nfsd/lockd.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/nfsd/lockd.c 2010-11-06 18:58:15.000000000 -0400
@@ -61,7 +61,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.35.4/fs/nfsd/nfsctl.c linux-2.6.35.4/fs/nfsd/nfsctl.c
---- linux-2.6.35.4/fs/nfsd/nfsctl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/nfsd/nfsctl.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/nfsd/nfsctl.c linux-2.6.36/fs/nfsd/nfsctl.c
+--- linux-2.6.36/fs/nfsd/nfsctl.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/nfsd/nfsctl.c 2010-11-06 18:58:15.000000000 -0400
@@ -163,7 +163,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.35.4/fs/nfsd/vfs.c linux-2.6.35.4/fs/nfsd/vfs.c
---- linux-2.6.35.4/fs/nfsd/vfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/nfsd/vfs.c 2010-09-17 20:12:09.000000000 -0400
-@@ -933,7 +933,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
+diff -urNp linux-2.6.36/fs/nfsd/vfs.c linux-2.6.36/fs/nfsd/vfs.c
+--- linux-2.6.36/fs/nfsd/vfs.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/nfsd/vfs.c 2010-11-06 18:58:15.000000000 -0400
+@@ -926,7 +926,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
} else {
oldfs = get_fs();
set_fs(KERNEL_DS);
set_fs(oldfs);
}
-@@ -1056,7 +1056,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, s
+@@ -1039,7 +1039,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, s
/* Write the data. */
oldfs = get_fs(); set_fs(KERNEL_DS);
set_fs(oldfs);
if (host_err < 0)
goto out_nfserr;
-@@ -1541,7 +1541,7 @@ nfsd_readlink(struct svc_rqst *rqstp, st
+@@ -1556,7 +1556,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.35.4/fs/nls/nls_base.c linux-2.6.35.4/fs/nls/nls_base.c
---- linux-2.6.35.4/fs/nls/nls_base.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/nls/nls_base.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/nls/nls_base.c linux-2.6.36/fs/nls/nls_base.c
+--- linux-2.6.36/fs/nls/nls_base.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/nls/nls_base.c 2010-11-06 18:58:15.000000000 -0400
@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
{0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */},
{0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */},
};
#define UNICODE_MAX 0x0010ffff
-diff -urNp linux-2.6.35.4/fs/ntfs/file.c linux-2.6.35.4/fs/ntfs/file.c
---- linux-2.6.35.4/fs/ntfs/file.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/ntfs/file.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/ntfs/dir.c linux-2.6.36/fs/ntfs/dir.c
+--- linux-2.6.36/fs/ntfs/dir.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/ntfs/dir.c 2010-11-06 18:58:15.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)));
+ /* Bounds checks. */
+- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
++ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
+ 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.36/fs/ntfs/file.c linux-2.6.36/fs/ntfs/file.c
+--- linux-2.6.36/fs/ntfs/file.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/ntfs/file.c 2010-11-06 18:58:15.000000000 -0400
@@ -2223,6 +2223,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.35.4/fs/ocfs2/localalloc.c linux-2.6.35.4/fs/ocfs2/localalloc.c
---- linux-2.6.35.4/fs/ocfs2/localalloc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/ocfs2/localalloc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/ocfs2/localalloc.c linux-2.6.36/fs/ocfs2/localalloc.c
+--- linux-2.6.36/fs/ocfs2/localalloc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/ocfs2/localalloc.c 2010-11-06 18:58:15.000000000 -0400
@@ -1307,7 +1307,7 @@ static int ocfs2_local_alloc_slide_windo
goto bail;
}
bail:
if (handle)
-diff -urNp linux-2.6.35.4/fs/ocfs2/ocfs2.h linux-2.6.35.4/fs/ocfs2/ocfs2.h
---- linux-2.6.35.4/fs/ocfs2/ocfs2.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/ocfs2/ocfs2.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/ocfs2/ocfs2.h linux-2.6.36/fs/ocfs2/ocfs2.h
+--- linux-2.6.36/fs/ocfs2/ocfs2.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/ocfs2/ocfs2.h 2010-11-06 18:58:15.000000000 -0400
@@ -223,11 +223,11 @@ enum ocfs2_vol_state
struct ocfs2_alloc_stats
};
enum ocfs2_local_alloc_state
-diff -urNp linux-2.6.35.4/fs/ocfs2/suballoc.c linux-2.6.35.4/fs/ocfs2/suballoc.c
---- linux-2.6.35.4/fs/ocfs2/suballoc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/ocfs2/suballoc.c 2010-09-17 20:12:09.000000000 -0400
-@@ -856,7 +856,7 @@ static int ocfs2_reserve_suballoc_bits(s
+diff -urNp linux-2.6.36/fs/ocfs2/suballoc.c linux-2.6.36/fs/ocfs2/suballoc.c
+--- linux-2.6.36/fs/ocfs2/suballoc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/ocfs2/suballoc.c 2010-11-06 18:58:15.000000000 -0400
+@@ -877,7 +877,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 >
-@@ -1968,7 +1968,7 @@ int ocfs2_claim_metadata(handle_t *handl
+@@ -2004,7 +2004,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;
-@@ -2045,7 +2045,7 @@ int ocfs2_claim_new_inode(handle_t *hand
+@@ -2211,7 +2211,7 @@ int ocfs2_claim_new_inode(handle_t *hand
mlog_errno(status);
goto bail;
}
BUG_ON(res.sr_bits != 1);
-@@ -2150,7 +2150,7 @@ int __ocfs2_claim_clusters(handle_t *han
+@@ -2316,7 +2316,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
-@@ -2176,7 +2176,7 @@ int __ocfs2_claim_clusters(handle_t *han
+@@ -2342,7 +2342,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.35.4/fs/ocfs2/super.c linux-2.6.35.4/fs/ocfs2/super.c
---- linux-2.6.35.4/fs/ocfs2/super.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/ocfs2/super.c 2010-09-17 20:12:09.000000000 -0400
-@@ -293,11 +293,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
+diff -urNp linux-2.6.36/fs/ocfs2/super.c linux-2.6.36/fs/ocfs2/super.c
+--- linux-2.6.36/fs/ocfs2/super.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/ocfs2/super.c 2010-11-06 18:58:15.000000000 -0400
+@@ -292,11 +292,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 "
-@@ -2047,11 +2047,11 @@ static int ocfs2_initialize_super(struct
+@@ -2046,11 +2046,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.35.4/fs/ocfs2/symlink.c linux-2.6.35.4/fs/ocfs2/symlink.c
---- linux-2.6.35.4/fs/ocfs2/symlink.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/ocfs2/symlink.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/ocfs2/symlink.c linux-2.6.36/fs/ocfs2/symlink.c
+--- linux-2.6.36/fs/ocfs2/symlink.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/ocfs2/symlink.c 2010-11-06 18:58:15.000000000 -0400
@@ -148,7 +148,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.35.4/fs/open.c linux-2.6.35.4/fs/open.c
---- linux-2.6.35.4/fs/open.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/open.c 2010-09-17 20:12:37.000000000 -0400
-@@ -42,6 +42,9 @@ int do_truncate(struct dentry *dentry, l
+diff -urNp linux-2.6.36/fs/open.c linux-2.6.36/fs/open.c
+--- linux-2.6.36/fs/open.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/open.c 2010-11-06 20:36:14.000000000 -0400
+@@ -43,6 +43,9 @@ int do_truncate(struct dentry *dentry, l
if (length < 0)
return -EINVAL;
@@ -397,6 +405,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd
goto out_putf;
- error = inode_permission(inode, MAY_EXEC | MAY_ACCESS);
+ error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
+
+ if (!error && !gr_chroot_fchdir(file->f_path.dentry, file->f_path.mnt))
+ error = -EPERM;
error = 0;
dput_and_out:
path_put(&path);
-@@ -453,6 +479,12 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd
+@@ -453,12 +479,25 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd
err = mnt_want_write_file(file);
if (err)
goto out_putf;
+
-+ if (!gr_acl_handle_fchmod(dentry, file->f_path.mnt, mode)) {
+ mutex_lock(&inode->i_mutex);
++
++ if (!gr_acl_handle_fchmod(dentry, file->f_vfsmnt, mode)) {
+ err = -EACCES;
-+ goto out_drop_write;
++ goto out_unlock;
+ }
+
- mutex_lock(&inode->i_mutex);
err = security_path_chmod(dentry, file->f_vfsmnt, mode);
if (err)
-@@ -464,6 +496,7 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd
+ goto out_unlock;
+ if (mode == (mode_t) -1)
+ mode = inode->i_mode;
++
++ if (gr_handle_chroot_chmod(dentry, file->f_vfsmnt, mode)) {
++ err = -EACCES;
++ goto out_unlock;
++ }
++
+ newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
+ newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
err = notify_change(dentry, &newattrs);
- out_unlock:
- mutex_unlock(&inode->i_mutex);
-+out_drop_write:
- mnt_drop_write(file->f_path.mnt);
- out_putf:
- fput(file);
-@@ -486,17 +519,30 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
+@@ -486,12 +525,25 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
error = mnt_want_write(path.mnt);
if (error)
goto dput_and_out;
++
+ mutex_lock(&inode->i_mutex);
+
+ if (!gr_acl_handle_chmod(path.dentry, path.mnt, mode)) {
+ error = -EACCES;
-+ goto out_drop_write;
++ goto out_unlock;
+ }
+
- mutex_lock(&inode->i_mutex);
error = security_path_chmod(path.dentry, path.mnt, mode);
if (error)
goto out_unlock;
newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
error = notify_change(path.dentry, &newattrs);
- out_unlock:
- mutex_unlock(&inode->i_mutex);
-+out_drop_write:
- mnt_drop_write(path.mnt);
- dput_and_out:
- path_put(&path);
-@@ -515,6 +561,9 @@ static int chown_common(struct path *pat
+@@ -515,6 +567,9 @@ static int chown_common(struct path *pat
int error;
struct iattr newattrs;
newattrs.ia_valid = ATTR_CTIME;
if (user != (uid_t) -1) {
newattrs.ia_valid |= ATTR_UID;
-diff -urNp linux-2.6.35.4/fs/pipe.c linux-2.6.35.4/fs/pipe.c
---- linux-2.6.35.4/fs/pipe.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/pipe.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/fs/pipe.c linux-2.6.36/fs/pipe.c
+--- linux-2.6.36/fs/pipe.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/pipe.c 2010-11-06 18:58:50.000000000 -0400
+@@ -382,7 +382,7 @@ pipe_read(struct kiocb *iocb, const stru
+ error = ops->confirm(pipe, buf);
+ if (error) {
+ if (!ret)
+- error = ret;
++ ret = error;
+ break;
+ }
+
@@ -420,9 +420,9 @@ redo:
}
if (bufs) /* More to do? */
inode->i_fop = &rdwr_pipefifo_fops;
/*
-diff -urNp linux-2.6.35.4/fs/proc/array.c linux-2.6.35.4/fs/proc/array.c
---- linux-2.6.35.4/fs/proc/array.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/proc/array.c 2010-09-17 20:12:37.000000000 -0400
-@@ -337,6 +337,21 @@ static void task_cpus_allowed(struct seq
+diff -urNp linux-2.6.36/fs/proc/array.c linux-2.6.36/fs/proc/array.c
+--- linux-2.6.36/fs/proc/array.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/proc/array.c 2010-11-06 18:58:50.000000000 -0400
+@@ -60,6 +60,7 @@
+ #include <linux/tty.h>
+ #include <linux/string.h>
+ #include <linux/mman.h>
++#include <linux/grsecurity.h>
+ #include <linux/proc_fs.h>
+ #include <linux/ioport.h>
+ #include <linux/uaccess.h>
+@@ -337,6 +338,21 @@ static void task_cpus_allowed(struct seq
seq_printf(m, "\n");
}
int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task)
{
-@@ -357,9 +372,20 @@ int proc_pid_status(struct seq_file *m,
+@@ -357,9 +373,24 @@ int proc_pid_status(struct seq_file *m,
task_show_regs(m, task);
#endif
task_context_switch_counts(m, task);
+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
+ task_pax(m, task);
+#endif
++
++#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
++ task_grsec_rbac(m, task);
++#endif
+
return 0;
}
static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task, int whole)
{
-@@ -452,6 +478,19 @@ static int do_task_stat(struct seq_file
+@@ -452,6 +483,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);
-@@ -492,9 +531,15 @@ static int do_task_stat(struct seq_file
+@@ -492,9 +536,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.
-@@ -547,3 +592,10 @@ int proc_pid_statm(struct seq_file *m, s
+@@ -547,3 +597,10 @@ int proc_pid_statm(struct seq_file *m, s
return 0;
}
+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
+}
+#endif
-diff -urNp linux-2.6.35.4/fs/proc/base.c linux-2.6.35.4/fs/proc/base.c
---- linux-2.6.35.4/fs/proc/base.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/proc/base.c 2010-09-17 20:12:37.000000000 -0400
-@@ -103,6 +103,22 @@ struct pid_entry {
+diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
+--- linux-2.6.36/fs/proc/base.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/proc/base.c 2010-11-06 18:58:50.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, \
-@@ -202,6 +218,9 @@ static int check_mem_permission(struct t
+@@ -203,6 +219,9 @@ static int check_mem_permission(struct t
if (task == current)
return 0;
/*
* If current is actively ptrace'ing, and would also be
* permitted to freshly attach with ptrace now, permit it.
-@@ -249,6 +268,9 @@ static int proc_pid_cmdline(struct task_
+@@ -250,6 +269,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)
-@@ -276,12 +298,26 @@ out:
+@@ -277,12 +299,28 @@ out:
return res;
}
unsigned int nwords = 0;
+
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
-+ if (PAX_RAND_FLAGS(mm)) {
++ /* allow if we're currently ptracing this task */
++ if (PAX_RAND_FLAGS(mm) &&
++ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
+ mmput(mm);
+ return res;
+ }
do {
nwords += 2;
} while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
-@@ -317,7 +353,7 @@ static int proc_pid_wchan(struct task_st
+@@ -296,7 +334,7 @@ static int proc_pid_auxv(struct task_str
+ }
+
+
+-#ifdef CONFIG_KALLSYMS
++#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
+ /*
+ * 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
}
#endif /* CONFIG_KALLSYMS */
#define MAX_STACK_TRACE_DEPTH 64
-@@ -511,7 +547,7 @@ static int proc_pid_limits(struct task_s
+@@ -509,7 +547,7 @@ static int proc_pid_limits(struct task_s
return count;
}
static int proc_pid_syscall(struct task_struct *task, char *buffer)
{
long nr;
-@@ -920,6 +956,9 @@ static ssize_t environ_read(struct file
+@@ -928,6 +966,9 @@ static ssize_t environ_read(struct file
if (!task)
goto out_no_task;
if (!ptrace_may_access(task, PTRACE_MODE_READ))
goto out;
-@@ -1514,7 +1553,11 @@ static struct inode *proc_pid_make_inode
+@@ -1614,7 +1655,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);
-@@ -1532,6 +1575,9 @@ static int pid_getattr(struct vfsmount *
+@@ -1632,6 +1677,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);
-@@ -1539,12 +1585,34 @@ static int pid_getattr(struct vfsmount *
+@@ -1639,12 +1687,34 @@ static int pid_getattr(struct vfsmount *
stat->uid = 0;
stat->gid = 0;
task = pid_task(proc_pid(inode), PIDTYPE_PID);
}
}
rcu_read_unlock();
-@@ -1576,11 +1644,20 @@ static int pid_revalidate(struct dentry
+@@ -1676,11 +1746,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;
-@@ -1701,7 +1778,8 @@ static int proc_fd_info(struct inode *in
+@@ -1801,7 +1880,8 @@ static int proc_fd_info(struct inode *in
int fd = proc_fd(inode);
if (task) {
put_task_struct(task);
}
if (files) {
-@@ -1953,12 +2031,22 @@ static const struct file_operations proc
+@@ -2053,12 +2133,22 @@ static const struct file_operations proc
static int proc_fd_permission(struct inode *inode, int mask)
{
int rv;
return rv;
}
-@@ -2067,6 +2155,9 @@ static struct dentry *proc_pident_lookup
+@@ -2167,6 +2257,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.
-@@ -2111,6 +2202,9 @@ static int proc_pident_readdir(struct fi
+@@ -2211,6 +2304,9 @@ static int proc_pident_readdir(struct fi
if (!task)
goto out_no_task;
ret = 0;
i = filp->f_pos;
switch (i) {
-@@ -2380,7 +2474,7 @@ static void *proc_self_follow_link(struc
+@@ -2480,7 +2576,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);
}
-@@ -2580,7 +2674,7 @@ static const struct pid_entry tgid_base_
+@@ -2680,7 +2776,7 @@ static const struct pid_entry tgid_base_
REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
#endif
REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
INF("syscall", S_IRUSR, proc_pid_syscall),
#endif
INF("cmdline", S_IRUGO, proc_pid_cmdline),
-@@ -2608,7 +2702,7 @@ static const struct pid_entry tgid_base_
- #ifdef CONFIG_KALLSYMS
+@@ -2705,10 +2801,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
+-#ifdef CONFIG_KALLSYMS
++#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
INF("wchan", S_IRUGO, proc_pid_wchan),
#endif
-#ifdef CONFIG_STACKTRACE
ONE("stack", S_IRUSR, proc_pid_stack),
#endif
#ifdef CONFIG_SCHEDSTATS
-@@ -2638,6 +2732,9 @@ static const struct pid_entry tgid_base_
+@@ -2739,6 +2835,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,
-@@ -2762,7 +2859,14 @@ static struct dentry *proc_pid_instantia
+@@ -2863,7 +2962,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;
-@@ -2804,7 +2908,11 @@ struct dentry *proc_pid_lookup(struct in
+@@ -2905,7 +3011,11 @@ struct dentry *proc_pid_lookup(struct in
if (!task)
goto out;
put_task_struct(task);
out:
return result;
-@@ -2869,6 +2977,11 @@ int proc_pid_readdir(struct file * filp,
+@@ -2970,6 +3080,11 @@ int proc_pid_readdir(struct file * filp,
{
unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY;
struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode);
struct tgid_iter iter;
struct pid_namespace *ns;
-@@ -2887,8 +3000,27 @@ int proc_pid_readdir(struct file * filp,
+@@ -2988,8 +3103,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;
}
-@@ -2915,7 +3047,7 @@ static const struct pid_entry tid_base_s
+@@ -3016,7 +3150,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),
INF("syscall", S_IRUSR, proc_pid_syscall),
#endif
INF("cmdline", S_IRUGO, proc_pid_cmdline),
-@@ -2942,7 +3074,7 @@ static const struct pid_entry tid_base_s
- #ifdef CONFIG_KALLSYMS
+@@ -3040,10 +3174,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
+-#ifdef CONFIG_KALLSYMS
++#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
INF("wchan", S_IRUGO, proc_pid_wchan),
#endif
-#ifdef CONFIG_STACKTRACE
ONE("stack", S_IRUSR, proc_pid_stack),
#endif
#ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-2.6.35.4/fs/proc/cmdline.c linux-2.6.35.4/fs/proc/cmdline.c
---- linux-2.6.35.4/fs/proc/cmdline.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/proc/cmdline.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/fs/proc/cmdline.c linux-2.6.36/fs/proc/cmdline.c
+--- linux-2.6.36/fs/proc/cmdline.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/proc/cmdline.c 2010-11-06 18:58:50.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.35.4/fs/proc/devices.c linux-2.6.35.4/fs/proc/devices.c
---- linux-2.6.35.4/fs/proc/devices.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/proc/devices.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/fs/proc/devices.c linux-2.6.36/fs/proc/devices.c
+--- linux-2.6.36/fs/proc/devices.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/proc/devices.c 2010-11-06 18:58:50.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.35.4/fs/proc/inode.c linux-2.6.35.4/fs/proc/inode.c
---- linux-2.6.35.4/fs/proc/inode.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/proc/inode.c 2010-09-17 20:12:37.000000000 -0400
-@@ -435,7 +435,11 @@ struct inode *proc_get_inode(struct supe
+diff -urNp linux-2.6.36/fs/proc/inode.c linux-2.6.36/fs/proc/inode.c
+--- linux-2.6.36/fs/proc/inode.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/proc/inode.c 2010-11-06 18:58:50.000000000 -0400
+@@ -426,7 +426,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.35.4/fs/proc/internal.h linux-2.6.35.4/fs/proc/internal.h
---- linux-2.6.35.4/fs/proc/internal.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/proc/internal.h 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/fs/proc/internal.h linux-2.6.36/fs/proc/internal.h
+--- linux-2.6.36/fs/proc/internal.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/proc/internal.h 2010-11-06 18:58:50.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.35.4/fs/proc/Kconfig linux-2.6.35.4/fs/proc/Kconfig
---- linux-2.6.35.4/fs/proc/Kconfig 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/proc/Kconfig 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/fs/proc/Kconfig linux-2.6.36/fs/proc/Kconfig
+--- linux-2.6.36/fs/proc/Kconfig 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/proc/Kconfig 2010-11-06 18:58:50.000000000 -0400
@@ -30,12 +30,12 @@ config PROC_FS
config PROC_KCORE
bool "Enable /proc page monitoring" if EMBEDDED
help
Various /proc files exist to monitor process memory utilization:
-diff -urNp linux-2.6.35.4/fs/proc/kcore.c linux-2.6.35.4/fs/proc/kcore.c
---- linux-2.6.35.4/fs/proc/kcore.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/proc/kcore.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/fs/proc/kcore.c linux-2.6.36/fs/proc/kcore.c
+--- linux-2.6.36/fs/proc/kcore.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/proc/kcore.c 2010-11-06 18:58:50.000000000 -0400
@@ -478,9 +478,10 @@ read_kcore(struct file *file, char __use
* the addresses in the elf_phdr on our list.
*/
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
if (kcore_need_update)
-diff -urNp linux-2.6.35.4/fs/proc/meminfo.c linux-2.6.35.4/fs/proc/meminfo.c
---- linux-2.6.35.4/fs/proc/meminfo.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/proc/meminfo.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/proc/meminfo.c linux-2.6.36/fs/proc/meminfo.c
+--- linux-2.6.36/fs/proc/meminfo.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/proc/meminfo.c 2010-11-06 18:58:15.000000000 -0400
@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
vmi.used >> 10,
vmi.largest_chunk >> 10
#endif
);
-diff -urNp linux-2.6.35.4/fs/proc/nommu.c linux-2.6.35.4/fs/proc/nommu.c
---- linux-2.6.35.4/fs/proc/nommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/proc/nommu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/proc/nommu.c linux-2.6.36/fs/proc/nommu.c
+--- linux-2.6.36/fs/proc/nommu.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/proc/nommu.c 2010-11-06 18:58:15.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.35.4/fs/proc/proc_net.c linux-2.6.35.4/fs/proc/proc_net.c
---- linux-2.6.35.4/fs/proc/proc_net.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/proc/proc_net.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/fs/proc/proc_net.c linux-2.6.36/fs/proc/proc_net.c
+--- linux-2.6.36/fs/proc/proc_net.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/proc/proc_net.c 2010-11-06 18:58:50.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.35.4/fs/proc/proc_sysctl.c linux-2.6.35.4/fs/proc/proc_sysctl.c
---- linux-2.6.35.4/fs/proc/proc_sysctl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/proc/proc_sysctl.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/fs/proc/proc_sysctl.c linux-2.6.36/fs/proc/proc_sysctl.c
+--- linux-2.6.36/fs/proc/proc_sysctl.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/proc/proc_sysctl.c 2010-11-06 18:58:50.000000000 -0400
@@ -7,6 +7,8 @@
#include <linux/security.h>
#include "internal.h"
res = proc_sys_fill_cache(file, dirent, filldir, head, table);
if (res)
return res;
-@@ -344,6 +352,9 @@ static int proc_sys_getattr(struct vfsmo
+@@ -353,6 +361,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.35.4/fs/proc/root.c linux-2.6.35.4/fs/proc/root.c
---- linux-2.6.35.4/fs/proc/root.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/proc/root.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/fs/proc/root.c linux-2.6.36/fs/proc/root.c
+--- linux-2.6.36/fs/proc/root.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/proc/root.c 2010-11-06 18:58:50.000000000 -0400
@@ -133,7 +133,15 @@ void __init proc_root_init(void)
#ifdef CONFIG_PROC_DEVICETREE
proc_device_tree_init();
proc_sys_init();
}
-diff -urNp linux-2.6.35.4/fs/proc/task_mmu.c linux-2.6.35.4/fs/proc/task_mmu.c
---- linux-2.6.35.4/fs/proc/task_mmu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/proc/task_mmu.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/fs/proc/task_mmu.c linux-2.6.36/fs/proc/task_mmu.c
+--- linux-2.6.36/fs/proc/task_mmu.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/proc/task_mmu.c 2010-11-06 18:58:50.000000000 -0400
@@ -49,8 +49,13 @@ void task_mem(struct seq_file *m, struct
"VmExe:\t%8lu kB\n"
"VmLib:\t%8lu kB\n"
dev_t dev = 0;
int len;
-@@ -221,19 +237,24 @@ static void show_map_vma(struct seq_file
+@@ -221,20 +237,24 @@ 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)
-- start += PAGE_SIZE;
+- 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,
MAJOR(dev), MINOR(dev), ino, &len);
/*
-@@ -242,16 +263,16 @@ static void show_map_vma(struct seq_file
+@@ -243,16 +263,16 @@ static void show_map_vma(struct seq_file
*/
if (file) {
pad_len_spaces(m, len);
name = "[stack]";
}
} else {
-@@ -393,11 +414,16 @@ static int show_smap(struct seq_file *m,
+@@ -394,11 +414,16 @@ static int show_smap(struct seq_file *m,
};
memset(&mss, 0, sizeof mss);
show_map_vma(m, vma);
seq_printf(m,
-@@ -412,7 +438,11 @@ static int show_smap(struct seq_file *m,
+@@ -413,7 +438,11 @@ static int show_smap(struct seq_file *m,
"Swap: %8lu kB\n"
"KernelPageSize: %8lu kB\n"
"MMUPageSize: %8lu kB\n",
mss.resident >> 10,
(unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
mss.shared_clean >> 10,
-diff -urNp linux-2.6.35.4/fs/proc/task_nommu.c linux-2.6.35.4/fs/proc/task_nommu.c
---- linux-2.6.35.4/fs/proc/task_nommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/proc/task_nommu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/proc/task_nommu.c linux-2.6.36/fs/proc/task_nommu.c
+--- linux-2.6.36/fs/proc/task_nommu.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/proc/task_nommu.c 2010-11-06 18:58:15.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.35.4/fs/readdir.c linux-2.6.35.4/fs/readdir.c
---- linux-2.6.35.4/fs/readdir.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/readdir.c 2010-09-17 20:12:37.000000000 -0400
-@@ -16,6 +16,7 @@
+diff -urNp linux-2.6.36/fs/readdir.c linux-2.6.36/fs/readdir.c
+--- linux-2.6.36/fs/readdir.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/readdir.c 2010-11-06 18:58:50.000000000 -0400
+@@ -17,6 +17,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
#include <linux/unistd.h>
int count;
int error;
};
-@@ -162,6 +170,10 @@ static int filldir(void * __buf, const c
+@@ -163,6 +171,10 @@ static int filldir(void * __buf, const c
buf->error = -EOVERFLOW;
return -EOVERFLOW;
}
dirent = buf->previous;
if (dirent) {
if (__put_user(offset, &dirent->d_off))
-@@ -209,6 +221,7 @@ SYSCALL_DEFINE3(getdents, unsigned int,
+@@ -210,6 +222,7 @@ SYSCALL_DEFINE3(getdents, unsigned int,
buf.previous = NULL;
buf.count = count;
buf.error = 0;
error = vfs_readdir(file, filldir, &buf);
if (error >= 0)
-@@ -228,6 +241,7 @@ out:
+@@ -229,6 +242,7 @@ out:
struct getdents_callback64 {
struct linux_dirent64 __user * current_dir;
struct linux_dirent64 __user * previous;
int count;
int error;
};
-@@ -242,6 +256,10 @@ static int filldir64(void * __buf, const
+@@ -244,6 +258,10 @@ static int filldir64(void * __buf, const
buf->error = -EINVAL; /* only used if we fail.. */
if (reclen > buf->count)
return -EINVAL;
dirent = buf->previous;
if (dirent) {
if (__put_user(offset, &dirent->d_off))
-@@ -289,6 +307,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int
+@@ -291,6 +309,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int
buf.current_dir = dirent;
buf.previous = NULL;
buf.count = count;
buf.error = 0;
-diff -urNp linux-2.6.35.4/fs/reiserfs/do_balan.c linux-2.6.35.4/fs/reiserfs/do_balan.c
---- linux-2.6.35.4/fs/reiserfs/do_balan.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/reiserfs/do_balan.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/reiserfs/do_balan.c linux-2.6.36/fs/reiserfs/do_balan.c
+--- linux-2.6.36/fs/reiserfs/do_balan.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/reiserfs/do_balan.c 2010-11-06 18:58:15.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.35.4/fs/reiserfs/item_ops.c linux-2.6.35.4/fs/reiserfs/item_ops.c
---- linux-2.6.35.4/fs/reiserfs/item_ops.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/reiserfs/item_ops.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/reiserfs/item_ops.c linux-2.6.36/fs/reiserfs/item_ops.c
+--- linux-2.6.36/fs/reiserfs/item_ops.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/reiserfs/item_ops.c 2010-11-06 18:58:15.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.35.4/fs/reiserfs/procfs.c linux-2.6.35.4/fs/reiserfs/procfs.c
---- linux-2.6.35.4/fs/reiserfs/procfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/reiserfs/procfs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/reiserfs/procfs.c linux-2.6.36/fs/reiserfs/procfs.c
+--- linux-2.6.36/fs/reiserfs/procfs.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/reiserfs/procfs.c 2010-11-06 18:58:15.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.35.4/fs/select.c linux-2.6.35.4/fs/select.c
---- linux-2.6.35.4/fs/select.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/select.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/fs/select.c linux-2.6.36/fs/select.c
+--- linux-2.6.36/fs/select.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/select.c 2010-11-06 18:58:50.000000000 -0400
@@ -20,6 +20,7 @@
#include <linux/module.h>
#include <linux/slab.h>
if (nfds > rlimit(RLIMIT_NOFILE))
return -EINVAL;
-diff -urNp linux-2.6.35.4/fs/seq_file.c linux-2.6.35.4/fs/seq_file.c
---- linux-2.6.35.4/fs/seq_file.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/seq_file.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/seq_file.c linux-2.6.36/fs/seq_file.c
+--- linux-2.6.36/fs/seq_file.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/seq_file.c 2010-11-06 18:58:15.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.35.4/fs/smbfs/symlink.c linux-2.6.35.4/fs/smbfs/symlink.c
---- linux-2.6.35.4/fs/smbfs/symlink.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/smbfs/symlink.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/smbfs/symlink.c linux-2.6.36/fs/smbfs/symlink.c
+--- linux-2.6.36/fs/smbfs/symlink.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/smbfs/symlink.c 2010-11-06 18:58:15.000000000 -0400
@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
if (!IS_ERR(s))
__putname(s);
}
-diff -urNp linux-2.6.35.4/fs/splice.c linux-2.6.35.4/fs/splice.c
---- linux-2.6.35.4/fs/splice.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/splice.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/splice.c linux-2.6.36/fs/splice.c
+--- linux-2.6.36/fs/splice.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/splice.c 2010-11-06 18:58:15.000000000 -0400
@@ -186,7 +186,7 @@ ssize_t splice_to_pipe(struct pipe_inode
pipe_lock(pipe);
}
pipe_unlock(pipe);
-@@ -566,7 +566,7 @@ static ssize_t kernel_readv(struct file
+@@ -556,7 +556,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;
-@@ -581,7 +581,7 @@ static ssize_t kernel_write(struct file
+@@ -571,7 +571,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;
-@@ -634,7 +634,7 @@ ssize_t default_file_splice_read(struct
+@@ -622,7 +622,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++;
-@@ -861,10 +861,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
+@@ -849,10 +849,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)
-@@ -1201,7 +1201,7 @@ ssize_t splice_direct_to_actor(struct fi
+@@ -1189,7 +1189,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;
}
-@@ -1769,9 +1769,9 @@ static int ipipe_prep(struct pipe_inode_
+@@ -1757,9 +1757,9 @@ static int ipipe_prep(struct pipe_inode_
ret = -ERESTARTSYS;
break;
}
if (flags & SPLICE_F_NONBLOCK) {
ret = -EAGAIN;
break;
-@@ -1803,7 +1803,7 @@ static int opipe_prep(struct pipe_inode_
+@@ -1791,7 +1791,7 @@ static int opipe_prep(struct pipe_inode_
pipe_lock(pipe);
while (pipe->nrbufs >= pipe->buffers) {
send_sig(SIGPIPE, current, 0);
ret = -EPIPE;
break;
-@@ -1816,9 +1816,9 @@ static int opipe_prep(struct pipe_inode_
+@@ -1804,9 +1804,9 @@ static int opipe_prep(struct pipe_inode_
ret = -ERESTARTSYS;
break;
}
}
pipe_unlock(pipe);
-@@ -1854,14 +1854,14 @@ retry:
+@@ -1842,14 +1842,14 @@ retry:
pipe_double_lock(ipipe, opipe);
do {
break;
/*
-@@ -1961,7 +1961,7 @@ static int link_pipe(struct pipe_inode_i
+@@ -1949,7 +1949,7 @@ static int link_pipe(struct pipe_inode_i
pipe_double_lock(ipipe, opipe);
do {
send_sig(SIGPIPE, current, 0);
if (!ret)
ret = -EPIPE;
-@@ -2006,7 +2006,7 @@ static int link_pipe(struct pipe_inode_i
+@@ -1994,7 +1994,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.35.4/fs/sysfs/symlink.c linux-2.6.35.4/fs/sysfs/symlink.c
---- linux-2.6.35.4/fs/sysfs/symlink.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/sysfs/symlink.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/sysfs/symlink.c linux-2.6.36/fs/sysfs/symlink.c
+--- linux-2.6.36/fs/sysfs/symlink.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/sysfs/symlink.c 2010-11-06 18:58:15.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.35.4/fs/udf/misc.c linux-2.6.35.4/fs/udf/misc.c
---- linux-2.6.35.4/fs/udf/misc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/udf/misc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/udf/misc.c linux-2.6.36/fs/udf/misc.c
+--- linux-2.6.36/fs/udf/misc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/udf/misc.c 2010-11-06 18:58:15.000000000 -0400
@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat
iinfo->i_lenEAttr += size;
return (struct genericFormat *)&ea[offset];
return NULL;
}
-diff -urNp linux-2.6.35.4/fs/udf/udfdecl.h linux-2.6.35.4/fs/udf/udfdecl.h
---- linux-2.6.35.4/fs/udf/udfdecl.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/udf/udfdecl.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/fs/udf/udfdecl.h linux-2.6.36/fs/udf/udfdecl.h
+--- linux-2.6.36/fs/udf/udfdecl.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/udf/udfdecl.h 2010-11-06 18:58:15.000000000 -0400
@@ -26,7 +26,7 @@ do { \
printk(f, ##a); \
} while (0)
#endif
#define udf_info(f, a...) \
-diff -urNp linux-2.6.35.4/fs/utimes.c linux-2.6.35.4/fs/utimes.c
---- linux-2.6.35.4/fs/utimes.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/utimes.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/fs/utimes.c linux-2.6.36/fs/utimes.c
+--- linux-2.6.36/fs/utimes.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/utimes.c 2010-11-06 18:58:50.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.35.4/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.35.4/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.35.4/fs/xfs/linux-2.6/xfs_ioctl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/xfs/linux-2.6/xfs_ioctl.c 2010-09-17 20:12:37.000000000 -0400
-@@ -136,7 +136,7 @@ xfs_find_handle(
+diff -urNp linux-2.6.36/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.36/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-2.6.36/fs/xfs/linux-2.6/xfs_ioctl.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/xfs/linux-2.6/xfs_ioctl.c 2010-11-06 18:58:50.000000000 -0400
+@@ -127,7 +127,7 @@ xfs_find_handle(
}
error = -EFAULT;
copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
goto out_put;
-diff -urNp linux-2.6.35.4/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.35.4/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.35.4/fs/xfs/linux-2.6/xfs_iops.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/xfs/linux-2.6/xfs_iops.c 2010-09-17 20:12:09.000000000 -0400
-@@ -480,7 +480,7 @@ xfs_vn_put_link(
+diff -urNp linux-2.6.36/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.36/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.36/fs/xfs/linux-2.6/xfs_iops.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/xfs/linux-2.6/xfs_iops.c 2010-11-06 18:58:15.000000000 -0400
+@@ -472,7 +472,7 @@ xfs_vn_put_link(
struct nameidata *nd,
void *p)
{
if (!IS_ERR(s))
kfree(s);
-diff -urNp linux-2.6.35.4/fs/xfs/xfs_bmap.c linux-2.6.35.4/fs/xfs/xfs_bmap.c
---- linux-2.6.35.4/fs/xfs/xfs_bmap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/fs/xfs/xfs_bmap.c 2010-09-17 20:12:09.000000000 -0400
-@@ -296,7 +296,7 @@ xfs_bmap_validate_ret(
+diff -urNp linux-2.6.36/fs/xfs/xfs_bmap.c linux-2.6.36/fs/xfs/xfs_bmap.c
+--- linux-2.6.36/fs/xfs/xfs_bmap.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/fs/xfs/xfs_bmap.c 2010-11-06 18:58:15.000000000 -0400
+@@ -287,7 +287,7 @@ xfs_bmap_validate_ret(
int nmap,
int ret_nmap);
#else
#endif /* DEBUG */
STATIC int
-diff -urNp linux-2.6.35.4/grsecurity/gracl_alloc.c linux-2.6.35.4/grsecurity/gracl_alloc.c
---- linux-2.6.35.4/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/gracl_alloc.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/gracl_alloc.c linux-2.6.36/grsecurity/gracl_alloc.c
+--- linux-2.6.36/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/gracl_alloc.c 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,105 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
+ else
+ return 1;
+}
-diff -urNp linux-2.6.35.4/grsecurity/gracl.c linux-2.6.35.4/grsecurity/gracl.c
---- linux-2.6.35.4/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/gracl.c 2010-09-17 20:18:36.000000000 -0400
-@@ -0,0 +1,3922 @@
+diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
+--- linux-2.6.36/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/gracl.c 2010-11-06 19:40:35.000000000 -0400
+@@ -0,0 +1,3874 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
+ can share references in the kernel as well
+*/
+
-+static struct dentry *real_root;
-+static struct vfsmount *real_root_mnt;
++static struct path real_root;
+
+static struct acl_subj_map_db subj_map_set;
+
+ return (gr_status & GR_READY);
+}
+
-+char gr_roletype_to_char(void)
++static char gr_task_roletype_to_char(struct task_struct *task)
+{
-+ switch (current->role->roletype &
++ switch (task->role->roletype &
+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
+ GR_ROLE_SPECIAL)) {
+ case GR_ROLE_DEFAULT:
+ return 'X';
+}
+
++char gr_roletype_to_char(void)
++{
++ return gr_task_roletype_to_char(current);
++}
++
+__inline__ int
+gr_acl_tpe_check(void)
+{
+ return !memcmp(a, b, lena);
+}
+
-+static char * __our_d_path(struct dentry *dentry, struct vfsmount *vfsmnt,
-+ struct dentry *root, struct vfsmount *rootmnt,
-+ char *buffer, int buflen)
-+{
-+ char * end = buffer+buflen;
-+ char * retval;
-+ int namelen;
-+
-+ spin_lock(&vfsmount_lock);
-+ *--end = '\0';
-+ buflen--;
-+
-+ if (buflen < 1)
-+ goto Elong;
-+ /* Get '/' right */
-+ retval = end-1;
-+ *retval = '/';
-+
-+ for (;;) {
-+ struct dentry * parent;
-+
-+ if (dentry == root && vfsmnt == rootmnt)
-+ break;
-+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
-+ /* Global root? */
-+ if (vfsmnt->mnt_parent == vfsmnt) {
-+ goto global_root;
-+ }
-+ dentry = vfsmnt->mnt_mountpoint;
-+ vfsmnt = vfsmnt->mnt_parent;
-+ continue;
-+ }
-+ parent = dentry->d_parent;
-+ prefetch(parent);
-+ namelen = dentry->d_name.len;
-+ buflen -= namelen + 1;
-+ if (buflen < 0)
-+ goto Elong;
-+ end -= namelen;
-+ memcpy(end, dentry->d_name.name, namelen);
-+ *--end = '/';
-+ retval = end;
-+ dentry = parent;
-+ }
-+
-+out:
-+ spin_unlock(&vfsmount_lock);
-+ return retval;
-+
-+global_root:
-+ namelen = dentry->d_name.len;
-+ buflen -= namelen;
-+ if (buflen < 0)
-+ goto Elong;
-+ retval -= namelen-1; /* hit the slash */
-+ memcpy(retval, dentry->d_name.name, namelen);
-+ goto out;
-+Elong:
-+ retval = ERR_PTR(-ENAMETOOLONG);
-+ goto out;
-+}
-+
+static char *
-+gen_full_path(struct dentry *dentry, struct vfsmount *vfsmnt,
-+ struct dentry *root, struct vfsmount *rootmnt, char *buf, int buflen)
++gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
+{
+ char *retval;
+
-+ retval = __our_d_path(dentry, vfsmnt, root, rootmnt, buf, buflen);
++ retval = __d_path(path, root, buf, buflen);
+ if (unlikely(IS_ERR(retval)))
+ retval = strcpy(buf, "<path too long>");
+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
+ char *buf, int buflen)
+{
++ struct path path;
+ char *res;
+
-+ /* we can use real_root, real_root_mnt, because this is only called
++ path.dentry = (struct dentry *)dentry;
++ path.mnt = (struct vfsmount *)vfsmnt;
++
++ /* we can use real_root.dentry, real_root.mnt, because this is only called
+ by the RBAC system */
-+ res = gen_full_path((struct dentry *)dentry, (struct vfsmount *)vfsmnt, real_root, real_root_mnt, buf, buflen);
++ res = gen_full_path(&path, &real_root, buf, buflen);
+
+ return res;
+}
+ char *buf, int buflen)
+{
+ char *res;
-+ struct dentry *root;
-+ struct vfsmount *rootmnt;
++ struct path path;
++ struct path root;
+ struct task_struct *reaper = &init_task;
+
-+ /* we can't use real_root, real_root_mnt, because they belong only to the RBAC system */
-+ read_lock(&reaper->fs->lock);
-+ root = dget(reaper->fs->root.dentry);
-+ rootmnt = mntget(reaper->fs->root.mnt);
-+ read_unlock(&reaper->fs->lock);
++ path.dentry = (struct dentry *)dentry;
++ path.mnt = (struct vfsmount *)vfsmnt;
++
++ /* we can't use real_root.dentry, real_root.mnt, because they belong only to the RBAC system */
++ get_fs_root(reaper->fs, &root);
+
+ spin_lock(&dcache_lock);
-+ res = gen_full_path((struct dentry *)dentry, (struct vfsmount *)vfsmnt, root, rootmnt, buf, buflen);
++ res = gen_full_path(&path, &root, buf, buflen);
+ spin_unlock(&dcache_lock);
+
-+ dput(root);
-+ mntput(rootmnt);
++ path_put(&root);
+ return res;
+}
+
+ return 1;
+
+ /* grab reference for the real root dentry and vfsmount */
-+ read_lock(&reaper->fs->lock);
-+ real_root_mnt = mntget(reaper->fs->root.mnt);
-+ real_root = dget(reaper->fs->root.dentry);
-+ read_unlock(&reaper->fs->lock);
++ get_fs_root(reaper->fs, &real_root);
+
+ fakefs_obj = acl_alloc(sizeof(struct acl_object_label));
+ if (fakefs_obj == NULL)
+ read_unlock(&tasklist_lock);
+
+ /* release the reference to the real root dentry and vfsmount */
-+ if (real_root)
-+ dput(real_root);
-+ real_root = NULL;
-+ if (real_root_mnt)
-+ mntput(real_root_mnt);
-+ real_root_mnt = NULL;
++ path_put(&real_root);
+
+ /* free all object hash tables */
+
+ }
+
+ for (;;) {
-+ if (dentry == real_root && mnt == real_root_mnt)
++ if (dentry == real_root.dentry && mnt == real_root.mnt)
+ break;
+
+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
+
+ if (retval == NULL)
-+ retval = full_lookup(l_dentry, l_mnt, real_root, subj, &path, checkglob);
++ retval = full_lookup(l_dentry, l_mnt, real_root.dentry, subj, &path, checkglob);
+out:
+ spin_unlock(&dcache_lock);
+ return retval;
+ spin_lock(&dcache_lock);
+
+ for (;;) {
-+ if (dentry == real_root && mnt == real_root_mnt)
++ if (dentry == real_root.dentry && mnt == real_root.mnt)
+ break;
+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
+ if (mnt->mnt_parent == mnt)
+
+ if (unlikely(retval == NULL)) {
+ read_lock(&gr_inode_lock);
-+ retval = lookup_acl_subj_label(real_root->d_inode->i_ino,
-+ real_root->d_inode->i_sb->s_dev, role);
++ retval = lookup_acl_subj_label(real_root.dentry->d_inode->i_ino,
++ real_root.dentry->d_inode->i_sb->s_dev, role);
+ read_unlock(&gr_inode_lock);
+ }
+out:
+ read_lock(&tasklist_lock);
+ read_lock(&grsec_exec_file_lock);
+
-+ tsk = current->parent;
++ tsk = current->real_parent;
+ if (tsk == NULL)
+ goto out_unlock;
+
+ while (p3->pid > 0) {
+ if (p3 == p)
+ break;
-+ p3 = p3->parent;
++ p3 = p3->real_parent;
+ }
+ if (p3 == p)
+ break;
+ char *p = "";
+ assign_special_role(gr_usermode->sp_role);
+ read_lock(&tasklist_lock);
-+ if (current->parent)
-+ p = current->parent->role->rolename;
++ if (current->real_parent)
++ p = current->real_parent->role->rolename;
+ read_unlock(&tasklist_lock);
+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
+ p, acl_sp_role_value);
+ int i = 0;
+
+ read_lock(&tasklist_lock);
-+ if (current->parent) {
-+ p = current->parent->role->rolename;
-+ i = current->parent->acl_role_id;
++ if (current->real_parent) {
++ p = current->real_parent->role->rolename;
++ i = current->real_parent->acl_role_id;
+ }
+ read_unlock(&tasklist_lock);
+
+ while (tmp->pid > 0) {
+ if (tmp == curtemp)
+ break;
-+ tmp = tmp->parent;
++ tmp = tmp->real_parent;
+ }
+
+ if (!filp || (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
+ return 0;
+}
+
++void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
++{
++ if (unlikely(!(gr_status & GR_READY)))
++ return;
++
++ if (!(current->role->roletype & GR_ROLE_GOD))
++ return;
++
++ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
++ p->role->rolename, gr_task_roletype_to_char(p),
++ p->acl->filename);
++}
++
+int
+gr_handle_ptrace(struct task_struct *task, const long request)
+{
+ while (tmp->pid > 0) {
+ if (tmp == curtemp)
+ break;
-+ tmp = tmp->parent;
++ tmp = tmp->real_parent;
+ }
+
+ if (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
+ return (obj->mode & GR_FIND) ? 1 : 0;
+}
+
++#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
++EXPORT_SYMBOL(gr_acl_is_enabled);
++#endif
+EXPORT_SYMBOL(gr_learn_resource);
+EXPORT_SYMBOL(gr_set_kernel_label);
+#ifdef CONFIG_SECURITY
+EXPORT_SYMBOL(gr_check_group_change);
+#endif
+
-diff -urNp linux-2.6.35.4/grsecurity/gracl_cap.c linux-2.6.35.4/grsecurity/gracl_cap.c
---- linux-2.6.35.4/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/gracl_cap.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/gracl_cap.c linux-2.6.36/grsecurity/gracl_cap.c
+--- linux-2.6.36/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/gracl_cap.c 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,138 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+ return 0;
+}
+
-diff -urNp linux-2.6.35.4/grsecurity/gracl_fs.c linux-2.6.35.4/grsecurity/gracl_fs.c
---- linux-2.6.35.4/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/gracl_fs.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/gracl_fs.c linux-2.6.36/grsecurity/gracl_fs.c
+--- linux-2.6.36/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/gracl_fs.c 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,424 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+
+ return 0;
+}
-diff -urNp linux-2.6.35.4/grsecurity/gracl_ip.c linux-2.6.35.4/grsecurity/gracl_ip.c
---- linux-2.6.35.4/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/gracl_ip.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/gracl_ip.c linux-2.6.36/grsecurity/gracl_ip.c
+--- linux-2.6.36/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/gracl_ip.c 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,339 @@
+#include <linux/kernel.h>
+#include <asm/uaccess.h>
+
+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
+}
-diff -urNp linux-2.6.35.4/grsecurity/gracl_learn.c linux-2.6.35.4/grsecurity/gracl_learn.c
---- linux-2.6.35.4/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/gracl_learn.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/gracl_learn.c linux-2.6.36/grsecurity/gracl_learn.c
+--- linux-2.6.36/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/gracl_learn.c 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,211 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
+ .release = close_learn,
+ .poll = poll_learn,
+};
-diff -urNp linux-2.6.35.4/grsecurity/gracl_res.c linux-2.6.35.4/grsecurity/gracl_res.c
---- linux-2.6.35.4/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/gracl_res.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/gracl_res.c linux-2.6.36/grsecurity/gracl_res.c
+--- linux-2.6.36/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/gracl_res.c 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,68 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+ rcu_read_unlock();
+ return;
+}
-diff -urNp linux-2.6.35.4/grsecurity/gracl_segv.c linux-2.6.35.4/grsecurity/gracl_segv.c
---- linux-2.6.35.4/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/gracl_segv.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/gracl_segv.c linux-2.6.36/grsecurity/gracl_segv.c
+--- linux-2.6.36/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/gracl_segv.c 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,310 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
+
+ return;
+}
-diff -urNp linux-2.6.35.4/grsecurity/gracl_shm.c linux-2.6.35.4/grsecurity/gracl_shm.c
---- linux-2.6.35.4/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/gracl_shm.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/gracl_shm.c linux-2.6.36/grsecurity/gracl_shm.c
+--- linux-2.6.36/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/gracl_shm.c 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,40 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
+
+ return 1;
+}
-diff -urNp linux-2.6.35.4/grsecurity/grsec_chdir.c linux-2.6.35.4/grsecurity/grsec_chdir.c
---- linux-2.6.35.4/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/grsec_chdir.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/grsec_chdir.c linux-2.6.36/grsecurity/grsec_chdir.c
+--- linux-2.6.36/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/grsec_chdir.c 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,19 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return;
+}
-diff -urNp linux-2.6.35.4/grsecurity/grsec_chroot.c linux-2.6.35.4/grsecurity/grsec_chroot.c
---- linux-2.6.35.4/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/grsec_chroot.c 2010-09-17 20:12:37.000000000 -0400
-@@ -0,0 +1,389 @@
+diff -urNp linux-2.6.36/grsecurity/grsec_chroot.c linux-2.6.36/grsecurity/grsec_chroot.c
+--- linux-2.6.36/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/grsec_chroot.c 2010-11-06 20:00:34.000000000 -0400
+@@ -0,0 +1,372 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
+}
+
+int
-+gr_handle_chroot_unix(const pid_t pid)
++gr_handle_chroot_unix(struct pid *pid)
+{
+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
-+ struct pid *spid = NULL;
++ struct task_struct *p;
+
+ if (unlikely(!grsec_enable_chroot_unix))
+ return 1;
+
+ rcu_read_lock();
+ read_lock(&tasklist_lock);
-+
-+ spid = find_vpid(pid);
-+ if (spid) {
-+ struct task_struct *p;
-+ p = pid_task(spid, PIDTYPE_PID);
-+ if (unlikely(!have_same_root(current, p))) {
-+ read_unlock(&tasklist_lock);
-+ rcu_read_unlock();
-+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
-+ return 0;
-+ }
++ p = pid_task(pid, PIDTYPE_PID);
++ if (unlikely(!have_same_root(current, p))) {
++ read_unlock(&tasklist_lock);
++ rcu_read_unlock();
++ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
++ return 0;
+ }
+ read_unlock(&tasklist_lock);
+ rcu_read_unlock();
+{
+ struct dentry *dentry = (struct dentry *)u_dentry;
+ struct vfsmount *mnt = (struct vfsmount *)u_mnt;
-+ struct dentry *realroot;
-+ struct vfsmount *realrootmnt;
-+ struct dentry *currentroot;
-+ struct vfsmount *currentmnt;
++ struct path realroot, currentroot;
+ struct task_struct *reaper = &init_task;
+ int ret = 1;
+
-+ read_lock(&reaper->fs->lock);
-+ realrootmnt = mntget(reaper->fs->root.mnt);
-+ realroot = dget(reaper->fs->root.dentry);
-+ read_unlock(&reaper->fs->lock);
-+
-+ read_lock(¤t->fs->lock);
-+ currentmnt = mntget(current->fs->root.mnt);
-+ currentroot = dget(current->fs->root.dentry);
-+ read_unlock(¤t->fs->lock);
++ get_fs_root(reaper->fs, &realroot);
++ get_fs_root(current->fs, ¤troot);
+
+ spin_lock(&dcache_lock);
+ for (;;) {
-+ if (unlikely((dentry == realroot && mnt == realrootmnt)
-+ || (dentry == currentroot && mnt == currentmnt)))
++ if (unlikely((dentry == realroot.dentry && mnt == realroot.mnt)
++ || (dentry == currentroot.dentry && mnt == currentroot.mnt)))
+ break;
+ if (unlikely(dentry == mnt->mnt_root || IS_ROOT(dentry))) {
+ if (mnt->mnt_parent == mnt)
+ }
+ spin_unlock(&dcache_lock);
+
-+ dput(currentroot);
-+ mntput(currentmnt);
++ path_put(¤troot);
+
+ /* access is outside of chroot */
-+ if (dentry == realroot && mnt == realrootmnt)
++ if (dentry == realroot.dentry && mnt == realroot.mnt)
+ ret = 0;
+
-+ dput(realroot);
-+ mntput(realrootmnt);
++ path_put(&realroot);
+ return ret;
+}
+#endif
+#ifdef CONFIG_SECURITY
+EXPORT_SYMBOL(gr_handle_chroot_caps);
+#endif
-diff -urNp linux-2.6.35.4/grsecurity/grsec_disabled.c linux-2.6.35.4/grsecurity/grsec_disabled.c
---- linux-2.6.35.4/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/grsec_disabled.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/grsec_disabled.c linux-2.6.36/grsecurity/grsec_disabled.c
+--- linux-2.6.36/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/grsec_disabled.c 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,431 @@
+#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.35.4/grsecurity/grsec_exec.c linux-2.6.35.4/grsecurity/grsec_exec.c
---- linux-2.6.35.4/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/grsec_exec.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/grsec_exec.c linux-2.6.36/grsecurity/grsec_exec.c
+--- linux-2.6.36/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/grsec_exec.c 2010-11-06 19:52:16.000000000 -0400
@@ -0,0 +1,88 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+}
+
+void
-+gr_handle_exec_args(struct linux_binprm *bprm, const char __user *__user *argv)
++gr_handle_exec_args(struct linux_binprm *bprm, const char __user *const __user *argv)
+{
+#ifdef CONFIG_GRKERNSEC_EXECLOG
+ char *grarg = gr_exec_arg_buf;
+#endif
+ return;
+}
-diff -urNp linux-2.6.35.4/grsecurity/grsec_fifo.c linux-2.6.35.4/grsecurity/grsec_fifo.c
---- linux-2.6.35.4/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/grsec_fifo.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/grsec_fifo.c linux-2.6.36/grsecurity/grsec_fifo.c
+--- linux-2.6.36/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/grsec_fifo.c 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,24 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.35.4/grsecurity/grsec_fork.c linux-2.6.35.4/grsecurity/grsec_fork.c
---- linux-2.6.35.4/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/grsec_fork.c 2010-09-17 20:12:37.000000000 -0400
-@@ -0,0 +1,15 @@
+diff -urNp linux-2.6.36/grsecurity/grsec_fork.c linux-2.6.36/grsecurity/grsec_fork.c
+--- linux-2.6.36/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/grsec_fork.c 2010-11-06 18:58:50.000000000 -0400
+@@ -0,0 +1,23 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/grsecurity.h>
+gr_log_forkfail(const int retval)
+{
+#ifdef CONFIG_GRKERNSEC_FORKFAIL
-+ if (grsec_enable_forkfail && retval != -ERESTARTNOINTR)
-+ gr_log_int(GR_DONT_AUDIT, GR_FAILFORK_MSG, retval);
++ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
++ switch (retval) {
++ case -EAGAIN:
++ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
++ break;
++ case -ENOMEM:
++ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
++ break;
++ }
++ }
+#endif
+ return;
+}
-diff -urNp linux-2.6.35.4/grsecurity/grsec_init.c linux-2.6.35.4/grsecurity/grsec_init.c
---- linux-2.6.35.4/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/grsec_init.c 2010-09-17 20:12:37.000000000 -0400
-@@ -0,0 +1,266 @@
+diff -urNp linux-2.6.36/grsecurity/grsec_init.c linux-2.6.36/grsecurity/grsec_init.c
+--- linux-2.6.36/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/grsec_init.c 2010-11-06 18:58:50.000000000 -0400
+@@ -0,0 +1,270 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/mm.h>
+int grsec_socket_server_gid;
+int grsec_resource_logging;
+int grsec_disable_privio;
++int grsec_enable_log_rwxmaps;
+int grsec_lock;
+
+DEFINE_SPINLOCK(grsec_alert_lock);
+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
+ grsec_enable_audit_textrel = 1;
+#endif
++#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
++ grsec_enable_log_rwxmaps = 1;
++#endif
+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
+ grsec_enable_group = 1;
+ grsec_audit_gid = CONFIG_GRKERNSEC_AUDIT_GID;
+
+ return;
+}
-diff -urNp linux-2.6.35.4/grsecurity/grsec_link.c linux-2.6.35.4/grsecurity/grsec_link.c
---- linux-2.6.35.4/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/grsec_link.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/grsec_link.c linux-2.6.36/grsecurity/grsec_link.c
+--- linux-2.6.36/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/grsec_link.c 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,43 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.35.4/grsecurity/grsec_log.c linux-2.6.35.4/grsecurity/grsec_log.c
---- linux-2.6.35.4/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/grsec_log.c 2010-09-17 20:12:37.000000000 -0400
-@@ -0,0 +1,306 @@
+diff -urNp linux-2.6.36/grsecurity/grsec_log.c linux-2.6.36/grsecurity/grsec_log.c
+--- linux-2.6.36/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/grsec_log.c 2010-11-06 18:58:50.000000000 -0400
+@@ -0,0 +1,310 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/file.h>
+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
+ unsigned int len = strlen(buf);
+
-+ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->parent)));
++ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
+ printk("%s\n", buf);
+
+ return;
+ switch (argtypes) {
+ case GR_TTYSNIFF:
+ task = va_arg(ap, struct task_struct *);
-+ gr_log_middle_varargs(audit, msg, &task->signal->curr_ip, gr_task_fullpath0(task), task->comm, task->pid, gr_parent_task_fullpath0(task), task->parent->comm, task->parent->pid);
++ gr_log_middle_varargs(audit, msg, &task->signal->curr_ip, gr_task_fullpath0(task), task->comm, task->pid, gr_parent_task_fullpath0(task), task->real_parent->comm, task->real_parent->pid);
+ break;
+ case GR_SYSCTL_HIDDEN:
+ str1 = va_arg(ap, char *);
+ case GR_RESOURCE:
+ task = va_arg(ap, struct task_struct *);
+ cred = __task_cred(task);
-+ pcred = __task_cred(task->parent);
++ pcred = __task_cred(task->real_parent);
+ ulong1 = va_arg(ap, unsigned long);
+ str1 = va_arg(ap, char *);
+ ulong2 = va_arg(ap, unsigned long);
-+ gr_log_middle_varargs(audit, msg, ulong1, str1, ulong2, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->parent->comm, task->parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
++ gr_log_middle_varargs(audit, msg, ulong1, str1, ulong2, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
+ break;
+ case GR_CAP:
+ task = va_arg(ap, struct task_struct *);
+ cred = __task_cred(task);
-+ pcred = __task_cred(task->parent);
++ pcred = __task_cred(task->real_parent);
+ str1 = va_arg(ap, char *);
-+ gr_log_middle_varargs(audit, msg, str1, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->parent->comm, task->parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
++ gr_log_middle_varargs(audit, msg, str1, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
+ break;
+ case GR_SIG:
+ str1 = va_arg(ap, char *);
+ case GR_SIG2:
+ task = va_arg(ap, struct task_struct *);
+ cred = __task_cred(task);
-+ pcred = __task_cred(task->parent);
++ pcred = __task_cred(task->real_parent);
+ num1 = va_arg(ap, int);
-+ gr_log_middle_varargs(audit, msg, num1, gr_task_fullpath0(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath0(task), task->parent->comm, task->parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
++ gr_log_middle_varargs(audit, msg, num1, gr_task_fullpath0(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath0(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
+ break;
+ case GR_CRASH1:
+ task = va_arg(ap, struct task_struct *);
+ cred = __task_cred(task);
-+ pcred = __task_cred(task->parent);
++ pcred = __task_cred(task->real_parent);
+ ulong1 = va_arg(ap, unsigned long);
-+ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->parent->comm, task->parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid, cred->uid, ulong1);
++ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid, cred->uid, ulong1);
+ break;
+ case GR_CRASH2:
+ task = va_arg(ap, struct task_struct *);
+ cred = __task_cred(task);
-+ pcred = __task_cred(task->parent);
++ pcred = __task_cred(task->real_parent);
+ ulong1 = va_arg(ap, unsigned long);
-+ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->parent->comm, task->parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid, ulong1);
++ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid, ulong1);
++ break;
++ case GR_RWXMAP:
++ file = va_arg(ap, struct file *);
++ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
+ break;
+ case GR_PSACCT:
+ {
+ csec = va_arg(ap, int);
+ ulong1 = va_arg(ap, unsigned long);
+ cred = __task_cred(task);
-+ pcred = __task_cred(task->parent);
++ pcred = __task_cred(task->real_parent);
+
-+ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, &task->signal->curr_ip, tty_name(task->signal->tty, cur_tty), cred->uid, cred->euid, cred->gid, cred->egid, wday, whr, wmin, wsec, cday, chr, cmin, csec, (task->flags & PF_SIGNALED) ? "killed by signal" : "exited", ulong1, gr_parent_task_fullpath(task), task->parent->comm, task->parent->pid, &task->parent->signal->curr_ip, tty_name(task->parent->signal->tty, parent_tty), pcred->uid, pcred->euid, pcred->gid, pcred->egid);
++ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, &task->signal->curr_ip, tty_name(task->signal->tty, cur_tty), cred->uid, cred->euid, cred->gid, cred->egid, wday, whr, wmin, wsec, cday, chr, cmin, csec, (task->flags & PF_SIGNALED) ? "killed by signal" : "exited", ulong1, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, &task->real_parent->signal->curr_ip, tty_name(task->real_parent->signal->tty, parent_tty), pcred->uid, pcred->euid, pcred->gid, pcred->egid);
+ }
+ break;
+ default:
+ gr_log_end(audit);
+ END_LOCKS(audit);
+}
-diff -urNp linux-2.6.35.4/grsecurity/grsec_mem.c linux-2.6.35.4/grsecurity/grsec_mem.c
---- linux-2.6.35.4/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/grsec_mem.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/grsec_mem.c linux-2.6.36/grsecurity/grsec_mem.c
+--- linux-2.6.36/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/grsec_mem.c 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,85 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
+ return;
+}
-diff -urNp linux-2.6.35.4/grsecurity/grsec_mount.c linux-2.6.35.4/grsecurity/grsec_mount.c
---- linux-2.6.35.4/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/grsec_mount.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/grsec_mount.c linux-2.6.36/grsecurity/grsec_mount.c
+--- linux-2.6.36/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/grsec_mount.c 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,62 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.35.4/grsecurity/grsec_ptrace.c linux-2.6.35.4/grsecurity/grsec_ptrace.c
---- linux-2.6.35.4/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/grsec_ptrace.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/grsec_pax.c linux-2.6.36/grsecurity/grsec_pax.c
+--- linux-2.6.36/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/grsec_pax.c 2010-11-06 18:58:50.000000000 -0400
+@@ -0,0 +1,36 @@
++#include <linux/kernel.h>
++#include <linux/sched.h>
++#include <linux/mm.h>
++#include <linux/file.h>
++#include <linux/grinternal.h>
++#include <linux/grsecurity.h>
++
++void
++gr_log_textrel(struct vm_area_struct * vma)
++{
++#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
++ if (grsec_enable_audit_textrel)
++ gr_log_textrel_ulong_ulong(GR_DO_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
++#endif
++ return;
++}
++
++void
++gr_log_rwxmmap(struct file *file)
++{
++#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
++ if (grsec_enable_log_rwxmaps)
++ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
++#endif
++ return;
++}
++
++void
++gr_log_rwxmprotect(struct file *file)
++{
++#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
++ if (grsec_enable_log_rwxmaps)
++ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, file);
++#endif
++ return;
++}
+diff -urNp linux-2.6.36/grsecurity/grsec_ptrace.c linux-2.6.36/grsecurity/grsec_ptrace.c
+--- linux-2.6.36/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/grsec_ptrace.c 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,14 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return;
+}
-diff -urNp linux-2.6.35.4/grsecurity/grsec_sig.c linux-2.6.35.4/grsecurity/grsec_sig.c
---- linux-2.6.35.4/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/grsec_sig.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/grsec_sig.c linux-2.6.36/grsecurity/grsec_sig.c
+--- linux-2.6.36/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/grsec_sig.c 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,65 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#ifdef CONFIG_GRKERNSEC_BRUTE
+ read_lock(&tasklist_lock);
+ read_lock(&grsec_exec_file_lock);
-+ if (p->parent && p->parent->exec_file == p->exec_file)
-+ p->parent->brute = 1;
++ if (p->real_parent && p->real_parent->exec_file == p->exec_file)
++ p->real_parent->brute = 1;
+ read_unlock(&grsec_exec_file_lock);
+ read_unlock(&tasklist_lock);
+#endif
+ return;
+}
+
-diff -urNp linux-2.6.35.4/grsecurity/grsec_sock.c linux-2.6.35.4/grsecurity/grsec_sock.c
---- linux-2.6.35.4/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/grsec_sock.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/grsec_sock.c linux-2.6.36/grsecurity/grsec_sock.c
+--- linux-2.6.36/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/grsec_sock.c 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,271 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+ return current_cap();
+#endif
+}
-diff -urNp linux-2.6.35.4/grsecurity/grsec_sysctl.c linux-2.6.35.4/grsecurity/grsec_sysctl.c
---- linux-2.6.35.4/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/grsec_sysctl.c 2010-09-17 20:18:57.000000000 -0400
-@@ -0,0 +1,424 @@
+diff -urNp linux-2.6.36/grsecurity/grsec_sysctl.c linux-2.6.36/grsecurity/grsec_sysctl.c
+--- linux-2.6.36/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/grsec_sysctl.c 2010-11-06 18:58:50.000000000 -0400
+@@ -0,0 +1,433 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/sysctl.h>
+ .proc_handler = &proc_dointvec,
+ },
+#endif
++#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
++ {
++ .procname = "rwxmap_logging",
++ .data = &grsec_enable_log_rwxmaps,
++ .maxlen = sizeof(int),
++ .mode = 0600,
++ .proc_handler = &proc_dointvec,
++ },
++#endif
+#ifdef CONFIG_GRKERNSEC_SIGNAL
+ {
+ .procname = "signal_logging",
+ { }
+};
+#endif
-diff -urNp linux-2.6.35.4/grsecurity/grsec_textrel.c linux-2.6.35.4/grsecurity/grsec_textrel.c
---- linux-2.6.35.4/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/grsec_textrel.c 2010-09-17 20:12:37.000000000 -0400
-@@ -0,0 +1,16 @@
-+#include <linux/kernel.h>
-+#include <linux/sched.h>
-+#include <linux/mm.h>
-+#include <linux/file.h>
-+#include <linux/grinternal.h>
-+#include <linux/grsecurity.h>
-+
-+void
-+gr_log_textrel(struct vm_area_struct * vma)
-+{
-+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
-+ if (grsec_enable_audit_textrel)
-+ gr_log_textrel_ulong_ulong(GR_DO_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
-+#endif
-+ return;
-+}
-diff -urNp linux-2.6.35.4/grsecurity/grsec_time.c linux-2.6.35.4/grsecurity/grsec_time.c
---- linux-2.6.35.4/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/grsec_time.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/grsec_time.c linux-2.6.36/grsecurity/grsec_time.c
+--- linux-2.6.36/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/grsec_time.c 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,13 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return;
+}
-diff -urNp linux-2.6.35.4/grsecurity/grsec_tpe.c linux-2.6.35.4/grsecurity/grsec_tpe.c
---- linux-2.6.35.4/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/grsec_tpe.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/grsec_tpe.c linux-2.6.36/grsecurity/grsec_tpe.c
+--- linux-2.6.36/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/grsec_tpe.c 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,39 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return 1;
+}
-diff -urNp linux-2.6.35.4/grsecurity/grsum.c linux-2.6.35.4/grsecurity/grsum.c
---- linux-2.6.35.4/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/grsum.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/grsum.c linux-2.6.36/grsecurity/grsum.c
+--- linux-2.6.36/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/grsum.c 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,61 @@
+#include <linux/err.h>
+#include <linux/kernel.h>
+
+ return retval;
+}
-diff -urNp linux-2.6.35.4/grsecurity/Kconfig linux-2.6.35.4/grsecurity/Kconfig
---- linux-2.6.35.4/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/Kconfig 2010-09-17 20:12:37.000000000 -0400
-@@ -0,0 +1,986 @@
+diff -urNp linux-2.6.36/grsecurity/Kconfig linux-2.6.36/grsecurity/Kconfig
+--- linux-2.6.36/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/Kconfig 2010-11-06 18:58:50.000000000 -0400
+@@ -0,0 +1,995 @@
+#
+# grecurity configuration
+#
+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
+ the RBAC system), and thus does not create privacy concerns.
+
++config GRKERNSEC_RWXMAP_LOG
++ bool 'Denied RWX mmap/mprotect logging'
++ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
++ help
++ If you say Y here, calls to mmap() and mprotect() with explicit
++ usage of PROT_WRITE and PROT_EXEC together will be logged when
++ denied by the PAX_MPROTECT feature. If the sysctl option is
++ enabled, a sysctl option with name "rwxmap_logging" is created.
++
+config GRKERNSEC_AUDIT_TEXTREL
+ bool 'ELF text relocations logging (READ HELP)'
+ depends on PAX_MPROTECT
+endmenu
+
+endmenu
-diff -urNp linux-2.6.35.4/grsecurity/Makefile linux-2.6.35.4/grsecurity/Makefile
---- linux-2.6.35.4/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/grsecurity/Makefile 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/grsecurity/Makefile linux-2.6.36/grsecurity/Makefile
+--- linux-2.6.36/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/grsecurity/Makefile 2010-11-06 18:58:50.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
+
+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
+ grsec_mount.o grsec_sig.o grsec_sock.o grsec_sysctl.o \
-+ grsec_time.o grsec_tpe.o grsec_link.o grsec_textrel.o grsec_ptrace.o
++ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o
+
+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_ip.o gracl_segv.o \
+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
+ @-chmod -f 700 .
+ @echo ' grsec: protected kernel image paths'
+endif
-diff -urNp linux-2.6.35.4/include/acpi/acoutput.h linux-2.6.35.4/include/acpi/acoutput.h
---- linux-2.6.35.4/include/acpi/acoutput.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/acpi/acoutput.h 2010-09-17 20:12:09.000000000 -0400
-@@ -268,8 +268,8 @@
+diff -urNp linux-2.6.36/include/acpi/acoutput.h linux-2.6.36/include/acpi/acoutput.h
+--- linux-2.6.36/include/acpi/acoutput.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/acpi/acoutput.h 2010-11-06 18:58:15.000000000 -0400
+@@ -269,8 +269,8 @@
* leaving no executable debug code!
*/
#define ACPI_FUNCTION_NAME(a)
#endif /* ACPI_DEBUG_OUTPUT */
-diff -urNp linux-2.6.35.4/include/acpi/acpi_drivers.h linux-2.6.35.4/include/acpi/acpi_drivers.h
---- linux-2.6.35.4/include/acpi/acpi_drivers.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/acpi/acpi_drivers.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/acpi/acpi_drivers.h linux-2.6.36/include/acpi/acpi_drivers.h
+--- linux-2.6.36/include/acpi/acpi_drivers.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/acpi/acpi_drivers.h 2010-11-06 18:58:15.000000000 -0400
@@ -121,8 +121,8 @@ int acpi_processor_set_thermal_limit(acp
Dock Station
-------------------------------------------------------------------------- */
void *context)
{
return -ENODEV;
-diff -urNp linux-2.6.35.4/include/asm-generic/atomic-long.h linux-2.6.35.4/include/asm-generic/atomic-long.h
---- linux-2.6.35.4/include/asm-generic/atomic-long.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/asm-generic/atomic-long.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/asm-generic/atomic-long.h linux-2.6.36/include/asm-generic/atomic-long.h
+--- linux-2.6.36/include/asm-generic/atomic-long.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/asm-generic/atomic-long.h 2010-11-06 18:58:15.000000000 -0400
@@ -22,6 +22,12 @@
typedef atomic64_t atomic_long_t;
static inline void atomic_long_sub(long i, atomic_long_t *l)
{
atomic64_t *v = (atomic64_t *)l;
-@@ -115,6 +166,15 @@ static inline long atomic_long_inc_retur
+@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long
+ atomic64_sub(i, v);
+ }
+
++#ifdef CONFIG_PAX_REFCOUNT
++static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
++{
++ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
++
++ atomic64_sub_unchecked(i, v);
++}
++#endif
++
+ static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
+ {
+ atomic64_t *v = (atomic64_t *)l;
+@@ -115,6 +175,15 @@ static inline long atomic_long_inc_retur
return (long)atomic64_inc_return(v);
}
static inline long atomic_long_dec_return(atomic_long_t *l)
{
atomic64_t *v = (atomic64_t *)l;
-@@ -140,6 +200,12 @@ static inline long atomic_long_add_unles
+@@ -140,6 +209,12 @@ static inline long atomic_long_add_unles
typedef atomic_t atomic_long_t;
#define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
static inline long atomic_long_read(atomic_long_t *l)
{
-@@ -148,6 +214,15 @@ static inline long atomic_long_read(atom
+@@ -148,6 +223,15 @@ static inline long atomic_long_read(atom
return (long)atomic_read(v);
}
static inline void atomic_long_set(atomic_long_t *l, long i)
{
atomic_t *v = (atomic_t *)l;
-@@ -155,6 +230,15 @@ static inline void atomic_long_set(atomi
+@@ -155,6 +239,15 @@ static inline void atomic_long_set(atomi
atomic_set(v, i);
}
static inline void atomic_long_inc(atomic_long_t *l)
{
atomic_t *v = (atomic_t *)l;
-@@ -162,6 +246,15 @@ static inline void atomic_long_inc(atomi
+@@ -162,6 +255,15 @@ static inline void atomic_long_inc(atomi
atomic_inc(v);
}
static inline void atomic_long_dec(atomic_long_t *l)
{
atomic_t *v = (atomic_t *)l;
-@@ -169,6 +262,15 @@ static inline void atomic_long_dec(atomi
+@@ -169,6 +271,15 @@ static inline void atomic_long_dec(atomi
atomic_dec(v);
}
static inline void atomic_long_add(long i, atomic_long_t *l)
{
atomic_t *v = (atomic_t *)l;
-@@ -176,6 +278,15 @@ static inline void atomic_long_add(long
+@@ -176,6 +287,15 @@ static inline void atomic_long_add(long
atomic_add(i, v);
}
static inline void atomic_long_sub(long i, atomic_long_t *l)
{
atomic_t *v = (atomic_t *)l;
-@@ -232,6 +343,15 @@ static inline long atomic_long_inc_retur
+@@ -183,6 +303,15 @@ static inline void atomic_long_sub(long
+ atomic_sub(i, v);
+ }
+
++#ifdef CONFIG_PAX_REFCOUNT
++static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
++{
++ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
++
++ atomic_sub_unchecked(i, v);
++}
++#endif
++
+ static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
+ {
+ atomic_t *v = (atomic_t *)l;
+@@ -232,6 +361,15 @@ static inline long atomic_long_inc_retur
return (long)atomic_inc_return(v);
}
static inline long atomic_long_dec_return(atomic_long_t *l)
{
atomic_t *v = (atomic_t *)l;
-@@ -255,4 +375,37 @@ static inline long atomic_long_add_unles
+@@ -255,4 +393,41 @@ static inline long atomic_long_add_unles
#endif /* BITS_PER_LONG == 64 */
+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
++ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
+
+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
++ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
+#define atomic_inc_unchecked(v) atomic_inc(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_long_read_unchecked(v) atomic_long_read(v)
+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
++#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
+#endif
+
#endif /* _ASM_GENERIC_ATOMIC_LONG_H */
-diff -urNp linux-2.6.35.4/include/asm-generic/dma-mapping-common.h linux-2.6.35.4/include/asm-generic/dma-mapping-common.h
---- linux-2.6.35.4/include/asm-generic/dma-mapping-common.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/asm-generic/dma-mapping-common.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/asm-generic/dma-mapping-common.h linux-2.6.36/include/asm-generic/dma-mapping-common.h
+--- linux-2.6.36/include/asm-generic/dma-mapping-common.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/asm-generic/dma-mapping-common.h 2010-11-06 18:58:15.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.35.4/include/asm-generic/futex.h linux-2.6.35.4/include/asm-generic/futex.h
---- linux-2.6.35.4/include/asm-generic/futex.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/asm-generic/futex.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/asm-generic/futex.h linux-2.6.36/include/asm-generic/futex.h
+--- linux-2.6.36/include/asm-generic/futex.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/asm-generic/futex.h 2010-11-06 18:58:15.000000000 -0400
@@ -6,7 +6,7 @@
#include <asm/errno.h>
{
return -ENOSYS;
}
-diff -urNp linux-2.6.35.4/include/asm-generic/int-l64.h linux-2.6.35.4/include/asm-generic/int-l64.h
---- linux-2.6.35.4/include/asm-generic/int-l64.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/asm-generic/int-l64.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/asm-generic/int-l64.h linux-2.6.36/include/asm-generic/int-l64.h
+--- linux-2.6.36/include/asm-generic/int-l64.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/asm-generic/int-l64.h 2010-11-06 18:58:15.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.35.4/include/asm-generic/int-ll64.h linux-2.6.35.4/include/asm-generic/int-ll64.h
---- linux-2.6.35.4/include/asm-generic/int-ll64.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/asm-generic/int-ll64.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/asm-generic/int-ll64.h linux-2.6.36/include/asm-generic/int-ll64.h
+--- linux-2.6.36/include/asm-generic/int-ll64.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/asm-generic/int-ll64.h 2010-11-06 18:58:15.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.35.4/include/asm-generic/kmap_types.h linux-2.6.35.4/include/asm-generic/kmap_types.h
---- linux-2.6.35.4/include/asm-generic/kmap_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/asm-generic/kmap_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/asm-generic/kmap_types.h linux-2.6.36/include/asm-generic/kmap_types.h
+--- linux-2.6.36/include/asm-generic/kmap_types.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/asm-generic/kmap_types.h 2010-11-06 18:58:15.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.35.4/include/asm-generic/pgtable.h linux-2.6.35.4/include/asm-generic/pgtable.h
---- linux-2.6.35.4/include/asm-generic/pgtable.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/asm-generic/pgtable.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/asm-generic/pgtable.h linux-2.6.36/include/asm-generic/pgtable.h
+--- linux-2.6.36/include/asm-generic/pgtable.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/asm-generic/pgtable.h 2010-11-06 18:58:15.000000000 -0400
@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
unsigned long size);
#endif
#endif /* !__ASSEMBLY__ */
#endif /* _ASM_GENERIC_PGTABLE_H */
-diff -urNp linux-2.6.35.4/include/asm-generic/pgtable-nopmd.h linux-2.6.35.4/include/asm-generic/pgtable-nopmd.h
---- linux-2.6.35.4/include/asm-generic/pgtable-nopmd.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/asm-generic/pgtable-nopmd.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/asm-generic/pgtable-nopmd.h linux-2.6.36/include/asm-generic/pgtable-nopmd.h
+--- linux-2.6.36/include/asm-generic/pgtable-nopmd.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/asm-generic/pgtable-nopmd.h 2010-11-06 18:58:15.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.35.4/include/asm-generic/pgtable-nopud.h linux-2.6.35.4/include/asm-generic/pgtable-nopud.h
---- linux-2.6.35.4/include/asm-generic/pgtable-nopud.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/asm-generic/pgtable-nopud.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/asm-generic/pgtable-nopud.h linux-2.6.36/include/asm-generic/pgtable-nopud.h
+--- linux-2.6.36/include/asm-generic/pgtable-nopud.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/asm-generic/pgtable-nopud.h 2010-11-06 18:58:15.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.35.4/include/asm-generic/vmlinux.lds.h linux-2.6.35.4/include/asm-generic/vmlinux.lds.h
---- linux-2.6.35.4/include/asm-generic/vmlinux.lds.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/asm-generic/vmlinux.lds.h 2010-09-17 20:12:09.000000000 -0400
-@@ -213,6 +213,7 @@
+diff -urNp linux-2.6.36/include/asm-generic/vmlinux.lds.h linux-2.6.36/include/asm-generic/vmlinux.lds.h
+--- linux-2.6.36/include/asm-generic/vmlinux.lds.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/asm-generic/vmlinux.lds.h 2010-11-06 18:58:15.000000000 -0400
+@@ -209,6 +209,7 @@
.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start_rodata) = .; \
*(.rodata) *(.rodata.*) \
*(__vermagic) /* Kernel version magic */ \
*(__markers_strings) /* Markers: strings */ \
*(__tracepoints_strings)/* Tracepoints: strings */ \
-@@ -670,22 +671,24 @@
+@@ -667,22 +668,24 @@
* section in the linker script will go there too. @phdr should have
* a leading colon.
*
/**
* PERCPU - define output section for percpu area, simple version
-diff -urNp linux-2.6.35.4/include/drm/drm_pciids.h linux-2.6.35.4/include/drm/drm_pciids.h
---- linux-2.6.35.4/include/drm/drm_pciids.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/drm/drm_pciids.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/drm/drm_pciids.h linux-2.6.36/include/drm/drm_pciids.h
+--- linux-2.6.36/include/drm/drm_pciids.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/drm/drm_pciids.h 2010-11-06 18:58:15.000000000 -0400
@@ -419,7 +419,7 @@
{0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
{0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
{0x8086, 0x0102, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
- {0, 0, 0}
+ {0, 0, 0, 0, 0, 0}
-diff -urNp linux-2.6.35.4/include/drm/drmP.h linux-2.6.35.4/include/drm/drmP.h
---- linux-2.6.35.4/include/drm/drmP.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/drm/drmP.h 2010-09-17 20:12:09.000000000 -0400
-@@ -808,7 +808,7 @@ struct drm_driver {
+diff -urNp linux-2.6.36/include/drm/drmP.h linux-2.6.36/include/drm/drmP.h
+--- linux-2.6.36/include/drm/drmP.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/drm/drmP.h 2010-11-06 18:58:15.000000000 -0400
+@@ -813,7 +813,7 @@ struct drm_driver {
void (*vgaarb_irq)(struct drm_device *dev, bool state);
/* Driver private ops for this object */
int major;
int minor;
-@@ -917,7 +917,7 @@ struct drm_device {
+@@ -923,7 +923,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 */
-@@ -928,7 +928,7 @@ struct drm_device {
+@@ -934,7 +934,7 @@ struct drm_device {
/*@{ */
unsigned long counters;
enum drm_stat_type types[15];
/*@} */
struct list_head filelist;
-diff -urNp linux-2.6.35.4/include/linux/a.out.h linux-2.6.35.4/include/linux/a.out.h
---- linux-2.6.35.4/include/linux/a.out.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/a.out.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/a.out.h linux-2.6.36/include/linux/a.out.h
+--- linux-2.6.36/include/linux/a.out.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/a.out.h 2010-11-06 18:58:15.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.35.4/include/linux/atmdev.h linux-2.6.35.4/include/linux/atmdev.h
---- linux-2.6.35.4/include/linux/atmdev.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/atmdev.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/atmdev.h linux-2.6.36/include/linux/atmdev.h
+--- linux-2.6.36/include/linux/atmdev.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/atmdev.h 2010-11-06 18:58:15.000000000 -0400
@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
#endif
__AAL_STAT_ITEMS
#undef __HANDLE_ITEM
};
-diff -urNp linux-2.6.35.4/include/linux/binfmts.h linux-2.6.35.4/include/linux/binfmts.h
---- linux-2.6.35.4/include/linux/binfmts.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/binfmts.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/binfmts.h linux-2.6.36/include/linux/binfmts.h
+--- linux-2.6.36/include/linux/binfmts.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/binfmts.h 2010-11-06 18:58:15.000000000 -0400
@@ -87,6 +87,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 */
int hasvdso;
};
-diff -urNp linux-2.6.35.4/include/linux/blkdev.h linux-2.6.35.4/include/linux/blkdev.h
---- linux-2.6.35.4/include/linux/blkdev.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/blkdev.h 2010-09-17 20:12:09.000000000 -0400
-@@ -1331,20 +1331,20 @@ static inline int blk_integrity_rq(struc
+diff -urNp linux-2.6.36/include/linux/blkdev.h linux-2.6.36/include/linux/blkdev.h
+--- linux-2.6.36/include/linux/blkdev.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/blkdev.h 2010-11-06 18:58:15.000000000 -0400
+@@ -1249,19 +1249,19 @@ static inline int blk_integrity_rq(struc
#endif /* CONFIG_BLK_DEV_INTEGRITY */
struct block_device_operations {
- int (*open) (struct block_device *, fmode_t);
- int (*release) (struct gendisk *, fmode_t);
-- int (*locked_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
- int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
- int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
- int (*direct_access) (struct block_device *, sector_t,
+ int (* const open) (struct block_device *, fmode_t);
+ int (* const release) (struct gendisk *, fmode_t);
-+ int (* const locked_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
+ int (* const ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
+ int (* const compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
+ int (* const direct_access) (struct block_device *, sector_t,
+ int (* const media_changed) (struct gendisk *);
+ void (* const unlock_native_capacity) (struct gendisk *);
+ int (* const revalidate_disk) (struct gendisk *);
-+ int (*const getgeo)(struct block_device *, struct hd_geometry *);
++ int (* const getgeo)(struct block_device *, struct hd_geometry *);
/* this callback is with swap_lock and sometimes page table lock held */
- void (*swap_slot_free_notify) (struct block_device *, unsigned long);
- struct module *owner;
};
extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
-diff -urNp linux-2.6.35.4/include/linux/cache.h linux-2.6.35.4/include/linux/cache.h
---- linux-2.6.35.4/include/linux/cache.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/cache.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/cache.h linux-2.6.36/include/linux/cache.h
+--- linux-2.6.36/include/linux/cache.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/cache.h 2010-11-06 18:58:15.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.35.4/include/linux/capability.h linux-2.6.35.4/include/linux/capability.h
---- linux-2.6.35.4/include/linux/capability.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/capability.h 2010-09-17 20:12:37.000000000 -0400
-@@ -561,6 +561,7 @@ extern const kernel_cap_t __cap_init_eff
+diff -urNp linux-2.6.36/include/linux/capability.h linux-2.6.36/include/linux/capability.h
+--- linux-2.6.36/include/linux/capability.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/capability.h 2010-11-06 18:58:50.000000000 -0400
+@@ -558,6 +558,7 @@ extern const kernel_cap_t __cap_init_eff
(security_real_capable_noaudit((t), (cap)) == 0)
extern int capable(int cap);
/* audit system wants to get cap info from files as well */
struct dentry;
-diff -urNp linux-2.6.35.4/include/linux/compat.h linux-2.6.35.4/include/linux/compat.h
---- linux-2.6.35.4/include/linux/compat.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/compat.h 2010-09-17 20:12:37.000000000 -0400
-@@ -360,5 +360,8 @@ extern ssize_t compat_rw_copy_check_uvec
- const struct compat_iovec __user *uvector, unsigned long nr_segs,
- unsigned long fast_segs, struct iovec *fast_pointer,
- struct iovec **ret_pointer);
-+
-+extern void __user *compat_alloc_user_space(unsigned long len);
-+
- #endif /* CONFIG_COMPAT */
- #endif /* _LINUX_COMPAT_H */
-diff -urNp linux-2.6.35.4/include/linux/compiler-gcc4.h linux-2.6.35.4/include/linux/compiler-gcc4.h
---- linux-2.6.35.4/include/linux/compiler-gcc4.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/compiler-gcc4.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/compiler-gcc4.h linux-2.6.36/include/linux/compiler-gcc4.h
+--- linux-2.6.36/include/linux/compiler-gcc4.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/compiler-gcc4.h 2010-11-06 18:58:15.000000000 -0400
@@ -54,6 +54,10 @@
#endif
#endif
#if __GNUC_MINOR__ > 0
-diff -urNp linux-2.6.35.4/include/linux/compiler.h linux-2.6.35.4/include/linux/compiler.h
---- linux-2.6.35.4/include/linux/compiler.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/compiler.h 2010-09-17 20:12:09.000000000 -0400
-@@ -267,6 +267,22 @@ void ftrace_likely_update(struct ftrace_
+diff -urNp linux-2.6.36/include/linux/compiler.h linux-2.6.36/include/linux/compiler.h
+--- linux-2.6.36/include/linux/compiler.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/compiler.h 2010-11-06 18:58:15.000000000 -0400
+@@ -269,6 +269,22 @@ void ftrace_likely_update(struct ftrace_
#define __cold
#endif
/* Simple shorthand for a section definition */
#ifndef __section
# define __section(S) __attribute__ ((__section__(#S)))
-diff -urNp linux-2.6.35.4/include/linux/decompress/mm.h linux-2.6.35.4/include/linux/decompress/mm.h
---- linux-2.6.35.4/include/linux/decompress/mm.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/decompress/mm.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/decompress/mm.h linux-2.6.36/include/linux/decompress/mm.h
+--- linux-2.6.36/include/linux/decompress/mm.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/decompress/mm.h 2010-11-06 18:58:15.000000000 -0400
@@ -78,7 +78,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.35.4/include/linux/dma-mapping.h linux-2.6.35.4/include/linux/dma-mapping.h
---- linux-2.6.35.4/include/linux/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/dma-mapping.h linux-2.6.36/include/linux/dma-mapping.h
+--- linux-2.6.36/include/linux/dma-mapping.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/dma-mapping.h 2010-11-06 18:58:15.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.35.4/include/linux/elf.h linux-2.6.35.4/include/linux/elf.h
---- linux-2.6.35.4/include/linux/elf.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/elf.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/elf.h linux-2.6.36/include/linux/elf.h
+--- linux-2.6.36/include/linux/elf.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/elf.h 2010-11-06 18:58:15.000000000 -0400
@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
#define PT_GNU_EH_FRAME 0x6474e550
#endif
-diff -urNp linux-2.6.35.4/include/linux/fs.h linux-2.6.35.4/include/linux/fs.h
---- linux-2.6.35.4/include/linux/fs.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/fs.h 2010-09-17 20:12:37.000000000 -0400
-@@ -90,6 +90,11 @@ struct inodes_stat_t {
+diff -urNp linux-2.6.36/include/linux/fs.h linux-2.6.36/include/linux/fs.h
+--- linux-2.6.36/include/linux/fs.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/fs.h 2010-11-06 19:01:56.000000000 -0400
+@@ -92,6 +92,11 @@ struct inodes_stat_t {
/* Expect random access pattern */
#define FMODE_RANDOM ((__force fmode_t)0x1000)
+ */
+#define FMODE_GREXEC ((__force fmode_t)0x2000)
+
- /*
- * The below are the various read and write types that we support. Some of
- * them include behavioral modifiers that send information down to the
-@@ -571,41 +576,41 @@ typedef int (*read_actor_t)(read_descrip
+ /* File was opened by fanotify and shouldn't generate fanotify events */
+ #define FMODE_NONOTIFY ((__force fmode_t)0x1000000)
+
+@@ -569,41 +574,41 @@ typedef int (*read_actor_t)(read_descrip
unsigned long, unsigned long);
struct address_space_operations {
};
/*
-@@ -1035,19 +1040,19 @@ static inline int file_check_writeable(s
+@@ -1029,19 +1034,19 @@ static inline int file_check_writeable(s
typedef struct files_struct *fl_owner_t;
struct file_lock_operations {
};
struct lock_manager {
-@@ -1440,7 +1445,7 @@ struct fiemap_extent_info {
+@@ -1442,7 +1447,7 @@ struct fiemap_extent_info {
unsigned int fi_flags; /* Flags as passed from user */
unsigned int fi_extents_mapped; /* Number of mapped extents */
unsigned int fi_extents_max; /* Size of fiemap_extent array */
* array */
};
int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical,
-@@ -1557,30 +1562,30 @@ extern ssize_t vfs_writev(struct file *,
+@@ -1558,29 +1563,29 @@ extern ssize_t vfs_writev(struct file *,
unsigned long, loff_t *);
struct super_operations {
- void (*dirty_inode) (struct inode *);
- int (*write_inode) (struct inode *, struct writeback_control *wbc);
-- void (*drop_inode) (struct inode *);
-- void (*delete_inode) (struct inode *);
+- int (*drop_inode) (struct inode *);
+- void (*evict_inode) (struct inode *);
- void (*put_super) (struct super_block *);
- void (*write_super) (struct super_block *);
- int (*sync_fs)(struct super_block *sb, int wait);
- int (*unfreeze_fs) (struct super_block *);
- int (*statfs) (struct dentry *, struct kstatfs *);
- int (*remount_fs) (struct super_block *, int *, char *);
-- void (*clear_inode) (struct inode *);
- void (*umount_begin) (struct super_block *);
+ void (* const dirty_inode) (struct inode *);
+ int (* const write_inode) (struct inode *, struct writeback_control *wbc);
-+ void (* const drop_inode) (struct inode *);
-+ void (* const delete_inode) (struct inode *);
++ int (* const drop_inode) (struct inode *);
++ void (* const evict_inode) (struct inode *);
+ void (* const put_super) (struct super_block *);
+ void (* const write_super) (struct super_block *);
+ int (* const sync_fs)(struct super_block *sb, int wait);
+ int (* const unfreeze_fs) (struct super_block *);
+ int (* const statfs) (struct dentry *, struct kstatfs *);
+ int (* const remount_fs) (struct super_block *, int *, char *);
-+ void (* const clear_inode) (struct inode *);
+ void (* const umount_begin) (struct super_block *);
- int (*show_options)(struct seq_file *, struct vfsmount *);
};
/*
-diff -urNp linux-2.6.35.4/include/linux/fs_struct.h linux-2.6.35.4/include/linux/fs_struct.h
---- linux-2.6.35.4/include/linux/fs_struct.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/fs_struct.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/fs_struct.h linux-2.6.36/include/linux/fs_struct.h
+--- linux-2.6.36/include/linux/fs_struct.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/fs_struct.h 2010-11-06 18:58:15.000000000 -0400
@@ -4,7 +4,7 @@
#include <linux/path.h>
struct fs_struct {
- int users;
+ atomic_t users;
- rwlock_t lock;
+ spinlock_t lock;
int umask;
int in_exec;
-diff -urNp linux-2.6.35.4/include/linux/genhd.h linux-2.6.35.4/include/linux/genhd.h
---- linux-2.6.35.4/include/linux/genhd.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/genhd.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/genhd.h linux-2.6.36/include/linux/genhd.h
+--- linux-2.6.36/include/linux/genhd.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/genhd.h 2010-11-06 18:58:15.000000000 -0400
@@ -162,7 +162,7 @@ struct gendisk {
struct timer_rand_state *random;
struct work_struct async_notify;
#ifdef CONFIG_BLK_DEV_INTEGRITY
struct blk_integrity *integrity;
-diff -urNp linux-2.6.35.4/include/linux/gracl.h linux-2.6.35.4/include/linux/gracl.h
---- linux-2.6.35.4/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/include/linux/gracl.h 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/gracl.h linux-2.6.36/include/linux/gracl.h
+--- linux-2.6.36/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/include/linux/gracl.h 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,310 @@
+#ifndef GR_ACL_H
+#define GR_ACL_H
+
+#endif
+
-diff -urNp linux-2.6.35.4/include/linux/gralloc.h linux-2.6.35.4/include/linux/gralloc.h
---- linux-2.6.35.4/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/include/linux/gralloc.h 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/gralloc.h linux-2.6.36/include/linux/gralloc.h
+--- linux-2.6.36/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/include/linux/gralloc.h 2010-11-06 18:58:50.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.35.4/include/linux/grdefs.h linux-2.6.35.4/include/linux/grdefs.h
---- linux-2.6.35.4/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/include/linux/grdefs.h 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/grdefs.h linux-2.6.36/include/linux/grdefs.h
+--- linux-2.6.36/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/include/linux/grdefs.h 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,136 @@
+#ifndef GRDEFS_H
+#define GRDEFS_H
+};
+
+#endif
-diff -urNp linux-2.6.35.4/include/linux/grinternal.h linux-2.6.35.4/include/linux/grinternal.h
---- linux-2.6.35.4/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/include/linux/grinternal.h 2010-09-17 20:12:37.000000000 -0400
-@@ -0,0 +1,211 @@
+diff -urNp linux-2.6.36/include/linux/grinternal.h linux-2.6.36/include/linux/grinternal.h
+--- linux-2.6.36/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/include/linux/grinternal.h 2010-11-06 18:58:50.000000000 -0400
+@@ -0,0 +1,214 @@
+#ifndef __GRINTERNAL_H
+#define __GRINTERNAL_H
+
+extern int grsec_audit_gid;
+extern int grsec_enable_group;
+extern int grsec_enable_audit_textrel;
++extern int grsec_enable_log_rwxmaps;
+extern int grsec_enable_mount;
+extern int grsec_enable_chdir;
+extern int grsec_resource_logging;
+
+extern rwlock_t grsec_exec_file_lock;
+
-+#define gr_task_fullpath(tsk) (tsk->exec_file ? \
-+ gr_to_filename2(tsk->exec_file->f_path.dentry, \
-+ tsk->exec_file->f_vfsmnt) : "/")
++#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
++ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
++ (tsk)->exec_file->f_vfsmnt) : "/")
+
-+#define gr_parent_task_fullpath(tsk) (tsk->parent->exec_file ? \
-+ gr_to_filename3(tsk->parent->exec_file->f_path.dentry, \
-+ tsk->parent->exec_file->f_vfsmnt) : "/")
++#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
++ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
++ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
+
-+#define gr_task_fullpath0(tsk) (tsk->exec_file ? \
-+ gr_to_filename(tsk->exec_file->f_path.dentry, \
-+ tsk->exec_file->f_vfsmnt) : "/")
++#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
++ gr_to_filename((tsk)->exec_file->f_path.dentry, \
++ (tsk)->exec_file->f_vfsmnt) : "/")
+
-+#define gr_parent_task_fullpath0(tsk) (tsk->parent->exec_file ? \
-+ gr_to_filename1(tsk->parent->exec_file->f_path.dentry, \
-+ tsk->parent->exec_file->f_vfsmnt) : "/")
++#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
++ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
++ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
+
-+#define proc_is_chrooted(tsk_a) (tsk_a->gr_is_chrooted)
++#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
+
-+#define have_same_root(tsk_a,tsk_b) (tsk_a->gr_chroot_dentry == tsk_b->gr_chroot_dentry)
++#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
+
-+#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), task->comm, \
-+ task->pid, cred->uid, \
-+ cred->euid, cred->gid, cred->egid, \
++#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), (task)->comm, \
++ (task)->pid, (cred)->uid, \
++ (cred)->euid, (cred)->gid, (cred)->egid, \
+ gr_parent_task_fullpath(task), \
-+ task->parent->comm, task->parent->pid, \
-+ pcred->uid, pcred->euid, \
-+ pcred->gid, pcred->egid
++ (task)->real_parent->comm, (task)->real_parent->pid, \
++ (pcred)->uid, (pcred)->euid, \
++ (pcred)->gid, (pcred)->egid
+
+#define GR_CHROOT_CAPS {{ \
+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
+ GR_SIG2,
+ GR_CRASH1,
+ GR_CRASH2,
-+ GR_PSACCT
++ GR_PSACCT,
++ GR_RWXMAP
+};
+
+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
+#define gr_log_procacct(audit, msg, task, num1, num2, num3, num4, num5, num6, num7, num8, num9) gr_log_varargs(audit, msg, GR_PSACCT, task, num1, num2, num3, num4, num5, num6, num7, num8, num9)
++#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
+
+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
+
+#endif
+
+#endif
-diff -urNp linux-2.6.35.4/include/linux/grmsg.h linux-2.6.35.4/include/linux/grmsg.h
---- linux-2.6.35.4/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/include/linux/grmsg.h 2010-09-17 20:12:37.000000000 -0400
-@@ -0,0 +1,108 @@
+diff -urNp linux-2.6.36/include/linux/grmsg.h linux-2.6.36/include/linux/grmsg.h
+--- linux-2.6.36/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/include/linux/grmsg.h 2010-11-06 18:58:50.000000000 -0400
+@@ -0,0 +1,110 @@
+#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_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
-+#define GR_FAILFORK_MSG "failed fork with errno %d by "
++#define GR_FAILFORK_MSG "failed fork with errno %s by "
+#define GR_NICE_CHROOT_MSG "denied priority change by "
+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
++#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
++#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
+#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by "
+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
+#define GR_VM86_MSG "denied use of vm86 by "
+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
-diff -urNp linux-2.6.35.4/include/linux/grsecurity.h linux-2.6.35.4/include/linux/grsecurity.h
---- linux-2.6.35.4/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/include/linux/grsecurity.h 2010-09-17 20:12:37.000000000 -0400
-@@ -0,0 +1,203 @@
+diff -urNp linux-2.6.36/include/linux/grsecurity.h linux-2.6.36/include/linux/grsecurity.h
+--- linux-2.6.36/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/include/linux/grsecurity.h 2010-11-06 20:09:12.000000000 -0400
+@@ -0,0 +1,206 @@
+#ifndef GR_SECURITY_H
+#define GR_SECURITY_H
+#include <linux/fs.h>
+ const struct vfsmount *mnt,
+ const char *dev_name);
+int gr_handle_chroot_pivot(void);
-+int gr_handle_chroot_unix(const pid_t pid);
++int gr_handle_chroot_unix(struct pid *pid);
+
+int gr_handle_rawio(const struct inode *inode);
+int gr_handle_nproc(void);
+ const struct vfsmount *mnt);
+void gr_log_chroot_exec(const struct dentry *dentry,
+ const struct vfsmount *mnt);
-+void gr_handle_exec_args(struct linux_binprm *bprm, char **argv);
++void gr_handle_exec_args(struct linux_binprm *bprm, const char __user *const __user *argv);
+void gr_log_remount(const char *devname, const int retval);
+void gr_log_unmount(const char *devname, const int retval);
+void gr_log_mount(const char *from, const char *to, const int retval);
+void gr_log_textrel(struct vm_area_struct *vma);
++void gr_log_rwxmmap(struct file *file);
++void gr_log_rwxmprotect(struct file *file);
+
+int gr_handle_follow_link(const struct inode *parent,
+ const struct inode *inode,
+void gr_audit_ptrace(struct task_struct *task);
+
+#ifdef CONFIG_GRKERNSEC
++void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
+void gr_log_nonroot_mod_load(const char *modname);
+void gr_handle_vm86(void);
+void gr_handle_mem_write(void);
+#endif
+
+#endif
-diff -urNp linux-2.6.35.4/include/linux/grsock.h linux-2.6.35.4/include/linux/grsock.h
---- linux-2.6.35.4/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/include/linux/grsock.h 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/grsock.h linux-2.6.36/include/linux/grsock.h
+--- linux-2.6.36/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/include/linux/grsock.h 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1,19 @@
+#ifndef __GRSOCK_H
+#define __GRSOCK_H
+ const int protocol);
+
+#endif
-diff -urNp linux-2.6.35.4/include/linux/highmem.h linux-2.6.35.4/include/linux/highmem.h
---- linux-2.6.35.4/include/linux/highmem.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/highmem.h 2010-09-17 20:12:09.000000000 -0400
-@@ -143,6 +143,18 @@ static inline void clear_highpage(struct
+diff -urNp linux-2.6.36/include/linux/highmem.h linux-2.6.36/include/linux/highmem.h
+--- linux-2.6.36/include/linux/highmem.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/highmem.h 2010-11-06 18:58:15.000000000 -0400
+@@ -155,6 +155,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.35.4/include/linux/interrupt.h linux-2.6.35.4/include/linux/interrupt.h
---- linux-2.6.35.4/include/linux/interrupt.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/interrupt.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/init.h linux-2.6.36/include/linux/init.h
+--- linux-2.6.36/include/linux/init.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/init.h 2010-11-06 18:58:15.000000000 -0400
+@@ -286,13 +286,13 @@ void __init parse_early_options(char *cm
+
+ /* Each module must use one module_init(). */
+ #define module_init(initfn) \
+- static inline initcall_t __inittest(void) \
++ static inline __used initcall_t __inittest(void) \
+ { return initfn; } \
+ int init_module(void) __attribute__((alias(#initfn)));
+
+ /* This is only required if you want to be unloadable. */
+ #define module_exit(exitfn) \
+- static inline exitcall_t __exittest(void) \
++ static inline __used exitcall_t __exittest(void) \
+ { return exitfn; } \
+ void cleanup_module(void) __attribute__((alias(#exitfn)));
+
+diff -urNp linux-2.6.36/include/linux/interrupt.h linux-2.6.36/include/linux/interrupt.h
+--- linux-2.6.36/include/linux/interrupt.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/interrupt.h 2010-11-06 18:58:15.000000000 -0400
@@ -392,7 +392,7 @@ enum
/* map softirq index to softirq name. update 'softirq_to_name' in
* kernel/softirq.c when adding a new softirq.
extern void softirq_init(void);
#define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
extern void raise_softirq_irqoff(unsigned int nr);
-diff -urNp linux-2.6.35.4/include/linux/jbd2.h linux-2.6.35.4/include/linux/jbd2.h
---- linux-2.6.35.4/include/linux/jbd2.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/jbd2.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/jbd2.h linux-2.6.36/include/linux/jbd2.h
+--- linux-2.6.36/include/linux/jbd2.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/jbd2.h 2010-11-06 18:58:15.000000000 -0400
@@ -67,7 +67,7 @@ extern u8 jbd2_journal_enable_debug;
} \
} while (0)
#endif
extern void *jbd2_alloc(size_t size, gfp_t flags);
-diff -urNp linux-2.6.35.4/include/linux/jbd.h linux-2.6.35.4/include/linux/jbd.h
---- linux-2.6.35.4/include/linux/jbd.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/jbd.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/jbd.h linux-2.6.36/include/linux/jbd.h
+--- linux-2.6.36/include/linux/jbd.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/jbd.h 2010-11-06 18:58:15.000000000 -0400
@@ -67,7 +67,7 @@ extern u8 journal_enable_debug;
} \
} while (0)
#endif
static inline void *jbd_alloc(size_t size, gfp_t flags)
-diff -urNp linux-2.6.35.4/include/linux/kallsyms.h linux-2.6.35.4/include/linux/kallsyms.h
---- linux-2.6.35.4/include/linux/kallsyms.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/kallsyms.h 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/kallsyms.h linux-2.6.36/include/linux/kallsyms.h
+--- linux-2.6.36/include/linux/kallsyms.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/kallsyms.h 2010-11-06 18:58:50.000000000 -0400
@@ -15,7 +15,8 @@
struct module;
/* This macro allows us to keep printk typechecking */
static void __check_printsym_format(const char *fmt, ...)
-diff -urNp linux-2.6.35.4/include/linux/kgdb.h linux-2.6.35.4/include/linux/kgdb.h
---- linux-2.6.35.4/include/linux/kgdb.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/kgdb.h 2010-09-17 20:12:09.000000000 -0400
-@@ -263,22 +263,22 @@ struct kgdb_arch {
+diff -urNp linux-2.6.36/include/linux/kgdb.h linux-2.6.36/include/linux/kgdb.h
+--- linux-2.6.36/include/linux/kgdb.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/kgdb.h 2010-11-06 18:58:15.000000000 -0400
+@@ -276,22 +276,22 @@ struct kgdb_arch {
*/
struct kgdb_io {
const char *name;
+extern const struct kgdb_io *dbg_io_ops;
extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
- extern int kgdb_mem2hex(char *mem, char *buf, int count);
-diff -urNp linux-2.6.35.4/include/linux/kvm_host.h linux-2.6.35.4/include/linux/kvm_host.h
---- linux-2.6.35.4/include/linux/kvm_host.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/kvm_host.h 2010-09-17 20:12:09.000000000 -0400
-@@ -243,7 +243,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
+ extern char *kgdb_mem2hex(char *mem, char *buf, int count);
+diff -urNp linux-2.6.36/include/linux/kvm_host.h linux-2.6.36/include/linux/kvm_host.h
+--- linux-2.6.36/include/linux/kvm_host.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/kvm_host.h 2010-11-06 18:58:15.000000000 -0400
+@@ -245,7 +245,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);
-@@ -367,7 +367,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(
+@@ -369,7 +369,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.35.4/include/linux/libata.h linux-2.6.35.4/include/linux/libata.h
---- linux-2.6.35.4/include/linux/libata.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/libata.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/libata.h linux-2.6.36/include/linux/libata.h
+--- linux-2.6.36/include/linux/libata.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/libata.h 2010-11-06 18:58:15.000000000 -0400
@@ -64,11 +64,11 @@
#ifdef ATA_VERBOSE_DEBUG
#define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
#endif /* ATA_DEBUG */
#define BPRINTK(fmt, args...) if (ap->flags & ATA_FLAG_DEBUGMSG) printk(KERN_ERR "%s: " fmt, __func__, ## args)
-@@ -523,11 +523,11 @@ struct ata_ioports {
+@@ -524,11 +524,11 @@ struct ata_ioports {
struct ata_host {
spinlock_t lock;
unsigned long flags;
#ifdef CONFIG_ATA_ACPI
acpi_handle acpi_handle;
-@@ -709,7 +709,7 @@ struct ata_link {
+@@ -710,7 +710,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 */
-@@ -894,7 +894,7 @@ struct ata_port_info {
+@@ -897,7 +897,7 @@ struct ata_port_info {
unsigned long pio_mask;
unsigned long mwdma_mask;
unsigned long udma_mask;
void *private_data;
};
-@@ -918,7 +918,7 @@ extern const unsigned long sata_deb_timi
+@@ -921,7 +921,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 *
-@@ -962,7 +962,7 @@ extern int ata_host_activate(struct ata_
+@@ -965,7 +965,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_cmnd *cmd, void (*done)(struct scsi_cmnd *));
-diff -urNp linux-2.6.35.4/include/linux/lockd/bind.h linux-2.6.35.4/include/linux/lockd/bind.h
---- linux-2.6.35.4/include/linux/lockd/bind.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/lockd/bind.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/lockd/bind.h linux-2.6.36/include/linux/lockd/bind.h
+--- linux-2.6.36/include/linux/lockd/bind.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/lockd/bind.h 2010-11-06 18:58:15.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.35.4/include/linux/mm.h linux-2.6.35.4/include/linux/mm.h
---- linux-2.6.35.4/include/linux/mm.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/mm.h 2010-09-17 20:12:09.000000000 -0400
-@@ -103,7 +103,14 @@ extern unsigned int kobjsize(const void
+diff -urNp linux-2.6.36/include/linux/mm.h linux-2.6.36/include/linux/mm.h
+--- linux-2.6.36/include/linux/mm.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/mm.h 2010-11-06 18:58:50.000000000 -0400
+@@ -107,7 +107,14 @@ extern unsigned int kobjsize(const void
#define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
#define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN 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 */
-@@ -1010,6 +1017,8 @@ struct shrinker {
+@@ -1021,6 +1028,15 @@ struct shrinker {
extern void register_shrinker(struct shrinker *);
extern void unregister_shrinker(struct shrinker *);
++#ifdef CONFIG_MMU
+pgprot_t vm_get_page_prot(unsigned long vm_flags);
++#else
++static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
++{
++ return __pgprot(0);
++}
++#endif
+
int vma_wants_writenotify(struct vm_area_struct *vma);
extern pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl);
-@@ -1286,6 +1295,7 @@ out:
+@@ -1297,6 +1313,7 @@ out:
}
extern int do_munmap(struct mm_struct *, unsigned long, size_t);
extern unsigned long do_brk(unsigned long, unsigned long);
-@@ -1340,6 +1350,10 @@ extern struct vm_area_struct * find_vma(
+@@ -1353,6 +1370,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)
-@@ -1356,7 +1370,6 @@ static inline unsigned long vma_pages(st
+@@ -1369,15 +1390,6 @@ static inline unsigned long vma_pages(st
return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
}
+-#ifdef CONFIG_MMU
-pgprot_t vm_get_page_prot(unsigned long vm_flags);
+-#else
+-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
+-{
+- return __pgprot(0);
+-}
+-#endif
+-
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);
-@@ -1463,10 +1476,16 @@ extern int unpoison_memory(unsigned long
+@@ -1484,7 +1496,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);
+@@ -1497,5 +1509,11 @@ static inline int is_hwpoison_address(un
extern void dump_page(struct page *page);
+
#endif /* __KERNEL__ */
#endif /* _LINUX_MM_H */
-diff -urNp linux-2.6.35.4/include/linux/mm_types.h linux-2.6.35.4/include/linux/mm_types.h
---- linux-2.6.35.4/include/linux/mm_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/mm_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/mm_types.h linux-2.6.36/include/linux/mm_types.h
+--- linux-2.6.36/include/linux/mm_types.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/mm_types.h 2010-11-06 18:58:15.000000000 -0400
@@ -183,6 +183,8 @@ struct vm_area_struct {
#ifdef CONFIG_NUMA
struct mempolicy *vm_policy; /* NUMA policy for the VMA */
};
/* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
-diff -urNp linux-2.6.35.4/include/linux/mmu_notifier.h linux-2.6.35.4/include/linux/mmu_notifier.h
---- linux-2.6.35.4/include/linux/mmu_notifier.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/mmu_notifier.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/mmu_notifier.h linux-2.6.36/include/linux/mmu_notifier.h
+--- linux-2.6.36/include/linux/mmu_notifier.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/mmu_notifier.h 2010-11-06 18:58:15.000000000 -0400
@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
*/
#define ptep_clear_flush_notify(__vma, __address, __ptep) \
})
#define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
-diff -urNp linux-2.6.35.4/include/linux/mmzone.h linux-2.6.35.4/include/linux/mmzone.h
---- linux-2.6.35.4/include/linux/mmzone.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/mmzone.h 2010-09-17 20:12:09.000000000 -0400
-@@ -345,7 +345,7 @@ struct zone {
+diff -urNp linux-2.6.36/include/linux/mmzone.h linux-2.6.36/include/linux/mmzone.h
+--- linux-2.6.36/include/linux/mmzone.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/mmzone.h 2010-11-06 18:58:15.000000000 -0400
+@@ -352,7 +352,7 @@ struct zone {
unsigned long flags; /* zone flags, see below */
/* Zone statistics */
+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
/*
- * prev_priority holds the scanning priority for this zone. It is
-diff -urNp linux-2.6.35.4/include/linux/mod_devicetable.h linux-2.6.35.4/include/linux/mod_devicetable.h
---- linux-2.6.35.4/include/linux/mod_devicetable.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/mod_devicetable.h 2010-09-17 20:12:09.000000000 -0400
+ * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
+diff -urNp linux-2.6.36/include/linux/mod_devicetable.h linux-2.6.36/include/linux/mod_devicetable.h
+--- linux-2.6.36/include/linux/mod_devicetable.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/mod_devicetable.h 2010-11-06 18:58:15.000000000 -0400
@@ -12,7 +12,7 @@
typedef unsigned long kernel_ulong_t;
#endif
struct hid_device_id {
__u16 bus;
-diff -urNp linux-2.6.35.4/include/linux/module.h linux-2.6.35.4/include/linux/module.h
---- linux-2.6.35.4/include/linux/module.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/module.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/module.h linux-2.6.36/include/linux/module.h
+--- linux-2.6.36/include/linux/module.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/module.h 2010-11-06 18:58:15.000000000 -0400
@@ -297,16 +297,16 @@ struct module
int (*init)(void);
}
/* Search for module by name: must hold module_mutex. */
-diff -urNp linux-2.6.35.4/include/linux/moduleloader.h linux-2.6.35.4/include/linux/moduleloader.h
---- linux-2.6.35.4/include/linux/moduleloader.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/moduleloader.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/moduleloader.h linux-2.6.36/include/linux/moduleloader.h
+--- linux-2.6.36/include/linux/moduleloader.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/moduleloader.h 2010-11-06 18:58:15.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.35.4/include/linux/namei.h linux-2.6.35.4/include/linux/namei.h
---- linux-2.6.35.4/include/linux/namei.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/namei.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/moduleparam.h linux-2.6.36/include/linux/moduleparam.h
+--- linux-2.6.36/include/linux/moduleparam.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/moduleparam.h 2010-11-06 18:58:15.000000000 -0400
+@@ -253,7 +253,7 @@ static inline void __kernel_param_unlock
+ * @len is usually just sizeof(string).
+ */
+ #define module_param_string(name, string, len, perm) \
+- static const struct kparam_string __param_string_##name \
++ static const struct kparam_string __param_string_##name __used \
+ = { len, string }; \
+ __module_param_call(MODULE_PARAM_PREFIX, name, \
+ ¶m_ops_string, \
+@@ -368,7 +368,7 @@ extern int param_get_invbool(char *buffe
+ * module_param_named() for why this might be necessary.
+ */
+ #define module_param_array_named(name, array, type, nump, perm) \
+- static const struct kparam_array __param_arr_##name \
++ static const struct kparam_array __param_arr_##name __used \
+ = { ARRAY_SIZE(array), nump, ¶m_ops_##type, \
+ sizeof(array[0]), array }; \
+ __module_param_call(MODULE_PARAM_PREFIX, name, \
+diff -urNp linux-2.6.36/include/linux/namei.h linux-2.6.36/include/linux/namei.h
+--- linux-2.6.36/include/linux/namei.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/namei.h 2010-11-06 18:58:15.000000000 -0400
@@ -22,7 +22,7 @@ struct nameidata {
unsigned int flags;
int last_type;
{
return nd->saved_names[nd->depth];
}
-diff -urNp linux-2.6.35.4/include/linux/oprofile.h linux-2.6.35.4/include/linux/oprofile.h
---- linux-2.6.35.4/include/linux/oprofile.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/oprofile.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/netfilter/xt_gradm.h linux-2.6.36/include/linux/netfilter/xt_gradm.h
+--- linux-2.6.36/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/include/linux/netfilter/xt_gradm.h 2010-11-06 18:58:50.000000000 -0400
+@@ -0,0 +1,9 @@
++#ifndef _LINUX_NETFILTER_XT_GRADM_H
++#define _LINUX_NETFILTER_XT_GRADM_H 1
++
++struct xt_gradm_mtinfo {
++ __u16 flags;
++ __u16 invflags;
++};
++
++#endif
+diff -urNp linux-2.6.36/include/linux/oprofile.h linux-2.6.36/include/linux/oprofile.h
+--- linux-2.6.36/include/linux/oprofile.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/oprofile.h 2010-11-06 18:58:15.000000000 -0400
@@ -129,9 +129,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.35.4/include/linux/pipe_fs_i.h linux-2.6.35.4/include/linux/pipe_fs_i.h
---- linux-2.6.35.4/include/linux/pipe_fs_i.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/pipe_fs_i.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/pipe_fs_i.h linux-2.6.36/include/linux/pipe_fs_i.h
+--- linux-2.6.36/include/linux/pipe_fs_i.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/pipe_fs_i.h 2010-11-06 18:58:15.000000000 -0400
@@ -45,9 +45,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.35.4/include/linux/poison.h linux-2.6.35.4/include/linux/poison.h
---- linux-2.6.35.4/include/linux/poison.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/poison.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/poison.h linux-2.6.36/include/linux/poison.h
+--- linux-2.6.36/include/linux/poison.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/poison.h 2010-11-06 18:58:15.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.35.4/include/linux/proc_fs.h linux-2.6.35.4/include/linux/proc_fs.h
---- linux-2.6.35.4/include/linux/proc_fs.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/proc_fs.h 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/proc_fs.h linux-2.6.36/include/linux/proc_fs.h
+--- linux-2.6.36/include/linux/proc_fs.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/proc_fs.h 2010-11-06 18:58:50.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.35.4/include/linux/random.h linux-2.6.35.4/include/linux/random.h
---- linux-2.6.35.4/include/linux/random.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/random.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/random.h linux-2.6.36/include/linux/random.h
+--- linux-2.6.36/include/linux/random.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/random.h 2010-11-06 18:58:15.000000000 -0400
@@ -80,12 +80,17 @@ void srandom32(u32 seed);
u32 prandom32(struct rnd_state *);
}
/**
-diff -urNp linux-2.6.35.4/include/linux/reiserfs_fs.h linux-2.6.35.4/include/linux/reiserfs_fs.h
---- linux-2.6.35.4/include/linux/reiserfs_fs.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/reiserfs_fs.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/reiserfs_fs.h linux-2.6.36/include/linux/reiserfs_fs.h
+--- linux-2.6.36/include/linux/reiserfs_fs.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/reiserfs_fs.h 2010-11-06 18:58:15.000000000 -0400
@@ -1404,7 +1404,7 @@ static inline loff_t max_reiserfs_offset
#define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
#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.35.4/include/linux/reiserfs_fs_sb.h linux-2.6.35.4/include/linux/reiserfs_fs_sb.h
---- linux-2.6.35.4/include/linux/reiserfs_fs_sb.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/reiserfs_fs_sb.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/reiserfs_fs_sb.h linux-2.6.36/include/linux/reiserfs_fs_sb.h
+--- linux-2.6.36/include/linux/reiserfs_fs_sb.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/reiserfs_fs_sb.h 2010-11-06 18:58:15.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.35.4/include/linux/rmap.h linux-2.6.35.4/include/linux/rmap.h
---- linux-2.6.35.4/include/linux/rmap.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/rmap.h 2010-09-17 20:12:09.000000000 -0400
-@@ -119,8 +119,8 @@ static inline void anon_vma_unlock(struc
+diff -urNp linux-2.6.36/include/linux/rmap.h linux-2.6.36/include/linux/rmap.h
+--- linux-2.6.36/include/linux/rmap.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/rmap.h 2010-11-06 18:58:15.000000000 -0400
+@@ -145,8 +145,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 *);
void __anon_vma_link(struct vm_area_struct *);
void anon_vma_free(struct anon_vma *);
-diff -urNp linux-2.6.35.4/include/linux/sched.h linux-2.6.35.4/include/linux/sched.h
---- linux-2.6.35.4/include/linux/sched.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/sched.h 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/sched.h linux-2.6.36/include/linux/sched.h
+--- linux-2.6.36/include/linux/sched.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/sched.h 2010-11-06 19:00:55.000000000 -0400
@@ -100,6 +100,7 @@ struct robust_list_head;
struct bio_list;
struct fs_struct;
/*
* List of flags we want to share for kernel threads,
-@@ -381,10 +382,12 @@ struct user_namespace;
+@@ -374,10 +375,12 @@ 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 +631,15 @@ struct signal_struct {
+@@ -621,6 +624,15 @@ struct signal_struct {
struct tty_audit_buf *tty_audit_buf;
#endif
+ u8 used_accept:1;
+#endif
+
- int oom_adj; /* OOM kill score adjustment (bit shift) */
+ int oom_adj; /* OOM kill score adjustment (bit shift) */
+ int oom_score_adj; /* OOM kill score adjustment */
};
-
-@@ -1166,7 +1178,7 @@ struct rcu_node;
+@@ -1162,7 +1174,7 @@ struct rcu_node;
struct task_struct {
volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
atomic_t usage;
unsigned int flags; /* per process flags, defined below */
unsigned int ptrace;
-@@ -1274,8 +1286,8 @@ struct task_struct {
+@@ -1270,8 +1282,8 @@ struct task_struct {
struct list_head thread_group;
struct completion *vfork_done; /* for vfork() */
cputime_t utime, stime, utimescaled, stimescaled;
cputime_t gtime;
-@@ -1291,16 +1303,6 @@ struct task_struct {
+@@ -1287,16 +1299,6 @@ struct task_struct {
struct task_cputime cputime_expires;
struct list_head cpu_timers[3];
char comm[TASK_COMM_LEN]; /* executable name excluding path
- access with [gs]et_task_comm (which lock
it with task_lock())
-@@ -1384,6 +1386,15 @@ struct task_struct {
+@@ -1380,6 +1382,15 @@ struct task_struct {
int softirqs_enabled;
int softirq_context;
#endif
#ifdef CONFIG_LOCKDEP
# define MAX_LOCK_DEPTH 48UL
u64 curr_chain_key;
-@@ -1404,6 +1415,9 @@ struct task_struct {
+@@ -1400,6 +1411,9 @@ struct task_struct {
struct backing_dev_info *backing_dev_info;
struct io_context *io_context;
unsigned long ptrace_message;
-@@ -1469,6 +1483,20 @@ struct task_struct {
+@@ -1465,6 +1479,20 @@ 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;
-@@ -1500,6 +1528,52 @@ struct task_struct {
+@@ -1496,6 +1524,52 @@ struct task_struct {
#endif
};
/* Future-safe accessor for struct task_struct's cpus_allowed. */
#define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
-@@ -2101,7 +2175,7 @@ extern void __cleanup_sighand(struct sig
+@@ -2103,7 +2177,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);
-@@ -2217,8 +2291,8 @@ static inline void unlock_task_sighand(s
+@@ -2221,8 +2295,8 @@ static inline void unlock_task_sighand(s
#ifndef __HAVE_THREAD_FUNCTIONS
static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org)
{
-@@ -2233,13 +2307,17 @@ static inline unsigned long *end_of_stac
+@@ -2237,13 +2311,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.35.4/include/linux/screen_info.h linux-2.6.35.4/include/linux/screen_info.h
---- linux-2.6.35.4/include/linux/screen_info.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/screen_info.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/screen_info.h linux-2.6.36/include/linux/screen_info.h
+--- linux-2.6.36/include/linux/screen_info.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/screen_info.h 2010-11-06 18:58:15.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.35.4/include/linux/security.h linux-2.6.35.4/include/linux/security.h
---- linux-2.6.35.4/include/linux/security.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/security.h 2010-09-17 20:12:37.000000000 -0400
-@@ -34,6 +34,7 @@
+diff -urNp linux-2.6.36/include/linux/security.h linux-2.6.36/include/linux/security.h
+--- linux-2.6.36/include/linux/security.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/security.h 2010-11-06 18:58:50.000000000 -0400
+@@ -35,6 +35,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.35.4/include/linux/shm.h linux-2.6.35.4/include/linux/shm.h
---- linux-2.6.35.4/include/linux/shm.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/shm.h 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/shm.h linux-2.6.36/include/linux/shm.h
+--- linux-2.6.36/include/linux/shm.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/shm.h 2010-11-06 18:58:50.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.35.4/include/linux/slab.h linux-2.6.35.4/include/linux/slab.h
---- linux-2.6.35.4/include/linux/slab.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/slab.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/slab.h linux-2.6.36/include/linux/slab.h
+--- linux-2.6.36/include/linux/slab.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/slab.h 2010-11-06 18:58:15.000000000 -0400
@@ -11,6 +11,7 @@
#include <linux/gfp.h>
/*
* Allocator specific definitions. These are mainly used to establish optimized
-@@ -334,4 +339,37 @@ static inline void *kzalloc_node(size_t
+@@ -336,4 +341,37 @@ static inline void *kzalloc_node(size_t
void __init kmem_cache_init_late(void);
+})
+
#endif /* _LINUX_SLAB_H */
-diff -urNp linux-2.6.35.4/include/linux/slub_def.h linux-2.6.35.4/include/linux/slub_def.h
---- linux-2.6.35.4/include/linux/slub_def.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/slub_def.h 2010-09-17 20:12:09.000000000 -0400
-@@ -79,7 +79,7 @@ struct kmem_cache {
+diff -urNp linux-2.6.36/include/linux/slub_def.h linux-2.6.36/include/linux/slub_def.h
+--- linux-2.6.36/include/linux/slub_def.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/slub_def.h 2010-11-06 18:58:15.000000000 -0400
+@@ -80,7 +80,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.35.4/include/linux/sonet.h linux-2.6.35.4/include/linux/sonet.h
---- linux-2.6.35.4/include/linux/sonet.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/sonet.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/sonet.h linux-2.6.36/include/linux/sonet.h
+--- linux-2.6.36/include/linux/sonet.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/sonet.h 2010-11-06 18:58:15.000000000 -0400
@@ -61,7 +61,7 @@ struct sonet_stats {
#include <asm/atomic.h>
__SONET_ITEMS
#undef __HANDLE_ITEM
};
-diff -urNp linux-2.6.35.4/include/linux/suspend.h linux-2.6.35.4/include/linux/suspend.h
---- linux-2.6.35.4/include/linux/suspend.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/suspend.h 2010-09-17 20:12:09.000000000 -0400
-@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
+diff -urNp linux-2.6.36/include/linux/suspend.h linux-2.6.36/include/linux/suspend.h
+--- linux-2.6.36/include/linux/suspend.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/suspend.h 2010-11-06 18:58:15.000000000 -0400
+@@ -106,15 +106,15 @@ typedef int __bitwise suspend_state_t;
* which require special recovery actions in that situation.
*/
struct platform_suspend_ops {
};
#ifdef CONFIG_SUSPEND
-@@ -120,7 +120,7 @@ struct platform_suspend_ops {
+@@ -122,7 +122,7 @@ struct platform_suspend_ops {
* suspend_set_ops - set platform dependent suspend operations
* @ops: The new suspend operations to set.
*/
extern int suspend_valid_only_mem(suspend_state_t state);
/**
-@@ -145,7 +145,7 @@ extern int pm_suspend(suspend_state_t st
+@@ -147,7 +147,7 @@ extern int pm_suspend(suspend_state_t st
#else /* !CONFIG_SUSPEND */
#define suspend_valid_only_mem NULL
static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; }
#endif /* !CONFIG_SUSPEND */
-@@ -215,16 +215,16 @@ extern void mark_free_pages(struct zone
+@@ -217,16 +217,16 @@ extern void mark_free_pages(struct zone
* platforms which require special recovery actions in that situation.
*/
struct platform_hibernation_ops {
};
#ifdef CONFIG_HIBERNATION
-@@ -243,7 +243,7 @@ extern void swsusp_set_page_free(struct
+@@ -245,7 +245,7 @@ extern void swsusp_set_page_free(struct
extern void swsusp_unset_page_free(struct page *);
extern unsigned long get_safe_page(gfp_t gfp_mask);
extern int hibernate(void);
extern bool system_entering_hibernation(void);
#else /* CONFIG_HIBERNATION */
-@@ -251,7 +251,7 @@ static inline int swsusp_page_is_forbidd
+@@ -253,7 +253,7 @@ static inline int swsusp_page_is_forbidd
static inline void swsusp_set_page_free(struct page *p) {}
static inline void swsusp_unset_page_free(struct page *p) {}
static inline int hibernate(void) { return -ENOSYS; }
static inline bool system_entering_hibernation(void) { return false; }
#endif /* CONFIG_HIBERNATION */
-diff -urNp linux-2.6.35.4/include/linux/sysctl.h linux-2.6.35.4/include/linux/sysctl.h
---- linux-2.6.35.4/include/linux/sysctl.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/sysctl.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/sysctl.h linux-2.6.36/include/linux/sysctl.h
+--- linux-2.6.36/include/linux/sysctl.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/sysctl.h 2010-11-06 18:58:15.000000000 -0400
@@ -155,7 +155,11 @@ enum
KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
};
/* CTL_VM names: */
enum
-diff -urNp linux-2.6.35.4/include/linux/sysfs.h linux-2.6.35.4/include/linux/sysfs.h
---- linux-2.6.35.4/include/linux/sysfs.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/sysfs.h 2010-09-17 20:12:09.000000000 -0400
-@@ -115,8 +115,8 @@ struct bin_attribute {
+diff -urNp linux-2.6.36/include/linux/sysfs.h linux-2.6.36/include/linux/sysfs.h
+--- linux-2.6.36/include/linux/sysfs.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/sysfs.h 2010-11-06 18:58:15.000000000 -0400
+@@ -110,8 +110,8 @@ struct bin_attribute {
#define sysfs_bin_attr_init(bin_attr) sysfs_attr_init(&(bin_attr)->attr)
struct sysfs_ops {
};
struct sysfs_dirent;
-diff -urNp linux-2.6.35.4/include/linux/thread_info.h linux-2.6.35.4/include/linux/thread_info.h
---- linux-2.6.35.4/include/linux/thread_info.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/thread_info.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/thread_info.h linux-2.6.36/include/linux/thread_info.h
+--- linux-2.6.36/include/linux/thread_info.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/thread_info.h 2010-11-06 18:58:15.000000000 -0400
@@ -23,7 +23,7 @@ struct restart_block {
};
/* For futex_wait and futex_wait_requeue_pi */
u32 val;
u32 flags;
u32 bitset;
-diff -urNp linux-2.6.35.4/include/linux/tty.h linux-2.6.35.4/include/linux/tty.h
---- linux-2.6.35.4/include/linux/tty.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/tty.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/tty.h linux-2.6.36/include/linux/tty.h
+--- linux-2.6.36/include/linux/tty.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/tty.h 2010-11-06 18:58:15.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>
-
-@@ -453,7 +454,6 @@ extern int tty_perform_flush(struct tty_
+@@ -463,7 +464,6 @@ extern int tty_perform_flush(struct tty_
extern dev_t tty_devnum(struct tty_struct *tty);
extern void proc_clear_tty(struct task_struct *p);
extern struct tty_struct *get_current_tty(void);
-extern void tty_default_fops(struct file_operations *fops);
extern struct tty_struct *alloc_tty_struct(void);
+ extern void tty_add_file(struct tty_struct *tty, struct file *file);
extern void free_tty_struct(struct tty_struct *tty);
- extern void initialize_tty_struct(struct tty_struct *tty,
-@@ -514,6 +514,18 @@ extern void tty_ldisc_begin(void);
+@@ -526,6 +526,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.35.4/include/linux/tty_ldisc.h linux-2.6.35.4/include/linux/tty_ldisc.h
---- linux-2.6.35.4/include/linux/tty_ldisc.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/tty_ldisc.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/tty_ldisc.h linux-2.6.36/include/linux/tty_ldisc.h
+--- linux-2.6.36/include/linux/tty_ldisc.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/tty_ldisc.h 2010-11-06 18:58:15.000000000 -0400
@@ -147,7 +147,7 @@ struct tty_ldisc_ops {
struct module *owner;
};
struct tty_ldisc {
-diff -urNp linux-2.6.35.4/include/linux/types.h linux-2.6.35.4/include/linux/types.h
---- linux-2.6.35.4/include/linux/types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/types.h 2010-09-17 20:12:09.000000000 -0400
-@@ -191,10 +191,26 @@ typedef struct {
+diff -urNp linux-2.6.36/include/linux/types.h linux-2.6.36/include/linux/types.h
+--- linux-2.6.36/include/linux/types.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/types.h 2010-11-06 18:58:15.000000000 -0400
+@@ -207,10 +207,26 @@ typedef struct {
int counter;
} atomic_t;
+#endif
#endif
- struct ustat {
-diff -urNp linux-2.6.35.4/include/linux/uaccess.h linux-2.6.35.4/include/linux/uaccess.h
---- linux-2.6.35.4/include/linux/uaccess.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/uaccess.h 2010-09-17 20:12:09.000000000 -0400
+ struct list_head {
+diff -urNp linux-2.6.36/include/linux/uaccess.h linux-2.6.36/include/linux/uaccess.h
+--- linux-2.6.36/include/linux/uaccess.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/uaccess.h 2010-11-06 18:58:15.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.35.4/include/linux/usb/hcd.h linux-2.6.35.4/include/linux/usb/hcd.h
---- linux-2.6.35.4/include/linux/usb/hcd.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/usb/hcd.h 2010-09-17 20:12:09.000000000 -0400
-@@ -559,7 +559,7 @@ struct usb_mon_operations {
+diff -urNp linux-2.6.36/include/linux/usb/hcd.h linux-2.6.36/include/linux/usb/hcd.h
+--- linux-2.6.36/include/linux/usb/hcd.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/usb/hcd.h 2010-11-06 18:58:15.000000000 -0400
+@@ -578,7 +578,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)
{
-@@ -581,7 +581,7 @@ static inline void usbmon_urb_complete(s
+@@ -600,7 +600,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.35.4/include/linux/vmalloc.h linux-2.6.35.4/include/linux/vmalloc.h
---- linux-2.6.35.4/include/linux/vmalloc.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/vmalloc.h 2010-09-17 20:12:09.000000000 -0400
-@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
+diff -urNp linux-2.6.36/include/linux/vmalloc.h linux-2.6.36/include/linux/vmalloc.h
+--- linux-2.6.36/include/linux/vmalloc.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/vmalloc.h 2010-11-06 18:58:15.000000000 -0400
+@@ -15,6 +15,11 @@ extern bool vmap_lazy_unmap;
#define VM_MAP 0x00000004 /* vmap()ed pages */
#define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
#define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
/* bits [20..32] reserved for arch specific ioremap internals */
/*
-@@ -121,4 +126,81 @@ struct vm_struct **pcpu_get_vm_areas(con
+@@ -123,4 +128,81 @@ struct vm_struct **pcpu_get_vm_areas(con
void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms);
+})
+
#endif /* _LINUX_VMALLOC_H */
-diff -urNp linux-2.6.35.4/include/linux/vmstat.h linux-2.6.35.4/include/linux/vmstat.h
---- linux-2.6.35.4/include/linux/vmstat.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/linux/vmstat.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/linux/vmstat.h linux-2.6.36/include/linux/vmstat.h
+--- linux-2.6.36/include/linux/vmstat.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/linux/vmstat.h 2010-11-06 18:58:15.000000000 -0400
@@ -140,18 +140,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;
-@@ -246,8 +246,8 @@ static inline void __mod_zone_page_state
+@@ -179,7 +179,7 @@ static inline unsigned long zone_page_st
+ static inline unsigned long zone_page_state_snapshot(struct zone *zone,
+ enum zone_stat_item item)
+ {
+- long x = atomic_long_read(&zone->vm_stat[item]);
++ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
+
+ #ifdef CONFIG_SMP
+ int cpu;
+@@ -268,8 +268,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,
-@@ -258,8 +258,8 @@ static inline void __inc_zone_page_state
+@@ -280,8 +280,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.35.4/include/net/irda/ircomm_tty.h linux-2.6.35.4/include/net/irda/ircomm_tty.h
---- linux-2.6.35.4/include/net/irda/ircomm_tty.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/net/irda/ircomm_tty.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/net/inetpeer.h linux-2.6.36/include/net/inetpeer.h
+--- linux-2.6.36/include/net/inetpeer.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/net/inetpeer.h 2010-11-06 18:58:15.000000000 -0400
+@@ -30,8 +30,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;
+ };
+@@ -62,7 +62,7 @@ static inline __u16 inet_getid(struct in
+ {
+ more++;
+ inet_peer_refcheck(p);
+- return atomic_add_return(more, &p->ip_id_count) - more;
++ return atomic_add_return_unchecked(more, &p->ip_id_count) - more;
+ }
+
+ #endif /* _NET_INETPEER_H */
+diff -urNp linux-2.6.36/include/net/irda/ircomm_tty.h linux-2.6.36/include/net/irda/ircomm_tty.h
+--- linux-2.6.36/include/net/irda/ircomm_tty.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/net/irda/ircomm_tty.h 2010-11-06 18:58:15.000000000 -0400
@@ -105,8 +105,8 @@ struct ircomm_tty_cb {
unsigned short close_delay;
unsigned short closing_wait; /* time to wait before closing */
/* Protect concurent access to :
* o self->open_count
-diff -urNp linux-2.6.35.4/include/net/neighbour.h linux-2.6.35.4/include/net/neighbour.h
---- linux-2.6.35.4/include/net/neighbour.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/net/neighbour.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/net/neighbour.h linux-2.6.36/include/net/neighbour.h
+--- linux-2.6.36/include/net/neighbour.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/net/neighbour.h 2010-11-06 18:58:15.000000000 -0400
@@ -116,12 +116,12 @@ struct neighbour {
struct neigh_ops {
};
struct pneigh_entry {
-diff -urNp linux-2.6.35.4/include/net/sctp/sctp.h linux-2.6.35.4/include/net/sctp/sctp.h
---- linux-2.6.35.4/include/net/sctp/sctp.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/net/sctp/sctp.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/net/sctp/sctp.h linux-2.6.36/include/net/sctp/sctp.h
+--- linux-2.6.36/include/net/sctp/sctp.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/net/sctp/sctp.h 2010-11-06 18:58:15.000000000 -0400
@@ -305,8 +305,8 @@ extern int sctp_debug_flag;
#else /* SCTP_DEBUG */
#define SCTP_ENABLE_DEBUG
#define SCTP_DISABLE_DEBUG
#define SCTP_ASSERT(expr, str, func)
-diff -urNp linux-2.6.35.4/include/net/tcp.h linux-2.6.35.4/include/net/tcp.h
---- linux-2.6.35.4/include/net/tcp.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/net/tcp.h 2010-09-17 20:12:09.000000000 -0400
-@@ -1404,6 +1404,7 @@ enum tcp_seq_states {
+diff -urNp linux-2.6.36/include/net/tcp.h linux-2.6.36/include/net/tcp.h
+--- linux-2.6.36/include/net/tcp.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/net/tcp.h 2010-11-06 18:58:15.000000000 -0400
+@@ -1373,6 +1373,7 @@ enum tcp_seq_states {
struct tcp_seq_afinfo {
char *name;
sa_family_t family;
struct file_operations seq_fops;
struct seq_operations seq_ops;
};
-diff -urNp linux-2.6.35.4/include/net/udp.h linux-2.6.35.4/include/net/udp.h
---- linux-2.6.35.4/include/net/udp.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/net/udp.h 2010-09-17 20:12:09.000000000 -0400
-@@ -221,6 +221,7 @@ struct udp_seq_afinfo {
+diff -urNp linux-2.6.36/include/net/udp.h linux-2.6.36/include/net/udp.h
+--- linux-2.6.36/include/net/udp.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/net/udp.h 2010-11-06 18:58:15.000000000 -0400
+@@ -220,6 +220,7 @@ struct udp_seq_afinfo {
char *name;
sa_family_t family;
struct udp_table *udp_table;
struct file_operations seq_fops;
struct seq_operations seq_ops;
};
-diff -urNp linux-2.6.35.4/include/sound/ac97_codec.h linux-2.6.35.4/include/sound/ac97_codec.h
---- linux-2.6.35.4/include/sound/ac97_codec.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/sound/ac97_codec.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/sound/ac97_codec.h linux-2.6.36/include/sound/ac97_codec.h
+--- linux-2.6.36/include/sound/ac97_codec.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/sound/ac97_codec.h 2010-11-06 18:58:15.000000000 -0400
@@ -419,15 +419,15 @@
struct snd_ac97;
void *private_data;
void (*private_free) (struct snd_ac97 *ac97);
/* --- */
-diff -urNp linux-2.6.35.4/include/trace/events/irq.h linux-2.6.35.4/include/trace/events/irq.h
---- linux-2.6.35.4/include/trace/events/irq.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/trace/events/irq.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/trace/events/irq.h linux-2.6.36/include/trace/events/irq.h
+--- linux-2.6.36/include/trace/events/irq.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/trace/events/irq.h 2010-11-06 18:58:15.000000000 -0400
@@ -34,7 +34,7 @@
*/
TRACE_EVENT(irq_handler_entry,
TP_ARGS(h, vec)
);
-diff -urNp linux-2.6.35.4/include/video/uvesafb.h linux-2.6.35.4/include/video/uvesafb.h
---- linux-2.6.35.4/include/video/uvesafb.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/include/video/uvesafb.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/include/video/uvesafb.h linux-2.6.36/include/video/uvesafb.h
+--- linux-2.6.36/include/video/uvesafb.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/include/video/uvesafb.h 2010-11-06 18:58:15.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.35.4/init/do_mounts.c linux-2.6.35.4/init/do_mounts.c
---- linux-2.6.35.4/init/do_mounts.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/init/do_mounts.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/init/do_mounts.c linux-2.6.36/init/do_mounts.c
+--- linux-2.6.36/init/do_mounts.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/init/do_mounts.c 2010-11-06 18:58:15.000000000 -0400
@@ -217,11 +217,11 @@ static void __init get_fs_names(char *pa
static int __init do_mount_root(char *name, char *fs, int flags, void *data)
+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
+ sys_chroot((__force char __user *)".");
}
-diff -urNp linux-2.6.35.4/init/do_mounts.h linux-2.6.35.4/init/do_mounts.h
---- linux-2.6.35.4/init/do_mounts.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/init/do_mounts.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/init/do_mounts.h linux-2.6.36/init/do_mounts.h
+--- linux-2.6.36/init/do_mounts.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/init/do_mounts.h 2010-11-06 18:58:15.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.35.4/init/do_mounts_initrd.c linux-2.6.35.4/init/do_mounts_initrd.c
---- linux-2.6.35.4/init/do_mounts_initrd.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/init/do_mounts_initrd.c 2010-09-17 20:12:09.000000000 -0400
-@@ -43,13 +43,13 @@ static void __init handle_initrd(void)
+diff -urNp linux-2.6.36/init/do_mounts_initrd.c linux-2.6.36/init/do_mounts_initrd.c
+--- linux-2.6.36/init/do_mounts_initrd.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/init/do_mounts_initrd.c 2010-11-06 18:58:15.000000000 -0400
+@@ -44,13 +44,13 @@ static void __init handle_initrd(void)
create_dev("/dev/root.old", Root_RAM0);
/* mount initrd on rootfs' /root */
mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
/*
* In case that a resume from disk is carried out by linuxrc or one of
-@@ -66,15 +66,15 @@ static void __init handle_initrd(void)
+@@ -67,15 +67,15 @@ static void __init handle_initrd(void)
/* move initrd to rootfs' /old */
sys_fchdir(old_fd);
return;
}
-@@ -82,17 +82,17 @@ static void __init handle_initrd(void)
+@@ -83,17 +83,17 @@ static void __init handle_initrd(void)
mount_root();
printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
if (fd < 0) {
error = fd;
-@@ -115,11 +115,11 @@ int __init initrd_load(void)
+@@ -116,11 +116,11 @@ int __init initrd_load(void)
* mounted in the normal path.
*/
if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
+ sys_unlink((__force const char __user *)"/initrd.image");
return 0;
}
-diff -urNp linux-2.6.35.4/init/do_mounts_md.c linux-2.6.35.4/init/do_mounts_md.c
---- linux-2.6.35.4/init/do_mounts_md.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/init/do_mounts_md.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/init/do_mounts_md.c linux-2.6.36/init/do_mounts_md.c
+--- linux-2.6.36/init/do_mounts_md.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/init/do_mounts_md.c 2010-11-06 18:58:15.000000000 -0400
@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
partitioned ? "_d" : "", minor,
md_setup_args[ent].device_names);
if (fd >= 0) {
sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
sys_close(fd);
-diff -urNp linux-2.6.35.4/init/initramfs.c linux-2.6.35.4/init/initramfs.c
---- linux-2.6.35.4/init/initramfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/init/initramfs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/init/initramfs.c linux-2.6.36/init/initramfs.c
+--- linux-2.6.36/init/initramfs.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/init/initramfs.c 2010-11-06 18:58:15.000000000 -0400
@@ -74,7 +74,7 @@ static void __init free_hash(void)
}
}
state = SkipIt;
next_state = Reset;
return 0;
-diff -urNp linux-2.6.35.4/init/Kconfig linux-2.6.35.4/init/Kconfig
---- linux-2.6.35.4/init/Kconfig 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/init/Kconfig 2010-09-17 20:12:09.000000000 -0400
-@@ -1063,7 +1063,7 @@ config SLUB_DEBUG
+diff -urNp linux-2.6.36/init/Kconfig linux-2.6.36/init/Kconfig
+--- linux-2.6.36/init/Kconfig 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/init/Kconfig 2010-11-06 18:58:15.000000000 -0400
+@@ -1067,7 +1067,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.35.4/init/main.c linux-2.6.35.4/init/main.c
---- linux-2.6.35.4/init/main.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/init/main.c 2010-09-17 20:12:37.000000000 -0400
-@@ -98,6 +98,7 @@ static inline void mark_rodata_ro(void)
+diff -urNp linux-2.6.36/init/main.c linux-2.6.36/init/main.c
+--- linux-2.6.36/init/main.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/init/main.c 2010-11-06 18:58:50.000000000 -0400
+@@ -95,6 +95,7 @@ static inline void mark_rodata_ro(void)
#ifdef CONFIG_TC
extern void tc_init(void);
#endif
enum system_states system_state __read_mostly;
EXPORT_SYMBOL(system_state);
-@@ -200,6 +201,50 @@ static int __init set_reset_devices(char
+@@ -197,6 +198,47 @@ static int __init set_reset_devices(char
__setup("reset_devices", set_reset_devices);
+ asm("mov %0, %%es" : : "r" (__KERNEL_DS) : "memory");
+ asm("mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
+#else
-+ char *p;
-+ p = (char *)pax_enter_kernel_user;
-+ *p = 0xc3;
-+ p = (char *)pax_exit_kernel_user;
-+ *p = 0xc3;
++ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
++ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
+ clone_pgd_mask = ~(pgdval_t)0UL;
+#endif
+
+__setup("pax_softmode=", setup_pax_softmode);
+#endif
+
- static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
- char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
+ 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;
-@@ -725,52 +770,53 @@ int initcall_debug;
- core_param(initcall_debug, initcall_debug, bool, 0644);
-
- static char msgbuf[64];
--static struct boot_trace_call call;
--static struct boot_trace_ret ret;
-+static struct boot_trace_call trace_call;
-+static struct boot_trace_ret trace_ret;
-
- int do_one_initcall(initcall_t fn)
+@@ -743,6 +785,7 @@ int __init_or_module do_one_initcall(ini
{
int count = preempt_count();
- ktime_t calltime, delta, rettime;
+ int ret;
+ const char *msg1 = "", *msg2 = "";
- if (initcall_debug) {
-- call.caller = task_pid_nr(current);
-- printk("calling %pF @ %i\n", fn, call.caller);
-+ trace_call.caller = task_pid_nr(current);
-+ printk("calling %pF @ %i\n", fn, trace_call.caller);
- calltime = ktime_get();
-- trace_boot_call(&call, fn);
-+ trace_boot_call(&trace_call, fn);
- enable_boot_trace();
- }
-
-- ret.result = fn();
-+ trace_ret.result = fn();
-
- if (initcall_debug) {
- disable_boot_trace();
- rettime = ktime_get();
- delta = ktime_sub(rettime, calltime);
-- ret.duration = (unsigned long long) ktime_to_ns(delta) >> 10;
-- trace_boot_ret(&ret, fn);
-+ trace_ret.duration = (unsigned long long) ktime_to_ns(delta) >> 10;
-+ trace_boot_ret(&trace_ret, fn);
- printk("initcall %pF returned %d after %Ld usecs\n", fn,
-- ret.result, ret.duration);
-+ trace_ret.result, trace_ret.duration);
- }
-
- msgbuf[0] = 0;
-
-- if (ret.result && ret.result != -ENODEV && initcall_debug)
-- sprintf(msgbuf, "error code %d ", ret.result);
-+ if (trace_ret.result && trace_ret.result != -ENODEV && initcall_debug)
-+ sprintf(msgbuf, "error code %d ", trace_ret.result);
+ if (initcall_debug)
+ ret = do_one_initcall_debug(fn);
+@@ -755,15 +798,15 @@ int __init_or_module do_one_initcall(ini
+ sprintf(msgbuf, "error code %d ", ret);
if (preempt_count() != count) {
- strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
+ printk("initcall %pF returned with %s%s%s\n", fn, msgbuf, msg1, msg2);
}
-- return ret.result;
-+ return trace_ret.result;
- }
-
-
-@@ -902,7 +948,7 @@ static int __init kernel_init(void * unu
+ return ret;
+@@ -893,7 +936,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);
-@@ -915,11 +961,13 @@ static int __init kernel_init(void * unu
+@@ -906,11 +949,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.35.4/init/noinitramfs.c linux-2.6.35.4/init/noinitramfs.c
---- linux-2.6.35.4/init/noinitramfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/init/noinitramfs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/init/noinitramfs.c linux-2.6.36/init/noinitramfs.c
+--- linux-2.6.36/init/noinitramfs.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/init/noinitramfs.c 2010-11-06 18:58:15.000000000 -0400
@@ -29,17 +29,17 @@ static int __init default_rootfs(void)
{
int err;
if (err < 0)
goto out;
-diff -urNp linux-2.6.35.4/ipc/mqueue.c linux-2.6.35.4/ipc/mqueue.c
---- linux-2.6.35.4/ipc/mqueue.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/ipc/mqueue.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/ipc/compat.c linux-2.6.36/ipc/compat.c
+--- linux-2.6.36/ipc/compat.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/ipc/compat.c 2010-11-06 18:58:50.000000000 -0400
+@@ -241,6 +241,8 @@ long compat_sys_semctl(int first, int se
+ struct semid64_ds __user *up64;
+ int version = compat_ipc_parse_version(&third);
+
++ memset(&s64, 0, sizeof(s64));
++
+ if (!uptr)
+ return -EINVAL;
+ if (get_user(pad, (u32 __user *) uptr))
+@@ -421,6 +423,8 @@ long compat_sys_msgctl(int first, int se
+ int version = compat_ipc_parse_version(&second);
+ void __user *p;
+
++ memset(&m64, 0, sizeof(m64));
++
+ switch (second & (~IPC_64)) {
+ case IPC_INFO:
+ case IPC_RMID:
+@@ -594,6 +598,8 @@ long compat_sys_shmctl(int first, int se
+ int err, err2;
+ int version = compat_ipc_parse_version(&second);
+
++ memset(&s64, 0, sizeof(s64));
++
+ switch (second & (~IPC_64)) {
+ case IPC_RMID:
+ case SHM_LOCK:
+diff -urNp linux-2.6.36/ipc/compat_mq.c linux-2.6.36/ipc/compat_mq.c
+--- linux-2.6.36/ipc/compat_mq.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/ipc/compat_mq.c 2010-11-06 18:58:50.000000000 -0400
+@@ -53,6 +53,9 @@ asmlinkage long compat_sys_mq_open(const
+ void __user *p = NULL;
+ if (u_attr && oflag & O_CREAT) {
+ struct mq_attr attr;
++
++ memset(&attr, 0, sizeof(attr));
++
+ p = compat_alloc_user_space(sizeof(attr));
+ if (get_compat_mq_attr(&attr, u_attr) ||
+ copy_to_user(p, &attr, sizeof(attr)))
+@@ -127,6 +130,8 @@ asmlinkage long compat_sys_mq_getsetattr
+ struct mq_attr __user *p = compat_alloc_user_space(2 * sizeof(*p));
+ long ret;
+
++ memset(&mqstat, 0, sizeof(mqstat));
++
+ if (u_mqstat) {
+ if (get_compat_mq_attr(&mqstat, u_mqstat) ||
+ copy_to_user(p, &mqstat, sizeof(mqstat)))
+diff -urNp linux-2.6.36/ipc/mqueue.c linux-2.6.36/ipc/mqueue.c
+--- linux-2.6.36/ipc/mqueue.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/ipc/mqueue.c 2010-11-06 18:58:50.000000000 -0400
@@ -153,6 +153,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.35.4/ipc/shm.c linux-2.6.35.4/ipc/shm.c
---- linux-2.6.35.4/ipc/shm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/ipc/shm.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/ipc/shm.c linux-2.6.36/ipc/shm.c
+--- linux-2.6.36/ipc/shm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/ipc/shm.c 2010-11-06 18:58:50.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;
-@@ -877,9 +893,21 @@ long do_shmat(int shmid, char __user *sh
+@@ -473,6 +489,8 @@ static inline unsigned long copy_shmid_t
+ {
+ struct shmid_ds out;
+
++ memset(&out, 0, sizeof(out));
++
+ ipc64_perm_to_ipc_perm(&in->shm_perm, &out.shm_perm);
+ out.shm_segsz = in->shm_segsz;
+ out.shm_atime = in->shm_atime;
+@@ -877,9 +895,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.35.4/kernel/acct.c linux-2.6.35.4/kernel/acct.c
---- linux-2.6.35.4/kernel/acct.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/acct.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/kernel/acct.c linux-2.6.36/kernel/acct.c
+--- linux-2.6.36/kernel/acct.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/acct.c 2010-11-06 18:58:15.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.35.4/kernel/capability.c linux-2.6.35.4/kernel/capability.c
---- linux-2.6.35.4/kernel/capability.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/capability.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/kernel/capability.c linux-2.6.36/kernel/capability.c
+--- linux-2.6.36/kernel/capability.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/capability.c 2010-11-06 18:58:50.000000000 -0400
@@ -205,6 +205,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_
* before modification is attempted and the application
* fails.
+
EXPORT_SYMBOL(capable);
+EXPORT_SYMBOL(capable_nolog);
-diff -urNp linux-2.6.35.4/kernel/compat.c linux-2.6.35.4/kernel/compat.c
---- linux-2.6.35.4/kernel/compat.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/compat.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/kernel/compat.c linux-2.6.36/kernel/compat.c
+--- linux-2.6.36/kernel/compat.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/compat.c 2010-11-06 18:58:50.000000000 -0400
@@ -13,6 +13,7 @@
#include <linux/linkage.h>
#include <linux/errno.h>
#include <linux/time.h>
#include <linux/signal.h>
-@@ -1137,3 +1138,24 @@ compat_sys_sysinfo(struct compat_sysinfo
-
- return 0;
- }
-+
-+/*
-+ * Allocate user-space memory for the duration of a single system call,
-+ * in order to marshall parameters inside a compat thunk.
-+ */
-+void __user *compat_alloc_user_space(unsigned long len)
-+{
-+ void __user *ptr;
-+
-+ /* If len would occupy more than half of the entire compat space... */
-+ if (unlikely(len > (((compat_uptr_t)~0) >> 1)))
-+ return NULL;
-+
-+ ptr = arch_compat_alloc_user_space(len);
-+
-+ if (unlikely(!access_ok(VERIFY_WRITE, ptr, len)))
-+ return NULL;
-+
-+ return ptr;
-+}
-+EXPORT_SYMBOL_GPL(compat_alloc_user_space);
-diff -urNp linux-2.6.35.4/kernel/configs.c linux-2.6.35.4/kernel/configs.c
---- linux-2.6.35.4/kernel/configs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/configs.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/kernel/configs.c linux-2.6.36/kernel/configs.c
+--- linux-2.6.36/kernel/configs.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/configs.c 2010-11-06 18:58:50.000000000 -0400
@@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
struct proc_dir_entry *entry;
if (!entry)
return -ENOMEM;
-diff -urNp linux-2.6.35.4/kernel/cred.c linux-2.6.35.4/kernel/cred.c
---- linux-2.6.35.4/kernel/cred.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/cred.c 2010-09-17 20:12:37.000000000 -0400
-@@ -489,6 +489,8 @@ int commit_creds(struct cred *new)
+diff -urNp linux-2.6.36/kernel/cred.c linux-2.6.36/kernel/cred.c
+--- linux-2.6.36/kernel/cred.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/cred.c 2010-11-06 18:58:50.000000000 -0400
+@@ -485,6 +485,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.35.4/kernel/debug/debug_core.c linux-2.6.35.4/kernel/debug/debug_core.c
---- linux-2.6.35.4/kernel/debug/debug_core.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/debug/debug_core.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/kernel/debug/debug_core.c linux-2.6.36/kernel/debug/debug_core.c
+--- linux-2.6.36/kernel/debug/debug_core.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/debug/debug_core.c 2010-11-06 18:58:15.000000000 -0400
@@ -71,7 +71,7 @@ int kgdb_io_module_registered;
/* Guard for recursive entry */
static int exception_level;
static DEFINE_SPINLOCK(kgdb_registration_lock);
/* kgdb console driver is loaded */
-@@ -871,7 +871,7 @@ static void kgdb_initial_breakpoint(void
+@@ -873,7 +873,7 @@ static void kgdb_initial_breakpoint(void
*
* Register it with the KGDB core.
*/
{
int err;
-@@ -916,7 +916,7 @@ EXPORT_SYMBOL_GPL(kgdb_register_io_modul
+@@ -918,7 +918,7 @@ EXPORT_SYMBOL_GPL(kgdb_register_io_modul
*
* Unregister it with the KGDB core.
*/
{
BUG_ON(kgdb_connected);
-diff -urNp linux-2.6.35.4/kernel/debug/kdb/kdb_main.c linux-2.6.35.4/kernel/debug/kdb/kdb_main.c
---- linux-2.6.35.4/kernel/debug/kdb/kdb_main.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/debug/kdb/kdb_main.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1872,7 +1872,7 @@ static int kdb_lsmod(int argc, const cha
+diff -urNp linux-2.6.36/kernel/debug/kdb/kdb_main.c linux-2.6.36/kernel/debug/kdb/kdb_main.c
+--- linux-2.6.36/kernel/debug/kdb/kdb_main.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/debug/kdb/kdb_main.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha
list_for_each_entry(mod, kdb_modules, list) {
kdb_printf("%-20s%8u 0x%p ", mod->name,
#ifdef CONFIG_MODULE_UNLOAD
kdb_printf("%4d ", module_refcount(mod));
#endif
-@@ -1882,7 +1882,7 @@ static int kdb_lsmod(int argc, const cha
+@@ -1990,7 +1990,7 @@ static int kdb_lsmod(int argc, const cha
kdb_printf(" (Loading)");
else
kdb_printf(" (Live)");
#ifdef CONFIG_MODULE_UNLOAD
{
-diff -urNp linux-2.6.35.4/kernel/exit.c linux-2.6.35.4/kernel/exit.c
---- linux-2.6.35.4/kernel/exit.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/exit.c 2010-09-17 20:13:49.000000000 -0400
+diff -urNp linux-2.6.36/kernel/exit.c linux-2.6.36/kernel/exit.c
+--- linux-2.6.36/kernel/exit.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/exit.c 2010-11-06 18:58:50.000000000 -0400
@@ -56,6 +56,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
-@@ -960,6 +988,9 @@ NORET_TYPE void do_exit(long code)
+@@ -963,6 +991,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.35.4/kernel/fork.c linux-2.6.35.4/kernel/fork.c
---- linux-2.6.35.4/kernel/fork.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/fork.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/kernel/fork.c linux-2.6.36/kernel/fork.c
+--- linux-2.6.36/kernel/fork.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/fork.c 2010-11-06 19:20:52.000000000 -0400
@@ -276,7 +276,7 @@ static struct task_struct *dup_task_stru
*stackend = STACK_END_MAGIC; /* for overflow detection */
+ if (anon_vma_fork(tmp, mpnt))
+ goto fail_nomem_anon_vma_fork;
+ tmp->vm_flags &= ~VM_LOCKED;
-+ tmp->vm_next = NULL;
++ tmp->vm_next = tmp->vm_prev = NULL;
+ tmp->vm_mirror = NULL;
+ file = tmp->vm_file;
+ if (file) {
- if (IS_ERR(pol))
- goto fail_nomem_policy;
- vma_set_policy(tmp, pol);
+- tmp->vm_mm = mm;
- if (anon_vma_fork(tmp, mpnt))
- goto fail_nomem_anon_vma_fork;
- tmp->vm_flags &= ~VM_LOCKED;
-- tmp->vm_mm = mm;
- tmp->vm_next = tmp->vm_prev = NULL;
- file = tmp->vm_file;
- if (file) {
static inline int mm_alloc_pgd(struct mm_struct * mm)
@@ -760,13 +797,14 @@ static int copy_fs(unsigned long clone_f
- write_unlock(&fs->lock);
+ spin_unlock(&fs->lock);
return -EAGAIN;
}
- fs->users++;
+ atomic_inc(&fs->users);
- write_unlock(&fs->lock);
+ spin_unlock(&fs->lock);
return 0;
}
tsk->fs = copy_fs_struct(fs);
return 0;
}
-@@ -1019,10 +1057,13 @@ static struct task_struct *copy_process(
+@@ -1020,10 +1058,13 @@ static struct task_struct *copy_process(
DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
#endif
retval = -EAGAIN;
goto bad_fork_free;
}
-@@ -1176,6 +1217,8 @@ static struct task_struct *copy_process(
+@@ -1177,6 +1218,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()?
-@@ -1328,6 +1371,8 @@ bad_fork_cleanup_count:
+@@ -1329,6 +1372,8 @@ bad_fork_cleanup_count:
bad_fork_free:
free_task(p);
fork_out:
return ERR_PTR(retval);
}
-@@ -1433,6 +1478,8 @@ long do_fork(unsigned long clone_flags,
+@@ -1434,6 +1479,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);
-@@ -1557,7 +1604,7 @@ static int unshare_fs(unsigned long unsh
+@@ -1558,7 +1605,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);
-@@ -1680,7 +1727,8 @@ SYSCALL_DEFINE1(unshare, unsigned long,
+@@ -1681,7 +1728,8 @@ SYSCALL_DEFINE1(unshare, unsigned long,
fs = current->fs;
- write_lock(&fs->lock);
+ spin_lock(&fs->lock);
current->fs = new_fs;
- if (--fs->users)
+ gr_set_chroot_entries(current, ¤t->fs->root);
new_fs = NULL;
else
new_fs = fs;
-diff -urNp linux-2.6.35.4/kernel/futex.c linux-2.6.35.4/kernel/futex.c
---- linux-2.6.35.4/kernel/futex.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/futex.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/kernel/futex.c linux-2.6.36/kernel/futex.c
+--- linux-2.6.36/kernel/futex.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/futex.c 2010-11-06 18:58:50.000000000 -0400
@@ -54,6 +54,7 @@
#include <linux/mount.h>
#include <linux/pagemap.h>
{
unsigned long uentry;
-diff -urNp linux-2.6.35.4/kernel/futex_compat.c linux-2.6.35.4/kernel/futex_compat.c
---- linux-2.6.35.4/kernel/futex_compat.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/futex_compat.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/kernel/futex_compat.c linux-2.6.36/kernel/futex_compat.c
+--- linux-2.6.36/kernel/futex_compat.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/futex_compat.c 2010-11-06 18:58:50.000000000 -0400
@@ -10,6 +10,7 @@
#include <linux/compat.h>
#include <linux/nsproxy.h>
head = p->compat_robust_list;
rcu_read_unlock();
}
-diff -urNp linux-2.6.35.4/kernel/gcov/base.c linux-2.6.35.4/kernel/gcov/base.c
---- linux-2.6.35.4/kernel/gcov/base.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/gcov/base.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/kernel/gcov/base.c linux-2.6.36/kernel/gcov/base.c
+--- linux-2.6.36/kernel/gcov/base.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/gcov/base.c 2010-11-06 18:58:15.000000000 -0400
@@ -102,11 +102,6 @@ void gcov_enable_events(void)
}
if (prev)
prev->next = info->next;
else
-diff -urNp linux-2.6.35.4/kernel/hrtimer.c linux-2.6.35.4/kernel/hrtimer.c
---- linux-2.6.35.4/kernel/hrtimer.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/hrtimer.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1398,7 +1398,7 @@ void hrtimer_peek_ahead_timers(void)
+diff -urNp linux-2.6.36/kernel/hrtimer.c linux-2.6.36/kernel/hrtimer.c
+--- linux-2.6.36/kernel/hrtimer.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/hrtimer.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1401,7 +1401,7 @@ void hrtimer_peek_ahead_timers(void)
local_irq_restore(flags);
}
{
hrtimer_peek_ahead_timers();
}
-diff -urNp linux-2.6.35.4/kernel/kallsyms.c linux-2.6.35.4/kernel/kallsyms.c
---- linux-2.6.35.4/kernel/kallsyms.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/kallsyms.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/kernel/kallsyms.c linux-2.6.36/kernel/kallsyms.c
+--- linux-2.6.36/kernel/kallsyms.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/kallsyms.c 2010-11-06 18:58:50.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)
if (!iter)
return -ENOMEM;
reset_iter(iter, 0);
-diff -urNp linux-2.6.35.4/kernel/kmod.c linux-2.6.35.4/kernel/kmod.c
---- linux-2.6.35.4/kernel/kmod.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/kmod.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/kernel/kmod.c linux-2.6.36/kernel/kmod.c
+--- linux-2.6.36/kernel/kmod.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/kmod.c 2010-11-06 18:58:50.000000000 -0400
@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch
if (ret)
return ret;
/* If modprobe needs a service that is in a module, we get a recursive
* loop. Limit the number of running kmod threads to max_threads/2 or
* MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
-diff -urNp linux-2.6.35.4/kernel/kprobes.c linux-2.6.35.4/kernel/kprobes.c
---- linux-2.6.35.4/kernel/kprobes.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/kprobes.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/kernel/kprobes.c linux-2.6.36/kernel/kprobes.c
+--- linux-2.6.36/kernel/kprobes.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/kprobes.c 2010-11-06 18:58:15.000000000 -0400
@@ -183,7 +183,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.35.4/kernel/lockdep.c linux-2.6.35.4/kernel/lockdep.c
---- linux-2.6.35.4/kernel/lockdep.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/lockdep.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/kernel/lockdep.c linux-2.6.36/kernel/lockdep.c
+--- linux-2.6.36/kernel/lockdep.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/lockdep.c 2010-11-06 18:58:15.000000000 -0400
@@ -571,6 +571,10 @@ static int static_obj(void *obj)
end = (unsigned long) &_end,
addr = (unsigned long) obj;
printk("the code is fine but needs lockdep annotation.\n");
printk("turning off the locking correctness validator.\n");
dump_stack();
-diff -urNp linux-2.6.35.4/kernel/lockdep_proc.c linux-2.6.35.4/kernel/lockdep_proc.c
---- linux-2.6.35.4/kernel/lockdep_proc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/lockdep_proc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/kernel/lockdep_proc.c linux-2.6.36/kernel/lockdep_proc.c
+--- linux-2.6.36/kernel/lockdep_proc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/lockdep_proc.c 2010-11-06 18:58:15.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.35.4/kernel/module.c linux-2.6.35.4/kernel/module.c
---- linux-2.6.35.4/kernel/module.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/module.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
+--- linux-2.6.36/kernel/module.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/module.c 2010-11-06 18:58:50.000000000 -0400
@@ -96,7 +96,8 @@ static BLOCKING_NOTIFIER_HEAD(module_not
/* Bounds of module allocation, for speeding __module_address.
int register_module_notifier(struct notifier_block * nb)
{
-@@ -250,7 +251,7 @@ bool each_symbol(bool (*fn)(const struct
+@@ -260,7 +261,7 @@ bool each_symbol(bool (*fn)(const struct
return true;
list_for_each_entry_rcu(mod, &modules, list) {
{ mod->syms, mod->syms + mod->num_syms, mod->crcs,
NOT_GPL_ONLY, false },
{ mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
-@@ -272,7 +273,7 @@ bool each_symbol(bool (*fn)(const struct
+@@ -282,7 +283,7 @@ bool each_symbol(bool (*fn)(const struct
#endif
};
return true;
}
return false;
-@@ -383,7 +384,7 @@ static inline void __percpu *mod_percpu(
+@@ -393,7 +394,7 @@ static inline void __percpu *mod_percpu(
static int percpu_modalloc(struct module *mod,
unsigned long size, unsigned long align)
{
printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
mod->name, align, PAGE_SIZE);
align = PAGE_SIZE;
-@@ -1562,7 +1563,8 @@ static void free_module(struct module *m
+@@ -1565,15 +1566,18 @@ static void free_module(struct module *m
destroy_params(mod->kp, mod->num_kp);
/* This may be NULL, but that's OK */
+ module_free_exec(mod, mod->module_init_rx);
kfree(mod->args);
percpu_modfree(mod);
- #if defined(CONFIG_MODULE_UNLOAD)
-@@ -1570,10 +1572,12 @@ static void free_module(struct module *m
- free_percpu(mod->refptr);
- #endif
+
/* Free lock-classes: */
- lockdep_free_key_range(mod->module_core, mod->core_size);
+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
#ifdef CONFIG_MPU
update_protections(current->mm);
-@@ -1670,7 +1674,9 @@ static int simplify_symbols(Elf_Shdr *se
- mod);
+@@ -1666,7 +1670,9 @@ static int simplify_symbols(struct modul
+ ksym = resolve_symbol_wait(mod, info, name);
/* Ok if resolved. */
if (ksym && !IS_ERR(ksym)) {
+ pax_open_kernel();
break;
}
-@@ -1690,7 +1696,9 @@ static int simplify_symbols(Elf_Shdr *se
+@@ -1685,7 +1691,9 @@ static int simplify_symbols(struct modul
secbase = (unsigned long)mod_percpu(mod);
else
- secbase = sechdrs[sym[i].st_shndx].sh_addr;
+ secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
+ pax_open_kernel();
sym[i].st_value += secbase;
+ pax_close_kernel();
break;
}
}
-@@ -1751,11 +1759,12 @@ static void layout_sections(struct modul
+@@ -1773,11 +1781,12 @@ static void layout_sections(struct modul
|| s->sh_entsize != ~0UL
- || strstarts(secstrings + s->sh_name, ".init"))
+ || strstarts(sname, ".init"))
continue;
- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
+ else
+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
- DEBUGP("\t%s\n", secstrings + s->sh_name);
+ DEBUGP("\t%s\n", name);
}
- if (m == 0)
- mod->core_text_size = mod->core_size;
}
DEBUGP("Init section allocation order:\n");
-@@ -1768,12 +1777,13 @@ static void layout_sections(struct modul
+@@ -1791,12 +1800,13 @@ static void layout_sections(struct modul
|| s->sh_entsize != ~0UL
- || !strstarts(secstrings + s->sh_name, ".init"))
+ || !strstarts(sname, ".init"))
continue;
- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
- | INIT_OFFSET_MASK);
+ else
+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
+ s->sh_entsize |= INIT_OFFSET_MASK;
- DEBUGP("\t%s\n", secstrings + s->sh_name);
+ DEBUGP("\t%s\n", sname);
}
- if (m == 0)
- mod->init_text_size = mod->init_size;
}
}
-@@ -1877,9 +1887,8 @@ static int is_exported(const char *name,
-
- /* As per nm */
- static char elf_type(const Elf_Sym *sym,
-- Elf_Shdr *sechdrs,
-- const char *secstrings,
-- struct module *mod)
-+ const Elf_Shdr *sechdrs,
-+ const char *secstrings)
- {
- if (ELF_ST_BIND(sym->st_info) == STB_WEAK) {
- if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT)
-@@ -1954,7 +1963,7 @@ static unsigned long layout_symtab(struc
+@@ -1964,7 +1974,7 @@ static void layout_symtab(struct module
/* Put symbol section at end of init part of module. */
symsect->sh_flags |= SHF_ALLOC;
- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
- symindex) | INIT_OFFSET_MASK;
- DEBUGP("\t%s\n", secstrings + symsect->sh_name);
+ info->index.sym) | INIT_OFFSET_MASK;
+ DEBUGP("\t%s\n", info->secstrings + symsect->sh_name);
-@@ -1971,19 +1980,19 @@ static unsigned long layout_symtab(struc
+@@ -1981,19 +1991,19 @@ static void layout_symtab(struct module
}
/* Append room for core symbols at end of core part. */
-- symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
-- mod->core_size = symoffs + ndst * sizeof(Elf_Sym);
-+ symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
-+ mod->core_size_rx = symoffs + ndst * sizeof(Elf_Sym);
+- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
+- mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
++ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
++ mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
/* Put string table section at end of init part of module. */
strsect->sh_flags |= SHF_ALLOC;
- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
- strindex) | INIT_OFFSET_MASK;
- DEBUGP("\t%s\n", secstrings + strsect->sh_name);
+ info->index.str) | INIT_OFFSET_MASK;
+ DEBUGP("\t%s\n", info->secstrings + strsect->sh_name);
/* Append room for core symbols' strings at end of core part. */
-- *pstroffs = mod->core_size;
-+ *pstroffs = mod->core_size_rx;
- __set_bit(0, strmap);
-- mod->core_size += bitmap_weight(strmap, strsect->sh_size);
-+ mod->core_size_rx += bitmap_weight(strmap, strsect->sh_size);
-
- return symoffs;
+- info->stroffs = mod->core_size;
++ info->stroffs = mod->core_size_rx;
+ __set_bit(0, info->strmap);
+- mod->core_size += bitmap_weight(info->strmap, strsect->sh_size);
++ mod->core_size_rx += bitmap_weight(info->strmap, strsect->sh_size);
}
-@@ -2007,12 +2016,14 @@ static void add_kallsyms(struct module *
- mod->num_symtab = sechdrs[symindex].sh_size / sizeof(Elf_Sym);
- mod->strtab = (void *)sechdrs[strindex].sh_addr;
+
+ static void add_kallsyms(struct module *mod, const struct load_info *info)
+@@ -2009,11 +2019,13 @@ static void add_kallsyms(struct module *
+ /* Make sure we get permanent strtab: don't use info->strtab. */
+ mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
+ pax_open_kernel();
+
/* Set types up while we still have access to sections. */
for (i = 0; i < mod->num_symtab; i++)
- mod->symtab[i].st_info
-- = elf_type(&mod->symtab[i], sechdrs, secstrings, mod);
-+ = elf_type(&mod->symtab[i], sechdrs, secstrings);
+ mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
-- mod->core_symtab = dst = mod->module_core + symoffs;
-+ mod->core_symtab = dst = mod->module_core_rx + symoffs;
+- mod->core_symtab = dst = mod->module_core + info->symoffs;
++ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
src = mod->symtab;
*dst = *src;
for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) {
-@@ -2024,10 +2035,12 @@ static void add_kallsyms(struct module *
+@@ -2026,10 +2038,12 @@ static void add_kallsyms(struct module *
}
mod->core_num_syms = ndst;
-- mod->core_strtab = s = mod->module_core + stroffs;
-+ mod->core_strtab = s = mod->module_core_rx + stroffs;
- for (*s = 0, i = 1; i < sechdrs[strindex].sh_size; ++i)
- if (test_bit(i, strmap))
+- mod->core_strtab = s = mod->module_core + info->stroffs;
++ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
+ for (*s = 0, i = 1; i < info->sechdrs[info->index.str].sh_size; ++i)
+ if (test_bit(i, info->strmap))
*++s = mod->strtab[i];
+
+ pax_close_kernel();
}
#else
- static inline unsigned long layout_symtab(struct module *mod,
-@@ -2070,17 +2083,33 @@ static void dynamic_debug_remove(struct
+ static inline void layout_symtab(struct module *mod, struct load_info *info)
+@@ -2058,17 +2072,33 @@ static void dynamic_debug_remove(struct
ddebug_remove_module(debug->modname);
}
mutex_unlock(&module_mutex);
}
return ret;
-@@ -2284,7 +2313,7 @@ static noinline struct module *load_modu
- secstrings, &stroffs, strmap);
+@@ -2344,7 +2374,7 @@ static int move_module(struct module *mo
+ void *ptr;
/* Do the allocs. */
- ptr = module_alloc_update_bounds(mod->core_size);
/*
* The pointer to this block is stored in the module structure
* which is inside the block. Just mark it as not being a
-@@ -2295,23 +2324,47 @@ static noinline struct module *load_modu
- err = -ENOMEM;
- goto free_percpu;
- }
+@@ -2354,23 +2384,50 @@ static int move_module(struct module *mo
+ if (!ptr)
+ return -ENOMEM;
+
- memset(ptr, 0, mod->core_size);
- mod->module_core = ptr;
+ memset(ptr, 0, mod->core_size_rw);
*/
- kmemleak_ignore(ptr);
- if (!ptr && mod->init_size) {
+- module_free(mod, mod->module_core);
+ kmemleak_not_leak(ptr);
+ if (!ptr && mod->init_size_rw) {
-+ err = -ENOMEM;
-+ goto free_core_rw;
++ module_free(mod, mod->module_core_rw);
++ return -ENOMEM;
+ }
+ memset(ptr, 0, mod->init_size_rw);
+ mod->module_init_rw = ptr;
+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
+ kmemleak_not_leak(ptr);
+ if (!ptr) {
-+ err = -ENOMEM;
-+ goto free_init_rw;
-+ }
++ module_free(mod, mod->module_init_rw);
++ module_free(mod, mod->module_core_rw);
+ return -ENOMEM;
+ }
+- memset(ptr, 0, mod->init_size);
+- mod->module_init = ptr;
+
+ pax_open_kernel();
+ memset(ptr, 0, mod->core_size_rx);
+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
+ kmemleak_not_leak(ptr);
+ if (!ptr && mod->init_size_rx) {
- err = -ENOMEM;
-- goto free_core;
-+ goto free_core_rx;
- }
-- memset(ptr, 0, mod->init_size);
-- mod->module_init = ptr;
++ module_free_exec(mod, mod->module_core_rx);
++ module_free(mod, mod->module_init_rw);
++ module_free(mod, mod->module_core_rw);
++ return -ENOMEM;
++ }
+
+ pax_open_kernel();
+ memset(ptr, 0, mod->init_size_rx);
/* Transfer each section which specifies SHF_ALLOC */
DEBUGP("final section addresses:\n");
-@@ -2321,17 +2374,41 @@ static noinline struct module *load_modu
- if (!(sechdrs[i].sh_flags & SHF_ALLOC))
+@@ -2381,16 +2438,41 @@ static int move_module(struct module *mo
+ if (!(shdr->sh_flags & SHF_ALLOC))
continue;
-- if (sechdrs[i].sh_entsize & INIT_OFFSET_MASK)
+- if (shdr->sh_entsize & INIT_OFFSET_MASK)
- dest = mod->module_init
-- + (sechdrs[i].sh_entsize & ~INIT_OFFSET_MASK);
+- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
- else
-- dest = mod->module_core + sechdrs[i].sh_entsize;
-+ if (sechdrs[i].sh_entsize & INIT_OFFSET_MASK) {
-+ if ((sechdrs[i].sh_flags & SHF_WRITE) || !(sechdrs[i].sh_flags & SHF_ALLOC))
+- dest = mod->module_core + shdr->sh_entsize;
++ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
++ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
+ dest = mod->module_init_rw
-+ + (sechdrs[i].sh_entsize & ~INIT_OFFSET_MASK);
++ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
+ else
+ dest = mod->module_init_rx
-+ + (sechdrs[i].sh_entsize & ~INIT_OFFSET_MASK);
++ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
+ } else {
-+ if ((sechdrs[i].sh_flags & SHF_WRITE) || !(sechdrs[i].sh_flags & SHF_ALLOC))
-+ dest = mod->module_core_rw + sechdrs[i].sh_entsize;
++ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
++ dest = mod->module_core_rw + shdr->sh_entsize;
+ else
-+ dest = mod->module_core_rx + sechdrs[i].sh_entsize;
++ dest = mod->module_core_rx + shdr->sh_entsize;
+ }
+
-+ if (sechdrs[i].sh_type != SHT_NOBITS) {
-
-- if (sechdrs[i].sh_type != SHT_NOBITS)
-- memcpy(dest, (void *)sechdrs[i].sh_addr,
-- sechdrs[i].sh_size);
++ if (shdr->sh_type != SHT_NOBITS) {
++
+#ifdef CONFIG_PAX_KERNEXEC
-+ if (!(sechdrs[i].sh_flags & SHF_WRITE) && (sechdrs[i].sh_flags & SHF_ALLOC)) {
++ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
+ pax_open_kernel();
-+ memcpy(dest, (void *)sechdrs[i].sh_addr, sechdrs[i].sh_size);
++ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
+ pax_close_kernel();
+ } else
+#endif
-+
-+ memcpy(dest, (void *)sechdrs[i].sh_addr, sechdrs[i].sh_size);
+
+- if (shdr->sh_type != SHT_NOBITS)
+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
+ }
/* Update sh_addr to point to copy in image. */
-- sechdrs[i].sh_addr = (unsigned long)dest;
+- shdr->sh_addr = (unsigned long)dest;
+
+#ifdef CONFIG_PAX_KERNEXEC
-+ if (sechdrs[i].sh_flags & SHF_EXECINSTR)
-+ sechdrs[i].sh_addr = ktva_ktla((unsigned long)dest);
++ if (shdr->sh_flags & SHF_EXECINSTR)
++ shdr->sh_addr = ktva_ktla((unsigned long)dest);
+ else
+#endif
+
-+ sechdrs[i].sh_addr = (unsigned long)dest;
- DEBUGP("\t0x%lx %s\n", sechdrs[i].sh_addr, secstrings + sechdrs[i].sh_name);
- }
- /* Module has been moved. */
-@@ -2342,7 +2419,7 @@ static noinline struct module *load_modu
- mod->refptr = alloc_percpu(struct module_ref);
- if (!mod->refptr) {
- err = -ENOMEM;
-- goto free_init;
-+ goto free_init_rx;
++ shdr->sh_addr = (unsigned long)dest;
+ DEBUGP("\t0x%lx %s\n",
+ shdr->sh_addr, info->secstrings + shdr->sh_name);
}
- #endif
- /* Now we've moved module, initialize linked lists, etc. */
-@@ -2452,8 +2529,8 @@ static noinline struct module *load_modu
-
- /* Now do relocations. */
- for (i = 1; i < hdr->e_shnum; i++) {
-- const char *strtab = (char *)sechdrs[strindex].sh_addr;
- unsigned int info = sechdrs[i].sh_info;
-+ strtab = (char *)sechdrs[strindex].sh_addr;
-
- /* Not a valid relocation section? */
- if (info >= hdr->e_shnum)
-@@ -2503,12 +2580,12 @@ static noinline struct module *load_modu
+@@ -2441,12 +2523,12 @@ static void flush_module_icache(const st
* Do it before processing of module parameters, so the module
* can provide parameter accessor functions of its own.
*/
+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
set_fs(old_fs);
-
-@@ -2574,12 +2651,16 @@ static noinline struct module *load_modu
- free_modinfo(mod);
- module_unload_free(mod);
- #if defined(CONFIG_MODULE_UNLOAD)
-+ free_init_rx:
- free_percpu(mod->refptr);
-- free_init:
- #endif
+ }
+@@ -2518,8 +2600,10 @@ static void module_deallocate(struct mod
+ {
+ kfree(info->strmap);
+ percpu_modfree(mod);
- module_free(mod, mod->module_init);
-- free_core:
- module_free(mod, mod->module_core);
+ module_free_exec(mod, mod->module_init_rx);
-+ free_core_rx:
+ module_free_exec(mod, mod->module_core_rx);
-+ free_init_rw:
+ module_free(mod, mod->module_init_rw);
-+ free_core_rw:
+ module_free(mod, mod->module_core_rw);
- /* mod will be freed with core. Don't access it beyond this line! */
- free_percpu:
- free_percpu(percpu);
-@@ -2669,10 +2750,12 @@ SYSCALL_DEFINE3(init_module, void __user
+ }
+
+ static int post_relocation(struct module *mod, const struct load_info *info)
+@@ -2747,10 +2831,12 @@ SYSCALL_DEFINE3(init_module, void __user
mod->symtab = mod->core_symtab;
mod->strtab = mod->core_strtab;
#endif
mutex_unlock(&module_mutex);
return 0;
-@@ -2703,10 +2786,16 @@ static const char *get_ksymbol(struct mo
+@@ -2781,10 +2867,16 @@ static const char *get_ksymbol(struct mo
unsigned long nextval;
/* At worse, next value is at end of module */
/* Scan for closest preceeding symbol, and next symbol. (ELF
starts real symbols at 1). */
-@@ -2952,7 +3041,7 @@ static int m_show(struct seq_file *m, vo
+@@ -3030,7 +3122,7 @@ static int m_show(struct seq_file *m, vo
char buf[8];
seq_printf(m, "%s %u",
print_unload_info(m, mod);
/* Informative for users. */
-@@ -2961,7 +3050,7 @@ static int m_show(struct seq_file *m, vo
+@@ -3039,7 +3131,7 @@ static int m_show(struct seq_file *m, vo
mod->state == MODULE_STATE_COMING ? "Loading":
"Live");
/* Used by oprofile and other similar tools. */
/* Taints info */
if (mod->taints)
-@@ -2997,7 +3086,17 @@ static const struct file_operations proc
+@@ -3075,7 +3167,17 @@ static const struct file_operations proc
static int __init proc_modules_init(void)
{
return 0;
}
module_init(proc_modules_init);
-@@ -3056,12 +3155,12 @@ struct module *__module_address(unsigned
+@@ -3134,12 +3236,12 @@ struct module *__module_address(unsigned
{
struct module *mod;
return mod;
return NULL;
}
-@@ -3095,11 +3194,20 @@ bool is_module_text_address(unsigned lon
+@@ -3173,11 +3275,20 @@ bool is_module_text_address(unsigned lon
*/
struct module *__module_text_address(unsigned long addr)
{
mod = NULL;
}
return mod;
-diff -urNp linux-2.6.35.4/kernel/panic.c linux-2.6.35.4/kernel/panic.c
---- linux-2.6.35.4/kernel/panic.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/panic.c 2010-09-17 20:12:09.000000000 -0400
-@@ -429,7 +429,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
+diff -urNp linux-2.6.36/kernel/panic.c linux-2.6.36/kernel/panic.c
+--- linux-2.6.36/kernel/panic.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/panic.c 2010-11-06 18:58:15.000000000 -0400
+@@ -423,7 +423,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
*/
void __stack_chk_fail(void)
{
__builtin_return_address(0));
}
EXPORT_SYMBOL(__stack_chk_fail);
-diff -urNp linux-2.6.35.4/kernel/pid.c linux-2.6.35.4/kernel/pid.c
---- linux-2.6.35.4/kernel/pid.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/pid.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/kernel/pid.c linux-2.6.36/kernel/pid.c
+--- linux-2.6.36/kernel/pid.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/pid.c 2010-11-06 18:58:50.000000000 -0400
@@ -33,6 +33,7 @@
#include <linux/rculist.h>
#include <linux/bootmem.h>
int pid_max_min = RESERVED_PIDS + 1;
int pid_max_max = PID_MAX_LIMIT;
-@@ -382,7 +383,14 @@ EXPORT_SYMBOL(pid_task);
+@@ -416,7 +417,14 @@ EXPORT_SYMBOL(pid_task);
*/
struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
{
}
struct task_struct *find_task_by_vpid(pid_t vnr)
-diff -urNp linux-2.6.35.4/kernel/posix-cpu-timers.c linux-2.6.35.4/kernel/posix-cpu-timers.c
---- linux-2.6.35.4/kernel/posix-cpu-timers.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/posix-cpu-timers.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/kernel/posix-cpu-timers.c linux-2.6.36/kernel/posix-cpu-timers.c
+--- linux-2.6.36/kernel/posix-cpu-timers.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/posix-cpu-timers.c 2010-11-06 18:58:50.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>
-@@ -972,6 +973,7 @@ static void check_thread_timers(struct t
+@@ -965,6 +966,7 @@ static void check_thread_timers(struct t
unsigned long hard =
ACCESS_ONCE(sig->rlim[RLIMIT_RTTIME].rlim_max);
if (hard != RLIM_INFINITY &&
tsk->rt.timeout > DIV_ROUND_UP(hard, USEC_PER_SEC/HZ)) {
/*
-@@ -1138,6 +1140,7 @@ static void check_process_timers(struct
+@@ -1131,6 +1133,7 @@ static void check_process_timers(struct
unsigned long hard =
ACCESS_ONCE(sig->rlim[RLIMIT_CPU].rlim_max);
cputime_t x;
if (psecs >= hard) {
/*
* At the hard limit, we just die.
-diff -urNp linux-2.6.35.4/kernel/power/hibernate.c linux-2.6.35.4/kernel/power/hibernate.c
---- linux-2.6.35.4/kernel/power/hibernate.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/power/hibernate.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/kernel/power/hibernate.c linux-2.6.36/kernel/power/hibernate.c
+--- linux-2.6.36/kernel/power/hibernate.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/power/hibernate.c 2010-11-06 18:58:15.000000000 -0400
@@ -50,14 +50,14 @@ enum {
static int hibernation_mode = HIBERNATION_SHUTDOWN;
{
if (ops && !(ops->begin && ops->end && ops->pre_snapshot
&& ops->prepare && ops->finish && ops->enter && ops->pre_restore
-diff -urNp linux-2.6.35.4/kernel/power/poweroff.c linux-2.6.35.4/kernel/power/poweroff.c
---- linux-2.6.35.4/kernel/power/poweroff.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/power/poweroff.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/kernel/power/poweroff.c linux-2.6.36/kernel/power/poweroff.c
+--- linux-2.6.36/kernel/power/poweroff.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/power/poweroff.c 2010-11-06 18:58:15.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.35.4/kernel/power/process.c linux-2.6.35.4/kernel/power/process.c
---- linux-2.6.35.4/kernel/power/process.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/power/process.c 2010-09-17 20:12:09.000000000 -0400
-@@ -38,12 +38,15 @@ static int try_to_freeze_tasks(bool sig_
+diff -urNp linux-2.6.36/kernel/power/process.c linux-2.6.36/kernel/power/process.c
+--- linux-2.6.36/kernel/power/process.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/power/process.c 2010-11-06 18:58:15.000000000 -0400
+@@ -40,6 +40,7 @@ static int try_to_freeze_tasks(bool sig_
struct timeval start, end;
u64 elapsed_csecs64;
unsigned int elapsed_csecs;
do_gettimeofday(&start);
- end_time = jiffies + TIMEOUT;
+@@ -50,6 +51,8 @@ static int try_to_freeze_tasks(bool sig_
+
while (true) {
todo = 0;
+ if (time_after(jiffies, end_time))
read_lock(&tasklist_lock);
do_each_thread(g, p) {
if (frozen(p) || !freezeable(p))
-@@ -58,12 +61,16 @@ static int try_to_freeze_tasks(bool sig_
+@@ -64,9 +67,13 @@ static int try_to_freeze_tasks(bool sig_
* It is "frozen enough". If the task does wake
* up, it will immediately call try_to_freeze.
*/
+ }
} while_each_thread(g, p);
read_unlock(&tasklist_lock);
+
+@@ -75,7 +82,7 @@ static int try_to_freeze_tasks(bool sig_
+ todo += wq_busy;
+ }
+
- if (!todo || time_after(jiffies, end_time))
+ if (!todo || timedout)
break;
/*
-diff -urNp linux-2.6.35.4/kernel/power/suspend.c linux-2.6.35.4/kernel/power/suspend.c
---- linux-2.6.35.4/kernel/power/suspend.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/power/suspend.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/kernel/power/suspend.c linux-2.6.36/kernel/power/suspend.c
+--- linux-2.6.36/kernel/power/suspend.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/power/suspend.c 2010-11-06 18:58:15.000000000 -0400
@@ -30,13 +30,13 @@ const char *const pm_states[PM_SUSPEND_M
[PM_SUSPEND_MEM] = "mem",
};
{
mutex_lock(&pm_mutex);
suspend_ops = ops;
-diff -urNp linux-2.6.35.4/kernel/printk.c linux-2.6.35.4/kernel/printk.c
---- linux-2.6.35.4/kernel/printk.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/printk.c 2010-09-17 20:12:37.000000000 -0400
-@@ -266,6 +266,11 @@ int do_syslog(int type, char __user *buf
+diff -urNp linux-2.6.36/kernel/printk.c linux-2.6.36/kernel/printk.c
+--- linux-2.6.36/kernel/printk.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/printk.c 2010-11-06 18:58:50.000000000 -0400
+@@ -268,6 +268,11 @@ int do_syslog(int type, char __user *buf
char c;
int error = 0;
error = security_syslog(type, from_file);
if (error)
return error;
-diff -urNp linux-2.6.35.4/kernel/ptrace.c linux-2.6.35.4/kernel/ptrace.c
---- linux-2.6.35.4/kernel/ptrace.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/ptrace.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/kernel/ptrace.c linux-2.6.36/kernel/ptrace.c
+--- linux-2.6.36/kernel/ptrace.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/ptrace.c 2010-11-06 18:58:50.000000000 -0400
@@ -140,7 +140,7 @@ int __ptrace_may_access(struct task_stru
cred->gid != tcred->egid ||
cred->gid != tcred->sgid ||
task->ptrace |= PT_PTRACE_CAP;
__ptrace_link(task, current);
-@@ -361,7 +361,7 @@ int ptrace_readdata(struct task_struct *
+@@ -367,7 +367,7 @@ int ptrace_readdata(struct task_struct *
break;
return -EIO;
}
return -EFAULT;
copied += retval;
src += retval;
-@@ -572,18 +572,18 @@ int ptrace_request(struct task_struct *c
+@@ -578,18 +578,18 @@ int ptrace_request(struct task_struct *c
ret = ptrace_setoptions(child, data);
break;
case PTRACE_GETEVENTMSG:
sizeof siginfo))
ret = -EFAULT;
else
-@@ -703,14 +703,21 @@ SYSCALL_DEFINE4(ptrace, long, request, l
+@@ -709,14 +709,21 @@ SYSCALL_DEFINE4(ptrace, long, request, l
goto out;
}
goto out_put_task_struct;
}
-@@ -734,7 +741,7 @@ int generic_ptrace_peekdata(struct task_
+@@ -740,7 +747,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, long addr, long data)
-diff -urNp linux-2.6.35.4/kernel/rcutree.c linux-2.6.35.4/kernel/rcutree.c
---- linux-2.6.35.4/kernel/rcutree.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/rcutree.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1356,7 +1356,7 @@ __rcu_process_callbacks(struct rcu_state
+diff -urNp linux-2.6.36/kernel/rcutree.c linux-2.6.36/kernel/rcutree.c
+--- linux-2.6.36/kernel/rcutree.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/rcutree.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1357,7 +1357,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.35.4/kernel/resource.c linux-2.6.35.4/kernel/resource.c
---- linux-2.6.35.4/kernel/resource.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/resource.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/kernel/resource.c linux-2.6.36/kernel/resource.c
+--- linux-2.6.36/kernel/resource.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/resource.c 2010-11-06 18:58:50.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.35.4/kernel/sched.c linux-2.6.35.4/kernel/sched.c
---- linux-2.6.35.4/kernel/sched.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/sched.c 2010-09-17 20:12:37.000000000 -0400
-@@ -4266,6 +4266,8 @@ int can_nice(const struct task_struct *p
+diff -urNp linux-2.6.36/kernel/rtmutex.c linux-2.6.36/kernel/rtmutex.c
+--- linux-2.6.36/kernel/rtmutex.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/rtmutex.c 2010-11-06 18:58: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.36/kernel/sched.c linux-2.6.36/kernel/sched.c
+--- linux-2.6.36/kernel/sched.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/sched.c 2010-11-06 19:41:42.000000000 -0400
+@@ -4443,6 +4443,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));
}
-@@ -4299,7 +4301,8 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -4476,7 +4478,8 @@ SYSCALL_DEFINE1(nice, int, increment)
if (nice > 19)
nice = 19;
return -EPERM;
retval = security_task_setnice(current, nice);
-@@ -4446,6 +4449,7 @@ recheck:
- rlim_rtprio = task_rlimit(p, RLIMIT_RTPRIO);
- unlock_task_sighand(p, &flags);
+@@ -4619,6 +4622,7 @@ recheck:
+ unsigned long rlim_rtprio =
+ task_rlimit(p, RLIMIT_RTPRIO);
-+ gr_learn_resource(p, RLIMIT_RTPRIO, param->sched_priority, 1);
++ gr_learn_resource(p, RLIMIT_RTPRIO, param->sched_priority, 1);
/* can't set/change the rt policy */
if (policy != p->policy && !rlim_rtprio)
return -EPERM;
-diff -urNp linux-2.6.35.4/kernel/sched_fair.c linux-2.6.35.4/kernel/sched_fair.c
---- linux-2.6.35.4/kernel/sched_fair.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/sched_fair.c 2010-09-17 20:12:09.000000000 -0400
-@@ -3390,7 +3390,7 @@ out:
- * In CONFIG_NO_HZ case, the idle load balance owner will do the
- * rebalancing for all the cpus for whom scheduler ticks are stopped.
+@@ -6785,7 +6789,7 @@ static void init_sched_groups_power(int
+ long power;
+ int weight;
+
+- WARN_ON(!sd || !sd->groups);
++ BUG_ON(!sd || !sd->groups);
+
+ if (cpu != group_first_cpu(sd->groups))
+ return;
+diff -urNp linux-2.6.36/kernel/sched_fair.c linux-2.6.36/kernel/sched_fair.c
+--- linux-2.6.36/kernel/sched_fair.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/sched_fair.c 2010-11-06 18:58:15.000000000 -0400
+@@ -3662,7 +3662,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).
*/
-static void run_rebalance_domains(struct softirq_action *h)
+static void run_rebalance_domains(void)
{
int this_cpu = smp_processor_id();
struct rq *this_rq = cpu_rq(this_cpu);
-diff -urNp linux-2.6.35.4/kernel/signal.c linux-2.6.35.4/kernel/signal.c
---- linux-2.6.35.4/kernel/signal.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/signal.c 2010-09-17 20:20:18.000000000 -0400
+diff -urNp linux-2.6.36/kernel/signal.c linux-2.6.36/kernel/signal.c
+--- linux-2.6.36/kernel/signal.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/signal.c 2010-11-06 18:58:50.000000000 -0400
@@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache
int print_fatal_signals __read_mostly;
return ret;
}
-diff -urNp linux-2.6.35.4/kernel/smp.c linux-2.6.35.4/kernel/smp.c
---- linux-2.6.35.4/kernel/smp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/smp.c 2010-09-17 20:12:09.000000000 -0400
-@@ -499,22 +499,22 @@ int smp_call_function(void (*func)(void
+diff -urNp linux-2.6.36/kernel/smp.c linux-2.6.36/kernel/smp.c
+--- linux-2.6.36/kernel/smp.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/smp.c 2010-11-06 18:58:15.000000000 -0400
+@@ -510,22 +510,22 @@ int smp_call_function(void (*func)(void
}
EXPORT_SYMBOL(smp_call_function);
{
raw_spin_unlock_irq(&call_function.lock);
}
-diff -urNp linux-2.6.35.4/kernel/softirq.c linux-2.6.35.4/kernel/softirq.c
---- linux-2.6.35.4/kernel/softirq.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/softirq.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/kernel/softirq.c linux-2.6.36/kernel/softirq.c
+--- linux-2.6.36/kernel/softirq.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/softirq.c 2010-11-06 18:58:15.000000000 -0400
@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
{
struct tasklet_struct *list;
-diff -urNp linux-2.6.35.4/kernel/sys.c linux-2.6.35.4/kernel/sys.c
---- linux-2.6.35.4/kernel/sys.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/sys.c 2010-09-17 20:28:33.000000000 -0400
+diff -urNp linux-2.6.36/kernel/sys.c linux-2.6.36/kernel/sys.c
+--- linux-2.6.36/kernel/sys.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/sys.c 2010-11-06 18:58:50.000000000 -0400
@@ -134,6 +134,12 @@ static int set_one_prio(struct task_stru
error = -EACCES;
goto out;
abort_creds(new);
return old_fsgid;
-@@ -1491,7 +1527,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
+@@ -1607,7 +1643,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.35.4/kernel/sysctl.c linux-2.6.35.4/kernel/sysctl.c
---- linux-2.6.35.4/kernel/sysctl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/sysctl.c 2010-09-17 20:18:09.000000000 -0400
-@@ -78,6 +78,13 @@
+diff -urNp linux-2.6.36/kernel/sysctl.c linux-2.6.36/kernel/sysctl.c
+--- linux-2.6.36/kernel/sysctl.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/sysctl.c 2010-11-06 18:58:50.000000000 -0400
+@@ -83,6 +83,13 @@
#if defined(CONFIG_SYSCTL)
/* External variables not in a header file. */
extern int sysctl_overcommit_memory;
-@@ -185,6 +192,7 @@ static int sysrq_sysctl_handler(ctl_tabl
+@@ -190,6 +197,7 @@ static int sysrq_sysctl_handler(ctl_tabl
}
#endif
static struct ctl_table root_table[];
static struct ctl_table_root sysctl_table_root;
-@@ -217,6 +225,20 @@ extern struct ctl_table epoll_table[];
+@@ -219,6 +227,20 @@ extern struct ctl_table epoll_table[];
int sysctl_legacy_va_layout;
#endif
/* The default sysctl tables: */
static struct ctl_table root_table[] = {
-@@ -269,6 +291,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,
-@@ -1171,6 +1209,13 @@ static struct ctl_table vm_table[] = {
+@@ -1173,6 +1211,13 @@ static struct ctl_table vm_table[] = {
.proc_handler = proc_dointvec_minmax,
.extra1 = &zero,
},
#else
{
.procname = "nr_trim_pages",
-@@ -1686,6 +1731,16 @@ int sysctl_perm(struct ctl_table_root *r
+@@ -1688,6 +1733,16 @@ int sysctl_perm(struct ctl_table_root *r
int error;
int mode;
error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
if (error)
return error;
-@@ -2201,6 +2256,8 @@ static int proc_put_long(void __user **b
+@@ -2200,6 +2255,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;
-diff -urNp linux-2.6.35.4/kernel/taskstats.c linux-2.6.35.4/kernel/taskstats.c
---- linux-2.6.35.4/kernel/taskstats.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/taskstats.c 2010-09-17 20:12:37.000000000 -0400
+@@ -2505,8 +2562,11 @@ static int __do_proc_doulongvec_minmax(v
+ *i = val;
+ } else {
+ val = convdiv * (*i) / convmul;
+- if (!first)
++ if (!first) {
+ err = proc_put_char(&buffer, &left, '\t');
++ if (err)
++ break;
++ }
+ err = proc_put_long(&buffer, &left, val, false);
+ if (err)
+ break;
+diff -urNp linux-2.6.36/kernel/taskstats.c linux-2.6.36/kernel/taskstats.c
+--- linux-2.6.36/kernel/taskstats.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/taskstats.c 2010-11-06 18:58:50.000000000 -0400
@@ -27,9 +27,12 @@
#include <linux/cgroup.h>
#include <linux/fs.h>
if (!alloc_cpumask_var(&mask, GFP_KERNEL))
return -ENOMEM;
-diff -urNp linux-2.6.35.4/kernel/time/tick-broadcast.c linux-2.6.35.4/kernel/time/tick-broadcast.c
---- linux-2.6.35.4/kernel/time/tick-broadcast.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/time/tick-broadcast.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/kernel/time/tick-broadcast.c linux-2.6.36/kernel/time/tick-broadcast.c
+--- linux-2.6.36/kernel/time/tick-broadcast.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/time/tick-broadcast.c 2010-11-06 18:58:15.000000000 -0400
@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
* then clear the broadcast bit.
*/
cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
tick_broadcast_clear_oneshot(cpu);
-diff -urNp linux-2.6.35.4/kernel/time/timer_list.c linux-2.6.35.4/kernel/time/timer_list.c
---- linux-2.6.35.4/kernel/time/timer_list.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/time/timer_list.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/kernel/time/timer_list.c linux-2.6.36/kernel/time/timer_list.c
+--- linux-2.6.36/kernel/time/timer_list.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/time/timer_list.c 2010-11-06 18:58:50.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.35.4/kernel/time/timer_stats.c linux-2.6.35.4/kernel/time/timer_stats.c
---- linux-2.6.35.4/kernel/time/timer_stats.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/time/timer_stats.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/kernel/time/timer_stats.c linux-2.6.36/kernel/time/timer_stats.c
+--- linux-2.6.36/kernel/time/timer_stats.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/time/timer_stats.c 2010-11-06 18:58:50.000000000 -0400
@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *time
static void print_name_offset(struct seq_file *m, unsigned long addr)
if (!pe)
return -ENOMEM;
return 0;
-diff -urNp linux-2.6.35.4/kernel/time.c linux-2.6.35.4/kernel/time.c
---- linux-2.6.35.4/kernel/time.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/time.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/kernel/time.c linux-2.6.36/kernel/time.c
+--- linux-2.6.36/kernel/time.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/time.c 2010-11-06 18:58:50.000000000 -0400
@@ -93,6 +93,9 @@ SYSCALL_DEFINE1(stime, time_t __user *,
return err;
{
#if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
return (USEC_PER_SEC / HZ) * j;
-diff -urNp linux-2.6.35.4/kernel/timer.c linux-2.6.35.4/kernel/timer.c
---- linux-2.6.35.4/kernel/timer.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/timer.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1272,7 +1272,7 @@ void update_process_times(int user_tick)
+diff -urNp linux-2.6.36/kernel/timer.c linux-2.6.36/kernel/timer.c
+--- linux-2.6.36/kernel/timer.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/timer.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1287,7 +1287,7 @@ void update_process_times(int user_tick)
/*
* This function runs timers and the timer-tq in bottom half context.
*/
{
struct tvec_base *base = __get_cpu_var(tvec_bases);
-diff -urNp linux-2.6.35.4/kernel/trace/ftrace.c linux-2.6.35.4/kernel/trace/ftrace.c
---- linux-2.6.35.4/kernel/trace/ftrace.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/trace/ftrace.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1101,13 +1101,18 @@ ftrace_code_disable(struct module *mod,
+diff -urNp linux-2.6.36/kernel/trace/ftrace.c linux-2.6.36/kernel/trace/ftrace.c
+--- linux-2.6.36/kernel/trace/ftrace.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/trace/ftrace.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1108,13 +1108,18 @@ ftrace_code_disable(struct module *mod,
ip = rec->ip;
}
/*
-diff -urNp linux-2.6.35.4/kernel/trace/ring_buffer.c linux-2.6.35.4/kernel/trace/ring_buffer.c
---- linux-2.6.35.4/kernel/trace/ring_buffer.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/trace/ring_buffer.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/kernel/trace/ring_buffer.c linux-2.6.36/kernel/trace/ring_buffer.c
+--- linux-2.6.36/kernel/trace/ring_buffer.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/trace/ring_buffer.c 2010-11-06 18:58:15.000000000 -0400
@@ -635,7 +635,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.
rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
struct buffer_page *page, struct list_head *list)
{
-diff -urNp linux-2.6.35.4/kernel/trace/trace.c linux-2.6.35.4/kernel/trace/trace.c
---- linux-2.6.35.4/kernel/trace/trace.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/trace/trace.c 2010-09-17 20:12:09.000000000 -0400
-@@ -3965,10 +3965,9 @@ static const struct file_operations trac
+diff -urNp linux-2.6.36/kernel/trace/trace.c linux-2.6.36/kernel/trace/trace.c
+--- linux-2.6.36/kernel/trace/trace.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/trace/trace.c 2010-11-06 18:58:15.000000000 -0400
+@@ -3943,10 +3943,9 @@ static const struct file_operations trac
};
#endif
static int once;
if (d_tracer)
-@@ -3988,10 +3987,9 @@ struct dentry *tracing_init_dentry(void)
+@@ -3966,10 +3965,9 @@ struct dentry *tracing_init_dentry(void)
return d_tracer;
}
static int once;
struct dentry *d_tracer;
-diff -urNp linux-2.6.35.4/kernel/trace/trace_output.c linux-2.6.35.4/kernel/trace/trace_output.c
---- linux-2.6.35.4/kernel/trace/trace_output.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/trace/trace_output.c 2010-09-17 20:12:09.000000000 -0400
-@@ -281,7 +281,7 @@ int trace_seq_path(struct trace_seq *s,
+diff -urNp linux-2.6.36/kernel/trace/trace_output.c linux-2.6.36/kernel/trace/trace_output.c
+--- linux-2.6.36/kernel/trace/trace_output.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/trace/trace_output.c 2010-11-06 18:58:15.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 (!IS_ERR(p)) {
if (p) {
s->len = p - s->buffer;
return 1;
-diff -urNp linux-2.6.35.4/kernel/trace/trace_stack.c linux-2.6.35.4/kernel/trace/trace_stack.c
---- linux-2.6.35.4/kernel/trace/trace_stack.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/kernel/trace/trace_stack.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/kernel/trace/trace_stack.c linux-2.6.36/kernel/trace/trace_stack.c
+--- linux-2.6.36/kernel/trace/trace_stack.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/kernel/trace/trace_stack.c 2010-11-06 18:58:15.000000000 -0400
@@ -50,7 +50,7 @@ static inline void check_stack(void)
return;
return;
local_irq_save(flags);
-diff -urNp linux-2.6.35.4/lib/bug.c linux-2.6.35.4/lib/bug.c
---- linux-2.6.35.4/lib/bug.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/lib/bug.c 2010-09-17 20:12:09.000000000 -0400
-@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
+diff -urNp linux-2.6.36/lib/bug.c linux-2.6.36/lib/bug.c
+--- linux-2.6.36/lib/bug.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/lib/bug.c 2010-11-06 18:58:15.000000000 -0400
+@@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l
return BUG_TRAP_TYPE_NONE;
bug = find_bug(bugaddr);
+ if (!bug)
+ return BUG_TRAP_TYPE_NONE;
- printk(KERN_EMERG "------------[ cut here ]------------\n");
-
-diff -urNp linux-2.6.35.4/lib/debugobjects.c linux-2.6.35.4/lib/debugobjects.c
---- linux-2.6.35.4/lib/debugobjects.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/lib/debugobjects.c 2010-09-17 20:12:09.000000000 -0400
+ file = NULL;
+ line = 0;
+diff -urNp linux-2.6.36/lib/debugobjects.c linux-2.6.36/lib/debugobjects.c
+--- linux-2.6.36/lib/debugobjects.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/lib/debugobjects.c 2010-11-06 18:58:15.000000000 -0400
@@ -281,7 +281,7 @@ static void debug_object_is_on_stack(voi
if (limit > 4)
return;
if (is_on_stack == onstack)
return;
-diff -urNp linux-2.6.35.4/lib/dma-debug.c linux-2.6.35.4/lib/dma-debug.c
---- linux-2.6.35.4/lib/dma-debug.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/lib/dma-debug.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/lib/dma-debug.c linux-2.6.36/lib/dma-debug.c
+--- linux-2.6.36/lib/dma-debug.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/lib/dma-debug.c 2010-11-06 18:58:15.000000000 -0400
@@ -861,7 +861,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.35.4/lib/inflate.c linux-2.6.35.4/lib/inflate.c
---- linux-2.6.35.4/lib/inflate.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/lib/inflate.c 2010-09-17 20:12:09.000000000 -0400
-@@ -267,7 +267,7 @@ static void free(void *where)
+diff -urNp linux-2.6.36/lib/inflate.c linux-2.6.36/lib/inflate.c
+--- linux-2.6.36/lib/inflate.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/lib/inflate.c 2010-11-06 18:58:15.000000000 -0400
+@@ -269,7 +269,7 @@ static void free(void *where)
malloc_ptr = free_mem_ptr;
}
#else
#define free(a) kfree(a)
#endif
-diff -urNp linux-2.6.35.4/lib/Kconfig.debug linux-2.6.35.4/lib/Kconfig.debug
---- linux-2.6.35.4/lib/Kconfig.debug 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/lib/Kconfig.debug 2010-09-17 20:12:37.000000000 -0400
-@@ -970,7 +970,7 @@ config LATENCYTOP
- select STACKTRACE
- select SCHEDSTATS
- select SCHED_DEBUG
-- depends on HAVE_LATENCYTOP_SUPPORT
-+ depends on HAVE_LATENCYTOP_SUPPORT && !GRKERNSEC_HIDESYM
- help
- Enable this option if you want to use the LatencyTOP tool
- to find out which userspace is blocking on what kernel operations.
-diff -urNp linux-2.6.35.4/lib/parser.c linux-2.6.35.4/lib/parser.c
---- linux-2.6.35.4/lib/parser.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/lib/parser.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/lib/Kconfig.debug linux-2.6.36/lib/Kconfig.debug
+--- linux-2.6.36/lib/Kconfig.debug 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/lib/Kconfig.debug 2010-11-06 19:03:24.000000000 -0400
+@@ -998,6 +998,7 @@ config LATENCYTOP
+ depends on DEBUG_KERNEL
+ depends on STACKTRACE_SUPPORT
+ depends on PROC_FS
++ depends on !GRKERNSEC_HIDESYM
+ select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE
+ select KALLSYMS
+ select KALLSYMS_ALL
+diff -urNp linux-2.6.36/lib/kref.c linux-2.6.36/lib/kref.c
+--- linux-2.6.36/lib/kref.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/lib/kref.c 2010-11-06 18:58:15.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 == NULL);
++ BUG_ON(release == NULL);
+ WARN_ON(release == (void (*)(struct kref *))kfree);
+
+ if (atomic_dec_and_test(&kref->refcount)) {
+diff -urNp linux-2.6.36/lib/parser.c linux-2.6.36/lib/parser.c
+--- linux-2.6.36/lib/parser.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/lib/parser.c 2010-11-06 18:58:15.000000000 -0400
@@ -129,7 +129,7 @@ static int match_number(substring_t *s,
char *buf;
int ret;
if (!buf)
return -ENOMEM;
memcpy(buf, s->from, s->to - s->from);
-diff -urNp linux-2.6.35.4/lib/radix-tree.c linux-2.6.35.4/lib/radix-tree.c
---- linux-2.6.35.4/lib/radix-tree.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/lib/radix-tree.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/lib/radix-tree.c linux-2.6.36/lib/radix-tree.c
+--- linux-2.6.36/lib/radix-tree.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/lib/radix-tree.c 2010-11-06 18:58:15.000000000 -0400
@@ -80,7 +80,7 @@ struct radix_tree_preload {
int nr;
struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
{
-diff -urNp linux-2.6.35.4/localversion-grsec linux-2.6.35.4/localversion-grsec
---- linux-2.6.35.4/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.4/localversion-grsec 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/lib/vsprintf.c linux-2.6.36/lib/vsprintf.c
+--- linux-2.6.36/lib/vsprintf.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/lib/vsprintf.c 2010-11-06 18:58:15.000000000 -0400
+@@ -989,7 +989,7 @@ char *pointer(const char *fmt, char *buf
+ struct printf_spec spec)
+ {
+ if (!ptr)
+- return string(buf, end, "(null)", spec);
++ return string(buf, end, "(nil)", spec);
+
+ switch (*fmt) {
+ case 'F':
+diff -urNp linux-2.6.36/localversion-grsec linux-2.6.36/localversion-grsec
+--- linux-2.6.36/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/localversion-grsec 2010-11-06 18:58:50.000000000 -0400
@@ -0,0 +1 @@
+-grsec
-diff -urNp linux-2.6.35.4/Makefile linux-2.6.35.4/Makefile
---- linux-2.6.35.4/Makefile 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/Makefile 2010-09-17 20:12:37.000000000 -0400
-@@ -230,8 +230,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
+diff -urNp linux-2.6.36/Makefile linux-2.6.36/Makefile
+--- linux-2.6.36/Makefile 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/Makefile 2010-11-06 18:58:50.000000000 -0400
+@@ -229,8 +229,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
HOSTCC = gcc
HOSTCXX = g++
# Decide whether to build built-in, modular, or both.
# Normally, just do built-in.
-@@ -650,7 +650,7 @@ export mod_strip_cmd
+@@ -659,7 +659,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.35.4/mm/bootmem.c linux-2.6.35.4/mm/bootmem.c
---- linux-2.6.35.4/mm/bootmem.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/bootmem.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/mm/bootmem.c linux-2.6.36/mm/bootmem.c
+--- linux-2.6.36/mm/bootmem.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/bootmem.c 2010-11-06 18:58:15.000000000 -0400
@@ -200,19 +200,30 @@ static void __init __free_pages_memory(u
unsigned long __init free_all_memory_core_early(int nodeid)
{
return count;
}
-diff -urNp linux-2.6.35.4/mm/filemap.c linux-2.6.35.4/mm/filemap.c
---- linux-2.6.35.4/mm/filemap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/filemap.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/mm/filemap.c linux-2.6.36/mm/filemap.c
+--- linux-2.6.36/mm/filemap.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/filemap.c 2010-11-06 18:58:50.000000000 -0400
@@ -1640,7 +1640,7 @@ int generic_file_mmap(struct file * file
struct address_space *mapping = file->f_mapping;
if (*pos >= limit) {
send_sig(SIGXFSZ, current, 0);
return -EFBIG;
-diff -urNp linux-2.6.35.4/mm/fremap.c linux-2.6.35.4/mm/fremap.c
---- linux-2.6.35.4/mm/fremap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/fremap.c 2010-09-17 20:12:09.000000000 -0400
-@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
+diff -urNp linux-2.6.36/mm/fremap.c linux-2.6.36/mm/fremap.c
+--- linux-2.6.36/mm/fremap.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/fremap.c 2010-11-06 18:58:15.000000000 -0400
+@@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
retry:
vma = find_vma(mm, start);
/*
* Make sure the vma is shared, that it supports prefaulting,
* and that the remapped range is valid and fully within
-@@ -221,7 +226,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
+@@ -224,7 +229,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
/*
* drop PG_Mlocked flag for over-mapped range
*/
munlock_vma_pages_range(vma, start, start + size);
vma->vm_flags = saved_flags;
}
-diff -urNp linux-2.6.35.4/mm/highmem.c linux-2.6.35.4/mm/highmem.c
---- linux-2.6.35.4/mm/highmem.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/highmem.c 2010-09-17 20:12:09.000000000 -0400
-@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
+diff -urNp linux-2.6.36/mm/highmem.c linux-2.6.36/mm/highmem.c
+--- linux-2.6.36/mm/highmem.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/highmem.c 2010-11-06 18:58:15.000000000 -0400
+@@ -117,9 +117,10 @@ static void flush_all_zero_pkmaps(void)
* So no dangers, even with speculative execution.
*/
page = pte_page(pkmap_page_table[i]);
set_page_address(page, NULL);
need_flush = 1;
}
-@@ -177,9 +178,11 @@ start:
+@@ -178,9 +179,11 @@ start:
}
}
vaddr = PKMAP_ADDR(last_pkmap_nr);
pkmap_count[last_pkmap_nr] = 1;
set_page_address(page, (void *)vaddr);
-diff -urNp linux-2.6.35.4/mm/hugetlb.c linux-2.6.35.4/mm/hugetlb.c
---- linux-2.6.35.4/mm/hugetlb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/hugetlb.c 2010-09-17 20:12:09.000000000 -0400
-@@ -2272,6 +2272,26 @@ static int unmap_ref_private(struct mm_s
+diff -urNp linux-2.6.36/mm/hugetlb.c linux-2.6.36/mm/hugetlb.c
+--- linux-2.6.36/mm/hugetlb.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/hugetlb.c 2010-11-06 18:58:15.000000000 -0400
+@@ -2305,6 +2305,27 @@ static int unmap_ref_private(struct mm_s
return 1;
}
+ address_m = address + SEGMEXEC_TASK_SIZE;
+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
+ get_page(page_m);
++ hugepage_add_anon_rmap(page_m, vma_m, address_m);
+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
+}
+#endif
+
- static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma,
- unsigned long address, pte_t *ptep, pte_t pte,
- struct page *pagecache_page)
-@@ -2352,6 +2372,11 @@ retry_avoidcopy:
- huge_ptep_clear_flush(vma, address, ptep);
- set_huge_pte_at(mm, address, ptep,
+ /*
+ * Hugetlb_cow() should be called with page lock of the original hugepage held.
+ */
+@@ -2402,6 +2423,11 @@ retry_avoidcopy:
make_huge_pte(vma, new_page, 1));
+ page_remove_rmap(old_page);
+ hugepage_add_new_anon_rmap(new_page, vma, address);
+
+#ifdef CONFIG_PAX_SEGMEXEC
+ pax_mirror_huge_pte(vma, address, new_page);
+
/* Make the old page be freed below */
new_page = old_page;
- }
-@@ -2483,6 +2508,10 @@ retry:
+ mmu_notifier_invalidate_range_end(mm,
+@@ -2555,6 +2581,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);
-@@ -2511,6 +2540,28 @@ int hugetlb_fault(struct mm_struct *mm,
+@@ -2584,6 +2614,10 @@ int hugetlb_fault(struct mm_struct *mm,
static DEFINE_MUTEX(hugetlb_instantiation_mutex);
struct hstate *h = hstate_vma(vma);
+#ifdef CONFIG_PAX_SEGMEXEC
+ struct vm_area_struct *vma_m;
++#endif
+
+ ptep = huge_pte_offset(mm, address);
+ if (ptep) {
+ entry = huge_ptep_get(ptep);
+@@ -2591,6 +2625,26 @@ int hugetlb_fault(struct mm_struct *mm,
+ return VM_FAULT_HWPOISON;
+ }
+
++#ifdef CONFIG_PAX_SEGMEXEC
+ vma_m = pax_find_mirror_vma(vma);
+ if (vma_m) {
+ unsigned long address_m;
ptep = huge_pte_alloc(mm, address, huge_page_size(h));
if (!ptep)
return VM_FAULT_OOM;
-diff -urNp linux-2.6.35.4/mm/Kconfig linux-2.6.35.4/mm/Kconfig
---- linux-2.6.35.4/mm/Kconfig 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/Kconfig 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/mm/Kconfig linux-2.6.36/mm/Kconfig
+--- linux-2.6.36/mm/Kconfig 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/Kconfig 2010-11-06 18:58:50.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.35.4/mm/maccess.c linux-2.6.35.4/mm/maccess.c
---- linux-2.6.35.4/mm/maccess.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/maccess.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/mm/maccess.c linux-2.6.36/mm/maccess.c
+--- linux-2.6.36/mm/maccess.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/maccess.c 2010-11-06 18:58:15.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.35.4/mm/madvise.c linux-2.6.35.4/mm/madvise.c
---- linux-2.6.35.4/mm/madvise.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/madvise.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/mm/madvise.c linux-2.6.36/mm/madvise.c
+--- linux-2.6.36/mm/madvise.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/madvise.c 2010-11-06 18:58:15.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.35.4/mm/memory.c linux-2.6.35.4/mm/memory.c
---- linux-2.6.35.4/mm/memory.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/memory.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
+--- linux-2.6.36/mm/memory.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/memory.c 2010-11-06 18:58:50.000000000 -0400
@@ -259,8 +259,12 @@ static inline void free_pmd_range(struct
return;
}
static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
-@@ -292,8 +296,12 @@ static inline void free_pud_range(struct
+@@ -291,9 +295,12 @@ static inline void free_pud_range(struct
+ if (end - 1 > ceiling - 1)
return;
- pud = pud_offset(pgd, start);
-+
+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
+ pud = pud_offset(pgd, start);
pgd_clear(pgd);
pud_free_tlb(tlb, pud, start);
+#endif
}
/*
-@@ -1363,10 +1371,10 @@ int __get_user_pages(struct task_struct
+@@ -1361,10 +1368,10 @@ int __get_user_pages(struct task_struct
(VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
i = 0;
if (!vma && in_gate_area(tsk, start)) {
unsigned long pg = start & PAGE_MASK;
struct vm_area_struct *gate_vma = get_gate_vma(tsk);
-@@ -1418,7 +1426,7 @@ int __get_user_pages(struct task_struct
+@@ -1416,7 +1423,7 @@ int __get_user_pages(struct task_struct
continue;
}
(vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
!(vm_flags & vma->vm_flags))
return i ? : -EFAULT;
-@@ -1493,7 +1501,7 @@ int __get_user_pages(struct task_struct
+@@ -1491,7 +1498,7 @@ int __get_user_pages(struct task_struct
start += PAGE_SIZE;
nr_pages--;
} while (nr_pages && start < vma->vm_end);
return i;
}
-@@ -2089,6 +2097,186 @@ static inline void cow_user_page(struct
+@@ -1636,6 +1643,10 @@ static int insert_page(struct vm_area_st
+ page_add_file_rmap(page);
+ set_pte_at(mm, addr, pte, mk_pte(page, prot));
+
++#ifdef CONFIG_PAX_SEGMEXEC
++ pax_mirror_file_pte(vma, addr, page, ptl);
++#endif
++
+ retval = 0;
+ pte_unmap_unlock(pte, ptl);
+ return retval;
+@@ -1670,10 +1681,22 @@ out:
+ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
+ struct page *page)
+ {
++
++#ifdef CONFIG_PAX_SEGMEXEC
++ struct vm_area_struct *vma_m;
++#endif
++
+ if (addr < vma->vm_start || addr >= vma->vm_end)
+ return -EFAULT;
+ if (!page_count(page))
+ return -EINVAL;
++
++#ifdef CONFIG_PAX_SEGMEXEC
++ vma_m = pax_find_mirror_vma(vma);
++ if (vma_m)
++ vma_m->vm_flags |= VM_INSERTPAGE;
++#endif
++
+ vma->vm_flags |= VM_INSERTPAGE;
+ return insert_page(vma, addr, page, vma->vm_page_prot);
+ }
+@@ -1759,6 +1782,7 @@ int vm_insert_mixed(struct vm_area_struc
+ unsigned long pfn)
+ {
+ BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
++ BUG_ON(vma->vm_mirror);
+
+ if (addr < vma->vm_start || addr >= vma->vm_end)
+ return -EFAULT;
+@@ -2086,6 +2110,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
-@@ -2275,6 +2463,12 @@ gotten:
+@@ -2272,6 +2476,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);
-@@ -2326,6 +2520,10 @@ gotten:
+@@ -2323,6 +2533,10 @@ gotten:
page_remove_rmap(old_page);
}
/* Free the old page.. */
new_page = old_page;
ret |= VM_FAULT_WRITE;
-@@ -2734,6 +2932,11 @@ static int do_swap_page(struct mm_struct
+@@ -2749,19 +2963,12 @@ 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);
+#endif
+
unlock_page(page);
+- if (swapcache) {
+- /*
+- * Hold the lock to avoid the swap entry to be reused
+- * until we take the PT lock for the pte_same() check
+- * (to avoid false positives from pte_same). For
+- * further safety release the lock after the swap_free
+- * so that the swap count won't change under a
+- * parallel locked swapcache.
+- */
+- unlock_page(swapcache);
+- page_cache_release(swapcache);
+- }
if (flags & FAULT_FLAG_WRITE) {
-@@ -2745,6 +2948,11 @@ static int do_swap_page(struct mm_struct
+ ret |= do_wp_page(mm, vma, address, page_table, pmd, ptl, pte);
+@@ -2772,6 +2979,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:
-@@ -2760,33 +2968,6 @@ out_release:
+@@ -2783,48 +2995,10 @@ out_page:
+ unlock_page(page);
+ out_release:
+ page_cache_release(page);
+- if (swapcache) {
+- unlock_page(swapcache);
+- page_cache_release(swapcache);
+- }
+ return ret;
}
/*
-- * This is like a special single-page "expand_downwards()",
-- * except we must first make sure that 'address-PAGE_SIZE'
+- * This is like a special single-page "expand_{down|up}wards()",
+- * except we must first make sure that 'address{-|+}PAGE_SIZE'
- * doesn't hit another vma.
-- *
-- * The "find_vma()" will do the right thing even if we wrap
- */
-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
-{
-
- expand_stack(vma, address - PAGE_SIZE);
- }
+- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
+- struct vm_area_struct *next = vma->vm_next;
+-
+- /* As VM_GROWSDOWN but s/below/above/ */
+- if (next && next->vm_start == address + PAGE_SIZE)
+- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
+-
+- expand_upwards(vma, address + PAGE_SIZE);
+- }
- return 0;
-}
-
* 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.
-@@ -2795,27 +2976,23 @@ static int do_anonymous_page(struct mm_s
+@@ -2833,27 +3007,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);
-@@ -2834,6 +3011,11 @@ static int do_anonymous_page(struct mm_s
+@@ -2872,6 +3042,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:
-@@ -2841,6 +3023,12 @@ setpte:
+@@ -2879,6 +3054,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;
-@@ -2983,6 +3171,12 @@ static int __do_fault(struct mm_struct *
+@@ -3021,6 +3202,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)
-@@ -3002,6 +3196,14 @@ static int __do_fault(struct mm_struct *
+@@ -3040,6 +3227,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);
-@@ -3149,6 +3351,12 @@ static inline int handle_pte_fault(struc
+@@ -3187,6 +3382,12 @@ static inline int handle_pte_fault(struc
if (flags & FAULT_FLAG_WRITE)
flush_tlb_page(vma, address);
}
unlock:
pte_unmap_unlock(pte, ptl);
return 0;
-@@ -3165,6 +3373,10 @@ int handle_mm_fault(struct mm_struct *mm
+@@ -3203,6 +3404,10 @@ int handle_mm_fault(struct mm_struct *mm
pmd_t *pmd;
pte_t *pte;
__set_current_state(TASK_RUNNING);
count_vm_event(PGFAULT);
-@@ -3175,6 +3387,34 @@ int handle_mm_fault(struct mm_struct *mm
+@@ -3213,6 +3418,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)
-@@ -3272,7 +3512,7 @@ static int __init gate_vma_init(void)
+@@ -3310,7 +3543,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.35.4/mm/memory-failure.c linux-2.6.35.4/mm/memory-failure.c
---- linux-2.6.35.4/mm/memory-failure.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/memory-failure.c 2010-09-17 20:12:09.000000000 -0400
-@@ -51,7 +51,7 @@ int sysctl_memory_failure_early_kill __r
+diff -urNp linux-2.6.36/mm/memory-failure.c linux-2.6.36/mm/memory-failure.c
+--- linux-2.6.36/mm/memory-failure.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/memory-failure.c 2010-11-06 18:58:15.000000000 -0400
+@@ -53,7 +53,7 @@ int sysctl_memory_failure_early_kill __r
int sysctl_memory_failure_recovery __read_mostly = 1;
#if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
-@@ -939,7 +939,7 @@ int __memory_failure(unsigned long pfn,
- return 0;
+@@ -975,7 +975,7 @@ int __memory_failure(unsigned long pfn,
}
-- atomic_long_add(1, &mce_bad_pages);
-+ atomic_long_add_unchecked(1, &mce_bad_pages);
+ nr_pages = 1 << compound_order(hpage);
+- atomic_long_add(nr_pages, &mce_bad_pages);
++ atomic_long_add_unchecked(nr_pages, &mce_bad_pages);
/*
* We need/can do nothing about count=0 pages.
-@@ -1003,7 +1003,7 @@ int __memory_failure(unsigned long pfn,
+@@ -1039,7 +1039,7 @@ int __memory_failure(unsigned long pfn,
}
if (hwpoison_filter(p)) {
if (TestClearPageHWPoison(p))
-- atomic_long_dec(&mce_bad_pages);
-+ atomic_long_dec_unchecked(&mce_bad_pages);
- unlock_page(p);
- put_page(p);
+- atomic_long_sub(nr_pages, &mce_bad_pages);
++ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
+ unlock_page(hpage);
+ put_page(hpage);
return 0;
-@@ -1096,7 +1096,7 @@ int unpoison_memory(unsigned long pfn)
+@@ -1155,7 +1155,7 @@ int unpoison_memory(unsigned long pfn)
if (!get_page_unless_zero(page)) {
if (TestClearPageHWPoison(p))
-- atomic_long_dec(&mce_bad_pages);
-+ atomic_long_dec_unchecked(&mce_bad_pages);
+- atomic_long_sub(nr_pages, &mce_bad_pages);
++ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
pr_debug("MCE: Software-unpoisoned free page %#lx\n", pfn);
return 0;
}
-@@ -1110,7 +1110,7 @@ int unpoison_memory(unsigned long pfn)
+@@ -1169,7 +1169,7 @@ int unpoison_memory(unsigned long pfn)
*/
- if (TestClearPageHWPoison(p)) {
+ if (TestClearPageHWPoison(page)) {
pr_debug("MCE: Software-unpoisoned page %#lx\n", pfn);
-- atomic_long_dec(&mce_bad_pages);
-+ atomic_long_dec_unchecked(&mce_bad_pages);
+- atomic_long_sub(nr_pages, &mce_bad_pages);
++ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
freeit = 1;
}
- unlock_page(page);
-@@ -1291,7 +1291,7 @@ int soft_offline_page(struct page *page,
+ if (PageHuge(p))
+@@ -1352,7 +1352,7 @@ int soft_offline_page(struct page *page,
return ret;
done:
SetPageHWPoison(page);
/* keep elevated page count for bad page */
return ret;
-diff -urNp linux-2.6.35.4/mm/mempolicy.c linux-2.6.35.4/mm/mempolicy.c
---- linux-2.6.35.4/mm/mempolicy.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/mempolicy.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/mm/mempolicy.c linux-2.6.36/mm/mempolicy.c
+--- linux-2.6.36/mm/mempolicy.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/mempolicy.c 2010-11-06 19:43:34.000000000 -0400
@@ -642,6 +642,10 @@ static int mbind_range(struct mm_struct
unsigned long vmstart;
unsigned long vmend;
if (end == start)
return 0;
-@@ -1303,6 +1328,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi
+@@ -1312,6 +1337,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi
if (!mm)
- return -EINVAL;
+ goto out;
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
+ if (mm != current->mm &&
/*
* Check if this process has the right to modify the specified
* process. The right exists if the process has administrative
-@@ -1312,8 +1345,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi
+@@ -1321,8 +1354,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi
rcu_read_lock();
tcred = __task_cred(task);
if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
rcu_read_unlock();
err = -EPERM;
goto out;
-@@ -2564,7 +2596,7 @@ int show_numa_map(struct seq_file *m, vo
+@@ -2620,7 +2652,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.35.4/mm/migrate.c linux-2.6.35.4/mm/migrate.c
---- linux-2.6.35.4/mm/migrate.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/migrate.c 2010-09-17 20:12:37.000000000 -0400
-@@ -1102,6 +1102,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
+diff -urNp linux-2.6.36/mm/migrate.c linux-2.6.36/mm/migrate.c
+--- linux-2.6.36/mm/migrate.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/migrate.c 2010-11-06 18:58:50.000000000 -0400
+@@ -1098,6 +1098,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
-@@ -1111,8 +1119,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
+@@ -1107,8 +1115,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.35.4/mm/mlock.c linux-2.6.35.4/mm/mlock.c
---- linux-2.6.35.4/mm/mlock.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/mlock.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/mm/mlock.c linux-2.6.36/mm/mlock.c
+--- linux-2.6.36/mm/mlock.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/mlock.c 2010-11-06 18:58:50.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>
-@@ -135,19 +136,6 @@ void munlock_vma_page(struct page *page)
+@@ -135,13 +136,6 @@ void munlock_vma_page(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)
--{
-- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
--}
--
-static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
-{
- return (vma->vm_flags & VM_GROWSDOWN) &&
/**
* __mlock_vma_pages_range() - mlock a range of pages in the vma.
* @vma: target vma
-@@ -180,12 +168,6 @@ static long __mlock_vma_pages_range(stru
+@@ -174,12 +168,6 @@ static long __mlock_vma_pages_range(stru
if (vma->vm_flags & VM_WRITE)
gup_flags |= FOLL_WRITE;
while (nr_pages > 0) {
int i;
-@@ -451,6 +433,9 @@ static int do_mlock(unsigned long start,
+@@ -445,6 +433,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;
-@@ -461,6 +446,11 @@ static int do_mlock(unsigned long start,
+@@ -455,6 +446,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;
-@@ -510,6 +500,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st
+@@ -504,6 +500,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);
-@@ -531,17 +522,23 @@ SYSCALL_DEFINE2(munlock, unsigned long,
+@@ -525,17 +522,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;
-@@ -573,6 +570,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
+@@ -567,6 +570,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.35.4/mm/mmap.c linux-2.6.35.4/mm/mmap.c
---- linux-2.6.35.4/mm/mmap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/mmap.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
+--- linux-2.6.36/mm/mmap.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/mmap.c 2010-11-06 18:58:50.000000000 -0400
@@ -44,6 +44,16 @@
#define arch_rebalance_pgtables(addr, len) (addr)
#endif
if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
(mm->end_data - mm->start_data) > rlim)
goto out;
-@@ -695,6 +717,12 @@ static int
+@@ -707,6 +729,12 @@ static int
can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
{
if (is_mergeable_vma(vma, file, vm_flags) &&
is_mergeable_anon_vma(anon_vma, vma->anon_vma)) {
if (vma->vm_pgoff == vm_pgoff)
-@@ -714,6 +742,12 @@ static int
+@@ -726,6 +754,12 @@ static int
can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
{
if (is_mergeable_vma(vma, file, vm_flags) &&
is_mergeable_anon_vma(anon_vma, vma->anon_vma)) {
pgoff_t vm_pglen;
-@@ -756,13 +790,20 @@ can_vma_merge_after(struct vm_area_struc
+@@ -768,13 +802,20 @@ can_vma_merge_after(struct vm_area_struc
struct vm_area_struct *vma_merge(struct mm_struct *mm,
struct vm_area_struct *prev, unsigned long addr,
unsigned long end, unsigned long vm_flags,
/*
* We later require that vma->vm_flags == vm_flags,
* so this tests vma->vm_flags & VM_SPECIAL, too.
-@@ -778,6 +819,15 @@ struct vm_area_struct *vma_merge(struct
+@@ -790,6 +831,15 @@ struct vm_area_struct *vma_merge(struct
if (next && next->vm_end == end) /* cases 6, 7, 8 */
next = next->vm_next;
/*
* Can it merge with the predecessor?
*/
-@@ -797,9 +847,24 @@ struct vm_area_struct *vma_merge(struct
+@@ -809,9 +859,24 @@ struct vm_area_struct *vma_merge(struct
/* cases 1, 6 */
err = vma_adjust(prev, prev->vm_start,
next->vm_end, prev->vm_pgoff, NULL);
if (err)
return NULL;
return prev;
-@@ -812,12 +877,27 @@ struct vm_area_struct *vma_merge(struct
+@@ -824,12 +889,27 @@ struct vm_area_struct *vma_merge(struct
mpol_equal(policy, vma_policy(next)) &&
can_vma_merge_before(next, vm_flags,
anon_vma, file, pgoff+pglen)) {
if (err)
return NULL;
return area;
-@@ -932,14 +1012,11 @@ none:
+@@ -944,14 +1024,11 @@ none:
void vm_stat_account(struct mm_struct *mm, unsigned long flags,
struct file *file, long pages)
{
mm->stack_vm += pages;
if (flags & (VM_RESERVED|VM_IO))
mm->reserved_vm += pages;
-@@ -966,7 +1043,7 @@ unsigned long do_mmap_pgoff(struct file
+@@ -978,7 +1055,7 @@ unsigned long do_mmap_pgoff(struct file
* (the exception is when the underlying filesystem is noexec
* mounted, in which case we dont add PROT_EXEC.)
*/
if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
prot |= PROT_EXEC;
-@@ -992,7 +1069,7 @@ unsigned long do_mmap_pgoff(struct file
+@@ -1004,7 +1081,7 @@ unsigned long do_mmap_pgoff(struct file
/* Obtain the address to map to. we verify (or select) it and ensure
* that it represents a valid section of the address space.
*/
if (addr & ~PAGE_MASK)
return addr;
-@@ -1003,6 +1080,28 @@ unsigned long do_mmap_pgoff(struct file
+@@ -1015,6 +1092,31 @@ unsigned long do_mmap_pgoff(struct file
vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
+#ifdef CONFIG_PAX_MPROTECT
+ if (mm->pax_flags & MF_PAX_MPROTECT) {
-+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
++ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
++ gr_log_rwxmmap(file);
+
+#ifdef CONFIG_PAX_EMUPLT
+ vm_flags &= ~VM_EXEC;
+ return -EPERM;
+#endif
+
++ }
++
+ if (!(vm_flags & VM_EXEC))
+ vm_flags &= ~VM_MAYEXEC;
+ else
if (flags & MAP_LOCKED)
if (!can_do_mlock())
return -EPERM;
-@@ -1014,6 +1113,7 @@ unsigned long do_mmap_pgoff(struct file
+@@ -1026,6 +1128,7 @@ unsigned long do_mmap_pgoff(struct file
locked += mm->locked_vm;
lock_limit = rlimit(RLIMIT_MEMLOCK);
lock_limit >>= PAGE_SHIFT;
if (locked > lock_limit && !capable(CAP_IPC_LOCK))
return -EAGAIN;
}
-@@ -1084,6 +1184,9 @@ unsigned long do_mmap_pgoff(struct file
+@@ -1096,6 +1199,9 @@ unsigned long do_mmap_pgoff(struct file
if (error)
return error;
return mmap_region(file, addr, len, flags, vm_flags, pgoff);
}
EXPORT_SYMBOL(do_mmap_pgoff);
-@@ -1160,10 +1263,10 @@ SYSCALL_DEFINE1(old_mmap, struct mmap_ar
+@@ -1172,10 +1278,10 @@ SYSCALL_DEFINE1(old_mmap, struct mmap_ar
*/
int vma_wants_writenotify(struct vm_area_struct *vma)
{
return 0;
/* The backer wishes to know when pages are first written to? */
-@@ -1212,14 +1315,24 @@ unsigned long mmap_region(struct file *f
+@@ -1224,14 +1330,24 @@ unsigned long mmap_region(struct file *f
unsigned long charged = 0;
struct inode *inode = file ? file->f_path.dentry->d_inode : NULL;
}
/* Check against address space limit. */
-@@ -1268,6 +1381,16 @@ munmap_back:
+@@ -1280,6 +1396,16 @@ munmap_back:
goto unacct_error;
}
vma->vm_mm = mm;
vma->vm_start = addr;
vma->vm_end = addr + len;
-@@ -1291,6 +1414,19 @@ munmap_back:
+@@ -1303,6 +1429,19 @@ munmap_back:
error = file->f_op->mmap(file, vma);
if (error)
goto unmap_and_free_vma;
if (vm_flags & VM_EXECUTABLE)
added_exe_file_vma(mm);
-@@ -1326,6 +1462,11 @@ munmap_back:
+@@ -1338,6 +1477,11 @@ munmap_back:
vma_link(mm, vma, prev, rb_link, rb_parent);
file = vma->vm_file;
/* Once vma denies write, undo our temporary denial count */
if (correct_wcount)
atomic_inc(&inode->i_writecount);
-@@ -1334,6 +1475,7 @@ out:
+@@ -1346,6 +1490,7 @@ out:
mm->total_vm += len >> PAGE_SHIFT;
vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
if (vm_flags & VM_LOCKED) {
if (!mlock_vma_pages_range(vma, addr, addr + len))
mm->locked_vm += (len >> PAGE_SHIFT);
-@@ -1351,6 +1493,12 @@ unmap_and_free_vma:
+@@ -1363,6 +1508,12 @@ unmap_and_free_vma:
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
charged = 0;
free_vma:
kmem_cache_free(vm_area_cachep, vma);
unacct_error:
if (charged)
-@@ -1358,6 +1506,33 @@ unacct_error:
+@@ -1370,6 +1521,33 @@ unacct_error:
return error;
}
/* Get an address range which is currently unmapped.
* For shmat() with addr=0.
*
-@@ -1384,18 +1559,23 @@ arch_get_unmapped_area(struct file *filp
+@@ -1396,18 +1574,23 @@ arch_get_unmapped_area(struct file *filp
if (flags & MAP_FIXED)
return addr;
}
full_search:
-@@ -1406,34 +1586,40 @@ full_search:
+@@ -1418,34 +1601,40 @@ full_search:
* Start a new search - just in case we missed
* some holes.
*/
mm->free_area_cache = addr;
mm->cached_hole_size = ~0UL;
}
-@@ -1451,7 +1637,7 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1463,7 +1652,7 @@ arch_get_unmapped_area_topdown(struct fi
{
struct vm_area_struct *vma;
struct mm_struct *mm = current->mm;
/* requested length too big for entire address space */
if (len > TASK_SIZE)
-@@ -1460,13 +1646,18 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1472,13 +1661,18 @@ arch_get_unmapped_area_topdown(struct fi
if (flags & MAP_FIXED)
return addr;
}
/* check if free_area_cache is useful for us */
-@@ -1481,7 +1672,7 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1493,7 +1687,7 @@ arch_get_unmapped_area_topdown(struct fi
/* make sure it can fit in the remaining address space */
if (addr > len) {
vma = find_vma(mm, addr-len);
/* remember the address as a hint for next time */
return (mm->free_area_cache = addr-len);
}
-@@ -1498,7 +1689,7 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1510,7 +1704,7 @@ arch_get_unmapped_area_topdown(struct fi
* return with success:
*/
vma = find_vma(mm, addr);
/* remember the address as a hint for next time */
return (mm->free_area_cache = addr);
-@@ -1517,13 +1708,21 @@ bottomup:
+@@ -1529,13 +1723,21 @@ bottomup:
* can happen with large stack limits and large mmap()
* allocations.
*/
mm->cached_hole_size = ~0UL;
return addr;
-@@ -1532,6 +1731,12 @@ bottomup:
+@@ -1544,6 +1746,12 @@ bottomup:
void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
{
/*
* Is this a new hole at the highest possible address?
*/
-@@ -1539,8 +1744,10 @@ void arch_unmap_area_topdown(struct mm_s
+@@ -1551,8 +1759,10 @@ void arch_unmap_area_topdown(struct mm_s
mm->free_area_cache = addr;
/* dont allow allocations above current base */
}
unsigned long
-@@ -1648,6 +1855,34 @@ out:
+@@ -1660,6 +1870,28 @@ out:
return prev ? prev->vm_next : vma;
}
+ BUG_ON(vma->vm_file != vma_m->vm_file);
+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
-+ if (vma->anon_vma != vma_m->anon_vma) {
-+ struct anon_vma_chain *avc, *avc_m;
-+
-+ avc = list_entry(vma->anon_vma_chain.prev, struct anon_vma_chain, same_vma);
-+ avc_m = list_entry(vma_m->anon_vma_chain.prev, struct anon_vma_chain, same_vma);
-+ BUG_ON(avc->anon_vma != avc_m->anon_vma);
-+ }
-+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
++ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
++ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED | VM_RESERVED));
+ return vma_m;
+}
+#endif
/*
* Verify that the stack growth is acceptable and
* update accounting. This is shared with both the
-@@ -1664,6 +1899,7 @@ static int acct_stack_growth(struct vm_a
+@@ -1676,6 +1908,7 @@ static int acct_stack_growth(struct vm_a
return -ENOMEM;
/* Stack limit test */
if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
return -ENOMEM;
-@@ -1674,6 +1910,7 @@ static int acct_stack_growth(struct vm_a
+@@ -1686,6 +1919,7 @@ static int acct_stack_growth(struct vm_a
locked = mm->locked_vm + grow;
limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
limit >>= PAGE_SHIFT;
if (locked > limit && !capable(CAP_IPC_LOCK))
return -ENOMEM;
}
-@@ -1709,35 +1946,42 @@ static
- #endif
+@@ -1716,37 +1950,47 @@ static int acct_stack_growth(struct vm_a
+ * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
+ * vma is the last one with address > vma->vm_end. Have to extend vma.
+ */
++#ifndef CONFIG_IA64
++static
++#endif
int expand_upwards(struct vm_area_struct *vma, unsigned long address)
{
- int error;
+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
+ if (locknext && anon_vma_prepare(vma->vm_next))
+ return -ENOMEM;
- anon_vma_lock(vma);
+ vma_lock_anon_vma(vma);
+ if (locknext)
-+ anon_vma_lock(vma->vm_next);
++ vma_lock_anon_vma(vma->vm_next);
/*
* vma->vm_start/vm_end cannot change under us because the caller
- if (address < PAGE_ALIGN(address+4))
- address = PAGE_ALIGN(address+4);
- else {
-- anon_vma_unlock(vma);
+- vma_unlock_anon_vma(vma);
- return -ENOMEM;
- }
error = 0;
unsigned long size, grow;
size = address - vma->vm_start;
-@@ -1747,6 +1991,8 @@ int expand_upwards(struct vm_area_struct
- if (!error)
- vma->vm_end = address;
+@@ -1758,6 +2002,8 @@ int expand_upwards(struct vm_area_struct
+ perf_event_mmap(vma);
+ }
}
+ if (locknext)
-+ anon_vma_unlock(vma->vm_next);
- anon_vma_unlock(vma);
++ vma_unlock_anon_vma(vma->vm_next);
+ vma_unlock_anon_vma(vma);
return error;
}
-@@ -1758,7 +2004,8 @@ int expand_upwards(struct vm_area_struct
+@@ -1769,7 +2015,8 @@ int expand_upwards(struct vm_area_struct
static int expand_downwards(struct vm_area_struct *vma,
unsigned long address)
{
/*
* We must make sure the anon_vma is allocated
-@@ -1772,6 +2019,15 @@ static int expand_downwards(struct vm_ar
+@@ -1783,6 +2030,15 @@ static int expand_downwards(struct vm_ar
if (error)
return error;
+ if (lockprev && anon_vma_prepare(prev))
+ return -ENOMEM;
+ if (lockprev)
-+ anon_vma_lock(prev);
++ vma_lock_anon_vma(prev);
+
- anon_vma_lock(vma);
+ vma_lock_anon_vma(vma);
/*
-@@ -1781,9 +2037,17 @@ static int expand_downwards(struct vm_ar
+@@ -1792,9 +2048,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;
-@@ -1791,9 +2055,20 @@ static int expand_downwards(struct vm_ar
+@@ -1802,10 +2066,21 @@ static int expand_downwards(struct vm_ar
if (!error) {
vma->vm_start = address;
vma->vm_pgoff -= grow;
+ }
+#endif
+
+ perf_event_mmap(vma);
}
}
- anon_vma_unlock(vma);
+ vma_unlock_anon_vma(vma);
+ if (lockprev)
-+ anon_vma_unlock(prev);
++ vma_unlock_anon_vma(prev);
return error;
}
-@@ -1867,6 +2142,13 @@ static void remove_vma_list(struct mm_st
+@@ -1879,6 +2154,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);
-@@ -1912,6 +2194,16 @@ detach_vmas_to_be_unmapped(struct mm_str
+@@ -1924,6 +2206,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;
-@@ -1940,14 +2232,33 @@ static int __split_vma(struct mm_struct
+@@ -1952,14 +2244,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;
-@@ -1960,6 +2271,22 @@ static int __split_vma(struct mm_struct
+@@ -1972,6 +2283,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);
-@@ -1985,6 +2312,42 @@ static int __split_vma(struct mm_struct
+@@ -1997,6 +2324,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;
-@@ -2000,6 +2363,15 @@ static int __split_vma(struct mm_struct
+@@ -2009,10 +2372,18 @@ static int __split_vma(struct mm_struct
+ removed_exe_file_vma(mm);
+ fput(new->vm_file);
+ }
+- unlink_anon_vmas(new);
out_free_mpol:
mpol_put(pol);
out_free_vma:
kmem_cache_free(vm_area_cachep, new);
out_err:
return err;
-@@ -2012,6 +2384,15 @@ static int __split_vma(struct mm_struct
+@@ -2025,6 +2396,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;
-@@ -2023,11 +2404,30 @@ int split_vma(struct mm_struct *mm, stru
+@@ -2036,11 +2416,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;
-@@ -2101,6 +2501,8 @@ int do_munmap(struct mm_struct *mm, unsi
+@@ -2114,6 +2513,8 @@ int do_munmap(struct mm_struct *mm, unsi
/* Fix up all other VM information */
remove_vma_list(mm, vma);
return 0;
}
-@@ -2113,22 +2515,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a
+@@ -2126,22 +2527,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
-@@ -2142,6 +2540,7 @@ unsigned long do_brk(unsigned long addr,
+@@ -2155,6 +2552,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)
-@@ -2153,16 +2552,30 @@ unsigned long do_brk(unsigned long addr,
+@@ -2166,16 +2564,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;
-@@ -2179,22 +2592,22 @@ unsigned long do_brk(unsigned long addr,
+@@ -2192,22 +2604,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? */
-@@ -2208,7 +2621,7 @@ unsigned long do_brk(unsigned long addr,
+@@ -2221,7 +2633,7 @@ unsigned long do_brk(unsigned long addr,
*/
vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
if (!vma) {
return -ENOMEM;
}
-@@ -2221,11 +2634,12 @@ unsigned long do_brk(unsigned long addr,
- vma->vm_page_prot = vm_get_page_prot(flags);
+@@ -2235,11 +2647,12 @@ unsigned long do_brk(unsigned long addr,
vma_link(mm, vma, prev, rb_link, rb_parent);
out:
+ perf_event_mmap(vma);
- mm->total_vm += len >> PAGE_SHIFT;
+ mm->total_vm += charged;
if (flags & VM_LOCKED) {
return addr;
}
-@@ -2272,8 +2686,10 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2286,8 +2699,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);
}
-@@ -2287,6 +2703,10 @@ int insert_vm_struct(struct mm_struct *
+@@ -2301,6 +2716,10 @@ 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
-@@ -2309,7 +2729,22 @@ int insert_vm_struct(struct mm_struct *
+@@ -2323,7 +2742,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;
}
-@@ -2327,6 +2762,8 @@ struct vm_area_struct *copy_vma(struct v
+@@ -2341,6 +2775,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.
-@@ -2376,6 +2813,39 @@ struct vm_area_struct *copy_vma(struct v
+@@ -2390,6 +2826,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
-@@ -2387,7 +2857,7 @@ int may_expand_vm(struct mm_struct *mm,
+@@ -2401,7 +2870,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;
-@@ -2457,6 +2927,17 @@ int install_special_mapping(struct mm_st
+@@ -2471,6 +2940,17 @@ 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.35.4/mm/mprotect.c linux-2.6.35.4/mm/mprotect.c
---- linux-2.6.35.4/mm/mprotect.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/mprotect.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/mm/mprotect.c linux-2.6.36/mm/mprotect.c
+--- linux-2.6.36/mm/mprotect.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/mprotect.c 2010-11-06 18:58:50.000000000 -0400
@@ -23,10 +23,16 @@
#include <linux/mmu_notifier.h>
#include <linux/migrate.h>
prot |= PROT_EXEC;
vm_flags = calc_vm_prot_bits(prot);
-@@ -276,6 +401,16 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
+@@ -276,6 +401,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
if (start > vma->vm_start)
prev = vma;
-+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
-+ error = -EACCES;
-+ goto out;
-+ }
-+
+#ifdef CONFIG_PAX_MPROTECT
+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
for (nstart = start ; ; ) {
unsigned long newflags;
-@@ -300,6 +435,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
+@@ -285,6 +415,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
+
+ /* newflags >> 4 shift VM_MAY% in place of VM_% */
+ if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
++ if (prot & (PROT_WRITE | PROT_EXEC))
++ gr_log_rwxmprotect(vma->vm_file);
++
++ error = -EACCES;
++ goto out;
++ }
++
++ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
+ error = -EACCES;
+ goto out;
+ }
+@@ -300,6 +438,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
if (error)
goto out;
perf_event_mmap(vma);
nstart = tmp;
if (nstart < prev->vm_end)
-diff -urNp linux-2.6.35.4/mm/mremap.c linux-2.6.35.4/mm/mremap.c
---- linux-2.6.35.4/mm/mremap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/mremap.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/mm/mremap.c linux-2.6.36/mm/mremap.c
+--- linux-2.6.36/mm/mremap.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/mremap.c 2010-11-06 18:58:15.000000000 -0400
@@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_str
continue;
pte = ptep_clear_flush(vma, old_addr, old_pte);
/* We can't remap across vm area boundaries */
if (old_len > vma->vm_end - addr)
goto Efault;
-@@ -321,20 +332,23 @@ static unsigned long mremap_to(unsigned
+@@ -321,20 +332,25 @@ static unsigned long mremap_to(unsigned
unsigned long ret = -EINVAL;
unsigned long charged = 0;
unsigned long map_flags;
+ pax_task_size = SEGMEXEC_TASK_SIZE;
+#endif
+
++ pax_task_size -= PAGE_SIZE;
++
+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
goto out;
goto out;
ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
-@@ -406,6 +420,7 @@ unsigned long do_mremap(unsigned long ad
+@@ -406,6 +422,7 @@ unsigned long do_mremap(unsigned long ad
struct vm_area_struct *vma;
unsigned long ret = -EINVAL;
unsigned long charged = 0;
if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
goto out;
-@@ -424,6 +439,15 @@ unsigned long do_mremap(unsigned long ad
+@@ -424,6 +441,17 @@ unsigned long do_mremap(unsigned long ad
if (!new_len)
goto out;
+ pax_task_size = SEGMEXEC_TASK_SIZE;
+#endif
+
++ pax_task_size -= PAGE_SIZE;
++
+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
+ old_len > pax_task_size || addr > pax_task_size-old_len)
+ goto out;
if (flags & MREMAP_FIXED) {
if (flags & MREMAP_MAYMOVE)
ret = mremap_to(addr, old_len, new_addr, new_len);
-@@ -473,6 +497,7 @@ unsigned long do_mremap(unsigned long ad
+@@ -473,6 +501,7 @@ unsigned long do_mremap(unsigned long ad
addr + new_len);
}
ret = addr;
goto out;
}
}
-@@ -499,7 +524,13 @@ unsigned long do_mremap(unsigned long ad
+@@ -499,7 +528,13 @@ unsigned long do_mremap(unsigned long ad
ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
if (ret)
goto out;
}
out:
if (ret & ~PAGE_MASK)
-diff -urNp linux-2.6.35.4/mm/nommu.c linux-2.6.35.4/mm/nommu.c
---- linux-2.6.35.4/mm/nommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/nommu.c 2010-09-17 20:12:09.000000000 -0400
-@@ -67,7 +67,6 @@ int sysctl_overcommit_memory = OVERCOMMI
+diff -urNp linux-2.6.36/mm/nommu.c linux-2.6.36/mm/nommu.c
+--- linux-2.6.36/mm/nommu.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/nommu.c 2010-11-06 18:58:15.000000000 -0400
+@@ -62,7 +62,6 @@ int sysctl_overcommit_memory = OVERCOMMI
int sysctl_overcommit_ratio = 50; /* default is 50% */
int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
atomic_long_t mmap_pages_allocated;
-@@ -762,15 +761,6 @@ struct vm_area_struct *find_vma(struct m
+@@ -757,15 +756,6 @@ struct vm_area_struct *find_vma(struct m
EXPORT_SYMBOL(find_vma);
/*
* expand a stack to a given address
* - not supported under NOMMU conditions
*/
-@@ -1491,6 +1481,7 @@ int split_vma(struct mm_struct *mm, stru
+@@ -1486,6 +1476,7 @@ int split_vma(struct mm_struct *mm, stru
/* most fields are the same, copy all, and then fixup */
*new = *vma;
*region = *vma->vm_region;
new->vm_region = region;
-diff -urNp linux-2.6.35.4/mm/page_alloc.c linux-2.6.35.4/mm/page_alloc.c
---- linux-2.6.35.4/mm/page_alloc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/page_alloc.c 2010-09-17 20:12:09.000000000 -0400
-@@ -641,6 +641,10 @@ static bool free_pages_prepare(struct pa
+diff -urNp linux-2.6.36/mm/page_alloc.c linux-2.6.36/mm/page_alloc.c
+--- linux-2.6.36/mm/page_alloc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/page_alloc.c 2010-11-06 18:58:15.000000000 -0400
+@@ -642,6 +642,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
+@@ -660,6 +664,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
+@@ -774,8 +784,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);
-@@ -3973,7 +3985,7 @@ static void __init setup_usemap(struct p
+@@ -3997,7 +4009,7 @@ static void __init setup_usemap(struct p
zone->pageblock_flags = alloc_bootmem_node(pgdat, usemapsize);
}
#else
struct zone *zone, unsigned long zonesize) {}
#endif /* CONFIG_SPARSEMEM */
-diff -urNp linux-2.6.35.4/mm/percpu.c linux-2.6.35.4/mm/percpu.c
---- linux-2.6.35.4/mm/percpu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/percpu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/mm/percpu.c linux-2.6.36/mm/percpu.c
+--- linux-2.6.36/mm/percpu.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/percpu.c 2010-11-06 18:58:15.000000000 -0400
@@ -115,7 +115,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.35.4/mm/rmap.c linux-2.6.35.4/mm/rmap.c
---- linux-2.6.35.4/mm/rmap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/rmap.c 2010-09-17 20:12:09.000000000 -0400
-@@ -116,6 +116,10 @@ int anon_vma_prepare(struct vm_area_stru
+diff -urNp linux-2.6.36/mm/rmap.c linux-2.6.36/mm/rmap.c
+--- linux-2.6.36/mm/rmap.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/rmap.c 2010-11-06 18:58:15.000000000 -0400
+@@ -117,6 +117,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;
-@@ -125,6 +129,12 @@ int anon_vma_prepare(struct vm_area_stru
+@@ -126,6 +130,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) {
-@@ -138,6 +148,21 @@ int anon_vma_prepare(struct vm_area_stru
+@@ -144,6 +154,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;
-@@ -151,12 +176,24 @@ int anon_vma_prepare(struct vm_area_stru
+@@ -157,12 +182,24 @@ int anon_vma_prepare(struct vm_area_stru
if (unlikely(allocated))
anon_vma_free(allocated);
anon_vma_chain_free(avc);
out_enomem:
return -ENOMEM;
-@@ -179,7 +216,7 @@ static void anon_vma_chain_link(struct v
+@@ -185,7 +222,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;
-@@ -201,7 +238,7 @@ int anon_vma_clone(struct vm_area_struct
+@@ -207,7 +244,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.35.4/mm/shmem.c linux-2.6.35.4/mm/shmem.c
---- linux-2.6.35.4/mm/shmem.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/shmem.c 2010-09-17 20:12:37.000000000 -0400
-@@ -30,7 +30,7 @@
- #include <linux/module.h>
+diff -urNp linux-2.6.36/mm/shmem.c linux-2.6.36/mm/shmem.c
+--- linux-2.6.36/mm/shmem.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/shmem.c 2010-11-06 19:42:24.000000000 -0400
+@@ -31,7 +31,7 @@
+ #include <linux/percpu_counter.h>
#include <linux/swap.h>
-static struct vfsmount *shm_mnt;
#ifdef CONFIG_SHMEM
/*
-diff -urNp linux-2.6.35.4/mm/slab.c linux-2.6.35.4/mm/slab.c
---- linux-2.6.35.4/mm/slab.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/slab.c 2010-09-17 20:12:37.000000000 -0400
-@@ -285,7 +285,7 @@ struct kmem_list3 {
+diff -urNp linux-2.6.36/mm/slab.c linux-2.6.36/mm/slab.c
+--- linux-2.6.36/mm/slab.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/slab.c 2010-11-06 18:58:50.000000000 -0400
+@@ -284,7 +284,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)
-@@ -535,7 +535,7 @@ static inline void *index_to_obj(struct
+@@ -534,7 +534,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);
-@@ -561,14 +561,14 @@ struct cache_names {
+@@ -560,14 +560,14 @@ 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>
/* internal cache of cache description objs */
static struct kmem_cache cache_cache = {
-@@ -4558,15 +4558,66 @@ static const struct file_operations proc
+@@ -4557,15 +4557,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.35.4/mm/slob.c linux-2.6.35.4/mm/slob.c
---- linux-2.6.35.4/mm/slob.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/slob.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/mm/slob.c linux-2.6.36/mm/slob.c
+--- linux-2.6.36/mm/slob.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/slob.c 2010-11-06 18:58:15.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
#include <linux/slab.h>
#include <linux/mm.h>
#include <linux/swap.h> /* struct reclaim_state */
-@@ -100,7 +101,8 @@ struct slob_page {
+@@ -102,7 +103,8 @@ struct slob_page {
unsigned long flags; /* mandatory */
atomic_t _count; /* mandatory */
slobidx_t units; /* free units left in page */
slob_t *free; /* first free slob_t in page */
struct list_head list; /* linked list of free pages */
};
-@@ -133,7 +135,7 @@ static LIST_HEAD(free_slob_large);
+@@ -135,7 +137,7 @@ static LIST_HEAD(free_slob_large);
*/
static inline int is_slob_page(struct slob_page *sp)
{
}
static inline void set_slob_page(struct slob_page *sp)
-@@ -148,7 +150,7 @@ static inline void clear_slob_page(struc
+@@ -150,7 +152,7 @@ static inline void clear_slob_page(struc
static inline struct slob_page *slob_page(const void *addr)
{
}
/*
-@@ -208,7 +210,7 @@ static void set_slob(slob_t *s, slobidx_
+@@ -210,7 +212,7 @@ static void set_slob(slob_t *s, slobidx_
/*
* Return the size of a slob block.
*/
{
if (s->units > 0)
return s->units;
-@@ -218,7 +220,7 @@ static slobidx_t slob_units(slob_t *s)
+@@ -220,7 +222,7 @@ static slobidx_t slob_units(slob_t *s)
/*
* Return the next free slob block pointer after this one.
*/
{
slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
slobidx_t next;
-@@ -233,7 +235,7 @@ static slob_t *slob_next(slob_t *s)
+@@ -235,7 +237,7 @@ static slob_t *slob_next(slob_t *s)
/*
* Returns true if s is the last free block in its page.
*/
{
return !((unsigned long)slob_next(s) & ~PAGE_MASK);
}
-@@ -252,6 +254,7 @@ static void *slob_new_pages(gfp_t gfp, i
+@@ -254,6 +256,7 @@ static void *slob_new_pages(gfp_t gfp, i
if (!page)
return NULL;
return page_address(page);
}
-@@ -368,11 +371,11 @@ static void *slob_alloc(size_t size, gfp
+@@ -370,11 +373,11 @@ static void *slob_alloc(size_t size, gfp
if (!b)
return NULL;
sp = slob_page(b);
INIT_LIST_HEAD(&sp->list);
set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
set_slob_page_free(sp, slob_list);
-@@ -467,10 +470,9 @@ out:
+@@ -476,10 +479,9 @@ out:
* End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
*/
void *ret;
lockdep_trace_alloc(gfp);
-@@ -483,7 +485,10 @@ void *__kmalloc_node(size_t size, gfp_t
+@@ -492,7 +494,10 @@ void *__kmalloc_node(size_t size, gfp_t
if (!m)
return NULL;
ret = (void *)m + align;
trace_kmalloc_node(_RET_IP_, ret,
-@@ -493,9 +498,9 @@ void *__kmalloc_node(size_t size, gfp_t
+@@ -502,9 +507,9 @@ void *__kmalloc_node(size_t size, gfp_t
ret = slob_new_pages(gfp | __GFP_COMP, get_order(size), node);
if (ret) {
}
trace_kmalloc_node(_RET_IP_, ret,
-@@ -505,6 +510,13 @@ void *__kmalloc_node(size_t size, gfp_t
+@@ -514,6 +519,13 @@ void *__kmalloc_node(size_t size, gfp_t
kmemleak_alloc(ret, size, 1, gfp);
return ret;
}
EXPORT_SYMBOL(__kmalloc_node);
void kfree(const void *block)
-@@ -520,13 +532,84 @@ void kfree(const void *block)
+@@ -529,13 +541,84 @@ void kfree(const void *block)
sp = slob_page(block);
if (is_slob_page(sp)) {
int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
/* can't use ksize for kmem_cache_alloc memory, only kmalloc */
size_t ksize(const void *block)
{
-@@ -539,10 +622,10 @@ size_t ksize(const void *block)
+@@ -548,10 +631,10 @@ size_t ksize(const void *block)
sp = slob_page(block);
if (is_slob_page(sp)) {
int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
}
EXPORT_SYMBOL(ksize);
-@@ -597,17 +680,25 @@ void *kmem_cache_alloc_node(struct kmem_
+@@ -606,17 +689,25 @@ void *kmem_cache_alloc_node(struct kmem_
{
void *b;
if (c->ctor)
c->ctor(b);
-@@ -619,10 +710,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
+@@ -628,10 +719,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
static void __kmem_cache_free(void *b, int size)
{
}
static void kmem_rcu_free(struct rcu_head *head)
-@@ -635,15 +732,24 @@ static void kmem_rcu_free(struct rcu_hea
+@@ -644,14 +741,23 @@ static void kmem_rcu_free(struct rcu_hea
void kmem_cache_free(struct kmem_cache *c, void *b)
{
if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
struct slob_rcu *slob_rcu;
- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
-+ slob_rcu = b + (size - sizeof(struct slob_rcu));
- INIT_RCU_HEAD(&slob_rcu->head);
- slob_rcu->size = c->size;
++ slob_rcu = b + (size - sizeof(struct slob_rcu));
+ slob_rcu->size = size;
call_rcu(&slob_rcu->head, kmem_rcu_free);
} else {
}
trace_kmem_cache_free(_RET_IP_, b);
-diff -urNp linux-2.6.35.4/mm/slub.c linux-2.6.35.4/mm/slub.c
---- linux-2.6.35.4/mm/slub.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/slub.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/mm/slub.c linux-2.6.36/mm/slub.c
+--- linux-2.6.36/mm/slub.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/slub.c 2010-11-06 18:58:50.000000000 -0400
@@ -1873,6 +1873,8 @@ void kmem_cache_free(struct kmem_cache *
page = virt_to_head_page(x);
- if (!s->refcount) {
+ if (atomic_dec_and_test(&s->refcount)) {
list_del(&s->list);
- up_write(&slub_lock);
if (kmem_cache_close(s)) {
-@@ -2780,6 +2781,46 @@ void *__kmalloc_node(size_t size, gfp_t
+ printk(KERN_ERR "SLUB %s: %s called for cache that "
+@@ -2779,6 +2780,46 @@ void *__kmalloc_node(size_t size, gfp_t
EXPORT_SYMBOL(__kmalloc_node);
#endif
size_t ksize(const void *object)
{
struct page *page;
-@@ -3049,7 +3090,7 @@ void __init kmem_cache_init(void)
+@@ -3048,7 +3089,7 @@ void __init kmem_cache_init(void)
*/
create_kmalloc_cache(&kmalloc_caches[0], "kmem_cache_node",
sizeof(struct kmem_cache_node), GFP_NOWAIT);
caches++;
hotplug_memory_notifier(slab_memory_callback, SLAB_CALLBACK_PRI);
-@@ -3158,7 +3199,7 @@ static int slab_unmergeable(struct kmem_
+@@ -3160,7 +3201,7 @@ static int slab_unmergeable(struct kmem_
/*
* We may have set a slab to be unmergeable during bootstrap.
*/
return 1;
return 0;
-@@ -3216,7 +3257,7 @@ struct kmem_cache *kmem_cache_create(con
+@@ -3218,7 +3259,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.
@@ -3227,7 +3268,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)) {
- down_write(&slub_lock);
- s->refcount--;
+ atomic_dec(&s->refcount);
- up_write(&slub_lock);
goto err;
}
-@@ -3953,7 +3994,7 @@ SLAB_ATTR_RO(ctor);
+ up_write(&slub_lock);
+@@ -3941,7 +3982,7 @@ SLAB_ATTR_RO(ctor);
static ssize_t aliases_show(struct kmem_cache *s, char *buf)
{
}
SLAB_ATTR_RO(aliases);
-@@ -4674,7 +4715,13 @@ static const struct file_operations proc
+@@ -4673,7 +4714,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.35.4/mm/util.c linux-2.6.35.4/mm/util.c
---- linux-2.6.35.4/mm/util.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/util.c 2010-09-17 20:12:09.000000000 -0400
-@@ -245,6 +245,12 @@ EXPORT_SYMBOL(strndup_user);
+diff -urNp linux-2.6.36/mm/util.c linux-2.6.36/mm/util.c
+--- linux-2.6.36/mm/util.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/util.c 2010-11-06 18:58:15.000000000 -0400
+@@ -240,6 +240,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.35.4/mm/vmalloc.c linux-2.6.35.4/mm/vmalloc.c
---- linux-2.6.35.4/mm/vmalloc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/vmalloc.c 2010-09-17 20:12:09.000000000 -0400
-@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
+diff -urNp linux-2.6.36/mm/vmalloc.c linux-2.6.36/mm/vmalloc.c
+--- linux-2.6.36/mm/vmalloc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/vmalloc.c 2010-11-06 18:58:15.000000000 -0400
+@@ -41,8 +41,19 @@ static void vunmap_pte_range(pmd_t *pmd,
pte = pte_offset_kernel(pmd, addr);
do {
} while (pte++, addr += PAGE_SIZE, addr != end);
}
-@@ -92,6 +103,7 @@ static int vmap_pte_range(pmd_t *pmd, un
+@@ -93,6 +104,7 @@ static int vmap_pte_range(pmd_t *pmd, un
unsigned long end, pgprot_t prot, struct page **pages, int *nr)
{
pte_t *pte;
/*
* nr is a running index into the array which helps higher level
-@@ -101,17 +113,30 @@ static int vmap_pte_range(pmd_t *pmd, un
+@@ -102,17 +114,30 @@ static int vmap_pte_range(pmd_t *pmd, un
pte = pte_alloc_kernel(pmd, addr);
if (!pte)
return -ENOMEM;
}
static int vmap_pmd_range(pud_t *pud, unsigned long addr,
-@@ -192,11 +217,20 @@ int is_vmalloc_or_module_addr(const void
+@@ -193,11 +218,20 @@ int is_vmalloc_or_module_addr(const void
* and fall back on vmalloc() if that fails. Others
* just put it in the vmalloc space.
*/
return is_vmalloc_addr(x);
}
-@@ -217,8 +251,14 @@ struct page *vmalloc_to_page(const void
+@@ -218,8 +252,14 @@ struct page *vmalloc_to_page(const void
if (!pgd_none(*pgd)) {
pud_t *pud = pud_offset(pgd, addr);
if (!pmd_none(*pmd)) {
pte_t *ptep, pte;
-@@ -292,13 +332,13 @@ static void __insert_vmap_area(struct vm
+@@ -293,13 +333,13 @@ static void __insert_vmap_area(struct vm
struct rb_node *tmp;
while (*p) {
p = &(*p)->rb_right;
else
BUG();
-@@ -1224,6 +1264,16 @@ static struct vm_struct *__get_vm_area_n
+@@ -1228,6 +1268,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);
-@@ -1449,6 +1499,11 @@ void *vmap(struct page **pages, unsigned
+@@ -1453,6 +1503,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 @@ static void *__vmalloc_node(unsigned lon
+@@ -1562,6 +1617,13 @@ static void *__vmalloc_node(unsigned lon
if (!size || (size >> PAGE_SHIFT) > totalram_pages)
return NULL;
area = __get_vm_area_node(size, align, VM_ALLOC, VMALLOC_START,
VMALLOC_END, node, gfp_mask, caller);
-@@ -1576,6 +1638,7 @@ static void *__vmalloc_node(unsigned lon
+@@ -1580,6 +1642,7 @@ static void *__vmalloc_node(unsigned lon
return addr;
}
void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
{
return __vmalloc_node(size, 1, gfp_mask, prot, -1,
-@@ -1592,6 +1655,7 @@ EXPORT_SYMBOL(__vmalloc);
+@@ -1596,6 +1659,7 @@ EXPORT_SYMBOL(__vmalloc);
* For tight control over page level allocator and protection flags
* use __vmalloc() instead.
*/
void *vmalloc(unsigned long size)
{
return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
-@@ -1606,6 +1670,7 @@ EXPORT_SYMBOL(vmalloc);
+@@ -1610,6 +1674,7 @@ EXPORT_SYMBOL(vmalloc);
* 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;
-@@ -1633,6 +1698,7 @@ EXPORT_SYMBOL(vmalloc_user);
+@@ -1637,6 +1702,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,
-@@ -1655,10 +1721,10 @@ EXPORT_SYMBOL(vmalloc_node);
+@@ -1659,10 +1725,10 @@ EXPORT_SYMBOL(vmalloc_node);
* For tight control over page level allocator and protection flags
* use __vmalloc() instead.
*/
-1, __builtin_return_address(0));
}
-@@ -1677,6 +1743,7 @@ void *vmalloc_exec(unsigned long size)
+@@ -1681,6 +1747,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,
-@@ -1691,6 +1758,7 @@ EXPORT_SYMBOL(vmalloc_32);
+@@ -1695,6 +1762,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;
-diff -urNp linux-2.6.35.4/mm/vmstat.c linux-2.6.35.4/mm/vmstat.c
---- linux-2.6.35.4/mm/vmstat.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/mm/vmstat.c 2010-09-17 20:12:37.000000000 -0400
+@@ -1959,6 +2027,8 @@ int remap_vmalloc_range(struct vm_area_s
+ unsigned long uaddr = vma->vm_start;
+ unsigned long usize = vma->vm_end - vma->vm_start;
+
++ BUG_ON(vma->vm_mirror);
++
+ if ((PAGE_SIZE-1) & (unsigned long)addr)
+ return -EINVAL;
+
+diff -urNp linux-2.6.36/mm/vmstat.c linux-2.6.36/mm/vmstat.c
+--- linux-2.6.36/mm/vmstat.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/mm/vmstat.c 2010-11-06 18:58:50.000000000 -0400
@@ -76,7 +76,7 @@ void vm_events_fold_cpu(int cpu)
*
* vm_stat contains the global counters
EXPORT_SYMBOL(vm_stat);
#ifdef CONFIG_SMP
-@@ -315,7 +315,7 @@ void refresh_cpu_vm_stats(int cpu)
+@@ -328,7 +328,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 */
-@@ -353,7 +353,7 @@ void refresh_cpu_vm_stats(int cpu)
+@@ -366,7 +366,7 @@ void refresh_cpu_vm_stats(int cpu)
for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
if (global_diff[i])
}
#endif
-@@ -1038,10 +1038,16 @@ static int __init setup_vmstat(void)
+@@ -1050,10 +1050,16 @@ static int __init setup_vmstat(void)
start_cpu_timer(cpu);
#endif
#ifdef CONFIG_PROC_FS
#endif
return 0;
}
-diff -urNp linux-2.6.35.4/net/8021q/vlan.c linux-2.6.35.4/net/8021q/vlan.c
---- linux-2.6.35.4/net/8021q/vlan.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/8021q/vlan.c 2010-09-17 20:12:09.000000000 -0400
-@@ -618,8 +618,7 @@ static int vlan_ioctl_handler(struct net
+diff -urNp linux-2.6.36/net/8021q/vlan.c linux-2.6.36/net/8021q/vlan.c
+--- linux-2.6.36/net/8021q/vlan.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/8021q/vlan.c 2010-11-06 18:58:15.000000000 -0400
+@@ -627,8 +627,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.35.4/net/atm/atm_misc.c linux-2.6.35.4/net/atm/atm_misc.c
---- linux-2.6.35.4/net/atm/atm_misc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/atm/atm_misc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/net/atm/atm_misc.c linux-2.6.36/net/atm/atm_misc.c
+--- linux-2.6.36/net/atm/atm_misc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/atm/atm_misc.c 2010-11-06 18:58:15.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.35.4/net/atm/proc.c linux-2.6.35.4/net/atm/proc.c
---- linux-2.6.35.4/net/atm/proc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/atm/proc.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/net/atm/proc.c linux-2.6.36/net/atm/proc.c
+--- linux-2.6.36/net/atm/proc.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/atm/proc.c 2010-11-06 18:58:50.000000000 -0400
@@ -44,9 +44,9 @@ static void add_stats(struct seq_file *s
const struct k_atm_aal_stats *stats)
{
if (!vcc->dev)
seq_printf(seq, "Unassigned ");
else
-diff -urNp linux-2.6.35.4/net/atm/resources.c linux-2.6.35.4/net/atm/resources.c
---- linux-2.6.35.4/net/atm/resources.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/atm/resources.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/net/atm/resources.c linux-2.6.36/net/atm/resources.c
+--- linux-2.6.36/net/atm/resources.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/atm/resources.c 2010-11-06 18:58:15.000000000 -0400
@@ -159,7 +159,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.35.4/net/bridge/br_stp_if.c linux-2.6.35.4/net/bridge/br_stp_if.c
---- linux-2.6.35.4/net/bridge/br_stp_if.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/bridge/br_stp_if.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/net/ax25/af_ax25.c linux-2.6.36/net/ax25/af_ax25.c
+--- linux-2.6.36/net/ax25/af_ax25.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/ax25/af_ax25.c 2010-11-06 18:58:50.000000000 -0400
+@@ -1392,6 +1392,7 @@ static int ax25_getname(struct socket *s
+ ax25_cb *ax25;
+ int err = 0;
+
++ memset(fsa, 0, sizeof(*fsa));
+ lock_sock(sk);
+ ax25 = ax25_sk(sk);
+
+@@ -1403,7 +1404,6 @@ static int ax25_getname(struct socket *s
+
+ fsa->fsa_ax25.sax25_family = AF_AX25;
+ fsa->fsa_ax25.sax25_call = ax25->dest_addr;
+- fsa->fsa_ax25.sax25_ndigis = 0;
+
+ if (ax25->digipeat != NULL) {
+ ndigi = ax25->digipeat->ndigi;
+diff -urNp linux-2.6.36/net/bridge/br_multicast.c linux-2.6.36/net/bridge/br_multicast.c
+--- linux-2.6.36/net/bridge/br_multicast.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/bridge/br_multicast.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1461,7 +1461,7 @@ static int br_multicast_ipv6_rcv(struct
+ nexthdr = ip6h->nexthdr;
+ offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
+
+- if (offset < 0 || nexthdr != IPPROTO_ICMPV6)
++ if (nexthdr != IPPROTO_ICMPV6)
+ return 0;
+
+ /* Okay, we found ICMPv6 header */
+diff -urNp linux-2.6.36/net/bridge/br_stp_if.c linux-2.6.36/net/bridge/br_stp_if.c
+--- linux-2.6.36/net/bridge/br_stp_if.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/bridge/br_stp_if.c 2010-11-06 18:58:15.000000000 -0400
@@ -145,7 +145,7 @@ static void br_stp_stop(struct net_bridg
char *envp[] = { NULL };
br_info(br, "userspace STP stopped, return code %d\n", r);
/* To start timers on any ports left in blocking */
-diff -urNp linux-2.6.35.4/net/bridge/netfilter/ebtables.c linux-2.6.35.4/net/bridge/netfilter/ebtables.c
---- linux-2.6.35.4/net/bridge/netfilter/ebtables.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/bridge/netfilter/ebtables.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1501,7 +1501,7 @@ static int do_ebt_get_ctl(struct sock *s
+diff -urNp linux-2.6.36/net/bridge/netfilter/ebtables.c linux-2.6.36/net/bridge/netfilter/ebtables.c
+--- linux-2.6.36/net/bridge/netfilter/ebtables.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/bridge/netfilter/ebtables.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1504,7 +1504,7 @@ static int do_ebt_get_ctl(struct sock *s
tmp.valid_hooks = t->table->valid_hooks;
}
mutex_unlock(&ebt_mutex);
BUGPRINT("c2u Didn't work\n");
ret = -EFAULT;
break;
-diff -urNp linux-2.6.35.4/net/core/dev.c linux-2.6.35.4/net/core/dev.c
---- linux-2.6.35.4/net/core/dev.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/core/dev.c 2010-09-17 20:12:09.000000000 -0400
-@@ -2541,7 +2541,7 @@ int netif_rx_ni(struct sk_buff *skb)
+diff -urNp linux-2.6.36/net/core/dev.c linux-2.6.36/net/core/dev.c
+--- linux-2.6.36/net/core/dev.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/core/dev.c 2010-11-06 18:58:15.000000000 -0400
+@@ -2554,7 +2554,7 @@ int netif_rx_ni(struct sk_buff *skb)
}
EXPORT_SYMBOL(netif_rx_ni);
{
struct softnet_data *sd = &__get_cpu_var(softnet_data);
-@@ -3474,7 +3474,7 @@ void netif_napi_del(struct napi_struct *
+@@ -3482,7 +3482,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.35.4/net/core/net-sysfs.c linux-2.6.35.4/net/core/net-sysfs.c
---- linux-2.6.35.4/net/core/net-sysfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/core/net-sysfs.c 2010-09-17 20:12:09.000000000 -0400
-@@ -511,7 +511,7 @@ static ssize_t rx_queue_attr_store(struc
+diff -urNp linux-2.6.36/net/core/net-sysfs.c linux-2.6.36/net/core/net-sysfs.c
+--- linux-2.6.36/net/core/net-sysfs.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/core/net-sysfs.c 2010-11-06 18:58:15.000000000 -0400
+@@ -515,7 +515,7 @@ static ssize_t rx_queue_attr_store(struc
return attribute->store(queue, attribute, buf, count);
}
.show = rx_queue_attr_show,
.store = rx_queue_attr_store,
};
-diff -urNp linux-2.6.35.4/net/core/sock.c linux-2.6.35.4/net/core/sock.c
---- linux-2.6.35.4/net/core/sock.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/core/sock.c 2010-09-17 20:12:09.000000000 -0400
-@@ -915,7 +915,7 @@ int sock_getsockopt(struct socket *sock,
+diff -urNp linux-2.6.36/net/core/sock.c linux-2.6.36/net/core/sock.c
+--- linux-2.6.36/net/core/sock.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/core/sock.c 2010-11-06 18:58:15.000000000 -0400
+@@ -934,7 +934,7 @@ int sock_getsockopt(struct socket *sock,
return -ENOTCONN;
if (lv < len)
return -EINVAL;
return -EFAULT;
goto lenout;
}
-@@ -948,7 +948,7 @@ int sock_getsockopt(struct socket *sock,
+@@ -967,7 +967,7 @@ int sock_getsockopt(struct socket *sock,
if (len > lv)
len = lv;
return -EFAULT;
lenout:
if (put_user(len, optlen))
-diff -urNp linux-2.6.35.4/net/dccp/ccids/ccid3.c linux-2.6.35.4/net/dccp/ccids/ccid3.c
---- linux-2.6.35.4/net/dccp/ccids/ccid3.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/dccp/ccids/ccid3.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/net/dccp/ccids/ccid3.c linux-2.6.36/net/dccp/ccids/ccid3.c
+--- linux-2.6.36/net/dccp/ccids/ccid3.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/dccp/ccids/ccid3.c 2010-11-06 18:58:15.000000000 -0400
@@ -41,7 +41,7 @@
static int ccid3_debug;
#define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a)
#endif
/*
-diff -urNp linux-2.6.35.4/net/dccp/dccp.h linux-2.6.35.4/net/dccp/dccp.h
---- linux-2.6.35.4/net/dccp/dccp.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/dccp/dccp.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/net/dccp/dccp.h linux-2.6.36/net/dccp/dccp.h
+--- linux-2.6.36/net/dccp/dccp.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/dccp/dccp.h 2010-11-06 18:58:15.000000000 -0400
@@ -44,9 +44,9 @@ extern int dccp_debug;
#define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a)
#define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)
#endif
extern struct inet_hashinfo dccp_hashinfo;
-diff -urNp linux-2.6.35.4/net/decnet/sysctl_net_decnet.c linux-2.6.35.4/net/decnet/sysctl_net_decnet.c
---- linux-2.6.35.4/net/decnet/sysctl_net_decnet.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/decnet/sysctl_net_decnet.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/net/decnet/sysctl_net_decnet.c linux-2.6.36/net/decnet/sysctl_net_decnet.c
+--- linux-2.6.36/net/decnet/sysctl_net_decnet.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/decnet/sysctl_net_decnet.c 2010-11-06 18:58:50.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.35.4/net/ipv4/inet_hashtables.c linux-2.6.35.4/net/ipv4/inet_hashtables.c
---- linux-2.6.35.4/net/ipv4/inet_hashtables.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/ipv4/inet_hashtables.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/net/ipv4/inet_hashtables.c linux-2.6.36/net/ipv4/inet_hashtables.c
+--- linux-2.6.36/net/ipv4/inet_hashtables.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/ipv4/inet_hashtables.c 2010-11-06 18:58:50.000000000 -0400
@@ -18,11 +18,14 @@
#include <linux/sched.h>
#include <linux/slab.h>
/*
* Allocate and initialize a new local port bind bucket.
* The bindhash mutex for snum's hash chain must be held here.
-@@ -508,6 +511,8 @@ ok:
+@@ -506,6 +509,8 @@ ok:
twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
spin_unlock(&head->lock);
if (tw) {
inet_twsk_deschedule(tw, death_row);
while (twrefcnt) {
-diff -urNp linux-2.6.35.4/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.35.4/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-2.6.35.4/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/net/ipv4/inetpeer.c linux-2.6.36/net/ipv4/inetpeer.c
+--- linux-2.6.36/net/ipv4/inetpeer.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/ipv4/inetpeer.c 2010-11-06 18:58:15.000000000 -0400
+@@ -447,8 +447,8 @@ struct inet_peer *inet_getpeer(__be32 da
+ if (p) {
+ p->v4daddr = daddr;
+ atomic_set(&p->refcnt, 1);
+- atomic_set(&p->rid, 0);
+- atomic_set(&p->ip_id_count, secure_ip_id(daddr));
++ atomic_set_unchecked(&p->rid, 0);
++ atomic_set_unchecked(&p->ip_id_count, secure_ip_id(daddr));
+ p->tcp_ts_stamp = 0;
+ INIT_LIST_HEAD(&p->unused);
+
+diff -urNp linux-2.6.36/net/ipv4/ip_fragment.c linux-2.6.36/net/ipv4/ip_fragment.c
+--- linux-2.6.36/net/ipv4/ip_fragment.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/ipv4/ip_fragment.c 2010-11-06 18:58:15.000000000 -0400
+@@ -279,7 +279,7 @@ static inline int ip_frag_too_far(struct
+ return 0;
+
+ start = qp->rid;
+- end = atomic_inc_return(&peer->rid);
++ end = atomic_inc_return_unchecked(&peer->rid);
+ qp->rid = end;
+
+ rc = qp->q.fragments && (end - start) > max;
+diff -urNp linux-2.6.36/net/ipv4/netfilter/arp_tables.c linux-2.6.36/net/ipv4/netfilter/arp_tables.c
+--- linux-2.6.36/net/ipv4/netfilter/arp_tables.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/ipv4/netfilter/arp_tables.c 2010-11-06 18:58:50.000000000 -0400
+@@ -927,6 +927,7 @@ static int get_info(struct net *net, voi
+ private = &tmp;
+ }
+ #endif
++ memset(&info, 0, sizeof(info));
+ info.valid_hooks = t->valid_hooks;
+ memcpy(info.hook_entry, private->hook_entry,
+ sizeof(info.hook_entry));
+diff -urNp linux-2.6.36/net/ipv4/netfilter/ip_tables.c linux-2.6.36/net/ipv4/netfilter/ip_tables.c
+--- linux-2.6.36/net/ipv4/netfilter/ip_tables.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/ipv4/netfilter/ip_tables.c 2010-11-06 18:58:50.000000000 -0400
+@@ -1124,6 +1124,7 @@ static int get_info(struct net *net, voi
+ private = &tmp;
+ }
+ #endif
++ memset(&info, 0, sizeof(info));
+ info.valid_hooks = t->valid_hooks;
+ memcpy(info.hook_entry, private->hook_entry,
+ sizeof(info.hook_entry));
+diff -urNp linux-2.6.36/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.36/net/ipv4/netfilter/nf_nat_snmp_basic.c
+--- linux-2.6.36/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-11-06 18:58:15.000000000 -0400
@@ -398,7 +398,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.35.4/net/ipv4/tcp_ipv4.c linux-2.6.35.4/net/ipv4/tcp_ipv4.c
---- linux-2.6.35.4/net/ipv4/tcp_ipv4.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/ipv4/tcp_ipv4.c 2010-09-17 20:12:37.000000000 -0400
-@@ -85,6 +85,9 @@
- int sysctl_tcp_tw_reuse __read_mostly;
+diff -urNp linux-2.6.36/net/ipv4/route.c linux-2.6.36/net/ipv4/route.c
+--- linux-2.6.36/net/ipv4/route.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/ipv4/route.c 2010-11-06 18:58:15.000000000 -0400
+@@ -2890,7 +2890,7 @@ static int rt_fill_info(struct net *net,
+ expires = rt->dst.expires ? rt->dst.expires - jiffies : 0;
+ if (rt->peer) {
+ inet_peer_refcheck(rt->peer);
+- id = atomic_read(&rt->peer->ip_id_count) & 0xffff;
++ id = atomic_read_unchecked(&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.36/net/ipv4/tcp_ipv4.c linux-2.6.36/net/ipv4/tcp_ipv4.c
+--- linux-2.6.36/net/ipv4/tcp_ipv4.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/ipv4/tcp_ipv4.c 2010-11-06 19:08:40.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_GRKERNSEC_BLACKHOLE
+extern int grsec_enable_blackhole;
#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
+@@ -1597,6 +1600,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc
return 0;
reset:
tcp_v4_send_reset(rsk, skb);
discard:
kfree_skb(skb);
-@@ -1654,12 +1660,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
+@@ -1659,12 +1665,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);
-@@ -1709,6 +1722,10 @@ no_tcp_socket:
+@@ -1714,6 +1727,10 @@ no_tcp_socket:
bad_packet:
TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
} else {
tcp_v4_send_reset(NULL, skb);
}
-@@ -2316,7 +2333,11 @@ static void get_openreq4(struct sock *sk
+@@ -2400,7 +2417,11 @@ static void get_openreq4(struct sock *sk
0, /* non standard timer */
0, /* open_requests have no inode */
atomic_read(&sk->sk_refcnt),
len);
}
-@@ -2366,7 +2387,12 @@ static void get_tcp4_sock(struct sock *s
+@@ -2450,7 +2471,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,
-@@ -2394,7 +2420,13 @@ static void get_timewait4_sock(struct in
+@@ -2478,7 +2504,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.35.4/net/ipv4/tcp_minisocks.c linux-2.6.35.4/net/ipv4/tcp_minisocks.c
---- linux-2.6.35.4/net/ipv4/tcp_minisocks.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/ipv4/tcp_minisocks.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/net/ipv4/tcp_minisocks.c linux-2.6.36/net/ipv4/tcp_minisocks.c
+--- linux-2.6.36/net/ipv4/tcp_minisocks.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/ipv4/tcp_minisocks.c 2010-11-06 18:58:50.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.35.4/net/ipv4/tcp_probe.c linux-2.6.35.4/net/ipv4/tcp_probe.c
---- linux-2.6.35.4/net/ipv4/tcp_probe.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/ipv4/tcp_probe.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/net/ipv4/tcp_probe.c linux-2.6.36/net/ipv4/tcp_probe.c
+--- linux-2.6.36/net/ipv4/tcp_probe.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/ipv4/tcp_probe.c 2010-11-06 18:58:50.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.35.4/net/ipv4/tcp_timer.c linux-2.6.35.4/net/ipv4/tcp_timer.c
---- linux-2.6.35.4/net/ipv4/tcp_timer.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/ipv4/tcp_timer.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/net/ipv4/tcp_timer.c linux-2.6.36/net/ipv4/tcp_timer.c
+--- linux-2.6.36/net/ipv4/tcp_timer.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/ipv4/tcp_timer.c 2010-11-06 19:10:03.000000000 -0400
@@ -22,6 +22,10 @@
#include <linux/gfp.h>
#include <net/tcp.h>
int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
-@@ -195,6 +199,13 @@ static int tcp_write_timeout(struct sock
+@@ -198,6 +202,13 @@ static int tcp_write_timeout(struct sock
}
}
+ retry_until = grsec_lastack_retries;
+#endif
+
- if (retransmits_timed_out(sk, retry_until)) {
+ if (retransmits_timed_out(sk, retry_until, syn_set)) {
/* Has it gone just too far? */
tcp_write_err(sk);
-diff -urNp linux-2.6.35.4/net/ipv4/udp.c linux-2.6.35.4/net/ipv4/udp.c
---- linux-2.6.35.4/net/ipv4/udp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/ipv4/udp.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/net/ipv4/udp.c linux-2.6.36/net/ipv4/udp.c
+--- linux-2.6.36/net/ipv4/udp.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/ipv4/udp.c 2010-11-06 18:58:50.000000000 -0400
@@ -86,6 +86,7 @@
#include <linux/types.h>
#include <linux/fcntl.h>
ulen = skb->len - sizeof(struct udphdr);
if (len > ulen)
len = ulen;
-@@ -1582,6 +1603,9 @@ int __udp4_lib_rcv(struct sk_buff *skb,
+@@ -1625,6 +1646,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);
/*
-@@ -2007,7 +2031,12 @@ static void udp4_format_sock(struct sock
+@@ -2051,7 +2075,12 @@ 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),
atomic_read(&sp->sk_drops), len);
}
-diff -urNp linux-2.6.35.4/net/ipv6/exthdrs.c linux-2.6.35.4/net/ipv6/exthdrs.c
---- linux-2.6.35.4/net/ipv6/exthdrs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/ipv6/exthdrs.c 2010-09-17 20:12:09.000000000 -0400
-@@ -636,7 +636,7 @@ static struct tlvtype_proc tlvprochopopt
+diff -urNp linux-2.6.36/net/ipv6/exthdrs.c linux-2.6.36/net/ipv6/exthdrs.c
+--- linux-2.6.36/net/ipv6/exthdrs.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/ipv6/exthdrs.c 2010-11-06 18:58:15.000000000 -0400
+@@ -634,7 +634,7 @@ static struct tlvtype_proc tlvprochopopt
.type = IPV6_TLV_JUMBO,
.func = ipv6_hop_jumbo,
},
};
int ipv6_parse_hopopts(struct sk_buff *skb)
-diff -urNp linux-2.6.35.4/net/ipv6/raw.c linux-2.6.35.4/net/ipv6/raw.c
---- linux-2.6.35.4/net/ipv6/raw.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/ipv6/raw.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/net/ipv6/netfilter/ip6_tables.c linux-2.6.36/net/ipv6/netfilter/ip6_tables.c
+--- linux-2.6.36/net/ipv6/netfilter/ip6_tables.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/ipv6/netfilter/ip6_tables.c 2010-11-06 18:58:50.000000000 -0400
+@@ -1137,6 +1137,7 @@ static int get_info(struct net *net, voi
+ private = &tmp;
+ }
+ #endif
++ memset(&info, 0, sizeof(info));
+ info.valid_hooks = t->valid_hooks;
+ memcpy(info.hook_entry, private->hook_entry,
+ sizeof(info.hook_entry));
+diff -urNp linux-2.6.36/net/ipv6/raw.c linux-2.6.36/net/ipv6/raw.c
+--- linux-2.6.36/net/ipv6/raw.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/ipv6/raw.c 2010-11-06 18:58:50.000000000 -0400
@@ -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 rt6_info *rt,
+ struct flowi *fl, struct dst_entry **dstp,
unsigned int flags)
{
-diff -urNp linux-2.6.35.4/net/ipv6/tcp_ipv6.c linux-2.6.35.4/net/ipv6/tcp_ipv6.c
---- linux-2.6.35.4/net/ipv6/tcp_ipv6.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/ipv6/tcp_ipv6.c 2010-09-17 20:23:25.000000000 -0400
+@@ -1243,7 +1243,13 @@ static void raw6_sock_seq_show(struct se
+ 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),
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++ NULL,
++#else
++ sp,
++#endif
++ atomic_read(&sp->sk_drops));
+ }
+
+ static int raw6_seq_show(struct seq_file *seq, void *v)
+diff -urNp linux-2.6.36/net/ipv6/tcp_ipv6.c linux-2.6.36/net/ipv6/tcp_ipv6.c
+--- linux-2.6.36/net/ipv6/tcp_ipv6.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/ipv6/tcp_ipv6.c 2010-11-06 18:58:50.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) {
-@@ -1641,6 +1645,9 @@ static int tcp_v6_do_rcv(struct sock *sk
+@@ -1627,6 +1631,9 @@ static int tcp_v6_do_rcv(struct sock *sk
return 0;
reset:
tcp_v6_send_reset(sk, skb);
discard:
if (opt_skb)
-@@ -1720,12 +1727,20 @@ static int tcp_v6_rcv(struct sk_buff *sk
+@@ -1706,12 +1713,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);
-@@ -1773,6 +1788,10 @@ no_tcp_socket:
+@@ -1759,6 +1774,10 @@ no_tcp_socket:
bad_packet:
TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
} else {
tcp_v6_send_reset(NULL, skb);
}
-diff -urNp linux-2.6.35.4/net/ipv6/udp.c linux-2.6.35.4/net/ipv6/udp.c
---- linux-2.6.35.4/net/ipv6/udp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/ipv6/udp.c 2010-09-17 20:12:37.000000000 -0400
+@@ -1987,7 +2006,13 @@ static void get_openreq6(struct seq_file
+ uid,
+ 0, /* non standard timer */
+ 0, /* open_requests have no inode */
+- 0, req);
++ 0,
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++ NULL
++#else
++ req
++#endif
++ );
+ }
+
+ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
+@@ -2037,7 +2062,12 @@ static void get_tcp6_sock(struct seq_fil
+ sock_i_uid(sp),
+ icsk->icsk_probes_out,
+ sock_i_ino(sp),
+- atomic_read(&sp->sk_refcnt), sp,
++ atomic_read(&sp->sk_refcnt),
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++ NULL,
++#else
++ sp,
++#endif
+ jiffies_to_clock_t(icsk->icsk_rto),
+ jiffies_to_clock_t(icsk->icsk_ack.ato),
+ (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong,
+@@ -2072,7 +2102,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,
+- atomic_read(&tw->tw_refcnt), tw);
++ atomic_read(&tw->tw_refcnt),
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++ NULL
++#else
++ tw
++#endif
++ );
+ }
+
+ static int tcp6_seq_show(struct seq_file *seq, void *v)
+diff -urNp linux-2.6.36/net/ipv6/udp.c linux-2.6.36/net/ipv6/udp.c
+--- linux-2.6.36/net/ipv6/udp.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/ipv6/udp.c 2010-11-06 18:58:50.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;
-@@ -756,6 +760,9 @@ int __udp6_lib_rcv(struct sk_buff *skb,
+@@ -765,6 +769,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);
-diff -urNp linux-2.6.35.4/net/irda/ircomm/ircomm_tty.c linux-2.6.35.4/net/irda/ircomm/ircomm_tty.c
---- linux-2.6.35.4/net/irda/ircomm/ircomm_tty.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/irda/ircomm/ircomm_tty.c 2010-09-17 20:12:09.000000000 -0400
+@@ -1399,7 +1406,12 @@ static void udp6_sock_seq_show(struct se
+ 0, 0L, 0,
+ sock_i_uid(sp), 0,
+ sock_i_ino(sp),
+- atomic_read(&sp->sk_refcnt), sp,
++ atomic_read(&sp->sk_refcnt),
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++ NULL,
++#else
++ sp,
++#endif
+ atomic_read(&sp->sk_drops));
+ }
+
+diff -urNp linux-2.6.36/net/irda/ircomm/ircomm_tty.c linux-2.6.36/net/irda/ircomm/ircomm_tty.c
+--- linux-2.6.36/net/irda/ircomm/ircomm_tty.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/irda/ircomm/ircomm_tty.c 2010-11-06 18:58:15.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.35.4/net/key/af_key.c linux-2.6.35.4/net/key/af_key.c
---- linux-2.6.35.4/net/key/af_key.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/key/af_key.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/net/key/af_key.c linux-2.6.36/net/key/af_key.c
+--- linux-2.6.36/net/key/af_key.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/key/af_key.c 2010-11-06 18:58:50.000000000 -0400
@@ -3644,7 +3644,11 @@ static int pfkey_seq_show(struct seq_fil
seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n");
else
atomic_read(&s->sk_refcnt),
sk_rmem_alloc_get(s),
sk_wmem_alloc_get(s),
-diff -urNp linux-2.6.35.4/net/mac80211/ieee80211_i.h linux-2.6.35.4/net/mac80211/ieee80211_i.h
---- linux-2.6.35.4/net/mac80211/ieee80211_i.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/mac80211/ieee80211_i.h 2010-09-17 20:12:09.000000000 -0400
-@@ -649,7 +649,7 @@ struct ieee80211_local {
+diff -urNp linux-2.6.36/net/mac80211/ieee80211_i.h linux-2.6.36/net/mac80211/ieee80211_i.h
+--- linux-2.6.36/net/mac80211/ieee80211_i.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/mac80211/ieee80211_i.h 2010-11-06 18:58:15.000000000 -0400
+@@ -650,7 +650,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.35.4/net/mac80211/iface.c linux-2.6.35.4/net/mac80211/iface.c
---- linux-2.6.35.4/net/mac80211/iface.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/mac80211/iface.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/net/mac80211/iface.c linux-2.6.36/net/mac80211/iface.c
+--- linux-2.6.36/net/mac80211/iface.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/mac80211/iface.c 2010-11-06 18:58:15.000000000 -0400
@@ -183,7 +183,7 @@ static int ieee80211_open(struct net_dev
break;
}
drv_stop(local);
return -EADDRNOTAVAIL;
}
-@@ -308,7 +308,7 @@ static int ieee80211_open(struct net_dev
+@@ -309,7 +309,7 @@ static int ieee80211_open(struct net_dev
hw_reconf_flags |= __ieee80211_recalc_idle(local);
if (hw_reconf_flags) {
ieee80211_hw_config(local, hw_reconf_flags);
/*
-@@ -336,7 +336,7 @@ static int ieee80211_open(struct net_dev
+@@ -328,7 +328,7 @@ static int ieee80211_open(struct net_dev
err_del_interface:
drv_remove_interface(local, &sdata->vif);
err_stop:
drv_stop(local);
err_del_bss:
sdata->bss = NULL;
-@@ -439,7 +439,7 @@ static int ieee80211_stop(struct net_dev
+@@ -418,7 +418,7 @@ static int ieee80211_stop(struct net_dev
WARN_ON(!list_empty(&sdata->u.ap.vlans));
}
switch (sdata->vif.type) {
case NL80211_IFTYPE_AP_VLAN:
-@@ -542,7 +542,7 @@ static int ieee80211_stop(struct net_dev
+@@ -518,7 +518,7 @@ static int ieee80211_stop(struct net_dev
ieee80211_recalc_ps(local, -1);
ieee80211_clear_tx_pending(local);
ieee80211_stop_device(local);
-diff -urNp linux-2.6.35.4/net/mac80211/main.c linux-2.6.35.4/net/mac80211/main.c
---- linux-2.6.35.4/net/mac80211/main.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/mac80211/main.c 2010-09-17 20:12:09.000000000 -0400
-@@ -148,7 +148,7 @@ int ieee80211_hw_config(struct ieee80211
+diff -urNp linux-2.6.36/net/mac80211/main.c linux-2.6.36/net/mac80211/main.c
+--- linux-2.6.36/net/mac80211/main.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/mac80211/main.c 2010-11-06 18:58:15.000000000 -0400
+@@ -152,7 +152,7 @@ int ieee80211_hw_config(struct ieee80211
local->hw.conf.power_level = power;
}
ret = drv_config(local, changed);
/*
* Goal:
-diff -urNp linux-2.6.35.4/net/mac80211/pm.c linux-2.6.35.4/net/mac80211/pm.c
---- linux-2.6.35.4/net/mac80211/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/mac80211/pm.c 2010-09-17 20:12:09.000000000 -0400
-@@ -101,7 +101,7 @@ int __ieee80211_suspend(struct ieee80211
+diff -urNp linux-2.6.36/net/mac80211/pm.c linux-2.6.36/net/mac80211/pm.c
+--- linux-2.6.36/net/mac80211/pm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/mac80211/pm.c 2010-11-06 18:58:15.000000000 -0400
+@@ -95,7 +95,7 @@ int __ieee80211_suspend(struct ieee80211
}
/* stop hardware - this must stop RX */
ieee80211_stop_device(local);
local->suspended = true;
-diff -urNp linux-2.6.35.4/net/mac80211/rate.c linux-2.6.35.4/net/mac80211/rate.c
---- linux-2.6.35.4/net/mac80211/rate.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/mac80211/rate.c 2010-09-17 20:12:09.000000000 -0400
-@@ -355,7 +355,7 @@ int ieee80211_init_rate_ctrl_alg(struct
+diff -urNp linux-2.6.36/net/mac80211/rate.c linux-2.6.36/net/mac80211/rate.c
+--- linux-2.6.36/net/mac80211/rate.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/mac80211/rate.c 2010-11-06 18:58:15.000000000 -0400
+@@ -357,7 +357,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.35.4/net/mac80211/rc80211_pid_debugfs.c linux-2.6.35.4/net/mac80211/rc80211_pid_debugfs.c
---- linux-2.6.35.4/net/mac80211/rc80211_pid_debugfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/mac80211/rc80211_pid_debugfs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/net/mac80211/rc80211_pid_debugfs.c linux-2.6.36/net/mac80211/rc80211_pid_debugfs.c
+--- linux-2.6.36/net/mac80211/rc80211_pid_debugfs.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/mac80211/rc80211_pid_debugfs.c 2010-11-06 18:58:15.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.35.4/net/mac80211/tx.c linux-2.6.35.4/net/mac80211/tx.c
---- linux-2.6.35.4/net/mac80211/tx.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/mac80211/tx.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/net/mac80211/tx.c linux-2.6.36/net/mac80211/tx.c
+--- linux-2.6.36/net/mac80211/tx.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/mac80211/tx.c 2010-11-06 18:58:15.000000000 -0400
@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct
return cpu_to_le16(dur);
}
struct net_device *dev)
{
return local == wdev_priv(dev->ieee80211_ptr);
-diff -urNp linux-2.6.35.4/net/mac80211/util.c linux-2.6.35.4/net/mac80211/util.c
---- linux-2.6.35.4/net/mac80211/util.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/mac80211/util.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1097,7 +1097,7 @@ int ieee80211_reconfig(struct ieee80211_
+diff -urNp linux-2.6.36/net/mac80211/util.c linux-2.6.36/net/mac80211/util.c
+--- linux-2.6.36/net/mac80211/util.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/mac80211/util.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1101,7 +1101,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.35.4/net/netlink/af_netlink.c linux-2.6.35.4/net/netlink/af_netlink.c
---- linux-2.6.35.4/net/netlink/af_netlink.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/netlink/af_netlink.c 2010-09-17 20:12:37.000000000 -0400
-@@ -2001,13 +2001,21 @@ static int netlink_seq_show(struct seq_f
+diff -urNp linux-2.6.36/net/netfilter/Kconfig linux-2.6.36/net/netfilter/Kconfig
+--- linux-2.6.36/net/netfilter/Kconfig 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/netfilter/Kconfig 2010-11-06 18:58:50.000000000 -0400
+@@ -708,6 +708,16 @@ config NETFILTER_XT_MATCH_ESP
+
+ To compile it as a module, choose M here. If unsure, say N.
+
++config NETFILTER_XT_MATCH_GRADM
++ tristate '"gradm" match support'
++ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
++ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
++ ---help---
++ The gradm match allows to match on grsecurity RBAC being enabled.
++ It is useful when iptables rules are applied early on bootup to
++ prevent connections to the machine (except from a trusted host)
++ while the RBAC system is disabled.
++
+ config NETFILTER_XT_MATCH_HASHLIMIT
+ tristate '"hashlimit" match support'
+ depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
+diff -urNp linux-2.6.36/net/netfilter/Makefile linux-2.6.36/net/netfilter/Makefile
+--- linux-2.6.36/net/netfilter/Makefile 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/netfilter/Makefile 2010-11-06 18:58:50.000000000 -0400
+@@ -74,6 +74,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CPU) +=
+ obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.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.36/net/netfilter/xt_gradm.c linux-2.6.36/net/netfilter/xt_gradm.c
+--- linux-2.6.36/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.36/net/netfilter/xt_gradm.c 2010-11-06 18:58:50.000000000 -0400
+@@ -0,0 +1,51 @@
++/*
++ * gradm match for netfilter
++ * Copyright © Zbigniew Krzystolik, 2010
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License; either version
++ * 2 or 3 as published by the Free Software Foundation.
++ */
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/skbuff.h>
++#include <linux/netfilter/x_tables.h>
++#include <linux/grsecurity.h>
++#include <linux/netfilter/xt_gradm.h>
++
++static bool
++gradm_mt(const struct sk_buff *skb, struct xt_action_param *par)
++{
++ const struct xt_gradm_mtinfo *info = par->matchinfo;
++ bool retval = false;
++ if (gr_acl_is_enabled())
++ retval = true;
++ return retval ^ info->invflags;
++}
++
++static struct xt_match gradm_mt_reg __read_mostly = {
++ .name = "gradm",
++ .revision = 0,
++ .family = NFPROTO_UNSPEC,
++ .match = gradm_mt,
++ .matchsize = XT_ALIGN(sizeof(struct xt_gradm_mtinfo)),
++ .me = THIS_MODULE,
++};
++
++static int __init gradm_mt_init(void)
++{
++ return xt_register_match(&gradm_mt_reg);
++}
++
++static void __exit gradm_mt_exit(void)
++{
++ xt_unregister_match(&gradm_mt_reg);
++}
++
++module_init(gradm_mt_init);
++module_exit(gradm_mt_exit);
++MODULE_AUTHOR("Zbigniew Krzystolik <zbyniu@destrukcja.pl>");
++MODULE_DESCRIPTION("Xtables: Grsecurity RBAC match");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("ipt_gradm");
++MODULE_ALIAS("ip6t_gradm");
+diff -urNp linux-2.6.36/net/netlink/af_netlink.c linux-2.6.36/net/netlink/af_netlink.c
+--- linux-2.6.36/net/netlink/af_netlink.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/netlink/af_netlink.c 2010-11-06 18:58:50.000000000 -0400
+@@ -2007,13 +2007,21 @@ 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",
atomic_read(&s->sk_refcnt),
atomic_read(&s->sk_drops),
sock_i_ino(s)
-diff -urNp linux-2.6.35.4/net/packet/af_packet.c linux-2.6.35.4/net/packet/af_packet.c
---- linux-2.6.35.4/net/packet/af_packet.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/packet/af_packet.c 2010-09-17 20:12:37.000000000 -0400
-@@ -2093,7 +2093,7 @@ static int packet_getsockopt(struct sock
+diff -urNp linux-2.6.36/net/netrom/af_netrom.c linux-2.6.36/net/netrom/af_netrom.c
+--- linux-2.6.36/net/netrom/af_netrom.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/netrom/af_netrom.c 2010-11-06 18:58:50.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);
+
++ memset(sax, 0, sizeof(*sax));
+ lock_sock(sk);
+ if (peer != 0) {
+ if (sk->sk_state != TCP_ESTABLISHED) {
+@@ -854,7 +855,6 @@ static int nr_getname(struct socket *soc
+ *uaddr_len = sizeof(struct full_sockaddr_ax25);
+ } else {
+ sax->fsa_ax25.sax25_family = AF_NETROM;
+- sax->fsa_ax25.sax25_ndigis = 0;
+ sax->fsa_ax25.sax25_call = nr->source_addr;
+ *uaddr_len = sizeof(struct sockaddr_ax25);
+ }
+diff -urNp linux-2.6.36/net/packet/af_packet.c linux-2.6.36/net/packet/af_packet.c
+--- linux-2.6.36/net/packet/af_packet.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/packet/af_packet.c 2010-11-06 18:58:50.000000000 -0400
+@@ -1610,8 +1610,9 @@ static int packet_recvmsg(struct kiocb *
+
+ err = -EINVAL;
+ vnet_hdr_len = sizeof(vnet_hdr);
+- if ((len -= vnet_hdr_len) < 0)
++ if (len < vnet_hdr_len)
+ goto out_free;
++ len -= vnet_hdr_len;
+
+ if (skb_is_gso(skb)) {
+ struct skb_shared_info *sinfo = skb_shinfo(skb);
+@@ -1719,7 +1720,7 @@ static int packet_getname_spkt(struct so
+ rcu_read_lock();
+ dev = dev_get_by_index_rcu(sock_net(sk), pkt_sk(sk)->ifindex);
+ if (dev)
+- strlcpy(uaddr->sa_data, dev->name, 15);
++ strncpy(uaddr->sa_data, dev->name, 14);
+ else
+ memset(uaddr->sa_data, 0, 14);
+ rcu_read_unlock();
+@@ -1742,6 +1743,7 @@ static int packet_getname(struct socket
+ sll->sll_family = AF_PACKET;
+ sll->sll_ifindex = po->ifindex;
+ sll->sll_protocol = po->num;
++ sll->sll_pkttype = 0;
+ rcu_read_lock();
+ dev = dev_get_by_index_rcu(sock_net(sk), po->ifindex);
+ if (dev) {
+@@ -2120,7 +2122,7 @@ static int packet_getsockopt(struct sock
case PACKET_HDRLEN:
if (len > sizeof(int))
len = sizeof(int);
return -EFAULT;
switch (val) {
case TPACKET_V1:
-@@ -2125,7 +2125,7 @@ static int packet_getsockopt(struct sock
+@@ -2158,7 +2160,7 @@ static int packet_getsockopt(struct sock
if (put_user(len, optlen))
return -EFAULT;
return -EFAULT;
return 0;
}
-@@ -2604,7 +2604,11 @@ static int packet_seq_show(struct seq_fi
+@@ -2637,7 +2639,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.35.4/net/sctp/socket.c linux-2.6.35.4/net/sctp/socket.c
---- linux-2.6.35.4/net/sctp/socket.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/sctp/socket.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1483,7 +1483,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
+diff -urNp linux-2.6.36/net/phonet/af_phonet.c linux-2.6.36/net/phonet/af_phonet.c
+--- linux-2.6.36/net/phonet/af_phonet.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/phonet/af_phonet.c 2010-11-06 18:58:50.000000000 -0400
+@@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
+ {
+ struct phonet_protocol *pp;
+
+- if (protocol >= PHONET_NPROTO)
++ if (protocol < 0 || protocol >= PHONET_NPROTO)
+ return NULL;
+
+ rcu_read_lock();
+@@ -446,7 +446,7 @@ int __init_or_module phonet_proto_regist
+ {
+ int err = 0;
+
+- if (protocol >= PHONET_NPROTO)
++ if (protocol < 0 || protocol >= PHONET_NPROTO)
+ return -EINVAL;
+
+ err = proto_register(pp->prot, 1);
+diff -urNp linux-2.6.36/net/sctp/socket.c linux-2.6.36/net/sctp/socket.c
+--- linux-2.6.36/net/sctp/socket.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/sctp/socket.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1494,7 +1494,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
struct sctp_sndrcvinfo *sinfo;
struct sctp_initmsg *sinit;
sctp_assoc_t associd = 0;
int err;
sctp_scope_t scope;
long timeo;
-@@ -4387,7 +4387,7 @@ static int sctp_getsockopt_peer_addrs(st
+@@ -4398,7 +4398,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.35.4/net/socket.c linux-2.6.35.4/net/socket.c
---- linux-2.6.35.4/net/socket.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/socket.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/net/socket.c linux-2.6.36/net/socket.c
+--- linux-2.6.36/net/socket.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/socket.c 2010-11-06 18:58:50.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);
-@@ -322,7 +325,7 @@ static int sockfs_get_sb(struct file_sys
+@@ -313,7 +316,7 @@ static int sockfs_get_sb(struct file_sys
mnt);
}
static struct file_system_type sock_fs_type = {
.name = "sockfs",
-@@ -1291,6 +1294,16 @@ SYSCALL_DEFINE3(socket, int, family, int
+@@ -1158,6 +1161,8 @@ static int __sock_create(struct net *net
+ return -EAFNOSUPPORT;
+ if (type < 0 || type >= SOCK_MAX)
+ return -EINVAL;
++ if (protocol < 0)
++ return -EINVAL;
+
+ /* Compatibility.
+
+@@ -1289,6 +1294,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;
-@@ -1403,6 +1416,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct so
+@@ -1401,6 +1416,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);
-@@ -1411,6 +1432,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct so
+@@ -1409,6 +1432,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct so
(struct sockaddr *)
&address, addrlen);
}
fput_light(sock->file, fput_needed);
}
return err;
-@@ -1434,10 +1456,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, ba
+@@ -1432,10 +1456,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, ba
if ((unsigned)backlog > somaxconn)
backlog = somaxconn;
fput_light(sock->file, fput_needed);
}
return err;
-@@ -1480,6 +1512,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
+@@ -1479,6 +1513,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.
-@@ -1518,6 +1562,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
+@@ -1517,6 +1563,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
fd_install(newfd, newfile);
err = newfd;
out_put:
fput_light(sock->file, fput_needed);
out:
-@@ -1550,6 +1596,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct
+@@ -1549,6 +1597,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct
int, addrlen)
{
struct socket *sock;
struct sockaddr_storage address;
int err, fput_needed;
-@@ -1560,6 +1607,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct
+@@ -1559,6 +1608,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.35.4/net/sunrpc/sched.c linux-2.6.35.4/net/sunrpc/sched.c
---- linux-2.6.35.4/net/sunrpc/sched.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/sunrpc/sched.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/net/sunrpc/sched.c linux-2.6.36/net/sunrpc/sched.c
+--- linux-2.6.36/net/sunrpc/sched.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/sunrpc/sched.c 2010-11-06 18:58:15.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.35.4/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.35.4/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-2.6.35.4/net/sunrpc/xprtrdma/svc_rdma.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/sunrpc/xprtrdma/svc_rdma.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.36/net/sunrpc/xprtrdma/svc_rdma.c
+--- linux-2.6.36/net/sunrpc/xprtrdma/svc_rdma.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/sunrpc/xprtrdma/svc_rdma.c 2010-11-06 18:58:50.000000000 -0400
@@ -106,7 +106,7 @@ static int read_reset_stat(ctl_table *ta
len -= *ppos;
if (len > *lenp)
return -EFAULT;
*lenp = len;
*ppos += len;
-diff -urNp linux-2.6.35.4/net/sysctl_net.c linux-2.6.35.4/net/sysctl_net.c
---- linux-2.6.35.4/net/sysctl_net.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/sysctl_net.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/net/sysctl_net.c linux-2.6.36/net/sysctl_net.c
+--- linux-2.6.36/net/sysctl_net.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/sysctl_net.c 2010-11-06 18:58:50.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.35.4/net/tipc/socket.c linux-2.6.35.4/net/tipc/socket.c
---- linux-2.6.35.4/net/tipc/socket.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/tipc/socket.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1451,8 +1451,9 @@ static int connect(struct socket *sock,
+diff -urNp linux-2.6.36/net/tipc/socket.c linux-2.6.36/net/tipc/socket.c
+--- linux-2.6.36/net/tipc/socket.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/tipc/socket.c 2010-11-06 18:58:50.000000000 -0400
+@@ -395,6 +395,7 @@ static int get_name(struct socket *sock,
+ struct sockaddr_tipc *addr = (struct sockaddr_tipc *)uaddr;
+ struct tipc_sock *tsock = tipc_sk(sock->sk);
+
++ memset(addr, 0, sizeof(*addr));
+ if (peer) {
+ if ((sock->state != SS_CONNECTED) &&
+ ((peer != 2) || (sock->state != SS_DISCONNECTING)))
+@@ -1451,8 +1452,9 @@ static int connect(struct socket *sock,
} else {
if (res == 0)
res = -ETIMEDOUT;
sock->state = SS_DISCONNECTING;
}
-diff -urNp linux-2.6.35.4/net/unix/af_unix.c linux-2.6.35.4/net/unix/af_unix.c
---- linux-2.6.35.4/net/unix/af_unix.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/unix/af_unix.c 2010-09-17 20:12:37.000000000 -0400
-@@ -736,6 +736,12 @@ static struct sock *unix_find_other(stru
+diff -urNp linux-2.6.36/net/unix/af_unix.c linux-2.6.36/net/unix/af_unix.c
+--- linux-2.6.36/net/unix/af_unix.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/unix/af_unix.c 2010-11-06 20:08:14.000000000 -0400
+@@ -764,6 +764,12 @@ static struct sock *unix_find_other(stru
err = -ECONNREFUSED;
if (!S_ISSOCK(inode->i_mode))
goto put_fail;
+ goto put_fail;
+ }
+
- u = unix_find_socket_byinode(net, inode);
+ u = unix_find_socket_byinode(inode);
if (!u)
goto put_fail;
-@@ -756,6 +762,13 @@ static struct sock *unix_find_other(stru
+@@ -784,6 +790,13 @@ static struct sock *unix_find_other(stru
if (u) {
struct dentry *dentry;
dentry = unix_sk(u)->dentry;
+
-+ if (!gr_handle_chroot_unix(u->sk_peercred.pid)) {
++ if (!gr_handle_chroot_unix(u->sk_peer_pid)) {
+ err = -EPERM;
+ sock_put(u);
+ goto fail;
if (dentry)
touch_atime(unix_sk(u)->mnt, dentry);
} else
-@@ -841,11 +854,18 @@ static int unix_bind(struct socket *sock
+@@ -869,11 +882,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;
-@@ -863,6 +883,10 @@ out_mknod_drop_write:
+@@ -891,6 +911,11 @@ out_mknod_drop_write:
goto out_unlock;
}
+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
-+ sk->sk_peercred.pid = current->pid;
++ put_pid(sk->sk_peer_pid);
++ sk->sk_peer_pid = get_pid(task_tgid(current));
+#endif
+
list = &unix_socket_table[addr->hash];
} else {
list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
-@@ -2161,7 +2185,11 @@ static int unix_seq_show(struct seq_file
+@@ -2195,7 +2220,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.35.4/net/wireless/reg.c linux-2.6.35.4/net/wireless/reg.c
---- linux-2.6.35.4/net/wireless/reg.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/wireless/reg.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/net/wireless/reg.c linux-2.6.36/net/wireless/reg.c
+--- linux-2.6.36/net/wireless/reg.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/wireless/reg.c 2010-11-06 18:58:15.000000000 -0400
@@ -50,7 +50,7 @@
printk(KERN_DEBUG format , ## args); \
} while (0)
#endif
/* Receipt of information from last regulatory request */
-diff -urNp linux-2.6.35.4/net/wireless/wext-core.c linux-2.6.35.4/net/wireless/wext-core.c
---- linux-2.6.35.4/net/wireless/wext-core.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/wireless/wext-core.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/net/wireless/wext-core.c linux-2.6.36/net/wireless/wext-core.c
+--- linux-2.6.36/net/wireless/wext-core.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/wireless/wext-core.c 2010-11-06 18:58:15.000000000 -0400
@@ -744,8 +744,7 @@ static int ioctl_standard_iw_point(struc
*/
/* Allow userspace to GET more than max so
* we can support any size GET requests.
* There is still a limit : -ENOMEM.
-diff -urNp linux-2.6.35.4/net/xfrm/xfrm_policy.c linux-2.6.35.4/net/xfrm/xfrm_policy.c
---- linux-2.6.35.4/net/xfrm/xfrm_policy.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/net/xfrm/xfrm_policy.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1502,7 +1502,7 @@ free_dst:
+@@ -782,22 +781,6 @@ static int ioctl_standard_iw_point(struc
+ }
+ }
+
+- if (IW_IS_GET(cmd) && !(descr->flags & IW_DESCR_FLAG_NOMAX)) {
+- /*
+- * If this is a GET, but not NOMAX, it means that the extra
+- * data is not bounded by userspace, but by max_tokens. Thus
+- * set the length to max_tokens. This matches the extra data
+- * allocation.
+- * The driver should fill it with the number of tokens it
+- * provided, and it may check iwp->length rather than having
+- * knowledge of max_tokens. If the driver doesn't change the
+- * iwp->length, this ioctl just copies back max_token tokens
+- * filled with zeroes. Hopefully the driver isn't claiming
+- * them to be valid data.
+- */
+- iwp->length = descr->max_tokens;
+- }
+-
+ err = handler(dev, info, (union iwreq_data *) iwp, extra);
+
+ iwp->length += essid_compat;
+diff -urNp linux-2.6.36/net/x25/x25_facilities.c linux-2.6.36/net/x25/x25_facilities.c
+--- linux-2.6.36/net/x25/x25_facilities.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/x25/x25_facilities.c 2010-11-06 18:58:50.000000000 -0400
+@@ -134,15 +134,15 @@ int x25_parse_facilities(struct sk_buff
+ case X25_FAC_CLASS_D:
+ switch (*p) {
+ case X25_FAC_CALLING_AE:
+- if (p[1] > X25_MAX_DTE_FACIL_LEN)
+- break;
++ if (p[1] > X25_MAX_DTE_FACIL_LEN || p[1] <= 1)
++ return 0;
+ dte_facs->calling_len = p[2];
+ memcpy(dte_facs->calling_ae, &p[3], p[1] - 1);
+ *vc_fac_mask |= X25_MASK_CALLING_AE;
+ break;
+ case X25_FAC_CALLED_AE:
+- if (p[1] > X25_MAX_DTE_FACIL_LEN)
+- break;
++ if (p[1] > X25_MAX_DTE_FACIL_LEN || p[1] <= 1)
++ return 0;
+ dte_facs->called_len = p[2];
+ memcpy(dte_facs->called_ae, &p[3], p[1] - 1);
+ *vc_fac_mask |= X25_MASK_CALLED_AE;
+diff -urNp linux-2.6.36/net/x25/x25_in.c linux-2.6.36/net/x25/x25_in.c
+--- linux-2.6.36/net/x25/x25_in.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/x25/x25_in.c 2010-11-06 18:58:50.000000000 -0400
+@@ -119,6 +119,8 @@ static int x25_state1_machine(struct soc
+ &x25->vc_facil_mask);
+ if (len > 0)
+ skb_pull(skb, len);
++ else
++ return -1;
+ /*
+ * Copy any Call User Data.
+ */
+diff -urNp linux-2.6.36/net/xfrm/xfrm_policy.c linux-2.6.36/net/xfrm/xfrm_policy.c
+--- linux-2.6.36/net/xfrm/xfrm_policy.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/net/xfrm/xfrm_policy.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1501,7 +1501,7 @@ free_dst:
goto out;
}
xfrm_dst_alloc_copy(void **target, void *src, int size)
{
if (!*target) {
-@@ -1514,7 +1514,7 @@ xfrm_dst_alloc_copy(void **target, void
+@@ -1513,7 +1513,7 @@ xfrm_dst_alloc_copy(void **target, void
return 0;
}
xfrm_dst_update_parent(struct dst_entry *dst, struct xfrm_selector *sel)
{
#ifdef CONFIG_XFRM_SUB_POLICY
-@@ -1526,7 +1526,7 @@ xfrm_dst_update_parent(struct dst_entry
+@@ -1525,7 +1525,7 @@ xfrm_dst_update_parent(struct dst_entry
#endif
}
xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
{
#ifdef CONFIG_XFRM_SUB_POLICY
-diff -urNp linux-2.6.35.4/scripts/basic/fixdep.c linux-2.6.35.4/scripts/basic/fixdep.c
---- linux-2.6.35.4/scripts/basic/fixdep.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/scripts/basic/fixdep.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/scripts/basic/fixdep.c linux-2.6.36/scripts/basic/fixdep.c
+--- linux-2.6.36/scripts/basic/fixdep.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/scripts/basic/fixdep.c 2010-11-06 18:58:15.000000000 -0400
@@ -222,9 +222,9 @@ static void use_config(char *m, int slen
static void parse_config_file(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.35.4/scripts/kallsyms.c linux-2.6.35.4/scripts/kallsyms.c
---- linux-2.6.35.4/scripts/kallsyms.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/scripts/kallsyms.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/scripts/kallsyms.c linux-2.6.36/scripts/kallsyms.c
+--- linux-2.6.36/scripts/kallsyms.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/scripts/kallsyms.c 2010-11-06 18:58:15.000000000 -0400
@@ -43,10 +43,10 @@ struct text_range {
static unsigned long long _text;
};
#define text_range_text (&text_ranges[0])
#define text_range_inittext (&text_ranges[1])
-diff -urNp linux-2.6.35.4/scripts/mod/file2alias.c linux-2.6.35.4/scripts/mod/file2alias.c
---- linux-2.6.35.4/scripts/mod/file2alias.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/scripts/mod/file2alias.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/scripts/mod/file2alias.c linux-2.6.36/scripts/mod/file2alias.c
+--- linux-2.6.36/scripts/mod/file2alias.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/scripts/mod/file2alias.c 2010-11-06 18:58:15.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.35.4/scripts/mod/modpost.c linux-2.6.35.4/scripts/mod/modpost.c
---- linux-2.6.35.4/scripts/mod/modpost.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/scripts/mod/modpost.c 2010-09-17 20:12:09.000000000 -0400
-@@ -846,6 +846,7 @@ enum mismatch {
+diff -urNp linux-2.6.36/scripts/mod/modpost.c linux-2.6.36/scripts/mod/modpost.c
+--- linux-2.6.36/scripts/mod/modpost.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/scripts/mod/modpost.c 2010-11-06 18:58:15.000000000 -0400
+@@ -895,6 +895,7 @@ enum mismatch {
ANY_INIT_TO_ANY_EXIT,
ANY_EXIT_TO_ANY_INIT,
EXPORT_TO_INIT_EXIT,
};
struct sectioncheck {
-@@ -954,6 +955,12 @@ const struct sectioncheck sectioncheck[]
+@@ -1003,6 +1004,12 @@ const struct sectioncheck sectioncheck[]
.tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
.mismatch = EXPORT_TO_INIT_EXIT,
.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
}
};
-@@ -1060,10 +1067,10 @@ static Elf_Sym *find_elf_symbol(struct e
+@@ -1125,10 +1132,10 @@ static Elf_Sym *find_elf_symbol(struct e
continue;
if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
continue;
if (d < 0)
d = addr - sym->st_value;
if (d < distance) {
-@@ -1306,6 +1313,14 @@ static void report_sec_mismatch(const ch
- "or drop the export.\n",
- tosym, sec2annotation(tosec), sec2annotation(tosec), tosym);
+@@ -1397,6 +1404,14 @@ static void report_sec_mismatch(const ch
+ tosym, prl_to, prl_to, tosym);
+ free(prl_to);
break;
+ case DATA_TO_TEXT:
+/*
}
fprintf(stderr, "\n");
}
-@@ -1629,7 +1644,7 @@ void __attribute__((format(printf, 2, 3)
+@@ -1720,7 +1735,7 @@ void __attribute__((format(printf, 2, 3)
va_end(ap);
}
{
if (buf->size - buf->pos < len) {
buf->size += len + SZ;
-@@ -1841,7 +1856,7 @@ static void write_if_changed(struct buff
+@@ -1932,7 +1947,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.35.4/scripts/mod/modpost.h linux-2.6.35.4/scripts/mod/modpost.h
---- linux-2.6.35.4/scripts/mod/modpost.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/scripts/mod/modpost.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/scripts/mod/modpost.h linux-2.6.36/scripts/mod/modpost.h
+--- linux-2.6.36/scripts/mod/modpost.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/scripts/mod/modpost.h 2010-11-06 18:58:15.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.35.4/scripts/mod/sumversion.c linux-2.6.35.4/scripts/mod/sumversion.c
---- linux-2.6.35.4/scripts/mod/sumversion.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/scripts/mod/sumversion.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/scripts/mod/sumversion.c linux-2.6.36/scripts/mod/sumversion.c
+--- linux-2.6.36/scripts/mod/sumversion.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/scripts/mod/sumversion.c 2010-11-06 18:58:15.000000000 -0400
@@ -455,7 +455,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.35.4/scripts/pnmtologo.c linux-2.6.35.4/scripts/pnmtologo.c
---- linux-2.6.35.4/scripts/pnmtologo.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/scripts/pnmtologo.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/scripts/pnmtologo.c linux-2.6.36/scripts/pnmtologo.c
+--- linux-2.6.36/scripts/pnmtologo.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/scripts/pnmtologo.c 2010-11-06 18:58:15.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.35.4/security/commoncap.c linux-2.6.35.4/security/commoncap.c
---- linux-2.6.35.4/security/commoncap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/security/commoncap.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/security/apparmor/lsm.c linux-2.6.36/security/apparmor/lsm.c
+--- linux-2.6.36/security/apparmor/lsm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/security/apparmor/lsm.c 2010-11-06 19:46:26.000000000 -0400
+@@ -619,7 +619,7 @@ static int apparmor_task_setrlimit(struc
+ return error;
+ }
+
+-static struct security_operations apparmor_ops = {
++static struct security_operations apparmor_ops __read_only = {
+ .name = "apparmor",
+
+ .ptrace_access_check = apparmor_ptrace_access_check,
+diff -urNp linux-2.6.36/security/commoncap.c linux-2.6.36/security/commoncap.c
+--- linux-2.6.36/security/commoncap.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/security/commoncap.c 2010-11-06 18:58:50.000000000 -0400
@@ -28,6 +28,7 @@
#include <linux/prctl.h>
#include <linux/securebits.h>
return 0;
}
-diff -urNp linux-2.6.35.4/security/integrity/ima/ima_api.c linux-2.6.35.4/security/integrity/ima/ima_api.c
---- linux-2.6.35.4/security/integrity/ima/ima_api.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/security/integrity/ima/ima_api.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/security/integrity/ima/ima_api.c linux-2.6.36/security/integrity/ima/ima_api.c
+--- linux-2.6.36/security/integrity/ima/ima_api.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/security/integrity/ima/ima_api.c 2010-11-06 18:58:15.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.35.4/security/integrity/ima/ima_fs.c linux-2.6.35.4/security/integrity/ima/ima_fs.c
---- linux-2.6.35.4/security/integrity/ima/ima_fs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/security/integrity/ima/ima_fs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/security/integrity/ima/ima_fs.c linux-2.6.36/security/integrity/ima/ima_fs.c
+--- linux-2.6.36/security/integrity/ima/ima_fs.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/security/integrity/ima/ima_fs.c 2010-11-06 18:58:15.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.35.4/security/integrity/ima/ima.h linux-2.6.35.4/security/integrity/ima/ima.h
---- linux-2.6.35.4/security/integrity/ima/ima.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/security/integrity/ima/ima.h 2010-09-17 20:12:09.000000000 -0400
-@@ -83,8 +83,8 @@ void ima_add_violation(struct inode *ino
+diff -urNp linux-2.6.36/security/integrity/ima/ima.h linux-2.6.36/security/integrity/ima/ima.h
+--- linux-2.6.36/security/integrity/ima/ima.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/security/integrity/ima/ima.h 2010-11-06 18:58:15.000000000 -0400
+@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
extern spinlock_t ima_queue_lock;
struct ima_h_table {
struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
};
extern struct ima_h_table ima_htable;
-diff -urNp linux-2.6.35.4/security/integrity/ima/ima_queue.c linux-2.6.35.4/security/integrity/ima/ima_queue.c
---- linux-2.6.35.4/security/integrity/ima/ima_queue.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/security/integrity/ima/ima_queue.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/security/integrity/ima/ima_queue.c linux-2.6.36/security/integrity/ima/ima_queue.c
+--- linux-2.6.36/security/integrity/ima/ima_queue.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/security/integrity/ima/ima_queue.c 2010-11-06 18:58:15.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.35.4/security/Kconfig linux-2.6.35.4/security/Kconfig
---- linux-2.6.35.4/security/Kconfig 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/security/Kconfig 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/security/Kconfig linux-2.6.36/security/Kconfig
+--- linux-2.6.36/security/Kconfig 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/security/Kconfig 2010-11-06 18:58:50.000000000 -0400
@@ -4,6 +4,505 @@
menu "Security options"
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.35.4/security/min_addr.c linux-2.6.35.4/security/min_addr.c
---- linux-2.6.35.4/security/min_addr.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/security/min_addr.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/security/min_addr.c linux-2.6.36/security/min_addr.c
+--- linux-2.6.36/security/min_addr.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/security/min_addr.c 2010-11-06 18:58:50.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.35.4/security/security.c linux-2.6.35.4/security/security.c
---- linux-2.6.35.4/security/security.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/security/security.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.36/security/security.c linux-2.6.36/security/security.c
+--- linux-2.6.36/security/security.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/security/security.c 2010-11-06 18:58:50.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.35.4/security/selinux/hooks.c linux-2.6.35.4/security/selinux/hooks.c
---- linux-2.6.35.4/security/selinux/hooks.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/security/selinux/hooks.c 2010-09-17 20:12:37.000000000 -0400
-@@ -93,7 +93,6 @@
+diff -urNp linux-2.6.36/security/selinux/hooks.c linux-2.6.36/security/selinux/hooks.c
+--- linux-2.6.36/security/selinux/hooks.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/security/selinux/hooks.c 2010-11-06 18:58:50.000000000 -0400
+@@ -90,7 +90,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);
-@@ -5428,7 +5427,7 @@ static int selinux_key_getsecurity(struc
+@@ -5371,7 +5370,7 @@ static int selinux_key_getsecurity(struc
#endif
.name = "selinux",
.ptrace_access_check = selinux_ptrace_access_check,
-diff -urNp linux-2.6.35.4/security/smack/smack_lsm.c linux-2.6.35.4/security/smack/smack_lsm.c
---- linux-2.6.35.4/security/smack/smack_lsm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/security/smack/smack_lsm.c 2010-09-17 20:12:09.000000000 -0400
-@@ -3064,7 +3064,7 @@ static int smack_inode_getsecctx(struct
+diff -urNp linux-2.6.36/security/smack/smack_lsm.c linux-2.6.36/security/smack/smack_lsm.c
+--- linux-2.6.36/security/smack/smack_lsm.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/security/smack/smack_lsm.c 2010-11-06 18:58:15.000000000 -0400
+@@ -3056,7 +3056,7 @@ static int smack_inode_getsecctx(struct
return 0;
}
.name = "smack",
.ptrace_access_check = smack_ptrace_access_check,
-diff -urNp linux-2.6.35.4/security/tomoyo/tomoyo.c linux-2.6.35.4/security/tomoyo/tomoyo.c
---- linux-2.6.35.4/security/tomoyo/tomoyo.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/security/tomoyo/tomoyo.c 2010-09-17 20:12:09.000000000 -0400
-@@ -235,7 +235,7 @@ static int tomoyo_sb_pivotroot(struct pa
+diff -urNp linux-2.6.36/security/tomoyo/tomoyo.c linux-2.6.36/security/tomoyo/tomoyo.c
+--- linux-2.6.36/security/tomoyo/tomoyo.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/security/tomoyo/tomoyo.c 2010-11-06 18:58:15.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.35.4/sound/aoa/codecs/onyx.c linux-2.6.35.4/sound/aoa/codecs/onyx.c
---- linux-2.6.35.4/sound/aoa/codecs/onyx.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/sound/aoa/codecs/onyx.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/sound/aoa/codecs/onyx.c linux-2.6.36/sound/aoa/codecs/onyx.c
+--- linux-2.6.36/sound/aoa/codecs/onyx.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/sound/aoa/codecs/onyx.c 2010-11-06 18:58:15.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.35.4/sound/core/oss/pcm_oss.c linux-2.6.35.4/sound/core/oss/pcm_oss.c
---- linux-2.6.35.4/sound/core/oss/pcm_oss.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/sound/core/oss/pcm_oss.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/sound/core/oss/pcm_oss.c linux-2.6.36/sound/core/oss/pcm_oss.c
+--- linux-2.6.36/sound/core/oss/pcm_oss.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/sound/core/oss/pcm_oss.c 2010-11-06 18:58:15.000000000 -0400
@@ -2966,8 +2966,8 @@ static void snd_pcm_oss_proc_done(struct
}
}
#endif /* CONFIG_SND_VERBOSE_PROCFS */
/*
-diff -urNp linux-2.6.35.4/sound/core/seq/seq_lock.h linux-2.6.35.4/sound/core/seq/seq_lock.h
---- linux-2.6.35.4/sound/core/seq/seq_lock.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/sound/core/seq/seq_lock.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/sound/core/seq/seq_lock.h linux-2.6.36/sound/core/seq/seq_lock.h
+--- linux-2.6.36/sound/core/seq/seq_lock.h 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/sound/core/seq/seq_lock.h 2010-11-06 18:58:15.000000000 -0400
@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
#else /* SMP || CONFIG_SND_DEBUG */
#endif /* SMP || CONFIG_SND_DEBUG */
-diff -urNp linux-2.6.35.4/sound/drivers/mts64.c linux-2.6.35.4/sound/drivers/mts64.c
---- linux-2.6.35.4/sound/drivers/mts64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/sound/drivers/mts64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/sound/drivers/mts64.c linux-2.6.36/sound/drivers/mts64.c
+--- linux-2.6.36/sound/drivers/mts64.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/sound/drivers/mts64.c 2010-11-06 18:58:15.000000000 -0400
@@ -66,7 +66,7 @@ struct mts64 {
struct pardevice *pardev;
int pardev_claimed;
return 0;
}
-diff -urNp linux-2.6.35.4/sound/drivers/portman2x4.c linux-2.6.35.4/sound/drivers/portman2x4.c
---- linux-2.6.35.4/sound/drivers/portman2x4.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/sound/drivers/portman2x4.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/sound/drivers/portman2x4.c linux-2.6.36/sound/drivers/portman2x4.c
+--- linux-2.6.36/sound/drivers/portman2x4.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/sound/drivers/portman2x4.c 2010-11-06 18:58:15.000000000 -0400
@@ -84,7 +84,7 @@ struct portman {
struct pardevice *pardev;
int pardev_claimed;
int mode[PORTMAN_NUM_INPUT_PORTS];
struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
};
-diff -urNp linux-2.6.35.4/sound/oss/sb_audio.c linux-2.6.35.4/sound/oss/sb_audio.c
---- linux-2.6.35.4/sound/oss/sb_audio.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/sound/oss/sb_audio.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/sound/oss/sb_audio.c linux-2.6.36/sound/oss/sb_audio.c
+--- linux-2.6.36/sound/oss/sb_audio.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/sound/oss/sb_audio.c 2010-11-06 18:58:15.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.35.4/sound/pci/ac97/ac97_codec.c linux-2.6.35.4/sound/pci/ac97/ac97_codec.c
---- linux-2.6.35.4/sound/pci/ac97/ac97_codec.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/sound/pci/ac97/ac97_codec.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/sound/pci/ac97/ac97_codec.c linux-2.6.36/sound/pci/ac97/ac97_codec.c
+--- linux-2.6.36/sound/pci/ac97/ac97_codec.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/sound/pci/ac97/ac97_codec.c 2010-11-06 18:58:15.000000000 -0400
@@ -1962,7 +1962,7 @@ static int snd_ac97_dev_disconnect(struc
}
#ifdef CONFIG_SND_AC97_POWER_SAVE
static void do_update_power(struct work_struct *work)
-diff -urNp linux-2.6.35.4/sound/pci/ac97/ac97_patch.c linux-2.6.35.4/sound/pci/ac97/ac97_patch.c
---- linux-2.6.35.4/sound/pci/ac97/ac97_patch.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/sound/pci/ac97/ac97_patch.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/sound/pci/ac97/ac97_patch.c linux-2.6.36/sound/pci/ac97/ac97_patch.c
+--- linux-2.6.36/sound/pci/ac97/ac97_patch.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/sound/pci/ac97/ac97_patch.c 2010-11-06 18:58:15.000000000 -0400
@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
return 0;
}
.build_specific = patch_ucb1400_specific,
};
-diff -urNp linux-2.6.35.4/sound/pci/ens1370.c linux-2.6.35.4/sound/pci/ens1370.c
---- linux-2.6.35.4/sound/pci/ens1370.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/sound/pci/ens1370.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/sound/pci/ens1370.c linux-2.6.36/sound/pci/ens1370.c
+--- linux-2.6.36/sound/pci/ens1370.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/sound/pci/ens1370.c 2010-11-06 18:58:15.000000000 -0400
@@ -452,7 +452,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_audio
{ PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
{ PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
};
MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
-diff -urNp linux-2.6.35.4/sound/pci/hda/patch_hdmi.c linux-2.6.35.4/sound/pci/hda/patch_hdmi.c
---- linux-2.6.35.4/sound/pci/hda/patch_hdmi.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/sound/pci/hda/patch_hdmi.c 2010-09-17 20:12:09.000000000 -0400
-@@ -670,10 +670,10 @@ static void hdmi_non_intrinsic_event(str
+diff -urNp linux-2.6.36/sound/pci/hda/patch_hdmi.c linux-2.6.36/sound/pci/hda/patch_hdmi.c
+--- linux-2.6.36/sound/pci/hda/patch_hdmi.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/sound/pci/hda/patch_hdmi.c 2010-11-06 18:58:15.000000000 -0400
+@@ -671,10 +671,10 @@ static void hdmi_non_intrinsic_event(str
cp_ready);
/* TODO */
}
-diff -urNp linux-2.6.35.4/sound/pci/intel8x0.c linux-2.6.35.4/sound/pci/intel8x0.c
---- linux-2.6.35.4/sound/pci/intel8x0.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/sound/pci/intel8x0.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/sound/pci/intel8x0.c linux-2.6.36/sound/pci/intel8x0.c
+--- linux-2.6.36/sound/pci/intel8x0.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/sound/pci/intel8x0.c 2010-11-06 18:58:15.000000000 -0400
@@ -444,7 +444,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel
{ PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
{ PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */
};
static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
-diff -urNp linux-2.6.35.4/sound/pci/intel8x0m.c linux-2.6.35.4/sound/pci/intel8x0m.c
---- linux-2.6.35.4/sound/pci/intel8x0m.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/sound/pci/intel8x0m.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/sound/pci/intel8x0m.c linux-2.6.36/sound/pci/intel8x0m.c
+--- linux-2.6.36/sound/pci/intel8x0m.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/sound/pci/intel8x0m.c 2010-11-06 18:58:15.000000000 -0400
@@ -239,7 +239,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel
{ PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
{ PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
};
static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
-diff -urNp linux-2.6.35.4/usr/gen_init_cpio.c linux-2.6.35.4/usr/gen_init_cpio.c
---- linux-2.6.35.4/usr/gen_init_cpio.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/usr/gen_init_cpio.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.36/usr/gen_init_cpio.c linux-2.6.36/usr/gen_init_cpio.c
+--- linux-2.6.36/usr/gen_init_cpio.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/usr/gen_init_cpio.c 2010-11-06 18:58:15.000000000 -0400
@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
int retval;
int rc = -1;
} else
break;
}
-diff -urNp linux-2.6.35.4/virt/kvm/kvm_main.c linux-2.6.35.4/virt/kvm/kvm_main.c
---- linux-2.6.35.4/virt/kvm/kvm_main.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.4/virt/kvm/kvm_main.c 2010-09-17 20:12:09.000000000 -0400
-@@ -1284,6 +1284,7 @@ static int kvm_vcpu_release(struct inode
+diff -urNp linux-2.6.36/virt/kvm/kvm_main.c linux-2.6.36/virt/kvm/kvm_main.c
+--- linux-2.6.36/virt/kvm/kvm_main.c 2010-10-20 16:30:22.000000000 -0400
++++ linux-2.6.36/virt/kvm/kvm_main.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1300,6 +1300,7 @@ static int kvm_vcpu_release(struct inode
return 0;
}
static struct file_operations kvm_vcpu_fops = {
.release = kvm_vcpu_release,
.unlocked_ioctl = kvm_vcpu_ioctl,
-@@ -1738,6 +1739,7 @@ static int kvm_vm_mmap(struct file *file
+@@ -1767,6 +1768,7 @@ static int kvm_vm_mmap(struct file *file
return 0;
}
static struct file_operations kvm_vm_fops = {
.release = kvm_vm_release,
.unlocked_ioctl = kvm_vm_ioctl,
-@@ -1835,6 +1837,7 @@ out:
+@@ -1864,6 +1866,7 @@ out:
return r;
}
static struct file_operations kvm_chardev_ops = {
.unlocked_ioctl = kvm_dev_ioctl,
.compat_ioctl = kvm_dev_ioctl,
-@@ -1844,6 +1847,9 @@ static struct miscdevice kvm_dev = {
+@@ -1873,6 +1876,9 @@ static struct miscdevice kvm_dev = {
KVM_MINOR,
"kvm",
&kvm_chardev_ops,
};
static void hardware_enable(void *junk)
-@@ -2178,7 +2184,7 @@ static void kvm_sched_out(struct preempt
+@@ -1974,7 +1980,7 @@ asmlinkage void kvm_handle_fault_on_rebo
+ /* spin while reset goes on */
+ local_irq_enable();
+ while (true)
+- ;
++ cpu_relax();
+ }
+ /* Fault while not rebooting. We want the trace. */
+ BUG();
+@@ -2208,7 +2214,7 @@ static void kvm_sched_out(struct preempt
kvm_arch_vcpu_put(vcpu);
}
projects / people / ms / ipfire-3.x.git / commitdiff
