-diff -urNp linux-2.6.34/arch/alpha/include/asm/dma-mapping.h linux-2.6.34/arch/alpha/include/asm/dma-mapping.h
---- linux-2.6.34/arch/alpha/include/asm/dma-mapping.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/alpha/include/asm/dma-mapping.h 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/Documentation/dontdiff linux-2.6.34.1/Documentation/dontdiff
+--- linux-2.6.34.1/Documentation/dontdiff 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/Documentation/dontdiff 2010-07-07 09:04:49.000000000 -0400
+@@ -3,6 +3,7 @@
+ *.bin
+ *.cpio
+ *.csp
++*.dbg
+ *.dsp
+ *.dvi
+ *.elf
+@@ -40,6 +41,7 @@
+ *.ver
+ *.xml
+ *_MODULES
++*_reg_safe.h
+ *_vga16.c
+ *~
+ *.9
+@@ -49,11 +51,16 @@
+ 53c700_d.h
+ CVS
+ ChangeSet
++GPATH
++GRTAGS
++GSYMS
++GTAGS
+ Image
+ Kerntypes
+ Module.markers
+ Module.symvers
+ PENDING
++PERF*
+ SCCS
+ System.map*
+ TAGS
+@@ -76,7 +83,10 @@ btfixupprep
+ build
+ bvmlinux
+ bzImage*
++capflags.c
+ classlist.h*
++clut_vga16.c
++common-cmds.h
+ comp*.log
+ compile.h*
+ conf
+@@ -106,13 +116,15 @@ generated
+ genheaders
+ genksyms
+ *_gray256.c
++hash
+ ihex2fw
+ ikconfig.h*
++inat-tables.c
+ initramfs_data.cpio
++initramfs_data.cpio.bz2
+ initramfs_data.cpio.gz
+ initramfs_list
+ kallsyms
+-kconfig
+ keywords.c
+ ksym.c*
+ ksym.h*
+@@ -136,10 +148,13 @@ mkboot
+ mkbugboot
+ mkcpustr
+ mkdep
++mkpiggy
+ mkprep
++mkregtable
+ mktables
+ mktree
+ modpost
++modules.builtin
+ modules.order
+ modversions.h*
+ ncscope.*
+@@ -152,6 +167,7 @@ patches*
+ pca200e.bin
+ pca200e_ecd.bin2
+ piggy.gz
++piggy.S
+ piggyback
+ pnmtologo
+ ppc_defs.h*
+@@ -166,6 +182,7 @@ setup
+ setup.bin
+ setup.elf
+ sImage
++slabinfo
+ sm_tbl*
+ split-include
+ syscalltab.h
+@@ -189,14 +206,20 @@ version.h*
+ vmlinux
+ vmlinux-*
+ vmlinux.aout
++vmlinux.bin.all
++vmlinux.bin.bz2
+ vmlinux.lds
++vmlinux.relocs
++voffset.h
+ vsyscall.lds
+ vsyscall_32.lds
+ wanxlfw.inc
+ uImage
+ unifdef
++utsrelease.h
+ wakeup.bin
+ wakeup.elf
+ wakeup.lds
+ zImage*
+ zconf.hash.c
++zoffset.h
+diff -urNp linux-2.6.34.1/Documentation/filesystems/sysfs.txt linux-2.6.34.1/Documentation/filesystems/sysfs.txt
+--- linux-2.6.34.1/Documentation/filesystems/sysfs.txt 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/Documentation/filesystems/sysfs.txt 2010-07-07 09:04:50.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 (* const show)(struct kobject *, struct attribute *, char *);
++ ssize_t (* const store)(struct kobject *, struct attribute *, const char *);
+ };
+
+ [ Subsystems should have already defined a struct kobj_type as a
+diff -urNp linux-2.6.34.1/Documentation/kernel-parameters.txt linux-2.6.34.1/Documentation/kernel-parameters.txt
+--- linux-2.6.34.1/Documentation/kernel-parameters.txt 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/Documentation/kernel-parameters.txt 2010-07-07 09:04:50.000000000 -0400
+@@ -1875,6 +1875,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.
+
++ pax_nouderef [X86-32] disables UDEREF. Most likely needed under certain
++ virtualization environments that don't cope well with the
++ expand down segment used by UDEREF on X86-32.
++
++ pax_softmode= [X86-32] 0/1 to disable/enable PaX softmode on boot already.
++
+ pcbit= [HW,ISDN]
+
+ pcd. [PARIDE]
+diff -urNp linux-2.6.34.1/Makefile linux-2.6.34.1/Makefile
+--- linux-2.6.34.1/Makefile 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/Makefile 2010-07-07 09:04:57.000000000 -0400
+@@ -227,8 +227,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
+
+ HOSTCC = gcc
+ HOSTCXX = g++
+-HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
+-HOSTCXXFLAGS = -O2
++HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
++HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks
+
+ # Decide whether to build built-in, modular, or both.
+ # Normally, just do built-in.
+@@ -650,7 +650,7 @@ export mod_strip_cmd
+
+
+ ifeq ($(KBUILD_EXTMOD),)
+-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
++core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
+
+ vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
+ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
+diff -urNp linux-2.6.34.1/arch/alpha/include/asm/dma-mapping.h linux-2.6.34.1/arch/alpha/include/asm/dma-mapping.h
+--- linux-2.6.34.1/arch/alpha/include/asm/dma-mapping.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/alpha/include/asm/dma-mapping.h 2010-07-07 09:04:42.000000000 -0400
@@ -3,9 +3,9 @@
#include <linux/dma-attrs.h>
{
return dma_ops;
}
-diff -urNp linux-2.6.34/arch/alpha/include/asm/elf.h linux-2.6.34/arch/alpha/include/asm/elf.h
---- linux-2.6.34/arch/alpha/include/asm/elf.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/alpha/include/asm/elf.h 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/alpha/include/asm/elf.h linux-2.6.34.1/arch/alpha/include/asm/elf.h
+--- linux-2.6.34.1/arch/alpha/include/asm/elf.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/alpha/include/asm/elf.h 2010-07-07 09:04:42.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.34/arch/alpha/include/asm/pgtable.h linux-2.6.34/arch/alpha/include/asm/pgtable.h
---- linux-2.6.34/arch/alpha/include/asm/pgtable.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/alpha/include/asm/pgtable.h 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/alpha/include/asm/pgtable.h linux-2.6.34.1/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.34.1/arch/alpha/include/asm/pgtable.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/alpha/include/asm/pgtable.h 2010-07-07 09:04:42.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.34/arch/alpha/kernel/module.c linux-2.6.34/arch/alpha/kernel/module.c
---- linux-2.6.34/arch/alpha/kernel/module.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/alpha/kernel/module.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/alpha/kernel/module.c linux-2.6.34.1/arch/alpha/kernel/module.c
+--- linux-2.6.34.1/arch/alpha/kernel/module.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/alpha/kernel/module.c 2010-07-07 09:04:42.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.34/arch/alpha/kernel/osf_sys.c linux-2.6.34/arch/alpha/kernel/osf_sys.c
---- linux-2.6.34/arch/alpha/kernel/osf_sys.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/alpha/kernel/osf_sys.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/alpha/kernel/osf_sys.c linux-2.6.34.1/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.34.1/arch/alpha/kernel/osf_sys.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/alpha/kernel/osf_sys.c 2010-07-07 09:04:42.000000000 -0400
@@ -1206,6 +1206,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 != (unsigned long) -ENOMEM)
return addr;
-diff -urNp linux-2.6.34/arch/alpha/kernel/pci_iommu.c linux-2.6.34/arch/alpha/kernel/pci_iommu.c
---- linux-2.6.34/arch/alpha/kernel/pci_iommu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/alpha/kernel/pci_iommu.c 2010-07-01 20:45:13.000000000 -0400
-@@ -950,7 +950,7 @@ static int alpha_pci_set_mask(struct dev
- return 0;
- }
-
--struct dma_map_ops alpha_pci_ops = {
-+const struct dma_map_ops alpha_pci_ops = {
- .alloc_coherent = alpha_pci_alloc_coherent,
- .free_coherent = alpha_pci_free_coherent,
- .map_page = alpha_pci_map_page,
-@@ -962,5 +962,5 @@ struct dma_map_ops alpha_pci_ops = {
- .set_dma_mask = alpha_pci_set_mask,
- };
-
--struct dma_map_ops *dma_ops = &alpha_pci_ops;
-+const struct dma_map_ops *dma_ops = &alpha_pci_ops;
- EXPORT_SYMBOL(dma_ops);
-diff -urNp linux-2.6.34/arch/alpha/kernel/pci-noop.c linux-2.6.34/arch/alpha/kernel/pci-noop.c
---- linux-2.6.34/arch/alpha/kernel/pci-noop.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/alpha/kernel/pci-noop.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/alpha/kernel/pci-noop.c linux-2.6.34.1/arch/alpha/kernel/pci-noop.c
+--- linux-2.6.34.1/arch/alpha/kernel/pci-noop.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/alpha/kernel/pci-noop.c 2010-07-07 09:04:42.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.34/arch/alpha/mm/fault.c linux-2.6.34/arch/alpha/mm/fault.c
---- linux-2.6.34/arch/alpha/mm/fault.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/alpha/mm/fault.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/alpha/kernel/pci_iommu.c linux-2.6.34.1/arch/alpha/kernel/pci_iommu.c
+--- linux-2.6.34.1/arch/alpha/kernel/pci_iommu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/alpha/kernel/pci_iommu.c 2010-07-07 09:04:42.000000000 -0400
+@@ -950,7 +950,7 @@ static int alpha_pci_set_mask(struct dev
+ return 0;
+ }
+
+-struct dma_map_ops alpha_pci_ops = {
++const struct dma_map_ops alpha_pci_ops = {
+ .alloc_coherent = alpha_pci_alloc_coherent,
+ .free_coherent = alpha_pci_free_coherent,
+ .map_page = alpha_pci_map_page,
+@@ -962,5 +962,5 @@ struct dma_map_ops alpha_pci_ops = {
+ .set_dma_mask = alpha_pci_set_mask,
+ };
+
+-struct dma_map_ops *dma_ops = &alpha_pci_ops;
++const struct dma_map_ops *dma_ops = &alpha_pci_ops;
+ EXPORT_SYMBOL(dma_ops);
+diff -urNp linux-2.6.34.1/arch/alpha/mm/fault.c linux-2.6.34.1/arch/alpha/mm/fault.c
+--- linux-2.6.34.1/arch/alpha/mm/fault.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/alpha/mm/fault.c 2010-07-07 09:04:42.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.34/arch/arm/include/asm/elf.h linux-2.6.34/arch/arm/include/asm/elf.h
---- linux-2.6.34/arch/arm/include/asm/elf.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/arm/include/asm/elf.h 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/arm/include/asm/elf.h linux-2.6.34.1/arch/arm/include/asm/elf.h
+--- linux-2.6.34.1/arch/arm/include/asm/elf.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/arm/include/asm/elf.h 2010-07-07 09:04:42.000000000 -0400
@@ -111,7 +111,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.34/arch/arm/include/asm/kmap_types.h linux-2.6.34/arch/arm/include/asm/kmap_types.h
---- linux-2.6.34/arch/arm/include/asm/kmap_types.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/arm/include/asm/kmap_types.h 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/arm/include/asm/kmap_types.h linux-2.6.34.1/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.34.1/arch/arm/include/asm/kmap_types.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/arm/include/asm/kmap_types.h 2010-07-07 09:04:42.000000000 -0400
@@ -20,6 +20,7 @@ enum km_type {
KM_SOFTIRQ1,
KM_L1_CACHE,
KM_TYPE_NR
};
-diff -urNp linux-2.6.34/arch/arm/include/asm/uaccess.h linux-2.6.34/arch/arm/include/asm/uaccess.h
---- linux-2.6.34/arch/arm/include/asm/uaccess.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/arm/include/asm/uaccess.h 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/arm/include/asm/uaccess.h linux-2.6.34.1/arch/arm/include/asm/uaccess.h
+--- linux-2.6.34.1/arch/arm/include/asm/uaccess.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/arm/include/asm/uaccess.h 2010-07-07 09:04:42.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.34/arch/arm/kernel/kgdb.c linux-2.6.34/arch/arm/kernel/kgdb.c
---- linux-2.6.34/arch/arm/kernel/kgdb.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/arm/kernel/kgdb.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/arm/kernel/kgdb.c linux-2.6.34.1/arch/arm/kernel/kgdb.c
+--- linux-2.6.34.1/arch/arm/kernel/kgdb.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/arm/kernel/kgdb.c 2010-07-07 09:04:42.000000000 -0400
@@ -203,7 +203,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.34/arch/arm/mach-at91/pm.c linux-2.6.34/arch/arm/mach-at91/pm.c
---- linux-2.6.34/arch/arm/mach-at91/pm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/arm/mach-at91/pm.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/arm/mach-at91/pm.c linux-2.6.34.1/arch/arm/mach-at91/pm.c
+--- linux-2.6.34.1/arch/arm/mach-at91/pm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/arm/mach-at91/pm.c 2010-07-07 09:04:42.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.34/arch/arm/mach-davinci/pm.c linux-2.6.34/arch/arm/mach-davinci/pm.c
---- linux-2.6.34/arch/arm/mach-davinci/pm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/arm/mach-davinci/pm.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/arm/mach-davinci/pm.c linux-2.6.34.1/arch/arm/mach-davinci/pm.c
+--- linux-2.6.34.1/arch/arm/mach-davinci/pm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/arm/mach-davinci/pm.c 2010-07-07 09:04:42.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.34/arch/arm/mach-omap1/pm.c linux-2.6.34/arch/arm/mach-omap1/pm.c
---- linux-2.6.34/arch/arm/mach-omap1/pm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/arm/mach-omap1/pm.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/arm/mach-omap1/pm.c linux-2.6.34.1/arch/arm/mach-omap1/pm.c
+--- linux-2.6.34.1/arch/arm/mach-omap1/pm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/arm/mach-omap1/pm.c 2010-07-07 09:04:42.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.34/arch/arm/mach-omap2/pm24xx.c linux-2.6.34/arch/arm/mach-omap2/pm24xx.c
---- linux-2.6.34/arch/arm/mach-omap2/pm24xx.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/arm/mach-omap2/pm24xx.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/arm/mach-omap2/pm24xx.c linux-2.6.34.1/arch/arm/mach-omap2/pm24xx.c
+--- linux-2.6.34.1/arch/arm/mach-omap2/pm24xx.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/arm/mach-omap2/pm24xx.c 2010-07-07 09:04:42.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.34/arch/arm/mach-omap2/pm34xx.c linux-2.6.34/arch/arm/mach-omap2/pm34xx.c
---- linux-2.6.34/arch/arm/mach-omap2/pm34xx.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/arm/mach-omap2/pm34xx.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/arm/mach-omap2/pm34xx.c linux-2.6.34.1/arch/arm/mach-omap2/pm34xx.c
+--- linux-2.6.34.1/arch/arm/mach-omap2/pm34xx.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/arm/mach-omap2/pm34xx.c 2010-07-07 09:04:42.000000000 -0400
@@ -651,7 +651,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.34/arch/arm/mach-pnx4008/pm.c linux-2.6.34/arch/arm/mach-pnx4008/pm.c
---- linux-2.6.34/arch/arm/mach-pnx4008/pm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/arm/mach-pnx4008/pm.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/arm/mach-pnx4008/pm.c linux-2.6.34.1/arch/arm/mach-pnx4008/pm.c
+--- linux-2.6.34.1/arch/arm/mach-pnx4008/pm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/arm/mach-pnx4008/pm.c 2010-07-07 09:04:42.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.34/arch/arm/mach-pxa/pm.c linux-2.6.34/arch/arm/mach-pxa/pm.c
---- linux-2.6.34/arch/arm/mach-pxa/pm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/arm/mach-pxa/pm.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/arm/mach-pxa/pm.c linux-2.6.34.1/arch/arm/mach-pxa/pm.c
+--- linux-2.6.34.1/arch/arm/mach-pxa/pm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/arm/mach-pxa/pm.c 2010-07-07 09:04:42.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.34/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.34/arch/arm/mach-pxa/sharpsl_pm.c
---- linux-2.6.34/arch/arm/mach-pxa/sharpsl_pm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/arm/mach-pxa/sharpsl_pm.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.34.1/arch/arm/mach-pxa/sharpsl_pm.c
+--- linux-2.6.34.1/arch/arm/mach-pxa/sharpsl_pm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/arm/mach-pxa/sharpsl_pm.c 2010-07-07 09:04:42.000000000 -0400
@@ -892,7 +892,7 @@ static void sharpsl_apm_get_power_status
}
.prepare = pxa_pm_prepare,
.finish = pxa_pm_finish,
.enter = corgi_pxa_pm_enter,
-diff -urNp linux-2.6.34/arch/arm/mach-sa1100/pm.c linux-2.6.34/arch/arm/mach-sa1100/pm.c
---- linux-2.6.34/arch/arm/mach-sa1100/pm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/arm/mach-sa1100/pm.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/arm/mach-sa1100/pm.c linux-2.6.34.1/arch/arm/mach-sa1100/pm.c
+--- linux-2.6.34.1/arch/arm/mach-sa1100/pm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/arm/mach-sa1100/pm.c 2010-07-07 09:04:42.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.34/arch/arm/mm/fault.c linux-2.6.34/arch/arm/mm/fault.c
---- linux-2.6.34/arch/arm/mm/fault.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/arm/mm/fault.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/arm/mm/fault.c linux-2.6.34.1/arch/arm/mm/fault.c
+--- linux-2.6.34.1/arch/arm/mm/fault.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/arm/mm/fault.c 2010-07-07 09:04:42.000000000 -0400
@@ -167,6 +167,13 @@ __do_user_fault(struct task_struct *tsk,
}
#endif
/*
* First Level Translation Fault Handler
*
-diff -urNp linux-2.6.34/arch/arm/mm/mmap.c linux-2.6.34/arch/arm/mm/mmap.c
---- linux-2.6.34/arch/arm/mm/mmap.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/arm/mm/mmap.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/arm/mm/mmap.c linux-2.6.34.1/arch/arm/mm/mmap.c
+--- linux-2.6.34.1/arch/arm/mm/mmap.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/arm/mm/mmap.c 2010-07-07 09:04:42.000000000 -0400
@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
mm->cached_hole_size = 0;
goto full_search;
}
-diff -urNp linux-2.6.34/arch/arm/plat-samsung/pm.c linux-2.6.34/arch/arm/plat-samsung/pm.c
---- linux-2.6.34/arch/arm/plat-samsung/pm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/arm/plat-samsung/pm.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/arm/plat-samsung/pm.c linux-2.6.34.1/arch/arm/plat-samsung/pm.c
+--- linux-2.6.34.1/arch/arm/plat-samsung/pm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/arm/plat-samsung/pm.c 2010-07-07 09:04:42.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.34/arch/avr32/include/asm/elf.h linux-2.6.34/arch/avr32/include/asm/elf.h
---- linux-2.6.34/arch/avr32/include/asm/elf.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/avr32/include/asm/elf.h 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/avr32/include/asm/elf.h linux-2.6.34.1/arch/avr32/include/asm/elf.h
+--- linux-2.6.34.1/arch/avr32/include/asm/elf.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/avr32/include/asm/elf.h 2010-07-07 09:04:42.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.34/arch/avr32/include/asm/kmap_types.h linux-2.6.34/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.34/arch/avr32/include/asm/kmap_types.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/avr32/include/asm/kmap_types.h 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/avr32/include/asm/kmap_types.h linux-2.6.34.1/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.34.1/arch/avr32/include/asm/kmap_types.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/avr32/include/asm/kmap_types.h 2010-07-07 09:04:42.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.34/arch/avr32/mach-at32ap/pm.c linux-2.6.34/arch/avr32/mach-at32ap/pm.c
---- linux-2.6.34/arch/avr32/mach-at32ap/pm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/avr32/mach-at32ap/pm.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/avr32/mach-at32ap/pm.c linux-2.6.34.1/arch/avr32/mach-at32ap/pm.c
+--- linux-2.6.34.1/arch/avr32/mach-at32ap/pm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/avr32/mach-at32ap/pm.c 2010-07-07 09:04:42.000000000 -0400
@@ -176,7 +176,7 @@ out:
return 0;
}
.valid = avr32_pm_valid_state,
.enter = avr32_pm_enter,
};
-diff -urNp linux-2.6.34/arch/avr32/mm/fault.c linux-2.6.34/arch/avr32/mm/fault.c
---- linux-2.6.34/arch/avr32/mm/fault.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/avr32/mm/fault.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/avr32/mm/fault.c linux-2.6.34.1/arch/avr32/mm/fault.c
+--- linux-2.6.34.1/arch/avr32/mm/fault.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/avr32/mm/fault.c 2010-07-07 09:04:42.000000000 -0400
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
int exception_trace = 1;
if (exception_trace && printk_ratelimit())
printk("%s%s[%d]: segfault at %08lx pc %08lx "
"sp %08lx ecr %lu\n",
-diff -urNp linux-2.6.34/arch/blackfin/kernel/kgdb.c linux-2.6.34/arch/blackfin/kernel/kgdb.c
---- linux-2.6.34/arch/blackfin/kernel/kgdb.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/blackfin/kernel/kgdb.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/blackfin/kernel/kgdb.c linux-2.6.34.1/arch/blackfin/kernel/kgdb.c
+--- linux-2.6.34.1/arch/blackfin/kernel/kgdb.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/blackfin/kernel/kgdb.c 2010-07-07 09:04:42.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.34/arch/blackfin/mach-common/pm.c linux-2.6.34/arch/blackfin/mach-common/pm.c
---- linux-2.6.34/arch/blackfin/mach-common/pm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/blackfin/mach-common/pm.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/blackfin/mach-common/pm.c linux-2.6.34.1/arch/blackfin/mach-common/pm.c
+--- linux-2.6.34.1/arch/blackfin/mach-common/pm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/blackfin/mach-common/pm.c 2010-07-07 09:04:42.000000000 -0400
@@ -256,7 +256,7 @@ static int bfin_pm_enter(suspend_state_t
return 0;
}
.enter = bfin_pm_enter,
.valid = bfin_pm_valid,
};
-diff -urNp linux-2.6.34/arch/blackfin/mm/maccess.c linux-2.6.34/arch/blackfin/mm/maccess.c
---- linux-2.6.34/arch/blackfin/mm/maccess.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/blackfin/mm/maccess.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/blackfin/mm/maccess.c linux-2.6.34.1/arch/blackfin/mm/maccess.c
+--- linux-2.6.34.1/arch/blackfin/mm/maccess.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/blackfin/mm/maccess.c 2010-07-07 09:04:42.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.34/arch/frv/include/asm/kmap_types.h linux-2.6.34/arch/frv/include/asm/kmap_types.h
---- linux-2.6.34/arch/frv/include/asm/kmap_types.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/frv/include/asm/kmap_types.h 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/frv/include/asm/kmap_types.h linux-2.6.34.1/arch/frv/include/asm/kmap_types.h
+--- linux-2.6.34.1/arch/frv/include/asm/kmap_types.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/frv/include/asm/kmap_types.h 2010-07-07 09:04:42.000000000 -0400
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
KM_TYPE_NR
};
-diff -urNp linux-2.6.34/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.34/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.34/arch/ia64/hp/common/hwsw_iommu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/ia64/hp/common/hwsw_iommu.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.34.1/arch/ia64/hp/common/hwsw_iommu.c
+--- linux-2.6.34.1/arch/ia64/hp/common/hwsw_iommu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/ia64/hp/common/hwsw_iommu.c 2010-07-07 09:04:42.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.34/arch/ia64/hp/common/sba_iommu.c linux-2.6.34/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.34/arch/ia64/hp/common/sba_iommu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/ia64/hp/common/sba_iommu.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/ia64/hp/common/sba_iommu.c linux-2.6.34.1/arch/ia64/hp/common/sba_iommu.c
+--- linux-2.6.34.1/arch/ia64/hp/common/sba_iommu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/ia64/hp/common/sba_iommu.c 2010-07-07 09:04:42.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.34/arch/ia64/include/asm/dma-mapping.h linux-2.6.34/arch/ia64/include/asm/dma-mapping.h
---- linux-2.6.34/arch/ia64/include/asm/dma-mapping.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/ia64/include/asm/dma-mapping.h 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/ia64/include/asm/dma-mapping.h linux-2.6.34.1/arch/ia64/include/asm/dma-mapping.h
+--- linux-2.6.34.1/arch/ia64/include/asm/dma-mapping.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/ia64/include/asm/dma-mapping.h 2010-07-07 09:04:42.000000000 -0400
@@ -12,7 +12,7 @@
#define ARCH_HAS_DMA_GET_REQUIRED_MASK
return ops->dma_supported(dev, mask);
}
-diff -urNp linux-2.6.34/arch/ia64/include/asm/elf.h linux-2.6.34/arch/ia64/include/asm/elf.h
---- linux-2.6.34/arch/ia64/include/asm/elf.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/ia64/include/asm/elf.h 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/ia64/include/asm/elf.h linux-2.6.34.1/arch/ia64/include/asm/elf.h
+--- linux-2.6.34.1/arch/ia64/include/asm/elf.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/ia64/include/asm/elf.h 2010-07-07 09:04:42.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.34/arch/ia64/include/asm/machvec.h linux-2.6.34/arch/ia64/include/asm/machvec.h
---- linux-2.6.34/arch/ia64/include/asm/machvec.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/ia64/include/asm/machvec.h 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/ia64/include/asm/machvec.h linux-2.6.34.1/arch/ia64/include/asm/machvec.h
+--- linux-2.6.34.1/arch/ia64/include/asm/machvec.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/ia64/include/asm/machvec.h 2010-07-07 09:04:42.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.34/arch/ia64/include/asm/pgtable.h linux-2.6.34/arch/ia64/include/asm/pgtable.h
---- linux-2.6.34/arch/ia64/include/asm/pgtable.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/ia64/include/asm/pgtable.h 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/ia64/include/asm/pgtable.h linux-2.6.34.1/arch/ia64/include/asm/pgtable.h
+--- linux-2.6.34.1/arch/ia64/include/asm/pgtable.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/ia64/include/asm/pgtable.h 2010-07-07 09:04:42.000000000 -0400
@@ -143,6 +143,17 @@
#define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
#define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
#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.34/arch/ia64/include/asm/uaccess.h linux-2.6.34/arch/ia64/include/asm/uaccess.h
---- linux-2.6.34/arch/ia64/include/asm/uaccess.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/ia64/include/asm/uaccess.h 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/ia64/include/asm/uaccess.h linux-2.6.34.1/arch/ia64/include/asm/uaccess.h
+--- linux-2.6.34.1/arch/ia64/include/asm/uaccess.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/ia64/include/asm/uaccess.h 2010-07-07 09:04:42.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.34/arch/ia64/kernel/dma-mapping.c linux-2.6.34/arch/ia64/kernel/dma-mapping.c
---- linux-2.6.34/arch/ia64/kernel/dma-mapping.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/ia64/kernel/dma-mapping.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/ia64/kernel/dma-mapping.c linux-2.6.34.1/arch/ia64/kernel/dma-mapping.c
+--- linux-2.6.34.1/arch/ia64/kernel/dma-mapping.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/ia64/kernel/dma-mapping.c 2010-07-07 09:04:42.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.34/arch/ia64/kernel/module.c linux-2.6.34/arch/ia64/kernel/module.c
---- linux-2.6.34/arch/ia64/kernel/module.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/ia64/kernel/module.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/ia64/kernel/module.c linux-2.6.34.1/arch/ia64/kernel/module.c
+--- linux-2.6.34.1/arch/ia64/kernel/module.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/ia64/kernel/module.c 2010-07-07 09:04:42.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.34/arch/ia64/kernel/pci-dma.c linux-2.6.34/arch/ia64/kernel/pci-dma.c
---- linux-2.6.34/arch/ia64/kernel/pci-dma.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/ia64/kernel/pci-dma.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/ia64/kernel/pci-dma.c linux-2.6.34.1/arch/ia64/kernel/pci-dma.c
+--- linux-2.6.34.1/arch/ia64/kernel/pci-dma.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/ia64/kernel/pci-dma.c 2010-07-07 09:04:42.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.34/arch/ia64/kernel/pci-swiotlb.c linux-2.6.34/arch/ia64/kernel/pci-swiotlb.c
---- linux-2.6.34/arch/ia64/kernel/pci-swiotlb.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/ia64/kernel/pci-swiotlb.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/ia64/kernel/pci-swiotlb.c linux-2.6.34.1/arch/ia64/kernel/pci-swiotlb.c
+--- linux-2.6.34.1/arch/ia64/kernel/pci-swiotlb.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/ia64/kernel/pci-swiotlb.c 2010-07-07 09:04:42.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.34/arch/ia64/kernel/sys_ia64.c linux-2.6.34/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.34/arch/ia64/kernel/sys_ia64.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/ia64/kernel/sys_ia64.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/ia64/kernel/sys_ia64.c linux-2.6.34.1/arch/ia64/kernel/sys_ia64.c
+--- linux-2.6.34.1/arch/ia64/kernel/sys_ia64.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/ia64/kernel/sys_ia64.c 2010-07-07 09:04:42.000000000 -0400
@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
if (REGION_NUMBER(addr) == RGN_HPAGE)
addr = 0;
goto full_search;
}
return -ENOMEM;
-diff -urNp linux-2.6.34/arch/ia64/kernel/vmlinux.lds.S linux-2.6.34/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.34/arch/ia64/kernel/vmlinux.lds.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/ia64/kernel/vmlinux.lds.S 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/ia64/kernel/vmlinux.lds.S linux-2.6.34.1/arch/ia64/kernel/vmlinux.lds.S
+--- linux-2.6.34.1/arch/ia64/kernel/vmlinux.lds.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/ia64/kernel/vmlinux.lds.S 2010-07-07 09:04:42.000000000 -0400
@@ -196,7 +196,7 @@ SECTIONS
/* Per-cpu data: */
. = ALIGN(PERCPU_PAGE_SIZE);
. = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
* into percpu page size
*/
-diff -urNp linux-2.6.34/arch/ia64/mm/fault.c linux-2.6.34/arch/ia64/mm/fault.c
---- linux-2.6.34/arch/ia64/mm/fault.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/ia64/mm/fault.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/ia64/mm/fault.c linux-2.6.34.1/arch/ia64/mm/fault.c
+--- linux-2.6.34.1/arch/ia64/mm/fault.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/ia64/mm/fault.c 2010-07-07 09:04:42.000000000 -0400
@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
return pte_present(pte);
}
survive:
/*
* If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.34/arch/ia64/mm/init.c linux-2.6.34/arch/ia64/mm/init.c
---- linux-2.6.34/arch/ia64/mm/init.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/ia64/mm/init.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/ia64/mm/init.c linux-2.6.34.1/arch/ia64/mm/init.c
+--- linux-2.6.34.1/arch/ia64/mm/init.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/ia64/mm/init.c 2010-07-07 09:04:42.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.34/arch/ia64/sn/pci/pci_dma.c linux-2.6.34/arch/ia64/sn/pci/pci_dma.c
---- linux-2.6.34/arch/ia64/sn/pci/pci_dma.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/ia64/sn/pci/pci_dma.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/ia64/sn/pci/pci_dma.c linux-2.6.34.1/arch/ia64/sn/pci/pci_dma.c
+--- linux-2.6.34.1/arch/ia64/sn/pci/pci_dma.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/ia64/sn/pci/pci_dma.c 2010-07-07 09:04:42.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.34/arch/m32r/lib/usercopy.c linux-2.6.34/arch/m32r/lib/usercopy.c
---- linux-2.6.34/arch/m32r/lib/usercopy.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/m32r/lib/usercopy.c 2010-07-01 20:45:13.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/m32r/lib/usercopy.c linux-2.6.34.1/arch/m32r/lib/usercopy.c
+--- linux-2.6.34.1/arch/m32r/lib/usercopy.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/m32r/lib/usercopy.c 2010-07-07 09:04:42.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.34/arch/microblaze/include/asm/device.h linux-2.6.34/arch/microblaze/include/asm/device.h
---- linux-2.6.34/arch/microblaze/include/asm/device.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/microblaze/include/asm/device.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/microblaze/include/asm/device.h linux-2.6.34.1/arch/microblaze/include/asm/device.h
+--- linux-2.6.34.1/arch/microblaze/include/asm/device.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/microblaze/include/asm/device.h 2010-07-07 09:04:42.000000000 -0400
@@ -16,7 +16,7 @@ struct dev_archdata {
struct device_node *of_node;
void *dma_data;
};
-diff -urNp linux-2.6.34/arch/microblaze/include/asm/dma-mapping.h linux-2.6.34/arch/microblaze/include/asm/dma-mapping.h
---- linux-2.6.34/arch/microblaze/include/asm/dma-mapping.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/microblaze/include/asm/dma-mapping.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/microblaze/include/asm/dma-mapping.h linux-2.6.34.1/arch/microblaze/include/asm/dma-mapping.h
+--- linux-2.6.34.1/arch/microblaze/include/asm/dma-mapping.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/microblaze/include/asm/dma-mapping.h 2010-07-07 09:04:42.000000000 -0400
@@ -43,14 +43,14 @@ static inline unsigned long device_to_ma
return 0xfffffffful;
}
BUG_ON(!ops);
debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
-diff -urNp linux-2.6.34/arch/microblaze/include/asm/pci.h linux-2.6.34/arch/microblaze/include/asm/pci.h
---- linux-2.6.34/arch/microblaze/include/asm/pci.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/microblaze/include/asm/pci.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/microblaze/include/asm/pci.h linux-2.6.34.1/arch/microblaze/include/asm/pci.h
+--- linux-2.6.34.1/arch/microblaze/include/asm/pci.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/microblaze/include/asm/pci.h 2010-07-07 09:04:42.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.34/arch/microblaze/kernel/dma.c linux-2.6.34/arch/microblaze/kernel/dma.c
---- linux-2.6.34/arch/microblaze/kernel/dma.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/microblaze/kernel/dma.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/microblaze/kernel/dma.c linux-2.6.34.1/arch/microblaze/kernel/dma.c
+--- linux-2.6.34.1/arch/microblaze/kernel/dma.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/microblaze/kernel/dma.c 2010-07-07 09:04:42.000000000 -0400
@@ -134,7 +134,7 @@ static inline void dma_direct_unmap_page
__dma_sync_page(dma_address, 0 , size, direction);
}
.alloc_coherent = dma_direct_alloc_coherent,
.free_coherent = dma_direct_free_coherent,
.map_sg = dma_direct_map_sg,
-diff -urNp linux-2.6.34/arch/microblaze/pci/pci-common.c linux-2.6.34/arch/microblaze/pci/pci-common.c
---- linux-2.6.34/arch/microblaze/pci/pci-common.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/microblaze/pci/pci-common.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/microblaze/pci/pci-common.c linux-2.6.34.1/arch/microblaze/pci/pci-common.c
+--- linux-2.6.34.1/arch/microblaze/pci/pci-common.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/microblaze/pci/pci-common.c 2010-07-07 09:04:42.000000000 -0400
@@ -46,14 +46,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.34/arch/mips/alchemy/devboards/pm.c linux-2.6.34/arch/mips/alchemy/devboards/pm.c
---- linux-2.6.34/arch/mips/alchemy/devboards/pm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/mips/alchemy/devboards/pm.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/mips/alchemy/devboards/pm.c linux-2.6.34.1/arch/mips/alchemy/devboards/pm.c
+--- linux-2.6.34.1/arch/mips/alchemy/devboards/pm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/mips/alchemy/devboards/pm.c 2010-07-07 09:04:42.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.34/arch/mips/include/asm/elf.h linux-2.6.34/arch/mips/include/asm/elf.h
---- linux-2.6.34/arch/mips/include/asm/elf.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/mips/include/asm/elf.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/mips/include/asm/elf.h linux-2.6.34.1/arch/mips/include/asm/elf.h
+--- linux-2.6.34.1/arch/mips/include/asm/elf.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/mips/include/asm/elf.h 2010-07-07 09:04:42.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.34/arch/mips/include/asm/page.h linux-2.6.34/arch/mips/include/asm/page.h
---- linux-2.6.34/arch/mips/include/asm/page.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/mips/include/asm/page.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/mips/include/asm/page.h linux-2.6.34.1/arch/mips/include/asm/page.h
+--- linux-2.6.34.1/arch/mips/include/asm/page.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/mips/include/asm/page.h 2010-07-07 09:04:42.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.34/arch/mips/include/asm/system.h linux-2.6.34/arch/mips/include/asm/system.h
---- linux-2.6.34/arch/mips/include/asm/system.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/mips/include/asm/system.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/mips/include/asm/system.h linux-2.6.34.1/arch/mips/include/asm/system.h
+--- linux-2.6.34.1/arch/mips/include/asm/system.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/mips/include/asm/system.h 2010-07-07 09:04:42.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.34/arch/mips/kernel/binfmt_elfn32.c linux-2.6.34/arch/mips/kernel/binfmt_elfn32.c
---- linux-2.6.34/arch/mips/kernel/binfmt_elfn32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/mips/kernel/binfmt_elfn32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/mips/kernel/binfmt_elfn32.c linux-2.6.34.1/arch/mips/kernel/binfmt_elfn32.c
+--- linux-2.6.34.1/arch/mips/kernel/binfmt_elfn32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/mips/kernel/binfmt_elfn32.c 2010-07-07 09:04:42.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.34/arch/mips/kernel/binfmt_elfo32.c linux-2.6.34/arch/mips/kernel/binfmt_elfo32.c
---- linux-2.6.34/arch/mips/kernel/binfmt_elfo32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/mips/kernel/binfmt_elfo32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/mips/kernel/binfmt_elfo32.c linux-2.6.34.1/arch/mips/kernel/binfmt_elfo32.c
+--- linux-2.6.34.1/arch/mips/kernel/binfmt_elfo32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/mips/kernel/binfmt_elfo32.c 2010-07-07 09:04:42.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.34/arch/mips/kernel/kgdb.c linux-2.6.34/arch/mips/kernel/kgdb.c
---- linux-2.6.34/arch/mips/kernel/kgdb.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/mips/kernel/kgdb.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/mips/kernel/kgdb.c linux-2.6.34.1/arch/mips/kernel/kgdb.c
+--- linux-2.6.34.1/arch/mips/kernel/kgdb.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/mips/kernel/kgdb.c 2010-07-07 09:04:42.000000000 -0400
@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
return -1;
}
struct kgdb_arch arch_kgdb_ops;
/*
-diff -urNp linux-2.6.34/arch/mips/kernel/process.c linux-2.6.34/arch/mips/kernel/process.c
---- linux-2.6.34/arch/mips/kernel/process.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/mips/kernel/process.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/mips/kernel/process.c linux-2.6.34.1/arch/mips/kernel/process.c
+--- linux-2.6.34.1/arch/mips/kernel/process.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/mips/kernel/process.c 2010-07-07 09:04:42.000000000 -0400
@@ -474,15 +474,3 @@ unsigned long get_wchan(struct task_stru
out:
return pc;
-
- return sp & ALMASK;
-}
-diff -urNp linux-2.6.34/arch/mips/kernel/syscall.c linux-2.6.34/arch/mips/kernel/syscall.c
---- linux-2.6.34/arch/mips/kernel/syscall.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/mips/kernel/syscall.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/mips/kernel/syscall.c linux-2.6.34.1/arch/mips/kernel/syscall.c
+--- linux-2.6.34.1/arch/mips/kernel/syscall.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/mips/kernel/syscall.c 2010-07-07 09:04:42.000000000 -0400
@@ -106,6 +106,11 @@ unsigned long arch_get_unmapped_area(str
do_color_align = 0;
if (filp || (flags & MAP_SHARED))
if (do_color_align)
addr = COLOUR_ALIGN(addr, pgoff);
else
-diff -urNp linux-2.6.34/arch/mips/loongson/common/pm.c linux-2.6.34/arch/mips/loongson/common/pm.c
---- linux-2.6.34/arch/mips/loongson/common/pm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/mips/loongson/common/pm.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/mips/loongson/common/pm.c linux-2.6.34.1/arch/mips/loongson/common/pm.c
+--- linux-2.6.34.1/arch/mips/loongson/common/pm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/mips/loongson/common/pm.c 2010-07-07 09:04:42.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.34/arch/mips/mm/fault.c linux-2.6.34/arch/mips/mm/fault.c
---- linux-2.6.34/arch/mips/mm/fault.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/mips/mm/fault.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/mips/mm/fault.c linux-2.6.34.1/arch/mips/mm/fault.c
+--- linux-2.6.34.1/arch/mips/mm/fault.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/mips/mm/fault.c 2010-07-07 09:04:42.000000000 -0400
@@ -26,6 +26,23 @@
#include <asm/ptrace.h>
#include <asm/highmem.h> /* For VMALLOC_END */
/*
* 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.34/arch/parisc/include/asm/elf.h linux-2.6.34/arch/parisc/include/asm/elf.h
---- linux-2.6.34/arch/parisc/include/asm/elf.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/parisc/include/asm/elf.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/parisc/include/asm/elf.h linux-2.6.34.1/arch/parisc/include/asm/elf.h
+--- linux-2.6.34.1/arch/parisc/include/asm/elf.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/parisc/include/asm/elf.h 2010-07-07 09:04:42.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.34/arch/parisc/include/asm/pgtable.h linux-2.6.34/arch/parisc/include/asm/pgtable.h
---- linux-2.6.34/arch/parisc/include/asm/pgtable.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/parisc/include/asm/pgtable.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/parisc/include/asm/pgtable.h linux-2.6.34.1/arch/parisc/include/asm/pgtable.h
+--- linux-2.6.34.1/arch/parisc/include/asm/pgtable.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/parisc/include/asm/pgtable.h 2010-07-07 09:04:42.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.34/arch/parisc/kernel/module.c linux-2.6.34/arch/parisc/kernel/module.c
---- linux-2.6.34/arch/parisc/kernel/module.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/parisc/kernel/module.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/parisc/kernel/module.c linux-2.6.34.1/arch/parisc/kernel/module.c
+--- linux-2.6.34.1/arch/parisc/kernel/module.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/parisc/kernel/module.c 2010-07-07 09:04:42.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.34/arch/parisc/kernel/sys_parisc.c linux-2.6.34/arch/parisc/kernel/sys_parisc.c
---- linux-2.6.34/arch/parisc/kernel/sys_parisc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/parisc/kernel/sys_parisc.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/parisc/kernel/sys_parisc.c linux-2.6.34.1/arch/parisc/kernel/sys_parisc.c
+--- linux-2.6.34.1/arch/parisc/kernel/sys_parisc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/parisc/kernel/sys_parisc.c 2010-07-07 09:04:42.000000000 -0400
@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str
if (flags & MAP_FIXED)
return addr;
if (filp) {
addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-2.6.34/arch/parisc/kernel/traps.c linux-2.6.34/arch/parisc/kernel/traps.c
---- linux-2.6.34/arch/parisc/kernel/traps.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/parisc/kernel/traps.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/parisc/kernel/traps.c linux-2.6.34.1/arch/parisc/kernel/traps.c
+--- linux-2.6.34.1/arch/parisc/kernel/traps.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/parisc/kernel/traps.c 2010-07-07 09:04:42.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.34/arch/parisc/mm/fault.c linux-2.6.34/arch/parisc/mm/fault.c
---- linux-2.6.34/arch/parisc/mm/fault.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/parisc/mm/fault.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/parisc/mm/fault.c linux-2.6.34.1/arch/parisc/mm/fault.c
+--- linux-2.6.34.1/arch/parisc/mm/fault.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/parisc/mm/fault.c 2010-07-07 09:04:42.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.34/arch/powerpc/include/asm/device.h linux-2.6.34/arch/powerpc/include/asm/device.h
---- linux-2.6.34/arch/powerpc/include/asm/device.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/include/asm/device.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/include/asm/device.h linux-2.6.34.1/arch/powerpc/include/asm/device.h
+--- linux-2.6.34.1/arch/powerpc/include/asm/device.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/include/asm/device.h 2010-07-07 09:04:42.000000000 -0400
@@ -14,7 +14,7 @@ struct dev_archdata {
struct device_node *of_node;
/*
* When an iommu is in use, dma_data is used as a ptr to the base of the
-diff -urNp linux-2.6.34/arch/powerpc/include/asm/dma-mapping.h linux-2.6.34/arch/powerpc/include/asm/dma-mapping.h
---- linux-2.6.34/arch/powerpc/include/asm/dma-mapping.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/include/asm/dma-mapping.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/include/asm/dma-mapping.h linux-2.6.34.1/arch/powerpc/include/asm/dma-mapping.h
+--- linux-2.6.34.1/arch/powerpc/include/asm/dma-mapping.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/include/asm/dma-mapping.h 2010-07-07 09:04:42.000000000 -0400
@@ -67,11 +67,11 @@ 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.34/arch/powerpc/include/asm/elf.h linux-2.6.34/arch/powerpc/include/asm/elf.h
---- linux-2.6.34/arch/powerpc/include/asm/elf.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/include/asm/elf.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/include/asm/elf.h linux-2.6.34.1/arch/powerpc/include/asm/elf.h
+--- linux-2.6.34.1/arch/powerpc/include/asm/elf.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/include/asm/elf.h 2010-07-07 09:04:42.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.34/arch/powerpc/include/asm/iommu.h linux-2.6.34/arch/powerpc/include/asm/iommu.h
---- linux-2.6.34/arch/powerpc/include/asm/iommu.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/include/asm/iommu.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/include/asm/iommu.h linux-2.6.34.1/arch/powerpc/include/asm/iommu.h
+--- linux-2.6.34.1/arch/powerpc/include/asm/iommu.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/include/asm/iommu.h 2010-07-07 09:04:42.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.34/arch/powerpc/include/asm/kmap_types.h linux-2.6.34/arch/powerpc/include/asm/kmap_types.h
---- linux-2.6.34/arch/powerpc/include/asm/kmap_types.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/include/asm/kmap_types.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/include/asm/kmap_types.h linux-2.6.34.1/arch/powerpc/include/asm/kmap_types.h
+--- linux-2.6.34.1/arch/powerpc/include/asm/kmap_types.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/include/asm/kmap_types.h 2010-07-07 09:04:42.000000000 -0400
@@ -26,6 +26,7 @@ enum km_type {
KM_SOFTIRQ1,
KM_PPC_SYNC_PAGE,
KM_TYPE_NR
};
-diff -urNp linux-2.6.34/arch/powerpc/include/asm/page_64.h linux-2.6.34/arch/powerpc/include/asm/page_64.h
---- linux-2.6.34/arch/powerpc/include/asm/page_64.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/include/asm/page_64.h 2010-07-01 20:45:14.000000000 -0400
-@@ -180,15 +180,18 @@ do { \
- * stack by default, so in the absense of a PT_GNU_STACK program header
- * we turn execute permission off.
- */
--#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
-- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-+#define VM_STACK_DEFAULT_FLAGS32 \
-+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
-+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-
- #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-
-+#ifndef CONFIG_PAX_PAGEEXEC
- #define VM_STACK_DEFAULT_FLAGS \
- (test_thread_flag(TIF_32BIT) ? \
- VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
-+#endif
-
- #include <asm-generic/getorder.h>
-
-diff -urNp linux-2.6.34/arch/powerpc/include/asm/page.h linux-2.6.34/arch/powerpc/include/asm/page.h
---- linux-2.6.34/arch/powerpc/include/asm/page.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/include/asm/page.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/include/asm/page.h linux-2.6.34.1/arch/powerpc/include/asm/page.h
+--- linux-2.6.34.1/arch/powerpc/include/asm/page.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/include/asm/page.h 2010-07-07 09:04:42.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.34/arch/powerpc/include/asm/pci.h linux-2.6.34/arch/powerpc/include/asm/pci.h
---- linux-2.6.34/arch/powerpc/include/asm/pci.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/include/asm/pci.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/include/asm/page_64.h linux-2.6.34.1/arch/powerpc/include/asm/page_64.h
+--- linux-2.6.34.1/arch/powerpc/include/asm/page_64.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/include/asm/page_64.h 2010-07-07 09:04:42.000000000 -0400
+@@ -180,15 +180,18 @@ do { \
+ * stack by default, so in the absense of a PT_GNU_STACK program header
+ * we turn execute permission off.
+ */
+-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
+- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
++#define VM_STACK_DEFAULT_FLAGS32 \
++ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
++ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
+ #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
+ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
++#ifndef CONFIG_PAX_PAGEEXEC
+ #define VM_STACK_DEFAULT_FLAGS \
+ (test_thread_flag(TIF_32BIT) ? \
+ VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
++#endif
+
+ #include <asm-generic/getorder.h>
+
+diff -urNp linux-2.6.34.1/arch/powerpc/include/asm/pci.h linux-2.6.34.1/arch/powerpc/include/asm/pci.h
+--- linux-2.6.34.1/arch/powerpc/include/asm/pci.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/include/asm/pci.h 2010-07-07 09:04:42.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.34/arch/powerpc/include/asm/pte-hash32.h linux-2.6.34/arch/powerpc/include/asm/pte-hash32.h
---- linux-2.6.34/arch/powerpc/include/asm/pte-hash32.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/include/asm/pte-hash32.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/include/asm/pte-hash32.h linux-2.6.34.1/arch/powerpc/include/asm/pte-hash32.h
+--- linux-2.6.34.1/arch/powerpc/include/asm/pte-hash32.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/include/asm/pte-hash32.h 2010-07-07 09:04:42.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.34/arch/powerpc/include/asm/reg.h linux-2.6.34/arch/powerpc/include/asm/reg.h
---- linux-2.6.34/arch/powerpc/include/asm/reg.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/include/asm/reg.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/include/asm/reg.h linux-2.6.34.1/arch/powerpc/include/asm/reg.h
+--- linux-2.6.34.1/arch/powerpc/include/asm/reg.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/include/asm/reg.h 2010-07-07 09:04:42.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.34/arch/powerpc/include/asm/swiotlb.h linux-2.6.34/arch/powerpc/include/asm/swiotlb.h
---- linux-2.6.34/arch/powerpc/include/asm/swiotlb.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/include/asm/swiotlb.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/include/asm/swiotlb.h linux-2.6.34.1/arch/powerpc/include/asm/swiotlb.h
+--- linux-2.6.34.1/arch/powerpc/include/asm/swiotlb.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/include/asm/swiotlb.h 2010-07-07 09:04:42.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.34/arch/powerpc/include/asm/uaccess.h linux-2.6.34/arch/powerpc/include/asm/uaccess.h
---- linux-2.6.34/arch/powerpc/include/asm/uaccess.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/include/asm/uaccess.h 2010-07-01 20:45:14.000000000 -0400
-@@ -327,52 +327,6 @@ do { \
+diff -urNp linux-2.6.34.1/arch/powerpc/include/asm/uaccess.h linux-2.6.34.1/arch/powerpc/include/asm/uaccess.h
+--- linux-2.6.34.1/arch/powerpc/include/asm/uaccess.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/include/asm/uaccess.h 2010-07-07 09:04:42.000000000 -0400
+@@ -13,6 +13,8 @@
+ #define VERIFY_READ 0
+ #define VERIFY_WRITE 1
+
++extern void check_object_size(const void *ptr, unsigned long n, bool to);
++
+ /*
+ * The fs value determines whether argument validity checking should be
+ * performed or not. If get_fs() == USER_DS, checking is performed, with
+@@ -327,52 +329,6 @@ do { \
extern unsigned long __copy_tofrom_user(void __user *to,
const void __user *from, unsigned long size);
static inline unsigned long __copy_from_user_inatomic(void *to,
const void __user *from, unsigned long n)
{
-@@ -396,6 +350,10 @@ static inline unsigned long __copy_from_
+@@ -396,6 +352,10 @@ static inline unsigned long __copy_from_
if (ret == 0)
return 0;
}
return __copy_tofrom_user((__force void __user *)to, from, n);
}
-@@ -422,6 +380,10 @@ static inline unsigned long __copy_to_us
+@@ -422,6 +382,10 @@ static inline unsigned long __copy_to_us
if (ret == 0)
return 0;
}
return __copy_tofrom_user(to, (__force const void __user *)from, n);
}
-@@ -439,6 +401,92 @@ static inline unsigned long __copy_to_us
+@@ -439,6 +403,92 @@ static inline unsigned long __copy_to_us
return __copy_to_user_inatomic(to, from, size);
}
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.34/arch/powerpc/kernel/dma.c linux-2.6.34/arch/powerpc/kernel/dma.c
---- linux-2.6.34/arch/powerpc/kernel/dma.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/kernel/dma.c 2010-07-01 20:45:14.000000000 -0400
-@@ -135,7 +135,7 @@ static inline void dma_direct_sync_singl
- }
- #endif
-
--struct dma_map_ops dma_direct_ops = {
-+const struct dma_map_ops dma_direct_ops = {
- .alloc_coherent = dma_direct_alloc_coherent,
- .free_coherent = dma_direct_free_coherent,
- .map_sg = dma_direct_map_sg,
-diff -urNp linux-2.6.34/arch/powerpc/kernel/dma-iommu.c linux-2.6.34/arch/powerpc/kernel/dma-iommu.c
---- linux-2.6.34/arch/powerpc/kernel/dma-iommu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/kernel/dma-iommu.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/kernel/dma-iommu.c linux-2.6.34.1/arch/powerpc/kernel/dma-iommu.c
+--- linux-2.6.34.1/arch/powerpc/kernel/dma-iommu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/kernel/dma-iommu.c 2010-07-07 09:04:42.000000000 -0400
@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
}
.alloc_coherent = dma_iommu_alloc_coherent,
.free_coherent = dma_iommu_free_coherent,
.map_sg = dma_iommu_map_sg,
-diff -urNp linux-2.6.34/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.34/arch/powerpc/kernel/dma-swiotlb.c
---- linux-2.6.34/arch/powerpc/kernel/dma-swiotlb.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/kernel/dma-swiotlb.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.34.1/arch/powerpc/kernel/dma-swiotlb.c
+--- linux-2.6.34.1/arch/powerpc/kernel/dma-swiotlb.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/kernel/dma-swiotlb.c 2010-07-07 09:04:42.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.34/arch/powerpc/kernel/exceptions-64e.S linux-2.6.34/arch/powerpc/kernel/exceptions-64e.S
---- linux-2.6.34/arch/powerpc/kernel/exceptions-64e.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/kernel/exceptions-64e.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/kernel/dma.c linux-2.6.34.1/arch/powerpc/kernel/dma.c
+--- linux-2.6.34.1/arch/powerpc/kernel/dma.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/kernel/dma.c 2010-07-07 09:04:42.000000000 -0400
+@@ -135,7 +135,7 @@ static inline void dma_direct_sync_singl
+ }
+ #endif
+
+-struct dma_map_ops dma_direct_ops = {
++const struct dma_map_ops dma_direct_ops = {
+ .alloc_coherent = dma_direct_alloc_coherent,
+ .free_coherent = dma_direct_free_coherent,
+ .map_sg = dma_direct_map_sg,
+diff -urNp linux-2.6.34.1/arch/powerpc/kernel/exceptions-64e.S linux-2.6.34.1/arch/powerpc/kernel/exceptions-64e.S
+--- linux-2.6.34.1/arch/powerpc/kernel/exceptions-64e.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/kernel/exceptions-64e.S 2010-07-07 09:04:42.000000000 -0400
@@ -455,6 +455,7 @@ storage_fault_common:
std r14,_DAR(r1)
std r15,_DSISR(r1)
addi r3,r1,STACK_FRAME_OVERHEAD
ld r4,_DAR(r1)
bl .bad_page_fault
-diff -urNp linux-2.6.34/arch/powerpc/kernel/exceptions-64s.S linux-2.6.34/arch/powerpc/kernel/exceptions-64s.S
---- linux-2.6.34/arch/powerpc/kernel/exceptions-64s.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/kernel/exceptions-64s.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/kernel/exceptions-64s.S linux-2.6.34.1/arch/powerpc/kernel/exceptions-64s.S
+--- linux-2.6.34.1/arch/powerpc/kernel/exceptions-64s.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/kernel/exceptions-64s.S 2010-07-07 09:04:42.000000000 -0400
@@ -829,10 +829,10 @@ handle_page_fault:
11: ld r4,_DAR(r1)
ld r5,_DSISR(r1)
mr r5,r3
addi r3,r1,STACK_FRAME_OVERHEAD
lwz r4,_DAR(r1)
-diff -urNp linux-2.6.34/arch/powerpc/kernel/ibmebus.c linux-2.6.34/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.34/arch/powerpc/kernel/ibmebus.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/kernel/ibmebus.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/kernel/ibmebus.c linux-2.6.34.1/arch/powerpc/kernel/ibmebus.c
+--- linux-2.6.34.1/arch/powerpc/kernel/ibmebus.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/kernel/ibmebus.c 2010-07-07 09:04:42.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.34/arch/powerpc/kernel/kgdb.c linux-2.6.34/arch/powerpc/kernel/kgdb.c
---- linux-2.6.34/arch/powerpc/kernel/kgdb.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/kernel/kgdb.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/kernel/kgdb.c linux-2.6.34.1/arch/powerpc/kernel/kgdb.c
+--- linux-2.6.34.1/arch/powerpc/kernel/kgdb.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/kernel/kgdb.c 2010-07-07 09:04:42.000000000 -0400
@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
return 0;
.gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
};
-diff -urNp linux-2.6.34/arch/powerpc/kernel/module_32.c linux-2.6.34/arch/powerpc/kernel/module_32.c
---- linux-2.6.34/arch/powerpc/kernel/module_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/kernel/module_32.c 2010-07-01 20:45:14.000000000 -0400
-@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
- me->arch.core_plt_section = i;
- }
- if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
-- printk("Module doesn't contain .plt or .init.plt sections.\n");
-+ printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
- return -ENOEXEC;
- }
-
-@@ -203,11 +203,16 @@ static uint32_t do_plt_call(void *locati
-
- DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
- /* Init, or core PLT? */
-- if (location >= mod->module_core
-- && location < mod->module_core + mod->core_size)
-+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
-+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
- entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
-- else
-+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
-+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
- entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
-+ else {
-+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
-+ return ~0UL;
-+ }
-
- /* Find this entry, or if that fails, the next avail. entry */
- while (entry->jump[0]) {
-diff -urNp linux-2.6.34/arch/powerpc/kernel/module.c linux-2.6.34/arch/powerpc/kernel/module.c
---- linux-2.6.34/arch/powerpc/kernel/module.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/kernel/module.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/kernel/module.c linux-2.6.34.1/arch/powerpc/kernel/module.c
+--- linux-2.6.34.1/arch/powerpc/kernel/module.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/kernel/module.c 2010-07-07 09:04:42.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.34/arch/powerpc/kernel/pci-common.c linux-2.6.34/arch/powerpc/kernel/pci-common.c
---- linux-2.6.34/arch/powerpc/kernel/pci-common.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/kernel/pci-common.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/kernel/module_32.c linux-2.6.34.1/arch/powerpc/kernel/module_32.c
+--- linux-2.6.34.1/arch/powerpc/kernel/module_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/kernel/module_32.c 2010-07-07 09:04:42.000000000 -0400
+@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
+ me->arch.core_plt_section = i;
+ }
+ if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
+- printk("Module doesn't contain .plt or .init.plt sections.\n");
++ printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
+ return -ENOEXEC;
+ }
+
+@@ -203,11 +203,16 @@ static uint32_t do_plt_call(void *locati
+
+ DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
+ /* Init, or core PLT? */
+- if (location >= mod->module_core
+- && location < mod->module_core + mod->core_size)
++ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
++ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
+ entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
+- else
++ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
++ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
+ entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
++ else {
++ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
++ return ~0UL;
++ }
+
+ /* Find this entry, or if that fails, the next avail. entry */
+ while (entry->jump[0]) {
+diff -urNp linux-2.6.34.1/arch/powerpc/kernel/pci-common.c linux-2.6.34.1/arch/powerpc/kernel/pci-common.c
+--- linux-2.6.34.1/arch/powerpc/kernel/pci-common.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/kernel/pci-common.c 2010-07-07 09:04:43.000000000 -0400
@@ -51,14 +51,14 @@ resource_size_t isa_mem_base;
unsigned int ppc_pci_flags = 0;
{
return pci_dma_ops;
}
-diff -urNp linux-2.6.34/arch/powerpc/kernel/process.c linux-2.6.34/arch/powerpc/kernel/process.c
---- linux-2.6.34/arch/powerpc/kernel/process.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/kernel/process.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/kernel/process.c linux-2.6.34.1/arch/powerpc/kernel/process.c
+--- linux-2.6.34.1/arch/powerpc/kernel/process.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/kernel/process.c 2010-07-07 09:04:43.000000000 -0400
@@ -1217,51 +1217,3 @@ unsigned long arch_align_stack(unsigned
sp -= get_random_int() & ~PAGE_MASK;
return sp & ~0xf;
-
- return ret;
-}
-diff -urNp linux-2.6.34/arch/powerpc/kernel/signal_32.c linux-2.6.34/arch/powerpc/kernel/signal_32.c
---- linux-2.6.34/arch/powerpc/kernel/signal_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/kernel/signal_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/kernel/signal_32.c linux-2.6.34.1/arch/powerpc/kernel/signal_32.c
+--- linux-2.6.34.1/arch/powerpc/kernel/signal_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/kernel/signal_32.c 2010-07-07 09:04:43.000000000 -0400
@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
/* Save user registers on the stack */
frame = &rt_sf->uc.uc_mcontext;
if (save_user_regs(regs, frame, 0, 1))
goto badframe;
regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
-diff -urNp linux-2.6.34/arch/powerpc/kernel/signal_64.c linux-2.6.34/arch/powerpc/kernel/signal_64.c
---- linux-2.6.34/arch/powerpc/kernel/signal_64.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/kernel/signal_64.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/kernel/signal_64.c linux-2.6.34.1/arch/powerpc/kernel/signal_64.c
+--- linux-2.6.34.1/arch/powerpc/kernel/signal_64.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/kernel/signal_64.c 2010-07-07 09:04:43.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.34/arch/powerpc/kernel/vdso.c linux-2.6.34/arch/powerpc/kernel/vdso.c
---- linux-2.6.34/arch/powerpc/kernel/vdso.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/kernel/vdso.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/kernel/vdso.c linux-2.6.34.1/arch/powerpc/kernel/vdso.c
+--- linux-2.6.34.1/arch/powerpc/kernel/vdso.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/kernel/vdso.c 2010-07-07 09:04:43.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.34/arch/powerpc/kernel/vio.c linux-2.6.34/arch/powerpc/kernel/vio.c
---- linux-2.6.34/arch/powerpc/kernel/vio.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/kernel/vio.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/kernel/vio.c linux-2.6.34.1/arch/powerpc/kernel/vio.c
+--- linux-2.6.34.1/arch/powerpc/kernel/vio.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/kernel/vio.c 2010-07-07 09:04:43.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.34/arch/powerpc/lib/usercopy_64.c linux-2.6.34/arch/powerpc/lib/usercopy_64.c
---- linux-2.6.34/arch/powerpc/lib/usercopy_64.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/lib/usercopy_64.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/lib/usercopy_64.c linux-2.6.34.1/arch/powerpc/lib/usercopy_64.c
+--- linux-2.6.34.1/arch/powerpc/lib/usercopy_64.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/lib/usercopy_64.c 2010-07-07 09:04:43.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.34/arch/powerpc/mm/fault.c linux-2.6.34/arch/powerpc/mm/fault.c
---- linux-2.6.34/arch/powerpc/mm/fault.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/mm/fault.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/mm/fault.c linux-2.6.34.1/arch/powerpc/mm/fault.c
+--- linux-2.6.34.1/arch/powerpc/mm/fault.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/mm/fault.c 2010-07-07 09:04:43.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.34/arch/powerpc/mm/mmap_64.c linux-2.6.34/arch/powerpc/mm/mmap_64.c
---- linux-2.6.34/arch/powerpc/mm/mmap_64.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/mm/mmap_64.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/mm/mmap_64.c linux-2.6.34.1/arch/powerpc/mm/mmap_64.c
+--- linux-2.6.34.1/arch/powerpc/mm/mmap_64.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/mm/mmap_64.c 2010-07-07 09:04:43.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.34/arch/powerpc/mm/slice.c linux-2.6.34/arch/powerpc/mm/slice.c
---- linux-2.6.34/arch/powerpc/mm/slice.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/mm/slice.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/mm/slice.c linux-2.6.34.1/arch/powerpc/mm/slice.c
+--- linux-2.6.34.1/arch/powerpc/mm/slice.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/mm/slice.c 2010-07-07 09:04:43.000000000 -0400
@@ -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.34/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.34/arch/powerpc/platforms/52xx/lite5200_pm.c
---- linux-2.6.34/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.34.1/arch/powerpc/platforms/52xx/lite5200_pm.c
+--- linux-2.6.34.1/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-07-07 09:04:43.000000000 -0400
@@ -235,7 +235,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.34/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.34/arch/powerpc/platforms/52xx/mpc52xx_pm.c
---- linux-2.6.34/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.34.1/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+--- linux-2.6.34.1/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-07-07 09:04:43.000000000 -0400
@@ -180,7 +180,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.34/arch/powerpc/platforms/83xx/suspend.c linux-2.6.34/arch/powerpc/platforms/83xx/suspend.c
---- linux-2.6.34/arch/powerpc/platforms/83xx/suspend.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/platforms/83xx/suspend.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/platforms/83xx/suspend.c linux-2.6.34.1/arch/powerpc/platforms/83xx/suspend.c
+--- linux-2.6.34.1/arch/powerpc/platforms/83xx/suspend.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/platforms/83xx/suspend.c 2010-07-07 09:04:43.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.34/arch/powerpc/platforms/cell/iommu.c linux-2.6.34/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.34/arch/powerpc/platforms/cell/iommu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/platforms/cell/iommu.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/platforms/cell/iommu.c linux-2.6.34.1/arch/powerpc/platforms/cell/iommu.c
+--- linux-2.6.34.1/arch/powerpc/platforms/cell/iommu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/platforms/cell/iommu.c 2010-07-07 09:04:43.000000000 -0400
@@ -643,7 +643,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.34/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.34/arch/powerpc/platforms/ps3/system-bus.c
---- linux-2.6.34/arch/powerpc/platforms/ps3/system-bus.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/platforms/ps3/system-bus.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.34.1/arch/powerpc/platforms/ps3/system-bus.c
+--- linux-2.6.34.1/arch/powerpc/platforms/ps3/system-bus.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/platforms/ps3/system-bus.c 2010-07-07 09:04:43.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.34/arch/powerpc/sysdev/fsl_pmc.c linux-2.6.34/arch/powerpc/sysdev/fsl_pmc.c
---- linux-2.6.34/arch/powerpc/sysdev/fsl_pmc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/powerpc/sysdev/fsl_pmc.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/powerpc/sysdev/fsl_pmc.c linux-2.6.34.1/arch/powerpc/sysdev/fsl_pmc.c
+--- linux-2.6.34.1/arch/powerpc/sysdev/fsl_pmc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/powerpc/sysdev/fsl_pmc.c 2010-07-07 09:04:43.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.34/arch/s390/include/asm/elf.h linux-2.6.34/arch/s390/include/asm/elf.h
---- linux-2.6.34/arch/s390/include/asm/elf.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/s390/include/asm/elf.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/s390/Kconfig linux-2.6.34.1/arch/s390/Kconfig
+--- linux-2.6.34.1/arch/s390/Kconfig 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/s390/Kconfig 2010-07-07 09:04:43.000000000 -0400
+@@ -229,13 +229,12 @@ config AUDIT_ARCH
+
+ config S390_EXEC_PROTECT
+ bool "Data execute protection"
++ default y
+ help
+ This option allows to enable a buffer overflow protection for user
+- space programs and it also selects the addressing mode option above.
+- The kernel parameter noexec=on will enable this feature and also
+- switch the addressing modes, default is disabled. Enabling this (via
+- kernel parameter) on machines earlier than IBM System z9-109 EC/BC
+- will reduce system performance.
++ space programs.
++ Enabling this on machines earlier than IBM System z9-109 EC/BC will
++ reduce system performance.
+
+ comment "Code generation options"
+
+diff -urNp linux-2.6.34.1/arch/s390/include/asm/elf.h linux-2.6.34.1/arch/s390/include/asm/elf.h
+--- linux-2.6.34.1/arch/s390/include/asm/elf.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/s390/include/asm/elf.h 2010-07-07 09:04:43.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.34/arch/s390/include/asm/uaccess.h linux-2.6.34/arch/s390/include/asm/uaccess.h
---- linux-2.6.34/arch/s390/include/asm/uaccess.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/s390/include/asm/uaccess.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/s390/include/asm/uaccess.h linux-2.6.34.1/arch/s390/include/asm/uaccess.h
+--- linux-2.6.34.1/arch/s390/include/asm/uaccess.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/s390/include/asm/uaccess.h 2010-07-07 09:04:43.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.34/arch/s390/Kconfig linux-2.6.34/arch/s390/Kconfig
---- linux-2.6.34/arch/s390/Kconfig 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/s390/Kconfig 2010-07-01 20:45:14.000000000 -0400
-@@ -229,13 +229,12 @@ config AUDIT_ARCH
-
- config S390_EXEC_PROTECT
- bool "Data execute protection"
-+ default y
- help
- This option allows to enable a buffer overflow protection for user
-- space programs and it also selects the addressing mode option above.
-- The kernel parameter noexec=on will enable this feature and also
-- switch the addressing modes, default is disabled. Enabling this (via
-- kernel parameter) on machines earlier than IBM System z9-109 EC/BC
-- will reduce system performance.
-+ space programs.
-+ Enabling this on machines earlier than IBM System z9-109 EC/BC will
-+ reduce system performance.
-
- comment "Code generation options"
-
-diff -urNp linux-2.6.34/arch/s390/kernel/module.c linux-2.6.34/arch/s390/kernel/module.c
---- linux-2.6.34/arch/s390/kernel/module.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/s390/kernel/module.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/s390/kernel/module.c linux-2.6.34.1/arch/s390/kernel/module.c
+--- linux-2.6.34.1/arch/s390/kernel/module.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/s390/kernel/module.c 2010-07-07 09:04:43.000000000 -0400
@@ -166,11 +166,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.34/arch/s390/kernel/setup.c linux-2.6.34/arch/s390/kernel/setup.c
---- linux-2.6.34/arch/s390/kernel/setup.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/s390/kernel/setup.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/s390/kernel/setup.c linux-2.6.34.1/arch/s390/kernel/setup.c
+--- linux-2.6.34.1/arch/s390/kernel/setup.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/s390/kernel/setup.c 2010-07-07 09:04:43.000000000 -0400
@@ -297,7 +297,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.34/arch/s390/mm/maccess.c linux-2.6.34/arch/s390/mm/maccess.c
---- linux-2.6.34/arch/s390/mm/maccess.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/s390/mm/maccess.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/s390/mm/maccess.c linux-2.6.34.1/arch/s390/mm/maccess.c
+--- linux-2.6.34.1/arch/s390/mm/maccess.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/s390/mm/maccess.c 2010-07-07 09:04:43.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.34/arch/s390/mm/mmap.c linux-2.6.34/arch/s390/mm/mmap.c
---- linux-2.6.34/arch/s390/mm/mmap.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/s390/mm/mmap.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/s390/mm/mmap.c linux-2.6.34.1/arch/s390/mm/mmap.c
+--- linux-2.6.34.1/arch/s390/mm/mmap.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/s390/mm/mmap.c 2010-07-07 09:04:43.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.34/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.34/arch/sh/boards/mach-hp6xx/pm.c
---- linux-2.6.34/arch/sh/boards/mach-hp6xx/pm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sh/boards/mach-hp6xx/pm.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.34.1/arch/sh/boards/mach-hp6xx/pm.c
+--- linux-2.6.34.1/arch/sh/boards/mach-hp6xx/pm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sh/boards/mach-hp6xx/pm.c 2010-07-07 09:04:43.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.34/arch/sh/include/asm/dma-mapping.h linux-2.6.34/arch/sh/include/asm/dma-mapping.h
---- linux-2.6.34/arch/sh/include/asm/dma-mapping.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sh/include/asm/dma-mapping.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sh/include/asm/dma-mapping.h linux-2.6.34.1/arch/sh/include/asm/dma-mapping.h
+--- linux-2.6.34.1/arch/sh/include/asm/dma-mapping.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sh/include/asm/dma-mapping.h 2010-07-07 09:04:43.000000000 -0400
@@ -1,10 +1,10 @@
#ifndef __ASM_SH_DMA_MAPPING_H
#define __ASM_SH_DMA_MAPPING_H
if (dma_release_from_coherent(dev, get_order(size), vaddr))
return;
-diff -urNp linux-2.6.34/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.34/arch/sh/kernel/cpu/shmobile/pm.c
---- linux-2.6.34/arch/sh/kernel/cpu/shmobile/pm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sh/kernel/cpu/shmobile/pm.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.34.1/arch/sh/kernel/cpu/shmobile/pm.c
+--- linux-2.6.34.1/arch/sh/kernel/cpu/shmobile/pm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sh/kernel/cpu/shmobile/pm.c 2010-07-07 09:04:43.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.34/arch/sh/kernel/dma-nommu.c linux-2.6.34/arch/sh/kernel/dma-nommu.c
---- linux-2.6.34/arch/sh/kernel/dma-nommu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sh/kernel/dma-nommu.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sh/kernel/dma-nommu.c linux-2.6.34.1/arch/sh/kernel/dma-nommu.c
+--- linux-2.6.34.1/arch/sh/kernel/dma-nommu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sh/kernel/dma-nommu.c 2010-07-07 09:04:43.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.34/arch/sh/kernel/kgdb.c linux-2.6.34/arch/sh/kernel/kgdb.c
---- linux-2.6.34/arch/sh/kernel/kgdb.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sh/kernel/kgdb.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sh/kernel/kgdb.c linux-2.6.34.1/arch/sh/kernel/kgdb.c
+--- linux-2.6.34.1/arch/sh/kernel/kgdb.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sh/kernel/kgdb.c 2010-07-07 09:04:43.000000000 -0400
@@ -307,7 +307,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.34/arch/sh/mm/consistent.c linux-2.6.34/arch/sh/mm/consistent.c
---- linux-2.6.34/arch/sh/mm/consistent.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sh/mm/consistent.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sh/mm/consistent.c linux-2.6.34.1/arch/sh/mm/consistent.c
+--- linux-2.6.34.1/arch/sh/mm/consistent.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sh/mm/consistent.c 2010-07-07 09:04:43.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.34/arch/sparc/include/asm/atomic_64.h linux-2.6.34/arch/sparc/include/asm/atomic_64.h
---- linux-2.6.34/arch/sparc/include/asm/atomic_64.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/include/asm/atomic_64.h 2010-07-03 19:27:09.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/Makefile linux-2.6.34.1/arch/sparc/Makefile
+--- linux-2.6.34.1/arch/sparc/Makefile 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/Makefile 2010-07-07 09:04:44.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_INIT := $(head-y) $(init-y)
+-VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
++VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
+ VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
+ VMLINUX_MAIN += $(drivers-y) $(net-y)
+
+diff -urNp linux-2.6.34.1/arch/sparc/include/asm/atomic_64.h linux-2.6.34.1/arch/sparc/include/asm/atomic_64.h
+--- linux-2.6.34.1/arch/sparc/include/asm/atomic_64.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/include/asm/atomic_64.h 2010-07-07 09:04:43.000000000 -0400
@@ -14,18 +14,39 @@
#define ATOMIC64_INIT(i) { (i) }
}
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.34/arch/sparc/include/asm/dma-mapping.h linux-2.6.34/arch/sparc/include/asm/dma-mapping.h
---- linux-2.6.34/arch/sparc/include/asm/dma-mapping.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/include/asm/dma-mapping.h 2010-07-03 09:57:51.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/include/asm/dma-mapping.h linux-2.6.34.1/arch/sparc/include/asm/dma-mapping.h
+--- linux-2.6.34.1/arch/sparc/include/asm/dma-mapping.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/include/asm/dma-mapping.h 2010-07-07 09:04:43.000000000 -0400
@@ -13,10 +13,10 @@ extern int dma_supported(struct device *
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
#define dma_is_consistent(d, h) (1)
debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
ops->free_coherent(dev, size, cpu_addr, dma_handle);
-diff -urNp linux-2.6.34/arch/sparc/include/asm/elf_32.h linux-2.6.34/arch/sparc/include/asm/elf_32.h
---- linux-2.6.34/arch/sparc/include/asm/elf_32.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/include/asm/elf_32.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/include/asm/elf_32.h linux-2.6.34.1/arch/sparc/include/asm/elf_32.h
+--- linux-2.6.34.1/arch/sparc/include/asm/elf_32.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/include/asm/elf_32.h 2010-07-07 09:04:43.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.34/arch/sparc/include/asm/elf_64.h linux-2.6.34/arch/sparc/include/asm/elf_64.h
---- linux-2.6.34/arch/sparc/include/asm/elf_64.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/include/asm/elf_64.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/include/asm/elf_64.h linux-2.6.34.1/arch/sparc/include/asm/elf_64.h
+--- linux-2.6.34.1/arch/sparc/include/asm/elf_64.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/include/asm/elf_64.h 2010-07-07 09:04:43.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.34/arch/sparc/include/asm/pgtable_32.h linux-2.6.34/arch/sparc/include/asm/pgtable_32.h
---- linux-2.6.34/arch/sparc/include/asm/pgtable_32.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/include/asm/pgtable_32.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/include/asm/pgtable_32.h linux-2.6.34.1/arch/sparc/include/asm/pgtable_32.h
+--- linux-2.6.34.1/arch/sparc/include/asm/pgtable_32.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/include/asm/pgtable_32.h 2010-07-07 09:04:43.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.34/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.34/arch/sparc/include/asm/pgtsrmmu.h
---- linux-2.6.34/arch/sparc/include/asm/pgtsrmmu.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/include/asm/pgtsrmmu.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.34.1/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-2.6.34.1/arch/sparc/include/asm/pgtsrmmu.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/include/asm/pgtsrmmu.h 2010-07-07 09:04:43.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.34/arch/sparc/include/asm/spinlock_64.h linux-2.6.34/arch/sparc/include/asm/spinlock_64.h
---- linux-2.6.34/arch/sparc/include/asm/spinlock_64.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/include/asm/spinlock_64.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/include/asm/spinlock_64.h linux-2.6.34.1/arch/sparc/include/asm/spinlock_64.h
+--- linux-2.6.34.1/arch/sparc/include/asm/spinlock_64.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/include/asm/spinlock_64.h 2010-07-07 09:04:43.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.34/arch/sparc/include/asm/uaccess_32.h linux-2.6.34/arch/sparc/include/asm/uaccess_32.h
---- linux-2.6.34/arch/sparc/include/asm/uaccess_32.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/include/asm/uaccess_32.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/include/asm/uaccess.h linux-2.6.34.1/arch/sparc/include/asm/uaccess.h
+--- linux-2.6.34.1/arch/sparc/include/asm/uaccess.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/include/asm/uaccess.h 2010-07-07 09:04:43.000000000 -0400
+@@ -1,5 +1,8 @@
+ #ifndef ___ASM_SPARC_UACCESS_H
+ #define ___ASM_SPARC_UACCESS_H
++
++extern void check_object_size(const void *ptr, unsigned long n, bool to);
++
+ #if defined(__sparc__) && defined(__arch64__)
+ #include <asm/uaccess_64.h>
+ #else
+diff -urNp linux-2.6.34.1/arch/sparc/include/asm/uaccess_32.h linux-2.6.34.1/arch/sparc/include/asm/uaccess_32.h
+--- linux-2.6.34.1/arch/sparc/include/asm/uaccess_32.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/include/asm/uaccess_32.h 2010-07-07 09:04:43.000000000 -0400
@@ -249,14 +249,25 @@ extern unsigned long __copy_user(void __
static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
return __copy_user((__force void __user *) to, from, n);
}
-diff -urNp linux-2.6.34/arch/sparc/include/asm/uaccess_64.h linux-2.6.34/arch/sparc/include/asm/uaccess_64.h
---- linux-2.6.34/arch/sparc/include/asm/uaccess_64.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/include/asm/uaccess_64.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/include/asm/uaccess_64.h linux-2.6.34.1/arch/sparc/include/asm/uaccess_64.h
+--- linux-2.6.34.1/arch/sparc/include/asm/uaccess_64.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/include/asm/uaccess_64.h 2010-07-07 09:04:43.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>
-@@ -204,6 +205,7 @@ __asm__ __volatile__( \
- : "=r" (x) : "r" (__m(addr)), "i" (retval))
-
- extern int __get_user_bad(void);
-+extern void check_object_size(const void *ptr, unsigned long n, bool to);
-
- extern void copy_from_user_overflow(void)
- #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
-@@ -224,6 +226,12 @@ copy_from_user(void *to, const void __us
+@@ -224,6 +225,12 @@ copy_from_user(void *to, const void __us
int sz = __compiletime_object_size(to);
unsigned long ret = size;
if (likely(sz == -1 || sz >= size)) {
ret = ___copy_from_user(to, from, size);
if (unlikely(ret))
-@@ -243,8 +251,15 @@ extern unsigned long copy_to_user_fixup(
+@@ -243,8 +250,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.34/arch/sparc/kernel/iommu.c linux-2.6.34/arch/sparc/kernel/iommu.c
---- linux-2.6.34/arch/sparc/kernel/iommu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/kernel/iommu.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/kernel/Makefile linux-2.6.34.1/arch/sparc/kernel/Makefile
+--- linux-2.6.34.1/arch/sparc/kernel/Makefile 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/kernel/Makefile 2010-07-07 09:04:43.000000000 -0400
+@@ -3,7 +3,7 @@
+ #
+
+ asflags-y := -ansi
+-ccflags-y := -Werror
++#ccflags-y := -Werror
+
+ extra-y := head_$(BITS).o
+ extra-y += init_task.o
+diff -urNp linux-2.6.34.1/arch/sparc/kernel/iommu.c linux-2.6.34.1/arch/sparc/kernel/iommu.c
+--- linux-2.6.34.1/arch/sparc/kernel/iommu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/kernel/iommu.c 2010-07-07 09:04:43.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.34/arch/sparc/kernel/ioport.c linux-2.6.34/arch/sparc/kernel/ioport.c
---- linux-2.6.34/arch/sparc/kernel/ioport.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/kernel/ioport.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/kernel/ioport.c linux-2.6.34.1/arch/sparc/kernel/ioport.c
+--- linux-2.6.34.1/arch/sparc/kernel/ioport.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/kernel/ioport.c 2010-07-07 09:04:43.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.34/arch/sparc/kernel/kgdb_32.c linux-2.6.34/arch/sparc/kernel/kgdb_32.c
---- linux-2.6.34/arch/sparc/kernel/kgdb_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/kernel/kgdb_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/kernel/kgdb_32.c linux-2.6.34.1/arch/sparc/kernel/kgdb_32.c
+--- linux-2.6.34.1/arch/sparc/kernel/kgdb_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/kernel/kgdb_32.c 2010-07-07 09:04:43.000000000 -0400
@@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
{
}
/* Breakpoint instruction: ta 0x7d */
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
};
-diff -urNp linux-2.6.34/arch/sparc/kernel/kgdb_64.c linux-2.6.34/arch/sparc/kernel/kgdb_64.c
---- linux-2.6.34/arch/sparc/kernel/kgdb_64.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/kernel/kgdb_64.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/kernel/kgdb_64.c linux-2.6.34.1/arch/sparc/kernel/kgdb_64.c
+--- linux-2.6.34.1/arch/sparc/kernel/kgdb_64.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/kernel/kgdb_64.c 2010-07-07 09:04:43.000000000 -0400
@@ -181,7 +181,7 @@ void kgdb_arch_exit(void)
{
}
/* Breakpoint instruction: ta 0x72 */
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
};
-diff -urNp linux-2.6.34/arch/sparc/kernel/Makefile linux-2.6.34/arch/sparc/kernel/Makefile
---- linux-2.6.34/arch/sparc/kernel/Makefile 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/kernel/Makefile 2010-07-01 20:45:14.000000000 -0400
-@@ -3,7 +3,7 @@
- #
-
- asflags-y := -ansi
--ccflags-y := -Werror
-+#ccflags-y := -Werror
-
- extra-y := head_$(BITS).o
- extra-y += init_task.o
-diff -urNp linux-2.6.34/arch/sparc/kernel/pci_sun4v.c linux-2.6.34/arch/sparc/kernel/pci_sun4v.c
---- linux-2.6.34/arch/sparc/kernel/pci_sun4v.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/kernel/pci_sun4v.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/kernel/pci_sun4v.c linux-2.6.34.1/arch/sparc/kernel/pci_sun4v.c
+--- linux-2.6.34.1/arch/sparc/kernel/pci_sun4v.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/kernel/pci_sun4v.c 2010-07-07 09:04:43.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.34/arch/sparc/kernel/sys_sparc_32.c linux-2.6.34/arch/sparc/kernel/sys_sparc_32.c
---- linux-2.6.34/arch/sparc/kernel/sys_sparc_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/kernel/sys_sparc_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/kernel/sys_sparc_32.c linux-2.6.34.1/arch/sparc/kernel/sys_sparc_32.c
+--- linux-2.6.34.1/arch/sparc/kernel/sys_sparc_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/kernel/sys_sparc_32.c 2010-07-07 09:04:43.000000000 -0400
@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
if (ARCH_SUN4C && len > 0x20000000)
return -ENOMEM;
if (flags & MAP_SHARED)
addr = COLOUR_ALIGN(addr);
-diff -urNp linux-2.6.34/arch/sparc/kernel/sys_sparc_64.c linux-2.6.34/arch/sparc/kernel/sys_sparc_64.c
---- linux-2.6.34/arch/sparc/kernel/sys_sparc_64.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/kernel/sys_sparc_64.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/kernel/sys_sparc_64.c linux-2.6.34.1/arch/sparc/kernel/sys_sparc_64.c
+--- linux-2.6.34.1/arch/sparc/kernel/sys_sparc_64.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/kernel/sys_sparc_64.c 2010-07-07 09:04:43.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.34/arch/sparc/kernel/traps_64.c linux-2.6.34/arch/sparc/kernel/traps_64.c
---- linux-2.6.34/arch/sparc/kernel/traps_64.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/kernel/traps_64.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/kernel/traps_64.c linux-2.6.34.1/arch/sparc/kernel/traps_64.c
+--- linux-2.6.34.1/arch/sparc/kernel/traps_64.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/kernel/traps_64.c 2010-07-07 09:04:43.000000000 -0400
@@ -94,6 +94,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.34/arch/sparc/lib/atomic_64.S linux-2.6.34/arch/sparc/lib/atomic_64.S
---- linux-2.6.34/arch/sparc/lib/atomic_64.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/lib/atomic_64.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/lib/atomic_64.S linux-2.6.34.1/arch/sparc/lib/atomic_64.S
+--- linux-2.6.34.1/arch/sparc/lib/atomic_64.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/lib/atomic_64.S 2010-07-07 09:04:44.000000000 -0400
@@ -18,7 +18,12 @@
atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
casx [%o1], %g1, %g7
cmp %g1, %g7
bne,pn %xcc, 2f
-diff -urNp linux-2.6.34/arch/sparc/lib/ksyms.c linux-2.6.34/arch/sparc/lib/ksyms.c
---- linux-2.6.34/arch/sparc/lib/ksyms.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/lib/ksyms.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/lib/ksyms.c linux-2.6.34.1/arch/sparc/lib/ksyms.c
+--- linux-2.6.34.1/arch/sparc/lib/ksyms.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/lib/ksyms.c 2010-07-07 09:04:44.000000000 -0400
@@ -142,12 +142,15 @@ EXPORT_SYMBOL(__downgrade_write);
/* Atomic counter implementation. */
EXPORT_SYMBOL(atomic64_sub_ret);
/* Atomic bit operations. */
-diff -urNp linux-2.6.34/arch/sparc/lib/rwsem_64.S linux-2.6.34/arch/sparc/lib/rwsem_64.S
---- linux-2.6.34/arch/sparc/lib/rwsem_64.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/lib/rwsem_64.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/lib/rwsem_64.S linux-2.6.34.1/arch/sparc/lib/rwsem_64.S
+--- linux-2.6.34.1/arch/sparc/lib/rwsem_64.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/lib/rwsem_64.S 2010-07-07 09:04:44.000000000 -0400
@@ -11,7 +11,12 @@
.globl __down_read
__down_read:
cas [%o0], %g3, %g7
cmp %g3, %g7
bne,pn %icc, 1b
-diff -urNp linux-2.6.34/arch/sparc/Makefile linux-2.6.34/arch/sparc/Makefile
---- linux-2.6.34/arch/sparc/Makefile 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/Makefile 2010-07-01 20:45:16.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_INIT := $(head-y) $(init-y)
--VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
-+VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
- VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
- VMLINUX_MAIN += $(drivers-y) $(net-y)
+diff -urNp linux-2.6.34.1/arch/sparc/mm/Makefile linux-2.6.34.1/arch/sparc/mm/Makefile
+--- linux-2.6.34.1/arch/sparc/mm/Makefile 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/mm/Makefile 2010-07-07 09:04:44.000000000 -0400
+@@ -2,7 +2,7 @@
+ #
-diff -urNp linux-2.6.34/arch/sparc/mm/fault_32.c linux-2.6.34/arch/sparc/mm/fault_32.c
---- linux-2.6.34/arch/sparc/mm/fault_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/mm/fault_32.c 2010-07-01 20:45:14.000000000 -0400
+ asflags-y := -ansi
+-ccflags-y := -Werror
++#ccflags-y := -Werror
+
+ obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
+ obj-y += fault_$(BITS).o
+diff -urNp linux-2.6.34.1/arch/sparc/mm/fault_32.c linux-2.6.34.1/arch/sparc/mm/fault_32.c
+--- linux-2.6.34.1/arch/sparc/mm/fault_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/mm/fault_32.c 2010-07-07 09:04:44.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.34/arch/sparc/mm/fault_64.c linux-2.6.34/arch/sparc/mm/fault_64.c
---- linux-2.6.34/arch/sparc/mm/fault_64.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/mm/fault_64.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/mm/fault_64.c linux-2.6.34.1/arch/sparc/mm/fault_64.c
+--- linux-2.6.34.1/arch/sparc/mm/fault_64.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/mm/fault_64.c 2010-07-07 09:04:44.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.34/arch/sparc/mm/init_32.c linux-2.6.34/arch/sparc/mm/init_32.c
---- linux-2.6.34/arch/sparc/mm/init_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/mm/init_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/mm/init_32.c linux-2.6.34.1/arch/sparc/mm/init_32.c
+--- linux-2.6.34.1/arch/sparc/mm/init_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/mm/init_32.c 2010-07-07 09:04:44.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.34/arch/sparc/mm/Makefile linux-2.6.34/arch/sparc/mm/Makefile
---- linux-2.6.34/arch/sparc/mm/Makefile 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/mm/Makefile 2010-07-01 20:45:14.000000000 -0400
-@@ -2,7 +2,7 @@
- #
-
- asflags-y := -ansi
--ccflags-y := -Werror
-+#ccflags-y := -Werror
-
- obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
- obj-y += fault_$(BITS).o
-diff -urNp linux-2.6.34/arch/sparc/mm/srmmu.c linux-2.6.34/arch/sparc/mm/srmmu.c
---- linux-2.6.34/arch/sparc/mm/srmmu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/sparc/mm/srmmu.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/sparc/mm/srmmu.c linux-2.6.34.1/arch/sparc/mm/srmmu.c
+--- linux-2.6.34.1/arch/sparc/mm/srmmu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/sparc/mm/srmmu.c 2010-07-07 09:04:44.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.34/arch/um/include/asm/kmap_types.h linux-2.6.34/arch/um/include/asm/kmap_types.h
---- linux-2.6.34/arch/um/include/asm/kmap_types.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/um/include/asm/kmap_types.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/um/include/asm/kmap_types.h linux-2.6.34.1/arch/um/include/asm/kmap_types.h
+--- linux-2.6.34.1/arch/um/include/asm/kmap_types.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/um/include/asm/kmap_types.h 2010-07-07 09:04:44.000000000 -0400
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
KM_TYPE_NR
};
-diff -urNp linux-2.6.34/arch/um/include/asm/page.h linux-2.6.34/arch/um/include/asm/page.h
---- linux-2.6.34/arch/um/include/asm/page.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/um/include/asm/page.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/um/include/asm/page.h linux-2.6.34.1/arch/um/include/asm/page.h
+--- linux-2.6.34.1/arch/um/include/asm/page.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/um/include/asm/page.h 2010-07-07 09:04:44.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.34/arch/um/sys-i386/syscalls.c linux-2.6.34/arch/um/sys-i386/syscalls.c
---- linux-2.6.34/arch/um/sys-i386/syscalls.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/um/sys-i386/syscalls.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/um/sys-i386/syscalls.c linux-2.6.34.1/arch/um/sys-i386/syscalls.c
+--- linux-2.6.34.1/arch/um/sys-i386/syscalls.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/um/sys-i386/syscalls.c 2010-07-07 09:04:44.000000000 -0400
@@ -11,6 +11,21 @@
#include "asm/uaccess.h"
#include "asm/unistd.h"
/*
* The prototype on i386 is:
*
-diff -urNp linux-2.6.34/arch/x86/boot/bitops.h linux-2.6.34/arch/x86/boot/bitops.h
---- linux-2.6.34/arch/x86/boot/bitops.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/boot/bitops.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/Kconfig linux-2.6.34.1/arch/x86/Kconfig
+--- linux-2.6.34.1/arch/x86/Kconfig 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/Kconfig 2010-07-07 09:04:46.000000000 -0400
+@@ -1123,7 +1123,7 @@ config PAGE_OFFSET
+ hex
+ default 0xB0000000 if VMSPLIT_3G_OPT
+ default 0x80000000 if VMSPLIT_2G
+- default 0x78000000 if VMSPLIT_2G_OPT
++ default 0x70000000 if VMSPLIT_2G_OPT
+ default 0x40000000 if VMSPLIT_1G
+ default 0xC0000000
+ depends on X86_32
+@@ -1457,7 +1457,7 @@ config ARCH_USES_PG_UNCACHED
+
+ config EFI
+ bool "EFI runtime service support"
+- depends on ACPI
++ depends on ACPI && !PAX_KERNEXEC
+ ---help---
+ This enables the kernel to use EFI runtime services that are
+ available (such as the EFI variable services).
+@@ -1544,6 +1544,7 @@ config KEXEC_JUMP
+ config PHYSICAL_START
+ hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
+ default "0x1000000"
++ range 0x400000 0x40000000
+ ---help---
+ This gives the physical address where the kernel is loaded.
+
+@@ -1608,6 +1609,7 @@ config PHYSICAL_ALIGN
+ hex
+ prompt "Alignment value to which kernel should be aligned" if X86_32
+ default "0x1000000"
++ range 0x400000 0x1000000 if PAX_KERNEXEC
+ range 0x2000 0x1000000
+ ---help---
+ This value puts the alignment restrictions on physical address
+@@ -1639,9 +1641,10 @@ config HOTPLUG_CPU
+ Say N if you want to disable CPU hotplug.
+
+ config COMPAT_VDSO
+- def_bool y
++ def_bool n
+ prompt "Compat VDSO support"
+ depends on X86_32 || IA32_EMULATION
++ depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
+ ---help---
+ Map the 32-bit VDSO to the predictable old-style address too.
+
+diff -urNp linux-2.6.34.1/arch/x86/Kconfig.cpu linux-2.6.34.1/arch/x86/Kconfig.cpu
+--- linux-2.6.34.1/arch/x86/Kconfig.cpu 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/Kconfig.cpu 2010-07-07 09:04:46.000000000 -0400
+@@ -336,7 +336,7 @@ config X86_PPRO_FENCE
+
+ config X86_F00F_BUG
+ def_bool y
+- depends on M586MMX || M586TSC || M586 || M486 || M386
++ depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
+
+ config X86_WP_WORKS_OK
+ def_bool y
+@@ -356,7 +356,7 @@ config X86_POPAD_OK
+
+ config X86_ALIGNMENT_16
+ def_bool y
+- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
++ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
+
+ config X86_INTEL_USERCOPY
+ def_bool y
+@@ -402,7 +402,7 @@ config X86_CMPXCHG64
+ # generates cmov.
+ config X86_CMOV
+ def_bool y
+- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
++ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
+
+ config X86_MINIMUM_CPU_FAMILY
+ int
+diff -urNp linux-2.6.34.1/arch/x86/Kconfig.debug linux-2.6.34.1/arch/x86/Kconfig.debug
+--- linux-2.6.34.1/arch/x86/Kconfig.debug 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/Kconfig.debug 2010-07-07 09:04:46.000000000 -0400
+@@ -99,7 +99,7 @@ config X86_PTDUMP
+ config DEBUG_RODATA
+ bool "Write protect kernel read-only data structures"
+ default y
+- depends on DEBUG_KERNEL
++ depends on DEBUG_KERNEL && BROKEN
+ ---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.34.1/arch/x86/Makefile linux-2.6.34.1/arch/x86/Makefile
+--- linux-2.6.34.1/arch/x86/Makefile 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/Makefile 2010-07-07 09:04:49.000000000 -0400
+@@ -190,3 +190,12 @@ define archhelp
+ echo ' FDARGS="..." arguments for the booted kernel'
+ echo ' FDINITRD=file initrd for the booted kernel'
+ endef
++
++define OLD_LD
++
++*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
++*** Please upgrade your binutils to 2.18 or newer
++endef
++
++archprepare:
++ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
+diff -urNp linux-2.6.34.1/arch/x86/boot/bitops.h linux-2.6.34.1/arch/x86/boot/bitops.h
+--- linux-2.6.34.1/arch/x86/boot/bitops.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/boot/bitops.h 2010-07-07 09:04:44.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.34/arch/x86/boot/boot.h linux-2.6.34/arch/x86/boot/boot.h
---- linux-2.6.34/arch/x86/boot/boot.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/boot/boot.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/boot/boot.h linux-2.6.34.1/arch/x86/boot/boot.h
+--- linux-2.6.34.1/arch/x86/boot/boot.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/boot/boot.h 2010-07-07 09:04:44.000000000 -0400
@@ -82,7 +82,7 @@ static inline void io_delay(void)
static inline u16 ds(void)
{
: "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
return diff;
}
-diff -urNp linux-2.6.34/arch/x86/boot/compressed/head_32.S linux-2.6.34/arch/x86/boot/compressed/head_32.S
---- linux-2.6.34/arch/x86/boot/compressed/head_32.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/boot/compressed/head_32.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/boot/compressed/head_32.S linux-2.6.34.1/arch/x86/boot/compressed/head_32.S
+--- linux-2.6.34.1/arch/x86/boot/compressed/head_32.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/boot/compressed/head_32.S 2010-07-07 09:04:44.000000000 -0400
@@ -76,7 +76,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
jmp 1b
2:
-diff -urNp linux-2.6.34/arch/x86/boot/compressed/head_64.S linux-2.6.34/arch/x86/boot/compressed/head_64.S
---- linux-2.6.34/arch/x86/boot/compressed/head_64.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/boot/compressed/head_64.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/boot/compressed/head_64.S linux-2.6.34.1/arch/x86/boot/compressed/head_64.S
+--- linux-2.6.34.1/arch/x86/boot/compressed/head_64.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/boot/compressed/head_64.S 2010-07-07 09:04:45.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.34/arch/x86/boot/compressed/misc.c linux-2.6.34/arch/x86/boot/compressed/misc.c
---- linux-2.6.34/arch/x86/boot/compressed/misc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/boot/compressed/misc.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/boot/compressed/misc.c linux-2.6.34.1/arch/x86/boot/compressed/misc.c
+--- linux-2.6.34.1/arch/x86/boot/compressed/misc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/boot/compressed/misc.c 2010-07-07 09:04:45.000000000 -0400
@@ -285,7 +285,7 @@ static void parse_elf(void *output)
case PT_LOAD:
#ifdef CONFIG_RELOCATABLE
error("Wrong destination address");
#endif
-diff -urNp linux-2.6.34/arch/x86/boot/compressed/mkpiggy.c linux-2.6.34/arch/x86/boot/compressed/mkpiggy.c
---- linux-2.6.34/arch/x86/boot/compressed/mkpiggy.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/boot/compressed/mkpiggy.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/boot/compressed/mkpiggy.c linux-2.6.34.1/arch/x86/boot/compressed/mkpiggy.c
+--- linux-2.6.34.1/arch/x86/boot/compressed/mkpiggy.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/boot/compressed/mkpiggy.c 2010-07-07 09:04:45.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.34/arch/x86/boot/compressed/relocs.c linux-2.6.34/arch/x86/boot/compressed/relocs.c
---- linux-2.6.34/arch/x86/boot/compressed/relocs.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/boot/compressed/relocs.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/boot/compressed/relocs.c linux-2.6.34.1/arch/x86/boot/compressed/relocs.c
+--- linux-2.6.34.1/arch/x86/boot/compressed/relocs.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/boot/compressed/relocs.c 2010-07-07 09:04:45.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.34/arch/x86/boot/cpucheck.c linux-2.6.34/arch/x86/boot/cpucheck.c
---- linux-2.6.34/arch/x86/boot/cpucheck.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/boot/cpucheck.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/boot/cpucheck.c linux-2.6.34.1/arch/x86/boot/cpucheck.c
+--- linux-2.6.34.1/arch/x86/boot/cpucheck.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/boot/cpucheck.c 2010-07-07 09:04:45.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.34/arch/x86/boot/header.S linux-2.6.34/arch/x86/boot/header.S
---- linux-2.6.34/arch/x86/boot/header.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/boot/header.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/boot/header.S linux-2.6.34.1/arch/x86/boot/header.S
+--- linux-2.6.34.1/arch/x86/boot/header.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/boot/header.S 2010-07-07 09:04:45.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.34/arch/x86/boot/memory.c linux-2.6.34/arch/x86/boot/memory.c
---- linux-2.6.34/arch/x86/boot/memory.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/boot/memory.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/boot/memory.c linux-2.6.34.1/arch/x86/boot/memory.c
+--- linux-2.6.34.1/arch/x86/boot/memory.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/boot/memory.c 2010-07-07 09:04:45.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.34/arch/x86/boot/video.c linux-2.6.34/arch/x86/boot/video.c
---- linux-2.6.34/arch/x86/boot/video.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/boot/video.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/boot/video-vesa.c linux-2.6.34.1/arch/x86/boot/video-vesa.c
+--- linux-2.6.34.1/arch/x86/boot/video-vesa.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/boot/video-vesa.c 2010-07-07 09:04:45.000000000 -0400
+@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
+
+ boot_params.screen_info.vesapm_seg = oreg.es;
+ boot_params.screen_info.vesapm_off = oreg.di;
++ boot_params.screen_info.vesapm_size = oreg.cx;
+ }
+
+ /*
+diff -urNp linux-2.6.34.1/arch/x86/boot/video.c linux-2.6.34.1/arch/x86/boot/video.c
+--- linux-2.6.34.1/arch/x86/boot/video.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/boot/video.c 2010-07-07 09:04:45.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.34/arch/x86/boot/video-vesa.c linux-2.6.34/arch/x86/boot/video-vesa.c
---- linux-2.6.34/arch/x86/boot/video-vesa.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/boot/video-vesa.c 2010-07-01 20:45:14.000000000 -0400
-@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
-
- boot_params.screen_info.vesapm_seg = oreg.es;
- boot_params.screen_info.vesapm_off = oreg.di;
-+ boot_params.screen_info.vesapm_size = oreg.cx;
+diff -urNp linux-2.6.34.1/arch/x86/ia32/ia32_signal.c linux-2.6.34.1/arch/x86/ia32/ia32_signal.c
+--- linux-2.6.34.1/arch/x86/ia32/ia32_signal.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/ia32/ia32_signal.c 2010-07-07 09:04:45.000000000 -0400
+@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
+ sp -= frame_size;
+ /* Align the stack pointer according to the i386 ABI,
+ * i.e. so that on function entry ((sp + 4) & 15) == 0. */
+- sp = ((sp + 4) & -16ul) - 4;
++ sp = ((sp - 12) & -16ul) - 4;
+ return (void __user *) sp;
}
- /*
-diff -urNp linux-2.6.34/arch/x86/ia32/ia32entry.S linux-2.6.34/arch/x86/ia32/ia32entry.S
---- linux-2.6.34/arch/x86/ia32/ia32entry.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/ia32/ia32entry.S 2010-07-01 20:45:14.000000000 -0400
+@@ -503,7 +503,7 @@ int ia32_setup_rt_frame(int sig, struct
+ 0xb8,
+ __NR_ia32_rt_sigreturn,
+ 0x80cd,
+- 0,
++ 0
+ };
+
+ frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
+diff -urNp linux-2.6.34.1/arch/x86/ia32/ia32entry.S linux-2.6.34.1/arch/x86/ia32/ia32entry.S
+--- linux-2.6.34.1/arch/x86/ia32/ia32entry.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/ia32/ia32entry.S 2010-07-07 09:04:45.000000000 -0400
@@ -13,6 +13,7 @@
#include <asm/thread_info.h>
#include <asm/segment.h>
/*
* No need to follow this irqs on/off section: the syscall
* disabled irqs and here we enable it straight after entry:
-diff -urNp linux-2.6.34/arch/x86/ia32/ia32_signal.c linux-2.6.34/arch/x86/ia32/ia32_signal.c
---- linux-2.6.34/arch/x86/ia32/ia32_signal.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/ia32/ia32_signal.c 2010-07-01 20:45:14.000000000 -0400
-@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
- sp -= frame_size;
- /* Align the stack pointer according to the i386 ABI,
- * i.e. so that on function entry ((sp + 4) & 15) == 0. */
-- sp = ((sp + 4) & -16ul) - 4;
-+ sp = ((sp - 12) & -16ul) - 4;
- return (void __user *) sp;
- }
-
-@@ -503,7 +503,7 @@ int ia32_setup_rt_frame(int sig, struct
- 0xb8,
- __NR_ia32_rt_sigreturn,
- 0x80cd,
-- 0,
-+ 0
- };
-
- frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
-diff -urNp linux-2.6.34/arch/x86/include/asm/alternative.h linux-2.6.34/arch/x86/include/asm/alternative.h
---- linux-2.6.34/arch/x86/include/asm/alternative.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/alternative.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/alternative.h linux-2.6.34.1/arch/x86/include/asm/alternative.h
+--- linux-2.6.34.1/arch/x86/include/asm/alternative.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/alternative.h 2010-07-07 09:04:45.000000000 -0400
@@ -91,7 +91,7 @@ static inline int alternatives_text_rese
" .byte 664f-663f\n" /* replacementlen */ \
" .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \
"663:\n\t" newinstr "\n664:\n" /* replacement */ \
".previous"
-diff -urNp linux-2.6.34/arch/x86/include/asm/apm.h linux-2.6.34/arch/x86/include/asm/apm.h
---- linux-2.6.34/arch/x86/include/asm/apm.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/apm.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/apm.h linux-2.6.34.1/arch/x86/include/asm/apm.h
+--- linux-2.6.34.1/arch/x86/include/asm/apm.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/apm.h 2010-07-07 09:04:45.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.34/arch/x86/include/asm/asm.h linux-2.6.34/arch/x86/include/asm/asm.h
---- linux-2.6.34/arch/x86/include/asm/asm.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/asm.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/asm.h linux-2.6.34.1/arch/x86/include/asm/asm.h
+--- linux-2.6.34.1/arch/x86/include/asm/asm.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/asm.h 2010-07-07 09:04:45.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.34/arch/x86/include/asm/atomic64_32.h linux-2.6.34/arch/x86/include/asm/atomic64_32.h
---- linux-2.6.34/arch/x86/include/asm/atomic64_32.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/atomic64_32.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/atomic.h linux-2.6.34.1/arch/x86/include/asm/atomic.h
+--- linux-2.6.34.1/arch/x86/include/asm/atomic.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/atomic.h 2010-07-07 09:04:45.000000000 -0400
+@@ -26,6 +26,17 @@ static inline int atomic_read(const atom
+ }
+
+ /**
++ * atomic_read_unchecked - read atomic variable
++ * @v: pointer of type atomic_unchecked_t
++ *
++ * Atomically reads the value of @v.
++ */
++static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
++{
++ return v->counter;
++}
++
++/**
+ * atomic_set - set atomic variable
+ * @v: pointer of type atomic_t
+ * @i: required value
+@@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t *
+ }
+
+ /**
++ * atomic_set_unchecked - set atomic variable
++ * @v: pointer of type atomic_unchecked_t
++ * @i: required value
++ *
++ * Atomically sets the value of @v to @i.
++ */
++static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
++{
++ v->counter = i;
++}
++
++/**
+ * atomic_add - add integer to atomic variable
+ * @i: integer value to add
+ * @v: pointer of type atomic_t
+@@ -46,7 +69,29 @@ static inline void atomic_set(atomic_t *
+ */
+ static inline void atomic_add(int i, atomic_t *v)
+ {
+- asm volatile(LOCK_PREFIX "addl %1,%0"
++ asm volatile(LOCK_PREFIX "addl %1,%0\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++ "jno 0f\n"
++ LOCK_PREFIX "subl %1,%0\n"
++ _ASM_INTO "\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
++#endif
++
++ : "+m" (v->counter)
++ : "ir" (i));
++}
++
++/**
++ * atomic_add_unchecked - add integer to atomic variable
++ * @i: integer value to add
++ * @v: pointer of type atomic_unchecked_t
++ *
++ * Atomically adds @i to @v.
++ */
++static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
++{
++ asm volatile(LOCK_PREFIX "addl %1,%0\n"
+ : "+m" (v->counter)
+ : "ir" (i));
+ }
+@@ -60,7 +105,29 @@ static inline void atomic_add(int i, ato
+ */
+ static inline void atomic_sub(int i, atomic_t *v)
+ {
+- asm volatile(LOCK_PREFIX "subl %1,%0"
++ asm volatile(LOCK_PREFIX "subl %1,%0\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++ "jno 0f\n"
++ LOCK_PREFIX "addl %1,%0\n"
++ _ASM_INTO "\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
++#endif
++
++ : "+m" (v->counter)
++ : "ir" (i));
++}
++
++/**
++ * atomic_sub_unchecked - subtract integer from atomic variable
++ * @i: integer value to subtract
++ * @v: pointer of type atomic_t
++ *
++ * Atomically subtracts @i from @v.
++ */
++static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
++{
++ asm volatile(LOCK_PREFIX "subl %1,%0\n"
+ : "+m" (v->counter)
+ : "ir" (i));
+ }
+@@ -78,7 +145,16 @@ static inline int atomic_sub_and_test(in
+ {
+ unsigned char c;
+
+- asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
++ asm volatile(LOCK_PREFIX "subl %2,%0\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++ "jno 0f\n"
++ LOCK_PREFIX "addl %2,%0\n"
++ _ASM_INTO "\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
++#endif
++
++ "sete %1\n"
+ : "+m" (v->counter), "=qm" (c)
+ : "ir" (i) : "memory");
+ return c;
+@@ -92,7 +168,27 @@ static inline int atomic_sub_and_test(in
+ */
+ static inline void atomic_inc(atomic_t *v)
+ {
+- asm volatile(LOCK_PREFIX "incl %0"
++ asm volatile(LOCK_PREFIX "incl %0\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++ "jno 0f\n"
++ LOCK_PREFIX "decl %0\n"
++ _ASM_INTO "\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
++#endif
++
++ : "+m" (v->counter));
++}
++
++/**
++ * atomic_inc_unchecked - increment atomic variable
++ * @v: pointer of type atomic_unchecked_t
++ *
++ * Atomically increments @v by 1.
++ */
++static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
++{
++ asm volatile(LOCK_PREFIX "incl %0\n"
+ : "+m" (v->counter));
+ }
+
+@@ -104,7 +200,27 @@ static inline void atomic_inc(atomic_t *
+ */
+ static inline void atomic_dec(atomic_t *v)
+ {
+- asm volatile(LOCK_PREFIX "decl %0"
++ asm volatile(LOCK_PREFIX "decl %0\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++ "jno 0f\n"
++ LOCK_PREFIX "incl %0\n"
++ _ASM_INTO "\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
++#endif
++
++ : "+m" (v->counter));
++}
++
++/**
++ * atomic_dec_unchecked - decrement atomic variable
++ * @v: pointer of type atomic_t
++ *
++ * Atomically decrements @v by 1.
++ */
++static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
++{
++ asm volatile(LOCK_PREFIX "decl %0\n"
+ : "+m" (v->counter));
+ }
+
+@@ -120,7 +236,16 @@ static inline int atomic_dec_and_test(at
+ {
+ unsigned char c;
+
+- asm volatile(LOCK_PREFIX "decl %0; sete %1"
++ asm volatile(LOCK_PREFIX "decl %0\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++ "jno 0f\n"
++ LOCK_PREFIX "incl %0\n"
++ _ASM_INTO "\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
++#endif
++
++ "sete %1\n"
+ : "+m" (v->counter), "=qm" (c)
+ : : "memory");
+ return c != 0;
+@@ -138,7 +263,16 @@ static inline int atomic_inc_and_test(at
+ {
+ unsigned char c;
+
+- asm volatile(LOCK_PREFIX "incl %0; sete %1"
++ asm volatile(LOCK_PREFIX "incl %0\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++ "jno 0f\n"
++ LOCK_PREFIX "decl %0\n"
++ _ASM_INTO "\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
++#endif
++
++ "sete %1\n"
+ : "+m" (v->counter), "=qm" (c)
+ : : "memory");
+ return c != 0;
+@@ -157,7 +291,16 @@ static inline int atomic_add_negative(in
+ {
+ unsigned char c;
+
+- asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
++ asm volatile(LOCK_PREFIX "addl %2,%0\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++ "jno 0f\n"
++ LOCK_PREFIX "subl %2,%0\n"
++ _ASM_INTO "\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
++#endif
++
++ "sets %1\n"
+ : "+m" (v->counter), "=qm" (c)
+ : "ir" (i) : "memory");
+ return c;
+@@ -180,6 +323,46 @@ static inline int atomic_add_return(int
+ #endif
+ /* Modern 486+ processor */
+ __i = i;
++ asm volatile(LOCK_PREFIX "xaddl %0, %1\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++ "jno 0f\n"
++ "movl %0, %1\n"
++ _ASM_INTO "\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
++#endif
++
++ : "+r" (i), "+m" (v->counter)
++ : : "memory");
++ return i + __i;
++
++#ifdef CONFIG_M386
++no_xadd: /* Legacy 386 processor */
++ local_irq_save(flags);
++ __i = atomic_read(v);
++ atomic_set(v, i + __i);
++ local_irq_restore(flags);
++ return i + __i;
++#endif
++}
++
++/**
++ * atomic_add_return_unchecked - add integer and return
++ * @v: pointer of type atomic_unchecked_t
++ * @i: integer value to add
++ *
++ * Atomically adds @i to @v and returns @i + @v
++ */
++static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
++{
++ int __i;
++#ifdef CONFIG_M386
++ unsigned long flags;
++ if (unlikely(boot_cpu_data.x86 <= 3))
++ goto no_xadd;
++#endif
++ /* Modern 486+ processor */
++ __i = i;
+ asm volatile(LOCK_PREFIX "xaddl %0, %1"
+ : "+r" (i), "+m" (v->counter)
+ : : "memory");
+@@ -208,6 +391,7 @@ static inline int atomic_sub_return(int
+ }
+
+ #define atomic_inc_return(v) (atomic_add_return(1, v))
++#define atomic_inc_return_unchecked(v) (atomic_add_return_unchecked(1, v))
+ #define atomic_dec_return(v) (atomic_sub_return(1, v))
+
+ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
+@@ -231,17 +415,29 @@ static inline int atomic_xchg(atomic_t *
+ */
+ static inline int atomic_add_unless(atomic_t *v, int a, int u)
+ {
+- int c, old;
++ int c, old, new;
+ c = atomic_read(v);
+ for (;;) {
+- if (unlikely(c == (u)))
++ if (unlikely(c == u))
+ break;
+- old = atomic_cmpxchg((v), c, c + (a));
++
++ asm volatile("addl %2,%0\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++ "jno 0f\n"
++ _ASM_INTO "\n0:\n"
++ _ASM_EXTABLE(0b, 0b)
++#endif
++
++ : "=r" (new)
++ : "0" (c), "ir" (a));
++
++ old = atomic_cmpxchg(v, c, new);
+ if (likely(old == c))
+ break;
+ c = old;
+ }
+- return c != (u);
++ return c != u;
+ }
+
+ #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/atomic64_32.h linux-2.6.34.1/arch/x86/include/asm/atomic64_32.h
+--- linux-2.6.34.1/arch/x86/include/asm/atomic64_32.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/atomic64_32.h 2010-07-07 09:04:45.000000000 -0400
@@ -12,6 +12,14 @@ typedef struct {
u64 __aligned(8) counter;
} atomic64_t;
#define ATOMIC64_INIT(val) { (val) }
extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
-diff -urNp linux-2.6.34/arch/x86/include/asm/atomic64_64.h linux-2.6.34/arch/x86/include/asm/atomic64_64.h
---- linux-2.6.34/arch/x86/include/asm/atomic64_64.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/atomic64_64.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/atomic64_64.h linux-2.6.34.1/arch/x86/include/asm/atomic64_64.h
+--- linux-2.6.34.1/arch/x86/include/asm/atomic64_64.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/atomic64_64.h 2010-07-07 09:04:45.000000000 -0400
@@ -22,6 +22,18 @@ static inline long atomic64_read(const a
}
}
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.34/arch/x86/include/asm/atomic.h linux-2.6.34/arch/x86/include/asm/atomic.h
---- linux-2.6.34/arch/x86/include/asm/atomic.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/atomic.h 2010-07-01 20:45:14.000000000 -0400
-@@ -26,6 +26,17 @@ static inline int atomic_read(const atom
- }
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/boot.h linux-2.6.34.1/arch/x86/include/asm/boot.h
+--- linux-2.6.34.1/arch/x86/include/asm/boot.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/boot.h 2010-07-07 09:04:45.000000000 -0400
+@@ -11,10 +11,15 @@
+ #include <asm/pgtable_types.h>
- /**
-+ * atomic_read_unchecked - read atomic variable
-+ * @v: pointer of type atomic_unchecked_t
-+ *
-+ * Atomically reads the value of @v.
-+ */
-+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
-+{
-+ return v->counter;
-+}
-+
-+/**
- * atomic_set - set atomic variable
- * @v: pointer of type atomic_t
- * @i: required value
-@@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t *
- }
+ /* Physical address where kernel should be loaded. */
+-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
++#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
+ + (CONFIG_PHYSICAL_ALIGN - 1)) \
+ & ~(CONFIG_PHYSICAL_ALIGN - 1))
- /**
-+ * atomic_set_unchecked - set atomic variable
-+ * @v: pointer of type atomic_unchecked_t
-+ * @i: required value
-+ *
-+ * Atomically sets the value of @v to @i.
-+ */
-+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
-+{
-+ v->counter = i;
-+}
-+
-+/**
- * atomic_add - add integer to atomic variable
- * @i: integer value to add
- * @v: pointer of type atomic_t
-@@ -46,7 +69,29 @@ static inline void atomic_set(atomic_t *
- */
- static inline void atomic_add(int i, atomic_t *v)
- {
-- asm volatile(LOCK_PREFIX "addl %1,%0"
-+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "jno 0f\n"
-+ LOCK_PREFIX "subl %1,%0\n"
-+ _ASM_INTO "\n0:\n"
-+ _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+ : "+m" (v->counter)
-+ : "ir" (i));
-+}
-+
-+/**
-+ * atomic_add_unchecked - add integer to atomic variable
-+ * @i: integer value to add
-+ * @v: pointer of type atomic_unchecked_t
-+ *
-+ * Atomically adds @i to @v.
-+ */
-+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
-+{
-+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
- : "+m" (v->counter)
- : "ir" (i));
- }
-@@ -60,7 +105,29 @@ static inline void atomic_add(int i, ato
- */
- static inline void atomic_sub(int i, atomic_t *v)
- {
-- asm volatile(LOCK_PREFIX "subl %1,%0"
-+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "jno 0f\n"
-+ LOCK_PREFIX "addl %1,%0\n"
-+ _ASM_INTO "\n0:\n"
-+ _ASM_EXTABLE(0b, 0b)
++#ifndef __ASSEMBLY__
++extern unsigned char __LOAD_PHYSICAL_ADDR[];
++#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
+#endif
+
-+ : "+m" (v->counter)
-+ : "ir" (i));
-+}
-+
-+/**
-+ * atomic_sub_unchecked - subtract integer from atomic variable
-+ * @i: integer value to subtract
-+ * @v: pointer of type atomic_t
-+ *
-+ * Atomically subtracts @i from @v.
-+ */
-+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
-+{
-+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
- : "+m" (v->counter)
- : "ir" (i));
- }
-@@ -78,7 +145,16 @@ static inline int atomic_sub_and_test(in
+ /* Minimum kernel alignment, as a power of two */
+ #ifdef CONFIG_X86_64
+ #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/cache.h linux-2.6.34.1/arch/x86/include/asm/cache.h
+--- linux-2.6.34.1/arch/x86/include/asm/cache.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/cache.h 2010-07-07 09:04:45.000000000 -0400
+@@ -8,6 +8,7 @@
+ #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
+
+ #define __read_mostly __attribute__((__section__(".data.read_mostly")))
++#define __read_only __attribute__((__section__(".data.read_only")))
+
+ #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
+ #define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/cacheflush.h linux-2.6.34.1/arch/x86/include/asm/cacheflush.h
+--- linux-2.6.34.1/arch/x86/include/asm/cacheflush.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/cacheflush.h 2010-07-07 09:04:45.000000000 -0400
+@@ -61,7 +61,7 @@ PAGEFLAG(WC, WC)
+ static inline unsigned long get_page_memtype(struct page *pg)
{
- unsigned char c;
+ if (!PageUncached(pg) && !PageWC(pg))
+- return -1;
++ return ~0UL;
+ else if (!PageUncached(pg) && PageWC(pg))
+ return _PAGE_CACHE_WC;
+ else if (PageUncached(pg) && !PageWC(pg))
+@@ -86,7 +86,7 @@ static inline void set_page_memtype(stru
+ SetPageWC(pg);
+ break;
+ default:
+- case -1:
++ case ~0UL:
+ ClearPageUncached(pg);
+ ClearPageWC(pg);
+ break;
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/checksum_32.h linux-2.6.34.1/arch/x86/include/asm/checksum_32.h
+--- linux-2.6.34.1/arch/x86/include/asm/checksum_32.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/checksum_32.h 2010-07-07 09:04:45.000000000 -0400
+@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
+ int len, __wsum sum,
+ int *src_err_ptr, int *dst_err_ptr);
-- asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
-+ asm volatile(LOCK_PREFIX "subl %2,%0\n"
++asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
++ int len, __wsum sum,
++ int *src_err_ptr, int *dst_err_ptr);
+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "jno 0f\n"
-+ LOCK_PREFIX "addl %2,%0\n"
-+ _ASM_INTO "\n0:\n"
-+ _ASM_EXTABLE(0b, 0b)
-+#endif
++asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
++ int len, __wsum sum,
++ int *src_err_ptr, int *dst_err_ptr);
+
-+ "sete %1\n"
- : "+m" (v->counter), "=qm" (c)
- : "ir" (i) : "memory");
- return c;
-@@ -92,7 +168,27 @@ static inline int atomic_sub_and_test(in
- */
- static inline void atomic_inc(atomic_t *v)
+ /*
+ * Note: when you get a NULL pointer exception here this means someone
+ * passed in an incorrect kernel address to one of these functions.
+@@ -50,7 +58,7 @@ static inline __wsum csum_partial_copy_f
+ int *err_ptr)
{
-- asm volatile(LOCK_PREFIX "incl %0"
-+ asm volatile(LOCK_PREFIX "incl %0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "jno 0f\n"
-+ LOCK_PREFIX "decl %0\n"
-+ _ASM_INTO "\n0:\n"
-+ _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+ : "+m" (v->counter));
-+}
-+
-+/**
-+ * atomic_inc_unchecked - increment atomic variable
-+ * @v: pointer of type atomic_unchecked_t
-+ *
-+ * Atomically increments @v by 1.
-+ */
-+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
-+{
-+ asm volatile(LOCK_PREFIX "incl %0\n"
- : "+m" (v->counter));
- }
-
-@@ -104,7 +200,27 @@ static inline void atomic_inc(atomic_t *
- */
- static inline void atomic_dec(atomic_t *v)
- {
-- asm volatile(LOCK_PREFIX "decl %0"
-+ asm volatile(LOCK_PREFIX "decl %0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "jno 0f\n"
-+ LOCK_PREFIX "incl %0\n"
-+ _ASM_INTO "\n0:\n"
-+ _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+ : "+m" (v->counter));
-+}
-+
-+/**
-+ * atomic_dec_unchecked - decrement atomic variable
-+ * @v: pointer of type atomic_t
-+ *
-+ * Atomically decrements @v by 1.
-+ */
-+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
-+{
-+ asm volatile(LOCK_PREFIX "decl %0\n"
- : "+m" (v->counter));
- }
-
-@@ -120,7 +236,16 @@ static inline int atomic_dec_and_test(at
- {
- unsigned char c;
-
-- asm volatile(LOCK_PREFIX "decl %0; sete %1"
-+ asm volatile(LOCK_PREFIX "decl %0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "jno 0f\n"
-+ LOCK_PREFIX "incl %0\n"
-+ _ASM_INTO "\n0:\n"
-+ _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+ "sete %1\n"
- : "+m" (v->counter), "=qm" (c)
- : : "memory");
- return c != 0;
-@@ -138,7 +263,16 @@ static inline int atomic_inc_and_test(at
- {
- unsigned char c;
-
-- asm volatile(LOCK_PREFIX "incl %0; sete %1"
-+ asm volatile(LOCK_PREFIX "incl %0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "jno 0f\n"
-+ LOCK_PREFIX "decl %0\n"
-+ _ASM_INTO "\n0:\n"
-+ _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+ "sete %1\n"
- : "+m" (v->counter), "=qm" (c)
- : : "memory");
- return c != 0;
-@@ -157,7 +291,16 @@ static inline int atomic_add_negative(in
- {
- unsigned char c;
-
-- asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
-+ asm volatile(LOCK_PREFIX "addl %2,%0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "jno 0f\n"
-+ LOCK_PREFIX "subl %2,%0\n"
-+ _ASM_INTO "\n0:\n"
-+ _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+ "sets %1\n"
- : "+m" (v->counter), "=qm" (c)
- : "ir" (i) : "memory");
- return c;
-@@ -180,6 +323,46 @@ static inline int atomic_add_return(int
- #endif
- /* Modern 486+ processor */
- __i = i;
-+ asm volatile(LOCK_PREFIX "xaddl %0, %1\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "jno 0f\n"
-+ "movl %0, %1\n"
-+ _ASM_INTO "\n0:\n"
-+ _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+ : "+r" (i), "+m" (v->counter)
-+ : : "memory");
-+ return i + __i;
-+
-+#ifdef CONFIG_M386
-+no_xadd: /* Legacy 386 processor */
-+ local_irq_save(flags);
-+ __i = atomic_read(v);
-+ atomic_set(v, i + __i);
-+ local_irq_restore(flags);
-+ return i + __i;
-+#endif
-+}
-+
-+/**
-+ * atomic_add_return_unchecked - add integer and return
-+ * @v: pointer of type atomic_unchecked_t
-+ * @i: integer value to add
-+ *
-+ * Atomically adds @i to @v and returns @i + @v
-+ */
-+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
-+{
-+ int __i;
-+#ifdef CONFIG_M386
-+ unsigned long flags;
-+ if (unlikely(boot_cpu_data.x86 <= 3))
-+ goto no_xadd;
-+#endif
-+ /* Modern 486+ processor */
-+ __i = i;
- asm volatile(LOCK_PREFIX "xaddl %0, %1"
- : "+r" (i), "+m" (v->counter)
- : : "memory");
-@@ -208,6 +391,7 @@ static inline int atomic_sub_return(int
- }
-
- #define atomic_inc_return(v) (atomic_add_return(1, v))
-+#define atomic_inc_return_unchecked(v) (atomic_add_return_unchecked(1, v))
- #define atomic_dec_return(v) (atomic_sub_return(1, v))
-
- static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
-@@ -231,17 +415,29 @@ static inline int atomic_xchg(atomic_t *
- */
- static inline int atomic_add_unless(atomic_t *v, int a, int u)
- {
-- int c, old;
-+ int c, old, new;
- c = atomic_read(v);
- for (;;) {
-- if (unlikely(c == (u)))
-+ if (unlikely(c == u))
- break;
-- old = atomic_cmpxchg((v), c, c + (a));
-+
-+ asm volatile("addl %2,%0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "jno 0f\n"
-+ _ASM_INTO "\n0:\n"
-+ _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+ : "=r" (new)
-+ : "0" (c), "ir" (a));
-+
-+ old = atomic_cmpxchg(v, c, new);
- if (likely(old == c))
- break;
- c = old;
- }
-- return c != (u);
-+ return c != u;
- }
-
- #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-diff -urNp linux-2.6.34/arch/x86/include/asm/boot.h linux-2.6.34/arch/x86/include/asm/boot.h
---- linux-2.6.34/arch/x86/include/asm/boot.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/boot.h 2010-07-01 20:45:14.000000000 -0400
-@@ -11,10 +11,15 @@
- #include <asm/pgtable_types.h>
-
- /* Physical address where kernel should be loaded. */
--#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
-+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
- + (CONFIG_PHYSICAL_ALIGN - 1)) \
- & ~(CONFIG_PHYSICAL_ALIGN - 1))
-
-+#ifndef __ASSEMBLY__
-+extern unsigned char __LOAD_PHYSICAL_ADDR[];
-+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
-+#endif
-+
- /* Minimum kernel alignment, as a power of two */
- #ifdef CONFIG_X86_64
- #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
-diff -urNp linux-2.6.34/arch/x86/include/asm/cacheflush.h linux-2.6.34/arch/x86/include/asm/cacheflush.h
---- linux-2.6.34/arch/x86/include/asm/cacheflush.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/cacheflush.h 2010-07-01 20:45:14.000000000 -0400
-@@ -61,7 +61,7 @@ PAGEFLAG(WC, WC)
- static inline unsigned long get_page_memtype(struct page *pg)
- {
- if (!PageUncached(pg) && !PageWC(pg))
-- return -1;
-+ return ~0UL;
- else if (!PageUncached(pg) && PageWC(pg))
- return _PAGE_CACHE_WC;
- else if (PageUncached(pg) && !PageWC(pg))
-@@ -86,7 +86,7 @@ static inline void set_page_memtype(stru
- SetPageWC(pg);
- break;
- default:
-- case -1:
-+ case ~0UL:
- ClearPageUncached(pg);
- ClearPageWC(pg);
- break;
-diff -urNp linux-2.6.34/arch/x86/include/asm/cache.h linux-2.6.34/arch/x86/include/asm/cache.h
---- linux-2.6.34/arch/x86/include/asm/cache.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/cache.h 2010-07-01 20:45:14.000000000 -0400
-@@ -8,6 +8,7 @@
- #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
-
- #define __read_mostly __attribute__((__section__(".data.read_mostly")))
-+#define __read_only __attribute__((__section__(".data.read_only")))
-
- #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
- #define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
-diff -urNp linux-2.6.34/arch/x86/include/asm/checksum_32.h linux-2.6.34/arch/x86/include/asm/checksum_32.h
---- linux-2.6.34/arch/x86/include/asm/checksum_32.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/checksum_32.h 2010-07-01 20:45:14.000000000 -0400
-@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
- int len, __wsum sum,
- int *src_err_ptr, int *dst_err_ptr);
-
-+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
-+ int len, __wsum sum,
-+ int *src_err_ptr, int *dst_err_ptr);
-+
-+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
-+ int len, __wsum sum,
-+ int *src_err_ptr, int *dst_err_ptr);
-+
- /*
- * Note: when you get a NULL pointer exception here this means someone
- * passed in an incorrect kernel address to one of these functions.
-@@ -50,7 +58,7 @@ static inline __wsum csum_partial_copy_f
- int *err_ptr)
- {
- might_sleep();
-- return csum_partial_copy_generic((__force void *)src, dst,
-+ return csum_partial_copy_generic_from_user((__force void *)src, dst,
- len, sum, err_ptr, NULL);
+ might_sleep();
+- return csum_partial_copy_generic((__force void *)src, dst,
++ return csum_partial_copy_generic_from_user((__force void *)src, dst,
+ len, sum, err_ptr, NULL);
}
@@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_us
len, sum, NULL, err_ptr);
if (len)
-diff -urNp linux-2.6.34/arch/x86/include/asm/desc.h linux-2.6.34/arch/x86/include/asm/desc.h
---- linux-2.6.34/arch/x86/include/asm/desc.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/desc.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/desc.h linux-2.6.34.1/arch/x86/include/asm/desc.h
+--- linux-2.6.34.1/arch/x86/include/asm/desc.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/desc.h 2010-07-07 09:04:45.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.34/arch/x86/include/asm/device.h linux-2.6.34/arch/x86/include/asm/device.h
---- linux-2.6.34/arch/x86/include/asm/device.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/device.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/device.h linux-2.6.34.1/arch/x86/include/asm/device.h
+--- linux-2.6.34.1/arch/x86/include/asm/device.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/device.h 2010-07-07 09:04:45.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.34/arch/x86/include/asm/dma-mapping.h linux-2.6.34/arch/x86/include/asm/dma-mapping.h
---- linux-2.6.34/arch/x86/include/asm/dma-mapping.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/dma-mapping.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/dma-mapping.h linux-2.6.34.1/arch/x86/include/asm/dma-mapping.h
+--- linux-2.6.34.1/arch/x86/include/asm/dma-mapping.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/dma-mapping.h 2010-07-07 09:04:45.000000000 -0400
@@ -26,9 +26,9 @@ extern int iommu_merge;
extern struct device x86_dma_fallback_dev;
extern int panic_on_overflow;
WARN_ON(irqs_disabled()); /* for portability */
-diff -urNp linux-2.6.34/arch/x86/include/asm/e820.h linux-2.6.34/arch/x86/include/asm/e820.h
---- linux-2.6.34/arch/x86/include/asm/e820.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/e820.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/e820.h linux-2.6.34.1/arch/x86/include/asm/e820.h
+--- linux-2.6.34.1/arch/x86/include/asm/e820.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/e820.h 2010-07-07 09:04:45.000000000 -0400
@@ -64,7 +64,7 @@ struct e820map {
#define ISA_START_ADDRESS 0xa0000
#define ISA_END_ADDRESS 0x100000
#define BIOS_END 0x00100000
#ifdef __KERNEL__
-diff -urNp linux-2.6.34/arch/x86/include/asm/elf.h linux-2.6.34/arch/x86/include/asm/elf.h
---- linux-2.6.34/arch/x86/include/asm/elf.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/elf.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/elf.h linux-2.6.34.1/arch/x86/include/asm/elf.h
+--- linux-2.6.34.1/arch/x86/include/asm/elf.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/elf.h 2010-07-07 09:04:45.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.34/arch/x86/include/asm/futex.h linux-2.6.34/arch/x86/include/asm/futex.h
---- linux-2.6.34/arch/x86/include/asm/futex.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/futex.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/futex.h linux-2.6.34.1/arch/x86/include/asm/futex.h
+--- linux-2.6.34.1/arch/x86/include/asm/futex.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/futex.h 2010-07-07 09:04:45.000000000 -0400
@@ -11,17 +11,54 @@
#include <asm/processor.h>
#include <asm/system.h>
: "memory"
);
-diff -urNp linux-2.6.34/arch/x86/include/asm/i387.h linux-2.6.34/arch/x86/include/asm/i387.h
---- linux-2.6.34/arch/x86/include/asm/i387.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/i387.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/i387.h linux-2.6.34.1/arch/x86/include/asm/i387.h
+--- linux-2.6.34.1/arch/x86/include/asm/i387.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/i387.h 2010-07-07 09:04:45.000000000 -0400
@@ -70,6 +70,11 @@ static inline int fxrstor_checking(struc
{
int err;
/*
* These must be called with preempt disabled
-diff -urNp linux-2.6.34/arch/x86/include/asm/io.h linux-2.6.34/arch/x86/include/asm/io.h
---- linux-2.6.34/arch/x86/include/asm/io.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/io.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/io.h linux-2.6.34.1/arch/x86/include/asm/io.h
+--- linux-2.6.34.1/arch/x86/include/asm/io.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/io.h 2010-07-07 09:04:45.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.34/arch/x86/include/asm/iommu.h linux-2.6.34/arch/x86/include/asm/iommu.h
---- linux-2.6.34/arch/x86/include/asm/iommu.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/iommu.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/iommu.h linux-2.6.34.1/arch/x86/include/asm/iommu.h
+--- linux-2.6.34.1/arch/x86/include/asm/iommu.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/iommu.h 2010-07-07 09:04:45.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.34/arch/x86/include/asm/irqflags.h linux-2.6.34/arch/x86/include/asm/irqflags.h
---- linux-2.6.34/arch/x86/include/asm/irqflags.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/irqflags.h 2010-07-03 09:57:21.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/irqflags.h linux-2.6.34.1/arch/x86/include/asm/irqflags.h
+--- linux-2.6.34.1/arch/x86/include/asm/irqflags.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/irqflags.h 2010-07-07 09:04:45.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.34/arch/x86/include/asm/kvm_host.h linux-2.6.34/arch/x86/include/asm/kvm_host.h
---- linux-2.6.34/arch/x86/include/asm/kvm_host.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/kvm_host.h 2010-07-01 20:45:14.000000000 -0400
-@@ -544,7 +544,7 @@ struct kvm_x86_ops {
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/kvm_host.h linux-2.6.34.1/arch/x86/include/asm/kvm_host.h
+--- linux-2.6.34.1/arch/x86/include/asm/kvm_host.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/kvm_host.h 2010-07-07 09:04:45.000000000 -0400
+@@ -547,7 +547,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.34/arch/x86/include/asm/local.h linux-2.6.34/arch/x86/include/asm/local.h
---- linux-2.6.34/arch/x86/include/asm/local.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/local.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/local.h linux-2.6.34.1/arch/x86/include/asm/local.h
+--- linux-2.6.34.1/arch/x86/include/asm/local.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/local.h 2010-07-07 09:04:45.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.34/arch/x86/include/asm/mc146818rtc.h linux-2.6.34/arch/x86/include/asm/mc146818rtc.h
---- linux-2.6.34/arch/x86/include/asm/mc146818rtc.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/mc146818rtc.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/mc146818rtc.h linux-2.6.34.1/arch/x86/include/asm/mc146818rtc.h
+--- linux-2.6.34.1/arch/x86/include/asm/mc146818rtc.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/mc146818rtc.h 2010-07-07 09:04:45.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.34/arch/x86/include/asm/microcode.h linux-2.6.34/arch/x86/include/asm/microcode.h
---- linux-2.6.34/arch/x86/include/asm/microcode.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/microcode.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/microcode.h linux-2.6.34.1/arch/x86/include/asm/microcode.h
+--- linux-2.6.34.1/arch/x86/include/asm/microcode.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/microcode.h 2010-07-07 09:04:45.000000000 -0400
@@ -12,13 +12,13 @@ struct device;
enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
{
return NULL;
}
-diff -urNp linux-2.6.34/arch/x86/include/asm/mman.h linux-2.6.34/arch/x86/include/asm/mman.h
---- linux-2.6.34/arch/x86/include/asm/mman.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/mman.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/mman.h linux-2.6.34.1/arch/x86/include/asm/mman.h
+--- linux-2.6.34.1/arch/x86/include/asm/mman.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/mman.h 2010-07-07 09:04:45.000000000 -0400
@@ -5,4 +5,14 @@
#include <asm-generic/mman.h>
+#endif
+
#endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-2.6.34/arch/x86/include/asm/mmu_context.h linux-2.6.34/arch/x86/include/asm/mmu_context.h
---- linux-2.6.34/arch/x86/include/asm/mmu_context.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/mmu_context.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/mmu.h linux-2.6.34.1/arch/x86/include/asm/mmu.h
+--- linux-2.6.34.1/arch/x86/include/asm/mmu.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/mmu.h 2010-07-07 09:04:45.000000000 -0400
+@@ -9,10 +9,23 @@
+ * we put the segment information here.
+ */
+ typedef struct {
+- void *ldt;
++ struct desc_struct *ldt;
+ int size;
+ struct mutex lock;
+- void *vdso;
++ unsigned long vdso;
++
++#ifdef CONFIG_X86_32
++#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
++ unsigned long user_cs_base;
++ unsigned long user_cs_limit;
++
++#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
++ cpumask_t cpu_user_cs_mask;
++#endif
++
++#endif
++#endif
++
+ } mm_context_t;
+
+ #ifdef CONFIG_SMP
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/mmu_context.h linux-2.6.34.1/arch/x86/include/asm/mmu_context.h
+--- linux-2.6.34.1/arch/x86/include/asm/mmu_context.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/mmu_context.h 2010-07-07 09:04:45.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.34/arch/x86/include/asm/mmu.h linux-2.6.34/arch/x86/include/asm/mmu.h
---- linux-2.6.34/arch/x86/include/asm/mmu.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/mmu.h 2010-07-01 20:45:14.000000000 -0400
-@@ -9,10 +9,23 @@
- * we put the segment information here.
- */
- typedef struct {
-- void *ldt;
-+ struct desc_struct *ldt;
- int size;
- struct mutex lock;
-- void *vdso;
-+ unsigned long vdso;
-+
-+#ifdef CONFIG_X86_32
-+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
-+ unsigned long user_cs_base;
-+ unsigned long user_cs_limit;
-+
-+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
-+ cpumask_t cpu_user_cs_mask;
-+#endif
-+
-+#endif
-+#endif
-+
- } mm_context_t;
-
- #ifdef CONFIG_SMP
-diff -urNp linux-2.6.34/arch/x86/include/asm/module.h linux-2.6.34/arch/x86/include/asm/module.h
---- linux-2.6.34/arch/x86/include/asm/module.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/module.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/module.h linux-2.6.34.1/arch/x86/include/asm/module.h
+--- linux-2.6.34.1/arch/x86/include/asm/module.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/module.h 2010-07-07 09:04:45.000000000 -0400
@@ -59,13 +59,31 @@
#error unknown processor family
#endif
#endif
#endif /* _ASM_X86_MODULE_H */
-diff -urNp linux-2.6.34/arch/x86/include/asm/page_32_types.h linux-2.6.34/arch/x86/include/asm/page_32_types.h
---- linux-2.6.34/arch/x86/include/asm/page_32_types.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/page_32_types.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/page_32_types.h linux-2.6.34.1/arch/x86/include/asm/page_32_types.h
+--- linux-2.6.34.1/arch/x86/include/asm/page_32_types.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/page_32_types.h 2010-07-07 09:04:45.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.34/arch/x86/include/asm/page_64_types.h linux-2.6.34/arch/x86/include/asm/page_64_types.h
---- linux-2.6.34/arch/x86/include/asm/page_64_types.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/page_64_types.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/page_64_types.h linux-2.6.34.1/arch/x86/include/asm/page_64_types.h
+--- linux-2.6.34.1/arch/x86/include/asm/page_64_types.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/page_64_types.h 2010-07-07 09:04:45.000000000 -0400
@@ -39,6 +39,9 @@
#define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START)
#define __START_KERNEL_map _AC(0xffffffff80000000, UL)
/* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */
#define __PHYSICAL_MASK_SHIFT 46
#define __VIRTUAL_MASK_SHIFT 47
-diff -urNp linux-2.6.34/arch/x86/include/asm/paravirt.h linux-2.6.34/arch/x86/include/asm/paravirt.h
---- linux-2.6.34/arch/x86/include/asm/paravirt.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/paravirt.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/paravirt.h linux-2.6.34.1/arch/x86/include/asm/paravirt.h
+--- linux-2.6.34.1/arch/x86/include/asm/paravirt.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/paravirt.h 2010-07-07 09:04:45.000000000 -0400
@@ -720,6 +720,21 @@ static inline void __set_fixmap(unsigned
pv_mmu_ops.set_fixmap(idx, phys, flags);
}
+#ifdef CONFIG_PAX_KERNEXEC
+static inline unsigned long pax_open_kernel(void)
+{
-+ return pv_mmu_ops.pax_open_kernel();
++ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
+}
+
+static inline unsigned long pax_close_kernel(void)
+{
-+ return pv_mmu_ops.pax_close_kernel();
++ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
+}
+#else
+static inline unsigned long pax_open_kernel(void) { return 0; }
#endif /* CONFIG_X86_32 */
#endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.34/arch/x86/include/asm/paravirt_types.h linux-2.6.34/arch/x86/include/asm/paravirt_types.h
---- linux-2.6.34/arch/x86/include/asm/paravirt_types.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/paravirt_types.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/paravirt_types.h linux-2.6.34.1/arch/x86/include/asm/paravirt_types.h
+--- linux-2.6.34.1/arch/x86/include/asm/paravirt_types.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/paravirt_types.h 2010-07-07 09:04:45.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.34/arch/x86/include/asm/pci_x86.h linux-2.6.34/arch/x86/include/asm/pci_x86.h
---- linux-2.6.34/arch/x86/include/asm/pci_x86.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/pci_x86.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/pci_x86.h linux-2.6.34.1/arch/x86/include/asm/pci_x86.h
+--- linux-2.6.34.1/arch/x86/include/asm/pci_x86.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/pci_x86.h 2010-07-07 09:04:45.000000000 -0400
@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct
extern void (*pcibios_disable_irq)(struct pci_dev *dev);
extern bool port_cf9_safe;
/* arch_initcall level */
-diff -urNp linux-2.6.34/arch/x86/include/asm/pgalloc.h linux-2.6.34/arch/x86/include/asm/pgalloc.h
---- linux-2.6.34/arch/x86/include/asm/pgalloc.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/pgalloc.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/pgalloc.h linux-2.6.34.1/arch/x86/include/asm/pgalloc.h
+--- linux-2.6.34.1/arch/x86/include/asm/pgalloc.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/pgalloc.h 2010-07-07 09:04:45.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.34/arch/x86/include/asm/pgtable-2level.h linux-2.6.34/arch/x86/include/asm/pgtable-2level.h
---- linux-2.6.34/arch/x86/include/asm/pgtable-2level.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/pgtable-2level.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/pgtable-2level.h linux-2.6.34.1/arch/x86/include/asm/pgtable-2level.h
+--- linux-2.6.34.1/arch/x86/include/asm/pgtable-2level.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/pgtable-2level.h 2010-07-07 09:04:45.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.34/arch/x86/include/asm/pgtable_32.h linux-2.6.34/arch/x86/include/asm/pgtable_32.h
---- linux-2.6.34/arch/x86/include/asm/pgtable_32.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/pgtable_32.h 2010-07-01 20:45:14.000000000 -0400
-@@ -25,8 +25,6 @@
- struct mm_struct;
- struct vm_area_struct;
-
--extern pgd_t swapper_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
- # include <asm/pgtable-2level.h>
- #endif
-
-+extern pgd_t swapper_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
- /* Clear a kernel PTE and flush it from the TLB */
- #define kpte_clear_flush(ptep, vaddr) \
- do { \
-+ pax_open_kernel(); \
- pte_clear(&init_mm, (vaddr), (ptep)); \
-+ pax_close_kernel(); \
- __flush_tlb_one((vaddr)); \
- } while (0)
-
-@@ -83,6 +88,9 @@ do { \
-
- #endif /* !__ASSEMBLY__ */
-
-+#define HAVE_ARCH_UNMAPPED_AREA
-+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
-+
- /*
- * kern_addr_valid() is (1) for FLATMEM and (0) for
- * SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-2.6.34/arch/x86/include/asm/pgtable_32_types.h linux-2.6.34/arch/x86/include/asm/pgtable_32_types.h
---- linux-2.6.34/arch/x86/include/asm/pgtable_32_types.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/pgtable_32_types.h 2010-07-01 20:45:14.000000000 -0400
-@@ -8,7 +8,7 @@
- */
- #ifdef CONFIG_X86_PAE
- # include <asm/pgtable-3level_types.h>
--# define PMD_SIZE (1UL << PMD_SHIFT)
-+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
- # define PMD_MASK (~(PMD_SIZE - 1))
- #else
- # include <asm/pgtable-2level_types.h>
-@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set
- # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
- #endif
-
-+#ifdef CONFIG_PAX_KERNEXEC
-+#ifndef __ASSEMBLY__
-+extern unsigned char MODULES_EXEC_VADDR[];
-+extern unsigned char MODULES_EXEC_END[];
-+#endif
-+#include <asm/boot.h>
-+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
-+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
-+#else
-+#define ktla_ktva(addr) (addr)
-+#define ktva_ktla(addr) (addr)
-+#endif
-+
- #define MODULES_VADDR VMALLOC_START
- #define MODULES_END VMALLOC_END
- #define MODULES_LEN (MODULES_VADDR - MODULES_END)
-diff -urNp linux-2.6.34/arch/x86/include/asm/pgtable-3level.h linux-2.6.34/arch/x86/include/asm/pgtable-3level.h
---- linux-2.6.34/arch/x86/include/asm/pgtable-3level.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/pgtable-3level.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/pgtable-3level.h linux-2.6.34.1/arch/x86/include/asm/pgtable-3level.h
+--- linux-2.6.34.1/arch/x86/include/asm/pgtable-3level.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/pgtable-3level.h 2010-07-07 09:04:45.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.34/arch/x86/include/asm/pgtable_64.h linux-2.6.34/arch/x86/include/asm/pgtable_64.h
---- linux-2.6.34/arch/x86/include/asm/pgtable_64.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/pgtable_64.h 2010-07-01 20:45:14.000000000 -0400
-@@ -16,10 +16,13 @@
-
- extern pud_t level3_kernel_pgt[512];
- extern pud_t level3_ident_pgt[512];
-+extern pud_t level3_vmalloc_pgt[512];
-+extern pud_t level3_vmemmap_pgt[512];
-+extern pud_t level2_vmemmap_pgt[512];
- extern pmd_t level2_kernel_pgt[512];
- extern pmd_t level2_fixmap_pgt[512];
--extern pmd_t level2_ident_pgt[512];
--extern pgd_t init_level4_pgt[];
-+extern pmd_t level2_ident_pgt[512*2];
-+extern pgd_t init_level4_pgt[512];
-
- #define swapper_pg_dir init_level4_pgt
-
-@@ -74,7 +77,9 @@ static inline pte_t native_ptep_get_and_
-
- static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
- {
-+ pax_open_kernel();
- *pmdp = pmd;
-+ pax_close_kernel();
- }
-
- static inline void native_pmd_clear(pmd_t *pmd)
-@@ -94,7 +99,9 @@ static inline void native_pud_clear(pud_
-
- static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
- {
-+ pax_open_kernel();
- *pgdp = pgd;
-+ pax_close_kernel();
- }
-
- static inline void native_pgd_clear(pgd_t *pgd)
-diff -urNp linux-2.6.34/arch/x86/include/asm/pgtable_64_types.h linux-2.6.34/arch/x86/include/asm/pgtable_64_types.h
---- linux-2.6.34/arch/x86/include/asm/pgtable_64_types.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/pgtable_64_types.h 2010-07-01 20:45:14.000000000 -0400
-@@ -59,5 +59,7 @@ typedef struct { pteval_t pte; } pte_t;
- #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
- #define MODULES_END _AC(0xffffffffff000000, UL)
- #define MODULES_LEN (MODULES_END - MODULES_VADDR)
-+#define MODULES_EXEC_VADDR MODULES_VADDR
-+#define MODULES_EXEC_END MODULES_END
-
- #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
-diff -urNp linux-2.6.34/arch/x86/include/asm/pgtable.h linux-2.6.34/arch/x86/include/asm/pgtable.h
---- linux-2.6.34/arch/x86/include/asm/pgtable.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/pgtable.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/pgtable.h linux-2.6.34.1/arch/x86/include/asm/pgtable.h
+--- linux-2.6.34.1/arch/x86/include/asm/pgtable.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/pgtable.h 2010-07-07 09:04:45.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.34/arch/x86/include/asm/pgtable_types.h linux-2.6.34/arch/x86/include/asm/pgtable_types.h
---- linux-2.6.34/arch/x86/include/asm/pgtable_types.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/pgtable_types.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/pgtable_32.h linux-2.6.34.1/arch/x86/include/asm/pgtable_32.h
+--- linux-2.6.34.1/arch/x86/include/asm/pgtable_32.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/pgtable_32.h 2010-07-07 09:04:45.000000000 -0400
+@@ -25,8 +25,6 @@
+ struct mm_struct;
+ struct vm_area_struct;
+
+-extern pgd_t swapper_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
+ # include <asm/pgtable-2level.h>
+ #endif
+
++extern pgd_t swapper_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
+ /* Clear a kernel PTE and flush it from the TLB */
+ #define kpte_clear_flush(ptep, vaddr) \
+ do { \
++ pax_open_kernel(); \
+ pte_clear(&init_mm, (vaddr), (ptep)); \
++ pax_close_kernel(); \
+ __flush_tlb_one((vaddr)); \
+ } while (0)
+
+@@ -83,6 +88,9 @@ do { \
+
+ #endif /* !__ASSEMBLY__ */
+
++#define HAVE_ARCH_UNMAPPED_AREA
++#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
++
+ /*
+ * kern_addr_valid() is (1) for FLATMEM and (0) for
+ * SPARSEMEM and DISCONTIGMEM
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/pgtable_32_types.h linux-2.6.34.1/arch/x86/include/asm/pgtable_32_types.h
+--- linux-2.6.34.1/arch/x86/include/asm/pgtable_32_types.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/pgtable_32_types.h 2010-07-07 09:04:45.000000000 -0400
+@@ -8,7 +8,7 @@
+ */
+ #ifdef CONFIG_X86_PAE
+ # include <asm/pgtable-3level_types.h>
+-# define PMD_SIZE (1UL << PMD_SHIFT)
++# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
+ # define PMD_MASK (~(PMD_SIZE - 1))
+ #else
+ # include <asm/pgtable-2level_types.h>
+@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set
+ # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
+ #endif
+
++#ifdef CONFIG_PAX_KERNEXEC
++#ifndef __ASSEMBLY__
++extern unsigned char MODULES_EXEC_VADDR[];
++extern unsigned char MODULES_EXEC_END[];
++#endif
++#include <asm/boot.h>
++#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
++#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
++#else
++#define ktla_ktva(addr) (addr)
++#define ktva_ktla(addr) (addr)
++#endif
++
+ #define MODULES_VADDR VMALLOC_START
+ #define MODULES_END VMALLOC_END
+ #define MODULES_LEN (MODULES_VADDR - MODULES_END)
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/pgtable_64.h linux-2.6.34.1/arch/x86/include/asm/pgtable_64.h
+--- linux-2.6.34.1/arch/x86/include/asm/pgtable_64.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/pgtable_64.h 2010-07-07 09:04:45.000000000 -0400
+@@ -16,10 +16,13 @@
+
+ extern pud_t level3_kernel_pgt[512];
+ extern pud_t level3_ident_pgt[512];
++extern pud_t level3_vmalloc_pgt[512];
++extern pud_t level3_vmemmap_pgt[512];
++extern pud_t level2_vmemmap_pgt[512];
+ extern pmd_t level2_kernel_pgt[512];
+ extern pmd_t level2_fixmap_pgt[512];
+-extern pmd_t level2_ident_pgt[512];
+-extern pgd_t init_level4_pgt[];
++extern pmd_t level2_ident_pgt[512*2];
++extern pgd_t init_level4_pgt[512];
+
+ #define swapper_pg_dir init_level4_pgt
+
+@@ -74,7 +77,9 @@ static inline pte_t native_ptep_get_and_
+
+ static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
+ {
++ pax_open_kernel();
+ *pmdp = pmd;
++ pax_close_kernel();
+ }
+
+ static inline void native_pmd_clear(pmd_t *pmd)
+@@ -94,7 +99,9 @@ static inline void native_pud_clear(pud_
+
+ static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
+ {
++ pax_open_kernel();
+ *pgdp = pgd;
++ pax_close_kernel();
+ }
+
+ static inline void native_pgd_clear(pgd_t *pgd)
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/pgtable_64_types.h linux-2.6.34.1/arch/x86/include/asm/pgtable_64_types.h
+--- linux-2.6.34.1/arch/x86/include/asm/pgtable_64_types.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/pgtable_64_types.h 2010-07-07 09:04:45.000000000 -0400
+@@ -59,5 +59,7 @@ typedef struct { pteval_t pte; } pte_t;
+ #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
+ #define MODULES_END _AC(0xffffffffff000000, UL)
+ #define MODULES_LEN (MODULES_END - MODULES_VADDR)
++#define MODULES_EXEC_VADDR MODULES_VADDR
++#define MODULES_EXEC_END MODULES_END
+
+ #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/pgtable_types.h linux-2.6.34.1/arch/x86/include/asm/pgtable_types.h
+--- linux-2.6.34.1/arch/x86/include/asm/pgtable_types.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/pgtable_types.h 2010-07-07 09:04:46.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.34/arch/x86/include/asm/processor.h linux-2.6.34/arch/x86/include/asm/processor.h
---- linux-2.6.34/arch/x86/include/asm/processor.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/processor.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/processor.h linux-2.6.34.1/arch/x86/include/asm/processor.h
+--- linux-2.6.34.1/arch/x86/include/asm/processor.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/processor.h 2010-07-07 09:04:46.000000000 -0400
@@ -273,7 +273,7 @@ struct tss_struct {
} ____cacheline_aligned;
#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.34/arch/x86/include/asm/ptrace.h linux-2.6.34/arch/x86/include/asm/ptrace.h
---- linux-2.6.34/arch/x86/include/asm/ptrace.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/ptrace.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/ptrace.h linux-2.6.34.1/arch/x86/include/asm/ptrace.h
+--- linux-2.6.34.1/arch/x86/include/asm/ptrace.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/ptrace.h 2010-07-07 09:04:46.000000000 -0400
@@ -152,28 +152,29 @@ static inline unsigned long regs_return_
}
#endif
}
-diff -urNp linux-2.6.34/arch/x86/include/asm/reboot.h linux-2.6.34/arch/x86/include/asm/reboot.h
---- linux-2.6.34/arch/x86/include/asm/reboot.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/reboot.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/reboot.h linux-2.6.34.1/arch/x86/include/asm/reboot.h
+--- linux-2.6.34.1/arch/x86/include/asm/reboot.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/reboot.h 2010-07-07 09:04:46.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.34/arch/x86/include/asm/rwsem.h linux-2.6.34/arch/x86/include/asm/rwsem.h
---- linux-2.6.34/arch/x86/include/asm/rwsem.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/rwsem.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/rwsem.h linux-2.6.34.1/arch/x86/include/asm/rwsem.h
+--- linux-2.6.34.1/arch/x86/include/asm/rwsem.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/rwsem.h 2010-07-07 09:04:46.000000000 -0400
@@ -118,10 +118,26 @@ static inline void __down_read(struct rw
{
asm volatile("# beginning down_read\n\t"
: "+r" (tmp), "+m" (sem->count)
: : "memory");
-diff -urNp linux-2.6.34/arch/x86/include/asm/segment.h linux-2.6.34/arch/x86/include/asm/segment.h
---- linux-2.6.34/arch/x86/include/asm/segment.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/segment.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/segment.h linux-2.6.34.1/arch/x86/include/asm/segment.h
+--- linux-2.6.34.1/arch/x86/include/asm/segment.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/segment.h 2010-07-07 09:04:46.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.34/arch/x86/include/asm/spinlock.h linux-2.6.34/arch/x86/include/asm/spinlock.h
---- linux-2.6.34/arch/x86/include/asm/spinlock.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/spinlock.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/spinlock.h linux-2.6.34.1/arch/x86/include/asm/spinlock.h
+--- linux-2.6.34.1/arch/x86/include/asm/spinlock.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/spinlock.h 2010-07-07 09:04:46.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.34/arch/x86/include/asm/system.h linux-2.6.34/arch/x86/include/asm/system.h
---- linux-2.6.34/arch/x86/include/asm/system.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/system.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/system.h linux-2.6.34.1/arch/x86/include/asm/system.h
+--- linux-2.6.34.1/arch/x86/include/asm/system.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/system.h 2010-07-07 09:04:46.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.34/arch/x86/include/asm/uaccess_32.h linux-2.6.34/arch/x86/include/asm/uaccess_32.h
---- linux-2.6.34/arch/x86/include/asm/uaccess_32.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/uaccess_32.h 2010-07-01 20:45:14.000000000 -0400
-@@ -22,6 +22,8 @@ unsigned long __must_check __copy_from_u
- unsigned long __must_check __copy_from_user_ll_nocache_nozero
- (void *to, const void __user *from, unsigned long n);
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/uaccess.h linux-2.6.34.1/arch/x86/include/asm/uaccess.h
+--- linux-2.6.34.1/arch/x86/include/asm/uaccess.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/uaccess.h 2010-07-07 09:04:46.000000000 -0400
+@@ -8,12 +8,15 @@
+ #include <linux/thread_info.h>
+ #include <linux/prefetch.h>
+ #include <linux/string.h>
++#include <linux/sched.h>
+ #include <asm/asm.h>
+ #include <asm/page.h>
+
+ #define VERIFY_READ 0
+ #define VERIFY_WRITE 1
+extern void check_object_size(const void *ptr, unsigned long n, bool to);
+
- /**
- * __copy_to_user_inatomic: - Copy a block of data into user space, with less checking.
- * @to: Destination address, in user space.
-@@ -44,6 +46,9 @@ unsigned long __must_check __copy_from_u
+ /*
+ * The fs value determines whether argument validity checking should be
+ * performed or not. If get_fs() == USER_DS, checking is performed, with
+@@ -29,7 +32,12 @@
+
+ #define get_ds() (KERNEL_DS)
+ #define get_fs() (current_thread_info()->addr_limit)
++#ifdef CONFIG_X86_32
++void __set_fs(mm_segment_t x, int cpu);
++void set_fs(mm_segment_t x);
++#else
+ #define set_fs(x) (current_thread_info()->addr_limit = (x))
++#endif
+
+ #define segment_eq(a, b) ((a).seg == (b).seg)
+
+@@ -77,7 +85,33 @@
+ * checks that the pointer is in the user space range - after calling
+ * this function, memory access functions may still return -EFAULT.
+ */
+-#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
++#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
++#define access_ok(type, addr, size) \
++({ \
++ long __size = size; \
++ unsigned long __addr = (unsigned long)addr; \
++ unsigned long __addr_ao = __addr & PAGE_MASK; \
++ unsigned long __end_ao = __addr + __size - 1; \
++ bool __ret_ao = __range_not_ok(__addr, __size) == 0; \
++ if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
++ while(__addr_ao <= __end_ao) { \
++ char __c_ao; \
++ __addr_ao += PAGE_SIZE; \
++ if (__size > PAGE_SIZE) \
++ cond_resched(); \
++ if (__get_user(__c_ao, (char __user *)__addr)) \
++ break; \
++ if (type != VERIFY_WRITE) { \
++ __addr = __addr_ao; \
++ continue; \
++ } \
++ if (__put_user(__c_ao, (char __user *)__addr)) \
++ break; \
++ __addr = __addr_ao; \
++ } \
++ } \
++ __ret_ao; \
++})
+
+ /*
+ * The exception table consists of pairs of addresses: the first is the
+@@ -183,13 +217,21 @@ extern int __get_user_bad(void);
+ asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
+ : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
+
+-
++#ifdef CONFIG_X86_32
++#define _ASM_LOAD_USER_DS(ds) "movw %w" #ds ",%%ds\n"
++#define _ASM_LOAD_KERNEL_DS "pushl %%ss; popl %%ds\n"
++#else
++#define _ASM_LOAD_USER_DS(ds)
++#define _ASM_LOAD_KERNEL_DS
++#endif
+
+ #ifdef CONFIG_X86_32
+ #define __put_user_asm_u64(x, addr, err, errret) \
+- asm volatile("1: movl %%eax,0(%2)\n" \
+- "2: movl %%edx,4(%2)\n" \
++ asm volatile(_ASM_LOAD_USER_DS(5) \
++ "1: movl %%eax,%%ds:0(%2)\n" \
++ "2: movl %%edx,%%ds:4(%2)\n" \
+ "3:\n" \
++ _ASM_LOAD_KERNEL_DS \
+ ".section .fixup,\"ax\"\n" \
+ "4: movl %3,%0\n" \
+ " jmp 3b\n" \
+@@ -197,15 +239,18 @@ extern int __get_user_bad(void);
+ _ASM_EXTABLE(1b, 4b) \
+ _ASM_EXTABLE(2b, 4b) \
+ : "=r" (err) \
+- : "A" (x), "r" (addr), "i" (errret), "0" (err))
++ : "A" (x), "r" (addr), "i" (errret), "0" (err), \
++ "r"(__USER_DS))
+
+ #define __put_user_asm_ex_u64(x, addr) \
+- asm volatile("1: movl %%eax,0(%1)\n" \
+- "2: movl %%edx,4(%1)\n" \
++ asm volatile(_ASM_LOAD_USER_DS(2) \
++ "1: movl %%eax,%%ds:0(%1)\n" \
++ "2: movl %%edx,%%ds:4(%1)\n" \
+ "3:\n" \
++ _ASM_LOAD_KERNEL_DS \
+ _ASM_EXTABLE(1b, 2b - 1b) \
+ _ASM_EXTABLE(2b, 3b - 2b) \
+- : : "A" (x), "r" (addr))
++ : : "A" (x), "r" (addr), "r"(__USER_DS))
+
+ #define __put_user_x8(x, ptr, __ret_pu) \
+ asm volatile("call __put_user_8" : "=a" (__ret_pu) \
+@@ -374,16 +419,18 @@ do { \
+ } while (0)
+
+ #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
+- asm volatile("1: mov"itype" %2,%"rtype"1\n" \
++ asm volatile(_ASM_LOAD_USER_DS(5) \
++ "1: mov"itype" %%ds:%2,%"rtype"1\n" \
+ "2:\n" \
++ _ASM_LOAD_KERNEL_DS \
+ ".section .fixup,\"ax\"\n" \
+ "3: mov %3,%0\n" \
+ " xor"itype" %"rtype"1,%"rtype"1\n" \
+ " jmp 2b\n" \
+ ".previous\n" \
+ _ASM_EXTABLE(1b, 3b) \
+- : "=r" (err), ltype(x) \
+- : "m" (__m(addr)), "i" (errret), "0" (err))
++ : "=r" (err), ltype (x) \
++ : "m" (__m(addr)), "i" (errret), "0" (err), "r"(__USER_DS))
+
+ #define __get_user_size_ex(x, ptr, size) \
+ do { \
+@@ -407,10 +454,12 @@ do { \
+ } while (0)
+
+ #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
+- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
++ asm volatile(_ASM_LOAD_USER_DS(2) \
++ "1: mov"itype" %%ds:%1,%"rtype"0\n" \
+ "2:\n" \
++ _ASM_LOAD_KERNEL_DS \
+ _ASM_EXTABLE(1b, 2b - 1b) \
+- : ltype(x) : "m" (__m(addr)))
++ : ltype(x) : "m" (__m(addr)), "r"(__USER_DS))
+
+ #define __put_user_nocheck(x, ptr, size) \
+ ({ \
+@@ -424,13 +473,24 @@ do { \
+ int __gu_err; \
+ unsigned long __gu_val; \
+ __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
+- (x) = (__force __typeof__(*(ptr)))__gu_val; \
++ (x) = (__typeof__(*(ptr)))__gu_val; \
+ __gu_err; \
+ })
+
+ /* FIXME: this hack is definitely wrong -AK */
+ struct __large_struct { unsigned long buf[100]; };
+-#define __m(x) (*(struct __large_struct __user *)(x))
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++#define ____m(x) \
++({ \
++ unsigned long ____x = (unsigned long)(x); \
++ if (____x < PAX_USER_SHADOW_BASE) \
++ ____x += PAX_USER_SHADOW_BASE; \
++ (void __user *)____x; \
++})
++#else
++#define ____m(x) (x)
++#endif
++#define __m(x) (*(struct __large_struct __user *)____m(x))
+
+ /*
+ * Tell gcc we read from memory instead of writing: this is because
+@@ -438,21 +498,26 @@ struct __large_struct { unsigned long bu
+ * aliasing issues.
+ */
+ #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
+- asm volatile("1: mov"itype" %"rtype"1,%2\n" \
++ asm volatile(_ASM_LOAD_USER_DS(5) \
++ "1: mov"itype" %"rtype"1,%%ds:%2\n" \
+ "2:\n" \
++ _ASM_LOAD_KERNEL_DS \
+ ".section .fixup,\"ax\"\n" \
+ "3: mov %3,%0\n" \
+ " jmp 2b\n" \
+ ".previous\n" \
+ _ASM_EXTABLE(1b, 3b) \
+ : "=r"(err) \
+- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
++ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err),\
++ "r"(__USER_DS))
+
+ #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
+- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
++ asm volatile(_ASM_LOAD_USER_DS(2) \
++ "1: mov"itype" %"rtype"0,%%ds:%1\n" \
+ "2:\n" \
++ _ASM_LOAD_KERNEL_DS \
+ _ASM_EXTABLE(1b, 2b - 1b) \
+- : : ltype(x), "m" (__m(addr)))
++ : : ltype(x), "m" (__m(addr)), "r"(__USER_DS))
+
+ /*
+ * uaccess_try and catch
+@@ -530,7 +595,7 @@ struct __large_struct { unsigned long bu
+ #define get_user_ex(x, ptr) do { \
+ unsigned long __gue_val; \
+ __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
+- (x) = (__force __typeof__(*(ptr)))__gue_val; \
++ (x) = (__typeof__(*(ptr)))__gue_val; \
+ } while (0)
+
+ #ifdef CONFIG_X86_WP_WORKS_OK
+@@ -567,6 +632,7 @@ extern struct movsl_mask {
+
+ #define ARCH_HAS_NOCACHE_UACCESS 1
+
++#define ARCH_HAS_SORT_EXTABLE
+ #ifdef CONFIG_X86_32
+ # include "uaccess_32.h"
+ #else
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/uaccess_32.h linux-2.6.34.1/arch/x86/include/asm/uaccess_32.h
+--- linux-2.6.34.1/arch/x86/include/asm/uaccess_32.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/uaccess_32.h 2010-07-07 09:04:46.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)
{
if (__builtin_constant_p(n)) {
unsigned long ret;
-@@ -62,6 +67,8 @@ __copy_to_user_inatomic(void __user *to,
+@@ -62,6 +65,8 @@ __copy_to_user_inatomic(void __user *to,
return ret;
}
}
return __copy_to_user_ll(to, from, n);
}
-@@ -89,6 +96,9 @@ __copy_to_user(void __user *to, const vo
+@@ -89,6 +94,9 @@ __copy_to_user(void __user *to, const vo
static __always_inline unsigned long
__copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
{
/* Avoid zeroing the tail if the copy fails..
* If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
* but as the zeroing behaviour is only significant when n is not
-@@ -138,6 +148,10 @@ static __always_inline unsigned long
+@@ -138,6 +146,10 @@ static __always_inline unsigned long
__copy_from_user(void *to, const void __user *from, unsigned long n)
{
might_fault();
if (__builtin_constant_p(n)) {
unsigned long ret;
-@@ -153,6 +167,8 @@ __copy_from_user(void *to, const void __
+@@ -153,6 +165,8 @@ __copy_from_user(void *to, const void __
return ret;
}
}
return __copy_from_user_ll(to, from, n);
}
-@@ -160,6 +176,10 @@ static __always_inline unsigned long __c
+@@ -160,6 +174,10 @@ static __always_inline unsigned long __c
const void __user *from, unsigned long n)
{
might_fault();
if (__builtin_constant_p(n)) {
unsigned long ret;
-@@ -182,15 +202,19 @@ static __always_inline unsigned long
+@@ -182,15 +200,19 @@ static __always_inline unsigned long
__copy_from_user_inatomic_nocache(void *to, const void __user *from,
unsigned long n)
{
extern void copy_from_user_overflow(void)
#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
-@@ -200,17 +224,61 @@ extern void copy_from_user_overflow(void
+@@ -200,17 +222,61 @@ extern void copy_from_user_overflow(void
#endif
;
return n;
}
-diff -urNp linux-2.6.34/arch/x86/include/asm/uaccess_64.h linux-2.6.34/arch/x86/include/asm/uaccess_64.h
---- linux-2.6.34/arch/x86/include/asm/uaccess_64.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/uaccess_64.h 2010-07-03 09:56:50.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/uaccess_64.h linux-2.6.34.1/arch/x86/include/asm/uaccess_64.h
+--- linux-2.6.34.1/arch/x86/include/asm/uaccess_64.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/uaccess_64.h 2010-07-07 09:04:46.000000000 -0400
@@ -11,6 +11,11 @@
#include <asm/alternative.h>
#include <asm/cpufeature.h>
copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
#endif /* _ASM_X86_UACCESS_64_H */
-diff -urNp linux-2.6.34/arch/x86/include/asm/uaccess.h linux-2.6.34/arch/x86/include/asm/uaccess.h
---- linux-2.6.34/arch/x86/include/asm/uaccess.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/uaccess.h 2010-07-01 20:45:14.000000000 -0400
-@@ -8,6 +8,7 @@
- #include <linux/thread_info.h>
- #include <linux/prefetch.h>
- #include <linux/string.h>
-+#include <linux/sched.h>
- #include <asm/asm.h>
- #include <asm/page.h>
-
-@@ -29,7 +30,12 @@
-
- #define get_ds() (KERNEL_DS)
- #define get_fs() (current_thread_info()->addr_limit)
-+#ifdef CONFIG_X86_32
-+void __set_fs(mm_segment_t x, int cpu);
-+void set_fs(mm_segment_t x);
-+#else
- #define set_fs(x) (current_thread_info()->addr_limit = (x))
-+#endif
-
- #define segment_eq(a, b) ((a).seg == (b).seg)
-
-@@ -77,7 +83,33 @@
- * checks that the pointer is in the user space range - after calling
- * this function, memory access functions may still return -EFAULT.
- */
--#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
-+#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
-+#define access_ok(type, addr, size) \
-+({ \
-+ long __size = size; \
-+ unsigned long __addr = (unsigned long)addr; \
-+ unsigned long __addr_ao = __addr & PAGE_MASK; \
-+ unsigned long __end_ao = __addr + __size - 1; \
-+ bool __ret_ao = __range_not_ok(__addr, __size) == 0; \
-+ if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
-+ while(__addr_ao <= __end_ao) { \
-+ char __c_ao; \
-+ __addr_ao += PAGE_SIZE; \
-+ if (__size > PAGE_SIZE) \
-+ cond_resched(); \
-+ if (__get_user(__c_ao, (char __user *)__addr)) \
-+ break; \
-+ if (type != VERIFY_WRITE) { \
-+ __addr = __addr_ao; \
-+ continue; \
-+ } \
-+ if (__put_user(__c_ao, (char __user *)__addr)) \
-+ break; \
-+ __addr = __addr_ao; \
-+ } \
-+ } \
-+ __ret_ao; \
-+})
-
- /*
- * The exception table consists of pairs of addresses: the first is the
-@@ -183,13 +215,21 @@ extern int __get_user_bad(void);
- asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
- : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
-
--
-+#ifdef CONFIG_X86_32
-+#define _ASM_LOAD_USER_DS(ds) "movw %w" #ds ",%%ds\n"
-+#define _ASM_LOAD_KERNEL_DS "pushl %%ss; popl %%ds\n"
-+#else
-+#define _ASM_LOAD_USER_DS(ds)
-+#define _ASM_LOAD_KERNEL_DS
-+#endif
-
- #ifdef CONFIG_X86_32
- #define __put_user_asm_u64(x, addr, err, errret) \
-- asm volatile("1: movl %%eax,0(%2)\n" \
-- "2: movl %%edx,4(%2)\n" \
-+ asm volatile(_ASM_LOAD_USER_DS(5) \
-+ "1: movl %%eax,%%ds:0(%2)\n" \
-+ "2: movl %%edx,%%ds:4(%2)\n" \
- "3:\n" \
-+ _ASM_LOAD_KERNEL_DS \
- ".section .fixup,\"ax\"\n" \
- "4: movl %3,%0\n" \
- " jmp 3b\n" \
-@@ -197,15 +237,18 @@ extern int __get_user_bad(void);
- _ASM_EXTABLE(1b, 4b) \
- _ASM_EXTABLE(2b, 4b) \
- : "=r" (err) \
-- : "A" (x), "r" (addr), "i" (errret), "0" (err))
-+ : "A" (x), "r" (addr), "i" (errret), "0" (err), \
-+ "r"(__USER_DS))
-
- #define __put_user_asm_ex_u64(x, addr) \
-- asm volatile("1: movl %%eax,0(%1)\n" \
-- "2: movl %%edx,4(%1)\n" \
-+ asm volatile(_ASM_LOAD_USER_DS(2) \
-+ "1: movl %%eax,%%ds:0(%1)\n" \
-+ "2: movl %%edx,%%ds:4(%1)\n" \
- "3:\n" \
-+ _ASM_LOAD_KERNEL_DS \
- _ASM_EXTABLE(1b, 2b - 1b) \
- _ASM_EXTABLE(2b, 3b - 2b) \
-- : : "A" (x), "r" (addr))
-+ : : "A" (x), "r" (addr), "r"(__USER_DS))
-
- #define __put_user_x8(x, ptr, __ret_pu) \
- asm volatile("call __put_user_8" : "=a" (__ret_pu) \
-@@ -374,16 +417,18 @@ do { \
- } while (0)
-
- #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
-- asm volatile("1: mov"itype" %2,%"rtype"1\n" \
-+ asm volatile(_ASM_LOAD_USER_DS(5) \
-+ "1: mov"itype" %%ds:%2,%"rtype"1\n" \
- "2:\n" \
-+ _ASM_LOAD_KERNEL_DS \
- ".section .fixup,\"ax\"\n" \
- "3: mov %3,%0\n" \
- " xor"itype" %"rtype"1,%"rtype"1\n" \
- " jmp 2b\n" \
- ".previous\n" \
- _ASM_EXTABLE(1b, 3b) \
-- : "=r" (err), ltype(x) \
-- : "m" (__m(addr)), "i" (errret), "0" (err))
-+ : "=r" (err), ltype (x) \
-+ : "m" (__m(addr)), "i" (errret), "0" (err), "r"(__USER_DS))
-
- #define __get_user_size_ex(x, ptr, size) \
- do { \
-@@ -407,10 +452,12 @@ do { \
- } while (0)
-
- #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
-- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
-+ asm volatile(_ASM_LOAD_USER_DS(2) \
-+ "1: mov"itype" %%ds:%1,%"rtype"0\n" \
- "2:\n" \
-+ _ASM_LOAD_KERNEL_DS \
- _ASM_EXTABLE(1b, 2b - 1b) \
-- : ltype(x) : "m" (__m(addr)))
-+ : ltype(x) : "m" (__m(addr)), "r"(__USER_DS))
-
- #define __put_user_nocheck(x, ptr, size) \
- ({ \
-@@ -424,13 +471,24 @@ do { \
- int __gu_err; \
- unsigned long __gu_val; \
- __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
-- (x) = (__force __typeof__(*(ptr)))__gu_val; \
-+ (x) = (__typeof__(*(ptr)))__gu_val; \
- __gu_err; \
- })
-
- /* FIXME: this hack is definitely wrong -AK */
- struct __large_struct { unsigned long buf[100]; };
--#define __m(x) (*(struct __large_struct __user *)(x))
-+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+#define ____m(x) \
-+({ \
-+ unsigned long ____x = (unsigned long)(x); \
-+ if (____x < PAX_USER_SHADOW_BASE) \
-+ ____x += PAX_USER_SHADOW_BASE; \
-+ (void __user *)____x; \
-+})
-+#else
-+#define ____m(x) (x)
-+#endif
-+#define __m(x) (*(struct __large_struct __user *)____m(x))
-
- /*
- * Tell gcc we read from memory instead of writing: this is because
-@@ -438,21 +496,26 @@ struct __large_struct { unsigned long bu
- * aliasing issues.
- */
- #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
-- asm volatile("1: mov"itype" %"rtype"1,%2\n" \
-+ asm volatile(_ASM_LOAD_USER_DS(5) \
-+ "1: mov"itype" %"rtype"1,%%ds:%2\n" \
- "2:\n" \
-+ _ASM_LOAD_KERNEL_DS \
- ".section .fixup,\"ax\"\n" \
- "3: mov %3,%0\n" \
- " jmp 2b\n" \
- ".previous\n" \
- _ASM_EXTABLE(1b, 3b) \
- : "=r"(err) \
-- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
-+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err),\
-+ "r"(__USER_DS))
-
- #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
-- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
-+ asm volatile(_ASM_LOAD_USER_DS(2) \
-+ "1: mov"itype" %"rtype"0,%%ds:%1\n" \
- "2:\n" \
-+ _ASM_LOAD_KERNEL_DS \
- _ASM_EXTABLE(1b, 2b - 1b) \
-- : : ltype(x), "m" (__m(addr)))
-+ : : ltype(x), "m" (__m(addr)), "r"(__USER_DS))
-
- /*
- * uaccess_try and catch
-@@ -530,7 +593,7 @@ struct __large_struct { unsigned long bu
- #define get_user_ex(x, ptr) do { \
- unsigned long __gue_val; \
- __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
-- (x) = (__force __typeof__(*(ptr)))__gue_val; \
-+ (x) = (__typeof__(*(ptr)))__gue_val; \
- } while (0)
-
- #ifdef CONFIG_X86_WP_WORKS_OK
-@@ -567,6 +630,7 @@ extern struct movsl_mask {
-
- #define ARCH_HAS_NOCACHE_UACCESS 1
-
-+#define ARCH_HAS_SORT_EXTABLE
- #ifdef CONFIG_X86_32
- # include "uaccess_32.h"
- #else
-diff -urNp linux-2.6.34/arch/x86/include/asm/vgtod.h linux-2.6.34/arch/x86/include/asm/vgtod.h
---- linux-2.6.34/arch/x86/include/asm/vgtod.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/vgtod.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/vgtod.h linux-2.6.34.1/arch/x86/include/asm/vgtod.h
+--- linux-2.6.34.1/arch/x86/include/asm/vgtod.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/vgtod.h 2010-07-07 09:04:46.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.34/arch/x86/include/asm/vmi.h linux-2.6.34/arch/x86/include/asm/vmi.h
---- linux-2.6.34/arch/x86/include/asm/vmi.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/vmi.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/vmi.h linux-2.6.34.1/arch/x86/include/asm/vmi.h
+--- linux-2.6.34.1/arch/x86/include/asm/vmi.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/vmi.h 2010-07-07 09:04:46.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.34/arch/x86/include/asm/vsyscall.h linux-2.6.34/arch/x86/include/asm/vsyscall.h
---- linux-2.6.34/arch/x86/include/asm/vsyscall.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/vsyscall.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/vsyscall.h linux-2.6.34.1/arch/x86/include/asm/vsyscall.h
+--- linux-2.6.34.1/arch/x86/include/asm/vsyscall.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/vsyscall.h 2010-07-07 09:04:46.000000000 -0400
@@ -15,9 +15,10 @@ enum vsyscall_num {
#ifdef __KERNEL__
#endif /* __KERNEL__ */
#endif /* _ASM_X86_VSYSCALL_H */
-diff -urNp linux-2.6.34/arch/x86/include/asm/xsave.h linux-2.6.34/arch/x86/include/asm/xsave.h
---- linux-2.6.34/arch/x86/include/asm/xsave.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/include/asm/xsave.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/include/asm/xsave.h linux-2.6.34.1/arch/x86/include/asm/xsave.h
+--- linux-2.6.34.1/arch/x86/include/asm/xsave.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/include/asm/xsave.h 2010-07-07 09:04:46.000000000 -0400
@@ -58,6 +58,12 @@ static inline int xrstor_checking(struct
static inline int xsave_user(struct xsave_struct __user *buf)
{
__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
"2:\n"
".section .fixup,\"ax\"\n"
-diff -urNp linux-2.6.34/arch/x86/Kconfig linux-2.6.34/arch/x86/Kconfig
---- linux-2.6.34/arch/x86/Kconfig 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/Kconfig 2010-07-01 20:45:16.000000000 -0400
-@@ -1123,7 +1123,7 @@ config PAGE_OFFSET
- hex
- default 0xB0000000 if VMSPLIT_3G_OPT
- default 0x80000000 if VMSPLIT_2G
-- default 0x78000000 if VMSPLIT_2G_OPT
-+ default 0x70000000 if VMSPLIT_2G_OPT
- default 0x40000000 if VMSPLIT_1G
- default 0xC0000000
- depends on X86_32
-@@ -1457,7 +1457,7 @@ config ARCH_USES_PG_UNCACHED
-
- config EFI
- bool "EFI runtime service support"
-- depends on ACPI
-+ depends on ACPI && !PAX_KERNEXEC
- ---help---
- This enables the kernel to use EFI runtime services that are
- available (such as the EFI variable services).
-@@ -1544,6 +1544,7 @@ config KEXEC_JUMP
- config PHYSICAL_START
- hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
- default "0x1000000"
-+ range 0x400000 0x40000000
- ---help---
- This gives the physical address where the kernel is loaded.
-
-@@ -1608,6 +1609,7 @@ config PHYSICAL_ALIGN
- hex
- prompt "Alignment value to which kernel should be aligned" if X86_32
- default "0x1000000"
-+ range 0x400000 0x1000000 if PAX_KERNEXEC
- range 0x2000 0x1000000
- ---help---
- This value puts the alignment restrictions on physical address
-@@ -1639,9 +1641,10 @@ config HOTPLUG_CPU
- Say N if you want to disable CPU hotplug.
-
- config COMPAT_VDSO
-- def_bool y
-+ def_bool n
- prompt "Compat VDSO support"
- depends on X86_32 || IA32_EMULATION
-+ depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
- ---help---
- Map the 32-bit VDSO to the predictable old-style address too.
-
-diff -urNp linux-2.6.34/arch/x86/Kconfig.cpu linux-2.6.34/arch/x86/Kconfig.cpu
---- linux-2.6.34/arch/x86/Kconfig.cpu 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/Kconfig.cpu 2010-07-01 20:45:14.000000000 -0400
-@@ -336,7 +336,7 @@ config X86_PPRO_FENCE
-
- config X86_F00F_BUG
- def_bool y
-- depends on M586MMX || M586TSC || M586 || M486 || M386
-+ depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
-
- config X86_WP_WORKS_OK
- def_bool y
-@@ -356,7 +356,7 @@ config X86_POPAD_OK
-
- config X86_ALIGNMENT_16
- def_bool y
-- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
-+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
-
- config X86_INTEL_USERCOPY
- def_bool y
-@@ -402,7 +402,7 @@ config X86_CMPXCHG64
- # generates cmov.
- config X86_CMOV
- def_bool y
-- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
-+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
-
- config X86_MINIMUM_CPU_FAMILY
- int
-diff -urNp linux-2.6.34/arch/x86/Kconfig.debug linux-2.6.34/arch/x86/Kconfig.debug
---- linux-2.6.34/arch/x86/Kconfig.debug 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/Kconfig.debug 2010-07-01 20:45:14.000000000 -0400
-@@ -99,7 +99,7 @@ config X86_PTDUMP
- config DEBUG_RODATA
- bool "Write protect kernel read-only data structures"
- default y
-- depends on DEBUG_KERNEL
-+ depends on DEBUG_KERNEL && BROKEN
- ---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.34/arch/x86/kernel/acpi/boot.c linux-2.6.34/arch/x86/kernel/acpi/boot.c
---- linux-2.6.34/arch/x86/kernel/acpi/boot.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/acpi/boot.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/acpi/boot.c linux-2.6.34.1/arch/x86/kernel/acpi/boot.c
+--- linux-2.6.34.1/arch/x86/kernel/acpi/boot.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/acpi/boot.c 2010-07-07 09:04:46.000000000 -0400
@@ -1436,7 +1436,7 @@ static struct dmi_system_id __initdata a
DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
},
};
/*
-diff -urNp linux-2.6.34/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.34/arch/x86/kernel/acpi/realmode/wakeup.S
---- linux-2.6.34/arch/x86/kernel/acpi/realmode/wakeup.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/acpi/realmode/wakeup.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.34.1/arch/x86/kernel/acpi/realmode/wakeup.S
+--- linux-2.6.34.1/arch/x86/kernel/acpi/realmode/wakeup.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/acpi/realmode/wakeup.S 2010-07-07 09:04:46.000000000 -0400
@@ -104,7 +104,7 @@ _start:
movl %eax, %ecx
orl %edx, %ecx
wrmsr
1:
-diff -urNp linux-2.6.34/arch/x86/kernel/acpi/sleep.c linux-2.6.34/arch/x86/kernel/acpi/sleep.c
---- linux-2.6.34/arch/x86/kernel/acpi/sleep.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/acpi/sleep.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/acpi/sleep.c linux-2.6.34.1/arch/x86/kernel/acpi/sleep.c
+--- linux-2.6.34.1/arch/x86/kernel/acpi/sleep.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/acpi/sleep.c 2010-07-07 09:04:46.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.34/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.34/arch/x86/kernel/acpi/wakeup_32.S
---- linux-2.6.34/arch/x86/kernel/acpi/wakeup_32.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/acpi/wakeup_32.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.34.1/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-2.6.34.1/arch/x86/kernel/acpi/wakeup_32.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/acpi/wakeup_32.S 2010-07-07 09:04:46.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.34/arch/x86/kernel/alternative.c linux-2.6.34/arch/x86/kernel/alternative.c
---- linux-2.6.34/arch/x86/kernel/alternative.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/alternative.c 2010-07-03 09:56:01.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/alternative.c linux-2.6.34.1/arch/x86/kernel/alternative.c
+--- linux-2.6.34.1/arch/x86/kernel/alternative.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/alternative.c 2010-07-07 09:04:46.000000000 -0400
@@ -429,7 +429,7 @@ void __init_or_module apply_paravirt(str
BUG_ON(p->len > MAX_PATCH_LEN);
return addr;
}
-diff -urNp linux-2.6.34/arch/x86/kernel/amd_iommu.c linux-2.6.34/arch/x86/kernel/amd_iommu.c
---- linux-2.6.34/arch/x86/kernel/amd_iommu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/amd_iommu.c 2010-07-01 20:45:14.000000000 -0400
-@@ -2211,7 +2211,7 @@ static void prealloc_protection_domains(
+diff -urNp linux-2.6.34.1/arch/x86/kernel/amd_iommu.c linux-2.6.34.1/arch/x86/kernel/amd_iommu.c
+--- linux-2.6.34.1/arch/x86/kernel/amd_iommu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/amd_iommu.c 2010-07-07 09:04:46.000000000 -0400
+@@ -2217,7 +2217,7 @@ static void prealloc_protection_domains(
}
}
.alloc_coherent = alloc_coherent,
.free_coherent = free_coherent,
.map_page = map_page,
-diff -urNp linux-2.6.34/arch/x86/kernel/apic/io_apic.c linux-2.6.34/arch/x86/kernel/apic/io_apic.c
---- linux-2.6.34/arch/x86/kernel/apic/io_apic.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/apic/io_apic.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/apic/io_apic.c linux-2.6.34.1/arch/x86/kernel/apic/io_apic.c
+--- linux-2.6.34.1/arch/x86/kernel/apic/io_apic.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/apic/io_apic.c 2010-07-07 09:04:46.000000000 -0400
@@ -688,7 +688,7 @@ struct IO_APIC_route_entry **alloc_ioapi
ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
GFP_ATOMIC);
{
raw_spin_unlock(&vector_lock);
}
-diff -urNp linux-2.6.34/arch/x86/kernel/apm_32.c linux-2.6.34/arch/x86/kernel/apm_32.c
---- linux-2.6.34/arch/x86/kernel/apm_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/apm_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/apm_32.c linux-2.6.34.1/arch/x86/kernel/apm_32.c
+--- linux-2.6.34.1/arch/x86/kernel/apm_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/apm_32.c 2010-07-07 09:04:47.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.34/arch/x86/kernel/asm-offsets_32.c linux-2.6.34/arch/x86/kernel/asm-offsets_32.c
---- linux-2.6.34/arch/x86/kernel/asm-offsets_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/asm-offsets_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/asm-offsets_32.c linux-2.6.34.1/arch/x86/kernel/asm-offsets_32.c
+--- linux-2.6.34.1/arch/x86/kernel/asm-offsets_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/asm-offsets_32.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/asm-offsets_64.c linux-2.6.34/arch/x86/kernel/asm-offsets_64.c
---- linux-2.6.34/arch/x86/kernel/asm-offsets_64.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/asm-offsets_64.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/asm-offsets_64.c linux-2.6.34.1/arch/x86/kernel/asm-offsets_64.c
+--- linux-2.6.34.1/arch/x86/kernel/asm-offsets_64.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/asm-offsets_64.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/cpu/common.c linux-2.6.34/arch/x86/kernel/cpu/common.c
---- linux-2.6.34/arch/x86/kernel/cpu/common.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/cpu/common.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/cpu/Makefile linux-2.6.34.1/arch/x86/kernel/cpu/Makefile
+--- linux-2.6.34.1/arch/x86/kernel/cpu/Makefile 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/cpu/Makefile 2010-07-07 09:04:48.000000000 -0400
+@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
+ CFLAGS_REMOVE_perf_event.o = -pg
+ endif
+
+-# Make sure load_percpu_segment has no stackprotector
+-nostackp := $(call cc-option, -fno-stack-protector)
+-CFLAGS_common.o := $(nostackp)
+-
+ obj-y := intel_cacheinfo.o addon_cpuid_features.o
+ obj-y += proc.o capflags.o powerflags.o common.o
+ obj-y += vmware.o hypervisor.o sched.o
+diff -urNp linux-2.6.34.1/arch/x86/kernel/cpu/common.c linux-2.6.34.1/arch/x86/kernel/cpu/common.c
+--- linux-2.6.34.1/arch/x86/kernel/cpu/common.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/cpu/common.c 2010-07-07 09:04:48.000000000 -0400
@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
struct thread_struct *thread = &curr->thread;
if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-2.6.34/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.34/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
---- linux-2.6.34/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.34.1/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+--- linux-2.6.34.1/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-07-07 09:04:48.000000000 -0400
@@ -524,7 +524,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.34/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.34/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
---- linux-2.6.34/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.34.1/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
+--- linux-2.6.34.1/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/cpu/intel.c linux-2.6.34/arch/x86/kernel/cpu/intel.c
---- linux-2.6.34/arch/x86/kernel/cpu/intel.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/cpu/intel.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/cpu/intel.c linux-2.6.34.1/arch/x86/kernel/cpu/intel.c
+--- linux-2.6.34.1/arch/x86/kernel/cpu/intel.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/cpu/intel.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/cpu/Makefile linux-2.6.34/arch/x86/kernel/cpu/Makefile
---- linux-2.6.34/arch/x86/kernel/cpu/Makefile 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/cpu/Makefile 2010-07-01 20:45:14.000000000 -0400
-@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
- CFLAGS_REMOVE_perf_event.o = -pg
- endif
-
--# Make sure load_percpu_segment has no stackprotector
--nostackp := $(call cc-option, -fno-stack-protector)
--CFLAGS_common.o := $(nostackp)
--
- obj-y := intel_cacheinfo.o addon_cpuid_features.o
- obj-y += proc.o capflags.o powerflags.o common.o
- obj-y += vmware.o hypervisor.o sched.o
-diff -urNp linux-2.6.34/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.34/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-2.6.34/arch/x86/kernel/cpu/mcheck/mce.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/cpu/mcheck/mce.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.34.1/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-2.6.34.1/arch/x86/kernel/cpu/mcheck/mce.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/cpu/mcheck/mce.c 2010-07-07 09:04:48.000000000 -0400
@@ -209,7 +209,7 @@ static void print_mce(struct mce *m)
!(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
m->cs, m->ip);
};
/*
-diff -urNp linux-2.6.34/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.34/arch/x86/kernel/cpu/mtrr/generic.c
---- linux-2.6.34/arch/x86/kernel/cpu/mtrr/generic.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/cpu/mtrr/generic.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.34.1/arch/x86/kernel/cpu/mtrr/generic.c
+--- linux-2.6.34.1/arch/x86/kernel/cpu/mtrr/generic.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/cpu/mtrr/generic.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.34/arch/x86/kernel/cpu/mtrr/main.c
---- linux-2.6.34/arch/x86/kernel/cpu/mtrr/main.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/cpu/mtrr/main.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.34.1/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-2.6.34.1/arch/x86/kernel/cpu/mtrr/main.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/cpu/mtrr/main.c 2010-07-07 09:04:48.000000000 -0400
@@ -60,7 +60,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.34/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.34/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-2.6.34/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.34.1/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-2.6.34.1/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-07-07 09:04:48.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.34/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.34/arch/x86/kernel/cpu/perfctr-watchdog.c
---- linux-2.6.34/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/cpu/perf_event.c linux-2.6.34.1/arch/x86/kernel/cpu/perf_event.c
+--- linux-2.6.34.1/arch/x86/kernel/cpu/perf_event.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/cpu/perf_event.c 2010-07-07 09:04:48.000000000 -0400
+@@ -1702,7 +1702,7 @@ perf_callchain_user(struct pt_regs *regs
+ break;
+
+ callchain_store(entry, frame.return_address);
+- fp = frame.next_frame;
++ fp = (__force const void __user *)frame.next_frame;
+ }
+ }
+
+diff -urNp linux-2.6.34.1/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.34.1/arch/x86/kernel/cpu/perfctr-watchdog.c
+--- linux-2.6.34.1/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/cpu/perf_event.c linux-2.6.34/arch/x86/kernel/cpu/perf_event.c
---- linux-2.6.34/arch/x86/kernel/cpu/perf_event.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/cpu/perf_event.c 2010-07-01 20:45:14.000000000 -0400
-@@ -1699,7 +1699,7 @@ perf_callchain_user(struct pt_regs *regs
- break;
-
- callchain_store(entry, frame.return_address);
-- fp = frame.next_frame;
-+ fp = (__force const void __user *)frame.next_frame;
- }
- }
-
-diff -urNp linux-2.6.34/arch/x86/kernel/crash.c linux-2.6.34/arch/x86/kernel/crash.c
---- linux-2.6.34/arch/x86/kernel/crash.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/crash.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/crash.c linux-2.6.34.1/arch/x86/kernel/crash.c
+--- linux-2.6.34.1/arch/x86/kernel/crash.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/crash.c 2010-07-07 09:04:48.000000000 -0400
@@ -40,7 +40,7 @@ static void kdump_nmi_callback(int cpu,
regs = args->regs;
crash_fixup_ss_esp(&fixed_regs, regs);
regs = &fixed_regs;
}
-diff -urNp linux-2.6.34/arch/x86/kernel/doublefault_32.c linux-2.6.34/arch/x86/kernel/doublefault_32.c
---- linux-2.6.34/arch/x86/kernel/doublefault_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/doublefault_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/doublefault_32.c linux-2.6.34.1/arch/x86/kernel/doublefault_32.c
+--- linux-2.6.34.1/arch/x86/kernel/doublefault_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/doublefault_32.c 2010-07-07 09:04:48.000000000 -0400
@@ -11,7 +11,7 @@
#define DOUBLEFAULT_STACKSIZE (1024)
.fs = __KERNEL_PERCPU,
.__cr3 = __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-2.6.34/arch/x86/kernel/dumpstack_32.c linux-2.6.34/arch/x86/kernel/dumpstack_32.c
---- linux-2.6.34/arch/x86/kernel/dumpstack_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/dumpstack_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/dumpstack.c linux-2.6.34.1/arch/x86/kernel/dumpstack.c
+--- linux-2.6.34.1/arch/x86/kernel/dumpstack.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/dumpstack.c 2010-07-07 09:04:48.000000000 -0400
+@@ -207,7 +207,7 @@ void dump_stack(void)
+ #endif
+
+ printk("Pid: %d, comm: %.20s %s %s %.*s\n",
+- current->pid, current->comm, print_tainted(),
++ task_pid_nr(current), current->comm, print_tainted(),
+ init_utsname()->release,
+ (int)strcspn(init_utsname()->version, " "),
+ init_utsname()->version);
+@@ -268,7 +268,7 @@ void __kprobes oops_end(unsigned long fl
+ panic("Fatal exception in interrupt");
+ if (panic_on_oops)
+ panic("Fatal exception");
+- do_exit(signr);
++ do_group_exit(signr);
+ }
+
+ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
+@@ -295,7 +295,7 @@ int __kprobes __die(const char *str, str
+
+ show_registers(regs);
+ #ifdef CONFIG_X86_32
+- if (user_mode_vm(regs)) {
++ if (user_mode(regs)) {
+ sp = regs->sp;
+ ss = regs->ss & 0xffff;
+ } else {
+@@ -323,7 +323,7 @@ void die(const char *str, struct pt_regs
+ unsigned long flags = oops_begin();
+ int sig = SIGSEGV;
+
+- if (!user_mode_vm(regs))
++ if (!user_mode(regs))
+ report_bug(regs->ip, regs);
+
+ if (__die(str, regs, err))
+diff -urNp linux-2.6.34.1/arch/x86/kernel/dumpstack_32.c linux-2.6.34.1/arch/x86/kernel/dumpstack_32.c
+--- linux-2.6.34.1/arch/x86/kernel/dumpstack_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/dumpstack_32.c 2010-07-07 09:04:48.000000000 -0400
@@ -107,11 +107,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..
if (ip < PAGE_OFFSET)
return 0;
if (probe_kernel_address((unsigned short *)ip, ud2))
-diff -urNp linux-2.6.34/arch/x86/kernel/dumpstack.c linux-2.6.34/arch/x86/kernel/dumpstack.c
---- linux-2.6.34/arch/x86/kernel/dumpstack.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/dumpstack.c 2010-07-01 20:45:14.000000000 -0400
-@@ -207,7 +207,7 @@ void dump_stack(void)
- #endif
-
- printk("Pid: %d, comm: %.20s %s %s %.*s\n",
-- current->pid, current->comm, print_tainted(),
-+ task_pid_nr(current), current->comm, print_tainted(),
- init_utsname()->release,
- (int)strcspn(init_utsname()->version, " "),
- init_utsname()->version);
-@@ -268,7 +268,7 @@ void __kprobes oops_end(unsigned long fl
- panic("Fatal exception in interrupt");
- if (panic_on_oops)
- panic("Fatal exception");
-- do_exit(signr);
-+ do_group_exit(signr);
- }
-
- int __kprobes __die(const char *str, struct pt_regs *regs, long err)
-@@ -295,7 +295,7 @@ int __kprobes __die(const char *str, str
-
- show_registers(regs);
- #ifdef CONFIG_X86_32
-- if (user_mode_vm(regs)) {
-+ if (user_mode(regs)) {
- sp = regs->sp;
- ss = regs->ss & 0xffff;
- } else {
-@@ -323,7 +323,7 @@ void die(const char *str, struct pt_regs
- unsigned long flags = oops_begin();
- int sig = SIGSEGV;
-
-- if (!user_mode_vm(regs))
-+ if (!user_mode(regs))
- report_bug(regs->ip, regs);
-
- if (__die(str, regs, err))
-diff -urNp linux-2.6.34/arch/x86/kernel/efi_32.c linux-2.6.34/arch/x86/kernel/efi_32.c
---- linux-2.6.34/arch/x86/kernel/efi_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/efi_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/efi_32.c linux-2.6.34.1/arch/x86/kernel/efi_32.c
+--- linux-2.6.34.1/arch/x86/kernel/efi_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/efi_32.c 2010-07-07 09:04:48.000000000 -0400
@@ -38,70 +38,38 @@
*/
/*
* After the lock is released, the original page table is restored.
-diff -urNp linux-2.6.34/arch/x86/kernel/efi_stub_32.S linux-2.6.34/arch/x86/kernel/efi_stub_32.S
---- linux-2.6.34/arch/x86/kernel/efi_stub_32.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/efi_stub_32.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/efi_stub_32.S linux-2.6.34.1/arch/x86/kernel/efi_stub_32.S
+--- linux-2.6.34.1/arch/x86/kernel/efi_stub_32.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/efi_stub_32.S 2010-07-07 09:04:48.000000000 -0400
@@ -6,6 +6,7 @@
*/
saved_return_addr:
.long 0
efi_rt_function_ptr:
-diff -urNp linux-2.6.34/arch/x86/kernel/entry_32.S linux-2.6.34/arch/x86/kernel/entry_32.S
---- linux-2.6.34/arch/x86/kernel/entry_32.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/entry_32.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/entry_32.S linux-2.6.34.1/arch/x86/kernel/entry_32.S
+--- linux-2.6.34.1/arch/x86/kernel/entry_32.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/entry_32.S 2010-07-07 09:04:48.000000000 -0400
@@ -191,7 +191,67 @@
#endif /* CONFIG_X86_32_LAZY_GS */
RESTORE_REGS
lss 12+4(%esp), %esp # back to espfix stack
CFI_ADJUST_CFA_OFFSET -24
-diff -urNp linux-2.6.34/arch/x86/kernel/entry_64.S linux-2.6.34/arch/x86/kernel/entry_64.S
---- linux-2.6.34/arch/x86/kernel/entry_64.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/entry_64.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/entry_64.S linux-2.6.34.1/arch/x86/kernel/entry_64.S
+--- linux-2.6.34.1/arch/x86/kernel/entry_64.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/entry_64.S 2010-07-07 09:04:48.000000000 -0400
@@ -53,6 +53,7 @@
#include <asm/paravirt.h>
#include <asm/ftrace.h>
RESTORE_ALL 8
jmp irq_return
nmi_userspace:
-diff -urNp linux-2.6.34/arch/x86/kernel/ftrace.c linux-2.6.34/arch/x86/kernel/ftrace.c
---- linux-2.6.34/arch/x86/kernel/ftrace.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/ftrace.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/ftrace.c linux-2.6.34.1/arch/x86/kernel/ftrace.c
+--- linux-2.6.34.1/arch/x86/kernel/ftrace.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/ftrace.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/head32.c linux-2.6.34/arch/x86/kernel/head32.c
---- linux-2.6.34/arch/x86/kernel/head32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/head32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/head32.c linux-2.6.34.1/arch/x86/kernel/head32.c
+--- linux-2.6.34.1/arch/x86/kernel/head32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/head32.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/head_32.S linux-2.6.34/arch/x86/kernel/head_32.S
---- linux-2.6.34/arch/x86/kernel/head_32.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/head_32.S 2010-07-03 09:51:21.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/head_32.S linux-2.6.34.1/arch/x86/kernel/head_32.S
+--- linux-2.6.34.1/arch/x86/kernel/head_32.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/head_32.S 2010-07-07 09:04:48.000000000 -0400
@@ -25,6 +25,12 @@
/* Physical address */
#define pa(X) ((X) - __PAGE_OFFSET)
+ /* 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.34/arch/x86/kernel/head_64.S linux-2.6.34/arch/x86/kernel/head_64.S
---- linux-2.6.34/arch/x86/kernel/head_64.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/head_64.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/head_64.S linux-2.6.34.1/arch/x86/kernel/head_64.S
+--- linux-2.6.34.1/arch/x86/kernel/head_64.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/head_64.S 2010-07-07 09:04:48.000000000 -0400
@@ -19,6 +19,7 @@
#include <asm/cache.h>
#include <asm/processor-flags.h>
__PAGE_ALIGNED_BSS
.align PAGE_SIZE
-diff -urNp linux-2.6.34/arch/x86/kernel/i386_ksyms_32.c linux-2.6.34/arch/x86/kernel/i386_ksyms_32.c
---- linux-2.6.34/arch/x86/kernel/i386_ksyms_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/i386_ksyms_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/i386_ksyms_32.c linux-2.6.34.1/arch/x86/kernel/i386_ksyms_32.c
+--- linux-2.6.34.1/arch/x86/kernel/i386_ksyms_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/i386_ksyms_32.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/init_task.c linux-2.6.34/arch/x86/kernel/init_task.c
---- linux-2.6.34/arch/x86/kernel/init_task.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/init_task.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/init_task.c linux-2.6.34.1/arch/x86/kernel/init_task.c
+--- linux-2.6.34.1/arch/x86/kernel/init_task.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/init_task.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/ioport.c linux-2.6.34/arch/x86/kernel/ioport.c
---- linux-2.6.34/arch/x86/kernel/ioport.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/ioport.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/ioport.c linux-2.6.34.1/arch/x86/kernel/ioport.c
+--- linux-2.6.34.1/arch/x86/kernel/ioport.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/ioport.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/irq_32.c linux-2.6.34/arch/x86/kernel/irq_32.c
---- linux-2.6.34/arch/x86/kernel/irq_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/irq_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/irq_32.c linux-2.6.34.1/arch/x86/kernel/irq_32.c
+--- linux-2.6.34.1/arch/x86/kernel/irq_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/irq_32.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/kgdb.c linux-2.6.34/arch/x86/kernel/kgdb.c
---- linux-2.6.34/arch/x86/kernel/kgdb.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/kgdb.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/kgdb.c linux-2.6.34.1/arch/x86/kernel/kgdb.c
+--- linux-2.6.34.1/arch/x86/kernel/kgdb.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/kgdb.c 2010-07-07 09:04:48.000000000 -0400
@@ -89,7 +89,7 @@ void pt_regs_to_gdb_regs(unsigned long *
gdb_regs[GDB_CS] = regs->cs;
gdb_regs[GDB_FS] = 0xFFFF;
/* Breakpoint instruction: */
.gdb_bpt_instr = { 0xcc },
.flags = KGDB_HW_BREAKPOINT,
-diff -urNp linux-2.6.34/arch/x86/kernel/kprobes.c linux-2.6.34/arch/x86/kernel/kprobes.c
---- linux-2.6.34/arch/x86/kernel/kprobes.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/kprobes.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/kprobes.c linux-2.6.34.1/arch/x86/kernel/kprobes.c
+--- linux-2.6.34.1/arch/x86/kernel/kprobes.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/kprobes.c 2010-07-07 09:04:48.000000000 -0400
@@ -114,9 +114,12 @@ static void __kprobes __synthesize_relat
s32 raddr;
} __attribute__((packed)) *insn;
return ret;
switch (val) {
-diff -urNp linux-2.6.34/arch/x86/kernel/ldt.c linux-2.6.34/arch/x86/kernel/ldt.c
---- linux-2.6.34/arch/x86/kernel/ldt.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/ldt.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/ldt.c linux-2.6.34.1/arch/x86/kernel/ldt.c
+--- linux-2.6.34.1/arch/x86/kernel/ldt.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/ldt.c 2010-07-07 09:04:48.000000000 -0400
@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i
if (reload) {
#ifdef CONFIG_SMP
fill_ldt(&ldt, &ldt_info);
if (oldmode)
ldt.avl = 0;
-diff -urNp linux-2.6.34/arch/x86/kernel/machine_kexec_32.c linux-2.6.34/arch/x86/kernel/machine_kexec_32.c
---- linux-2.6.34/arch/x86/kernel/machine_kexec_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/machine_kexec_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/machine_kexec_32.c linux-2.6.34.1/arch/x86/kernel/machine_kexec_32.c
+--- linux-2.6.34.1/arch/x86/kernel/machine_kexec_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/machine_kexec_32.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/microcode_amd.c linux-2.6.34/arch/x86/kernel/microcode_amd.c
---- linux-2.6.34/arch/x86/kernel/microcode_amd.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/microcode_amd.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/microcode_amd.c linux-2.6.34.1/arch/x86/kernel/microcode_amd.c
+--- linux-2.6.34.1/arch/x86/kernel/microcode_amd.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/microcode_amd.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/microcode_core.c linux-2.6.34/arch/x86/kernel/microcode_core.c
---- linux-2.6.34/arch/x86/kernel/microcode_core.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/microcode_core.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/microcode_core.c linux-2.6.34.1/arch/x86/kernel/microcode_core.c
+--- linux-2.6.34.1/arch/x86/kernel/microcode_core.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/microcode_core.c 2010-07-07 09:04:48.000000000 -0400
@@ -92,7 +92,7 @@ MODULE_LICENSE("GPL");
#define MICROCODE_VERSION "2.00"
/*
* Synchronization.
-diff -urNp linux-2.6.34/arch/x86/kernel/microcode_intel.c linux-2.6.34/arch/x86/kernel/microcode_intel.c
---- linux-2.6.34/arch/x86/kernel/microcode_intel.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/microcode_intel.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/microcode_intel.c linux-2.6.34.1/arch/x86/kernel/microcode_intel.c
+--- linux-2.6.34.1/arch/x86/kernel/microcode_intel.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/microcode_intel.c 2010-07-07 09:04:48.000000000 -0400
@@ -436,13 +436,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.34/arch/x86/kernel/module.c linux-2.6.34/arch/x86/kernel/module.c
---- linux-2.6.34/arch/x86/kernel/module.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/module.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/module.c linux-2.6.34.1/arch/x86/kernel/module.c
+--- linux-2.6.34.1/arch/x86/kernel/module.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/module.c 2010-07-07 09:04:48.000000000 -0400
@@ -35,7 +35,7 @@
#define DEBUGP(fmt...)
#endif
#if 0
if ((s64)val != *(s32 *)loc)
goto overflow;
-diff -urNp linux-2.6.34/arch/x86/kernel/paravirt.c linux-2.6.34/arch/x86/kernel/paravirt.c
---- linux-2.6.34/arch/x86/kernel/paravirt.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/paravirt.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.34.1/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-2.6.34.1/arch/x86/kernel/paravirt-spinlocks.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/paravirt-spinlocks.c 2010-07-07 09:04:48.000000000 -0400
+@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t
+ arch_spin_lock(lock);
+ }
+
+-struct pv_lock_ops pv_lock_ops = {
++struct pv_lock_ops pv_lock_ops __read_only = {
+ #ifdef CONFIG_SMP
+ .spin_is_locked = __ticket_spin_is_locked,
+ .spin_is_contended = __ticket_spin_is_contended,
+diff -urNp linux-2.6.34.1/arch/x86/kernel/paravirt.c linux-2.6.34.1/arch/x86/kernel/paravirt.c
+--- linux-2.6.34.1/arch/x86/kernel/paravirt.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/paravirt.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.34/arch/x86/kernel/paravirt-spinlocks.c
---- linux-2.6.34/arch/x86/kernel/paravirt-spinlocks.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/paravirt-spinlocks.c 2010-07-01 20:45:14.000000000 -0400
-@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t
- arch_spin_lock(lock);
- }
-
--struct pv_lock_ops pv_lock_ops = {
-+struct pv_lock_ops pv_lock_ops __read_only = {
- #ifdef CONFIG_SMP
- .spin_is_locked = __ticket_spin_is_locked,
- .spin_is_contended = __ticket_spin_is_contended,
-diff -urNp linux-2.6.34/arch/x86/kernel/pci-calgary_64.c linux-2.6.34/arch/x86/kernel/pci-calgary_64.c
---- linux-2.6.34/arch/x86/kernel/pci-calgary_64.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/pci-calgary_64.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/pci-calgary_64.c linux-2.6.34.1/arch/x86/kernel/pci-calgary_64.c
+--- linux-2.6.34.1/arch/x86/kernel/pci-calgary_64.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/pci-calgary_64.c 2010-07-07 09:04:48.000000000 -0400
@@ -470,7 +470,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.34/arch/x86/kernel/pci-dma.c linux-2.6.34/arch/x86/kernel/pci-dma.c
---- linux-2.6.34/arch/x86/kernel/pci-dma.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/pci-dma.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/pci-dma.c linux-2.6.34.1/arch/x86/kernel/pci-dma.c
+--- linux-2.6.34.1/arch/x86/kernel/pci-dma.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/pci-dma.c 2010-07-07 09:04:48.000000000 -0400
@@ -16,7 +16,7 @@
static int forbid_dac __read_mostly;
#ifdef CONFIG_PCI
if (mask > 0xffffffff && forbid_dac > 0) {
-diff -urNp linux-2.6.34/arch/x86/kernel/pci-gart_64.c linux-2.6.34/arch/x86/kernel/pci-gart_64.c
---- linux-2.6.34/arch/x86/kernel/pci-gart_64.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/pci-gart_64.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/pci-gart_64.c linux-2.6.34.1/arch/x86/kernel/pci-gart_64.c
+--- linux-2.6.34.1/arch/x86/kernel/pci-gart_64.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/pci-gart_64.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/pci-nommu.c linux-2.6.34/arch/x86/kernel/pci-nommu.c
---- linux-2.6.34/arch/x86/kernel/pci-nommu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/pci-nommu.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/pci-nommu.c linux-2.6.34.1/arch/x86/kernel/pci-nommu.c
+--- linux-2.6.34.1/arch/x86/kernel/pci-nommu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/pci-nommu.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/pci-swiotlb.c linux-2.6.34/arch/x86/kernel/pci-swiotlb.c
---- linux-2.6.34/arch/x86/kernel/pci-swiotlb.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/pci-swiotlb.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/pci-swiotlb.c linux-2.6.34.1/arch/x86/kernel/pci-swiotlb.c
+--- linux-2.6.34.1/arch/x86/kernel/pci-swiotlb.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/pci-swiotlb.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/process_32.c linux-2.6.34/arch/x86/kernel/process_32.c
---- linux-2.6.34/arch/x86/kernel/process_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/process_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/process.c linux-2.6.34.1/arch/x86/kernel/process.c
+--- linux-2.6.34.1/arch/x86/kernel/process.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/process.c 2010-07-07 09:04:48.000000000 -0400
+@@ -78,7 +78,7 @@ void exit_thread(void)
+ unsigned long *bp = t->io_bitmap_ptr;
+
+ if (bp) {
+- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
++ struct tss_struct *tss = init_tss + get_cpu();
+
+ t->io_bitmap_ptr = NULL;
+ clear_thread_flag(TIF_IO_BITMAP);
+@@ -112,7 +112,7 @@ void show_regs_common(void)
+
+ printk(KERN_CONT "\n");
+ printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s %s/%s\n",
+- current->pid, current->comm, print_tainted(),
++ task_pid_nr(current), current->comm, print_tainted(),
+ init_utsname()->release,
+ (int)strcspn(init_utsname()->version, " "),
+ init_utsname()->version, board, product);
+@@ -122,6 +122,9 @@ void flush_thread(void)
+ {
+ struct task_struct *tsk = current;
+
++#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR)
++ loadsegment(gs, 0);
++#endif
+ 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
+ regs.di = (unsigned long) arg;
+
+ #ifdef CONFIG_X86_32
+- regs.ds = __USER_DS;
+- regs.es = __USER_DS;
++ regs.ds = __KERNEL_DS;
++ regs.es = __KERNEL_DS;
+ regs.fs = __KERNEL_PERCPU;
+ regs.gs = __KERNEL_STACK_CANARY;
+ #else
+@@ -689,17 +692,3 @@ static int __init idle_setup(char *str)
+ return 0;
+ }
+ early_param("idle", idle_setup);
+-
+-unsigned long arch_align_stack(unsigned long sp)
+-{
+- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
+- sp -= get_random_int() % 8192;
+- return sp & ~0xf;
+-}
+-
+-unsigned long arch_randomize_brk(struct mm_struct *mm)
+-{
+- unsigned long range_end = mm->brk + 0x02000000;
+- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+-}
+-
+diff -urNp linux-2.6.34.1/arch/x86/kernel/process_32.c linux-2.6.34.1/arch/x86/kernel/process_32.c
+--- linux-2.6.34.1/arch/x86/kernel/process_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/process_32.c 2010-07-07 09:04:48.000000000 -0400
@@ -66,6 +66,7 @@ asmlinkage void ret_from_fork(void) __as
unsigned long thread_saved_pc(struct task_struct *tsk)
{
+ load_sp0(init_tss + smp_processor_id(), thread);
+}
+#endif
-diff -urNp linux-2.6.34/arch/x86/kernel/process_64.c linux-2.6.34/arch/x86/kernel/process_64.c
---- linux-2.6.34/arch/x86/kernel/process_64.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/process_64.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/process_64.c linux-2.6.34.1/arch/x86/kernel/process_64.c
+--- linux-2.6.34.1/arch/x86/kernel/process_64.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/process_64.c 2010-07-07 09:04:48.000000000 -0400
@@ -88,7 +88,7 @@ static void __exit_idle(void)
void exit_idle(void)
{
return 0;
ip = *(u64 *)(fp+8);
if (!in_sched_functions(ip))
-diff -urNp linux-2.6.34/arch/x86/kernel/process.c linux-2.6.34/arch/x86/kernel/process.c
---- linux-2.6.34/arch/x86/kernel/process.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/process.c 2010-07-01 20:45:14.000000000 -0400
-@@ -78,7 +78,7 @@ void exit_thread(void)
- unsigned long *bp = t->io_bitmap_ptr;
-
- if (bp) {
-- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
-+ struct tss_struct *tss = init_tss + get_cpu();
-
- t->io_bitmap_ptr = NULL;
- clear_thread_flag(TIF_IO_BITMAP);
-@@ -112,7 +112,7 @@ void show_regs_common(void)
-
- printk(KERN_CONT "\n");
- printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s %s/%s\n",
-- current->pid, current->comm, print_tainted(),
-+ task_pid_nr(current), current->comm, print_tainted(),
- init_utsname()->release,
- (int)strcspn(init_utsname()->version, " "),
- init_utsname()->version, board, product);
-@@ -122,6 +122,9 @@ void flush_thread(void)
- {
- struct task_struct *tsk = current;
-
-+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR)
-+ loadsegment(gs, 0);
-+#endif
- 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
- regs.di = (unsigned long) arg;
-
- #ifdef CONFIG_X86_32
-- regs.ds = __USER_DS;
-- regs.es = __USER_DS;
-+ regs.ds = __KERNEL_DS;
-+ regs.es = __KERNEL_DS;
- regs.fs = __KERNEL_PERCPU;
- regs.gs = __KERNEL_STACK_CANARY;
- #else
-@@ -689,17 +692,3 @@ static int __init idle_setup(char *str)
- return 0;
- }
- early_param("idle", idle_setup);
--
--unsigned long arch_align_stack(unsigned long sp)
--{
-- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
-- sp -= get_random_int() % 8192;
-- return sp & ~0xf;
--}
--
--unsigned long arch_randomize_brk(struct mm_struct *mm)
--{
-- unsigned long range_end = mm->brk + 0x02000000;
-- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
--}
--
-diff -urNp linux-2.6.34/arch/x86/kernel/ptrace.c linux-2.6.34/arch/x86/kernel/ptrace.c
---- linux-2.6.34/arch/x86/kernel/ptrace.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/ptrace.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/ptrace.c linux-2.6.34.1/arch/x86/kernel/ptrace.c
+--- linux-2.6.34.1/arch/x86/kernel/ptrace.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/ptrace.c 2010-07-07 09:04:48.000000000 -0400
@@ -1145,7 +1145,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.34/arch/x86/kernel/reboot.c linux-2.6.34/arch/x86/kernel/reboot.c
---- linux-2.6.34/arch/x86/kernel/reboot.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/reboot.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/reboot.c linux-2.6.34.1/arch/x86/kernel/reboot.c
+--- linux-2.6.34.1/arch/x86/kernel/reboot.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/reboot.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/setup.c linux-2.6.34/arch/x86/kernel/setup.c
---- linux-2.6.34/arch/x86/kernel/setup.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/setup.c 2010-07-01 20:45:14.000000000 -0400
-@@ -779,14 +779,14 @@ void __init setup_arch(char **cmdline_p)
+diff -urNp linux-2.6.34.1/arch/x86/kernel/setup.c linux-2.6.34.1/arch/x86/kernel/setup.c
+--- linux-2.6.34.1/arch/x86/kernel/setup.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/setup.c 2010-07-07 09:04:48.000000000 -0400
+@@ -704,7 +704,7 @@ static void __init trim_bios_range(void)
+ * area (640->1Mb) as ram even though it is not.
+ * take them out.
+ */
+- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
++ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
+ sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
+ }
+
+@@ -790,14 +790,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.34/arch/x86/kernel/setup_percpu.c linux-2.6.34/arch/x86/kernel/setup_percpu.c
---- linux-2.6.34/arch/x86/kernel/setup_percpu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/setup_percpu.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/setup_percpu.c linux-2.6.34.1/arch/x86/kernel/setup_percpu.c
+--- linux-2.6.34.1/arch/x86/kernel/setup_percpu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/setup_percpu.c 2010-07-07 09:04:48.000000000 -0400
@@ -27,19 +27,17 @@
# define DBG(fmt, ...) do { if (0) pr_dbg(fmt, ##__VA_ARGS__); } while (0)
#endif
/*
* Up to this point, the boot CPU has been using .data.init
* area. Reload any changed state for the boot CPU.
-diff -urNp linux-2.6.34/arch/x86/kernel/signal.c linux-2.6.34/arch/x86/kernel/signal.c
---- linux-2.6.34/arch/x86/kernel/signal.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/signal.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/signal.c linux-2.6.34.1/arch/x86/kernel/signal.c
+--- linux-2.6.34.1/arch/x86/kernel/signal.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/signal.c 2010-07-07 09:04:48.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.
return;
if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-diff -urNp linux-2.6.34/arch/x86/kernel/smpboot.c linux-2.6.34/arch/x86/kernel/smpboot.c
---- linux-2.6.34/arch/x86/kernel/smpboot.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/smpboot.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/smpboot.c linux-2.6.34.1/arch/x86/kernel/smpboot.c
+--- linux-2.6.34.1/arch/x86/kernel/smpboot.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/smpboot.c 2010-07-07 09:04:48.000000000 -0400
@@ -761,7 +761,11 @@ do_rest:
(unsigned long)task_stack_page(c_idle.idle) -
KERNEL_STACK_OFFSET + THREAD_SIZE;
#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.34/arch/x86/kernel/step.c linux-2.6.34/arch/x86/kernel/step.c
---- linux-2.6.34/arch/x86/kernel/step.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/step.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/step.c linux-2.6.34.1/arch/x86/kernel/step.c
+--- linux-2.6.34.1/arch/x86/kernel/step.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/step.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/syscall_table_32.S linux-2.6.34/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.34/arch/x86/kernel/syscall_table_32.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/syscall_table_32.S 2010-07-01 20:45:14.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.34/arch/x86/kernel/sys_i386_32.c linux-2.6.34/arch/x86/kernel/sys_i386_32.c
---- linux-2.6.34/arch/x86/kernel/sys_i386_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/sys_i386_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/sys_i386_32.c linux-2.6.34.1/arch/x86/kernel/sys_i386_32.c
+--- linux-2.6.34.1/arch/x86/kernel/sys_i386_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/sys_i386_32.c 2010-07-07 09:04:48.000000000 -0400
@@ -24,6 +24,221 @@
#include <asm/syscalls.h>
/*
* Do a system call from kernel instead of calling sys_execve so we
* end up with proper pt_regs.
-diff -urNp linux-2.6.34/arch/x86/kernel/sys_x86_64.c linux-2.6.34/arch/x86/kernel/sys_x86_64.c
---- linux-2.6.34/arch/x86/kernel/sys_x86_64.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/sys_x86_64.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/sys_x86_64.c linux-2.6.34.1/arch/x86/kernel/sys_x86_64.c
+--- linux-2.6.34.1/arch/x86/kernel/sys_x86_64.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/sys_x86_64.c 2010-07-07 09:04:48.000000000 -0400
@@ -32,8 +32,8 @@ out:
return error;
}
mm->cached_hole_size = ~0UL;
return addr;
-diff -urNp linux-2.6.34/arch/x86/kernel/time.c linux-2.6.34/arch/x86/kernel/time.c
---- linux-2.6.34/arch/x86/kernel/time.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/time.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/syscall_table_32.S linux-2.6.34.1/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.34.1/arch/x86/kernel/syscall_table_32.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/syscall_table_32.S 2010-07-07 09:04:48.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.34.1/arch/x86/kernel/time.c linux-2.6.34.1/arch/x86/kernel/time.c
+--- linux-2.6.34.1/arch/x86/kernel/time.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/time.c 2010-07-07 09:04:48.000000000 -0400
@@ -26,17 +26,13 @@
int timer_ack;
#endif
}
return pc;
}
-diff -urNp linux-2.6.34/arch/x86/kernel/tls.c linux-2.6.34/arch/x86/kernel/tls.c
---- linux-2.6.34/arch/x86/kernel/tls.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/tls.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/tls.c linux-2.6.34.1/arch/x86/kernel/tls.c
+--- linux-2.6.34.1/arch/x86/kernel/tls.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/tls.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/trampoline_32.S linux-2.6.34/arch/x86/kernel/trampoline_32.S
---- linux-2.6.34/arch/x86/kernel/trampoline_32.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/trampoline_32.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/trampoline_32.S linux-2.6.34.1/arch/x86/kernel/trampoline_32.S
+--- linux-2.6.34.1/arch/x86/kernel/trampoline_32.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/trampoline_32.S 2010-07-07 09:04:48.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.34/arch/x86/kernel/traps.c linux-2.6.34/arch/x86/kernel/traps.c
---- linux-2.6.34/arch/x86/kernel/traps.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/traps.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/traps.c linux-2.6.34.1/arch/x86/kernel/traps.c
+--- linux-2.6.34.1/arch/x86/kernel/traps.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/traps.c 2010-07-07 09:04:48.000000000 -0400
@@ -69,12 +69,6 @@ asmlinkage int system_call(void);
/* Do we ignore FPU interrupts ? */
handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
return;
}
-diff -urNp linux-2.6.34/arch/x86/kernel/tsc.c linux-2.6.34/arch/x86/kernel/tsc.c
---- linux-2.6.34/arch/x86/kernel/tsc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/tsc.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/tsc.c linux-2.6.34.1/arch/x86/kernel/tsc.c
+--- linux-2.6.34.1/arch/x86/kernel/tsc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/tsc.c 2010-07-07 09:04:48.000000000 -0400
@@ -795,7 +795,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.34/arch/x86/kernel/vm86_32.c linux-2.6.34/arch/x86/kernel/vm86_32.c
---- linux-2.6.34/arch/x86/kernel/vm86_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/vm86_32.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/vm86_32.c linux-2.6.34.1/arch/x86/kernel/vm86_32.c
+--- linux-2.6.34.1/arch/x86/kernel/vm86_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/vm86_32.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/vmi_32.c linux-2.6.34/arch/x86/kernel/vmi_32.c
---- linux-2.6.34/arch/x86/kernel/vmi_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/vmi_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/vmi_32.c linux-2.6.34.1/arch/x86/kernel/vmi_32.c
+--- linux-2.6.34.1/arch/x86/kernel/vmi_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/vmi_32.c 2010-07-07 09:04:48.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.34/arch/x86/kernel/vmlinux.lds.S linux-2.6.34/arch/x86/kernel/vmlinux.lds.S
---- linux-2.6.34/arch/x86/kernel/vmlinux.lds.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/vmlinux.lds.S 2010-07-03 09:50:33.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/vmlinux.lds.S linux-2.6.34.1/arch/x86/kernel/vmlinux.lds.S
+--- linux-2.6.34.1/arch/x86/kernel/vmlinux.lds.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/vmlinux.lds.S 2010-07-07 09:04:48.000000000 -0400
@@ -26,6 +26,22 @@
#include <asm/page_types.h>
#include <asm/cache.h>
"kernel image bigger than KERNEL_IMAGE_SIZE");
#ifdef CONFIG_SMP
-diff -urNp linux-2.6.34/arch/x86/kernel/vsyscall_64.c linux-2.6.34/arch/x86/kernel/vsyscall_64.c
---- linux-2.6.34/arch/x86/kernel/vsyscall_64.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/vsyscall_64.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/vsyscall_64.c linux-2.6.34.1/arch/x86/kernel/vsyscall_64.c
+--- linux-2.6.34.1/arch/x86/kernel/vsyscall_64.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/vsyscall_64.c 2010-07-07 09:04:49.000000000 -0400
@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
p = tcache->blob[1];
} else if (__vgetcpu_mode == VGETCPU_RDTSCP) {
/* Load per CPU data from RDTSCP */
-diff -urNp linux-2.6.34/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.34/arch/x86/kernel/x8664_ksyms_64.c
---- linux-2.6.34/arch/x86/kernel/x8664_ksyms_64.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/x8664_ksyms_64.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.34.1/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-2.6.34.1/arch/x86/kernel/x8664_ksyms_64.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/x8664_ksyms_64.c 2010-07-07 09:04:49.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.34/arch/x86/kernel/xsave.c linux-2.6.34/arch/x86/kernel/xsave.c
---- linux-2.6.34/arch/x86/kernel/xsave.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kernel/xsave.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kernel/xsave.c linux-2.6.34.1/arch/x86/kernel/xsave.c
+--- linux-2.6.34.1/arch/x86/kernel/xsave.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kernel/xsave.c 2010-07-07 09:04:49.000000000 -0400
@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
fx_sw_user->xstate_size > fx_sw_user->extended_size)
return -1;
buf);
if (unlikely(err)) {
/*
-diff -urNp linux-2.6.34/arch/x86/kvm/emulate.c linux-2.6.34/arch/x86/kvm/emulate.c
---- linux-2.6.34/arch/x86/kvm/emulate.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kvm/emulate.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kvm/emulate.c linux-2.6.34.1/arch/x86/kvm/emulate.c
+--- linux-2.6.34.1/arch/x86/kvm/emulate.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kvm/emulate.c 2010-07-07 09:04:49.000000000 -0400
@@ -84,8 +84,8 @@
#define Src2CL (1<<29)
#define Src2ImmByte (2<<29)
switch ((_dst).bytes) { \
case 1: \
____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
-diff -urNp linux-2.6.34/arch/x86/kvm/lapic.c linux-2.6.34/arch/x86/kvm/lapic.c
---- linux-2.6.34/arch/x86/kvm/lapic.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kvm/lapic.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kvm/lapic.c linux-2.6.34.1/arch/x86/kvm/lapic.c
+--- linux-2.6.34.1/arch/x86/kvm/lapic.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kvm/lapic.c 2010-07-07 09:04:49.000000000 -0400
@@ -52,7 +52,7 @@
#define APIC_BUS_CYCLE_NS 1
#define APIC_LVT_NUM 6
/* 14 is the version for Xeon and Pentium 8.4.8*/
-diff -urNp linux-2.6.34/arch/x86/kvm/svm.c linux-2.6.34/arch/x86/kvm/svm.c
---- linux-2.6.34/arch/x86/kvm/svm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kvm/svm.c 2010-07-01 20:45:14.000000000 -0400
-@@ -2457,7 +2457,11 @@ static void reload_tss(struct kvm_vcpu *
+diff -urNp linux-2.6.34.1/arch/x86/kvm/svm.c linux-2.6.34.1/arch/x86/kvm/svm.c
+--- linux-2.6.34.1/arch/x86/kvm/svm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kvm/svm.c 2010-07-07 09:04:49.000000000 -0400
+@@ -2481,7 +2481,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();
}
-@@ -2950,7 +2954,7 @@ static void svm_fpu_deactivate(struct kv
+@@ -2995,7 +2999,7 @@ static void svm_fpu_deactivate(struct kv
svm->vmcb->control.intercept_exceptions |= 1 << NM_VECTOR;
}
.cpu_has_kvm_support = has_svm,
.disabled_by_bios = is_disabled,
.hardware_setup = svm_hardware_setup,
-diff -urNp linux-2.6.34/arch/x86/kvm/vmx.c linux-2.6.34/arch/x86/kvm/vmx.c
---- linux-2.6.34/arch/x86/kvm/vmx.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kvm/vmx.c 2010-07-01 20:45:14.000000000 -0400
-@@ -605,7 +605,11 @@ static void reload_tss(void)
+diff -urNp linux-2.6.34.1/arch/x86/kvm/vmx.c linux-2.6.34.1/arch/x86/kvm/vmx.c
+--- linux-2.6.34.1/arch/x86/kvm/vmx.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kvm/vmx.c 2010-07-07 09:04:49.000000000 -0400
+@@ -606,7 +606,11 @@ static void reload_tss(void)
kvm_get_gdt(&gdt);
descs = (void *)gdt.base;
load_TR_desc();
}
-@@ -1444,8 +1448,11 @@ static __init int hardware_setup(void)
+@@ -1454,8 +1458,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();
-@@ -2419,7 +2426,7 @@ static int vmx_vcpu_setup(struct vcpu_vm
+@@ -2429,7 +2436,7 @@ static int vmx_vcpu_setup(struct vcpu_vm
vmcs_writel(HOST_IDTR_BASE, dt.base); /* 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_write32(VM_ENTRY_MSR_LOAD_COUNT, 0);
-@@ -3835,6 +3842,12 @@ static void vmx_vcpu_run(struct kvm_vcpu
+@@ -3845,6 +3852,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"
-@@ -3881,8 +3894,13 @@ static void vmx_vcpu_run(struct kvm_vcpu
+@@ -3891,8 +3904,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
-@@ -3896,7 +3914,7 @@ static void vmx_vcpu_run(struct kvm_vcpu
+@@ -3906,7 +3924,7 @@ static void vmx_vcpu_run(struct kvm_vcpu
if (vmx->rmode.irq.pending)
fixup_rmode_irq(vmx);
vmx->launched = 1;
vmx_complete_interrupts(vmx);
-@@ -4115,7 +4133,7 @@ static void vmx_cpuid_update(struct kvm_
- }
+@@ -4129,7 +4147,7 @@ static void vmx_set_supported_cpuid(u32
+ {
}
-static struct kvm_x86_ops vmx_x86_ops = {
.cpu_has_kvm_support = cpu_has_kvm_support,
.disabled_by_bios = vmx_disabled_by_bios,
.hardware_setup = hardware_setup,
-diff -urNp linux-2.6.34/arch/x86/kvm/x86.c linux-2.6.34/arch/x86/kvm/x86.c
---- linux-2.6.34/arch/x86/kvm/x86.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/kvm/x86.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/kvm/x86.c linux-2.6.34.1/arch/x86/kvm/x86.c
+--- linux-2.6.34.1/arch/x86/kvm/x86.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/kvm/x86.c 2010-07-07 09:04:49.000000000 -0400
@@ -85,7 +85,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);
{ NULL }
};
-@@ -1603,6 +1603,8 @@ long kvm_arch_dev_ioctl(struct file *fil
+@@ -1604,6 +1604,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;
-@@ -1994,7 +1996,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
+@@ -2000,7 +2002,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;
-@@ -3747,10 +3749,10 @@ static void kvm_timer_init(void)
+@@ -3757,10 +3759,10 @@ static void kvm_timer_init(void)
}
}
if (kvm_x86_ops) {
printk(KERN_ERR "kvm: already loaded the other module\n");
-diff -urNp linux-2.6.34/arch/x86/lib/checksum_32.S linux-2.6.34/arch/x86/lib/checksum_32.S
---- linux-2.6.34/arch/x86/lib/checksum_32.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/lib/checksum_32.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/lib/checksum_32.S linux-2.6.34.1/arch/x86/lib/checksum_32.S
+--- linux-2.6.34.1/arch/x86/lib/checksum_32.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/lib/checksum_32.S 2010-07-07 09:04:49.000000000 -0400
@@ -28,7 +28,8 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
#undef ROUND
#undef ROUND1
-diff -urNp linux-2.6.34/arch/x86/lib/clear_page_64.S linux-2.6.34/arch/x86/lib/clear_page_64.S
---- linux-2.6.34/arch/x86/lib/clear_page_64.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/lib/clear_page_64.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/lib/clear_page_64.S linux-2.6.34.1/arch/x86/lib/clear_page_64.S
+--- linux-2.6.34.1/arch/x86/lib/clear_page_64.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/lib/clear_page_64.S 2010-07-07 09:04:49.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.34/arch/x86/lib/copy_page_64.S linux-2.6.34/arch/x86/lib/copy_page_64.S
---- linux-2.6.34/arch/x86/lib/copy_page_64.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/lib/copy_page_64.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/lib/copy_page_64.S linux-2.6.34.1/arch/x86/lib/copy_page_64.S
+--- linux-2.6.34.1/arch/x86/lib/copy_page_64.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/lib/copy_page_64.S 2010-07-07 09:04:49.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.34/arch/x86/lib/copy_user_64.S linux-2.6.34/arch/x86/lib/copy_user_64.S
---- linux-2.6.34/arch/x86/lib/copy_user_64.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/lib/copy_user_64.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/lib/copy_user_64.S linux-2.6.34.1/arch/x86/lib/copy_user_64.S
+--- linux-2.6.34.1/arch/x86/lib/copy_user_64.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/lib/copy_user_64.S 2010-07-07 09:04:49.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.34/arch/x86/lib/copy_user_nocache_64.S linux-2.6.34/arch/x86/lib/copy_user_nocache_64.S
---- linux-2.6.34/arch/x86/lib/copy_user_nocache_64.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/lib/copy_user_nocache_64.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/lib/copy_user_nocache_64.S linux-2.6.34.1/arch/x86/lib/copy_user_nocache_64.S
+--- linux-2.6.34.1/arch/x86/lib/copy_user_nocache_64.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/lib/copy_user_nocache_64.S 2010-07-07 09:04:49.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.34/arch/x86/lib/csum-wrappers_64.c linux-2.6.34/arch/x86/lib/csum-wrappers_64.c
---- linux-2.6.34/arch/x86/lib/csum-wrappers_64.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/lib/csum-wrappers_64.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/lib/csum-wrappers_64.c linux-2.6.34.1/arch/x86/lib/csum-wrappers_64.c
+--- linux-2.6.34.1/arch/x86/lib/csum-wrappers_64.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/lib/csum-wrappers_64.c 2010-07-07 09:04:49.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.34/arch/x86/lib/getuser.S linux-2.6.34/arch/x86/lib/getuser.S
---- linux-2.6.34/arch/x86/lib/getuser.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/lib/getuser.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/lib/getuser.S linux-2.6.34.1/arch/x86/lib/getuser.S
+--- linux-2.6.34.1/arch/x86/lib/getuser.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/lib/getuser.S 2010-07-07 09:04:49.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.34/arch/x86/lib/mmx_32.c linux-2.6.34/arch/x86/lib/mmx_32.c
---- linux-2.6.34/arch/x86/lib/mmx_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/lib/mmx_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/lib/mmx_32.c linux-2.6.34.1/arch/x86/lib/mmx_32.c
+--- linux-2.6.34.1/arch/x86/lib/mmx_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/lib/mmx_32.c 2010-07-07 09:04:49.000000000 -0400
@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
{
void *p;
from += 64;
to += 64;
-diff -urNp linux-2.6.34/arch/x86/lib/putuser.S linux-2.6.34/arch/x86/lib/putuser.S
---- linux-2.6.34/arch/x86/lib/putuser.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/lib/putuser.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/lib/putuser.S linux-2.6.34.1/arch/x86/lib/putuser.S
+--- linux-2.6.34.1/arch/x86/lib/putuser.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/lib/putuser.S 2010-07-07 09:04:49.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.34/arch/x86/lib/usercopy_32.c linux-2.6.34/arch/x86/lib/usercopy_32.c
---- linux-2.6.34/arch/x86/lib/usercopy_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/lib/usercopy_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/lib/usercopy_32.c linux-2.6.34.1/arch/x86/lib/usercopy_32.c
+--- linux-2.6.34.1/arch/x86/lib/usercopy_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/lib/usercopy_32.c 2010-07-07 09:04:49.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.34/arch/x86/lib/usercopy_64.c linux-2.6.34/arch/x86/lib/usercopy_64.c
---- linux-2.6.34/arch/x86/lib/usercopy_64.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/lib/usercopy_64.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/lib/usercopy_64.c linux-2.6.34.1/arch/x86/lib/usercopy_64.c
+--- linux-2.6.34.1/arch/x86/lib/usercopy_64.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/lib/usercopy_64.c 2010-07-07 09:04:49.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.34/arch/x86/Makefile linux-2.6.34/arch/x86/Makefile
---- linux-2.6.34/arch/x86/Makefile 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/Makefile 2010-07-01 20:45:14.000000000 -0400
-@@ -190,3 +190,12 @@ define archhelp
- echo ' FDARGS="..." arguments for the booted kernel'
- echo ' FDINITRD=file initrd for the booted kernel'
- endef
-+
-+define OLD_LD
-+
-+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
-+*** Please upgrade your binutils to 2.18 or newer
-+endef
-+
-+archprepare:
-+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff -urNp linux-2.6.34/arch/x86/mm/extable.c linux-2.6.34/arch/x86/mm/extable.c
---- linux-2.6.34/arch/x86/mm/extable.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/mm/extable.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/mm/extable.c linux-2.6.34.1/arch/x86/mm/extable.c
+--- linux-2.6.34.1/arch/x86/mm/extable.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/mm/extable.c 2010-07-07 09:04:49.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.34/arch/x86/mm/fault.c linux-2.6.34/arch/x86/mm/fault.c
---- linux-2.6.34/arch/x86/mm/fault.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/mm/fault.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/mm/fault.c linux-2.6.34.1/arch/x86/mm/fault.c
+--- linux-2.6.34.1/arch/x86/mm/fault.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/mm/fault.c 2010-07-07 09:04:49.000000000 -0400
@@ -11,10 +11,19 @@
#include <linux/kprobes.h> /* __kprobes, ... */
#include <linux/mmiotrace.h> /* kmmio_handler, ... */
+
+ return ret ? -EFAULT : 0;
+}
-diff -urNp linux-2.6.34/arch/x86/mm/gup.c linux-2.6.34/arch/x86/mm/gup.c
---- linux-2.6.34/arch/x86/mm/gup.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/mm/gup.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/mm/gup.c linux-2.6.34.1/arch/x86/mm/gup.c
+--- linux-2.6.34.1/arch/x86/mm/gup.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/mm/gup.c 2010-07-07 09:04:49.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.34/arch/x86/mm/highmem_32.c linux-2.6.34/arch/x86/mm/highmem_32.c
---- linux-2.6.34/arch/x86/mm/highmem_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/mm/highmem_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/mm/highmem_32.c linux-2.6.34.1/arch/x86/mm/highmem_32.c
+--- linux-2.6.34.1/arch/x86/mm/highmem_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/mm/highmem_32.c 2010-07-07 09:04:49.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.34/arch/x86/mm/hugetlbpage.c linux-2.6.34/arch/x86/mm/hugetlbpage.c
---- linux-2.6.34/arch/x86/mm/hugetlbpage.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/mm/hugetlbpage.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/mm/hugetlbpage.c linux-2.6.34.1/arch/x86/mm/hugetlbpage.c
+--- linux-2.6.34.1/arch/x86/mm/hugetlbpage.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/mm/hugetlbpage.c 2010-07-07 09:04:49.000000000 -0400
@@ -266,13 +266,18 @@ static unsigned long hugetlb_get_unmappe
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
(!vma || addr + len <= vma->vm_start))
return addr;
}
-diff -urNp linux-2.6.34/arch/x86/mm/init_32.c linux-2.6.34/arch/x86/mm/init_32.c
---- linux-2.6.34/arch/x86/mm/init_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/mm/init_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/mm/init.c linux-2.6.34.1/arch/x86/mm/init.c
+--- linux-2.6.34.1/arch/x86/mm/init.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/mm/init.c 2010-07-07 09:04:49.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.
+ */
+-#ifdef CONFIG_X86_32
+- start = 0x7000;
+-#else
+- start = 0x8000;
+-#endif
++ start = 0x100000;
+ e820_table_start = find_e820_area(start, max_pfn_mapped<<PAGE_SHIFT,
+ tables, PAGE_SIZE);
+ if (e820_table_start == -1UL)
+@@ -321,7 +317,13 @@ unsigned long __init_refok init_memory_m
+ */
+ int devmem_is_allowed(unsigned long pagenr)
+ {
+- if (pagenr <= 256)
++ if (!pagenr)
++ return 1;
++#ifdef CONFIG_VM86
++ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
++ return 1;
++#endif
++ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
+ return 1;
+ if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
+ return 0;
+@@ -380,6 +382,88 @@ void free_init_pages(char *what, unsigne
+
+ void free_initmem(void)
+ {
++
++#ifdef CONFIG_PAX_KERNEXEC
++#ifdef CONFIG_X86_32
++ /* PaX: limit KERNEL_CS to actual size */
++ unsigned long addr, limit;
++ struct desc_struct d;
++ int cpu;
++
++ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
++ limit = (limit - 1UL) >> PAGE_SHIFT;
++
++ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
++ for (cpu = 0; cpu < NR_CPUS; cpu++) {
++ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
++ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
++ }
++
++ /* PaX: make KERNEL_CS read-only */
++ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
++ if (!paravirt_enabled())
++ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
++/*
++ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
++ pgd = pgd_offset_k(addr);
++ pud = pud_offset(pgd, addr);
++ pmd = pmd_offset(pud, addr);
++ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
++ }
++*/
++#ifdef CONFIG_X86_PAE
++ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
++/*
++ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
++ pgd = pgd_offset_k(addr);
++ pud = pud_offset(pgd, addr);
++ pmd = pmd_offset(pud, addr);
++ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
++ }
++*/
++#endif
++
++#ifdef CONFIG_MODULES
++ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
++#endif
++
++#else
++ pgd_t *pgd;
++ pud_t *pud;
++ pmd_t *pmd;
++ unsigned long addr, end;
++
++ /* PaX: make kernel code/rodata read-only, rest non-executable */
++ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
++ pgd = pgd_offset_k(addr);
++ pud = pud_offset(pgd, addr);
++ pmd = pmd_offset(pud, addr);
++ if (!pmd_present(*pmd))
++ continue;
++ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
++ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
++ else
++ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
++ }
++
++ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
++ end = addr + KERNEL_IMAGE_SIZE;
++ for (; addr < end; addr += PMD_SIZE) {
++ pgd = pgd_offset_k(addr);
++ pud = pud_offset(pgd, addr);
++ pmd = pmd_offset(pud, addr);
++ if (!pmd_present(*pmd))
++ continue;
++ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
++ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
++ else
++ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
++ }
++#endif
++
++ flush_tlb_all();
++#endif
++
+ free_init_pages("unused kernel memory",
+ (unsigned long)(&__init_begin),
+ (unsigned long)(&__init_end));
+diff -urNp linux-2.6.34.1/arch/x86/mm/init_32.c linux-2.6.34.1/arch/x86/mm/init_32.c
+--- linux-2.6.34.1/arch/x86/mm/init_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/mm/init_32.c 2010-07-07 09:04:49.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.34/arch/x86/mm/init_64.c linux-2.6.34/arch/x86/mm/init_64.c
---- linux-2.6.34/arch/x86/mm/init_64.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/mm/init_64.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/mm/init_64.c linux-2.6.34.1/arch/x86/mm/init_64.c
+--- linux-2.6.34.1/arch/x86/mm/init_64.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/mm/init_64.c 2010-07-07 09:04:49.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.34/arch/x86/mm/init.c linux-2.6.34/arch/x86/mm/init.c
---- linux-2.6.34/arch/x86/mm/init.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/mm/init.c 2010-07-01 20:45:14.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.
- */
--#ifdef CONFIG_X86_32
-- start = 0x7000;
--#else
-- start = 0x8000;
--#endif
-+ start = 0x100000;
- e820_table_start = find_e820_area(start, max_pfn_mapped<<PAGE_SHIFT,
- tables, PAGE_SIZE);
- if (e820_table_start == -1UL)
-@@ -321,7 +317,13 @@ unsigned long __init_refok init_memory_m
- */
- int devmem_is_allowed(unsigned long pagenr)
- {
-- if (pagenr <= 256)
-+ if (!pagenr)
-+ return 1;
-+#ifdef CONFIG_VM86
-+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
-+ return 1;
-+#endif
-+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
- return 1;
- if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
- return 0;
-@@ -380,6 +382,88 @@ void free_init_pages(char *what, unsigne
-
- void free_initmem(void)
- {
-+
-+#ifdef CONFIG_PAX_KERNEXEC
-+#ifdef CONFIG_X86_32
-+ /* PaX: limit KERNEL_CS to actual size */
-+ unsigned long addr, limit;
-+ struct desc_struct d;
-+ int cpu;
-+
-+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
-+ limit = (limit - 1UL) >> PAGE_SHIFT;
-+
-+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
-+ for (cpu = 0; cpu < NR_CPUS; cpu++) {
-+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
-+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
-+ }
-+
-+ /* PaX: make KERNEL_CS read-only */
-+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
-+ if (!paravirt_enabled())
-+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
-+/*
-+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
-+ pgd = pgd_offset_k(addr);
-+ pud = pud_offset(pgd, addr);
-+ pmd = pmd_offset(pud, addr);
-+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
-+ }
-+*/
-+#ifdef CONFIG_X86_PAE
-+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
-+/*
-+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
-+ pgd = pgd_offset_k(addr);
-+ pud = pud_offset(pgd, addr);
-+ pmd = pmd_offset(pud, addr);
-+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
-+ }
-+*/
-+#endif
-+
-+#ifdef CONFIG_MODULES
-+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
-+#endif
-+
-+#else
-+ pgd_t *pgd;
-+ pud_t *pud;
-+ pmd_t *pmd;
-+ unsigned long addr, end;
-+
-+ /* PaX: make kernel code/rodata read-only, rest non-executable */
-+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
-+ pgd = pgd_offset_k(addr);
-+ pud = pud_offset(pgd, addr);
-+ pmd = pmd_offset(pud, addr);
-+ if (!pmd_present(*pmd))
-+ continue;
-+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
-+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
-+ else
-+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
-+ }
-+
-+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
-+ end = addr + KERNEL_IMAGE_SIZE;
-+ for (; addr < end; addr += PMD_SIZE) {
-+ pgd = pgd_offset_k(addr);
-+ pud = pud_offset(pgd, addr);
-+ pmd = pmd_offset(pud, addr);
-+ if (!pmd_present(*pmd))
-+ continue;
-+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
-+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
-+ else
-+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
-+ }
-+#endif
-+
-+ flush_tlb_all();
-+#endif
-+
- free_init_pages("unused kernel memory",
- (unsigned long)(&__init_begin),
- (unsigned long)(&__init_end));
-diff -urNp linux-2.6.34/arch/x86/mm/iomap_32.c linux-2.6.34/arch/x86/mm/iomap_32.c
---- linux-2.6.34/arch/x86/mm/iomap_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/mm/iomap_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/mm/iomap_32.c linux-2.6.34.1/arch/x86/mm/iomap_32.c
+--- linux-2.6.34.1/arch/x86/mm/iomap_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/mm/iomap_32.c 2010-07-07 09:04:49.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.34/arch/x86/mm/ioremap.c linux-2.6.34/arch/x86/mm/ioremap.c
---- linux-2.6.34/arch/x86/mm/ioremap.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/mm/ioremap.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/mm/ioremap.c linux-2.6.34.1/arch/x86/mm/ioremap.c
+--- linux-2.6.34.1/arch/x86/mm/ioremap.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/mm/ioremap.c 2010-07-07 09:04:49.000000000 -0400
@@ -100,13 +100,10 @@ static void __iomem *__ioremap_caller(re
/*
* Don't allow anybody to remap normal RAM that we're using..
/*
* The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-2.6.34/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.34/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-2.6.34/arch/x86/mm/kmemcheck/kmemcheck.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/mm/kmemcheck/kmemcheck.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.34.1/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-2.6.34.1/arch/x86/mm/kmemcheck/kmemcheck.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/mm/kmemcheck/kmemcheck.c 2010-07-07 09:04:49.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.34/arch/x86/mm/mmap.c linux-2.6.34/arch/x86/mm/mmap.c
---- linux-2.6.34/arch/x86/mm/mmap.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/mm/mmap.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/mm/mmap.c linux-2.6.34.1/arch/x86/mm/mmap.c
+--- linux-2.6.34.1/arch/x86/mm/mmap.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/mm/mmap.c 2010-07-07 09:04:49.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.34/arch/x86/mm/numa_32.c linux-2.6.34/arch/x86/mm/numa_32.c
---- linux-2.6.34/arch/x86/mm/numa_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/mm/numa_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/mm/numa_32.c linux-2.6.34.1/arch/x86/mm/numa_32.c
+--- linux-2.6.34.1/arch/x86/mm/numa_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/mm/numa_32.c 2010-07-07 09:04:49.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.34/arch/x86/mm/pageattr.c linux-2.6.34/arch/x86/mm/pageattr.c
---- linux-2.6.34/arch/x86/mm/pageattr.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/mm/pageattr.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/mm/pageattr-test.c linux-2.6.34.1/arch/x86/mm/pageattr-test.c
+--- linux-2.6.34.1/arch/x86/mm/pageattr-test.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/mm/pageattr-test.c 2010-07-07 09:04:49.000000000 -0400
+@@ -36,7 +36,7 @@ enum {
+
+ static int pte_testbit(pte_t pte)
+ {
+- return pte_flags(pte) & _PAGE_UNUSED1;
++ return pte_flags(pte) & _PAGE_CPA_TEST;
+ }
+
+ struct split_state {
+diff -urNp linux-2.6.34.1/arch/x86/mm/pageattr.c linux-2.6.34.1/arch/x86/mm/pageattr.c
+--- linux-2.6.34.1/arch/x86/mm/pageattr.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/mm/pageattr.c 2010-07-07 09:04:49.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.34/arch/x86/mm/pageattr-test.c linux-2.6.34/arch/x86/mm/pageattr-test.c
---- linux-2.6.34/arch/x86/mm/pageattr-test.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/mm/pageattr-test.c 2010-07-01 20:45:14.000000000 -0400
-@@ -36,7 +36,7 @@ enum {
-
- static int pte_testbit(pte_t pte)
- {
-- return pte_flags(pte) & _PAGE_UNUSED1;
-+ return pte_flags(pte) & _PAGE_CPA_TEST;
- }
-
- struct split_state {
-diff -urNp linux-2.6.34/arch/x86/mm/pat.c linux-2.6.34/arch/x86/mm/pat.c
---- linux-2.6.34/arch/x86/mm/pat.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/mm/pat.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/mm/pat.c linux-2.6.34.1/arch/x86/mm/pat.c
+--- linux-2.6.34.1/arch/x86/mm/pat.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/mm/pat.c 2010-07-07 09:04:49.000000000 -0400
@@ -259,7 +259,7 @@ chk_conflict(struct memtype *new, struct
conflict:
cattr_name(want_flags),
(unsigned long long)paddr,
(unsigned long long)(paddr + size),
-diff -urNp linux-2.6.34/arch/x86/mm/pgtable_32.c linux-2.6.34/arch/x86/mm/pgtable_32.c
---- linux-2.6.34/arch/x86/mm/pgtable_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/mm/pgtable_32.c 2010-07-01 20:45:14.000000000 -0400
-@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
- return;
- }
- pte = pte_offset_kernel(pmd, vaddr);
-+
-+ pax_open_kernel();
- if (pte_val(pteval))
- set_pte_at(&init_mm, vaddr, pte, pteval);
- else
- pte_clear(&init_mm, vaddr, pte);
-+ pax_close_kernel();
-
- /*
- * It's enough to flush this one mapping.
-diff -urNp linux-2.6.34/arch/x86/mm/pgtable.c linux-2.6.34/arch/x86/mm/pgtable.c
---- linux-2.6.34/arch/x86/mm/pgtable.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/mm/pgtable.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/mm/pgtable.c linux-2.6.34.1/arch/x86/mm/pgtable.c
+--- linux-2.6.34.1/arch/x86/mm/pgtable.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/mm/pgtable.c 2010-07-07 09:04:49.000000000 -0400
@@ -84,8 +84,59 @@ static inline void pgd_list_del(pgd_t *p
list_del(&page->lru);
}
pgd_dtor(pgd);
paravirt_pgd_free(mm, pgd);
free_page((unsigned long)pgd);
-diff -urNp linux-2.6.34/arch/x86/mm/setup_nx.c linux-2.6.34/arch/x86/mm/setup_nx.c
---- linux-2.6.34/arch/x86/mm/setup_nx.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/mm/setup_nx.c 2010-07-02 21:45:04.000000000 -0400
-@@ -5,8 +5,11 @@
+diff -urNp linux-2.6.34.1/arch/x86/mm/pgtable_32.c linux-2.6.34.1/arch/x86/mm/pgtable_32.c
+--- linux-2.6.34.1/arch/x86/mm/pgtable_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/mm/pgtable_32.c 2010-07-07 09:04:49.000000000 -0400
+@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
+ return;
+ }
+ pte = pte_offset_kernel(pmd, vaddr);
++
++ pax_open_kernel();
+ if (pte_val(pteval))
+ set_pte_at(&init_mm, vaddr, pte, pteval);
+ else
+ pte_clear(&init_mm, vaddr, pte);
++ pax_close_kernel();
+
+ /*
+ * It's enough to flush this one mapping.
+diff -urNp linux-2.6.34.1/arch/x86/mm/setup_nx.c linux-2.6.34.1/arch/x86/mm/setup_nx.c
+--- linux-2.6.34.1/arch/x86/mm/setup_nx.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/mm/setup_nx.c 2010-07-07 09:05:57.000000000 -0400
+@@ -5,8 +5,10 @@
#include <asm/pgtable.h>
#include <asm/proto.h>
+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
static int disable_nx __cpuinitdata;
-+#endif
-+#if (defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)) && !defined(CONFIG_PAX_PAGEEXEC)
++#ifndef CONFIG_PAX_PAGEEXEC
/*
* noexec = on|off
*
-@@ -28,12 +31,15 @@ static int __init noexec_setup(char *str
+@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str
return 0;
}
early_param("noexec", noexec_setup);
++#endif
++
+#endif
void __cpuinit x86_configure_nx(void)
__supported_pte_mask &= ~_PAGE_NX;
}
-diff -urNp linux-2.6.34/arch/x86/mm/tlb.c linux-2.6.34/arch/x86/mm/tlb.c
---- linux-2.6.34/arch/x86/mm/tlb.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/mm/tlb.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/mm/tlb.c linux-2.6.34.1/arch/x86/mm/tlb.c
+--- linux-2.6.34.1/arch/x86/mm/tlb.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/mm/tlb.c 2010-07-07 09:04:49.000000000 -0400
@@ -13,7 +13,7 @@
#include <asm/uv/uv.h>
}
EXPORT_SYMBOL_GPL(leave_mm);
-diff -urNp linux-2.6.34/arch/x86/oprofile/backtrace.c linux-2.6.34/arch/x86/oprofile/backtrace.c
---- linux-2.6.34/arch/x86/oprofile/backtrace.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/oprofile/backtrace.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/oprofile/backtrace.c linux-2.6.34.1/arch/x86/oprofile/backtrace.c
+--- linux-2.6.34.1/arch/x86/oprofile/backtrace.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/oprofile/backtrace.c 2010-07-07 09:04:49.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.34/arch/x86/oprofile/op_model_p4.c linux-2.6.34/arch/x86/oprofile/op_model_p4.c
---- linux-2.6.34/arch/x86/oprofile/op_model_p4.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/oprofile/op_model_p4.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/oprofile/op_model_p4.c linux-2.6.34.1/arch/x86/oprofile/op_model_p4.c
+--- linux-2.6.34.1/arch/x86/oprofile/op_model_p4.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/oprofile/op_model_p4.c 2010-07-07 09:04:49.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.34/arch/x86/pci/common.c linux-2.6.34/arch/x86/pci/common.c
---- linux-2.6.34/arch/x86/pci/common.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/pci/common.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/pci/common.c linux-2.6.34.1/arch/x86/pci/common.c
+--- linux-2.6.34.1/arch/x86/pci/common.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/pci/common.c 2010-07-07 09:04:49.000000000 -0400
@@ -32,8 +32,8 @@ int noioapicreroute = 1;
int pcibios_last_bus = -1;
unsigned long pirq_table_addr;
};
void __init dmi_check_pciprobe(void)
-diff -urNp linux-2.6.34/arch/x86/pci/direct.c linux-2.6.34/arch/x86/pci/direct.c
---- linux-2.6.34/arch/x86/pci/direct.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/pci/direct.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/pci/direct.c linux-2.6.34.1/arch/x86/pci/direct.c
+--- linux-2.6.34.1/arch/x86/pci/direct.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/pci/direct.c 2010-07-07 09:04:49.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.34/arch/x86/pci/fixup.c linux-2.6.34/arch/x86/pci/fixup.c
---- linux-2.6.34/arch/x86/pci/fixup.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/pci/fixup.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/pci/fixup.c linux-2.6.34.1/arch/x86/pci/fixup.c
+--- linux-2.6.34.1/arch/x86/pci/fixup.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/pci/fixup.c 2010-07-07 09:04:49.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.34/arch/x86/pci/irq.c linux-2.6.34/arch/x86/pci/irq.c
---- linux-2.6.34/arch/x86/pci/irq.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/pci/irq.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/pci/irq.c linux-2.6.34.1/arch/x86/pci/irq.c
+--- linux-2.6.34.1/arch/x86/pci/irq.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/pci/irq.c 2010-07-07 09:04:49.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.34/arch/x86/pci/mmconfig_32.c linux-2.6.34/arch/x86/pci/mmconfig_32.c
---- linux-2.6.34/arch/x86/pci/mmconfig_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/pci/mmconfig_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/pci/mmconfig_32.c linux-2.6.34.1/arch/x86/pci/mmconfig_32.c
+--- linux-2.6.34.1/arch/x86/pci/mmconfig_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/pci/mmconfig_32.c 2010-07-07 09:04:49.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.34/arch/x86/pci/mmconfig_64.c linux-2.6.34/arch/x86/pci/mmconfig_64.c
---- linux-2.6.34/arch/x86/pci/mmconfig_64.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/pci/mmconfig_64.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/pci/mmconfig_64.c linux-2.6.34.1/arch/x86/pci/mmconfig_64.c
+--- linux-2.6.34.1/arch/x86/pci/mmconfig_64.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/pci/mmconfig_64.c 2010-07-07 09:04:49.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.34/arch/x86/pci/numaq_32.c linux-2.6.34/arch/x86/pci/numaq_32.c
---- linux-2.6.34/arch/x86/pci/numaq_32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/pci/numaq_32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/pci/numaq_32.c linux-2.6.34.1/arch/x86/pci/numaq_32.c
+--- linux-2.6.34.1/arch/x86/pci/numaq_32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/pci/numaq_32.c 2010-07-07 09:04:49.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.34/arch/x86/pci/olpc.c linux-2.6.34/arch/x86/pci/olpc.c
---- linux-2.6.34/arch/x86/pci/olpc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/pci/olpc.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/pci/olpc.c linux-2.6.34.1/arch/x86/pci/olpc.c
+--- linux-2.6.34.1/arch/x86/pci/olpc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/pci/olpc.c 2010-07-07 09:04:49.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.34/arch/x86/pci/pcbios.c linux-2.6.34/arch/x86/pci/pcbios.c
---- linux-2.6.34/arch/x86/pci/pcbios.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/pci/pcbios.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/pci/pcbios.c linux-2.6.34.1/arch/x86/pci/pcbios.c
+--- linux-2.6.34.1/arch/x86/pci/pcbios.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/pci/pcbios.c 2010-07-07 09:04:49.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.34/arch/x86/power/cpu.c linux-2.6.34/arch/x86/power/cpu.c
---- linux-2.6.34/arch/x86/power/cpu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/power/cpu.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/power/cpu.c linux-2.6.34.1/arch/x86/power/cpu.c
+--- linux-2.6.34.1/arch/x86/power/cpu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/power/cpu.c 2010-07-07 09:04:49.000000000 -0400
@@ -127,7 +127,7 @@ static void do_fpu_end(void)
static void fix_processor_context(void)
{
syscall_init(); /* This sets MSR_*STAR and related */
#endif
-diff -urNp linux-2.6.34/arch/x86/vdso/Makefile linux-2.6.34/arch/x86/vdso/Makefile
---- linux-2.6.34/arch/x86/vdso/Makefile 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/vdso/Makefile 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/vdso/Makefile linux-2.6.34.1/arch/x86/vdso/Makefile
+--- linux-2.6.34.1/arch/x86/vdso/Makefile 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/vdso/Makefile 2010-07-07 09:04:49.000000000 -0400
@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
$(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
GCOV_PROFILE := n
#
-diff -urNp linux-2.6.34/arch/x86/vdso/vclock_gettime.c linux-2.6.34/arch/x86/vdso/vclock_gettime.c
---- linux-2.6.34/arch/x86/vdso/vclock_gettime.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/vdso/vclock_gettime.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/vdso/vclock_gettime.c linux-2.6.34.1/arch/x86/vdso/vclock_gettime.c
+--- linux-2.6.34.1/arch/x86/vdso/vclock_gettime.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/vdso/vclock_gettime.c 2010-07-07 09:04:49.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.34/arch/x86/vdso/vdso32-setup.c linux-2.6.34/arch/x86/vdso/vdso32-setup.c
---- linux-2.6.34/arch/x86/vdso/vdso32-setup.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/vdso/vdso32-setup.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/vdso/vdso.lds.S linux-2.6.34.1/arch/x86/vdso/vdso.lds.S
+--- linux-2.6.34.1/arch/x86/vdso/vdso.lds.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/vdso/vdso.lds.S 2010-07-07 09:04:49.000000000 -0400
+@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
+ #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
+ #include "vextern.h"
+ #undef VEXTERN
++
++#define VEXTERN(x) VDSO64_ ## x = __vdso_ ## x;
++VEXTERN(fallback_gettimeofday)
++VEXTERN(fallback_time)
++VEXTERN(getcpu)
++#undef VEXTERN
+diff -urNp linux-2.6.34.1/arch/x86/vdso/vdso32-setup.c linux-2.6.34.1/arch/x86/vdso/vdso32-setup.c
+--- linux-2.6.34.1/arch/x86/vdso/vdso32-setup.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/vdso/vdso32-setup.c 2010-07-07 09:04:49.000000000 -0400
@@ -25,6 +25,7 @@
#include <asm/tlbflush.h>
#include <asm/vdso.h>
return &gate_vma;
return NULL;
}
-diff -urNp linux-2.6.34/arch/x86/vdso/vdso.lds.S linux-2.6.34/arch/x86/vdso/vdso.lds.S
---- linux-2.6.34/arch/x86/vdso/vdso.lds.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/vdso/vdso.lds.S 2010-07-01 20:45:14.000000000 -0400
-@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
- #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
- #include "vextern.h"
- #undef VEXTERN
-+
-+#define VEXTERN(x) VDSO64_ ## x = __vdso_ ## x;
-+VEXTERN(fallback_gettimeofday)
-+VEXTERN(fallback_time)
-+VEXTERN(getcpu)
-+#undef VEXTERN
-diff -urNp linux-2.6.34/arch/x86/vdso/vextern.h linux-2.6.34/arch/x86/vdso/vextern.h
---- linux-2.6.34/arch/x86/vdso/vextern.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/vdso/vextern.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/vdso/vextern.h linux-2.6.34.1/arch/x86/vdso/vextern.h
+--- linux-2.6.34.1/arch/x86/vdso/vextern.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/vdso/vextern.h 2010-07-07 09:04:49.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.34/arch/x86/vdso/vma.c linux-2.6.34/arch/x86/vdso/vma.c
---- linux-2.6.34/arch/x86/vdso/vma.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/vdso/vma.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/vdso/vma.c linux-2.6.34.1/arch/x86/vdso/vma.c
+--- linux-2.6.34.1/arch/x86/vdso/vma.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/vdso/vma.c 2010-07-07 09:04:49.000000000 -0400
@@ -58,7 +58,7 @@ static int __init init_vdso_vars(void)
if (!vbase)
goto oom;
- return 0;
-}
-__setup("vdso=", vdso_setup);
-diff -urNp linux-2.6.34/arch/x86/xen/enlighten.c linux-2.6.34/arch/x86/xen/enlighten.c
---- linux-2.6.34/arch/x86/xen/enlighten.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/xen/enlighten.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/xen/enlighten.c linux-2.6.34.1/arch/x86/xen/enlighten.c
+--- linux-2.6.34.1/arch/x86/xen/enlighten.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/xen/enlighten.c 2010-07-07 09:04:49.000000000 -0400
@@ -74,8 +74,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
struct shared_info xen_dummy_shared_info;
xen_smp_init();
pgd = (pgd_t *)xen_start_info->pt_base;
-diff -urNp linux-2.6.34/arch/x86/xen/mmu.c linux-2.6.34/arch/x86/xen/mmu.c
---- linux-2.6.34/arch/x86/xen/mmu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/xen/mmu.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/xen/mmu.c linux-2.6.34.1/arch/x86/xen/mmu.c
+--- linux-2.6.34.1/arch/x86/xen/mmu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/xen/mmu.c 2010-07-07 09:04:49.000000000 -0400
@@ -1694,6 +1694,8 @@ __init pgd_t *xen_setup_kernel_pagetable
convert_pfn_mfn(init_level4_pgt);
convert_pfn_mfn(level3_ident_pgt);
set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
-diff -urNp linux-2.6.34/arch/x86/xen/smp.c linux-2.6.34/arch/x86/xen/smp.c
---- linux-2.6.34/arch/x86/xen/smp.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/xen/smp.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/xen/smp.c linux-2.6.34.1/arch/x86/xen/smp.c
+--- linux-2.6.34.1/arch/x86/xen/smp.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/xen/smp.c 2010-07-07 09:04:49.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.34/arch/x86/xen/xen-head.S linux-2.6.34/arch/x86/xen/xen-head.S
---- linux-2.6.34/arch/x86/xen/xen-head.S 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/xen/xen-head.S 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/xen/xen-head.S linux-2.6.34.1/arch/x86/xen/xen-head.S
+--- linux-2.6.34.1/arch/x86/xen/xen-head.S 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/xen/xen-head.S 2010-07-07 09:04:49.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.34/arch/x86/xen/xen-ops.h linux-2.6.34/arch/x86/xen/xen-ops.h
---- linux-2.6.34/arch/x86/xen/xen-ops.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/arch/x86/xen/xen-ops.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/arch/x86/xen/xen-ops.h linux-2.6.34.1/arch/x86/xen/xen-ops.h
+--- linux-2.6.34.1/arch/x86/xen/xen-ops.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/arch/x86/xen/xen-ops.h 2010-07-07 09:04:49.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.34/block/blk-iopoll.c linux-2.6.34/block/blk-iopoll.c
---- linux-2.6.34/block/blk-iopoll.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/block/blk-iopoll.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/block/blk-iopoll.c linux-2.6.34.1/block/blk-iopoll.c
+--- linux-2.6.34.1/block/blk-iopoll.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/block/blk-iopoll.c 2010-07-07 09:04:49.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.34/block/blk-map.c linux-2.6.34/block/blk-map.c
---- linux-2.6.34/block/blk-map.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/block/blk-map.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/block/blk-map.c linux-2.6.34.1/block/blk-map.c
+--- linux-2.6.34.1/block/blk-map.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/block/blk-map.c 2010-07-07 09:04:49.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.34/block/blk-softirq.c linux-2.6.34/block/blk-softirq.c
---- linux-2.6.34/block/blk-softirq.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/block/blk-softirq.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/block/blk-softirq.c linux-2.6.34.1/block/blk-softirq.c
+--- linux-2.6.34.1/block/blk-softirq.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/block/blk-softirq.c 2010-07-07 09:04:49.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.34/crypto/lrw.c linux-2.6.34/crypto/lrw.c
---- linux-2.6.34/crypto/lrw.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/crypto/lrw.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/crypto/lrw.c linux-2.6.34.1/crypto/lrw.c
+--- linux-2.6.34.1/crypto/lrw.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/crypto/lrw.c 2010-07-07 09:04:49.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.34/Documentation/dontdiff linux-2.6.34/Documentation/dontdiff
---- linux-2.6.34/Documentation/dontdiff 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/Documentation/dontdiff 2010-07-01 20:45:13.000000000 -0400
-@@ -3,6 +3,7 @@
- *.bin
- *.cpio
- *.csp
-+*.dbg
- *.dsp
- *.dvi
- *.elf
-@@ -40,6 +41,7 @@
- *.ver
- *.xml
- *_MODULES
-+*_reg_safe.h
- *_vga16.c
- *~
- *.9
-@@ -49,11 +51,16 @@
- 53c700_d.h
- CVS
- ChangeSet
-+GPATH
-+GRTAGS
-+GSYMS
-+GTAGS
- Image
- Kerntypes
- Module.markers
- Module.symvers
- PENDING
-+PERF*
- SCCS
- System.map*
- TAGS
-@@ -76,7 +83,10 @@ btfixupprep
- build
- bvmlinux
- bzImage*
-+capflags.c
- classlist.h*
-+clut_vga16.c
-+common-cmds.h
- comp*.log
- compile.h*
- conf
-@@ -106,13 +116,15 @@ generated
- genheaders
- genksyms
- *_gray256.c
-+hash
- ihex2fw
- ikconfig.h*
-+inat-tables.c
- initramfs_data.cpio
-+initramfs_data.cpio.bz2
- initramfs_data.cpio.gz
- initramfs_list
- kallsyms
--kconfig
- keywords.c
- ksym.c*
- ksym.h*
-@@ -136,10 +148,13 @@ mkboot
- mkbugboot
- mkcpustr
- mkdep
-+mkpiggy
- mkprep
-+mkregtable
- mktables
- mktree
- modpost
-+modules.builtin
- modules.order
- modversions.h*
- ncscope.*
-@@ -152,6 +167,7 @@ patches*
- pca200e.bin
- pca200e_ecd.bin2
- piggy.gz
-+piggy.S
- piggyback
- pnmtologo
- ppc_defs.h*
-@@ -166,6 +182,7 @@ setup
- setup.bin
- setup.elf
- sImage
-+slabinfo
- sm_tbl*
- split-include
- syscalltab.h
-@@ -189,14 +206,20 @@ version.h*
- vmlinux
- vmlinux-*
- vmlinux.aout
-+vmlinux.bin.all
-+vmlinux.bin.bz2
- vmlinux.lds
-+vmlinux.relocs
-+voffset.h
- vsyscall.lds
- vsyscall_32.lds
- wanxlfw.inc
- uImage
- unifdef
-+utsrelease.h
- wakeup.bin
- wakeup.elf
- wakeup.lds
- zImage*
- zconf.hash.c
-+zoffset.h
-diff -urNp linux-2.6.34/Documentation/filesystems/sysfs.txt linux-2.6.34/Documentation/filesystems/sysfs.txt
---- linux-2.6.34/Documentation/filesystems/sysfs.txt 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/Documentation/filesystems/sysfs.txt 2010-07-01 20:45:13.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 (* const show)(struct kobject *, struct attribute *, char *);
-+ ssize_t (* const store)(struct kobject *, struct attribute *, const char *);
- };
-
- [ Subsystems should have already defined a struct kobj_type as a
-diff -urNp linux-2.6.34/Documentation/kernel-parameters.txt linux-2.6.34/Documentation/kernel-parameters.txt
---- linux-2.6.34/Documentation/kernel-parameters.txt 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/Documentation/kernel-parameters.txt 2010-07-01 20:45:13.000000000 -0400
-@@ -1875,6 +1875,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.
-
-+ pax_nouderef [X86-32] disables UDEREF. Most likely needed under certain
-+ virtualization environments that don't cope well with the
-+ expand down segment used by UDEREF on X86-32.
-+
-+ pax_softmode= [X86-32] 0/1 to disable/enable PaX softmode on boot already.
-+
- pcbit= [HW,ISDN]
-
- pcd. [PARIDE]
-diff -urNp linux-2.6.34/drivers/acpi/battery.c linux-2.6.34/drivers/acpi/battery.c
---- linux-2.6.34/drivers/acpi/battery.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/acpi/battery.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/acpi/battery.c linux-2.6.34.1/drivers/acpi/battery.c
+--- linux-2.6.34.1/drivers/acpi/battery.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/acpi/battery.c 2010-07-07 09:04:50.000000000 -0400
@@ -810,7 +810,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
}
mode_t mode;
const char *name;
} acpi_battery_file[] = {
-diff -urNp linux-2.6.34/drivers/acpi/blacklist.c linux-2.6.34/drivers/acpi/blacklist.c
---- linux-2.6.34/drivers/acpi/blacklist.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/acpi/blacklist.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/acpi/blacklist.c linux-2.6.34.1/drivers/acpi/blacklist.c
+--- linux-2.6.34.1/drivers/acpi/blacklist.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/acpi/blacklist.c 2010-07-07 09:04:50.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.34/drivers/acpi/dock.c linux-2.6.34/drivers/acpi/dock.c
---- linux-2.6.34/drivers/acpi/dock.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/acpi/dock.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/acpi/dock.c linux-2.6.34.1/drivers/acpi/dock.c
+--- linux-2.6.34.1/drivers/acpi/dock.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/acpi/dock.c 2010-07-07 09:04:50.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.34/drivers/acpi/osl.c linux-2.6.34/drivers/acpi/osl.c
---- linux-2.6.34/drivers/acpi/osl.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/acpi/osl.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/acpi/osl.c linux-2.6.34.1/drivers/acpi/osl.c
+--- linux-2.6.34.1/drivers/acpi/osl.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/acpi/osl.c 2010-07-07 09:04:50.000000000 -0400
@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
void __iomem *virt_addr;
switch (width) {
case 8:
-diff -urNp linux-2.6.34/drivers/acpi/power_meter.c linux-2.6.34/drivers/acpi/power_meter.c
---- linux-2.6.34/drivers/acpi/power_meter.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/acpi/power_meter.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/acpi/power_meter.c linux-2.6.34.1/drivers/acpi/power_meter.c
+--- linux-2.6.34.1/drivers/acpi/power_meter.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/acpi/power_meter.c 2010-07-07 09:04:50.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.34/drivers/acpi/proc.c linux-2.6.34/drivers/acpi/proc.c
---- linux-2.6.34/drivers/acpi/proc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/acpi/proc.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/acpi/proc.c linux-2.6.34.1/drivers/acpi/proc.c
+--- linux-2.6.34.1/drivers/acpi/proc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/acpi/proc.c 2010-07-07 09:04:50.000000000 -0400
@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
size_t count, loff_t * ppos)
{
dev->wakeup.state.enabled =
dev->wakeup.state.enabled ? 0 : 1;
found_dev = dev;
-diff -urNp linux-2.6.34/drivers/acpi/processor_driver.c linux-2.6.34/drivers/acpi/processor_driver.c
---- linux-2.6.34/drivers/acpi/processor_driver.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/acpi/processor_driver.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/acpi/processor_driver.c linux-2.6.34.1/drivers/acpi/processor_driver.c
+--- linux-2.6.34.1/drivers/acpi/processor_driver.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/acpi/processor_driver.c 2010-07-07 09:04:50.000000000 -0400
@@ -581,7 +581,7 @@ static int __cpuinit acpi_processor_add(
return 0;
}
/*
* Buggy BIOS check
-diff -urNp linux-2.6.34/drivers/acpi/processor_idle.c linux-2.6.34/drivers/acpi/processor_idle.c
---- linux-2.6.34/drivers/acpi/processor_idle.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/acpi/processor_idle.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/acpi/processor_idle.c linux-2.6.34.1/drivers/acpi/processor_idle.c
+--- linux-2.6.34.1/drivers/acpi/processor_idle.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/acpi/processor_idle.c 2010-07-07 09:04:50.000000000 -0400
@@ -119,7 +119,7 @@ static struct dmi_system_id __cpuinitdat
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
};
-diff -urNp linux-2.6.34/drivers/acpi/sleep.c linux-2.6.34/drivers/acpi/sleep.c
---- linux-2.6.34/drivers/acpi/sleep.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/acpi/sleep.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/acpi/sleep.c linux-2.6.34.1/drivers/acpi/sleep.c
+--- linux-2.6.34.1/drivers/acpi/sleep.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/acpi/sleep.c 2010-07-07 09:04:50.000000000 -0400
@@ -302,7 +302,7 @@ static int acpi_suspend_state_valid(susp
}
}
.begin = acpi_hibernation_begin_old,
.end = acpi_pm_end,
.pre_snapshot = acpi_hibernation_pre_snapshot_old,
-diff -urNp linux-2.6.34/drivers/acpi/video.c linux-2.6.34/drivers/acpi/video.c
---- linux-2.6.34/drivers/acpi/video.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/acpi/video.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/acpi/video.c linux-2.6.34.1/drivers/acpi/video.c
+--- linux-2.6.34.1/drivers/acpi/video.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/acpi/video.c 2010-07-07 09:04:50.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.34/drivers/ata/ahci.c linux-2.6.34/drivers/ata/ahci.c
---- linux-2.6.34/drivers/ata/ahci.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/ahci.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/ahci.c linux-2.6.34.1/drivers/ata/ahci.c
+--- linux-2.6.34.1/drivers/ata/ahci.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/ahci.c 2010-07-07 09:04:50.000000000 -0400
@@ -407,7 +407,7 @@ static struct scsi_host_template ahci_sh
.sdev_attrs = ahci_sdev_attrs,
};
};
-diff -urNp linux-2.6.34/drivers/ata/ata_generic.c linux-2.6.34/drivers/ata/ata_generic.c
---- linux-2.6.34/drivers/ata/ata_generic.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/ata_generic.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/ata_generic.c linux-2.6.34.1/drivers/ata/ata_generic.c
+--- linux-2.6.34.1/drivers/ata/ata_generic.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/ata_generic.c 2010-07-07 09:04:50.000000000 -0400
@@ -95,7 +95,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.34/drivers/ata/ata_piix.c linux-2.6.34/drivers/ata/ata_piix.c
---- linux-2.6.34/drivers/ata/ata_piix.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/ata_piix.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/ata_piix.c linux-2.6.34.1/drivers/ata/ata_piix.c
+--- linux-2.6.34.1/drivers/ata/ata_piix.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/ata_piix.c 2010-07-07 09:04:50.000000000 -0400
@@ -301,7 +301,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) */
};
static const char *oemstrs[] = {
"Tecra M3,",
-diff -urNp linux-2.6.34/drivers/ata/libata-acpi.c linux-2.6.34/drivers/ata/libata-acpi.c
---- linux-2.6.34/drivers/ata/libata-acpi.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/libata-acpi.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/libata-acpi.c linux-2.6.34.1/drivers/ata/libata-acpi.c
+--- linux-2.6.34.1/drivers/ata/libata-acpi.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/libata-acpi.c 2010-07-07 09:04:50.000000000 -0400
@@ -224,12 +224,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.34/drivers/ata/libata-core.c linux-2.6.34/drivers/ata/libata-core.c
---- linux-2.6.34/drivers/ata/libata-core.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/libata-core.c 2010-07-01 20:45:14.000000000 -0400
-@@ -897,7 +897,7 @@ static const struct ata_xfer_ent {
+diff -urNp linux-2.6.34.1/drivers/ata/libata-core.c linux-2.6.34.1/drivers/ata/libata-core.c
+--- linux-2.6.34.1/drivers/ata/libata-core.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/libata-core.c 2010-07-07 09:04:50.000000000 -0400
+@@ -901,7 +901,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 },
};
/**
-@@ -3165,7 +3165,7 @@ static const struct ata_timing ata_timin
+@@ -3170,7 +3170,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)
-@@ -4410,7 +4410,7 @@ static const struct ata_blacklist_entry
+@@ -4415,7 +4415,7 @@ static const struct ata_blacklist_entry
{ "PIONEER DVD-RW DVRTD08", "1.00", ATA_HORKAGE_NOSETXFER },
/* End Marker */
};
static int strn_pattern_cmp(const char *patt, const char *name, int wildchar)
-@@ -5986,7 +5986,7 @@ static void ata_host_stop(struct device
+@@ -5991,7 +5991,7 @@ static void ata_host_stop(struct device
* LOCKING:
* None.
*/
{
static DEFINE_SPINLOCK(lock);
const struct ata_port_operations *cur;
-@@ -5998,6 +5998,7 @@ static void ata_finalize_port_ops(struct
+@@ -6003,6 +6003,7 @@ static void ata_finalize_port_ops(struct
return;
spin_lock(&lock);
for (cur = ops->inherits; cur; cur = cur->inherits) {
void **inherit = (void **)cur;
-@@ -6011,8 +6012,9 @@ static void ata_finalize_port_ops(struct
+@@ -6016,8 +6017,9 @@ static void ata_finalize_port_ops(struct
if (IS_ERR(*pp))
*pp = NULL;
spin_unlock(&lock);
}
-@@ -6109,7 +6111,7 @@ int ata_host_start(struct ata_host *host
+@@ -6114,7 +6116,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;
-@@ -6779,7 +6781,7 @@ static void ata_dummy_error_handler(stru
+@@ -6784,7 +6786,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.34/drivers/ata/libata-eh.c linux-2.6.34/drivers/ata/libata-eh.c
---- linux-2.6.34/drivers/ata/libata-eh.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/libata-eh.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/libata-eh.c linux-2.6.34.1/drivers/ata/libata-eh.c
+--- linux-2.6.34.1/drivers/ata/libata-eh.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/libata-eh.c 2010-07-07 09:04:50.000000000 -0400
@@ -3680,7 +3680,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.34/drivers/ata/libata-pmp.c linux-2.6.34/drivers/ata/libata-pmp.c
---- linux-2.6.34/drivers/ata/libata-pmp.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/libata-pmp.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/libata-pmp.c linux-2.6.34.1/drivers/ata/libata-pmp.c
+--- linux-2.6.34.1/drivers/ata/libata-pmp.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/libata-pmp.c 2010-07-07 09:04:50.000000000 -0400
@@ -842,7 +842,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.34/drivers/ata/pata_acpi.c linux-2.6.34/drivers/ata/pata_acpi.c
---- linux-2.6.34/drivers/ata/pata_acpi.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_acpi.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_acpi.c linux-2.6.34.1/drivers/ata/pata_acpi.c
+--- linux-2.6.34.1/drivers/ata/pata_acpi.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_acpi.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_ali.c linux-2.6.34/drivers/ata/pata_ali.c
---- linux-2.6.34/drivers/ata/pata_ali.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_ali.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_ali.c linux-2.6.34.1/drivers/ata/pata_ali.c
+--- linux-2.6.34.1/drivers/ata/pata_ali.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_ali.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_amd.c linux-2.6.34/drivers/ata/pata_amd.c
---- linux-2.6.34/drivers/ata/pata_amd.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_amd.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_amd.c linux-2.6.34.1/drivers/ata/pata_amd.c
+--- linux-2.6.34.1/drivers/ata/pata_amd.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_amd.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_artop.c linux-2.6.34/drivers/ata/pata_artop.c
---- linux-2.6.34/drivers/ata/pata_artop.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_artop.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_artop.c linux-2.6.34.1/drivers/ata/pata_artop.c
+--- linux-2.6.34.1/drivers/ata/pata_artop.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_artop.c 2010-07-07 09:04:50.000000000 -0400
@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
ATA_BMDMA_SHT(DRV_NAME),
};
.inherits = &ata_bmdma_port_ops,
.cable_detect = artop6260_cable_detect,
.set_piomode = artop6260_set_piomode,
-diff -urNp linux-2.6.34/drivers/ata/pata_at32.c linux-2.6.34/drivers/ata/pata_at32.c
---- linux-2.6.34/drivers/ata/pata_at32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_at32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_at32.c linux-2.6.34.1/drivers/ata/pata_at32.c
+--- linux-2.6.34.1/drivers/ata/pata_at32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_at32.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_at91.c linux-2.6.34/drivers/ata/pata_at91.c
---- linux-2.6.34/drivers/ata/pata_at91.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_at91.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_at91.c linux-2.6.34.1/drivers/ata/pata_at91.c
+--- linux-2.6.34.1/drivers/ata/pata_at91.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_at91.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_atiixp.c linux-2.6.34/drivers/ata/pata_atiixp.c
---- linux-2.6.34/drivers/ata/pata_atiixp.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_atiixp.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_atiixp.c linux-2.6.34.1/drivers/ata/pata_atiixp.c
+--- linux-2.6.34.1/drivers/ata/pata_atiixp.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_atiixp.c 2010-07-07 09:04:50.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_sff_dumb_qc_prep,
-diff -urNp linux-2.6.34/drivers/ata/pata_atp867x.c linux-2.6.34/drivers/ata/pata_atp867x.c
---- linux-2.6.34/drivers/ata/pata_atp867x.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_atp867x.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_atp867x.c linux-2.6.34.1/drivers/ata/pata_atp867x.c
+--- linux-2.6.34.1/drivers/ata/pata_atp867x.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_atp867x.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_bf54x.c linux-2.6.34/drivers/ata/pata_bf54x.c
---- linux-2.6.34/drivers/ata/pata_bf54x.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_bf54x.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_bf54x.c linux-2.6.34.1/drivers/ata/pata_bf54x.c
+--- linux-2.6.34.1/drivers/ata/pata_bf54x.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_bf54x.c 2010-07-07 09:04:50.000000000 -0400
@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
.dma_boundary = ATA_DMA_BOUNDARY,
};
.inherits = &ata_sff_port_ops,
.set_piomode = bfin_set_piomode,
-diff -urNp linux-2.6.34/drivers/ata/pata_cmd640.c linux-2.6.34/drivers/ata/pata_cmd640.c
---- linux-2.6.34/drivers/ata/pata_cmd640.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_cmd640.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_cmd640.c linux-2.6.34.1/drivers/ata/pata_cmd640.c
+--- linux-2.6.34.1/drivers/ata/pata_cmd640.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_cmd640.c 2010-07-07 09:04:50.000000000 -0400
@@ -169,7 +169,7 @@ static struct scsi_host_template cmd640_
ATA_BMDMA_SHT(DRV_NAME),
};
.inherits = &ata_bmdma_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.34/drivers/ata/pata_cmd64x.c linux-2.6.34/drivers/ata/pata_cmd64x.c
---- linux-2.6.34/drivers/ata/pata_cmd64x.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_cmd64x.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_cmd64x.c linux-2.6.34.1/drivers/ata/pata_cmd64x.c
+--- linux-2.6.34.1/drivers/ata/pata_cmd64x.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_cmd64x.c 2010-07-07 09:04:50.000000000 -0400
@@ -274,18 +274,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.34/drivers/ata/pata_cs5520.c linux-2.6.34/drivers/ata/pata_cs5520.c
---- linux-2.6.34/drivers/ata/pata_cs5520.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_cs5520.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_cs5520.c linux-2.6.34.1/drivers/ata/pata_cs5520.c
+--- linux-2.6.34.1/drivers/ata/pata_cs5520.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_cs5520.c 2010-07-07 09:04:50.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_sff_dumb_qc_prep,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.34/drivers/ata/pata_cs5530.c linux-2.6.34/drivers/ata/pata_cs5530.c
---- linux-2.6.34/drivers/ata/pata_cs5530.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_cs5530.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_cs5530.c linux-2.6.34.1/drivers/ata/pata_cs5530.c
+--- linux-2.6.34.1/drivers/ata/pata_cs5530.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_cs5530.c 2010-07-07 09:04:50.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_sff_dumb_qc_prep,
-diff -urNp linux-2.6.34/drivers/ata/pata_cs5535.c linux-2.6.34/drivers/ata/pata_cs5535.c
---- linux-2.6.34/drivers/ata/pata_cs5535.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_cs5535.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_cs5535.c linux-2.6.34.1/drivers/ata/pata_cs5535.c
+--- linux-2.6.34.1/drivers/ata/pata_cs5535.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_cs5535.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_cs5536.c linux-2.6.34/drivers/ata/pata_cs5536.c
---- linux-2.6.34/drivers/ata/pata_cs5536.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_cs5536.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_cs5536.c linux-2.6.34.1/drivers/ata/pata_cs5536.c
+--- linux-2.6.34.1/drivers/ata/pata_cs5536.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_cs5536.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_cypress.c linux-2.6.34/drivers/ata/pata_cypress.c
---- linux-2.6.34/drivers/ata/pata_cypress.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_cypress.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_cypress.c linux-2.6.34.1/drivers/ata/pata_cypress.c
+--- linux-2.6.34.1/drivers/ata/pata_cypress.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_cypress.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_efar.c linux-2.6.34/drivers/ata/pata_efar.c
---- linux-2.6.34/drivers/ata/pata_efar.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_efar.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_efar.c linux-2.6.34.1/drivers/ata/pata_efar.c
+--- linux-2.6.34.1/drivers/ata/pata_efar.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_efar.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_hpt366.c linux-2.6.34/drivers/ata/pata_hpt366.c
---- linux-2.6.34/drivers/ata/pata_hpt366.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_hpt366.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_hpt366.c linux-2.6.34.1/drivers/ata/pata_hpt366.c
+--- linux-2.6.34.1/drivers/ata/pata_hpt366.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_hpt366.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_hpt37x.c linux-2.6.34/drivers/ata/pata_hpt37x.c
---- linux-2.6.34/drivers/ata/pata_hpt37x.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_hpt37x.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_hpt37x.c linux-2.6.34.1/drivers/ata/pata_hpt37x.c
+--- linux-2.6.34.1/drivers/ata/pata_hpt37x.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_hpt37x.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_hpt3x2n.c linux-2.6.34/drivers/ata/pata_hpt3x2n.c
---- linux-2.6.34/drivers/ata/pata_hpt3x2n.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_hpt3x2n.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_hpt3x2n.c linux-2.6.34.1/drivers/ata/pata_hpt3x2n.c
+--- linux-2.6.34.1/drivers/ata/pata_hpt3x2n.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_hpt3x2n.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_hpt3x3.c linux-2.6.34/drivers/ata/pata_hpt3x3.c
---- linux-2.6.34/drivers/ata/pata_hpt3x3.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_hpt3x3.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_hpt3x3.c linux-2.6.34.1/drivers/ata/pata_hpt3x3.c
+--- linux-2.6.34.1/drivers/ata/pata_hpt3x3.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_hpt3x3.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_icside.c linux-2.6.34/drivers/ata/pata_icside.c
---- linux-2.6.34/drivers/ata/pata_icside.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_icside.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_icside.c linux-2.6.34.1/drivers/ata/pata_icside.c
+--- linux-2.6.34.1/drivers/ata/pata_icside.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_icside.c 2010-07-07 09:04:50.000000000 -0400
@@ -320,7 +320,7 @@ static void pata_icside_postreset(struct
}
}
.inherits = &ata_sff_port_ops,
/* no need to build any PRD tables for DMA */
.qc_prep = ata_noop_qc_prep,
-diff -urNp linux-2.6.34/drivers/ata/pata_isapnp.c linux-2.6.34/drivers/ata/pata_isapnp.c
---- linux-2.6.34/drivers/ata/pata_isapnp.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_isapnp.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_isapnp.c linux-2.6.34.1/drivers/ata/pata_isapnp.c
+--- linux-2.6.34.1/drivers/ata/pata_isapnp.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_isapnp.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_it8213.c linux-2.6.34/drivers/ata/pata_it8213.c
---- linux-2.6.34/drivers/ata/pata_it8213.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_it8213.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_it8213.c linux-2.6.34.1/drivers/ata/pata_it8213.c
+--- linux-2.6.34.1/drivers/ata/pata_it8213.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_it8213.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_it821x.c linux-2.6.34/drivers/ata/pata_it821x.c
---- linux-2.6.34/drivers/ata/pata_it821x.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_it821x.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_it821x.c linux-2.6.34.1/drivers/ata/pata_it821x.c
+--- linux-2.6.34.1/drivers/ata/pata_it821x.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_it821x.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_ixp4xx_cf.c linux-2.6.34/drivers/ata/pata_ixp4xx_cf.c
---- linux-2.6.34/drivers/ata/pata_ixp4xx_cf.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_ixp4xx_cf.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_ixp4xx_cf.c linux-2.6.34.1/drivers/ata/pata_ixp4xx_cf.c
+--- linux-2.6.34.1/drivers/ata/pata_ixp4xx_cf.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_ixp4xx_cf.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_jmicron.c linux-2.6.34/drivers/ata/pata_jmicron.c
---- linux-2.6.34/drivers/ata/pata_jmicron.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_jmicron.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_jmicron.c linux-2.6.34.1/drivers/ata/pata_jmicron.c
+--- linux-2.6.34.1/drivers/ata/pata_jmicron.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_jmicron.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_legacy.c linux-2.6.34/drivers/ata/pata_legacy.c
---- linux-2.6.34/drivers/ata/pata_legacy.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_legacy.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_legacy.c linux-2.6.34.1/drivers/ata/pata_legacy.c
+--- linux-2.6.34.1/drivers/ata/pata_legacy.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_legacy.c 2010-07-07 09:04:50.000000000 -0400
@@ -113,7 +113,7 @@ struct legacy_probe {
struct legacy_controller {
struct legacy_data *ld = &legacy_data[probe->slot];
struct ata_host *host = NULL;
struct ata_port *ap;
-diff -urNp linux-2.6.34/drivers/ata/pata_macio.c linux-2.6.34/drivers/ata/pata_macio.c
---- linux-2.6.34/drivers/ata/pata_macio.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_macio.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_macio.c linux-2.6.34.1/drivers/ata/pata_macio.c
+--- linux-2.6.34.1/drivers/ata/pata_macio.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_macio.c 2010-07-07 09:04:50.000000000 -0400
@@ -916,7 +916,7 @@ static struct scsi_host_template pata_ma
.slave_configure = pata_macio_slave_config,
};
.inherits = &ata_sff_port_ops,
.freeze = pata_macio_freeze,
-diff -urNp linux-2.6.34/drivers/ata/pata_marvell.c linux-2.6.34/drivers/ata/pata_marvell.c
---- linux-2.6.34/drivers/ata/pata_marvell.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_marvell.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_marvell.c linux-2.6.34.1/drivers/ata/pata_marvell.c
+--- linux-2.6.34.1/drivers/ata/pata_marvell.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_marvell.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_mpc52xx.c linux-2.6.34/drivers/ata/pata_mpc52xx.c
---- linux-2.6.34/drivers/ata/pata_mpc52xx.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_mpc52xx.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_mpc52xx.c linux-2.6.34.1/drivers/ata/pata_mpc52xx.c
+--- linux-2.6.34.1/drivers/ata/pata_mpc52xx.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_mpc52xx.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_mpiix.c linux-2.6.34/drivers/ata/pata_mpiix.c
---- linux-2.6.34/drivers/ata/pata_mpiix.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_mpiix.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_mpiix.c linux-2.6.34.1/drivers/ata/pata_mpiix.c
+--- linux-2.6.34.1/drivers/ata/pata_mpiix.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_mpiix.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_netcell.c linux-2.6.34/drivers/ata/pata_netcell.c
---- linux-2.6.34/drivers/ata/pata_netcell.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_netcell.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_netcell.c linux-2.6.34.1/drivers/ata/pata_netcell.c
+--- linux-2.6.34.1/drivers/ata/pata_netcell.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_netcell.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_ninja32.c linux-2.6.34/drivers/ata/pata_ninja32.c
---- linux-2.6.34/drivers/ata/pata_ninja32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_ninja32.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_ninja32.c linux-2.6.34.1/drivers/ata/pata_ninja32.c
+--- linux-2.6.34.1/drivers/ata/pata_ninja32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_ninja32.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_ns87410.c linux-2.6.34/drivers/ata/pata_ns87410.c
---- linux-2.6.34/drivers/ata/pata_ns87410.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_ns87410.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_ns87410.c linux-2.6.34.1/drivers/ata/pata_ns87410.c
+--- linux-2.6.34.1/drivers/ata/pata_ns87410.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_ns87410.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_ns87415.c linux-2.6.34/drivers/ata/pata_ns87415.c
---- linux-2.6.34/drivers/ata/pata_ns87415.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_ns87415.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_ns87415.c linux-2.6.34.1/drivers/ata/pata_ns87415.c
+--- linux-2.6.34.1/drivers/ata/pata_ns87415.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_ns87415.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_octeon_cf.c linux-2.6.34/drivers/ata/pata_octeon_cf.c
---- linux-2.6.34/drivers/ata/pata_octeon_cf.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_octeon_cf.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_octeon_cf.c linux-2.6.34.1/drivers/ata/pata_octeon_cf.c
+--- linux-2.6.34.1/drivers/ata/pata_octeon_cf.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_octeon_cf.c 2010-07-07 09:04:50.000000000 -0400
@@ -802,6 +802,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.34/drivers/ata/pata_oldpiix.c linux-2.6.34/drivers/ata/pata_oldpiix.c
---- linux-2.6.34/drivers/ata/pata_oldpiix.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_oldpiix.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_oldpiix.c linux-2.6.34.1/drivers/ata/pata_oldpiix.c
+--- linux-2.6.34.1/drivers/ata/pata_oldpiix.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_oldpiix.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_opti.c linux-2.6.34/drivers/ata/pata_opti.c
---- linux-2.6.34/drivers/ata/pata_opti.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_opti.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_opti.c linux-2.6.34.1/drivers/ata/pata_opti.c
+--- linux-2.6.34.1/drivers/ata/pata_opti.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_opti.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_optidma.c linux-2.6.34/drivers/ata/pata_optidma.c
---- linux-2.6.34/drivers/ata/pata_optidma.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_optidma.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_optidma.c linux-2.6.34.1/drivers/ata/pata_optidma.c
+--- linux-2.6.34.1/drivers/ata/pata_optidma.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_optidma.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_palmld.c linux-2.6.34/drivers/ata/pata_palmld.c
---- linux-2.6.34/drivers/ata/pata_palmld.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_palmld.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_palmld.c linux-2.6.34.1/drivers/ata/pata_palmld.c
+--- linux-2.6.34.1/drivers/ata/pata_palmld.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_palmld.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_pcmcia.c linux-2.6.34/drivers/ata/pata_pcmcia.c
---- linux-2.6.34/drivers/ata/pata_pcmcia.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_pcmcia.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_pcmcia.c linux-2.6.34.1/drivers/ata/pata_pcmcia.c
+--- linux-2.6.34.1/drivers/ata/pata_pcmcia.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_pcmcia.c 2010-07-07 09:04:50.000000000 -0400
@@ -163,14 +163,14 @@ static struct scsi_host_template pcmcia_
ATA_PIO_SHT(DRV_NAME),
};
info = kzalloc(sizeof(*info), GFP_KERNEL);
if (info == NULL)
-diff -urNp linux-2.6.34/drivers/ata/pata_pdc2027x.c linux-2.6.34/drivers/ata/pata_pdc2027x.c
---- linux-2.6.34/drivers/ata/pata_pdc2027x.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_pdc2027x.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_pdc2027x.c linux-2.6.34.1/drivers/ata/pata_pdc2027x.c
+--- linux-2.6.34.1/drivers/ata/pata_pdc2027x.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_pdc2027x.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_pdc202xx_old.c linux-2.6.34/drivers/ata/pata_pdc202xx_old.c
---- linux-2.6.34/drivers/ata/pata_pdc202xx_old.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_pdc202xx_old.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_pdc202xx_old.c linux-2.6.34.1/drivers/ata/pata_pdc202xx_old.c
+--- linux-2.6.34.1/drivers/ata/pata_pdc202xx_old.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_pdc202xx_old.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_piccolo.c linux-2.6.34/drivers/ata/pata_piccolo.c
---- linux-2.6.34/drivers/ata/pata_piccolo.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_piccolo.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_piccolo.c linux-2.6.34.1/drivers/ata/pata_piccolo.c
+--- linux-2.6.34.1/drivers/ata/pata_piccolo.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_piccolo.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_platform.c linux-2.6.34/drivers/ata/pata_platform.c
---- linux-2.6.34/drivers/ata/pata_platform.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_platform.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_platform.c linux-2.6.34.1/drivers/ata/pata_platform.c
+--- linux-2.6.34.1/drivers/ata/pata_platform.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_platform.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_qdi.c linux-2.6.34/drivers/ata/pata_qdi.c
---- linux-2.6.34/drivers/ata/pata_qdi.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_qdi.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_qdi.c linux-2.6.34.1/drivers/ata/pata_qdi.c
+--- linux-2.6.34.1/drivers/ata/pata_qdi.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_qdi.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_radisys.c linux-2.6.34/drivers/ata/pata_radisys.c
---- linux-2.6.34/drivers/ata/pata_radisys.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_radisys.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_radisys.c linux-2.6.34.1/drivers/ata/pata_radisys.c
+--- linux-2.6.34.1/drivers/ata/pata_radisys.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_radisys.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_rb532_cf.c linux-2.6.34/drivers/ata/pata_rb532_cf.c
---- linux-2.6.34/drivers/ata/pata_rb532_cf.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_rb532_cf.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_rb532_cf.c linux-2.6.34.1/drivers/ata/pata_rb532_cf.c
+--- linux-2.6.34.1/drivers/ata/pata_rb532_cf.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_rb532_cf.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_rdc.c linux-2.6.34/drivers/ata/pata_rdc.c
---- linux-2.6.34/drivers/ata/pata_rdc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_rdc.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_rdc.c linux-2.6.34.1/drivers/ata/pata_rdc.c
+--- linux-2.6.34.1/drivers/ata/pata_rdc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_rdc.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_rz1000.c linux-2.6.34/drivers/ata/pata_rz1000.c
---- linux-2.6.34/drivers/ata/pata_rz1000.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_rz1000.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_rz1000.c linux-2.6.34.1/drivers/ata/pata_rz1000.c
+--- linux-2.6.34.1/drivers/ata/pata_rz1000.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_rz1000.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_sc1200.c linux-2.6.34/drivers/ata/pata_sc1200.c
---- linux-2.6.34/drivers/ata/pata_sc1200.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_sc1200.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_sc1200.c linux-2.6.34.1/drivers/ata/pata_sc1200.c
+--- linux-2.6.34.1/drivers/ata/pata_sc1200.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_sc1200.c 2010-07-07 09:04:50.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_sff_dumb_qc_prep,
.qc_issue = sc1200_qc_issue,
-diff -urNp linux-2.6.34/drivers/ata/pata_scc.c linux-2.6.34/drivers/ata/pata_scc.c
---- linux-2.6.34/drivers/ata/pata_scc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_scc.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_scc.c linux-2.6.34.1/drivers/ata/pata_scc.c
+--- linux-2.6.34.1/drivers/ata/pata_scc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_scc.c 2010-07-07 09:04:50.000000000 -0400
@@ -965,7 +965,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.34/drivers/ata/pata_sch.c linux-2.6.34/drivers/ata/pata_sch.c
---- linux-2.6.34/drivers/ata/pata_sch.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_sch.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_sch.c linux-2.6.34.1/drivers/ata/pata_sch.c
+--- linux-2.6.34.1/drivers/ata/pata_sch.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_sch.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_serverworks.c linux-2.6.34/drivers/ata/pata_serverworks.c
---- linux-2.6.34/drivers/ata/pata_serverworks.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_serverworks.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_serverworks.c linux-2.6.34.1/drivers/ata/pata_serverworks.c
+--- linux-2.6.34.1/drivers/ata/pata_serverworks.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_serverworks.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_sil680.c linux-2.6.34/drivers/ata/pata_sil680.c
---- linux-2.6.34/drivers/ata/pata_sil680.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_sil680.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_sil680.c linux-2.6.34.1/drivers/ata/pata_sil680.c
+--- linux-2.6.34.1/drivers/ata/pata_sil680.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_sil680.c 2010-07-07 09:04:50.000000000 -0400
@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
ATA_BMDMA_SHT(DRV_NAME),
};
.inherits = &ata_bmdma32_port_ops,
.cable_detect = sil680_cable_detect,
.set_piomode = sil680_set_piomode,
-diff -urNp linux-2.6.34/drivers/ata/pata_sis.c linux-2.6.34/drivers/ata/pata_sis.c
---- linux-2.6.34/drivers/ata/pata_sis.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_sis.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_sis.c linux-2.6.34.1/drivers/ata/pata_sis.c
+--- linux-2.6.34.1/drivers/ata/pata_sis.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_sis.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_sl82c105.c linux-2.6.34/drivers/ata/pata_sl82c105.c
---- linux-2.6.34/drivers/ata/pata_sl82c105.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_sl82c105.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_sl82c105.c linux-2.6.34.1/drivers/ata/pata_sl82c105.c
+--- linux-2.6.34.1/drivers/ata/pata_sl82c105.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_sl82c105.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_triflex.c linux-2.6.34/drivers/ata/pata_triflex.c
---- linux-2.6.34/drivers/ata/pata_triflex.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_triflex.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_triflex.c linux-2.6.34.1/drivers/ata/pata_triflex.c
+--- linux-2.6.34.1/drivers/ata/pata_triflex.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_triflex.c 2010-07-07 09:04:50.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.34/drivers/ata/pata_via.c linux-2.6.34/drivers/ata/pata_via.c
---- linux-2.6.34/drivers/ata/pata_via.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_via.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_via.c linux-2.6.34.1/drivers/ata/pata_via.c
+--- linux-2.6.34.1/drivers/ata/pata_via.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_via.c 2010-07-07 09:04:50.000000000 -0400
@@ -441,7 +441,7 @@ static struct scsi_host_template via_sht
ATA_BMDMA_SHT(DRV_NAME),
};
.inherits = &via_port_ops,
.sff_data_xfer = ata_sff_data_xfer_noirq,
};
-diff -urNp linux-2.6.34/drivers/ata/pata_winbond.c linux-2.6.34/drivers/ata/pata_winbond.c
---- linux-2.6.34/drivers/ata/pata_winbond.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pata_winbond.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pata_winbond.c linux-2.6.34.1/drivers/ata/pata_winbond.c
+--- linux-2.6.34.1/drivers/ata/pata_winbond.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pata_winbond.c 2010-07-07 09:04:50.000000000 -0400
@@ -125,7 +125,7 @@ static struct scsi_host_template winbond
ATA_PIO_SHT(DRV_NAME),
};
.inherits = &ata_sff_port_ops,
.sff_data_xfer = winbond_data_xfer,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.34/drivers/ata/pdc_adma.c linux-2.6.34/drivers/ata/pdc_adma.c
---- linux-2.6.34/drivers/ata/pdc_adma.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/pdc_adma.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/pdc_adma.c linux-2.6.34.1/drivers/ata/pdc_adma.c
+--- linux-2.6.34.1/drivers/ata/pdc_adma.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/pdc_adma.c 2010-07-07 09:04:50.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.34/drivers/ata/sata_fsl.c linux-2.6.34/drivers/ata/sata_fsl.c
---- linux-2.6.34/drivers/ata/sata_fsl.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/sata_fsl.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/sata_fsl.c linux-2.6.34.1/drivers/ata/sata_fsl.c
+--- linux-2.6.34.1/drivers/ata/sata_fsl.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/sata_fsl.c 2010-07-07 09:04:50.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.34/drivers/ata/sata_inic162x.c linux-2.6.34/drivers/ata/sata_inic162x.c
---- linux-2.6.34/drivers/ata/sata_inic162x.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/sata_inic162x.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/sata_inic162x.c linux-2.6.34.1/drivers/ata/sata_inic162x.c
+--- linux-2.6.34.1/drivers/ata/sata_inic162x.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/sata_inic162x.c 2010-07-07 09:04:50.000000000 -0400
@@ -722,7 +722,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.34/drivers/ata/sata_mv.c linux-2.6.34/drivers/ata/sata_mv.c
---- linux-2.6.34/drivers/ata/sata_mv.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/sata_mv.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/sata_mv.c linux-2.6.34.1/drivers/ata/sata_mv.c
+--- linux-2.6.34.1/drivers/ata/sata_mv.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/sata_mv.c 2010-07-07 09:04:50.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.34/drivers/ata/sata_nv.c linux-2.6.34/drivers/ata/sata_nv.c
---- linux-2.6.34/drivers/ata/sata_nv.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/sata_nv.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/sata_nv.c linux-2.6.34.1/drivers/ata/sata_nv.c
+--- linux-2.6.34.1/drivers/ata/sata_nv.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/sata_nv.c 2010-07-07 09:04:50.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.34/drivers/ata/sata_promise.c linux-2.6.34/drivers/ata/sata_promise.c
---- linux-2.6.34/drivers/ata/sata_promise.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/sata_promise.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/sata_promise.c linux-2.6.34.1/drivers/ata/sata_promise.c
+--- linux-2.6.34.1/drivers/ata/sata_promise.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/sata_promise.c 2010-07-07 09:04:50.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.34/drivers/ata/sata_qstor.c linux-2.6.34/drivers/ata/sata_qstor.c
---- linux-2.6.34/drivers/ata/sata_qstor.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/sata_qstor.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/sata_qstor.c linux-2.6.34.1/drivers/ata/sata_qstor.c
+--- linux-2.6.34.1/drivers/ata/sata_qstor.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/sata_qstor.c 2010-07-07 09:04:50.000000000 -0400
@@ -133,7 +133,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.34/drivers/ata/sata_sil24.c linux-2.6.34/drivers/ata/sata_sil24.c
---- linux-2.6.34/drivers/ata/sata_sil24.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/sata_sil24.c 2010-07-01 20:45:14.000000000 -0400
-@@ -389,7 +389,7 @@ static struct scsi_host_template sil24_s
- .dma_boundary = ATA_DMA_BOUNDARY,
- };
-
--static struct ata_port_operations sil24_ops = {
-+static const struct ata_port_operations sil24_ops = {
- .inherits = &sata_pmp_port_ops,
-
- .qc_defer = sil24_qc_defer,
-diff -urNp linux-2.6.34/drivers/ata/sata_sil.c linux-2.6.34/drivers/ata/sata_sil.c
---- linux-2.6.34/drivers/ata/sata_sil.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/sata_sil.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/sata_sil.c linux-2.6.34.1/drivers/ata/sata_sil.c
+--- linux-2.6.34.1/drivers/ata/sata_sil.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/sata_sil.c 2010-07-07 09:04:50.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.34/drivers/ata/sata_sis.c linux-2.6.34/drivers/ata/sata_sis.c
---- linux-2.6.34/drivers/ata/sata_sis.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/sata_sis.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/sata_sil24.c linux-2.6.34.1/drivers/ata/sata_sil24.c
+--- linux-2.6.34.1/drivers/ata/sata_sil24.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/sata_sil24.c 2010-07-07 09:04:50.000000000 -0400
+@@ -389,7 +389,7 @@ static struct scsi_host_template sil24_s
+ .dma_boundary = ATA_DMA_BOUNDARY,
+ };
+
+-static struct ata_port_operations sil24_ops = {
++static const struct ata_port_operations sil24_ops = {
+ .inherits = &sata_pmp_port_ops,
+
+ .qc_defer = sil24_qc_defer,
+diff -urNp linux-2.6.34.1/drivers/ata/sata_sis.c linux-2.6.34.1/drivers/ata/sata_sis.c
+--- linux-2.6.34.1/drivers/ata/sata_sis.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/sata_sis.c 2010-07-07 09:04:50.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.34/drivers/ata/sata_svw.c linux-2.6.34/drivers/ata/sata_svw.c
---- linux-2.6.34/drivers/ata/sata_svw.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/sata_svw.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/sata_svw.c linux-2.6.34.1/drivers/ata/sata_svw.c
+--- linux-2.6.34.1/drivers/ata/sata_svw.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/sata_svw.c 2010-07-07 09:04:50.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.34/drivers/ata/sata_sx4.c linux-2.6.34/drivers/ata/sata_sx4.c
---- linux-2.6.34/drivers/ata/sata_sx4.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/sata_sx4.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/sata_sx4.c linux-2.6.34.1/drivers/ata/sata_sx4.c
+--- linux-2.6.34.1/drivers/ata/sata_sx4.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/sata_sx4.c 2010-07-07 09:04:50.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.34/drivers/ata/sata_uli.c linux-2.6.34/drivers/ata/sata_uli.c
---- linux-2.6.34/drivers/ata/sata_uli.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/sata_uli.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/sata_uli.c linux-2.6.34.1/drivers/ata/sata_uli.c
+--- linux-2.6.34.1/drivers/ata/sata_uli.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/sata_uli.c 2010-07-07 09:04:50.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.34/drivers/ata/sata_via.c linux-2.6.34/drivers/ata/sata_via.c
---- linux-2.6.34/drivers/ata/sata_via.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/sata_via.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/sata_via.c linux-2.6.34.1/drivers/ata/sata_via.c
+--- linux-2.6.34.1/drivers/ata/sata_via.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/sata_via.c 2010-07-07 09:04:50.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.34/drivers/ata/sata_vsc.c linux-2.6.34/drivers/ata/sata_vsc.c
---- linux-2.6.34/drivers/ata/sata_vsc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ata/sata_vsc.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ata/sata_vsc.c linux-2.6.34.1/drivers/ata/sata_vsc.c
+--- linux-2.6.34.1/drivers/ata/sata_vsc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ata/sata_vsc.c 2010-07-07 09:04:50.000000000 -0400
@@ -306,7 +306,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.34/drivers/atm/adummy.c linux-2.6.34/drivers/atm/adummy.c
---- linux-2.6.34/drivers/atm/adummy.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/atm/adummy.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/atm/adummy.c linux-2.6.34.1/drivers/atm/adummy.c
+--- linux-2.6.34.1/drivers/atm/adummy.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/atm/adummy.c 2010-07-07 09:04:50.000000000 -0400
@@ -78,7 +78,7 @@ adummy_send(struct atm_vcc *vcc, struct
vcc->pop(vcc, skb);
else
return 0;
}
-diff -urNp linux-2.6.34/drivers/atm/ambassador.c linux-2.6.34/drivers/atm/ambassador.c
---- linux-2.6.34/drivers/atm/ambassador.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/atm/ambassador.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/atm/ambassador.c linux-2.6.34.1/drivers/atm/ambassador.c
+--- linux-2.6.34.1/drivers/atm/ambassador.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/atm/ambassador.c 2010-07-07 09:04:50.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.34/drivers/atm/atmtcp.c linux-2.6.34/drivers/atm/atmtcp.c
---- linux-2.6.34/drivers/atm/atmtcp.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/atm/atmtcp.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/atm/atmtcp.c linux-2.6.34.1/drivers/atm/atmtcp.c
+--- linux-2.6.34.1/drivers/atm/atmtcp.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/atm/atmtcp.c 2010-07-07 09:04:50.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.34/drivers/atm/eni.c linux-2.6.34/drivers/atm/eni.c
---- linux-2.6.34/drivers/atm/eni.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/atm/eni.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/atm/eni.c linux-2.6.34.1/drivers/atm/eni.c
+--- linux-2.6.34.1/drivers/atm/eni.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/atm/eni.c 2010-07-07 09:04:50.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.34/drivers/atm/firestream.c linux-2.6.34/drivers/atm/firestream.c
---- linux-2.6.34/drivers/atm/firestream.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/atm/firestream.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/atm/firestream.c linux-2.6.34.1/drivers/atm/firestream.c
+--- linux-2.6.34.1/drivers/atm/firestream.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/atm/firestream.c 2010-07-07 09:04:50.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.34/drivers/atm/fore200e.c linux-2.6.34/drivers/atm/fore200e.c
---- linux-2.6.34/drivers/atm/fore200e.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/atm/fore200e.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/atm/fore200e.c linux-2.6.34.1/drivers/atm/fore200e.c
+--- linux-2.6.34.1/drivers/atm/fore200e.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/atm/fore200e.c 2010-07-07 09:04:50.000000000 -0400
@@ -931,9 +931,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.34/drivers/atm/he.c linux-2.6.34/drivers/atm/he.c
---- linux-2.6.34/drivers/atm/he.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/atm/he.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/atm/he.c linux-2.6.34.1/drivers/atm/he.c
+--- linux-2.6.34.1/drivers/atm/he.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/atm/he.c 2010-07-07 09:04:50.000000000 -0400
@@ -1770,7 +1770,7 @@ he_service_rbrq(struct he_dev *he_dev, i
if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
return 0;
}
-diff -urNp linux-2.6.34/drivers/atm/horizon.c linux-2.6.34/drivers/atm/horizon.c
---- linux-2.6.34/drivers/atm/horizon.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/atm/horizon.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/atm/horizon.c linux-2.6.34.1/drivers/atm/horizon.c
+--- linux-2.6.34.1/drivers/atm/horizon.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/atm/horizon.c 2010-07-07 09:04:51.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.34/drivers/atm/idt77252.c linux-2.6.34/drivers/atm/idt77252.c
---- linux-2.6.34/drivers/atm/idt77252.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/atm/idt77252.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/atm/idt77252.c linux-2.6.34.1/drivers/atm/idt77252.c
+--- linux-2.6.34.1/drivers/atm/idt77252.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/atm/idt77252.c 2010-07-07 09:04:51.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.34/drivers/atm/iphase.c linux-2.6.34/drivers/atm/iphase.c
---- linux-2.6.34/drivers/atm/iphase.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/atm/iphase.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/atm/iphase.c linux-2.6.34.1/drivers/atm/iphase.c
+--- linux-2.6.34.1/drivers/atm/iphase.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/atm/iphase.c 2010-07-07 09:04:51.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.34/drivers/atm/lanai.c linux-2.6.34/drivers/atm/lanai.c
---- linux-2.6.34/drivers/atm/lanai.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/atm/lanai.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/atm/lanai.c linux-2.6.34.1/drivers/atm/lanai.c
+--- linux-2.6.34.1/drivers/atm/lanai.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/atm/lanai.c 2010-07-07 09:04:51.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.34/drivers/atm/nicstar.c linux-2.6.34/drivers/atm/nicstar.c
---- linux-2.6.34/drivers/atm/nicstar.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/atm/nicstar.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/atm/nicstar.c linux-2.6.34.1/drivers/atm/nicstar.c
+--- linux-2.6.34.1/drivers/atm/nicstar.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/atm/nicstar.c 2010-07-07 09:04:51.000000000 -0400
@@ -1722,7 +1722,7 @@ static int ns_send(struct atm_vcc *vcc,
if ((vc = (vc_map *) vcc->dev_data) == NULL)
{
}
}
-diff -urNp linux-2.6.34/drivers/atm/solos-pci.c linux-2.6.34/drivers/atm/solos-pci.c
---- linux-2.6.34/drivers/atm/solos-pci.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/atm/solos-pci.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/atm/solos-pci.c linux-2.6.34.1/drivers/atm/solos-pci.c
+--- linux-2.6.34.1/drivers/atm/solos-pci.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/atm/solos-pci.c 2010-07-07 09:04:51.000000000 -0400
@@ -715,7 +715,7 @@ void solos_bh(unsigned long card_arg)
}
atm_charge(vcc, skb->truesize);
solos_pop(vcc, oldskb);
} else
dev_kfree_skb_irq(oldskb);
-diff -urNp linux-2.6.34/drivers/atm/suni.c linux-2.6.34/drivers/atm/suni.c
---- linux-2.6.34/drivers/atm/suni.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/atm/suni.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/atm/suni.c linux-2.6.34.1/drivers/atm/suni.c
+--- linux-2.6.34.1/drivers/atm/suni.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/atm/suni.c 2010-07-07 09:04:51.000000000 -0400
@@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
static void suni_hz(unsigned long from_timer)
-diff -urNp linux-2.6.34/drivers/atm/uPD98402.c linux-2.6.34/drivers/atm/uPD98402.c
---- linux-2.6.34/drivers/atm/uPD98402.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/atm/uPD98402.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/atm/uPD98402.c linux-2.6.34.1/drivers/atm/uPD98402.c
+--- linux-2.6.34.1/drivers/atm/uPD98402.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/atm/uPD98402.c 2010-07-07 09:04:51.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.34/drivers/atm/zatm.c linux-2.6.34/drivers/atm/zatm.c
---- linux-2.6.34/drivers/atm/zatm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/atm/zatm.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/atm/zatm.c linux-2.6.34.1/drivers/atm/zatm.c
+--- linux-2.6.34.1/drivers/atm/zatm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/atm/zatm.c 2010-07-07 09:04:51.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.34/drivers/char/agp/frontend.c linux-2.6.34/drivers/char/agp/frontend.c
---- linux-2.6.34/drivers/char/agp/frontend.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/char/agp/frontend.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/char/agp/frontend.c linux-2.6.34.1/drivers/char/agp/frontend.c
+--- linux-2.6.34.1/drivers/char/agp/frontend.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/char/agp/frontend.c 2010-07-07 09:04:51.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.34/drivers/char/agp/intel-agp.c linux-2.6.34/drivers/char/agp/intel-agp.c
---- linux-2.6.34/drivers/char/agp/intel-agp.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/char/agp/intel-agp.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/char/agp/intel-agp.c linux-2.6.34.1/drivers/char/agp/intel-agp.c
+--- linux-2.6.34.1/drivers/char/agp/intel-agp.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/char/agp/intel-agp.c 2010-07-07 09:04:51.000000000 -0400
@@ -2697,7 +2697,7 @@ static struct pci_device_id agp_intel_pc
ID(PCI_DEVICE_ID_INTEL_IRONLAKE_MC2_HB),
ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB),
};
MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
-diff -urNp linux-2.6.34/drivers/char/hpet.c linux-2.6.34/drivers/char/hpet.c
---- linux-2.6.34/drivers/char/hpet.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/char/hpet.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/char/hpet.c linux-2.6.34.1/drivers/char/hpet.c
+--- linux-2.6.34.1/drivers/char/hpet.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/char/hpet.c 2010-07-07 09:04:51.000000000 -0400
@@ -429,7 +429,7 @@ static int hpet_release(struct inode *in
return 0;
}
static int __init hpet_init(void)
{
-diff -urNp linux-2.6.34/drivers/char/hvc_console.h linux-2.6.34/drivers/char/hvc_console.h
---- linux-2.6.34/drivers/char/hvc_console.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/char/hvc_console.h 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/char/hvc_console.h linux-2.6.34.1/drivers/char/hvc_console.h
+--- linux-2.6.34.1/drivers/char/hvc_console.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/char/hvc_console.h 2010-07-07 09:04:51.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.34/drivers/char/hvcs.c linux-2.6.34/drivers/char/hvcs.c
---- linux-2.6.34/drivers/char/hvcs.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/char/hvcs.c 2010-07-01 20:45:14.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/char/hvcs.c linux-2.6.34.1/drivers/char/hvcs.c
+--- linux-2.6.34.1/drivers/char/hvcs.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/char/hvcs.c 2010-07-07 09:04:51.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.34/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.34/drivers/char/ipmi/ipmi_msghandler.c
---- linux-2.6.34/drivers/char/ipmi/ipmi_msghandler.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/char/ipmi/ipmi_msghandler.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.34.1/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-2.6.34.1/drivers/char/ipmi/ipmi_msghandler.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/char/ipmi/ipmi_msghandler.c 2010-07-07 09:04:51.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.34/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.34/drivers/char/ipmi/ipmi_si_intf.c
---- linux-2.6.34/drivers/char/ipmi/ipmi_si_intf.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/char/ipmi/ipmi_si_intf.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.34.1/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-2.6.34.1/drivers/char/ipmi/ipmi_si_intf.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/char/ipmi/ipmi_si_intf.c 2010-07-07 09:04:51.000000000 -0400
@@ -278,7 +278,7 @@ struct smi_info {
unsigned char slave_addr;
#define SI_MAX_PARMS 4
-@@ -3083,7 +3083,7 @@ static int try_smi_init(struct smi_info
+@@ -3088,7 +3088,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 = 0;
atomic_set(&new_smi->stop_operation, 0);
-diff -urNp linux-2.6.34/drivers/char/keyboard.c linux-2.6.34/drivers/char/keyboard.c
---- linux-2.6.34/drivers/char/keyboard.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/char/keyboard.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/char/keyboard.c linux-2.6.34.1/drivers/char/keyboard.c
+--- linux-2.6.34.1/drivers/char/keyboard.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/char/keyboard.c 2010-07-07 09:04:51.000000000 -0400
@@ -652,6 +652,16 @@ static void k_spec(struct vc_data *vc, u
kbd->kbdmode == VC_MEDIUMRAW) &&
value != KVAL(K_SAK))
};
MODULE_DEVICE_TABLE(input, kbd_ids);
-diff -urNp linux-2.6.34/drivers/char/mem.c linux-2.6.34/drivers/char/mem.c
---- linux-2.6.34/drivers/char/mem.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/char/mem.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/char/mem.c linux-2.6.34.1/drivers/char/mem.c
+--- linux-2.6.34.1/drivers/char/mem.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/char/mem.c 2010-07-07 09:04:51.000000000 -0400
@@ -18,6 +18,7 @@
#include <linux/raw.h>
#include <linux/tty.h>
};
static int memory_open(struct inode *inode, struct file *filp)
-diff -urNp linux-2.6.34/drivers/char/n_tty.c linux-2.6.34/drivers/char/n_tty.c
---- linux-2.6.34/drivers/char/n_tty.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/char/n_tty.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/char/n_tty.c linux-2.6.34.1/drivers/char/n_tty.c
+--- linux-2.6.34.1/drivers/char/n_tty.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/char/n_tty.c 2010-07-07 09:04:51.000000000 -0400
@@ -2105,6 +2105,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
{
*ops = tty_ldisc_N_TTY;
+ ops->flags = 0;
}
EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
-diff -urNp linux-2.6.34/drivers/char/nvram.c linux-2.6.34/drivers/char/nvram.c
---- linux-2.6.34/drivers/char/nvram.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/char/nvram.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/char/nvram.c linux-2.6.34.1/drivers/char/nvram.c
+--- linux-2.6.34.1/drivers/char/nvram.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/char/nvram.c 2010-07-07 09:04:51.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.34/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.34/drivers/char/pcmcia/ipwireless/tty.c
---- linux-2.6.34/drivers/char/pcmcia/ipwireless/tty.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/char/pcmcia/ipwireless/tty.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.34.1/drivers/char/pcmcia/ipwireless/tty.c
+--- linux-2.6.34.1/drivers/char/pcmcia/ipwireless/tty.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/char/pcmcia/ipwireless/tty.c 2010-07-07 09:04:51.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.34/drivers/char/pty.c linux-2.6.34/drivers/char/pty.c
---- linux-2.6.34/drivers/char/pty.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/char/pty.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/char/pty.c linux-2.6.34.1/drivers/char/pty.c
+--- linux-2.6.34.1/drivers/char/pty.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/char/pty.c 2010-07-07 09:04:51.000000000 -0400
@@ -677,7 +677,18 @@ static int ptmx_open(struct inode *inode
return ret;
}
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.34/drivers/char/random.c linux-2.6.34/drivers/char/random.c
---- linux-2.6.34/drivers/char/random.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/char/random.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/char/random.c linux-2.6.34.1/drivers/char/random.c
+--- linux-2.6.34.1/drivers/char/random.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/char/random.c 2010-07-07 09:04:51.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.34/drivers/char/sonypi.c linux-2.6.34/drivers/char/sonypi.c
---- linux-2.6.34/drivers/char/sonypi.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/char/sonypi.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/char/sonypi.c linux-2.6.34.1/drivers/char/sonypi.c
+--- linux-2.6.34.1/drivers/char/sonypi.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/char/sonypi.c 2010-07-07 09:04:51.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.34/drivers/char/tpm/tpm_bios.c linux-2.6.34/drivers/char/tpm/tpm_bios.c
---- linux-2.6.34/drivers/char/tpm/tpm_bios.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/char/tpm/tpm_bios.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/char/tpm/tpm_bios.c linux-2.6.34.1/drivers/char/tpm/tpm_bios.c
+--- linux-2.6.34.1/drivers/char/tpm/tpm_bios.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/char/tpm/tpm_bios.c 2010-07-07 09:04:51.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.34/drivers/char/tty_io.c linux-2.6.34/drivers/char/tty_io.c
---- linux-2.6.34/drivers/char/tty_io.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/char/tty_io.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/char/tty_io.c linux-2.6.34.1/drivers/char/tty_io.c
+--- linux-2.6.34.1/drivers/char/tty_io.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/char/tty_io.c 2010-07-07 09:04:51.000000000 -0400
@@ -136,20 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list
DEFINE_MUTEX(tty_mutex);
EXPORT_SYMBOL(tty_mutex);
/*
* 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.34/drivers/char/tty_ldisc.c linux-2.6.34/drivers/char/tty_ldisc.c
---- linux-2.6.34/drivers/char/tty_ldisc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/char/tty_ldisc.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/char/tty_ldisc.c linux-2.6.34.1/drivers/char/tty_ldisc.c
+--- linux-2.6.34.1/drivers/char/tty_ldisc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/char/tty_ldisc.c 2010-07-07 09:04:51.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.34/drivers/char/vt_ioctl.c linux-2.6.34/drivers/char/vt_ioctl.c
---- linux-2.6.34/drivers/char/vt_ioctl.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/char/vt_ioctl.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/char/vt_ioctl.c linux-2.6.34.1/drivers/char/vt_ioctl.c
+--- linux-2.6.34.1/drivers/char/vt_ioctl.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/char/vt_ioctl.c 2010-07-07 09:04:51.000000000 -0400
@@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __
case KDSKBENT:
if (!perm)
q = func_table[i];
first_free = funcbufptr + (funcbufsize - funcbufleft);
for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++)
-diff -urNp linux-2.6.34/drivers/cpuidle/sysfs.c linux-2.6.34/drivers/cpuidle/sysfs.c
---- linux-2.6.34/drivers/cpuidle/sysfs.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/cpuidle/sysfs.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/cpuidle/sysfs.c linux-2.6.34.1/drivers/cpuidle/sysfs.c
+--- linux-2.6.34.1/drivers/cpuidle/sysfs.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/cpuidle/sysfs.c 2010-07-07 09:04:51.000000000 -0400
@@ -299,7 +299,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.34/drivers/edac/edac_core.h linux-2.6.34/drivers/edac/edac_core.h
---- linux-2.6.34/drivers/edac/edac_core.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/edac/edac_core.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/edac/edac_core.h linux-2.6.34.1/drivers/edac/edac_core.h
+--- linux-2.6.34.1/drivers/edac/edac_core.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/edac/edac_core.h 2010-07-07 09:04:51.000000000 -0400
@@ -100,11 +100,11 @@ extern const char *edac_mem_types[];
#else /* !CONFIG_EDAC_DEBUG */
#endif /* !CONFIG_EDAC_DEBUG */
-diff -urNp linux-2.6.34/drivers/firewire/core-cdev.c linux-2.6.34/drivers/firewire/core-cdev.c
---- linux-2.6.34/drivers/firewire/core-cdev.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/firewire/core-cdev.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/firewire/core-cdev.c linux-2.6.34.1/drivers/firewire/core-cdev.c
+--- linux-2.6.34.1/drivers/firewire/core-cdev.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/firewire/core-cdev.c 2010-07-07 09:04:51.000000000 -0400
@@ -1195,8 +1195,7 @@ static int init_iso_resource(struct clie
int ret;
return -EINVAL;
r = kmalloc(sizeof(*r), GFP_KERNEL);
-diff -urNp linux-2.6.34/drivers/firmware/dmi_scan.c linux-2.6.34/drivers/firmware/dmi_scan.c
---- linux-2.6.34/drivers/firmware/dmi_scan.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/firmware/dmi_scan.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/firmware/dmi_scan.c linux-2.6.34.1/drivers/firmware/dmi_scan.c
+--- linux-2.6.34.1/drivers/firmware/dmi_scan.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/firmware/dmi_scan.c 2010-07-07 09:04:51.000000000 -0400
@@ -387,11 +387,6 @@ void __init dmi_scan_machine(void)
}
}
p = dmi_ioremap(0xF0000, 0x10000);
if (p == NULL)
goto error;
-diff -urNp linux-2.6.34/drivers/gpu/drm/drm_drv.c linux-2.6.34/drivers/gpu/drm/drm_drv.c
---- linux-2.6.34/drivers/gpu/drm/drm_drv.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/drm_drv.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/drm_drv.c linux-2.6.34.1/drivers/gpu/drm/drm_drv.c
+--- linux-2.6.34.1/drivers/gpu/drm/drm_drv.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/drm_drv.c 2010-07-07 09:04:51.000000000 -0400
@@ -449,7 +449,7 @@ long drm_ioctl(struct file *filp,
dev = file_priv->minor->dev;
++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.34/drivers/gpu/drm/drm_fops.c linux-2.6.34/drivers/gpu/drm/drm_fops.c
---- linux-2.6.34/drivers/gpu/drm/drm_fops.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/drm_fops.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/drm_fops.c linux-2.6.34.1/drivers/gpu/drm/drm_fops.c
+--- linux-2.6.34.1/drivers/gpu/drm/drm_fops.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/drm_fops.c 2010-07-07 09:04:51.000000000 -0400
@@ -67,7 +67,7 @@ static int drm_setup(struct drm_device *
}
if (atomic_read(&dev->ioctl_count)) {
DRM_ERROR("Device busy: %d\n",
atomic_read(&dev->ioctl_count));
-diff -urNp linux-2.6.34/drivers/gpu/drm/drm_ioctl.c linux-2.6.34/drivers/gpu/drm/drm_ioctl.c
---- linux-2.6.34/drivers/gpu/drm/drm_ioctl.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/drm_ioctl.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/drm_ioctl.c linux-2.6.34.1/drivers/gpu/drm/drm_ioctl.c
+--- linux-2.6.34.1/drivers/gpu/drm/drm_ioctl.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/drm_ioctl.c 2010-07-07 09:04:51.000000000 -0400
@@ -283,7 +283,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);
stats->data[i].type = dev->types[i];
}
-diff -urNp linux-2.6.34/drivers/gpu/drm/drm_lock.c linux-2.6.34/drivers/gpu/drm/drm_lock.c
---- linux-2.6.34/drivers/gpu/drm/drm_lock.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/drm_lock.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/drm_lock.c linux-2.6.34.1/drivers/gpu/drm/drm_lock.c
+--- linux-2.6.34.1/drivers/gpu/drm/drm_lock.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/drm_lock.c 2010-07-07 09:04:51.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;
/* 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.34/drivers/gpu/drm/i810/i810_dma.c linux-2.6.34/drivers/gpu/drm/i810/i810_dma.c
---- linux-2.6.34/drivers/gpu/drm/i810/i810_dma.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/i810/i810_dma.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/i810/i810_dma.c linux-2.6.34.1/drivers/gpu/drm/i810/i810_dma.c
+--- linux-2.6.34.1/drivers/gpu/drm/i810/i810_dma.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/i810/i810_dma.c 2010-07-07 09:04:51.000000000 -0400
@@ -953,8 +953,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];
-diff -urNp linux-2.6.34/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.34/drivers/gpu/drm/i915/dvo_ch7017.c
---- linux-2.6.34/drivers/gpu/drm/i915/dvo_ch7017.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/i915/dvo_ch7017.c 2010-07-01 20:45:15.000000000 -0400
-@@ -444,7 +444,7 @@ static void ch7017_destroy(struct intel_
- }
- }
-
--struct intel_dvo_dev_ops ch7017_ops = {
-+const struct intel_dvo_dev_ops ch7017_ops = {
- .init = ch7017_init,
- .detect = ch7017_detect,
- .mode_valid = ch7017_mode_valid,
-diff -urNp linux-2.6.34/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.34/drivers/gpu/drm/i915/dvo_ch7xxx.c
---- linux-2.6.34/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-07-01 20:45:15.000000000 -0400
-@@ -358,7 +358,7 @@ static void ch7xxx_destroy(struct intel_
- }
- }
-
--struct intel_dvo_dev_ops ch7xxx_ops = {
-+const struct intel_dvo_dev_ops ch7xxx_ops = {
- .init = ch7xxx_init,
- .detect = ch7xxx_detect,
- .mode_valid = ch7xxx_mode_valid,
-diff -urNp linux-2.6.34/drivers/gpu/drm/i915/dvo.h linux-2.6.34/drivers/gpu/drm/i915/dvo.h
---- linux-2.6.34/drivers/gpu/drm/i915/dvo.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/i915/dvo.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/i915/dvo.h linux-2.6.34.1/drivers/gpu/drm/i915/dvo.h
+--- linux-2.6.34.1/drivers/gpu/drm/i915/dvo.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/i915/dvo.h 2010-07-07 09:04:51.000000000 -0400
@@ -135,23 +135,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.34/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.34/drivers/gpu/drm/i915/dvo_ivch.c
---- linux-2.6.34/drivers/gpu/drm/i915/dvo_ivch.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/i915/dvo_ivch.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.34.1/drivers/gpu/drm/i915/dvo_ch7017.c
+--- linux-2.6.34.1/drivers/gpu/drm/i915/dvo_ch7017.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/i915/dvo_ch7017.c 2010-07-07 09:04:51.000000000 -0400
+@@ -444,7 +444,7 @@ static void ch7017_destroy(struct intel_
+ }
+ }
+
+-struct intel_dvo_dev_ops ch7017_ops = {
++const struct intel_dvo_dev_ops ch7017_ops = {
+ .init = ch7017_init,
+ .detect = ch7017_detect,
+ .mode_valid = ch7017_mode_valid,
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.34.1/drivers/gpu/drm/i915/dvo_ch7xxx.c
+--- linux-2.6.34.1/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-07-07 09:04:51.000000000 -0400
+@@ -358,7 +358,7 @@ static void ch7xxx_destroy(struct intel_
+ }
+ }
+
+-struct intel_dvo_dev_ops ch7xxx_ops = {
++const struct intel_dvo_dev_ops ch7xxx_ops = {
+ .init = ch7xxx_init,
+ .detect = ch7xxx_detect,
+ .mode_valid = ch7xxx_mode_valid,
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.34.1/drivers/gpu/drm/i915/dvo_ivch.c
+--- linux-2.6.34.1/drivers/gpu/drm/i915/dvo_ivch.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/i915/dvo_ivch.c 2010-07-07 09:04:51.000000000 -0400
@@ -431,7 +431,7 @@ static void ivch_destroy(struct intel_dv
}
}
.init = ivch_init,
.dpms = ivch_dpms,
.save = ivch_save,
-diff -urNp linux-2.6.34/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.34/drivers/gpu/drm/i915/dvo_sil164.c
---- linux-2.6.34/drivers/gpu/drm/i915/dvo_sil164.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/i915/dvo_sil164.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.34.1/drivers/gpu/drm/i915/dvo_sil164.c
+--- linux-2.6.34.1/drivers/gpu/drm/i915/dvo_sil164.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/i915/dvo_sil164.c 2010-07-07 09:04:51.000000000 -0400
@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
}
}
.init = sil164_init,
.detect = sil164_detect,
.mode_valid = sil164_mode_valid,
-diff -urNp linux-2.6.34/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.34/drivers/gpu/drm/i915/dvo_tfp410.c
---- linux-2.6.34/drivers/gpu/drm/i915/dvo_tfp410.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/i915/dvo_tfp410.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.34.1/drivers/gpu/drm/i915/dvo_tfp410.c
+--- linux-2.6.34.1/drivers/gpu/drm/i915/dvo_tfp410.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/i915/dvo_tfp410.c 2010-07-07 09:04:51.000000000 -0400
@@ -325,7 +325,7 @@ static void tfp410_destroy(struct intel_
}
}
.init = tfp410_init,
.detect = tfp410_detect,
.mode_valid = tfp410_mode_valid,
-diff -urNp linux-2.6.34/drivers/gpu/drm/i915/i915_drv.c linux-2.6.34/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.34/drivers/gpu/drm/i915/i915_drv.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/i915/i915_drv.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/i915/i915_dma.c linux-2.6.34.1/drivers/gpu/drm/i915/i915_dma.c
+--- linux-2.6.34.1/drivers/gpu/drm/i915/i915_dma.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/i915/i915_dma.c 2010-07-07 09:04:51.000000000 -0400
+@@ -1416,7 +1416,7 @@ static bool i915_switcheroo_can_switch(s
+ bool can_switch;
+
+ spin_lock(&dev->count_lock);
+- can_switch = (dev->open_count == 0);
++ can_switch = (atomic_read(&dev->open_count) == 0);
+ spin_unlock(&dev->count_lock);
+ return can_switch;
+ }
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/i915/i915_drv.c linux-2.6.34.1/drivers/gpu/drm/i915/i915_drv.c
+--- linux-2.6.34.1/drivers/gpu/drm/i915/i915_drv.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/i915/i915_drv.c 2010-07-07 09:04:51.000000000 -0400
@@ -484,7 +484,7 @@ const struct dev_pm_ops i915_pm_ops = {
.restore = i915_pm_resume,
};
.fault = i915_gem_fault,
.open = drm_gem_vm_open,
.close = drm_gem_vm_close,
-diff -urNp linux-2.6.34/drivers/gpu/drm/nouveau/nouveau_backlight.c linux-2.6.34/drivers/gpu/drm/nouveau/nouveau_backlight.c
---- linux-2.6.34/drivers/gpu/drm/nouveau/nouveau_backlight.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/nouveau/nouveau_backlight.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/nouveau/nouveau_backlight.c linux-2.6.34.1/drivers/gpu/drm/nouveau/nouveau_backlight.c
+--- linux-2.6.34.1/drivers/gpu/drm/nouveau/nouveau_backlight.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/nouveau/nouveau_backlight.c 2010-07-07 09:04:51.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.34/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.34/drivers/gpu/drm/radeon/mkregtable.c
---- linux-2.6.34/drivers/gpu/drm/radeon/mkregtable.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/radeon/mkregtable.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.34.1/drivers/gpu/drm/nouveau/nouveau_state.c
+--- linux-2.6.34.1/drivers/gpu/drm/nouveau/nouveau_state.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/nouveau/nouveau_state.c 2010-07-07 09:04:51.000000000 -0400
+@@ -391,7 +391,7 @@ static bool nouveau_switcheroo_can_switc
+ bool can_switch;
+
+ spin_lock(&dev->count_lock);
+- can_switch = (dev->open_count == 0);
++ can_switch = (atomic_read(&dev->open_count) == 0);
+ spin_unlock(&dev->count_lock);
+ return can_switch;
+ }
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.34.1/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-2.6.34.1/drivers/gpu/drm/radeon/mkregtable.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/radeon/mkregtable.c 2010-07-07 09:04:51.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.34/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.34/drivers/gpu/drm/radeon/radeon_atombios.c
---- linux-2.6.34/drivers/gpu/drm/radeon/radeon_atombios.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/radeon/radeon_atombios.c 2010-07-01 20:45:15.000000000 -0400
-@@ -659,14 +659,14 @@ static uint16_t atombios_get_connector_o
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.34.1/drivers/gpu/drm/radeon/radeon_atombios.c
+--- linux-2.6.34.1/drivers/gpu/drm/radeon/radeon_atombios.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/radeon/radeon_atombios.c 2010-07-07 09:04:51.000000000 -0400
+@@ -658,14 +658,14 @@ static uint16_t atombios_get_connector_o
}
}
bool radeon_get_atom_connector_info_from_supported_devices_table(struct
drm_device
-@@ -682,7 +682,6 @@ bool radeon_get_atom_connector_info_from
+@@ -681,7 +681,6 @@ bool radeon_get_atom_connector_info_from
uint8_t dac;
union atom_supported_devices *supported_devices;
int i, j, max_device;
if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset))
return false;
-diff -urNp linux-2.6.34/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.34/drivers/gpu/drm/radeon/radeon_device.c
---- linux-2.6.34/drivers/gpu/drm/radeon/radeon_device.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/radeon/radeon_device.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.34.1/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-2.6.34.1/drivers/gpu/drm/radeon/radeon_device.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/radeon/radeon_device.c 2010-07-07 09:04:51.000000000 -0400
@@ -560,7 +560,7 @@ static bool radeon_switcheroo_can_switch
bool can_switch;
spin_unlock(&dev->count_lock);
return can_switch;
}
-diff -urNp linux-2.6.34/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.34/drivers/gpu/drm/radeon/radeon_display.c
---- linux-2.6.34/drivers/gpu/drm/radeon/radeon_display.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/radeon/radeon_display.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.34.1/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-2.6.34.1/drivers/gpu/drm/radeon/radeon_display.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/radeon/radeon_display.c 2010-07-07 09:04:51.000000000 -0400
@@ -560,7 +560,7 @@ static void radeon_compute_pll_legacy(st
if (pll->flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
} else
error = abs(current_freq - freq);
vco_diff = abs(vco - best_vco);
-diff -urNp linux-2.6.34/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.34/drivers/gpu/drm/radeon/radeon_state.c
---- linux-2.6.34/drivers/gpu/drm/radeon/radeon_state.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/radeon/radeon_state.c 2010-07-01 20:45:15.000000000 -0400
-@@ -2167,7 +2167,7 @@ static int radeon_cp_clear(struct drm_de
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.34.1/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-2.6.34.1/drivers/gpu/drm/radeon/radeon_state.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/radeon/radeon_state.c 2010-07-07 09:04:51.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;
sarea_priv->nbox * sizeof(depth_boxes[0])))
return -EFAULT;
-@@ -3030,7 +3030,7 @@ static int radeon_cp_getparam(struct drm
+@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm
{
drm_radeon_private_t *dev_priv = dev->dev_private;
drm_radeon_getparam_t *param = data;
DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
-diff -urNp linux-2.6.34/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.34/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-2.6.34/drivers/gpu/drm/radeon/radeon_ttm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/radeon/radeon_ttm.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.34.1/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-2.6.34.1/drivers/gpu/drm/radeon/radeon_ttm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/radeon/radeon_ttm.c 2010-07-07 09:04:51.000000000 -0400
@@ -565,27 +565,10 @@ void radeon_ttm_fini(struct radeon_devic
DRM_INFO("radeon: ttm finalized\n");
}
}
-diff -urNp linux-2.6.34/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.34/drivers/gpu/drm/ttm/ttm_bo.c
---- linux-2.6.34/drivers/gpu/drm/ttm/ttm_bo.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/ttm/ttm_bo.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.34.1/drivers/gpu/drm/ttm/ttm_bo.c
+--- linux-2.6.34.1/drivers/gpu/drm/ttm/ttm_bo.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/ttm/ttm_bo.c 2010-07-07 09:04:51.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.34/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.34/drivers/gpu/drm/ttm/ttm_bo_vm.c
---- linux-2.6.34/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.34.1/drivers/gpu/drm/ttm/ttm_bo_vm.c
+--- linux-2.6.34.1/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-07-07 09:04:51.000000000 -0400
@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
{
struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
/*
* Work around locking order reversal in fault / nopfn
* between mmap_sem and bo_reserve: Perform a trylock operation
-diff -urNp linux-2.6.34/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.34/drivers/gpu/drm/ttm/ttm_global.c
---- linux-2.6.34/drivers/gpu/drm/ttm/ttm_global.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/gpu/drm/ttm/ttm_global.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.34.1/drivers/gpu/drm/ttm/ttm_global.c
+--- linux-2.6.34.1/drivers/gpu/drm/ttm/ttm_global.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/gpu/drm/ttm/ttm_global.c 2010-07-07 09:04:51.000000000 -0400
@@ -36,7 +36,7 @@
struct ttm_global_item {
struct mutex mutex;
ref->release(ref);
item->object = NULL;
}
-diff -urNp linux-2.6.34/drivers/hid/usbhid/hiddev.c linux-2.6.34/drivers/hid/usbhid/hiddev.c
---- linux-2.6.34/drivers/hid/usbhid/hiddev.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/hid/usbhid/hiddev.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/hid/usbhid/hiddev.c linux-2.6.34.1/drivers/hid/usbhid/hiddev.c
+--- linux-2.6.34.1/drivers/hid/usbhid/hiddev.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/hid/usbhid/hiddev.c 2010-07-07 09:04:51.000000000 -0400
@@ -615,7 +615,7 @@ static long hiddev_ioctl(struct file *fi
return put_user(HID_VERSION, (int __user *)arg);
return -EINVAL;
for (i = 0; i < hid->maxcollection; i++)
-diff -urNp linux-2.6.34/drivers/hwmon/k8temp.c linux-2.6.34/drivers/hwmon/k8temp.c
---- linux-2.6.34/drivers/hwmon/k8temp.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/hwmon/k8temp.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/hwmon/k8temp.c linux-2.6.34.1/drivers/hwmon/k8temp.c
+--- linux-2.6.34.1/drivers/hwmon/k8temp.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/hwmon/k8temp.c 2010-07-07 09:04:51.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.34/drivers/hwmon/sis5595.c linux-2.6.34/drivers/hwmon/sis5595.c
---- linux-2.6.34/drivers/hwmon/sis5595.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/hwmon/sis5595.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/hwmon/sis5595.c linux-2.6.34.1/drivers/hwmon/sis5595.c
+--- linux-2.6.34.1/drivers/hwmon/sis5595.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/hwmon/sis5595.c 2010-07-07 09:04:51.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.34/drivers/hwmon/via686a.c linux-2.6.34/drivers/hwmon/via686a.c
---- linux-2.6.34/drivers/hwmon/via686a.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/hwmon/via686a.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/hwmon/via686a.c linux-2.6.34.1/drivers/hwmon/via686a.c
+--- linux-2.6.34.1/drivers/hwmon/via686a.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/hwmon/via686a.c 2010-07-07 09:04:51.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.34/drivers/hwmon/vt8231.c linux-2.6.34/drivers/hwmon/vt8231.c
---- linux-2.6.34/drivers/hwmon/vt8231.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/hwmon/vt8231.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/hwmon/vt8231.c linux-2.6.34.1/drivers/hwmon/vt8231.c
+--- linux-2.6.34.1/drivers/hwmon/vt8231.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/hwmon/vt8231.c 2010-07-07 09:04:51.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.34/drivers/hwmon/w83791d.c linux-2.6.34/drivers/hwmon/w83791d.c
---- linux-2.6.34/drivers/hwmon/w83791d.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/hwmon/w83791d.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/hwmon/w83791d.c linux-2.6.34.1/drivers/hwmon/w83791d.c
+--- linux-2.6.34.1/drivers/hwmon/w83791d.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/hwmon/w83791d.c 2010-07-07 09:04:51.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.34/drivers/i2c/busses/i2c-i801.c linux-2.6.34/drivers/i2c/busses/i2c-i801.c
---- linux-2.6.34/drivers/i2c/busses/i2c-i801.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/i2c/busses/i2c-i801.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/i2c/busses/i2c-i801.c linux-2.6.34.1/drivers/i2c/busses/i2c-i801.c
+--- linux-2.6.34.1/drivers/i2c/busses/i2c-i801.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/i2c/busses/i2c-i801.c 2010-07-07 09:04:51.000000000 -0400
@@ -582,7 +582,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.34/drivers/i2c/busses/i2c-piix4.c linux-2.6.34/drivers/i2c/busses/i2c-piix4.c
---- linux-2.6.34/drivers/i2c/busses/i2c-piix4.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/i2c/busses/i2c-piix4.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/i2c/busses/i2c-piix4.c linux-2.6.34.1/drivers/i2c/busses/i2c-piix4.c
+--- linux-2.6.34.1/drivers/i2c/busses/i2c-piix4.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/i2c/busses/i2c-piix4.c 2010-07-07 09:04:52.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.34/drivers/i2c/busses/i2c-sis630.c linux-2.6.34/drivers/i2c/busses/i2c-sis630.c
---- linux-2.6.34/drivers/i2c/busses/i2c-sis630.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/i2c/busses/i2c-sis630.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/i2c/busses/i2c-sis630.c linux-2.6.34.1/drivers/i2c/busses/i2c-sis630.c
+--- linux-2.6.34.1/drivers/i2c/busses/i2c-sis630.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/i2c/busses/i2c-sis630.c 2010-07-07 09:04:52.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.34/drivers/i2c/busses/i2c-sis96x.c linux-2.6.34/drivers/i2c/busses/i2c-sis96x.c
---- linux-2.6.34/drivers/i2c/busses/i2c-sis96x.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/i2c/busses/i2c-sis96x.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/i2c/busses/i2c-sis96x.c linux-2.6.34.1/drivers/i2c/busses/i2c-sis96x.c
+--- linux-2.6.34.1/drivers/i2c/busses/i2c-sis96x.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/i2c/busses/i2c-sis96x.c 2010-07-07 09:04:52.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.34/drivers/ide/ide-cd.c linux-2.6.34/drivers/ide/ide-cd.c
---- linux-2.6.34/drivers/ide/ide-cd.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ide/ide-cd.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ide/ide-cd.c linux-2.6.34.1/drivers/ide/ide-cd.c
+--- linux-2.6.34.1/drivers/ide/ide-cd.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ide/ide-cd.c 2010-07-07 09:04:52.000000000 -0400
@@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_
alignment = queue_dma_alignment(q) | q->dma_pad_mask;
if ((unsigned long)buf & alignment
drive->dma = 0;
}
}
-diff -urNp linux-2.6.34/drivers/ieee1394/dv1394.c linux-2.6.34/drivers/ieee1394/dv1394.c
---- linux-2.6.34/drivers/ieee1394/dv1394.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ieee1394/dv1394.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ieee1394/dv1394.c linux-2.6.34.1/drivers/ieee1394/dv1394.c
+--- linux-2.6.34.1/drivers/ieee1394/dv1394.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ieee1394/dv1394.c 2010-07-07 09:04:52.000000000 -0400
@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
based upon DIF section and sequence
*/
};
MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
-diff -urNp linux-2.6.34/drivers/ieee1394/eth1394.c linux-2.6.34/drivers/ieee1394/eth1394.c
---- linux-2.6.34/drivers/ieee1394/eth1394.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ieee1394/eth1394.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ieee1394/eth1394.c linux-2.6.34.1/drivers/ieee1394/eth1394.c
+--- linux-2.6.34.1/drivers/ieee1394/eth1394.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ieee1394/eth1394.c 2010-07-07 09:04:52.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.34/drivers/ieee1394/hosts.c linux-2.6.34/drivers/ieee1394/hosts.c
---- linux-2.6.34/drivers/ieee1394/hosts.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ieee1394/hosts.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ieee1394/hosts.c linux-2.6.34.1/drivers/ieee1394/hosts.c
+--- linux-2.6.34.1/drivers/ieee1394/hosts.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ieee1394/hosts.c 2010-07-07 09:04:52.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.34/drivers/ieee1394/ohci1394.c linux-2.6.34/drivers/ieee1394/ohci1394.c
---- linux-2.6.34/drivers/ieee1394/ohci1394.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ieee1394/ohci1394.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ieee1394/ohci1394.c linux-2.6.34.1/drivers/ieee1394/ohci1394.c
+--- linux-2.6.34.1/drivers/ieee1394/ohci1394.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ieee1394/ohci1394.c 2010-07-07 09:04:52.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.34/drivers/ieee1394/raw1394.c linux-2.6.34/drivers/ieee1394/raw1394.c
---- linux-2.6.34/drivers/ieee1394/raw1394.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ieee1394/raw1394.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ieee1394/raw1394.c linux-2.6.34.1/drivers/ieee1394/raw1394.c
+--- linux-2.6.34.1/drivers/ieee1394/raw1394.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ieee1394/raw1394.c 2010-07-07 09:04:52.000000000 -0400
@@ -3002,7 +3002,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,
};
MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
-diff -urNp linux-2.6.34/drivers/ieee1394/sbp2.c linux-2.6.34/drivers/ieee1394/sbp2.c
---- linux-2.6.34/drivers/ieee1394/sbp2.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ieee1394/sbp2.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ieee1394/sbp2.c linux-2.6.34.1/drivers/ieee1394/sbp2.c
+--- linux-2.6.34.1/drivers/ieee1394/sbp2.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ieee1394/sbp2.c 2010-07-07 09:04:52.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,
{
int ret;
-diff -urNp linux-2.6.34/drivers/ieee1394/video1394.c linux-2.6.34/drivers/ieee1394/video1394.c
---- linux-2.6.34/drivers/ieee1394/video1394.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/ieee1394/video1394.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/ieee1394/video1394.c linux-2.6.34.1/drivers/ieee1394/video1394.c
+--- linux-2.6.34.1/drivers/ieee1394/video1394.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/ieee1394/video1394.c 2010-07-07 09:04:52.000000000 -0400
@@ -1311,7 +1311,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.34/drivers/infiniband/core/cm.c linux-2.6.34/drivers/infiniband/core/cm.c
---- linux-2.6.34/drivers/infiniband/core/cm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/infiniband/core/cm.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/infiniband/core/cm.c linux-2.6.34.1/drivers/infiniband/core/cm.c
+--- linux-2.6.34.1/drivers/infiniband/core/cm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/infiniband/core/cm.c 2010-07-07 09:04:52.000000000 -0400
@@ -113,7 +113,7 @@ static char const counter_group_names[CM
struct cm_counter_group {
}
static const struct sysfs_ops cm_counter_ops = {
-diff -urNp linux-2.6.34/drivers/input/keyboard/atkbd.c linux-2.6.34/drivers/input/keyboard/atkbd.c
---- linux-2.6.34/drivers/input/keyboard/atkbd.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/input/keyboard/atkbd.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/input/keyboard/atkbd.c linux-2.6.34.1/drivers/input/keyboard/atkbd.c
+--- linux-2.6.34.1/drivers/input/keyboard/atkbd.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/input/keyboard/atkbd.c 2010-07-07 09:04:52.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.34/drivers/input/mouse/lifebook.c linux-2.6.34/drivers/input/mouse/lifebook.c
---- linux-2.6.34/drivers/input/mouse/lifebook.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/input/mouse/lifebook.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/input/mouse/lifebook.c linux-2.6.34.1/drivers/input/mouse/lifebook.c
+--- linux-2.6.34.1/drivers/input/mouse/lifebook.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/input/mouse/lifebook.c 2010-07-07 09:04:52.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.34/drivers/input/mouse/psmouse-base.c linux-2.6.34/drivers/input/mouse/psmouse-base.c
---- linux-2.6.34/drivers/input/mouse/psmouse-base.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/input/mouse/psmouse-base.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/input/mouse/psmouse-base.c linux-2.6.34.1/drivers/input/mouse/psmouse-base.c
+--- linux-2.6.34.1/drivers/input/mouse/psmouse-base.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/input/mouse/psmouse-base.c 2010-07-07 09:04:52.000000000 -0400
@@ -1460,7 +1460,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.34/drivers/input/mouse/synaptics.c linux-2.6.34/drivers/input/mouse/synaptics.c
---- linux-2.6.34/drivers/input/mouse/synaptics.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/input/mouse/synaptics.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/input/mouse/synaptics.c linux-2.6.34.1/drivers/input/mouse/synaptics.c
+--- linux-2.6.34.1/drivers/input/mouse/synaptics.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/input/mouse/synaptics.c 2010-07-07 09:04:52.000000000 -0400
@@ -458,7 +458,7 @@ static void synaptics_process_packet(str
break;
case 2:
#endif
};
-diff -urNp linux-2.6.34/drivers/input/mousedev.c linux-2.6.34/drivers/input/mousedev.c
---- linux-2.6.34/drivers/input/mousedev.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/input/mousedev.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/input/mousedev.c linux-2.6.34.1/drivers/input/mousedev.c
+--- linux-2.6.34.1/drivers/input/mousedev.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/input/mousedev.c 2010-07-07 09:04:52.000000000 -0400
@@ -754,7 +754,7 @@ static ssize_t mousedev_read(struct file
spin_unlock_irq(&client->packet_lock);
};
static int psaux_registered;
#endif
-diff -urNp linux-2.6.34/drivers/input/serio/i8042-x86ia64io.h linux-2.6.34/drivers/input/serio/i8042-x86ia64io.h
---- linux-2.6.34/drivers/input/serio/i8042-x86ia64io.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/input/serio/i8042-x86ia64io.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/input/serio/i8042-x86ia64io.h linux-2.6.34.1/drivers/input/serio/i8042-x86ia64io.h
+--- linux-2.6.34.1/drivers/input/serio/i8042-x86ia64io.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/input/serio/i8042-x86ia64io.h 2010-07-07 09:04:52.000000000 -0400
@@ -172,7 +172,7 @@ static const struct dmi_system_id __init
DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
},
};
#endif /* CONFIG_X86 */
-diff -urNp linux-2.6.34/drivers/input/serio/serio_raw.c linux-2.6.34/drivers/input/serio/serio_raw.c
---- linux-2.6.34/drivers/input/serio/serio_raw.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/input/serio/serio_raw.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/input/serio/serio_raw.c linux-2.6.34.1/drivers/input/serio/serio_raw.c
+--- linux-2.6.34.1/drivers/input/serio/serio_raw.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/input/serio/serio_raw.c 2010-07-07 09:04:52.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.34/drivers/isdn/gigaset/common.c linux-2.6.34/drivers/isdn/gigaset/common.c
---- linux-2.6.34/drivers/isdn/gigaset/common.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/isdn/gigaset/common.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/isdn/gigaset/common.c linux-2.6.34.1/drivers/isdn/gigaset/common.c
+--- linux-2.6.34.1/drivers/isdn/gigaset/common.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/isdn/gigaset/common.c 2010-07-07 09:04:52.000000000 -0400
@@ -733,7 +733,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.34/drivers/isdn/gigaset/gigaset.h linux-2.6.34/drivers/isdn/gigaset/gigaset.h
---- linux-2.6.34/drivers/isdn/gigaset/gigaset.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/isdn/gigaset/gigaset.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/isdn/gigaset/gigaset.h linux-2.6.34.1/drivers/isdn/gigaset/gigaset.h
+--- linux-2.6.34.1/drivers/isdn/gigaset/gigaset.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/isdn/gigaset/gigaset.h 2010-07-07 09:04:52.000000000 -0400
@@ -443,7 +443,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.34/drivers/isdn/gigaset/interface.c linux-2.6.34/drivers/isdn/gigaset/interface.c
---- linux-2.6.34/drivers/isdn/gigaset/interface.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/isdn/gigaset/interface.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/isdn/gigaset/interface.c linux-2.6.34.1/drivers/isdn/gigaset/interface.c
+--- linux-2.6.34.1/drivers/isdn/gigaset/interface.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/isdn/gigaset/interface.c 2010-07-07 09:04:52.000000000 -0400
@@ -160,9 +160,7 @@ static int if_open(struct tty_struct *tt
return -ERESTARTSYS;
tty->driver_data = cs;
dev_warn(cs->dev, "%s: device not opened\n", __func__);
goto out;
}
-diff -urNp linux-2.6.34/drivers/isdn/hardware/avm/b1.c linux-2.6.34/drivers/isdn/hardware/avm/b1.c
---- linux-2.6.34/drivers/isdn/hardware/avm/b1.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/isdn/hardware/avm/b1.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/isdn/hardware/avm/b1.c linux-2.6.34.1/drivers/isdn/hardware/avm/b1.c
+--- linux-2.6.34.1/drivers/isdn/hardware/avm/b1.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/isdn/hardware/avm/b1.c 2010-07-07 09:04:52.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.34/drivers/isdn/icn/icn.c linux-2.6.34/drivers/isdn/icn/icn.c
---- linux-2.6.34/drivers/isdn/icn/icn.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/isdn/icn/icn.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/isdn/icn/icn.c linux-2.6.34.1/drivers/isdn/icn/icn.c
+--- linux-2.6.34.1/drivers/isdn/icn/icn.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/isdn/icn/icn.c 2010-07-07 09:04:52.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.34/drivers/lguest/core.c linux-2.6.34/drivers/lguest/core.c
---- linux-2.6.34/drivers/lguest/core.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/lguest/core.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/lguest/core.c linux-2.6.34.1/drivers/lguest/core.c
+--- linux-2.6.34.1/drivers/lguest/core.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/lguest/core.c 2010-07-07 09:04:52.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.34/drivers/macintosh/via-pmu-backlight.c linux-2.6.34/drivers/macintosh/via-pmu-backlight.c
---- linux-2.6.34/drivers/macintosh/via-pmu-backlight.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/macintosh/via-pmu-backlight.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/macintosh/via-pmu-backlight.c linux-2.6.34.1/drivers/macintosh/via-pmu-backlight.c
+--- linux-2.6.34.1/drivers/macintosh/via-pmu-backlight.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/macintosh/via-pmu-backlight.c 2010-07-07 09:04:52.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.34/drivers/macintosh/via-pmu.c linux-2.6.34/drivers/macintosh/via-pmu.c
---- linux-2.6.34/drivers/macintosh/via-pmu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/macintosh/via-pmu.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/macintosh/via-pmu.c linux-2.6.34.1/drivers/macintosh/via-pmu.c
+--- linux-2.6.34.1/drivers/macintosh/via-pmu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/macintosh/via-pmu.c 2010-07-07 09:04:52.000000000 -0400
@@ -2254,7 +2254,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.34/drivers/md/bitmap.c linux-2.6.34/drivers/md/bitmap.c
---- linux-2.6.34/drivers/md/bitmap.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/md/bitmap.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/md/bitmap.c linux-2.6.34.1/drivers/md/bitmap.c
+--- linux-2.6.34.1/drivers/md/bitmap.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/md/bitmap.c 2010-07-07 09:04:52.000000000 -0400
@@ -58,7 +58,7 @@
# if DEBUG > 0
# define PRINTK(x...) printk(KERN_DEBUG x)
# endif
#endif
-diff -urNp linux-2.6.34/drivers/md/dm-table.c linux-2.6.34/drivers/md/dm-table.c
---- linux-2.6.34/drivers/md/dm-table.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/md/dm-table.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/md/dm-table.c linux-2.6.34.1/drivers/md/dm-table.c
+--- linux-2.6.34.1/drivers/md/dm-table.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/md/dm-table.c 2010-07-07 09:04:52.000000000 -0400
@@ -363,7 +363,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.34/drivers/md/md.c linux-2.6.34/drivers/md/md.c
---- linux-2.6.34/drivers/md/md.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/md/md.c 2010-07-01 20:45:15.000000000 -0400
-@@ -6194,7 +6194,7 @@ static int md_seq_show(struct seq_file *
+diff -urNp linux-2.6.34.1/drivers/md/md.c linux-2.6.34.1/drivers/md/md.c
+--- linux-2.6.34.1/drivers/md/md.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/md/md.c 2010-07-07 09:04:52.000000000 -0400
+@@ -6265,7 +6265,7 @@ static int md_seq_show(struct seq_file *
chunk_kb ? "KB" : "B");
if (bitmap->file) {
seq_printf(seq, ", file: ");
}
seq_printf(seq, "\n");
-@@ -6288,7 +6288,7 @@ static int is_mddev_idle(mddev_t *mddev,
+@@ -6359,7 +6359,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.34/drivers/md/md.h linux-2.6.34/drivers/md/md.h
---- linux-2.6.34/drivers/md/md.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/md/md.h 2010-07-01 20:45:15.000000000 -0400
-@@ -327,7 +327,7 @@ static inline void rdev_dec_pending(mdk_
+diff -urNp linux-2.6.34.1/drivers/md/md.h linux-2.6.34.1/drivers/md/md.h
+--- linux-2.6.34.1/drivers/md/md.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/md/md.h 2010-07-07 09:04:52.000000000 -0400
+@@ -328,7 +328,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.34/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.34/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-2.6.34/drivers/media/dvb/dvb-core/dvbdev.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/media/dvb/dvb-core/dvbdev.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.34.1/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-2.6.34.1/drivers/media/dvb/dvb-core/dvbdev.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/media/dvb/dvb-core/dvbdev.c 2010-07-07 09:04:52.000000000 -0400
@@ -191,6 +191,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.34/drivers/media/radio/radio-cadet.c linux-2.6.34/drivers/media/radio/radio-cadet.c
---- linux-2.6.34/drivers/media/radio/radio-cadet.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/media/radio/radio-cadet.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/media/radio/radio-cadet.c linux-2.6.34.1/drivers/media/radio/radio-cadet.c
+--- linux-2.6.34.1/drivers/media/radio/radio-cadet.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/media/radio/radio-cadet.c 2010-07-07 09:04:52.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.34/drivers/message/fusion/mptdebug.h linux-2.6.34/drivers/message/fusion/mptdebug.h
---- linux-2.6.34/drivers/message/fusion/mptdebug.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/message/fusion/mptdebug.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/message/fusion/mptdebug.h linux-2.6.34.1/drivers/message/fusion/mptdebug.h
+--- linux-2.6.34.1/drivers/message/fusion/mptdebug.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/message/fusion/mptdebug.h 2010-07-07 09:04:52.000000000 -0400
@@ -71,7 +71,7 @@
CMD; \
}
#endif
-diff -urNp linux-2.6.34/drivers/message/fusion/mptsas.c linux-2.6.34/drivers/message/fusion/mptsas.c
---- linux-2.6.34/drivers/message/fusion/mptsas.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/message/fusion/mptsas.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/message/fusion/mptsas.c linux-2.6.34.1/drivers/message/fusion/mptsas.c
+--- linux-2.6.34.1/drivers/message/fusion/mptsas.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/message/fusion/mptsas.c 2010-07-07 09:04:52.000000000 -0400
@@ -437,6 +437,23 @@ mptsas_is_end_device(struct mptsas_devin
return 0;
}
static inline struct sas_port *
mptsas_get_port(struct mptsas_phyinfo *phy_info)
{
-diff -urNp linux-2.6.34/drivers/message/i2o/i2o_proc.c linux-2.6.34/drivers/message/i2o/i2o_proc.c
---- linux-2.6.34/drivers/message/i2o/i2o_proc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/message/i2o/i2o_proc.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/message/i2o/i2o_proc.c linux-2.6.34.1/drivers/message/i2o/i2o_proc.c
+--- linux-2.6.34.1/drivers/message/i2o/i2o_proc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/message/i2o/i2o_proc.c 2010-07-07 09:04:52.000000000 -0400
@@ -255,13 +255,6 @@ static char *scsi_devices[] = {
"Array Controller Device"
};
return 0;
}
-diff -urNp linux-2.6.34/drivers/misc/kgdbts.c linux-2.6.34/drivers/misc/kgdbts.c
---- linux-2.6.34/drivers/misc/kgdbts.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/misc/kgdbts.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/misc/kgdbts.c linux-2.6.34.1/drivers/misc/kgdbts.c
+--- linux-2.6.34.1/drivers/misc/kgdbts.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/misc/kgdbts.c 2010-07-07 09:04:52.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.34/drivers/misc/sgi-gru/gruhandles.c linux-2.6.34/drivers/misc/sgi-gru/gruhandles.c
---- linux-2.6.34/drivers/misc/sgi-gru/gruhandles.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/misc/sgi-gru/gruhandles.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/misc/sgi-gru/gruhandles.c linux-2.6.34.1/drivers/misc/sgi-gru/gruhandles.c
+--- linux-2.6.34.1/drivers/misc/sgi-gru/gruhandles.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/misc/sgi-gru/gruhandles.c 2010-07-07 09:04:52.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.34/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.34/drivers/misc/sgi-gru/gruprocfs.c
---- linux-2.6.34/drivers/misc/sgi-gru/gruprocfs.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/misc/sgi-gru/gruprocfs.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.34.1/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-2.6.34.1/drivers/misc/sgi-gru/gruprocfs.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/misc/sgi-gru/gruprocfs.c 2010-07-07 09:04:52.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.34/drivers/misc/sgi-gru/grutables.h linux-2.6.34/drivers/misc/sgi-gru/grutables.h
---- linux-2.6.34/drivers/misc/sgi-gru/grutables.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/misc/sgi-gru/grutables.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/misc/sgi-gru/grutables.h linux-2.6.34.1/drivers/misc/sgi-gru/grutables.h
+--- linux-2.6.34.1/drivers/misc/sgi-gru/grutables.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/misc/sgi-gru/grutables.h 2010-07-07 09:04:52.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.34/drivers/mtd/devices/doc2000.c linux-2.6.34/drivers/mtd/devices/doc2000.c
---- linux-2.6.34/drivers/mtd/devices/doc2000.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/mtd/devices/doc2000.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/mtd/devices/doc2000.c linux-2.6.34.1/drivers/mtd/devices/doc2000.c
+--- linux-2.6.34.1/drivers/mtd/devices/doc2000.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/mtd/devices/doc2000.c 2010-07-07 09:04:52.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.34/drivers/mtd/devices/doc2001.c linux-2.6.34/drivers/mtd/devices/doc2001.c
---- linux-2.6.34/drivers/mtd/devices/doc2001.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/mtd/devices/doc2001.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/mtd/devices/doc2001.c linux-2.6.34.1/drivers/mtd/devices/doc2001.c
+--- linux-2.6.34.1/drivers/mtd/devices/doc2001.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/mtd/devices/doc2001.c 2010-07-07 09:04:52.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.34/drivers/mtd/ubi/build.c linux-2.6.34/drivers/mtd/ubi/build.c
---- linux-2.6.34/drivers/mtd/ubi/build.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/mtd/ubi/build.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/mtd/ubi/build.c linux-2.6.34.1/drivers/mtd/ubi/build.c
+--- linux-2.6.34.1/drivers/mtd/ubi/build.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/mtd/ubi/build.c 2010-07-07 09:04:52.000000000 -0400
@@ -1296,7 +1296,7 @@ module_exit(ubi_exit);
static int __init bytes_str_to_int(const char *str)
{
}
/**
-diff -urNp linux-2.6.34/drivers/net/e1000e/82571.c linux-2.6.34/drivers/net/e1000e/82571.c
---- linux-2.6.34/drivers/net/e1000e/82571.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/net/e1000e/82571.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/net/e1000e/82571.c linux-2.6.34.1/drivers/net/e1000e/82571.c
+--- linux-2.6.34.1/drivers/net/e1000e/82571.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/net/e1000e/82571.c 2010-07-07 09:04:52.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.34/drivers/net/e1000e/e1000.h linux-2.6.34/drivers/net/e1000e/e1000.h
---- linux-2.6.34/drivers/net/e1000e/e1000.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/net/e1000e/e1000.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/net/e1000e/e1000.h linux-2.6.34.1/drivers/net/e1000e/e1000.h
+--- linux-2.6.34.1/drivers/net/e1000e/e1000.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/net/e1000e/e1000.h 2010-07-07 09:04:52.000000000 -0400
@@ -379,9 +379,9 @@ struct e1000_info {
u32 pba;
u32 max_hw_frame_size;
};
/* hardware capability, feature, and workaround flags */
-diff -urNp linux-2.6.34/drivers/net/e1000e/es2lan.c linux-2.6.34/drivers/net/e1000e/es2lan.c
---- linux-2.6.34/drivers/net/e1000e/es2lan.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/net/e1000e/es2lan.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/net/e1000e/es2lan.c linux-2.6.34.1/drivers/net/e1000e/es2lan.c
+--- linux-2.6.34.1/drivers/net/e1000e/es2lan.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/net/e1000e/es2lan.c 2010-07-07 09:04:52.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.34/drivers/net/e1000e/hw.h linux-2.6.34/drivers/net/e1000e/hw.h
---- linux-2.6.34/drivers/net/e1000e/hw.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/net/e1000e/hw.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/net/e1000e/hw.h linux-2.6.34.1/drivers/net/e1000e/hw.h
+--- linux-2.6.34.1/drivers/net/e1000e/hw.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/net/e1000e/hw.h 2010-07-07 09:04:52.000000000 -0400
@@ -788,13 +788,13 @@ struct e1000_phy_operations {
/* Function pointers for the NVM. */
struct e1000_nvm_operations ops;
enum e1000_nvm_type type;
-diff -urNp linux-2.6.34/drivers/net/e1000e/ich8lan.c linux-2.6.34/drivers/net/e1000e/ich8lan.c
---- linux-2.6.34/drivers/net/e1000e/ich8lan.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/net/e1000e/ich8lan.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/net/e1000e/ich8lan.c linux-2.6.34.1/drivers/net/e1000e/ich8lan.c
+--- linux-2.6.34.1/drivers/net/e1000e/ich8lan.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/net/e1000e/ich8lan.c 2010-07-07 09:04:52.000000000 -0400
@@ -3371,7 +3371,7 @@ static void e1000_clear_hw_cntrs_ich8lan
}
}
.acquire = e1000_acquire_nvm_ich8lan,
.read = e1000_read_nvm_ich8lan,
.release = e1000_release_nvm_ich8lan,
-diff -urNp linux-2.6.34/drivers/net/igb/e1000_82575.c linux-2.6.34/drivers/net/igb/e1000_82575.c
---- linux-2.6.34/drivers/net/igb/e1000_82575.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/net/igb/e1000_82575.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/net/igb/e1000_82575.c linux-2.6.34.1/drivers/net/igb/e1000_82575.c
+--- linux-2.6.34.1/drivers/net/igb/e1000_82575.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/net/igb/e1000_82575.c 2010-07-07 09:04:52.000000000 -0400
@@ -1610,7 +1610,7 @@ u16 igb_rxpbs_adjust_82580(u32 data)
return ret_val;
}
.acquire = igb_acquire_nvm_82575,
.read = igb_read_nvm_eerd,
.release = igb_release_nvm_82575,
-diff -urNp linux-2.6.34/drivers/net/igb/e1000_hw.h linux-2.6.34/drivers/net/igb/e1000_hw.h
---- linux-2.6.34/drivers/net/igb/e1000_hw.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/net/igb/e1000_hw.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/net/igb/e1000_hw.h linux-2.6.34.1/drivers/net/igb/e1000_hw.h
+--- linux-2.6.34.1/drivers/net/igb/e1000_hw.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/net/igb/e1000_hw.h 2010-07-07 09:04:52.000000000 -0400
@@ -317,17 +317,17 @@ struct e1000_phy_operations {
};
struct e1000_nvm_operations ops;
enum e1000_nvm_type type;
-diff -urNp linux-2.6.34/drivers/net/irda/vlsi_ir.c linux-2.6.34/drivers/net/irda/vlsi_ir.c
---- linux-2.6.34/drivers/net/irda/vlsi_ir.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/net/irda/vlsi_ir.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/net/irda/vlsi_ir.c linux-2.6.34.1/drivers/net/irda/vlsi_ir.c
+--- linux-2.6.34.1/drivers/net/irda/vlsi_ir.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/net/irda/vlsi_ir.c 2010-07-07 09:04:52.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.34/drivers/net/pcnet32.c linux-2.6.34/drivers/net/pcnet32.c
---- linux-2.6.34/drivers/net/pcnet32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/net/pcnet32.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/net/pcnet32.c linux-2.6.34.1/drivers/net/pcnet32.c
+--- linux-2.6.34.1/drivers/net/pcnet32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/net/pcnet32.c 2010-07-07 09:04:52.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.34/drivers/net/ppp_generic.c linux-2.6.34/drivers/net/ppp_generic.c
---- linux-2.6.34/drivers/net/ppp_generic.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/net/ppp_generic.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/net/ppp_generic.c linux-2.6.34.1/drivers/net/ppp_generic.c
+--- linux-2.6.34.1/drivers/net/ppp_generic.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/net/ppp_generic.c 2010-07-07 09:04:53.000000000 -0400
@@ -992,7 +992,6 @@ ppp_net_ioctl(struct net_device *dev, st
void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
struct ppp_stats stats;
break;
err = 0;
break;
-diff -urNp linux-2.6.34/drivers/net/tg3.h linux-2.6.34/drivers/net/tg3.h
---- linux-2.6.34/drivers/net/tg3.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/net/tg3.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/net/tg3.h linux-2.6.34.1/drivers/net/tg3.h
+--- linux-2.6.34.1/drivers/net/tg3.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/net/tg3.h 2010-07-07 09:04:53.000000000 -0400
@@ -133,6 +133,7 @@
#define CHIPREV_ID_5750_A0 0x4000
#define CHIPREV_ID_5750_A1 0x4001
#define CHIPREV_ID_5750_C2 0x4202
#define CHIPREV_ID_5752_A0_HW 0x5000
#define CHIPREV_ID_5752_A0 0x6000
-diff -urNp linux-2.6.34/drivers/net/tulip/de4x5.c linux-2.6.34/drivers/net/tulip/de4x5.c
---- linux-2.6.34/drivers/net/tulip/de4x5.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/net/tulip/de4x5.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/net/tulip/de4x5.c linux-2.6.34.1/drivers/net/tulip/de4x5.c
+--- linux-2.6.34.1/drivers/net/tulip/de4x5.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/net/tulip/de4x5.c 2010-07-07 09:04:53.000000000 -0400
@@ -5470,7 +5470,7 @@ de4x5_ioctl(struct net_device *dev, stru
for (i=0; i<ETH_ALEN; i++) {
tmp.addr[i] = dev->dev_addr[i];
return -EFAULT;
break;
}
-diff -urNp linux-2.6.34/drivers/net/usb/hso.c linux-2.6.34/drivers/net/usb/hso.c
---- linux-2.6.34/drivers/net/usb/hso.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/net/usb/hso.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/net/usb/hso.c linux-2.6.34.1/drivers/net/usb/hso.c
+--- linux-2.6.34.1/drivers/net/usb/hso.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/net/usb/hso.c 2010-07-07 09:04:53.000000000 -0400
@@ -258,7 +258,7 @@ struct hso_serial {
/* from usb_serial_port */
result =
hso_start_serial_device(serial_table[i], GFP_NOIO);
hso_kick_transmit(dev2ser(serial_table[i]));
-diff -urNp linux-2.6.34/drivers/net/wireless/b43/debugfs.c linux-2.6.34/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.34/drivers/net/wireless/b43/debugfs.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/net/wireless/b43/debugfs.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/net/wireless/b43/debugfs.c linux-2.6.34.1/drivers/net/wireless/b43/debugfs.c
+--- linux-2.6.34.1/drivers/net/wireless/b43/debugfs.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/net/wireless/b43/debugfs.c 2010-07-07 09:04:53.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.34/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.34/drivers/net/wireless/b43legacy/debugfs.c
---- linux-2.6.34/drivers/net/wireless/b43legacy/debugfs.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/net/wireless/b43legacy/debugfs.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.34.1/drivers/net/wireless/b43legacy/debugfs.c
+--- linux-2.6.34.1/drivers/net/wireless/b43legacy/debugfs.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/net/wireless/b43legacy/debugfs.c 2010-07-07 09:04:53.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.34/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.34/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-2.6.34/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.34.1/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-2.6.34.1/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-07-07 09:04:53.000000000 -0400
@@ -68,8 +68,8 @@ do {
} while (0)
static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
void *p, u32 len)
{}
-diff -urNp linux-2.6.34/drivers/net/wireless/libertas/debugfs.c linux-2.6.34/drivers/net/wireless/libertas/debugfs.c
---- linux-2.6.34/drivers/net/wireless/libertas/debugfs.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/net/wireless/libertas/debugfs.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/net/wireless/libertas/debugfs.c linux-2.6.34.1/drivers/net/wireless/libertas/debugfs.c
+--- linux-2.6.34.1/drivers/net/wireless/libertas/debugfs.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/net/wireless/libertas/debugfs.c 2010-07-07 09:04:53.000000000 -0400
@@ -718,7 +718,7 @@ out_unlock:
struct lbs_debugfs_files {
const char *name;
};
static const struct lbs_debugfs_files debugfs_files[] = {
-diff -urNp linux-2.6.34/drivers/net/wireless/rndis_wlan.c linux-2.6.34/drivers/net/wireless/rndis_wlan.c
---- linux-2.6.34/drivers/net/wireless/rndis_wlan.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/net/wireless/rndis_wlan.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/net/wireless/rndis_wlan.c linux-2.6.34.1/drivers/net/wireless/rndis_wlan.c
+--- linux-2.6.34.1/drivers/net/wireless/rndis_wlan.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/net/wireless/rndis_wlan.c 2010-07-07 09:04:53.000000000 -0400
@@ -1185,7 +1185,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.34/drivers/oprofile/buffer_sync.c linux-2.6.34/drivers/oprofile/buffer_sync.c
---- linux-2.6.34/drivers/oprofile/buffer_sync.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/oprofile/buffer_sync.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/oprofile/buffer_sync.c linux-2.6.34.1/drivers/oprofile/buffer_sync.c
+--- linux-2.6.34.1/drivers/oprofile/buffer_sync.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/oprofile/buffer_sync.c 2010-07-07 09:04:53.000000000 -0400
@@ -341,7 +341,7 @@ static void add_data(struct op_entry *en
if (cookie == NO_COOKIE)
offset = pc;
}
}
release_mm(mm);
-diff -urNp linux-2.6.34/drivers/oprofile/event_buffer.c linux-2.6.34/drivers/oprofile/event_buffer.c
---- linux-2.6.34/drivers/oprofile/event_buffer.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/oprofile/event_buffer.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/oprofile/event_buffer.c linux-2.6.34.1/drivers/oprofile/event_buffer.c
+--- linux-2.6.34.1/drivers/oprofile/event_buffer.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/oprofile/event_buffer.c 2010-07-07 09:04:53.000000000 -0400
@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
}
return;
}
-diff -urNp linux-2.6.34/drivers/oprofile/oprof.c linux-2.6.34/drivers/oprofile/oprof.c
---- linux-2.6.34/drivers/oprofile/oprof.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/oprofile/oprof.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/oprofile/oprof.c linux-2.6.34.1/drivers/oprofile/oprof.c
+--- linux-2.6.34.1/drivers/oprofile/oprof.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/oprofile/oprof.c 2010-07-07 09:04:53.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.34/drivers/oprofile/oprofilefs.c linux-2.6.34/drivers/oprofile/oprofilefs.c
---- linux-2.6.34/drivers/oprofile/oprofilefs.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/oprofile/oprofilefs.c 2010-07-01 20:45:15.000000000 -0400
-@@ -187,7 +187,7 @@ static const struct file_operations atom
-
-
- int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
-- char const *name, atomic_t *val)
-+ char const *name, atomic_unchecked_t *val)
- {
- struct dentry *d = __oprofilefs_create_file(sb, root, name,
- &atomic_ro_fops, 0444);
-diff -urNp linux-2.6.34/drivers/oprofile/oprofile_stats.c linux-2.6.34/drivers/oprofile/oprofile_stats.c
---- linux-2.6.34/drivers/oprofile/oprofile_stats.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/oprofile/oprofile_stats.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/oprofile/oprofile_stats.c linux-2.6.34.1/drivers/oprofile/oprofile_stats.c
+--- linux-2.6.34.1/drivers/oprofile/oprofile_stats.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/oprofile/oprofile_stats.c 2010-07-07 09:04:53.000000000 -0400
@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
cpu_buf->sample_invalid_eip = 0;
}
}
-diff -urNp linux-2.6.34/drivers/oprofile/oprofile_stats.h linux-2.6.34/drivers/oprofile/oprofile_stats.h
---- linux-2.6.34/drivers/oprofile/oprofile_stats.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/oprofile/oprofile_stats.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/oprofile/oprofile_stats.h linux-2.6.34.1/drivers/oprofile/oprofile_stats.h
+--- linux-2.6.34.1/drivers/oprofile/oprofile_stats.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/oprofile/oprofile_stats.h 2010-07-07 09:04:53.000000000 -0400
@@ -13,11 +13,11 @@
#include <asm/atomic.h>
};
extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-2.6.34/drivers/parport/procfs.c linux-2.6.34/drivers/parport/procfs.c
---- linux-2.6.34/drivers/parport/procfs.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/parport/procfs.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/oprofile/oprofilefs.c linux-2.6.34.1/drivers/oprofile/oprofilefs.c
+--- linux-2.6.34.1/drivers/oprofile/oprofilefs.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/oprofile/oprofilefs.c 2010-07-07 09:04:53.000000000 -0400
+@@ -187,7 +187,7 @@ static const struct file_operations atom
+
+
+ int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
+- char const *name, atomic_t *val)
++ char const *name, atomic_unchecked_t *val)
+ {
+ struct dentry *d = __oprofilefs_create_file(sb, root, name,
+ &atomic_ro_fops, 0444);
+diff -urNp linux-2.6.34.1/drivers/parport/procfs.c linux-2.6.34.1/drivers/parport/procfs.c
+--- linux-2.6.34.1/drivers/parport/procfs.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/parport/procfs.c 2010-07-07 09:04:53.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.34/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.34/drivers/pci/hotplug/acpiphp_glue.c
---- linux-2.6.34/drivers/pci/hotplug/acpiphp_glue.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/pci/hotplug/acpiphp_glue.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.34.1/drivers/pci/hotplug/acpiphp_glue.c
+--- linux-2.6.34.1/drivers/pci/hotplug/acpiphp_glue.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/pci/hotplug/acpiphp_glue.c 2010-07-07 09:04:53.000000000 -0400
@@ -110,7 +110,7 @@ static int post_dock_fixups(struct notif
}
.handler = handle_hotplug_event_func,
};
-diff -urNp linux-2.6.34/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.34/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-2.6.34/drivers/pci/hotplug/cpqphp_nvram.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/pci/hotplug/cpqphp_nvram.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.34.1/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-2.6.34.1/drivers/pci/hotplug/cpqphp_nvram.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/pci/hotplug/cpqphp_nvram.c 2010-07-07 09:04:53.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.34/drivers/pci/intel-iommu.c linux-2.6.34/drivers/pci/intel-iommu.c
---- linux-2.6.34/drivers/pci/intel-iommu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/pci/intel-iommu.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/pci/intel-iommu.c linux-2.6.34.1/drivers/pci/intel-iommu.c
+--- linux-2.6.34.1/drivers/pci/intel-iommu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/pci/intel-iommu.c 2010-07-07 09:04:53.000000000 -0400
@@ -2940,7 +2940,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.34/drivers/pci/pcie/portdrv_pci.c linux-2.6.34/drivers/pci/pcie/portdrv_pci.c
---- linux-2.6.34/drivers/pci/pcie/portdrv_pci.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/pci/pcie/portdrv_pci.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/pci/pcie/portdrv_pci.c linux-2.6.34.1/drivers/pci/pcie/portdrv_pci.c
+--- linux-2.6.34.1/drivers/pci/pcie/portdrv_pci.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/pci/pcie/portdrv_pci.c 2010-07-07 09:04:53.000000000 -0400
@@ -250,7 +250,7 @@ static void pcie_portdrv_err_resume(stru
static const struct pci_device_id port_pci_ids[] = { {
/* handle any PCI-Express port */
};
MODULE_DEVICE_TABLE(pci, port_pci_ids);
-diff -urNp linux-2.6.34/drivers/pci/probe.c linux-2.6.34/drivers/pci/probe.c
---- linux-2.6.34/drivers/pci/probe.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/pci/probe.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/pci/probe.c linux-2.6.34.1/drivers/pci/probe.c
+--- linux-2.6.34.1/drivers/pci/probe.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/pci/probe.c 2010-07-07 09:04:53.000000000 -0400
@@ -63,14 +63,14 @@ static ssize_t pci_bus_show_cpuaffinity(
return ret;
}
struct device_attribute *attr,
char *buf)
{
-diff -urNp linux-2.6.34/drivers/pci/proc.c linux-2.6.34/drivers/pci/proc.c
---- linux-2.6.34/drivers/pci/proc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/pci/proc.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/pci/proc.c linux-2.6.34.1/drivers/pci/proc.c
+--- linux-2.6.34.1/drivers/pci/proc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/pci/proc.c 2010-07-07 09:04:53.000000000 -0400
@@ -481,7 +481,16 @@ static const struct file_operations proc
static int __init pci_proc_init(void)
{
proc_create("devices", 0, proc_bus_pci_dir,
&proc_bus_pci_dev_operations);
proc_initialized = 1;
-diff -urNp linux-2.6.34/drivers/pcmcia/ti113x.h linux-2.6.34/drivers/pcmcia/ti113x.h
---- linux-2.6.34/drivers/pcmcia/ti113x.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/pcmcia/ti113x.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/pcmcia/ti113x.h linux-2.6.34.1/drivers/pcmcia/ti113x.h
+--- linux-2.6.34.1/drivers/pcmcia/ti113x.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/pcmcia/ti113x.h 2010-07-07 09:04:53.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.34/drivers/pcmcia/yenta_socket.c linux-2.6.34/drivers/pcmcia/yenta_socket.c
---- linux-2.6.34/drivers/pcmcia/yenta_socket.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/pcmcia/yenta_socket.c 2010-07-01 20:45:15.000000000 -0400
-@@ -1436,7 +1436,7 @@ static struct pci_device_id yenta_table[
+diff -urNp linux-2.6.34.1/drivers/pcmcia/yenta_socket.c linux-2.6.34.1/drivers/pcmcia/yenta_socket.c
+--- linux-2.6.34.1/drivers/pcmcia/yenta_socket.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/pcmcia/yenta_socket.c 2010-07-07 09:04:53.000000000 -0400
+@@ -1437,7 +1437,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.34/drivers/platform/x86/acer-wmi.c linux-2.6.34/drivers/platform/x86/acer-wmi.c
---- linux-2.6.34/drivers/platform/x86/acer-wmi.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/platform/x86/acer-wmi.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/platform/x86/acer-wmi.c linux-2.6.34.1/drivers/platform/x86/acer-wmi.c
+--- linux-2.6.34.1/drivers/platform/x86/acer-wmi.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/platform/x86/acer-wmi.c 2010-07-07 09:04:53.000000000 -0400
@@ -916,7 +916,7 @@ static int update_bl_status(struct backl
return 0;
}
.get_brightness = read_brightness,
.update_status = update_bl_status,
};
-diff -urNp linux-2.6.34/drivers/platform/x86/asus_acpi.c linux-2.6.34/drivers/platform/x86/asus_acpi.c
---- linux-2.6.34/drivers/platform/x86/asus_acpi.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/platform/x86/asus_acpi.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/platform/x86/asus-laptop.c linux-2.6.34.1/drivers/platform/x86/asus-laptop.c
+--- linux-2.6.34.1/drivers/platform/x86/asus-laptop.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/platform/x86/asus-laptop.c 2010-07-07 09:04:53.000000000 -0400
+@@ -621,7 +621,7 @@ static int update_bl_status(struct backl
+ return asus_lcd_set(asus, value);
+ }
+
+-static struct backlight_ops asusbl_ops = {
++static const struct backlight_ops asusbl_ops = {
+ .get_brightness = asus_read_brightness,
+ .update_status = update_bl_status,
+ };
+diff -urNp linux-2.6.34.1/drivers/platform/x86/asus_acpi.c linux-2.6.34.1/drivers/platform/x86/asus_acpi.c
+--- linux-2.6.34.1/drivers/platform/x86/asus_acpi.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/platform/x86/asus_acpi.c 2010-07-07 09:04:53.000000000 -0400
@@ -1464,7 +1464,7 @@ static int asus_hotk_remove(struct acpi_
return 0;
}
.get_brightness = read_brightness,
.update_status = set_brightness_status,
};
-diff -urNp linux-2.6.34/drivers/platform/x86/asus-laptop.c linux-2.6.34/drivers/platform/x86/asus-laptop.c
---- linux-2.6.34/drivers/platform/x86/asus-laptop.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/platform/x86/asus-laptop.c 2010-07-01 20:45:15.000000000 -0400
-@@ -224,7 +224,6 @@ struct asus_laptop {
- struct asus_led gled;
- struct asus_led kled;
- struct workqueue_struct *led_workqueue;
--
- int wireless_status;
- bool have_rsts;
- int lcd_state;
-@@ -621,7 +620,7 @@ static int update_bl_status(struct backl
- return asus_lcd_set(asus, value);
- }
-
--static struct backlight_ops asusbl_ops = {
-+static const struct backlight_ops asusbl_ops = {
- .get_brightness = asus_read_brightness,
- .update_status = update_bl_status,
- };
-diff -urNp linux-2.6.34/drivers/platform/x86/compal-laptop.c linux-2.6.34/drivers/platform/x86/compal-laptop.c
---- linux-2.6.34/drivers/platform/x86/compal-laptop.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/platform/x86/compal-laptop.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/platform/x86/compal-laptop.c linux-2.6.34.1/drivers/platform/x86/compal-laptop.c
+--- linux-2.6.34.1/drivers/platform/x86/compal-laptop.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/platform/x86/compal-laptop.c 2010-07-07 09:04:53.000000000 -0400
@@ -168,7 +168,7 @@ static int bl_update_status(struct backl
return set_lcd_level(b->props.brightness);
}
.get_brightness = bl_get_brightness,
.update_status = bl_update_status,
};
-diff -urNp linux-2.6.34/drivers/platform/x86/dell-laptop.c linux-2.6.34/drivers/platform/x86/dell-laptop.c
---- linux-2.6.34/drivers/platform/x86/dell-laptop.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/platform/x86/dell-laptop.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/platform/x86/dell-laptop.c linux-2.6.34.1/drivers/platform/x86/dell-laptop.c
+--- linux-2.6.34.1/drivers/platform/x86/dell-laptop.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/platform/x86/dell-laptop.c 2010-07-07 09:04:53.000000000 -0400
@@ -462,7 +462,7 @@ out:
return buffer->output[1];
}
.get_brightness = dell_get_intensity,
.update_status = dell_send_intensity,
};
-diff -urNp linux-2.6.34/drivers/platform/x86/eeepc-laptop.c linux-2.6.34/drivers/platform/x86/eeepc-laptop.c
---- linux-2.6.34/drivers/platform/x86/eeepc-laptop.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/platform/x86/eeepc-laptop.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/platform/x86/eeepc-laptop.c linux-2.6.34.1/drivers/platform/x86/eeepc-laptop.c
+--- linux-2.6.34.1/drivers/platform/x86/eeepc-laptop.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/platform/x86/eeepc-laptop.c 2010-07-07 09:04:53.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.34/drivers/platform/x86/fujitsu-laptop.c linux-2.6.34/drivers/platform/x86/fujitsu-laptop.c
---- linux-2.6.34/drivers/platform/x86/fujitsu-laptop.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/platform/x86/fujitsu-laptop.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/platform/x86/fujitsu-laptop.c linux-2.6.34.1/drivers/platform/x86/fujitsu-laptop.c
+--- linux-2.6.34.1/drivers/platform/x86/fujitsu-laptop.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/platform/x86/fujitsu-laptop.c 2010-07-07 09:04:53.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.34/drivers/platform/x86/msi-laptop.c linux-2.6.34/drivers/platform/x86/msi-laptop.c
---- linux-2.6.34/drivers/platform/x86/msi-laptop.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/platform/x86/msi-laptop.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/platform/x86/msi-laptop.c linux-2.6.34.1/drivers/platform/x86/msi-laptop.c
+--- linux-2.6.34.1/drivers/platform/x86/msi-laptop.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/platform/x86/msi-laptop.c 2010-07-07 09:04:53.000000000 -0400
@@ -254,7 +254,7 @@ static int bl_update_status(struct backl
return set_lcd_level(b->props.brightness);
}
.get_brightness = bl_get_brightness,
.update_status = bl_update_status,
};
-diff -urNp linux-2.6.34/drivers/platform/x86/sony-laptop.c linux-2.6.34/drivers/platform/x86/sony-laptop.c
---- linux-2.6.34/drivers/platform/x86/sony-laptop.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/platform/x86/sony-laptop.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/platform/x86/sony-laptop.c linux-2.6.34.1/drivers/platform/x86/sony-laptop.c
+--- linux-2.6.34.1/drivers/platform/x86/sony-laptop.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/platform/x86/sony-laptop.c 2010-07-07 09:04:53.000000000 -0400
@@ -857,7 +857,7 @@ static int sony_backlight_get_brightness
}
.update_status = sony_backlight_update_status,
.get_brightness = sony_backlight_get_brightness,
};
-diff -urNp linux-2.6.34/drivers/platform/x86/thinkpad_acpi.c linux-2.6.34/drivers/platform/x86/thinkpad_acpi.c
---- linux-2.6.34/drivers/platform/x86/thinkpad_acpi.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/platform/x86/thinkpad_acpi.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/platform/x86/thinkpad_acpi.c linux-2.6.34.1/drivers/platform/x86/thinkpad_acpi.c
+--- linux-2.6.34.1/drivers/platform/x86/thinkpad_acpi.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/platform/x86/thinkpad_acpi.c 2010-07-07 09:04:53.000000000 -0400
@@ -6132,7 +6132,7 @@ static void tpacpi_brightness_notify_cha
BACKLIGHT_UPDATE_HOTKEY);
}
.get_brightness = brightness_get,
.update_status = brightness_update_status,
};
-diff -urNp linux-2.6.34/drivers/platform/x86/toshiba_acpi.c linux-2.6.34/drivers/platform/x86/toshiba_acpi.c
---- linux-2.6.34/drivers/platform/x86/toshiba_acpi.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/platform/x86/toshiba_acpi.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/platform/x86/toshiba_acpi.c linux-2.6.34.1/drivers/platform/x86/toshiba_acpi.c
+--- linux-2.6.34.1/drivers/platform/x86/toshiba_acpi.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/platform/x86/toshiba_acpi.c 2010-07-07 09:04:53.000000000 -0400
@@ -741,7 +741,7 @@ static acpi_status remove_device(void)
return AE_OK;
}
.get_brightness = get_lcd,
.update_status = set_lcd_status,
};
-diff -urNp linux-2.6.34/drivers/pnp/pnpbios/bioscalls.c linux-2.6.34/drivers/pnp/pnpbios/bioscalls.c
---- linux-2.6.34/drivers/pnp/pnpbios/bioscalls.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/pnp/pnpbios/bioscalls.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/pnp/pnpbios/bioscalls.c linux-2.6.34.1/drivers/pnp/pnpbios/bioscalls.c
+--- linux-2.6.34.1/drivers/pnp/pnpbios/bioscalls.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/pnp/pnpbios/bioscalls.c 2010-07-07 09:04:53.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.34/drivers/pnp/quirks.c linux-2.6.34/drivers/pnp/quirks.c
---- linux-2.6.34/drivers/pnp/quirks.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/pnp/quirks.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/pnp/quirks.c linux-2.6.34.1/drivers/pnp/quirks.c
+--- linux-2.6.34.1/drivers/pnp/quirks.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/pnp/quirks.c 2010-07-07 09:04:53.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.34/drivers/pnp/resource.c linux-2.6.34/drivers/pnp/resource.c
---- linux-2.6.34/drivers/pnp/resource.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/pnp/resource.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/pnp/resource.c linux-2.6.34.1/drivers/pnp/resource.c
+--- linux-2.6.34.1/drivers/pnp/resource.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/pnp/resource.c 2010-07-07 09:04:53.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.34/drivers/s390/cio/qdio_debug.c linux-2.6.34/drivers/s390/cio/qdio_debug.c
---- linux-2.6.34/drivers/s390/cio/qdio_debug.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/s390/cio/qdio_debug.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/s390/cio/qdio_debug.c linux-2.6.34.1/drivers/s390/cio/qdio_debug.c
+--- linux-2.6.34.1/drivers/s390/cio/qdio_debug.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/s390/cio/qdio_debug.c 2010-07-07 09:04:53.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.34/drivers/scsi/ipr.c linux-2.6.34/drivers/scsi/ipr.c
---- linux-2.6.34/drivers/scsi/ipr.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/scsi/ipr.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/scsi/ipr.c linux-2.6.34.1/drivers/scsi/ipr.c
+--- linux-2.6.34.1/drivers/scsi/ipr.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/scsi/ipr.c 2010-07-07 09:04:53.000000000 -0400
@@ -6055,7 +6055,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.34/drivers/scsi/libfc/fc_exch.c linux-2.6.34/drivers/scsi/libfc/fc_exch.c
---- linux-2.6.34/drivers/scsi/libfc/fc_exch.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/scsi/libfc/fc_exch.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/scsi/libfc/fc_exch.c linux-2.6.34.1/drivers/scsi/libfc/fc_exch.c
+--- linux-2.6.34.1/drivers/scsi/libfc/fc_exch.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/scsi/libfc/fc_exch.c 2010-07-07 09:04:53.000000000 -0400
@@ -100,12 +100,12 @@ struct fc_exch_mgr {
* all together if not used XXX
*/
fc_frame_free(fp);
}
-diff -urNp linux-2.6.34/drivers/scsi/libsas/sas_ata.c linux-2.6.34/drivers/scsi/libsas/sas_ata.c
---- linux-2.6.34/drivers/scsi/libsas/sas_ata.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/scsi/libsas/sas_ata.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/scsi/libsas/sas_ata.c linux-2.6.34.1/drivers/scsi/libsas/sas_ata.c
+--- linux-2.6.34.1/drivers/scsi/libsas/sas_ata.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/scsi/libsas/sas_ata.c 2010-07-07 09:04:53.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.34/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.34/drivers/scsi/mpt2sas/mpt2sas_debug.h
---- linux-2.6.34/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.34.1/drivers/scsi/mpt2sas/mpt2sas_debug.h
+--- linux-2.6.34.1/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-07-07 09:04:53.000000000 -0400
@@ -79,7 +79,7 @@
CMD; \
}
#endif /* CONFIG_SCSI_MPT2SAS_LOGGING */
-diff -urNp linux-2.6.34/drivers/scsi/scsi_logging.h linux-2.6.34/drivers/scsi/scsi_logging.h
---- linux-2.6.34/drivers/scsi/scsi_logging.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/scsi/scsi_logging.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/scsi/scsi_logging.h linux-2.6.34.1/drivers/scsi/scsi_logging.h
+--- linux-2.6.34.1/drivers/scsi/scsi_logging.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/scsi/scsi_logging.h 2010-07-07 09:04:53.000000000 -0400
@@ -51,7 +51,7 @@ do { \
} while (0); \
} while (0)
#endif /* CONFIG_SCSI_LOGGING */
/*
-diff -urNp linux-2.6.34/drivers/scsi/sg.c linux-2.6.34/drivers/scsi/sg.c
---- linux-2.6.34/drivers/scsi/sg.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/scsi/sg.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/scsi/sg.c linux-2.6.34.1/drivers/scsi/sg.c
+--- linux-2.6.34.1/drivers/scsi/sg.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/scsi/sg.c 2010-07-07 09:04:53.000000000 -0400
@@ -2291,7 +2291,7 @@ struct sg_proc_leaf {
const struct file_operations * fops;
};
sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
if (!sg_proc_sgp)
-diff -urNp linux-2.6.34/drivers/serial/8250_pci.c linux-2.6.34/drivers/serial/8250_pci.c
---- linux-2.6.34/drivers/serial/8250_pci.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/serial/8250_pci.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/serial/8250_pci.c linux-2.6.34.1/drivers/serial/8250_pci.c
+--- linux-2.6.34.1/drivers/serial/8250_pci.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/serial/8250_pci.c 2010-07-07 09:04:53.000000000 -0400
@@ -3693,7 +3693,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.34/drivers/serial/kgdboc.c linux-2.6.34/drivers/serial/kgdboc.c
---- linux-2.6.34/drivers/serial/kgdboc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/serial/kgdboc.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/serial/kgdboc.c linux-2.6.34.1/drivers/serial/kgdboc.c
+--- linux-2.6.34.1/drivers/serial/kgdboc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/serial/kgdboc.c 2010-07-07 09:04:53.000000000 -0400
@@ -18,7 +18,7 @@
#define MAX_CONFIG_LEN 40
.name = "kgdboc",
.read_char = kgdboc_get_char,
.write_char = kgdboc_put_char,
-diff -urNp linux-2.6.34/drivers/staging/comedi/comedi_fops.c linux-2.6.34/drivers/staging/comedi/comedi_fops.c
---- linux-2.6.34/drivers/staging/comedi/comedi_fops.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/comedi/comedi_fops.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/comedi/comedi_fops.c linux-2.6.34.1/drivers/staging/comedi/comedi_fops.c
+--- linux-2.6.34.1/drivers/staging/comedi/comedi_fops.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/comedi/comedi_fops.c 2010-07-07 09:04:53.000000000 -0400
@@ -1384,7 +1384,7 @@ void comedi_unmap(struct vm_area_struct
mutex_unlock(&dev->mutex);
}
.close = comedi_unmap,
};
-diff -urNp linux-2.6.34/drivers/staging/dream/pmem.c linux-2.6.34/drivers/staging/dream/pmem.c
---- linux-2.6.34/drivers/staging/dream/pmem.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/dream/pmem.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/dream/pmem.c linux-2.6.34.1/drivers/staging/dream/pmem.c
+--- linux-2.6.34.1/drivers/staging/dream/pmem.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/dream/pmem.c 2010-07-07 09:04:53.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);
.read = debug_read,
.open = debug_open,
};
-diff -urNp linux-2.6.34/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.34/drivers/staging/dream/qdsp5/adsp_driver.c
---- linux-2.6.34/drivers/staging/dream/qdsp5/adsp_driver.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/dream/qdsp5/adsp_driver.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.34.1/drivers/staging/dream/qdsp5/adsp_driver.c
+--- linux-2.6.34.1/drivers/staging/dream/qdsp5/adsp_driver.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/dream/qdsp5/adsp_driver.c 2010-07-07 09:04:54.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.34/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.34/drivers/staging/dream/qdsp5/audio_aac.c
---- linux-2.6.34/drivers/staging/dream/qdsp5/audio_aac.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/dream/qdsp5/audio_aac.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_aac.c
+--- linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_aac.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_aac.c 2010-07-07 09:04:54.000000000 -0400
@@ -1023,7 +1023,7 @@ done:
return rc;
}
.owner = THIS_MODULE,
.open = audio_open,
.release = audio_release,
-diff -urNp linux-2.6.34/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.34/drivers/staging/dream/qdsp5/audio_amrnb.c
---- linux-2.6.34/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_amrnb.c
+--- linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-07-07 09:04:54.000000000 -0400
@@ -834,7 +834,7 @@ done:
return rc;
}
.owner = THIS_MODULE,
.open = audamrnb_open,
.release = audamrnb_release,
-diff -urNp linux-2.6.34/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.34/drivers/staging/dream/qdsp5/audio_evrc.c
---- linux-2.6.34/drivers/staging/dream/qdsp5/audio_evrc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/dream/qdsp5/audio_evrc.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_evrc.c
+--- linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_evrc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_evrc.c 2010-07-07 09:04:54.000000000 -0400
@@ -806,7 +806,7 @@ dma_fail:
return rc;
}
.owner = THIS_MODULE,
.open = audevrc_open,
.release = audevrc_release,
-diff -urNp linux-2.6.34/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.34/drivers/staging/dream/qdsp5/audio_in.c
---- linux-2.6.34/drivers/staging/dream/qdsp5/audio_in.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/dream/qdsp5/audio_in.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_in.c
+--- linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_in.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_in.c 2010-07-07 09:04:54.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.34/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.34/drivers/staging/dream/qdsp5/audio_mp3.c
---- linux-2.6.34/drivers/staging/dream/qdsp5/audio_mp3.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/dream/qdsp5/audio_mp3.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_mp3.c
+--- linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_mp3.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_mp3.c 2010-07-07 09:04:54.000000000 -0400
@@ -941,7 +941,7 @@ done:
return rc;
}
.owner = THIS_MODULE,
.open = audio_open,
.release = audio_release,
-diff -urNp linux-2.6.34/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.34/drivers/staging/dream/qdsp5/audio_out.c
---- linux-2.6.34/drivers/staging/dream/qdsp5/audio_out.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/dream/qdsp5/audio_out.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_out.c
+--- linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_out.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_out.c 2010-07-07 09:04:54.000000000 -0400
@@ -807,7 +807,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.34/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.34/drivers/staging/dream/qdsp5/audio_qcelp.c
---- linux-2.6.34/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_qcelp.c
+--- linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-07-07 09:04:54.000000000 -0400
@@ -817,7 +817,7 @@ err:
return rc;
}
.owner = THIS_MODULE,
.open = audqcelp_open,
.release = audqcelp_release,
-diff -urNp linux-2.6.34/drivers/staging/dream/qdsp5/snd.c linux-2.6.34/drivers/staging/dream/qdsp5/snd.c
---- linux-2.6.34/drivers/staging/dream/qdsp5/snd.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/dream/qdsp5/snd.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/dream/qdsp5/snd.c linux-2.6.34.1/drivers/staging/dream/qdsp5/snd.c
+--- linux-2.6.34.1/drivers/staging/dream/qdsp5/snd.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/dream/qdsp5/snd.c 2010-07-07 09:04:54.000000000 -0400
@@ -242,7 +242,7 @@ err:
return rc;
}
.owner = THIS_MODULE,
.open = snd_open,
.release = snd_release,
-diff -urNp linux-2.6.34/drivers/staging/dream/smd/smd_qmi.c linux-2.6.34/drivers/staging/dream/smd/smd_qmi.c
---- linux-2.6.34/drivers/staging/dream/smd/smd_qmi.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/dream/smd/smd_qmi.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/dream/smd/smd_qmi.c linux-2.6.34.1/drivers/staging/dream/smd/smd_qmi.c
+--- linux-2.6.34.1/drivers/staging/dream/smd/smd_qmi.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/dream/smd/smd_qmi.c 2010-07-07 09:04:54.000000000 -0400
@@ -788,7 +788,7 @@ static int qmi_release(struct inode *ip,
return 0;
}
.owner = THIS_MODULE,
.read = qmi_read,
.write = qmi_write,
-diff -urNp linux-2.6.34/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.34/drivers/staging/dream/smd/smd_rpcrouter_device.c
---- linux-2.6.34/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.34.1/drivers/staging/dream/smd/smd_rpcrouter_device.c
+--- linux-2.6.34.1/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-07-07 09:04:54.000000000 -0400
@@ -215,7 +215,7 @@ static long rpcrouter_ioctl(struct file
return rc;
}
.owner = THIS_MODULE,
.open = rpcrouter_open,
.release = rpcrouter_release,
-diff -urNp linux-2.6.34/drivers/staging/dt3155/dt3155_drv.c linux-2.6.34/drivers/staging/dt3155/dt3155_drv.c
---- linux-2.6.34/drivers/staging/dt3155/dt3155_drv.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/dt3155/dt3155_drv.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/dt3155/dt3155_drv.c linux-2.6.34.1/drivers/staging/dt3155/dt3155_drv.c
+--- linux-2.6.34.1/drivers/staging/dt3155/dt3155_drv.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/dt3155/dt3155_drv.c 2010-07-07 09:04:54.000000000 -0400
@@ -841,7 +841,7 @@ static unsigned int dt3155_poll (struct
* needed by init_module
* register_chrdev
read: dt3155_read,
ioctl: dt3155_ioctl,
mmap: dt3155_mmap,
-diff -urNp linux-2.6.34/drivers/staging/go7007/go7007-v4l2.c linux-2.6.34/drivers/staging/go7007/go7007-v4l2.c
---- linux-2.6.34/drivers/staging/go7007/go7007-v4l2.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/go7007/go7007-v4l2.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/go7007/go7007-v4l2.c linux-2.6.34.1/drivers/staging/go7007/go7007-v4l2.c
+--- linux-2.6.34.1/drivers/staging/go7007/go7007-v4l2.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/go7007/go7007-v4l2.c 2010-07-07 09:04:54.000000000 -0400
@@ -1675,7 +1675,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.34/drivers/staging/hv/blkvsc_drv.c linux-2.6.34/drivers/staging/hv/blkvsc_drv.c
---- linux-2.6.34/drivers/staging/hv/blkvsc_drv.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/hv/blkvsc_drv.c 2010-07-01 20:45:15.000000000 -0400
-@@ -155,7 +155,7 @@ static int blkvsc_ringbuffer_size = BLKV
- /* The one and only one */
- static struct blkvsc_driver_context g_blkvsc_drv;
-
--static struct block_device_operations block_ops = {
-+static const struct block_device_operations block_ops = {
- .owner = THIS_MODULE,
- .open = blkvsc_open,
- .release = blkvsc_release,
-diff -urNp linux-2.6.34/drivers/staging/hv/Hv.c linux-2.6.34/drivers/staging/hv/Hv.c
---- linux-2.6.34/drivers/staging/hv/Hv.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/hv/Hv.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/hv/Hv.c linux-2.6.34.1/drivers/staging/hv/Hv.c
+--- linux-2.6.34.1/drivers/staging/hv/Hv.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/hv/Hv.c 2010-07-07 09:04:54.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.34/drivers/staging/panel/panel.c linux-2.6.34/drivers/staging/panel/panel.c
---- linux-2.6.34/drivers/staging/panel/panel.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/panel/panel.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/hv/blkvsc_drv.c linux-2.6.34.1/drivers/staging/hv/blkvsc_drv.c
+--- linux-2.6.34.1/drivers/staging/hv/blkvsc_drv.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/hv/blkvsc_drv.c 2010-07-07 09:04:54.000000000 -0400
+@@ -155,7 +155,7 @@ static int blkvsc_ringbuffer_size = BLKV
+ /* The one and only one */
+ static struct blkvsc_driver_context g_blkvsc_drv;
+
+-static struct block_device_operations block_ops = {
++static const struct block_device_operations block_ops = {
+ .owner = THIS_MODULE,
+ .open = blkvsc_open,
+ .release = blkvsc_release,
+diff -urNp linux-2.6.34.1/drivers/staging/panel/panel.c linux-2.6.34.1/drivers/staging/panel/panel.c
+--- linux-2.6.34.1/drivers/staging/panel/panel.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/panel/panel.c 2010-07-07 09:04:54.000000000 -0400
@@ -1304,7 +1304,7 @@ static int lcd_release(struct inode *ino
return 0;
}
.read = keypad_read, /* read */
.open = keypad_open, /* open */
.release = keypad_release, /* close */
-diff -urNp linux-2.6.34/drivers/staging/phison/phison.c linux-2.6.34/drivers/staging/phison/phison.c
---- linux-2.6.34/drivers/staging/phison/phison.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/phison/phison.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/phison/phison.c linux-2.6.34.1/drivers/staging/phison/phison.c
+--- linux-2.6.34.1/drivers/staging/phison/phison.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/phison/phison.c 2010-07-07 09:04:54.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.34/drivers/staging/poch/poch.c linux-2.6.34/drivers/staging/poch/poch.c
---- linux-2.6.34/drivers/staging/poch/poch.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/poch/poch.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/poch/poch.c linux-2.6.34.1/drivers/staging/poch/poch.c
+--- linux-2.6.34.1/drivers/staging/poch/poch.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/poch/poch.c 2010-07-07 09:04:54.000000000 -0400
@@ -1033,7 +1033,7 @@ static int poch_ioctl(struct inode *inod
return 0;
}
.owner = THIS_MODULE,
.open = poch_open,
.release = poch_release,
-diff -urNp linux-2.6.34/drivers/staging/pohmelfs/inode.c linux-2.6.34/drivers/staging/pohmelfs/inode.c
---- linux-2.6.34/drivers/staging/pohmelfs/inode.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/pohmelfs/inode.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/pohmelfs/inode.c linux-2.6.34.1/drivers/staging/pohmelfs/inode.c
+--- linux-2.6.34.1/drivers/staging/pohmelfs/inode.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/pohmelfs/inode.c 2010-07-07 09:04:54.000000000 -0400
@@ -1854,7 +1854,7 @@ static int pohmelfs_fill_super(struct su
mutex_init(&psb->mcache_lock);
psb->mcache_root = RB_ROOT;
psb->trans_max_pages = 100;
-diff -urNp linux-2.6.34/drivers/staging/pohmelfs/mcache.c linux-2.6.34/drivers/staging/pohmelfs/mcache.c
---- linux-2.6.34/drivers/staging/pohmelfs/mcache.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/pohmelfs/mcache.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/pohmelfs/mcache.c linux-2.6.34.1/drivers/staging/pohmelfs/mcache.c
+--- linux-2.6.34.1/drivers/staging/pohmelfs/mcache.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/pohmelfs/mcache.c 2010-07-07 09:04:54.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.34/drivers/staging/pohmelfs/netfs.h linux-2.6.34/drivers/staging/pohmelfs/netfs.h
---- linux-2.6.34/drivers/staging/pohmelfs/netfs.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/pohmelfs/netfs.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/pohmelfs/netfs.h linux-2.6.34.1/drivers/staging/pohmelfs/netfs.h
+--- linux-2.6.34.1/drivers/staging/pohmelfs/netfs.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/pohmelfs/netfs.h 2010-07-07 09:04:54.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.34/drivers/staging/ramzswap/ramzswap_drv.c linux-2.6.34/drivers/staging/ramzswap/ramzswap_drv.c
---- linux-2.6.34/drivers/staging/ramzswap/ramzswap_drv.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/ramzswap/ramzswap_drv.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/ramzswap/ramzswap_drv.c linux-2.6.34.1/drivers/staging/ramzswap/ramzswap_drv.c
+--- linux-2.6.34.1/drivers/staging/ramzswap/ramzswap_drv.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/ramzswap/ramzswap_drv.c 2010-07-07 09:04:54.000000000 -0400
@@ -1295,7 +1295,7 @@ out:
return ret;
}
.ioctl = ramzswap_ioctl,
.owner = THIS_MODULE,
};
-diff -urNp linux-2.6.34/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.34/drivers/staging/rtl8192u/ieee80211/proc.c
---- linux-2.6.34/drivers/staging/rtl8192u/ieee80211/proc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/rtl8192u/ieee80211/proc.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.34.1/drivers/staging/rtl8192u/ieee80211/proc.c
+--- linux-2.6.34.1/drivers/staging/rtl8192u/ieee80211/proc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/rtl8192u/ieee80211/proc.c 2010-07-07 09:04:54.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.34/drivers/staging/samsung-laptop/samsung-laptop.c linux-2.6.34/drivers/staging/samsung-laptop/samsung-laptop.c
---- linux-2.6.34/drivers/staging/samsung-laptop/samsung-laptop.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/samsung-laptop/samsung-laptop.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/samsung-laptop/samsung-laptop.c linux-2.6.34.1/drivers/staging/samsung-laptop/samsung-laptop.c
+--- linux-2.6.34.1/drivers/staging/samsung-laptop/samsung-laptop.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/samsung-laptop/samsung-laptop.c 2010-07-07 09:04:54.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.34/drivers/staging/sep/sep_driver.c linux-2.6.34/drivers/staging/sep/sep_driver.c
---- linux-2.6.34/drivers/staging/sep/sep_driver.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/sep/sep_driver.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/sep/sep_driver.c linux-2.6.34.1/drivers/staging/sep/sep_driver.c
+--- linux-2.6.34.1/drivers/staging/sep/sep_driver.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/sep/sep_driver.c 2010-07-07 09:04:54.000000000 -0400
@@ -2610,7 +2610,7 @@ static struct pci_driver sep_pci_driver
static dev_t sep_devno;
.owner = THIS_MODULE,
.unlocked_ioctl = sep_ioctl,
.poll = sep_poll,
-diff -urNp linux-2.6.34/drivers/staging/vme/devices/vme_user.c linux-2.6.34/drivers/staging/vme/devices/vme_user.c
---- linux-2.6.34/drivers/staging/vme/devices/vme_user.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/staging/vme/devices/vme_user.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/staging/vme/devices/vme_user.c linux-2.6.34.1/drivers/staging/vme/devices/vme_user.c
+--- linux-2.6.34.1/drivers/staging/vme/devices/vme_user.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/staging/vme/devices/vme_user.c 2010-07-07 09:04:54.000000000 -0400
@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *
static int __init vme_user_probe(struct device *, int, int);
static int __exit vme_user_remove(struct device *, int, int);
.open = vme_user_open,
.release = vme_user_release,
.read = vme_user_read,
-diff -urNp linux-2.6.34/drivers/usb/atm/usbatm.c linux-2.6.34/drivers/usb/atm/usbatm.c
---- linux-2.6.34/drivers/usb/atm/usbatm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/usb/atm/usbatm.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/usb/atm/usbatm.c linux-2.6.34.1/drivers/usb/atm/usbatm.c
+--- linux-2.6.34.1/drivers/usb/atm/usbatm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/usb/atm/usbatm.c 2010-07-07 09:04:54.000000000 -0400
@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
if (printk_ratelimit())
atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
if (!left--) {
if (instance->disconnected)
-diff -urNp linux-2.6.34/drivers/usb/class/cdc-acm.c linux-2.6.34/drivers/usb/class/cdc-acm.c
---- linux-2.6.34/drivers/usb/class/cdc-acm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/usb/class/cdc-acm.c 2010-07-01 20:45:15.000000000 -0400
-@@ -1616,7 +1616,7 @@ static const struct usb_device_id acm_id
+diff -urNp linux-2.6.34.1/drivers/usb/class/cdc-acm.c linux-2.6.34.1/drivers/usb/class/cdc-acm.c
+--- linux-2.6.34.1/drivers/usb/class/cdc-acm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/usb/class/cdc-acm.c 2010-07-07 09:04:54.000000000 -0400
+@@ -1618,7 +1618,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.34/drivers/usb/class/usblp.c linux-2.6.34/drivers/usb/class/usblp.c
---- linux-2.6.34/drivers/usb/class/usblp.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/usb/class/usblp.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/usb/class/usblp.c linux-2.6.34.1/drivers/usb/class/usblp.c
+--- linux-2.6.34.1/drivers/usb/class/usblp.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/usb/class/usblp.c 2010-07-07 09:04:54.000000000 -0400
@@ -226,7 +226,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 */
};
MODULE_DEVICE_TABLE (usb, usblp_ids);
-diff -urNp linux-2.6.34/drivers/usb/core/hcd.c linux-2.6.34/drivers/usb/core/hcd.c
---- linux-2.6.34/drivers/usb/core/hcd.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/usb/core/hcd.c 2010-07-01 20:45:15.000000000 -0400
-@@ -2275,7 +2275,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
+diff -urNp linux-2.6.34.1/drivers/usb/core/hcd.c linux-2.6.34.1/drivers/usb/core/hcd.c
+--- linux-2.6.34.1/drivers/usb/core/hcd.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/usb/core/hcd.c 2010-07-07 09:04:54.000000000 -0400
+@@ -2316,7 +2316,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
/*
* The registration is unlocked.
-@@ -2285,7 +2285,7 @@ struct usb_mon_operations *mon_ops;
+@@ -2326,7 +2326,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.34/drivers/usb/core/hcd.h linux-2.6.34/drivers/usb/core/hcd.h
---- linux-2.6.34/drivers/usb/core/hcd.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/usb/core/hcd.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/usb/core/hcd.h linux-2.6.34.1/drivers/usb/core/hcd.h
+--- linux-2.6.34.1/drivers/usb/core/hcd.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/usb/core/hcd.h 2010-07-07 09:04:54.000000000 -0400
@@ -506,13 +506,13 @@ static inline void usbfs_cleanup(void) {
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
void usb_mon_deregister(void);
#else
-diff -urNp linux-2.6.34/drivers/usb/core/hub.c linux-2.6.34/drivers/usb/core/hub.c
---- linux-2.6.34/drivers/usb/core/hub.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/usb/core/hub.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/usb/core/hub.c linux-2.6.34.1/drivers/usb/core/hub.c
+--- linux-2.6.34.1/drivers/usb/core/hub.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/usb/core/hub.c 2010-07-07 09:04:54.000000000 -0400
@@ -3437,7 +3437,7 @@ static const struct usb_device_id hub_id
.bDeviceClass = USB_CLASS_HUB},
{ .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
};
MODULE_DEVICE_TABLE (usb, hub_id_table);
-diff -urNp linux-2.6.34/drivers/usb/core/message.c linux-2.6.34/drivers/usb/core/message.c
---- linux-2.6.34/drivers/usb/core/message.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/usb/core/message.c 2010-07-01 20:45:15.000000000 -0400
-@@ -909,8 +909,8 @@ char *usb_cache_string(struct usb_device
+diff -urNp linux-2.6.34.1/drivers/usb/core/message.c linux-2.6.34.1/drivers/usb/core/message.c
+--- linux-2.6.34.1/drivers/usb/core/message.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/usb/core/message.c 2010-07-07 09:04:54.000000000 -0400
+@@ -884,8 +884,8 @@ char *usb_cache_string(struct usb_device
buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
if (buf) {
len = usb_string(udev, index, buf, MAX_USB_STRING_SIZE);
if (!smallbuf)
return buf;
memcpy(smallbuf, buf, len);
-diff -urNp linux-2.6.34/drivers/usb/host/ehci-pci.c linux-2.6.34/drivers/usb/host/ehci-pci.c
---- linux-2.6.34/drivers/usb/host/ehci-pci.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/usb/host/ehci-pci.c 2010-07-01 20:45:15.000000000 -0400
-@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id
+diff -urNp linux-2.6.34.1/drivers/usb/host/ehci-pci.c linux-2.6.34.1/drivers/usb/host/ehci-pci.c
+--- linux-2.6.34.1/drivers/usb/host/ehci-pci.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/usb/host/ehci-pci.c 2010-07-07 09:04:54.000000000 -0400
+@@ -415,7 +415,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.34/drivers/usb/host/uhci-hcd.c linux-2.6.34/drivers/usb/host/uhci-hcd.c
---- linux-2.6.34/drivers/usb/host/uhci-hcd.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/usb/host/uhci-hcd.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/usb/host/uhci-hcd.c linux-2.6.34.1/drivers/usb/host/uhci-hcd.c
+--- linux-2.6.34.1/drivers/usb/host/uhci-hcd.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/usb/host/uhci-hcd.c 2010-07-07 09:04:54.000000000 -0400
@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p
/* handle any USB UHCI controller */
PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
};
MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
-diff -urNp linux-2.6.34/drivers/usb/mon/mon_main.c linux-2.6.34/drivers/usb/mon/mon_main.c
---- linux-2.6.34/drivers/usb/mon/mon_main.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/usb/mon/mon_main.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/usb/mon/mon_main.c linux-2.6.34.1/drivers/usb/mon/mon_main.c
+--- linux-2.6.34.1/drivers/usb/mon/mon_main.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/usb/mon/mon_main.c 2010-07-07 09:04:54.000000000 -0400
@@ -239,7 +239,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.34/drivers/usb/storage/debug.h linux-2.6.34/drivers/usb/storage/debug.h
---- linux-2.6.34/drivers/usb/storage/debug.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/usb/storage/debug.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/usb/storage/debug.h linux-2.6.34.1/drivers/usb/storage/debug.h
+--- linux-2.6.34.1/drivers/usb/storage/debug.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/usb/storage/debug.h 2010-07-07 09:04:54.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.34/drivers/usb/storage/usb.c linux-2.6.34/drivers/usb/storage/usb.c
---- linux-2.6.34/drivers/usb/storage/usb.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/usb/storage/usb.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/usb/storage/usb.c linux-2.6.34.1/drivers/usb/storage/usb.c
+--- linux-2.6.34.1/drivers/usb/storage/usb.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/usb/storage/usb.c 2010-07-07 09:04:54.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.34/drivers/usb/storage/usual-tables.c linux-2.6.34/drivers/usb/storage/usual-tables.c
---- linux-2.6.34/drivers/usb/storage/usual-tables.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/usb/storage/usual-tables.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/usb/storage/usual-tables.c linux-2.6.34.1/drivers/usb/storage/usual-tables.c
+--- linux-2.6.34.1/drivers/usb/storage/usual-tables.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/usb/storage/usual-tables.c 2010-07-07 09:04:54.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.34/drivers/uwb/wlp/messages.c linux-2.6.34/drivers/uwb/wlp/messages.c
---- linux-2.6.34/drivers/uwb/wlp/messages.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/uwb/wlp/messages.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/uwb/wlp/messages.c linux-2.6.34.1/drivers/uwb/wlp/messages.c
+--- linux-2.6.34.1/drivers/uwb/wlp/messages.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/uwb/wlp/messages.c 2010-07-07 09:04:54.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.34/drivers/video/atmel_lcdfb.c linux-2.6.34/drivers/video/atmel_lcdfb.c
---- linux-2.6.34/drivers/video/atmel_lcdfb.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/video/atmel_lcdfb.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/video/atmel_lcdfb.c linux-2.6.34.1/drivers/video/atmel_lcdfb.c
+--- linux-2.6.34.1/drivers/video/atmel_lcdfb.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/video/atmel_lcdfb.c 2010-07-07 09:04:54.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.34/drivers/video/aty/aty128fb.c linux-2.6.34/drivers/video/aty/aty128fb.c
---- linux-2.6.34/drivers/video/aty/aty128fb.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/video/aty/aty128fb.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/video/aty/aty128fb.c linux-2.6.34.1/drivers/video/aty/aty128fb.c
+--- linux-2.6.34.1/drivers/video/aty/aty128fb.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/video/aty/aty128fb.c 2010-07-07 09:04:54.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.34/drivers/video/aty/atyfb_base.c linux-2.6.34/drivers/video/aty/atyfb_base.c
---- linux-2.6.34/drivers/video/aty/atyfb_base.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/video/aty/atyfb_base.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/video/aty/atyfb_base.c linux-2.6.34.1/drivers/video/aty/atyfb_base.c
+--- linux-2.6.34.1/drivers/video/aty/atyfb_base.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/video/aty/atyfb_base.c 2010-07-07 09:04:54.000000000 -0400
@@ -2225,7 +2225,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.34/drivers/video/aty/radeon_backlight.c linux-2.6.34/drivers/video/aty/radeon_backlight.c
---- linux-2.6.34/drivers/video/aty/radeon_backlight.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/video/aty/radeon_backlight.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/video/aty/radeon_backlight.c linux-2.6.34.1/drivers/video/aty/radeon_backlight.c
+--- linux-2.6.34.1/drivers/video/aty/radeon_backlight.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/video/aty/radeon_backlight.c 2010-07-07 09:04:54.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.34/drivers/video/backlight/88pm860x_bl.c linux-2.6.34/drivers/video/backlight/88pm860x_bl.c
---- linux-2.6.34/drivers/video/backlight/88pm860x_bl.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/video/backlight/88pm860x_bl.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/video/backlight/88pm860x_bl.c linux-2.6.34.1/drivers/video/backlight/88pm860x_bl.c
+--- linux-2.6.34.1/drivers/video/backlight/88pm860x_bl.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/video/backlight/88pm860x_bl.c 2010-07-07 09:04:54.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.34/drivers/video/backlight/max8925_bl.c linux-2.6.34/drivers/video/backlight/max8925_bl.c
---- linux-2.6.34/drivers/video/backlight/max8925_bl.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/video/backlight/max8925_bl.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/video/backlight/max8925_bl.c linux-2.6.34.1/drivers/video/backlight/max8925_bl.c
+--- linux-2.6.34.1/drivers/video/backlight/max8925_bl.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/video/backlight/max8925_bl.c 2010-07-07 09:04:54.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.34/drivers/video/fbcmap.c linux-2.6.34/drivers/video/fbcmap.c
---- linux-2.6.34/drivers/video/fbcmap.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/video/fbcmap.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/video/fbcmap.c linux-2.6.34.1/drivers/video/fbcmap.c
+--- linux-2.6.34.1/drivers/video/fbcmap.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/video/fbcmap.c 2010-07-07 09:04:54.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.34/drivers/video/fbmem.c linux-2.6.34/drivers/video/fbmem.c
---- linux-2.6.34/drivers/video/fbmem.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/video/fbmem.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/video/fbmem.c linux-2.6.34.1/drivers/video/fbmem.c
+--- linux-2.6.34.1/drivers/video/fbmem.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/video/fbmem.c 2010-07-07 09:04:54.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.34/drivers/video/fbmon.c linux-2.6.34/drivers/video/fbmon.c
---- linux-2.6.34/drivers/video/fbmon.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/video/fbmon.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/video/fbmon.c linux-2.6.34.1/drivers/video/fbmon.c
+--- linux-2.6.34.1/drivers/video/fbmon.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/video/fbmon.c 2010-07-07 09:04:54.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.34/drivers/video/i810/i810_accel.c linux-2.6.34/drivers/video/i810/i810_accel.c
---- linux-2.6.34/drivers/video/i810/i810_accel.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/video/i810/i810_accel.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/video/i810/i810_accel.c linux-2.6.34.1/drivers/video/i810/i810_accel.c
+--- linux-2.6.34.1/drivers/video/i810/i810_accel.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/video/i810/i810_accel.c 2010-07-07 09:04:54.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.34/drivers/video/i810/i810_main.c linux-2.6.34/drivers/video/i810/i810_main.c
---- linux-2.6.34/drivers/video/i810/i810_main.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/video/i810/i810_main.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/video/i810/i810_main.c linux-2.6.34.1/drivers/video/i810/i810_main.c
+--- linux-2.6.34.1/drivers/video/i810/i810_main.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/video/i810/i810_main.c 2010-07-07 09:04:54.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.34/drivers/video/modedb.c linux-2.6.34/drivers/video/modedb.c
---- linux-2.6.34/drivers/video/modedb.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/video/modedb.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/video/modedb.c linux-2.6.34.1/drivers/video/modedb.c
+--- linux-2.6.34.1/drivers/video/modedb.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/video/modedb.c 2010-07-07 09:04:54.000000000 -0400
@@ -40,240 +40,240 @@ static const struct fb_videomode modedb[
{
/* 640x400 @ 70 Hz, 31.5 kHz hsync */
},
};
-diff -urNp linux-2.6.34/drivers/video/nvidia/nv_backlight.c linux-2.6.34/drivers/video/nvidia/nv_backlight.c
---- linux-2.6.34/drivers/video/nvidia/nv_backlight.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/video/nvidia/nv_backlight.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/video/nvidia/nv_backlight.c linux-2.6.34.1/drivers/video/nvidia/nv_backlight.c
+--- linux-2.6.34.1/drivers/video/nvidia/nv_backlight.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/video/nvidia/nv_backlight.c 2010-07-07 09:04:54.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.34/drivers/video/omap2/displays/panel-taal.c linux-2.6.34/drivers/video/omap2/displays/panel-taal.c
---- linux-2.6.34/drivers/video/omap2/displays/panel-taal.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/video/omap2/displays/panel-taal.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/video/omap2/displays/panel-taal.c linux-2.6.34.1/drivers/video/omap2/displays/panel-taal.c
+--- linux-2.6.34.1/drivers/video/omap2/displays/panel-taal.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/video/omap2/displays/panel-taal.c 2010-07-07 09:04:54.000000000 -0400
@@ -316,7 +316,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.34/drivers/video/riva/fbdev.c linux-2.6.34/drivers/video/riva/fbdev.c
---- linux-2.6.34/drivers/video/riva/fbdev.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/video/riva/fbdev.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/video/riva/fbdev.c linux-2.6.34.1/drivers/video/riva/fbdev.c
+--- linux-2.6.34.1/drivers/video/riva/fbdev.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/video/riva/fbdev.c 2010-07-07 09:04:54.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.34/drivers/video/uvesafb.c linux-2.6.34/drivers/video/uvesafb.c
---- linux-2.6.34/drivers/video/uvesafb.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/video/uvesafb.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/video/uvesafb.c linux-2.6.34.1/drivers/video/uvesafb.c
+--- linux-2.6.34.1/drivers/video/uvesafb.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/video/uvesafb.c 2010-07-07 09:04:54.000000000 -0400
@@ -19,6 +19,7 @@
#include <linux/io.h>
#include <linux/mutex.h>
}
framebuffer_release(info);
-diff -urNp linux-2.6.34/drivers/video/vesafb.c linux-2.6.34/drivers/video/vesafb.c
---- linux-2.6.34/drivers/video/vesafb.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/drivers/video/vesafb.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/drivers/video/vesafb.c linux-2.6.34.1/drivers/video/vesafb.c
+--- linux-2.6.34.1/drivers/video/vesafb.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/drivers/video/vesafb.c 2010-07-07 09:04:54.000000000 -0400
@@ -9,6 +9,7 @@
*/
if (info->screen_base)
iounmap(info->screen_base);
framebuffer_release(info);
-diff -urNp linux-2.6.34/fs/9p/vfs_inode.c linux-2.6.34/fs/9p/vfs_inode.c
---- linux-2.6.34/fs/9p/vfs_inode.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/9p/vfs_inode.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/9p/vfs_inode.c linux-2.6.34.1/fs/9p/vfs_inode.c
+--- linux-2.6.34.1/fs/9p/vfs_inode.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/9p/vfs_inode.c 2010-07-07 09:04:54.000000000 -0400
@@ -1067,7 +1067,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.34/fs/aio.c linux-2.6.34/fs/aio.c
---- linux-2.6.34/fs/aio.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/aio.c 2010-07-01 20:45:15.000000000 -0400
-@@ -129,7 +129,7 @@ static int aio_setup_ring(struct kioctx
+diff -urNp linux-2.6.34.1/fs/aio.c linux-2.6.34.1/fs/aio.c
+--- linux-2.6.34.1/fs/aio.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/aio.c 2010-07-07 09:04:54.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.34/fs/attr.c linux-2.6.34/fs/attr.c
---- linux-2.6.34/fs/attr.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/attr.c 2010-07-01 20:49:07.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/attr.c linux-2.6.34.1/fs/attr.c
+--- linux-2.6.34.1/fs/attr.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/attr.c 2010-07-07 09:04:54.000000000 -0400
@@ -82,6 +82,7 @@ int inode_newsize_ok(const struct inode
unsigned long limit;
if (limit != RLIM_INFINITY && offset > limit)
goto out_sig;
if (offset > inode->i_sb->s_maxbytes)
-diff -urNp linux-2.6.34/fs/autofs/root.c linux-2.6.34/fs/autofs/root.c
---- linux-2.6.34/fs/autofs/root.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/autofs/root.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/autofs/root.c linux-2.6.34.1/fs/autofs/root.c
+--- linux-2.6.34.1/fs/autofs/root.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/autofs/root.c 2010-07-07 09:04:54.000000000 -0400
@@ -300,7 +300,8 @@ static int autofs_root_symlink(struct in
set_bit(n,sbi->symlink_bitmap);
sl = &sbi->symlink[n];
if (!sl->data) {
clear_bit(n,sbi->symlink_bitmap);
unlock_kernel();
-diff -urNp linux-2.6.34/fs/autofs4/symlink.c linux-2.6.34/fs/autofs4/symlink.c
---- linux-2.6.34/fs/autofs4/symlink.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/autofs4/symlink.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/autofs4/symlink.c linux-2.6.34.1/fs/autofs4/symlink.c
+--- linux-2.6.34.1/fs/autofs4/symlink.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/autofs4/symlink.c 2010-07-07 09:04:54.000000000 -0400
@@ -15,7 +15,7 @@
static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
{
return NULL;
}
-diff -urNp linux-2.6.34/fs/befs/linuxvfs.c linux-2.6.34/fs/befs/linuxvfs.c
---- linux-2.6.34/fs/befs/linuxvfs.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/befs/linuxvfs.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/befs/linuxvfs.c linux-2.6.34.1/fs/befs/linuxvfs.c
+--- linux-2.6.34.1/fs/befs/linuxvfs.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/befs/linuxvfs.c 2010-07-07 09:04:54.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.34/fs/binfmt_aout.c linux-2.6.34/fs/binfmt_aout.c
---- linux-2.6.34/fs/binfmt_aout.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/binfmt_aout.c 2010-07-01 21:15:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/binfmt_aout.c linux-2.6.34.1/fs/binfmt_aout.c
+--- linux-2.6.34.1/fs/binfmt_aout.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/binfmt_aout.c 2010-07-07 09:04:54.000000000 -0400
@@ -16,6 +16,7 @@
#include <linux/string.h>
#include <linux/fs.h>
MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
fd_offset + ex.a_text);
up_write(¤t->mm->mmap_sem);
-diff -urNp linux-2.6.34/fs/binfmt_elf.c linux-2.6.34/fs/binfmt_elf.c
---- linux-2.6.34/fs/binfmt_elf.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/binfmt_elf.c 2010-07-01 21:17:45.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/binfmt_elf.c linux-2.6.34.1/fs/binfmt_elf.c
+--- linux-2.6.34.1/fs/binfmt_elf.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/binfmt_elf.c 2010-07-07 09:04:54.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.34/fs/binfmt_flat.c linux-2.6.34/fs/binfmt_flat.c
---- linux-2.6.34/fs/binfmt_flat.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/binfmt_flat.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/binfmt_flat.c linux-2.6.34.1/fs/binfmt_flat.c
+--- linux-2.6.34.1/fs/binfmt_flat.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/binfmt_flat.c 2010-07-07 09:04:54.000000000 -0400
@@ -564,7 +564,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.34/fs/binfmt_misc.c linux-2.6.34/fs/binfmt_misc.c
---- linux-2.6.34/fs/binfmt_misc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/binfmt_misc.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/binfmt_misc.c linux-2.6.34.1/fs/binfmt_misc.c
+--- linux-2.6.34.1/fs/binfmt_misc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/binfmt_misc.c 2010-07-07 09:04:54.000000000 -0400
@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl
static struct tree_descr bm_files[] = {
[2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
};
int err = simple_fill_super(sb, 0x42494e4d, bm_files);
if (!err)
-diff -urNp linux-2.6.34/fs/bio.c linux-2.6.34/fs/bio.c
---- linux-2.6.34/fs/bio.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/bio.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/bio.c linux-2.6.34.1/fs/bio.c
+--- linux-2.6.34.1/fs/bio.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/bio.c 2010-07-07 09:04:54.000000000 -0400
@@ -1213,7 +1213,7 @@ static void bio_copy_kern_endio(struct b
const int read = bio_data_dir(bio) == READ;
struct bio_map_data *bmd = bio->bi_private;
__bio_for_each_segment(bvec, bio, i, 0) {
char *addr = page_address(bvec->bv_page);
-diff -urNp linux-2.6.34/fs/block_dev.c linux-2.6.34/fs/block_dev.c
---- linux-2.6.34/fs/block_dev.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/block_dev.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/block_dev.c linux-2.6.34.1/fs/block_dev.c
+--- linux-2.6.34.1/fs/block_dev.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/block_dev.c 2010-07-07 09:04:54.000000000 -0400
@@ -681,7 +681,7 @@ int bd_claim(struct block_device *bdev,
else if (bdev->bd_contains == bdev)
res = 0; /* is a whole device which isn't held */
res = 0; /* is a partition of a device that is being partitioned */
else if (bdev->bd_contains->bd_holder != NULL)
res = -EBUSY; /* is a partition of a held device */
-diff -urNp linux-2.6.34/fs/btrfs/ctree.c linux-2.6.34/fs/btrfs/ctree.c
---- linux-2.6.34/fs/btrfs/ctree.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/btrfs/ctree.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/btrfs/ctree.c linux-2.6.34.1/fs/btrfs/ctree.c
+--- linux-2.6.34.1/fs/btrfs/ctree.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/btrfs/ctree.c 2010-07-07 09:04:54.000000000 -0400
@@ -3650,7 +3650,6 @@ setup_items_for_insert(struct btrfs_tran
ret = 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.34/fs/btrfs/disk-io.c linux-2.6.34/fs/btrfs/disk-io.c
---- linux-2.6.34/fs/btrfs/disk-io.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/btrfs/disk-io.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/btrfs/disk-io.c linux-2.6.34.1/fs/btrfs/disk-io.c
+--- linux-2.6.34.1/fs/btrfs/disk-io.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/btrfs/disk-io.c 2010-07-07 09:04:54.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.34/fs/btrfs/extent_io.h linux-2.6.34/fs/btrfs/extent_io.h
---- linux-2.6.34/fs/btrfs/extent_io.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/btrfs/extent_io.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/btrfs/extent_io.h linux-2.6.34.1/fs/btrfs/extent_io.h
+--- linux-2.6.34.1/fs/btrfs/extent_io.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/btrfs/extent_io.h 2010-07-07 09:04:55.000000000 -0400
@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s
struct bio *bio, int mirror_num,
unsigned long bio_flags);
};
struct extent_state {
-diff -urNp linux-2.6.34/fs/btrfs/free-space-cache.c linux-2.6.34/fs/btrfs/free-space-cache.c
---- linux-2.6.34/fs/btrfs/free-space-cache.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/btrfs/free-space-cache.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/btrfs/free-space-cache.c linux-2.6.34.1/fs/btrfs/free-space-cache.c
+--- linux-2.6.34.1/fs/btrfs/free-space-cache.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/btrfs/free-space-cache.c 2010-07-07 09:04:55.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.34/fs/btrfs/inode.c linux-2.6.34/fs/btrfs/inode.c
---- linux-2.6.34/fs/btrfs/inode.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/btrfs/inode.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/btrfs/inode.c linux-2.6.34.1/fs/btrfs/inode.c
+--- linux-2.6.34.1/fs/btrfs/inode.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/btrfs/inode.c 2010-07-07 09:04:55.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;
.fill_delalloc = run_delalloc_range,
.submit_bio_hook = btrfs_submit_bio_hook,
.merge_bio_hook = btrfs_merge_bio_hook,
-diff -urNp linux-2.6.34/fs/buffer.c linux-2.6.34/fs/buffer.c
---- linux-2.6.34/fs/buffer.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/buffer.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/buffer.c linux-2.6.34.1/fs/buffer.c
+--- linux-2.6.34.1/fs/buffer.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/buffer.c 2010-07-07 09:04:55.000000000 -0400
@@ -25,6 +25,7 @@
#include <linux/percpu.h>
#include <linux/slab.h>
#include <linux/blkdev.h>
#include <linux/file.h>
#include <linux/quotaops.h>
-diff -urNp linux-2.6.34/fs/cachefiles/bind.c linux-2.6.34/fs/cachefiles/bind.c
---- linux-2.6.34/fs/cachefiles/bind.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/cachefiles/bind.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/cachefiles/bind.c linux-2.6.34.1/fs/cachefiles/bind.c
+--- linux-2.6.34.1/fs/cachefiles/bind.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/cachefiles/bind.c 2010-07-07 09:04:55.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.34/fs/cachefiles/daemon.c linux-2.6.34/fs/cachefiles/daemon.c
---- linux-2.6.34/fs/cachefiles/daemon.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/cachefiles/daemon.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/cachefiles/daemon.c linux-2.6.34.1/fs/cachefiles/daemon.c
+--- linux-2.6.34.1/fs/cachefiles/daemon.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/cachefiles/daemon.c 2010-07-07 09:04:55.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.34/fs/cachefiles/rdwr.c linux-2.6.34/fs/cachefiles/rdwr.c
---- linux-2.6.34/fs/cachefiles/rdwr.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/cachefiles/rdwr.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/cachefiles/rdwr.c linux-2.6.34.1/fs/cachefiles/rdwr.c
+--- linux-2.6.34.1/fs/cachefiles/rdwr.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/cachefiles/rdwr.c 2010-07-07 09:04:55.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.34/fs/cifs/cifs_uniupr.h linux-2.6.34/fs/cifs/cifs_uniupr.h
---- linux-2.6.34/fs/cifs/cifs_uniupr.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/cifs/cifs_uniupr.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/cifs/cifs_uniupr.h linux-2.6.34.1/fs/cifs/cifs_uniupr.h
+--- linux-2.6.34.1/fs/cifs/cifs_uniupr.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/cifs/cifs_uniupr.h 2010-07-07 09:04:55.000000000 -0400
@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
{0x0490, 0x04cc, UniCaseRangeU0490},
{0x1e00, 0x1ffc, UniCaseRangeU1e00},
};
#endif
-diff -urNp linux-2.6.34/fs/cifs/link.c linux-2.6.34/fs/cifs/link.c
---- linux-2.6.34/fs/cifs/link.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/cifs/link.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/cifs/link.c linux-2.6.34.1/fs/cifs/link.c
+--- linux-2.6.34.1/fs/cifs/link.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/cifs/link.c 2010-07-07 09:04:55.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.34/fs/compat_binfmt_elf.c linux-2.6.34/fs/compat_binfmt_elf.c
---- linux-2.6.34/fs/compat_binfmt_elf.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/compat_binfmt_elf.c 2010-07-01 20:45:15.000000000 -0400
-@@ -30,11 +30,13 @@
- #undef elf_phdr
- #undef elf_shdr
- #undef elf_note
-+#undef elf_dyn
- #undef elf_addr_t
- #define elfhdr elf32_hdr
- #define elf_phdr elf32_phdr
- #define elf_shdr elf32_shdr
- #define elf_note elf32_note
-+#define elf_dyn Elf32_Dyn
- #define elf_addr_t Elf32_Addr
-
- /*
-diff -urNp linux-2.6.34/fs/compat.c linux-2.6.34/fs/compat.c
---- linux-2.6.34/fs/compat.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/compat.c 2010-07-01 20:45:16.000000000 -0400
-@@ -1409,14 +1409,12 @@ static int compat_copy_strings(int argc,
+diff -urNp linux-2.6.34.1/fs/compat.c linux-2.6.34.1/fs/compat.c
+--- linux-2.6.34.1/fs/compat.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/compat.c 2010-07-07 09:04:55.000000000 -0400
+@@ -1433,14 +1433,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) {
-@@ -1462,6 +1460,11 @@ int compat_do_execve(char * filename,
+@@ -1486,6 +1484,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;
-@@ -1498,6 +1501,14 @@ int compat_do_execve(char * filename,
+@@ -1522,6 +1525,14 @@ int compat_do_execve(char * filename,
bprm->filename = filename;
bprm->interp = filename;
retval = bprm_mm_init(bprm);
if (retval)
goto out_file;
-@@ -1527,9 +1538,40 @@ int compat_do_execve(char * filename,
+@@ -1551,9 +1562,40 @@ int compat_do_execve(char * filename,
if (retval < 0)
goto out;
/* execve succeeded */
current->fs->in_exec = 0;
-@@ -1540,6 +1582,14 @@ int compat_do_execve(char * filename,
+@@ -1564,6 +1606,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.34/fs/debugfs/inode.c linux-2.6.34/fs/debugfs/inode.c
---- linux-2.6.34/fs/debugfs/inode.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/debugfs/inode.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/compat_binfmt_elf.c linux-2.6.34.1/fs/compat_binfmt_elf.c
+--- linux-2.6.34.1/fs/compat_binfmt_elf.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/compat_binfmt_elf.c 2010-07-07 09:04:55.000000000 -0400
+@@ -30,11 +30,13 @@
+ #undef elf_phdr
+ #undef elf_shdr
+ #undef elf_note
++#undef elf_dyn
+ #undef elf_addr_t
+ #define elfhdr elf32_hdr
+ #define elf_phdr elf32_phdr
+ #define elf_shdr elf32_shdr
+ #define elf_note elf32_note
++#define elf_dyn Elf32_Dyn
+ #define elf_addr_t Elf32_Addr
+
+ /*
+diff -urNp linux-2.6.34.1/fs/debugfs/inode.c linux-2.6.34.1/fs/debugfs/inode.c
+--- linux-2.6.34.1/fs/debugfs/inode.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/debugfs/inode.c 2010-07-07 09:04:55.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.34/fs/dlm/lockspace.c linux-2.6.34/fs/dlm/lockspace.c
---- linux-2.6.34/fs/dlm/lockspace.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/dlm/lockspace.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/dlm/lockspace.c linux-2.6.34.1/fs/dlm/lockspace.c
+--- linux-2.6.34.1/fs/dlm/lockspace.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/dlm/lockspace.c 2010-07-07 09:04:55.000000000 -0400
@@ -200,7 +200,7 @@ static int dlm_uevent(struct kset *kset,
return 0;
}
.uevent = dlm_uevent,
};
-diff -urNp linux-2.6.34/fs/ecryptfs/inode.c linux-2.6.34/fs/ecryptfs/inode.c
---- linux-2.6.34/fs/ecryptfs/inode.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/ecryptfs/inode.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/ecryptfs/inode.c linux-2.6.34.1/fs/ecryptfs/inode.c
+--- linux-2.6.34.1/fs/ecryptfs/inode.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/ecryptfs/inode.c 2010-07-07 09:04:55.000000000 -0400
@@ -666,7 +666,7 @@ static int ecryptfs_readlink_lower(struc
old_fs = get_fs();
set_fs(get_ds());
if (!IS_ERR(buf)) {
/* Free the char* */
kfree(buf);
-diff -urNp linux-2.6.34/fs/ecryptfs/miscdev.c linux-2.6.34/fs/ecryptfs/miscdev.c
---- linux-2.6.34/fs/ecryptfs/miscdev.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/ecryptfs/miscdev.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/ecryptfs/miscdev.c linux-2.6.34.1/fs/ecryptfs/miscdev.c
+--- linux-2.6.34.1/fs/ecryptfs/miscdev.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/ecryptfs/miscdev.c 2010-07-07 09:04:55.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.34/fs/exec.c linux-2.6.34/fs/exec.c
---- linux-2.6.34/fs/exec.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/exec.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/exec.c linux-2.6.34.1/fs/exec.c
+--- linux-2.6.34.1/fs/exec.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/exec.c 2010-07-07 09:04:55.000000000 -0400
@@ -55,12 +55,24 @@
#include <linux/fsnotify.h>
#include <linux/fs_struct.h>
/*
* lock_kernel() because format_corename() is controlled by sysctl, which
* uses lock_kernel()
-diff -urNp linux-2.6.34/fs/ext2/balloc.c linux-2.6.34/fs/ext2/balloc.c
---- linux-2.6.34/fs/ext2/balloc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/ext2/balloc.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/ext2/balloc.c linux-2.6.34.1/fs/ext2/balloc.c
+--- linux-2.6.34.1/fs/ext2/balloc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/ext2/balloc.c 2010-07-07 09:04:55.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.34/fs/ext2/xattr.c linux-2.6.34/fs/ext2/xattr.c
---- linux-2.6.34/fs/ext2/xattr.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/ext2/xattr.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/ext2/xattr.c linux-2.6.34.1/fs/ext2/xattr.c
+--- linux-2.6.34.1/fs/ext2/xattr.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/ext2/xattr.c 2010-07-07 09:04:55.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.34/fs/ext3/balloc.c linux-2.6.34/fs/ext3/balloc.c
---- linux-2.6.34/fs/ext3/balloc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/ext3/balloc.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/ext3/balloc.c linux-2.6.34.1/fs/ext3/balloc.c
+--- linux-2.6.34.1/fs/ext3/balloc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/ext3/balloc.c 2010-07-07 09:04:55.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.34/fs/ext3/namei.c linux-2.6.34/fs/ext3/namei.c
---- linux-2.6.34/fs/ext3/namei.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/ext3/namei.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/ext3/namei.c linux-2.6.34.1/fs/ext3/namei.c
+--- linux-2.6.34.1/fs/ext3/namei.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/ext3/namei.c 2010-07-07 09:04:55.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.34/fs/ext3/xattr.c linux-2.6.34/fs/ext3/xattr.c
---- linux-2.6.34/fs/ext3/xattr.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/ext3/xattr.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/ext3/xattr.c linux-2.6.34.1/fs/ext3/xattr.c
+--- linux-2.6.34.1/fs/ext3/xattr.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/ext3/xattr.c 2010-07-07 09:04:55.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.34/fs/ext4/balloc.c linux-2.6.34/fs/ext4/balloc.c
---- linux-2.6.34/fs/ext4/balloc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/ext4/balloc.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/ext4/balloc.c linux-2.6.34.1/fs/ext4/balloc.c
+--- linux-2.6.34.1/fs/ext4/balloc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/ext4/balloc.c 2010-07-07 09:04:55.000000000 -0400
@@ -522,7 +522,7 @@ int ext4_has_free_blocks(struct ext4_sb_
/* Hm, nope. Are (enough) root reserved blocks available? */
if (sbi->s_resuid == current_fsuid() ||
if (free_blocks >= (nblocks + dirty_blocks))
return 1;
}
-diff -urNp linux-2.6.34/fs/ext4/ioctl.c linux-2.6.34/fs/ext4/ioctl.c
---- linux-2.6.34/fs/ext4/ioctl.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/ext4/ioctl.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/ext4/ioctl.c linux-2.6.34.1/fs/ext4/ioctl.c
+--- linux-2.6.34.1/fs/ext4/ioctl.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/ext4/ioctl.c 2010-07-07 09:04:55.000000000 -0400
@@ -230,6 +230,9 @@ setversion_out:
struct file *donor_filp;
int err;
if (!(filp->f_mode & FMODE_READ) ||
!(filp->f_mode & FMODE_WRITE))
return -EBADF;
-diff -urNp linux-2.6.34/fs/ext4/namei.c linux-2.6.34/fs/ext4/namei.c
---- linux-2.6.34/fs/ext4/namei.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/ext4/namei.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/ext4/namei.c linux-2.6.34.1/fs/ext4/namei.c
+--- linux-2.6.34.1/fs/ext4/namei.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/ext4/namei.c 2010-07-07 09:04:55.000000000 -0400
@@ -1197,7 +1197,7 @@ static struct ext4_dir_entry_2 *do_split
char *data1 = (*bh)->b_data, *data2;
unsigned split, move, size;
bh2 = ext4_append (handle, dir, &newblock, &err);
if (!(bh2)) {
-diff -urNp linux-2.6.34/fs/ext4/xattr.c linux-2.6.34/fs/ext4/xattr.c
---- linux-2.6.34/fs/ext4/xattr.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/ext4/xattr.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/ext4/xattr.c linux-2.6.34.1/fs/ext4/xattr.c
+--- linux-2.6.34.1/fs/ext4/xattr.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/ext4/xattr.c 2010-07-07 09:04:55.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.34/fs/fcntl.c linux-2.6.34/fs/fcntl.c
---- linux-2.6.34/fs/fcntl.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/fcntl.c 2010-07-01 21:14:22.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/fcntl.c linux-2.6.34.1/fs/fcntl.c
+--- linux-2.6.34.1/fs/fcntl.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/fcntl.c 2010-07-07 09:04:55.000000000 -0400
@@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in
switch (cmd) {
case F_DUPFD:
rcu_read_unlock();
return ret;
}
-diff -urNp linux-2.6.34/fs/fifo.c linux-2.6.34/fs/fifo.c
---- linux-2.6.34/fs/fifo.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/fifo.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/fifo.c linux-2.6.34.1/fs/fifo.c
+--- linux-2.6.34.1/fs/fifo.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/fifo.c 2010-07-07 09:04:55.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.34/fs/file.c linux-2.6.34/fs/file.c
---- linux-2.6.34/fs/file.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/file.c 2010-07-01 20:51:03.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/file.c linux-2.6.34.1/fs/file.c
+--- linux-2.6.34.1/fs/file.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/file.c 2010-07-07 09:04:55.000000000 -0400
@@ -14,6 +14,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
if (nr >= rlimit(RLIMIT_NOFILE))
return -EMFILE;
-diff -urNp linux-2.6.34/fs/fs_struct.c linux-2.6.34/fs/fs_struct.c
---- linux-2.6.34/fs/fs_struct.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/fs_struct.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/fs_struct.c linux-2.6.34.1/fs/fs_struct.c
+--- linux-2.6.34.1/fs/fs_struct.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/fs_struct.c 2010-07-07 09:04:55.000000000 -0400
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
write_unlock(&fs->lock);
task_unlock(current);
-diff -urNp linux-2.6.34/fs/fuse/control.c linux-2.6.34/fs/fuse/control.c
---- linux-2.6.34/fs/fuse/control.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/fuse/control.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/fuse/control.c linux-2.6.34.1/fs/fuse/control.c
+--- linux-2.6.34.1/fs/fuse/control.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/fuse/control.c 2010-07-07 09:04:55.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.34/fs/fuse/cuse.c linux-2.6.34/fs/fuse/cuse.c
---- linux-2.6.34/fs/fuse/cuse.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/fuse/cuse.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/fuse/cuse.c linux-2.6.34.1/fs/fuse/cuse.c
+--- linux-2.6.34.1/fs/fuse/cuse.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/fuse/cuse.c 2010-07-07 09:04:55.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.34/fs/fuse/dev.c linux-2.6.34/fs/fuse/dev.c
---- linux-2.6.34/fs/fuse/dev.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/fuse/dev.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/fuse/dev.c linux-2.6.34.1/fs/fuse/dev.c
+--- linux-2.6.34.1/fs/fuse/dev.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/fuse/dev.c 2010-07-07 09:04:55.000000000 -0400
@@ -745,7 +745,7 @@ __releases(&fc->lock)
* request_end(). Otherwise add it to the processing list, and set
* the 'sent' flag.
const struct file_operations fuse_dev_operations = {
.owner = THIS_MODULE,
.llseek = no_llseek,
-diff -urNp linux-2.6.34/fs/fuse/dir.c linux-2.6.34/fs/fuse/dir.c
---- linux-2.6.34/fs/fuse/dir.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/fuse/dir.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/fuse/dir.c linux-2.6.34.1/fs/fuse/dir.c
+--- linux-2.6.34.1/fs/fuse/dir.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/fuse/dir.c 2010-07-07 09:04:55.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.34/fs/fuse/fuse_i.h linux-2.6.34/fs/fuse/fuse_i.h
---- linux-2.6.34/fs/fuse/fuse_i.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/fuse/fuse_i.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/fuse/fuse_i.h linux-2.6.34.1/fs/fuse/fuse_i.h
+--- linux-2.6.34.1/fs/fuse/fuse_i.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/fuse/fuse_i.h 2010-07-07 09:04:55.000000000 -0400
@@ -521,6 +521,16 @@ extern const struct file_operations fuse
extern const struct dentry_operations fuse_dentry_operations;
/**
* Inode to nodeid comparison.
*/
-diff -urNp linux-2.6.34/fs/hfs/inode.c linux-2.6.34/fs/hfs/inode.c
---- linux-2.6.34/fs/hfs/inode.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/hfs/inode.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/hfs/inode.c linux-2.6.34.1/fs/hfs/inode.c
+--- linux-2.6.34.1/fs/hfs/inode.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/hfs/inode.c 2010-07-07 09:04:55.000000000 -0400
@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
if (S_ISDIR(main_inode->i_mode)) {
hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
sizeof(struct hfs_cat_file));
if (rec.type != HFS_CDR_FIL ||
-diff -urNp linux-2.6.34/fs/hfsplus/inode.c linux-2.6.34/fs/hfsplus/inode.c
---- linux-2.6.34/fs/hfsplus/inode.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/hfsplus/inode.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/hfsplus/inode.c linux-2.6.34.1/fs/hfsplus/inode.c
+--- linux-2.6.34.1/fs/hfsplus/inode.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/hfsplus/inode.c 2010-07-07 09:04:55.000000000 -0400
@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode
struct hfsplus_cat_folder *folder = &entry.folder;
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.34/fs/hugetlbfs/inode.c linux-2.6.34/fs/hugetlbfs/inode.c
---- linux-2.6.34/fs/hugetlbfs/inode.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/hugetlbfs/inode.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/hugetlbfs/inode.c linux-2.6.34.1/fs/hugetlbfs/inode.c
+--- linux-2.6.34.1/fs/hugetlbfs/inode.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/hugetlbfs/inode.c 2010-07-07 09:04:55.000000000 -0400
@@ -908,7 +908,7 @@ static struct file_system_type hugetlbfs
.kill_sb = kill_litter_super,
};
static int can_do_hugetlb_shm(void)
{
-diff -urNp linux-2.6.34/fs/ioctl.c linux-2.6.34/fs/ioctl.c
---- linux-2.6.34/fs/ioctl.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/ioctl.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/ioctl.c linux-2.6.34.1/fs/ioctl.c
+--- linux-2.6.34.1/fs/ioctl.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/ioctl.c 2010-07-07 09:04:55.000000000 -0400
@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
u64 phys, u64 len, u32 flags)
{
error = -EFAULT;
return error;
-diff -urNp linux-2.6.34/fs/jffs2/debug.h linux-2.6.34/fs/jffs2/debug.h
---- linux-2.6.34/fs/jffs2/debug.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/jffs2/debug.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/jffs2/debug.h linux-2.6.34.1/fs/jffs2/debug.h
+--- linux-2.6.34.1/fs/jffs2/debug.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/jffs2/debug.h 2010-07-07 09:04:55.000000000 -0400
@@ -52,13 +52,13 @@
#if CONFIG_JFFS2_FS_DEBUG > 0
#define D1(x) x
#endif
/* "Sanity" checks */
-diff -urNp linux-2.6.34/fs/jffs2/erase.c linux-2.6.34/fs/jffs2/erase.c
---- linux-2.6.34/fs/jffs2/erase.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/jffs2/erase.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/jffs2/erase.c linux-2.6.34.1/fs/jffs2/erase.c
+--- linux-2.6.34.1/fs/jffs2/erase.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/jffs2/erase.c 2010-07-07 09:04:55.000000000 -0400
@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
struct jffs2_unknown_node marker = {
.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
};
jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-2.6.34/fs/jffs2/summary.h linux-2.6.34/fs/jffs2/summary.h
---- linux-2.6.34/fs/jffs2/summary.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/jffs2/summary.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/jffs2/summary.h linux-2.6.34.1/fs/jffs2/summary.h
+--- linux-2.6.34.1/fs/jffs2/summary.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/jffs2/summary.h 2010-07-07 09:04:55.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.34/fs/jffs2/wbuf.c linux-2.6.34/fs/jffs2/wbuf.c
---- linux-2.6.34/fs/jffs2/wbuf.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/jffs2/wbuf.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/jffs2/wbuf.c linux-2.6.34.1/fs/jffs2/wbuf.c
+--- linux-2.6.34.1/fs/jffs2/wbuf.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/jffs2/wbuf.c 2010-07-07 09:04:55.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.34/fs/lockd/svc.c linux-2.6.34/fs/lockd/svc.c
---- linux-2.6.34/fs/lockd/svc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/lockd/svc.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/lockd/svc.c linux-2.6.34.1/fs/lockd/svc.c
+--- linux-2.6.34.1/fs/lockd/svc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/lockd/svc.c 2010-07-07 09:04:55.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.34/fs/locks.c linux-2.6.34/fs/locks.c
---- linux-2.6.34/fs/locks.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/locks.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/locks.c linux-2.6.34.1/fs/locks.c
+--- linux-2.6.34.1/fs/locks.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/locks.c 2010-07-07 09:04:55.000000000 -0400
@@ -2008,16 +2008,16 @@ void locks_remove_flock(struct file *fil
return;
}
lock_kernel();
-diff -urNp linux-2.6.34/fs/namei.c linux-2.6.34/fs/namei.c
---- linux-2.6.34/fs/namei.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/namei.c 2010-07-02 19:42:31.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/namei.c linux-2.6.34.1/fs/namei.c
+--- linux-2.6.34.1/fs/namei.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/namei.c 2010-07-07 09:04:55.000000000 -0400
@@ -547,7 +547,7 @@ __do_follow_link(struct path *path, stru
*p = dentry->d_inode->i_op->follow_link(dentry, nd);
error = PTR_ERR(*p);
exit6:
mnt_drop_write(oldnd.path.mnt);
exit5:
-diff -urNp linux-2.6.34/fs/namespace.c linux-2.6.34/fs/namespace.c
---- linux-2.6.34/fs/namespace.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/namespace.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/namespace.c linux-2.6.34.1/fs/namespace.c
+--- linux-2.6.34.1/fs/namespace.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/namespace.c 2010-07-07 09:04:55.000000000 -0400
@@ -1100,6 +1100,9 @@ static int do_umount(struct vfsmount *mn
if (!(sb->s_flags & MS_RDONLY))
retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
read_lock(¤t->fs->lock);
root = current->fs->root;
path_get(¤t->fs->root);
-diff -urNp linux-2.6.34/fs/nfs/inode.c linux-2.6.34/fs/nfs/inode.c
---- linux-2.6.34/fs/nfs/inode.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/nfs/inode.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/nfs/inode.c linux-2.6.34.1/fs/nfs/inode.c
+--- linux-2.6.34.1/fs/nfs/inode.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/nfs/inode.c 2010-07-07 09:04:55.000000000 -0400
@@ -897,16 +897,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.34/fs/nfs/nfs4proc.c linux-2.6.34/fs/nfs/nfs4proc.c
---- linux-2.6.34/fs/nfs/nfs4proc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/nfs/nfs4proc.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/nfs/nfs4proc.c linux-2.6.34.1/fs/nfs/nfs4proc.c
+--- linux-2.6.34.1/fs/nfs/nfs4proc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/nfs/nfs4proc.c 2010-07-07 09:04:55.000000000 -0400
@@ -1162,7 +1162,7 @@ static int _nfs4_do_open_reclaim(struct
static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
{
int err;
err = nfs4_set_lock_state(state, fl);
-diff -urNp linux-2.6.34/fs/nfsd/lockd.c linux-2.6.34/fs/nfsd/lockd.c
---- linux-2.6.34/fs/nfsd/lockd.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/nfsd/lockd.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/nfsd/lockd.c linux-2.6.34.1/fs/nfsd/lockd.c
+--- linux-2.6.34.1/fs/nfsd/lockd.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/nfsd/lockd.c 2010-07-07 09:04:55.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.34/fs/nfsd/nfsctl.c linux-2.6.34/fs/nfsd/nfsctl.c
---- linux-2.6.34/fs/nfsd/nfsctl.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/nfsd/nfsctl.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/nfsd/nfsctl.c linux-2.6.34.1/fs/nfsd/nfsctl.c
+--- linux-2.6.34.1/fs/nfsd/nfsctl.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/nfsd/nfsctl.c 2010-07-07 09:04:55.000000000 -0400
@@ -160,7 +160,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.34/fs/nfsd/vfs.c linux-2.6.34/fs/nfsd/vfs.c
---- linux-2.6.34/fs/nfsd/vfs.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/nfsd/vfs.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/nfsd/vfs.c linux-2.6.34.1/fs/nfsd/vfs.c
+--- linux-2.6.34.1/fs/nfsd/vfs.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/nfsd/vfs.c 2010-07-07 09:04:55.000000000 -0400
@@ -933,7 +933,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
} else {
oldfs = get_fs();
set_fs(oldfs);
if (host_err < 0)
goto out_nfserr;
-@@ -1541,7 +1541,7 @@ nfsd_readlink(struct svc_rqst *rqstp, st
+@@ -1542,7 +1542,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.34/fs/nls/nls_base.c linux-2.6.34/fs/nls/nls_base.c
---- linux-2.6.34/fs/nls/nls_base.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/nls/nls_base.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/nls/nls_base.c linux-2.6.34.1/fs/nls/nls_base.c
+--- linux-2.6.34.1/fs/nls/nls_base.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/nls/nls_base.c 2010-07-07 09:04:55.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.34/fs/ntfs/file.c linux-2.6.34/fs/ntfs/file.c
---- linux-2.6.34/fs/ntfs/file.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/ntfs/file.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/ntfs/file.c linux-2.6.34.1/fs/ntfs/file.c
+--- linux-2.6.34.1/fs/ntfs/file.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/ntfs/file.c 2010-07-07 09:04:55.000000000 -0400
@@ -2244,6 +2244,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.34/fs/ocfs2/localalloc.c linux-2.6.34/fs/ocfs2/localalloc.c
---- linux-2.6.34/fs/ocfs2/localalloc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/ocfs2/localalloc.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/ocfs2/localalloc.c linux-2.6.34.1/fs/ocfs2/localalloc.c
+--- linux-2.6.34.1/fs/ocfs2/localalloc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/ocfs2/localalloc.c 2010-07-07 09:04:55.000000000 -0400
@@ -1190,7 +1190,7 @@ static int ocfs2_local_alloc_slide_windo
goto bail;
}
status = 0;
bail:
-diff -urNp linux-2.6.34/fs/ocfs2/ocfs2.h linux-2.6.34/fs/ocfs2/ocfs2.h
---- linux-2.6.34/fs/ocfs2/ocfs2.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/ocfs2/ocfs2.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/ocfs2/ocfs2.h linux-2.6.34.1/fs/ocfs2/ocfs2.h
+--- linux-2.6.34.1/fs/ocfs2/ocfs2.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/ocfs2/ocfs2.h 2010-07-07 09:04:55.000000000 -0400
@@ -222,11 +222,11 @@ enum ocfs2_vol_state
struct ocfs2_alloc_stats
};
enum ocfs2_local_alloc_state
-diff -urNp linux-2.6.34/fs/ocfs2/suballoc.c linux-2.6.34/fs/ocfs2/suballoc.c
---- linux-2.6.34/fs/ocfs2/suballoc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/ocfs2/suballoc.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/ocfs2/suballoc.c linux-2.6.34.1/fs/ocfs2/suballoc.c
+--- linux-2.6.34.1/fs/ocfs2/suballoc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/ocfs2/suballoc.c 2010-07-07 09:04:55.000000000 -0400
@@ -616,7 +616,7 @@ static int ocfs2_reserve_suballoc_bits(s
mlog_errno(status);
goto bail;
}
}
if (status < 0) {
-diff -urNp linux-2.6.34/fs/ocfs2/super.c linux-2.6.34/fs/ocfs2/super.c
---- linux-2.6.34/fs/ocfs2/super.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/ocfs2/super.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/ocfs2/super.c linux-2.6.34.1/fs/ocfs2/super.c
+--- linux-2.6.34.1/fs/ocfs2/super.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/ocfs2/super.c 2010-07-07 09:04:55.000000000 -0400
@@ -287,11 +287,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
"%10s => GlobalAllocs: %d LocalAllocs: %d "
"SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
/* Copy the blockcheck stats from the superblock probe */
osb->osb_ecc_stats = *stats;
-diff -urNp linux-2.6.34/fs/ocfs2/symlink.c linux-2.6.34/fs/ocfs2/symlink.c
---- linux-2.6.34/fs/ocfs2/symlink.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/ocfs2/symlink.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/ocfs2/symlink.c linux-2.6.34.1/fs/ocfs2/symlink.c
+--- linux-2.6.34.1/fs/ocfs2/symlink.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/ocfs2/symlink.c 2010-07-07 09:04:55.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.34/fs/open.c linux-2.6.34/fs/open.c
---- linux-2.6.34/fs/open.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/open.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/open.c linux-2.6.34.1/fs/open.c
+--- linux-2.6.34.1/fs/open.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/open.c 2010-07-07 09:04:55.000000000 -0400
@@ -208,6 +208,9 @@ int do_truncate(struct dentry *dentry, l
if (length < 0)
return -EINVAL;
newattrs.ia_valid = ATTR_CTIME;
if (user != (uid_t) -1) {
newattrs.ia_valid |= ATTR_UID;
-diff -urNp linux-2.6.34/fs/pipe.c linux-2.6.34/fs/pipe.c
---- linux-2.6.34/fs/pipe.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/pipe.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/pipe.c linux-2.6.34.1/fs/pipe.c
+--- linux-2.6.34.1/fs/pipe.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/pipe.c 2010-07-07 09:04:56.000000000 -0400
@@ -401,9 +401,9 @@ redo:
}
if (bufs) /* More to do? */
inode->i_fop = &rdwr_pipefifo_fops;
/*
-diff -urNp linux-2.6.34/fs/proc/array.c linux-2.6.34/fs/proc/array.c
---- linux-2.6.34/fs/proc/array.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/proc/array.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/proc/Kconfig linux-2.6.34.1/fs/proc/Kconfig
+--- linux-2.6.34.1/fs/proc/Kconfig 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/proc/Kconfig 2010-07-07 09:04:56.000000000 -0400
+@@ -30,12 +30,12 @@ config PROC_FS
+
+ config PROC_KCORE
+ bool "/proc/kcore support" if !ARM
+- depends on PROC_FS && MMU
++ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
+
+ config PROC_VMCORE
+ bool "/proc/vmcore support (EXPERIMENTAL)"
+- depends on PROC_FS && CRASH_DUMP
+- default y
++ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
++ default n
+ help
+ Exports the dump image of crashed kernel in ELF format.
+
+@@ -59,8 +59,8 @@ config PROC_SYSCTL
+ limited in memory.
+
+ config PROC_PAGE_MONITOR
+- default y
+- depends on PROC_FS && MMU
++ default n
++ depends on PROC_FS && MMU && !GRKERNSEC
+ bool "Enable /proc page monitoring" if EMBEDDED
+ help
+ Various /proc files exist to monitor process memory utilization:
+diff -urNp linux-2.6.34.1/fs/proc/array.c linux-2.6.34.1/fs/proc/array.c
+--- linux-2.6.34.1/fs/proc/array.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/proc/array.c 2010-07-07 09:04:56.000000000 -0400
@@ -337,6 +337,21 @@ static void task_cpus_allowed(struct seq
seq_printf(m, "\n");
}
+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
+}
+#endif
-diff -urNp linux-2.6.34/fs/proc/base.c linux-2.6.34/fs/proc/base.c
---- linux-2.6.34/fs/proc/base.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/proc/base.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/proc/base.c linux-2.6.34.1/fs/proc/base.c
+--- linux-2.6.34.1/fs/proc/base.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/proc/base.c 2010-07-07 09:04:56.000000000 -0400
@@ -103,6 +103,22 @@ struct pid_entry {
union proc_op op;
};
ONE("stack", S_IRUSR, proc_pid_stack),
#endif
#ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-2.6.34/fs/proc/cmdline.c linux-2.6.34/fs/proc/cmdline.c
---- linux-2.6.34/fs/proc/cmdline.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/proc/cmdline.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/proc/cmdline.c linux-2.6.34.1/fs/proc/cmdline.c
+--- linux-2.6.34.1/fs/proc/cmdline.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/proc/cmdline.c 2010-07-07 09:04:56.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.34/fs/proc/devices.c linux-2.6.34/fs/proc/devices.c
---- linux-2.6.34/fs/proc/devices.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/proc/devices.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/proc/devices.c linux-2.6.34.1/fs/proc/devices.c
+--- linux-2.6.34.1/fs/proc/devices.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/proc/devices.c 2010-07-07 09:04:56.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.34/fs/proc/inode.c linux-2.6.34/fs/proc/inode.c
---- linux-2.6.34/fs/proc/inode.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/proc/inode.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/proc/inode.c linux-2.6.34.1/fs/proc/inode.c
+--- linux-2.6.34.1/fs/proc/inode.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/proc/inode.c 2010-07-07 09:04:56.000000000 -0400
@@ -435,7 +435,11 @@ struct inode *proc_get_inode(struct supe
if (de->mode) {
inode->i_mode = de->mode;
}
if (de->size)
inode->i_size = de->size;
-diff -urNp linux-2.6.34/fs/proc/internal.h linux-2.6.34/fs/proc/internal.h
---- linux-2.6.34/fs/proc/internal.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/proc/internal.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/proc/internal.h linux-2.6.34.1/fs/proc/internal.h
+--- linux-2.6.34.1/fs/proc/internal.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/proc/internal.h 2010-07-07 09:04:56.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.34/fs/proc/Kconfig linux-2.6.34/fs/proc/Kconfig
---- linux-2.6.34/fs/proc/Kconfig 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/proc/Kconfig 2010-07-01 20:45:16.000000000 -0400
-@@ -30,12 +30,12 @@ config PROC_FS
-
- config PROC_KCORE
- bool "/proc/kcore support" if !ARM
-- depends on PROC_FS && MMU
-+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
-
- config PROC_VMCORE
- bool "/proc/vmcore support (EXPERIMENTAL)"
-- depends on PROC_FS && CRASH_DUMP
-- default y
-+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
-+ default n
- help
- Exports the dump image of crashed kernel in ELF format.
-
-@@ -59,8 +59,8 @@ config PROC_SYSCTL
- limited in memory.
-
- config PROC_PAGE_MONITOR
-- default y
-- depends on PROC_FS && MMU
-+ default n
-+ depends on PROC_FS && MMU && !GRKERNSEC
- bool "Enable /proc page monitoring" if EMBEDDED
- help
- Various /proc files exist to monitor process memory utilization:
-diff -urNp linux-2.6.34/fs/proc/kcore.c linux-2.6.34/fs/proc/kcore.c
---- linux-2.6.34/fs/proc/kcore.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/proc/kcore.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/proc/kcore.c linux-2.6.34.1/fs/proc/kcore.c
+--- linux-2.6.34.1/fs/proc/kcore.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/proc/kcore.c 2010-07-07 09:04:56.000000000 -0400
@@ -542,6 +542,9 @@ read_kcore(struct file *file, char __use
static int open_kcore(struct inode *inode, struct file *filp)
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
if (kcore_need_update)
-diff -urNp linux-2.6.34/fs/proc/meminfo.c linux-2.6.34/fs/proc/meminfo.c
---- linux-2.6.34/fs/proc/meminfo.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/proc/meminfo.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/proc/meminfo.c linux-2.6.34.1/fs/proc/meminfo.c
+--- linux-2.6.34.1/fs/proc/meminfo.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/proc/meminfo.c 2010-07-07 09:04:56.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.34/fs/proc/nommu.c linux-2.6.34/fs/proc/nommu.c
---- linux-2.6.34/fs/proc/nommu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/proc/nommu.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/proc/nommu.c linux-2.6.34.1/fs/proc/nommu.c
+--- linux-2.6.34.1/fs/proc/nommu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/proc/nommu.c 2010-07-07 09:04:56.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.34/fs/proc/proc_net.c linux-2.6.34/fs/proc/proc_net.c
---- linux-2.6.34/fs/proc/proc_net.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/proc/proc_net.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/proc/proc_net.c linux-2.6.34.1/fs/proc/proc_net.c
+--- linux-2.6.34.1/fs/proc/proc_net.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/proc/proc_net.c 2010-07-07 09:04:56.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.34/fs/proc/proc_sysctl.c linux-2.6.34/fs/proc/proc_sysctl.c
---- linux-2.6.34/fs/proc/proc_sysctl.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/proc/proc_sysctl.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/proc/proc_sysctl.c linux-2.6.34.1/fs/proc/proc_sysctl.c
+--- linux-2.6.34.1/fs/proc/proc_sysctl.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/proc/proc_sysctl.c 2010-07-07 09:04:56.000000000 -0400
@@ -7,6 +7,8 @@
#include <linux/security.h>
#include "internal.h"
generic_fillattr(inode, stat);
if (table)
stat->mode = (stat->mode & S_IFMT) | table->mode;
-diff -urNp linux-2.6.34/fs/proc/root.c linux-2.6.34/fs/proc/root.c
---- linux-2.6.34/fs/proc/root.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/proc/root.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/proc/root.c linux-2.6.34.1/fs/proc/root.c
+--- linux-2.6.34.1/fs/proc/root.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/proc/root.c 2010-07-07 09:04:56.000000000 -0400
@@ -134,7 +134,15 @@ void __init proc_root_init(void)
#ifdef CONFIG_PROC_DEVICETREE
proc_device_tree_init();
proc_sys_init();
}
-diff -urNp linux-2.6.34/fs/proc/task_mmu.c linux-2.6.34/fs/proc/task_mmu.c
---- linux-2.6.34/fs/proc/task_mmu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/proc/task_mmu.c 2010-07-02 17:29:09.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/proc/task_mmu.c linux-2.6.34.1/fs/proc/task_mmu.c
+--- linux-2.6.34.1/fs/proc/task_mmu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/proc/task_mmu.c 2010-07-07 09:04:56.000000000 -0400
@@ -49,8 +49,13 @@ void task_mem(struct seq_file *m, struct
"VmExe:\t%8lu kB\n"
"VmLib:\t%8lu kB\n"
mss.resident >> 10,
(unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
mss.shared_clean >> 10,
-diff -urNp linux-2.6.34/fs/proc/task_nommu.c linux-2.6.34/fs/proc/task_nommu.c
---- linux-2.6.34/fs/proc/task_nommu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/proc/task_nommu.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/proc/task_nommu.c linux-2.6.34.1/fs/proc/task_nommu.c
+--- linux-2.6.34.1/fs/proc/task_nommu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/proc/task_nommu.c 2010-07-07 09:04:56.000000000 -0400
@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct
else
bytes += kobjsize(mm);
}
seq_putc(m, '\n');
-diff -urNp linux-2.6.34/fs/readdir.c linux-2.6.34/fs/readdir.c
---- linux-2.6.34/fs/readdir.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/readdir.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/readdir.c linux-2.6.34.1/fs/readdir.c
+--- linux-2.6.34.1/fs/readdir.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/readdir.c 2010-07-07 09:04:56.000000000 -0400
@@ -16,6 +16,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
buf.count = count;
buf.error = 0;
-diff -urNp linux-2.6.34/fs/reiserfs/do_balan.c linux-2.6.34/fs/reiserfs/do_balan.c
---- linux-2.6.34/fs/reiserfs/do_balan.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/reiserfs/do_balan.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/reiserfs/do_balan.c linux-2.6.34.1/fs/reiserfs/do_balan.c
+--- linux-2.6.34.1/fs/reiserfs/do_balan.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/reiserfs/do_balan.c 2010-07-07 09:04:56.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.34/fs/reiserfs/item_ops.c linux-2.6.34/fs/reiserfs/item_ops.c
---- linux-2.6.34/fs/reiserfs/item_ops.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/reiserfs/item_ops.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/reiserfs/item_ops.c linux-2.6.34.1/fs/reiserfs/item_ops.c
+--- linux-2.6.34.1/fs/reiserfs/item_ops.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/reiserfs/item_ops.c 2010-07-07 09:04:56.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.34/fs/reiserfs/procfs.c linux-2.6.34/fs/reiserfs/procfs.c
---- linux-2.6.34/fs/reiserfs/procfs.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/reiserfs/procfs.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/reiserfs/procfs.c linux-2.6.34.1/fs/reiserfs/procfs.c
+--- linux-2.6.34.1/fs/reiserfs/procfs.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/reiserfs/procfs.c 2010-07-07 09:04:56.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.34/fs/select.c linux-2.6.34/fs/select.c
---- linux-2.6.34/fs/select.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/select.c 2010-07-01 20:52:08.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/select.c linux-2.6.34.1/fs/select.c
+--- linux-2.6.34.1/fs/select.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/select.c 2010-07-07 09:04:56.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.34/fs/seq_file.c linux-2.6.34/fs/seq_file.c
---- linux-2.6.34/fs/seq_file.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/seq_file.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/seq_file.c linux-2.6.34.1/fs/seq_file.c
+--- linux-2.6.34.1/fs/seq_file.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/seq_file.c 2010-07-07 09:04:56.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.34/fs/smbfs/symlink.c linux-2.6.34/fs/smbfs/symlink.c
---- linux-2.6.34/fs/smbfs/symlink.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/smbfs/symlink.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/smbfs/symlink.c linux-2.6.34.1/fs/smbfs/symlink.c
+--- linux-2.6.34.1/fs/smbfs/symlink.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/smbfs/symlink.c 2010-07-07 09:04:56.000000000 -0400
@@ -56,7 +56,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.34/fs/splice.c linux-2.6.34/fs/splice.c
---- linux-2.6.34/fs/splice.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/splice.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/splice.c linux-2.6.34.1/fs/splice.c
+--- linux-2.6.34.1/fs/splice.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/splice.c 2010-07-07 09:04:56.000000000 -0400
@@ -186,7 +186,7 @@ ssize_t splice_to_pipe(struct pipe_inode
pipe_lock(pipe);
ret = -EAGAIN;
pipe_unlock(ipipe);
-diff -urNp linux-2.6.34/fs/sysfs/symlink.c linux-2.6.34/fs/sysfs/symlink.c
---- linux-2.6.34/fs/sysfs/symlink.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/sysfs/symlink.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/sysfs/symlink.c linux-2.6.34.1/fs/sysfs/symlink.c
+--- linux-2.6.34.1/fs/sysfs/symlink.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/sysfs/symlink.c 2010-07-07 09:04:56.000000000 -0400
@@ -243,7 +243,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.34/fs/udf/misc.c linux-2.6.34/fs/udf/misc.c
---- linux-2.6.34/fs/udf/misc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/udf/misc.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/udf/misc.c linux-2.6.34.1/fs/udf/misc.c
+--- linux-2.6.34.1/fs/udf/misc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/udf/misc.c 2010-07-07 09:04:56.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.34/fs/udf/udfdecl.h linux-2.6.34/fs/udf/udfdecl.h
---- linux-2.6.34/fs/udf/udfdecl.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/udf/udfdecl.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/udf/udfdecl.h linux-2.6.34.1/fs/udf/udfdecl.h
+--- linux-2.6.34.1/fs/udf/udfdecl.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/udf/udfdecl.h 2010-07-07 09:04:56.000000000 -0400
@@ -26,7 +26,7 @@ do { \
printk(f, ##a); \
} while (0)
#endif
#define udf_info(f, a...) \
-diff -urNp linux-2.6.34/fs/utimes.c linux-2.6.34/fs/utimes.c
---- linux-2.6.34/fs/utimes.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/utimes.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/utimes.c linux-2.6.34.1/fs/utimes.c
+--- linux-2.6.34.1/fs/utimes.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/utimes.c 2010-07-07 09:04:56.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.34/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.34/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.34/fs/xfs/linux-2.6/xfs_ioctl.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/xfs/linux-2.6/xfs_ioctl.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.34.1/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-2.6.34.1/fs/xfs/linux-2.6/xfs_ioctl.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/xfs/linux-2.6/xfs_ioctl.c 2010-07-07 09:04:56.000000000 -0400
@@ -136,7 +136,7 @@ xfs_find_handle(
}
copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
goto out_put;
-diff -urNp linux-2.6.34/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.34/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.34/fs/xfs/linux-2.6/xfs_iops.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/xfs/linux-2.6/xfs_iops.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.34.1/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.34.1/fs/xfs/linux-2.6/xfs_iops.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/xfs/linux-2.6/xfs_iops.c 2010-07-07 09:04:56.000000000 -0400
@@ -480,7 +480,7 @@ xfs_vn_put_link(
struct nameidata *nd,
void *p)
if (!IS_ERR(s))
kfree(s);
-diff -urNp linux-2.6.34/fs/xfs/xfs_bmap.c linux-2.6.34/fs/xfs/xfs_bmap.c
---- linux-2.6.34/fs/xfs/xfs_bmap.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/fs/xfs/xfs_bmap.c 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/fs/xfs/xfs_bmap.c linux-2.6.34.1/fs/xfs/xfs_bmap.c
+--- linux-2.6.34.1/fs/xfs/xfs_bmap.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/fs/xfs/xfs_bmap.c 2010-07-07 09:04:56.000000000 -0400
@@ -296,7 +296,7 @@ xfs_bmap_validate_ret(
int nmap,
int ret_nmap);
#endif /* DEBUG */
STATIC int
-diff -urNp linux-2.6.34/grsecurity/gracl_alloc.c linux-2.6.34/grsecurity/gracl_alloc.c
---- linux-2.6.34/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/gracl_alloc.c 2010-07-01 20:45:16.000000000 -0400
-@@ -0,0 +1,105 @@
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/gracl.h>
-+#include <linux/grsecurity.h>
-+
-+static unsigned long alloc_stack_next = 1;
-+static unsigned long alloc_stack_size = 1;
-+static void **alloc_stack;
+diff -urNp linux-2.6.34.1/grsecurity/Kconfig linux-2.6.34.1/grsecurity/Kconfig
+--- linux-2.6.34.1/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/Kconfig 2010-07-07 09:04:56.000000000 -0400
+@@ -0,0 +1,981 @@
++#
++# grecurity configuration
++#
+
-+static __inline__ int
-+alloc_pop(void)
-+{
-+ if (alloc_stack_next == 1)
-+ return 0;
++menu "Grsecurity"
+
-+ kfree(alloc_stack[alloc_stack_next - 2]);
++config GRKERNSEC
++ bool "Grsecurity"
++ select CRYPTO
++ select CRYPTO_SHA256
++ help
++ If you say Y here, you will be able to configure many features
++ that will enhance the security of your system. It is highly
++ recommended that you say Y here and read through the help
++ for each option so that you fully understand the features and
++ can evaluate their usefulness for your machine.
+
-+ alloc_stack_next--;
++choice
++ prompt "Security Level"
++ depends on GRKERNSEC
++ default GRKERNSEC_CUSTOM
+
-+ return 1;
-+}
++config GRKERNSEC_LOW
++ bool "Low"
++ select GRKERNSEC_LINK
++ select GRKERNSEC_FIFO
++ select GRKERNSEC_EXECVE
++ select GRKERNSEC_RANDNET
++ select GRKERNSEC_DMESG
++ select GRKERNSEC_CHROOT
++ select GRKERNSEC_CHROOT_CHDIR
+
-+static __inline__ int
-+alloc_push(void *buf)
-+{
-+ if (alloc_stack_next >= alloc_stack_size)
-+ return 1;
++ help
++ If you choose this option, several of the grsecurity options will
++ be enabled that will give you greater protection against a number
++ of attacks, while assuring that none of your software will have any
++ conflicts with the additional security measures. If you run a lot
++ of unusual software, or you are having problems with the higher
++ security levels, you should say Y here. With this option, the
++ following features are enabled:
+
-+ alloc_stack[alloc_stack_next - 1] = buf;
++ - Linking restrictions
++ - FIFO restrictions
++ - Enforcing RLIMIT_NPROC on execve
++ - Restricted dmesg
++ - Enforced chdir("/") on chroot
++ - Runtime module disabling
+
-+ alloc_stack_next++;
++config GRKERNSEC_MEDIUM
++ bool "Medium"
++ select PAX
++ select PAX_EI_PAX
++ select PAX_PT_PAX_FLAGS
++ select PAX_HAVE_ACL_FLAGS
++ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
++ select GRKERNSEC_CHROOT
++ select GRKERNSEC_CHROOT_SYSCTL
++ select GRKERNSEC_LINK
++ select GRKERNSEC_FIFO
++ select GRKERNSEC_EXECVE
++ select GRKERNSEC_DMESG
++ select GRKERNSEC_RANDNET
++ select GRKERNSEC_FORKFAIL
++ select GRKERNSEC_TIME
++ select GRKERNSEC_SIGNAL
++ select GRKERNSEC_CHROOT
++ select GRKERNSEC_CHROOT_UNIX
++ select GRKERNSEC_CHROOT_MOUNT
++ select GRKERNSEC_CHROOT_PIVOT
++ select GRKERNSEC_CHROOT_DOUBLE
++ select GRKERNSEC_CHROOT_CHDIR
++ select GRKERNSEC_CHROOT_MKNOD
++ select GRKERNSEC_PROC
++ select GRKERNSEC_PROC_USERGROUP
++ select PAX_RANDUSTACK
++ select PAX_ASLR
++ select PAX_RANDMMAP
++ select PAX_REFCOUNT if (X86 || SPARC64)
++ select PAX_USERCOPY if ((X86 || SPARC32 || SPARC64 || PPC32 || PPC64) && (SLAB || SLUB || SLOB))
+
-+ return 0;
-+}
++ help
++ If you say Y here, several features in addition to those included
++ in the low additional security level will be enabled. These
++ features provide even more security to your system, though in rare
++ cases they may be incompatible with very old or poorly written
++ software. If you enable this option, make sure that your auth
++ service (identd) is running as gid 1001. With this option,
++ the following features (in addition to those provided in the
++ low additional security level) will be enabled:
+
-+void *
-+acl_alloc(unsigned long len)
-+{
-+ void *ret = NULL;
++ - Failed fork logging
++ - Time change logging
++ - Signal logging
++ - Deny mounts in chroot
++ - Deny double chrooting
++ - Deny sysctl writes in chroot
++ - Deny mknod in chroot
++ - Deny access to abstract AF_UNIX sockets out of chroot
++ - Deny pivot_root in chroot
++ - Denied writes of /dev/kmem, /dev/mem, and /dev/port
++ - /proc restrictions with special GID set to 10 (usually wheel)
++ - Address Space Layout Randomization (ASLR)
++ - Prevent exploitation of most refcount overflows
++ - Bounds checking of copying between the kernel and userland
+
-+ if (!len || len > PAGE_SIZE)
-+ goto out;
++config GRKERNSEC_HIGH
++ bool "High"
++ select GRKERNSEC_LINK
++ select GRKERNSEC_FIFO
++ select GRKERNSEC_EXECVE
++ select GRKERNSEC_DMESG
++ select GRKERNSEC_FORKFAIL
++ select GRKERNSEC_TIME
++ select GRKERNSEC_SIGNAL
++ select GRKERNSEC_CHROOT
++ select GRKERNSEC_CHROOT_SHMAT
++ select GRKERNSEC_CHROOT_UNIX
++ select GRKERNSEC_CHROOT_MOUNT
++ select GRKERNSEC_CHROOT_FCHDIR
++ select GRKERNSEC_CHROOT_PIVOT
++ select GRKERNSEC_CHROOT_DOUBLE
++ select GRKERNSEC_CHROOT_CHDIR
++ select GRKERNSEC_CHROOT_MKNOD
++ select GRKERNSEC_CHROOT_CAPS
++ select GRKERNSEC_CHROOT_SYSCTL
++ select GRKERNSEC_CHROOT_FINDTASK
++ select GRKERNSEC_PROC
++ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
++ select GRKERNSEC_HIDESYM
++ select GRKERNSEC_BRUTE
++ select GRKERNSEC_PROC_USERGROUP
++ select GRKERNSEC_KMEM
++ select GRKERNSEC_RESLOG
++ select GRKERNSEC_RANDNET
++ select GRKERNSEC_PROC_ADD
++ select GRKERNSEC_CHROOT_CHMOD
++ select GRKERNSEC_CHROOT_NICE
++ select GRKERNSEC_AUDIT_MOUNT
++ select GRKERNSEC_MODHARDEN if (MODULES)
++ select GRKERNSEC_HARDEN_PTRACE
++ select GRKERNSEC_VM86 if (X86_32)
++ select PAX
++ select PAX_RANDUSTACK
++ select PAX_ASLR
++ select PAX_RANDMMAP
++ select PAX_NOEXEC
++ select PAX_MPROTECT
++ select PAX_EI_PAX
++ select PAX_PT_PAX_FLAGS
++ select PAX_HAVE_ACL_FLAGS
++ select PAX_KERNEXEC if ((PPC32 || PPC64 || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN)
++ select PAX_MEMORY_UDEREF if (X86_32 && !XEN)
++ select PAX_RANDKSTACK if (X86_TSC && !X86_64)
++ select PAX_SEGMEXEC if (X86_32)
++ select PAX_PAGEEXEC
++ select PAX_EMUPLT if (ALPHA || PARISC || SPARC32 || SPARC64)
++ select PAX_EMUTRAMP if (PARISC)
++ select PAX_EMUSIGRT if (PARISC)
++ select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC)
++ select PAX_REFCOUNT if (X86 || SPARC64)
++ select PAX_USERCOPY if ((X86 || PPC32 || PPC64 || SPARC32 || SPARC64) && (SLAB || SLUB || SLOB))
++ help
++ If you say Y here, many of the features of grsecurity will be
++ enabled, which will protect you against many kinds of attacks
++ against your system. The heightened security comes at a cost
++ of an increased chance of incompatibilities with rare software
++ on your machine. Since this security level enables PaX, you should
++ view <http://pax.grsecurity.net> and read about the PaX
++ project. While you are there, download chpax and run it on
++ binaries that cause problems with PaX. Also remember that
++ since the /proc restrictions are enabled, you must run your
++ identd as gid 1001. This security level enables the following
++ features in addition to those listed in the low and medium
++ security levels:
+
-+ ret = kmalloc(len, GFP_KERNEL);
++ - Additional /proc restrictions
++ - Chmod restrictions in chroot
++ - No signals, ptrace, or viewing of processes outside of chroot
++ - Capability restrictions in chroot
++ - Deny fchdir out of chroot
++ - Priority restrictions in chroot
++ - Segmentation-based implementation of PaX
++ - Mprotect restrictions
++ - Removal of addresses from /proc/<pid>/[smaps|maps|stat]
++ - Kernel stack randomization
++ - Mount/unmount/remount logging
++ - Kernel symbol hiding
++ - Prevention of memory exhaustion-based exploits
++ - Hardening of module auto-loading
++ - Ptrace restrictions
++ - Restricted vm86 mode
+
-+ if (ret) {
-+ if (alloc_push(ret)) {
-+ kfree(ret);
-+ ret = NULL;
-+ }
-+ }
++config GRKERNSEC_CUSTOM
++ bool "Custom"
++ help
++ If you say Y here, you will be able to configure every grsecurity
++ option, which allows you to enable many more features that aren't
++ covered in the basic security levels. These additional features
++ include TPE, socket restrictions, and the sysctl system for
++ grsecurity. It is advised that you read through the help for
++ each option to determine its usefulness in your situation.
+
-+out:
-+ return ret;
-+}
++endchoice
+
-+void *
-+acl_alloc_num(unsigned long num, unsigned long len)
-+{
-+ if (!len || (num > (PAGE_SIZE / len)))
-+ return NULL;
++menu "Address Space Protection"
++depends on GRKERNSEC
+
-+ return acl_alloc(num * len);
-+}
++config GRKERNSEC_KMEM
++ bool "Deny writing to /dev/kmem, /dev/mem, and /dev/port"
++ help
++ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
++ be written to via mmap or otherwise to modify the running kernel.
++ /dev/port will also not be allowed to be opened. If you have module
++ support disabled, enabling this will close up four ways that are
++ currently used to insert malicious code into the running kernel.
++ Even with all these features enabled, we still highly recommend that
++ you use the RBAC system, as it is still possible for an attacker to
++ modify the running kernel through privileged I/O granted by ioperm/iopl.
++ If you are not using XFree86, you may be able to stop this additional
++ case by enabling the 'Disable privileged I/O' option. Though nothing
++ legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
++ but only to video memory, which is the only writing we allow in this
++ case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
++ not be allowed to mprotect it with PROT_WRITE later.
++ It is highly recommended that you say Y here if you meet all the
++ conditions above.
+
-+void
-+acl_free_all(void)
-+{
-+ if (gr_acl_is_enabled() || !alloc_stack)
-+ return;
++config GRKERNSEC_VM86
++ bool "Restrict VM86 mode"
++ depends on X86_32
+
-+ while (alloc_pop()) ;
++ help
++ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
++ make use of a special execution mode on 32bit x86 processors called
++ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
++ video cards and will still work with this option enabled. The purpose
++ of the option is to prevent exploitation of emulation errors in
++ virtualization of vm86 mode like the one discovered in VMWare in 2009.
++ Nearly all users should be able to enable this option.
+
-+ if (alloc_stack) {
-+ if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
-+ kfree(alloc_stack);
-+ else
-+ vfree(alloc_stack);
-+ }
++config GRKERNSEC_IO
++ bool "Disable privileged I/O"
++ depends on X86
++ select RTC_CLASS
++ select RTC_INTF_DEV
++ select RTC_DRV_CMOS
+
-+ alloc_stack = NULL;
-+ alloc_stack_size = 1;
-+ alloc_stack_next = 1;
++ help
++ If you say Y here, all ioperm and iopl calls will return an error.
++ Ioperm and iopl can be used to modify the running kernel.
++ Unfortunately, some programs need this access to operate properly,
++ the most notable of which are XFree86 and hwclock. hwclock can be
++ remedied by having RTC support in the kernel, so real-time
++ clock support is enabled if this option is enabled, to ensure
++ that hwclock operates correctly. XFree86 still will not
++ operate correctly with this option enabled, so DO NOT CHOOSE Y
++ IF YOU USE XFree86. If you use XFree86 and you still want to
++ protect your kernel against modification, use the RBAC system.
+
-+ return;
-+}
++config GRKERNSEC_PROC_MEMMAP
++ bool "Remove addresses from /proc/<pid>/[smaps|maps|stat]"
++ default y if (PAX_NOEXEC || PAX_ASLR)
++ depends on PAX_NOEXEC || PAX_ASLR
++ help
++ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
++ give no information about the addresses of its mappings if
++ PaX features that rely on random addresses are enabled on the task.
++ If you use PaX it is greatly recommended that you say Y here as it
++ closes up a hole that makes the full ASLR useless for suid
++ binaries.
+
-+int
-+acl_alloc_stack_init(unsigned long size)
-+{
-+ if ((size * sizeof (void *)) <= PAGE_SIZE)
-+ alloc_stack =
-+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
-+ else
-+ alloc_stack = (void **) vmalloc(size * sizeof (void *));
++config GRKERNSEC_BRUTE
++ bool "Deter exploit bruteforcing"
++ help
++ If you say Y here, attempts to bruteforce exploits against forking
++ daemons such as apache or sshd will be deterred. When a child of a
++ forking daemon is killed by PaX or crashes due to an illegal
++ instruction, the parent process will be delayed 30 seconds upon every
++ subsequent fork until the administrator is able to assess the
++ situation and restart the daemon. It is recommended that you also
++ enable signal logging in the auditing section so that logs are
++ generated when a process performs an illegal instruction.
+
-+ alloc_stack_size = size;
++config GRKERNSEC_MODHARDEN
++ bool "Harden module auto-loading"
++ depends on MODULES
++ help
++ If you say Y here, module auto-loading in response to use of some
++ feature implemented by an unloaded module will be restricted to
++ root users. Enabling this option helps defend against attacks
++ by unprivileged users who abuse the auto-loading behavior to
++ cause a vulnerable module to load that is then exploited.
+
-+ if (!alloc_stack)
-+ return 0;
-+ else
-+ return 1;
-+}
-diff -urNp linux-2.6.34/grsecurity/gracl.c linux-2.6.34/grsecurity/gracl.c
---- linux-2.6.34/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/gracl.c 2010-07-02 18:12:24.000000000 -0400
-@@ -0,0 +1,3899 @@
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/sched.h>
-+#include <linux/mm.h>
-+#include <linux/file.h>
-+#include <linux/fs.h>
-+#include <linux/namei.h>
-+#include <linux/mount.h>
-+#include <linux/tty.h>
-+#include <linux/proc_fs.h>
-+#include <linux/smp_lock.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/types.h>
-+#include <linux/sysctl.h>
-+#include <linux/netdevice.h>
-+#include <linux/ptrace.h>
-+#include <linux/gracl.h>
-+#include <linux/gralloc.h>
-+#include <linux/grsecurity.h>
-+#include <linux/grinternal.h>
-+#include <linux/pid_namespace.h>
-+#include <linux/fdtable.h>
-+#include <linux/percpu.h>
++ If this option prevents a legitimate use of auto-loading for a
++ non-root user, the administrator can execute modprobe manually
++ with the exact name of the module mentioned in the alert log.
++ Alternatively, the administrator can add the module to the list
++ of modules loaded at boot by modifying init scripts.
+
-+#include <asm/uaccess.h>
-+#include <asm/errno.h>
-+#include <asm/mman.h>
++ Modification of init scripts will most likely be needed on
++ Ubuntu servers with encrypted home directory support enabled,
++ as the first non-root user logging in will cause the ecb(aes),
++ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
+
-+static struct acl_role_db acl_role_set;
-+static struct name_db name_set;
-+static struct inodev_db inodev_set;
++config GRKERNSEC_HIDESYM
++ bool "Hide kernel symbols"
++ help
++ If you say Y here, getting information on loaded modules, and
++ displaying all kernel symbols through a syscall will be restricted
++ to users with CAP_SYS_MODULE. For software compatibility reasons,
++ /proc/kallsyms will be restricted to the root user. The RBAC
++ system can hide that entry even from root. Note that this option
++ is only effective provided the following conditions are met:
++ 1) The kernel using grsecurity is not precompiled by some distribution
++ 2) You are using the RBAC system and hiding other files such as your
++ kernel image and System.map. Alternatively, enabling this option
++ causes the permissions on /boot, /lib/modules, and the kernel
++ source directory to change at compile time to prevent
++ reading by non-root users.
++ If the above conditions are met, this option will aid in providing a
++ useful protection against local kernel exploitation of overflows
++ and arbitrary read/write vulnerabilities.
+
-+/* for keeping track of userspace pointers used for subjects, so we
-+ can share references in the kernel as well
-+*/
++endmenu
++menu "Role Based Access Control Options"
++depends on GRKERNSEC
+
-+static struct dentry *real_root;
-+static struct vfsmount *real_root_mnt;
++config GRKERNSEC_NO_RBAC
++ bool "Disable RBAC system"
++ help
++ If you say Y here, the /dev/grsec device will be removed from the kernel,
++ preventing the RBAC system from being enabled. You should only say Y
++ here if you have no intention of using the RBAC system, so as to prevent
++ an attacker with root access from misusing the RBAC system to hide files
++ and processes when loadable module support and /dev/[k]mem have been
++ locked down.
+
-+static struct acl_subj_map_db subj_map_set;
++config GRKERNSEC_ACL_HIDEKERN
++ bool "Hide kernel processes"
++ help
++ If you say Y here, all kernel threads will be hidden to all
++ processes but those whose subject has the "view hidden processes"
++ flag.
+
-+static struct acl_role_label *default_role;
++config GRKERNSEC_ACL_MAXTRIES
++ int "Maximum tries before password lockout"
++ default 3
++ help
++ This option enforces the maximum number of times a user can attempt
++ to authorize themselves with the grsecurity RBAC system before being
++ denied the ability to attempt authorization again for a specified time.
++ The lower the number, the harder it will be to brute-force a password.
+
-+static struct acl_role_label *role_list;
++config GRKERNSEC_ACL_TIMEOUT
++ int "Time to wait after max password tries, in seconds"
++ default 30
++ help
++ This option specifies the time the user must wait after attempting to
++ authorize to the RBAC system with the maximum number of invalid
++ passwords. The higher the number, the harder it will be to brute-force
++ a password.
+
-+static u16 acl_sp_role_value;
++endmenu
++menu "Filesystem Protections"
++depends on GRKERNSEC
+
-+extern char *gr_shared_page[4];
-+static DECLARE_MUTEX(gr_dev_sem);
-+DEFINE_RWLOCK(gr_inode_lock);
++config GRKERNSEC_PROC
++ bool "Proc restrictions"
++ help
++ If you say Y here, the permissions of the /proc filesystem
++ will be altered to enhance system security and privacy. You MUST
++ choose either a user only restriction or a user and group restriction.
++ Depending upon the option you choose, you can either restrict users to
++ see only the processes they themselves run, or choose a group that can
++ view all processes and files normally restricted to root if you choose
++ the "restrict to user only" option. NOTE: If you're running identd as
++ a non-root user, you will have to run it as the group you specify here.
+
-+struct gr_arg *gr_usermode;
++config GRKERNSEC_PROC_USER
++ bool "Restrict /proc to user only"
++ depends on GRKERNSEC_PROC
++ help
++ If you say Y here, non-root users will only be able to view their own
++ processes, and restricts them from viewing network-related information,
++ and viewing kernel symbol and module information.
+
-+static unsigned int gr_status __read_only = GR_STATUS_INIT;
++config GRKERNSEC_PROC_USERGROUP
++ bool "Allow special group"
++ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
++ help
++ If you say Y here, you will be able to select a group that will be
++ able to view all processes, network-related information, and
++ kernel and symbol information. This option is useful if you want
++ to run identd as a non-root user.
+
-+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
-+extern void gr_clear_learn_entries(void);
++config GRKERNSEC_PROC_GID
++ int "GID for special group"
++ depends on GRKERNSEC_PROC_USERGROUP
++ default 1001
+
-+#ifdef CONFIG_GRKERNSEC_RESLOG
-+extern void gr_log_resource(const struct task_struct *task,
-+ const int res, const unsigned long wanted, const int gt);
-+#endif
++config GRKERNSEC_PROC_ADD
++ bool "Additional restrictions"
++ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
++ help
++ If you say Y here, additional restrictions will be placed on
++ /proc that keep normal users from viewing device information and
++ slabinfo information that could be useful for exploits.
+
-+unsigned char *gr_system_salt;
-+unsigned char *gr_system_sum;
++config GRKERNSEC_LINK
++ bool "Linking restrictions"
++ help
++ If you say Y here, /tmp race exploits will be prevented, since users
++ will no longer be able to follow symlinks owned by other users in
++ world-writable +t directories (i.e. /tmp), unless the owner of the
++ symlink is the owner of the directory. users will also not be
++ able to hardlink to files they do not own. If the sysctl option is
++ enabled, a sysctl option with name "linking_restrictions" is created.
+
-+static struct sprole_pw **acl_special_roles = NULL;
-+static __u16 num_sprole_pws = 0;
++config GRKERNSEC_FIFO
++ bool "FIFO restrictions"
++ help
++ If you say Y here, users will not be able to write to FIFOs they don't
++ own in world-writable +t directories (i.e. /tmp), unless the owner of
++ the FIFO is the same owner of the directory it's held in. If the sysctl
++ option is enabled, a sysctl option with name "fifo_restrictions" is
++ created.
+
-+static struct acl_role_label *kernel_role = NULL;
++config GRKERNSEC_ROFS
++ bool "Runtime read-only mount protection"
++ help
++ If you say Y here, a sysctl option with name "romount_protect" will
++ be created. By setting this option to 1 at runtime, filesystems
++ will be protected in the following ways:
++ * No new writable mounts will be allowed
++ * Existing read-only mounts won't be able to be remounted read/write
++ * Write operations will be denied on all block devices
++ This option acts independently of grsec_lock: once it is set to 1,
++ it cannot be turned off. Therefore, please be mindful of the resulting
++ behavior if this option is enabled in an init script on a read-only
++ filesystem. This feature is mainly intended for secure embedded systems.
+
-+static unsigned int gr_auth_attempts = 0;
-+static unsigned long gr_auth_expires = 0UL;
++config GRKERNSEC_CHROOT
++ bool "Chroot jail restrictions"
++ help
++ If you say Y here, you will be able to choose several options that will
++ make breaking out of a chrooted jail much more difficult. If you
++ encounter no software incompatibilities with the following options, it
++ is recommended that you enable each one.
+
-+extern struct vfsmount *sock_mnt;
-+extern struct vfsmount *pipe_mnt;
-+extern struct vfsmount *shm_mnt;
-+#ifdef CONFIG_HUGETLBFS
-+extern struct vfsmount *hugetlbfs_vfsmount;
-+#endif
++config GRKERNSEC_CHROOT_MOUNT
++ bool "Deny mounts"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, processes inside a chroot will not be able to
++ mount or remount filesystems. If the sysctl option is enabled, a
++ sysctl option with name "chroot_deny_mount" is created.
+
-+static struct acl_object_label *fakefs_obj;
++config GRKERNSEC_CHROOT_DOUBLE
++ bool "Deny double-chroots"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, processes inside a chroot will not be able to chroot
++ again outside the chroot. This is a widely used method of breaking
++ out of a chroot jail and should not be allowed. If the sysctl
++ option is enabled, a sysctl option with name
++ "chroot_deny_chroot" is created.
+
-+extern int gr_init_uidset(void);
-+extern void gr_free_uidset(void);
-+extern void gr_remove_uid(uid_t uid);
-+extern int gr_find_uid(uid_t uid);
++config GRKERNSEC_CHROOT_PIVOT
++ bool "Deny pivot_root in chroot"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, processes inside a chroot will not be able to use
++ a function called pivot_root() that was introduced in Linux 2.3.41. It
++ works similar to chroot in that it changes the root filesystem. This
++ function could be misused in a chrooted process to attempt to break out
++ of the chroot, and therefore should not be allowed. If the sysctl
++ option is enabled, a sysctl option with name "chroot_deny_pivot" is
++ created.
+
-+extern spinlock_t vfsmount_lock;
++config GRKERNSEC_CHROOT_CHDIR
++ bool "Enforce chdir(\"/\") on all chroots"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, the current working directory of all newly-chrooted
++ applications will be set to the the root directory of the chroot.
++ The man page on chroot(2) states:
++ Note that this call does not change the current working
++ directory, so that `.' can be outside the tree rooted at
++ `/'. In particular, the super-user can escape from a
++ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
+
-+__inline__ int
-+gr_acl_is_enabled(void)
-+{
-+ return (gr_status & GR_READY);
-+}
++ It is recommended that you say Y here, since it's not known to break
++ any software. If the sysctl option is enabled, a sysctl option with
++ name "chroot_enforce_chdir" is created.
+
-+char gr_roletype_to_char(void)
-+{
-+ switch (current->role->roletype &
-+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
-+ GR_ROLE_SPECIAL)) {
-+ case GR_ROLE_DEFAULT:
-+ return 'D';
-+ case GR_ROLE_USER:
-+ return 'U';
-+ case GR_ROLE_GROUP:
-+ return 'G';
-+ case GR_ROLE_SPECIAL:
-+ return 'S';
-+ }
++config GRKERNSEC_CHROOT_CHMOD
++ bool "Deny (f)chmod +s"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, processes inside a chroot will not be able to chmod
++ or fchmod files to make them have suid or sgid bits. This protects
++ against another published method of breaking a chroot. If the sysctl
++ option is enabled, a sysctl option with name "chroot_deny_chmod" is
++ created.
+
-+ return 'X';
-+}
++config GRKERNSEC_CHROOT_FCHDIR
++ bool "Deny fchdir out of chroot"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, a well-known method of breaking chroots by fchdir'ing
++ to a file descriptor of the chrooting process that points to a directory
++ outside the filesystem will be stopped. If the sysctl option
++ is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
+
-+__inline__ int
-+gr_acl_tpe_check(void)
-+{
-+ if (unlikely(!(gr_status & GR_READY)))
-+ return 0;
-+ if (current->role->roletype & GR_ROLE_TPE)
-+ return 1;
-+ else
-+ return 0;
-+}
++config GRKERNSEC_CHROOT_MKNOD
++ bool "Deny mknod"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, processes inside a chroot will not be allowed to
++ mknod. The problem with using mknod inside a chroot is that it
++ would allow an attacker to create a device entry that is the same
++ as one on the physical root of your system, which could range from
++ anything from the console device to a device for your harddrive (which
++ they could then use to wipe the drive or steal data). It is recommended
++ that you say Y here, unless you run into software incompatibilities.
++ If the sysctl option is enabled, a sysctl option with name
++ "chroot_deny_mknod" is created.
+
-+int
-+gr_handle_rawio(const struct inode *inode)
-+{
-+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
-+ if (inode && S_ISBLK(inode->i_mode) &&
-+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
-+ !capable(CAP_SYS_RAWIO))
-+ return 1;
-+#endif
-+ return 0;
-+}
++config GRKERNSEC_CHROOT_SHMAT
++ bool "Deny shmat() out of chroot"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, processes inside a chroot will not be able to attach
++ to shared memory segments that were created outside of the chroot jail.
++ It is recommended that you say Y here. If the sysctl option is enabled,
++ a sysctl option with name "chroot_deny_shmat" is created.
+
-+static int
-+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
-+{
-+ if (likely(lena != lenb))
-+ return 0;
++config GRKERNSEC_CHROOT_UNIX
++ bool "Deny access to abstract AF_UNIX sockets out of chroot"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, processes inside a chroot will not be able to
++ connect to abstract (meaning not belonging to a filesystem) Unix
++ domain sockets that were bound outside of a chroot. It is recommended
++ that you say Y here. If the sysctl option is enabled, a sysctl option
++ with name "chroot_deny_unix" is created.
+
-+ return !memcmp(a, b, lena);
-+}
++config GRKERNSEC_CHROOT_FINDTASK
++ bool "Protect outside processes"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, processes inside a chroot will not be able to
++ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
++ getsid, or view any process outside of the chroot. If the sysctl
++ option is enabled, a sysctl option with name "chroot_findtask" is
++ created.
+
-+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;
++config GRKERNSEC_CHROOT_NICE
++ bool "Restrict priority changes"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, processes inside a chroot will not be able to raise
++ the priority of processes in the chroot, or alter the priority of
++ processes outside the chroot. This provides more security than simply
++ removing CAP_SYS_NICE from the process' capability set. If the
++ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
++ is created.
+
-+ spin_lock(&vfsmount_lock);
-+ *--end = '\0';
-+ buflen--;
++config GRKERNSEC_CHROOT_SYSCTL
++ bool "Deny sysctl writes"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, an attacker in a chroot will not be able to
++ write to sysctl entries, either by sysctl(2) or through a /proc
++ interface. It is strongly recommended that you say Y here. If the
++ sysctl option is enabled, a sysctl option with name
++ "chroot_deny_sysctl" is created.
+
-+ if (buflen < 1)
-+ goto Elong;
-+ /* Get '/' right */
-+ retval = end-1;
-+ *retval = '/';
++config GRKERNSEC_CHROOT_CAPS
++ bool "Capability restrictions"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, the capabilities on all root processes within a
++ chroot jail will be lowered to stop module insertion, raw i/o,
++ system and net admin tasks, rebooting the system, modifying immutable
++ files, modifying IPC owned by another, and changing the system time.
++ This is left an option because it can break some apps. Disable this
++ if your chrooted apps are having problems performing those kinds of
++ tasks. If the sysctl option is enabled, a sysctl option with
++ name "chroot_caps" is created.
+
-+ for (;;) {
-+ struct dentry * parent;
++endmenu
++menu "Kernel Auditing"
++depends on GRKERNSEC
+
-+ 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;
-+ }
++config GRKERNSEC_AUDIT_GROUP
++ bool "Single group for auditing"
++ help
++ If you say Y here, the exec, chdir, and (un)mount logging features
++ will only operate on a group you specify. This option is recommended
++ if you only want to watch certain users instead of having a large
++ amount of logs from the entire system. If the sysctl option is enabled,
++ a sysctl option with name "audit_group" is created.
+
-+out:
-+ spin_unlock(&vfsmount_lock);
-+ return retval;
++config GRKERNSEC_AUDIT_GID
++ int "GID for auditing"
++ depends on GRKERNSEC_AUDIT_GROUP
++ default 1007
+
-+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;
-+}
++config GRKERNSEC_EXECLOG
++ bool "Exec logging"
++ help
++ If you say Y here, all execve() calls will be logged (since the
++ other exec*() calls are frontends to execve(), all execution
++ will be logged). Useful for shell-servers that like to keep track
++ of their users. If the sysctl option is enabled, a sysctl option with
++ name "exec_logging" is created.
++ WARNING: This option when enabled will produce a LOT of logs, especially
++ on an active system.
+
-+static char *
-+gen_full_path(struct dentry *dentry, struct vfsmount *vfsmnt,
-+ struct dentry *root, struct vfsmount *rootmnt, char *buf, int buflen)
-+{
-+ char *retval;
++config GRKERNSEC_RESLOG
++ bool "Resource logging"
++ help
++ If you say Y here, all attempts to overstep resource limits will
++ be logged with the resource name, the requested size, and the current
++ limit. It is highly recommended that you say Y here. If the sysctl
++ option is enabled, a sysctl option with name "resource_logging" is
++ created. If the RBAC system is enabled, the sysctl value is ignored.
+
-+ retval = __our_d_path(dentry, vfsmnt, root, rootmnt, buf, buflen);
-+ if (unlikely(IS_ERR(retval)))
-+ retval = strcpy(buf, "<path too long>");
-+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
-+ retval[1] = '\0';
++config GRKERNSEC_CHROOT_EXECLOG
++ bool "Log execs within chroot"
++ help
++ If you say Y here, all executions inside a chroot jail will be logged
++ to syslog. This can cause a large amount of logs if certain
++ applications (eg. djb's daemontools) are installed on the system, and
++ is therefore left as an option. If the sysctl option is enabled, a
++ sysctl option with name "chroot_execlog" is created.
+
-+ return retval;
-+}
++config GRKERNSEC_AUDIT_PTRACE
++ bool "Ptrace logging"
++ help
++ If you say Y here, all attempts to attach to a process via ptrace
++ will be logged. If the sysctl option is enabled, a sysctl option
++ with name "audit_ptrace" is created.
+
-+static char *
-+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
-+ char *buf, int buflen)
-+{
-+ char *res;
++config GRKERNSEC_AUDIT_CHDIR
++ bool "Chdir logging"
++ help
++ If you say Y here, all chdir() calls will be logged. If the sysctl
++ option is enabled, a sysctl option with name "audit_chdir" is created.
+
-+ /* we can use real_root, 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);
++config GRKERNSEC_AUDIT_MOUNT
++ bool "(Un)Mount logging"
++ help
++ If you say Y here, all mounts and unmounts will be logged. If the
++ sysctl option is enabled, a sysctl option with name "audit_mount" is
++ created.
+
-+ return res;
-+}
++config GRKERNSEC_SIGNAL
++ bool "Signal logging"
++ help
++ If you say Y here, certain important signals will be logged, such as
++ SIGSEGV, which will as a result inform you of when a error in a program
++ occurred, which in some cases could mean a possible exploit attempt.
++ If the sysctl option is enabled, a sysctl option with name
++ "signal_logging" is created.
+
-+static char *
-+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
-+ char *buf, int buflen)
-+{
-+ char *res;
-+ struct dentry *root;
-+ struct vfsmount *rootmnt;
-+ struct task_struct *reaper = &init_task;
++config GRKERNSEC_FORKFAIL
++ bool "Fork failure logging"
++ help
++ If you say Y here, all failed fork() attempts will be logged.
++ This could suggest a fork bomb, or someone attempting to overstep
++ their process limit. If the sysctl option is enabled, a sysctl option
++ with name "forkfail_logging" is created.
+
-+ /* 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);
++config GRKERNSEC_TIME
++ bool "Time change logging"
++ help
++ If you say Y here, any changes of the system clock will be logged.
++ If the sysctl option is enabled, a sysctl option with name
++ "timechange_logging" is created.
+
-+ spin_lock(&dcache_lock);
-+ res = gen_full_path((struct dentry *)dentry, (struct vfsmount *)vfsmnt, root, rootmnt, buf, buflen);
-+ spin_unlock(&dcache_lock);
++config GRKERNSEC_PROC_IPADDR
++ bool "/proc/<pid>/ipaddr support"
++ help
++ If you say Y here, a new entry will be added to each /proc/<pid>
++ directory that contains the IP address of the person using the task.
++ The IP is carried across local TCP and AF_UNIX stream sockets.
++ This information can be useful for IDS/IPSes to perform remote response
++ to a local attack. The entry is readable by only the owner of the
++ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
++ the RBAC system), and thus does not create privacy concerns.
+
-+ dput(root);
-+ mntput(rootmnt);
-+ return res;
-+}
++config GRKERNSEC_AUDIT_TEXTREL
++ bool 'ELF text relocations logging (READ HELP)'
++ depends on PAX_MPROTECT
++ help
++ If you say Y here, text relocations will be logged with the filename
++ of the offending library or binary. The purpose of the feature is
++ to help Linux distribution developers get rid of libraries and
++ binaries that need text relocations which hinder the future progress
++ of PaX. Only Linux distribution developers should say Y here, and
++ never on a production machine, as this option creates an information
++ leak that could aid an attacker in defeating the randomization of
++ a single memory region. If the sysctl option is enabled, a sysctl
++ option with name "audit_textrel" is created.
+
-+static char *
-+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
-+{
-+ char *ret;
-+ spin_lock(&dcache_lock);
-+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
-+ PAGE_SIZE);
-+ spin_unlock(&dcache_lock);
-+ return ret;
-+}
++endmenu
+
-+char *
-+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
-+{
-+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
-+ PAGE_SIZE);
-+}
++menu "Executable Protections"
++depends on GRKERNSEC
+
-+char *
-+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
-+{
-+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
-+ PAGE_SIZE);
-+}
++config GRKERNSEC_EXECVE
++ bool "Enforce RLIMIT_NPROC on execs"
++ help
++ If you say Y here, users with a resource limit on processes will
++ have the value checked during execve() calls. The current system
++ only checks the system limit during fork() calls. If the sysctl option
++ is enabled, a sysctl option with name "execve_limiting" is created.
+
-+char *
-+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
-+{
-+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
-+ PAGE_SIZE);
-+}
++config GRKERNSEC_DMESG
++ bool "Dmesg(8) restriction"
++ help
++ If you say Y here, non-root users will not be able to use dmesg(8)
++ to view up to the last 4kb of messages in the kernel's log buffer.
++ If the sysctl option is enabled, a sysctl option with name "dmesg" is
++ created.
+
-+char *
-+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
-+{
-+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
-+ PAGE_SIZE);
-+}
++config GRKERNSEC_HARDEN_PTRACE
++ bool "Deter ptrace-based process snooping"
++ help
++ If you say Y here, TTY sniffers and other malicious monitoring
++ programs implemented through ptrace will be defeated. If you
++ have been using the RBAC system, this option has already been
++ enabled for several years for all users, with the ability to make
++ fine-grained exceptions.
+
-+char *
-+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
-+{
-+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
-+ PAGE_SIZE);
-+}
++ This option only affects the ability of non-root users to ptrace
++ processes that are not a descendent of the ptracing process.
++ This means that strace ./binary and gdb ./binary will still work,
++ but attaching to arbitrary processes will not. If the sysctl
++ option is enabled, a sysctl option with name "harden_ptrace" is
++ created.
+
-+__inline__ __u32
-+to_gr_audit(const __u32 reqmode)
-+{
-+ /* masks off auditable permission flags, then shifts them to create
-+ auditing flags, and adds the special case of append auditing if
-+ we're requesting write */
-+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
-+}
++config GRKERNSEC_TPE
++ bool "Trusted Path Execution (TPE)"
++ help
++ If you say Y here, you will be able to choose a gid to add to the
++ supplementary groups of users you want to mark as "untrusted."
++ These users will not be able to execute any files that are not in
++ root-owned directories writable only by root. If the sysctl option
++ is enabled, a sysctl option with name "tpe" is created.
+
-+struct acl_subject_label *
-+lookup_subject_map(const struct acl_subject_label *userp)
-+{
-+ unsigned int index = shash(userp, subj_map_set.s_size);
-+ struct subject_map *match;
++config GRKERNSEC_TPE_ALL
++ bool "Partially restrict non-root users"
++ depends on GRKERNSEC_TPE
++ help
++ If you say Y here, All non-root users other than the ones in the
++ group specified in the main TPE option will only be allowed to
++ execute files in directories they own that are not group or
++ world-writable, or in directories owned by root and writable only by
++ root. If the sysctl option is enabled, a sysctl option with name
++ "tpe_restrict_all" is created.
+
-+ match = subj_map_set.s_hash[index];
++config GRKERNSEC_TPE_INVERT
++ bool "Invert GID option"
++ depends on GRKERNSEC_TPE
++ help
++ If you say Y here, the group you specify in the TPE configuration will
++ decide what group TPE restrictions will be *disabled* for. This
++ option is useful if you want TPE restrictions to be applied to most
++ users on the system.
+
-+ while (match && match->user != userp)
-+ match = match->next;
++config GRKERNSEC_TPE_GID
++ int "GID for untrusted users"
++ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
++ default 1005
++ help
++ If you have selected the "Invert GID option" above, setting this
++ GID determines what group TPE restrictions will be *disabled* for.
++ If you have not selected the "Invert GID option" above, setting this
++ GID determines what group TPE restrictions will be *enabled* for.
++ If the sysctl option is enabled, a sysctl option with name "tpe_gid"
++ is created.
+
-+ if (match != NULL)
-+ return match->kernel;
-+ else
-+ return NULL;
-+}
++config GRKERNSEC_TPE_GID
++ int "GID for trusted users"
++ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
++ default 1005
++ help
++ If you have selected the "Invert GID option" above, setting this
++ GID determines what group TPE restrictions will be *disabled* for.
++ If you have not selected the "Invert GID option" above, setting this
++ GID determines what group TPE restrictions will be *enabled* for.
++ If the sysctl option is enabled, a sysctl option with name "tpe_gid"
++ is created.
+
-+static void
-+insert_subj_map_entry(struct subject_map *subjmap)
-+{
-+ unsigned int index = shash(subjmap->user, subj_map_set.s_size);
-+ struct subject_map **curr;
++endmenu
++menu "Network Protections"
++depends on GRKERNSEC
+
-+ subjmap->prev = NULL;
++config GRKERNSEC_RANDNET
++ bool "Larger entropy pools"
++ help
++ If you say Y here, the entropy pools used for many features of Linux
++ and grsecurity will be doubled in size. Since several grsecurity
++ features use additional randomness, it is recommended that you say Y
++ here. Saying Y here has a similar effect as modifying
++ /proc/sys/kernel/random/poolsize.
+
-+ curr = &subj_map_set.s_hash[index];
-+ if (*curr != NULL)
-+ (*curr)->prev = subjmap;
++config GRKERNSEC_BLACKHOLE
++ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
++ help
++ If you say Y here, neither TCP resets nor ICMP
++ destination-unreachable packets will be sent in response to packets
++ sent to ports for which no associated listening process exists.
++ This feature supports both IPV4 and IPV6 and exempts the
++ loopback interface from blackholing. Enabling this feature
++ makes a host more resilient to DoS attacks and reduces network
++ visibility against scanners.
+
-+ subjmap->next = *curr;
-+ *curr = subjmap;
++ The blackhole feature as-implemented is equivalent to the FreeBSD
++ blackhole feature, as it prevents RST responses to all packets, not
++ just SYNs. Under most application behavior this causes no
++ problems, but applications (like haproxy) may not close certain
++ connections in a way that cleanly terminates them on the remote
++ end, leaving the remote host in LAST_ACK state. Because of this
++ side-effect and to prevent intentional LAST_ACK DoSes, this
++ feature also adds automatic mitigation against such attacks.
++ The mitigation drastically reduces the amount of time a socket
++ can spend in LAST_ACK state. If you're using haproxy and not
++ all servers it connects to have this option enabled, consider
++ disabling this feature on the haproxy host.
+
-+ return;
-+}
++ If the sysctl option is enabled, two sysctl options with names
++ "ip_blackhole" and "lastack_retries" will be created.
++ While "ip_blackhole" takes the standard zero/non-zero on/off
++ toggle, "lastack_retries" uses the same kinds of values as
++ "tcp_retries1" and "tcp_retries2". The default value of 4
++ prevents a socket from lasting more than 45 seconds in LAST_ACK
++ state.
+
-+static struct acl_role_label *
-+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
-+ const gid_t gid)
-+{
-+ unsigned int index = rhash(uid, GR_ROLE_USER, acl_role_set.r_size);
-+ struct acl_role_label *match;
-+ struct role_allowed_ip *ipp;
-+ unsigned int x;
++config GRKERNSEC_SOCKET
++ bool "Socket restrictions"
++ help
++ If you say Y here, you will be able to choose from several options.
++ If you assign a GID on your system and add it to the supplementary
++ groups of users you want to restrict socket access to, this patch
++ will perform up to three things, based on the option(s) you choose.
+
-+ match = acl_role_set.r_hash[index];
++config GRKERNSEC_SOCKET_ALL
++ bool "Deny any sockets to group"
++ depends on GRKERNSEC_SOCKET
++ help
++ If you say Y here, you will be able to choose a GID of whose users will
++ be unable to connect to other hosts from your machine or run server
++ applications from your machine. If the sysctl option is enabled, a
++ sysctl option with name "socket_all" is created.
+
-+ while (match) {
-+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
-+ for (x = 0; x < match->domain_child_num; x++) {
-+ if (match->domain_children[x] == uid)
-+ goto found;
-+ }
-+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
-+ break;
-+ match = match->next;
-+ }
-+found:
-+ if (match == NULL) {
-+ try_group:
-+ index = rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size);
-+ match = acl_role_set.r_hash[index];
++config GRKERNSEC_SOCKET_ALL_GID
++ int "GID to deny all sockets for"
++ depends on GRKERNSEC_SOCKET_ALL
++ default 1004
++ help
++ Here you can choose the GID to disable socket access for. Remember to
++ add the users you want socket access disabled for to the GID
++ specified here. If the sysctl option is enabled, a sysctl option
++ with name "socket_all_gid" is created.
+
-+ while (match) {
-+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
-+ for (x = 0; x < match->domain_child_num; x++) {
-+ if (match->domain_children[x] == gid)
-+ goto found2;
-+ }
-+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
-+ break;
-+ match = match->next;
-+ }
-+found2:
-+ if (match == NULL)
-+ match = default_role;
-+ if (match->allowed_ips == NULL)
-+ return match;
-+ else {
-+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
-+ if (likely
-+ ((ntohl(task->signal->curr_ip) & ipp->netmask) ==
-+ (ntohl(ipp->addr) & ipp->netmask)))
-+ return match;
-+ }
-+ match = default_role;
-+ }
-+ } else if (match->allowed_ips == NULL) {
-+ return match;
-+ } else {
-+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
-+ if (likely
-+ ((ntohl(task->signal->curr_ip) & ipp->netmask) ==
-+ (ntohl(ipp->addr) & ipp->netmask)))
-+ return match;
-+ }
-+ goto try_group;
-+ }
++config GRKERNSEC_SOCKET_CLIENT
++ bool "Deny client sockets to group"
++ depends on GRKERNSEC_SOCKET
++ help
++ If you say Y here, you will be able to choose a GID of whose users will
++ be unable to connect to other hosts from your machine, but will be
++ able to run servers. If this option is enabled, all users in the group
++ you specify will have to use passive mode when initiating ftp transfers
++ from the shell on your machine. If the sysctl option is enabled, a
++ sysctl option with name "socket_client" is created.
+
-+ return match;
-+}
++config GRKERNSEC_SOCKET_CLIENT_GID
++ int "GID to deny client sockets for"
++ depends on GRKERNSEC_SOCKET_CLIENT
++ default 1003
++ help
++ Here you can choose the GID to disable client socket access for.
++ Remember to add the users you want client socket access disabled for to
++ the GID specified here. If the sysctl option is enabled, a sysctl
++ option with name "socket_client_gid" is created.
+
-+struct acl_subject_label *
-+lookup_acl_subj_label(const ino_t ino, const dev_t dev,
-+ const struct acl_role_label *role)
-+{
-+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
-+ struct acl_subject_label *match;
++config GRKERNSEC_SOCKET_SERVER
++ bool "Deny server sockets to group"
++ depends on GRKERNSEC_SOCKET
++ help
++ If you say Y here, you will be able to choose a GID of whose users will
++ be unable to run server applications from your machine. If the sysctl
++ option is enabled, a sysctl option with name "socket_server" is created.
+
-+ match = role->subj_hash[index];
++config GRKERNSEC_SOCKET_SERVER_GID
++ int "GID to deny server sockets for"
++ depends on GRKERNSEC_SOCKET_SERVER
++ default 1002
++ help
++ Here you can choose the GID to disable server socket access for.
++ Remember to add the users you want server socket access disabled for to
++ the GID specified here. If the sysctl option is enabled, a sysctl
++ option with name "socket_server_gid" is created.
+
-+ while (match && (match->inode != ino || match->device != dev ||
-+ (match->mode & GR_DELETED))) {
-+ match = match->next;
-+ }
++endmenu
++menu "Sysctl support"
++depends on GRKERNSEC && SYSCTL
+
-+ if (match && !(match->mode & GR_DELETED))
-+ return match;
-+ else
-+ return NULL;
-+}
++config GRKERNSEC_SYSCTL
++ bool "Sysctl support"
++ help
++ If you say Y here, you will be able to change the options that
++ grsecurity runs with at bootup, without having to recompile your
++ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
++ to enable (1) or disable (0) various features. All the sysctl entries
++ are mutable until the "grsec_lock" entry is set to a non-zero value.
++ All features enabled in the kernel configuration are disabled at boot
++ if you do not say Y to the "Turn on features by default" option.
++ All options should be set at startup, and the grsec_lock entry should
++ be set to a non-zero value after all the options are set.
++ *THIS IS EXTREMELY IMPORTANT*
+
-+struct acl_subject_label *
-+lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
-+ const struct acl_role_label *role)
-+{
-+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
-+ struct acl_subject_label *match;
++config GRKERNSEC_SYSCTL_DISTRO
++ bool "Extra sysctl support for distro makers (READ HELP)"
++ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
++ help
++ If you say Y here, additional sysctl options will be created
++ for features that affect processes running as root. Therefore,
++ it is critical when using this option that the grsec_lock entry be
++ enabled after boot. Only distros with prebuilt kernel packages
++ with this option enabled that can ensure grsec_lock is enabled
++ after boot should use this option.
++ *Failure to set grsec_lock after boot makes all grsec features
++ this option covers useless*
+
-+ match = role->subj_hash[index];
++ Currently this option creates the following sysctl entries:
++ "Disable Privileged I/O": "disable_priv_io"
+
-+ while (match && (match->inode != ino || match->device != dev ||
-+ !(match->mode & GR_DELETED))) {
-+ match = match->next;
-+ }
++config GRKERNSEC_SYSCTL_ON
++ bool "Turn on features by default"
++ depends on GRKERNSEC_SYSCTL
++ help
++ If you say Y here, instead of having all features enabled in the
++ kernel configuration disabled at boot time, the features will be
++ enabled at boot time. It is recommended you say Y here unless
++ there is some reason you would want all sysctl-tunable features to
++ be disabled by default. As mentioned elsewhere, it is important
++ to enable the grsec_lock entry once you have finished modifying
++ the sysctl entries.
+
-+ if (match && (match->mode & GR_DELETED))
-+ return match;
-+ else
-+ return NULL;
-+}
++endmenu
++menu "Logging Options"
++depends on GRKERNSEC
+
-+static struct acl_object_label *
-+lookup_acl_obj_label(const ino_t ino, const dev_t dev,
-+ const struct acl_subject_label *subj)
-+{
-+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
-+ struct acl_object_label *match;
++config GRKERNSEC_FLOODTIME
++ int "Seconds in between log messages (minimum)"
++ default 10
++ help
++ This option allows you to enforce the number of seconds between
++ grsecurity log messages. The default should be suitable for most
++ people, however, if you choose to change it, choose a value small enough
++ to allow informative logs to be produced, but large enough to
++ prevent flooding.
+
-+ match = subj->obj_hash[index];
++config GRKERNSEC_FLOODBURST
++ int "Number of messages in a burst (maximum)"
++ default 4
++ help
++ This option allows you to choose the maximum number of messages allowed
++ within the flood time interval you chose in a separate option. The
++ default should be suitable for most people, however if you find that
++ many of your logs are being interpreted as flooding, you may want to
++ raise this value.
+
-+ while (match && (match->inode != ino || match->device != dev ||
-+ (match->mode & GR_DELETED))) {
-+ match = match->next;
-+ }
++endmenu
+
-+ if (match && !(match->mode & GR_DELETED))
-+ return match;
-+ else
-+ return NULL;
-+}
++endmenu
+diff -urNp linux-2.6.34.1/grsecurity/Makefile linux-2.6.34.1/grsecurity/Makefile
+--- linux-2.6.34.1/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/Makefile 2010-07-07 09:04:56.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
++# into an RBAC system
++#
++# All code in this directory and various hooks inserted throughout the kernel
++# are copyright Brad Spengler - Open Source Security, Inc., and released
++# under the GPL v2 or higher
+
-+static struct acl_object_label *
-+lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
-+ const struct acl_subject_label *subj)
-+{
-+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
-+ struct acl_object_label *match;
++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
+
-+ match = subj->obj_hash[index];
++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 \
++ gracl_learn.o grsec_log.o
++obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
+
-+ while (match && (match->inode != ino || match->device != dev ||
-+ !(match->mode & GR_DELETED))) {
-+ match = match->next;
-+ }
++ifndef CONFIG_GRKERNSEC
++obj-y += grsec_disabled.o
++endif
+
-+ if (match && (match->mode & GR_DELETED))
-+ return match;
++ifdef CONFIG_GRKERNSEC_HIDESYM
++extra-y := grsec_hidesym.o
++$(obj)/grsec_hidesym.o:
++ @-chmod -f 500 /boot
++ @-chmod -f 500 /lib/modules
++ @-chmod -f 700 .
++ @echo ' grsec: protected kernel image paths'
++endif
+diff -urNp linux-2.6.34.1/grsecurity/gracl.c linux-2.6.34.1/grsecurity/gracl.c
+--- linux-2.6.34.1/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/gracl.c 2010-07-07 09:04:56.000000000 -0400
+@@ -0,0 +1,3899 @@
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/sched.h>
++#include <linux/mm.h>
++#include <linux/file.h>
++#include <linux/fs.h>
++#include <linux/namei.h>
++#include <linux/mount.h>
++#include <linux/tty.h>
++#include <linux/proc_fs.h>
++#include <linux/smp_lock.h>
++#include <linux/slab.h>
++#include <linux/vmalloc.h>
++#include <linux/types.h>
++#include <linux/sysctl.h>
++#include <linux/netdevice.h>
++#include <linux/ptrace.h>
++#include <linux/gracl.h>
++#include <linux/gralloc.h>
++#include <linux/grsecurity.h>
++#include <linux/grinternal.h>
++#include <linux/pid_namespace.h>
++#include <linux/fdtable.h>
++#include <linux/percpu.h>
+
-+ match = subj->obj_hash[index];
++#include <asm/uaccess.h>
++#include <asm/errno.h>
++#include <asm/mman.h>
+
-+ while (match && (match->inode != ino || match->device != dev ||
-+ (match->mode & GR_DELETED))) {
-+ match = match->next;
-+ }
++static struct acl_role_db acl_role_set;
++static struct name_db name_set;
++static struct inodev_db inodev_set;
+
-+ if (match && !(match->mode & GR_DELETED))
-+ return match;
-+ else
-+ return NULL;
-+}
++/* for keeping track of userspace pointers used for subjects, so we
++ can share references in the kernel as well
++*/
+
-+static struct name_entry *
-+lookup_name_entry(const char *name)
-+{
-+ unsigned int len = strlen(name);
-+ unsigned int key = full_name_hash(name, len);
-+ unsigned int index = key % name_set.n_size;
-+ struct name_entry *match;
++static struct dentry *real_root;
++static struct vfsmount *real_root_mnt;
+
-+ match = name_set.n_hash[index];
++static struct acl_subj_map_db subj_map_set;
+
-+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
-+ match = match->next;
++static struct acl_role_label *default_role;
+
-+ return match;
-+}
++static struct acl_role_label *role_list;
+
-+static struct name_entry *
-+lookup_name_entry_create(const char *name)
-+{
-+ unsigned int len = strlen(name);
-+ unsigned int key = full_name_hash(name, len);
-+ unsigned int index = key % name_set.n_size;
-+ struct name_entry *match;
++static u16 acl_sp_role_value;
+
-+ match = name_set.n_hash[index];
++extern char *gr_shared_page[4];
++static DECLARE_MUTEX(gr_dev_sem);
++DEFINE_RWLOCK(gr_inode_lock);
+
-+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
-+ !match->deleted))
-+ match = match->next;
++struct gr_arg *gr_usermode;
+
-+ if (match && match->deleted)
-+ return match;
++static unsigned int gr_status __read_only = GR_STATUS_INIT;
+
-+ match = name_set.n_hash[index];
++extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
++extern void gr_clear_learn_entries(void);
+
-+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
-+ match->deleted))
-+ match = match->next;
++#ifdef CONFIG_GRKERNSEC_RESLOG
++extern void gr_log_resource(const struct task_struct *task,
++ const int res, const unsigned long wanted, const int gt);
++#endif
+
-+ if (match && !match->deleted)
-+ return match;
-+ else
-+ return NULL;
-+}
++unsigned char *gr_system_salt;
++unsigned char *gr_system_sum;
+
-+static struct inodev_entry *
-+lookup_inodev_entry(const ino_t ino, const dev_t dev)
-+{
-+ unsigned int index = fhash(ino, dev, inodev_set.i_size);
-+ struct inodev_entry *match;
++static struct sprole_pw **acl_special_roles = NULL;
++static __u16 num_sprole_pws = 0;
+
-+ match = inodev_set.i_hash[index];
++static struct acl_role_label *kernel_role = NULL;
+
-+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
-+ match = match->next;
++static unsigned int gr_auth_attempts = 0;
++static unsigned long gr_auth_expires = 0UL;
+
-+ return match;
-+}
++extern struct vfsmount *sock_mnt;
++extern struct vfsmount *pipe_mnt;
++extern struct vfsmount *shm_mnt;
++#ifdef CONFIG_HUGETLBFS
++extern struct vfsmount *hugetlbfs_vfsmount;
++#endif
+
-+static void
-+insert_inodev_entry(struct inodev_entry *entry)
-+{
-+ unsigned int index = fhash(entry->nentry->inode, entry->nentry->device,
-+ inodev_set.i_size);
-+ struct inodev_entry **curr;
++static struct acl_object_label *fakefs_obj;
+
-+ entry->prev = NULL;
++extern int gr_init_uidset(void);
++extern void gr_free_uidset(void);
++extern void gr_remove_uid(uid_t uid);
++extern int gr_find_uid(uid_t uid);
+
-+ curr = &inodev_set.i_hash[index];
-+ if (*curr != NULL)
-+ (*curr)->prev = entry;
-+
-+ entry->next = *curr;
-+ *curr = entry;
++extern spinlock_t vfsmount_lock;
+
-+ return;
++__inline__ int
++gr_acl_is_enabled(void)
++{
++ return (gr_status & GR_READY);
+}
+
-+static void
-+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
++char gr_roletype_to_char(void)
+{
-+ unsigned int index =
-+ rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
-+ struct acl_role_label **curr;
-+ struct acl_role_label *tmp;
-+
-+ curr = &acl_role_set.r_hash[index];
-+
-+ /* if role was already inserted due to domains and already has
-+ a role in the same bucket as it attached, then we need to
-+ combine these two buckets
-+ */
-+ if (role->next) {
-+ tmp = role->next;
-+ while (tmp->next)
-+ tmp = tmp->next;
-+ tmp->next = *curr;
-+ } else
-+ role->next = *curr;
-+ *curr = role;
++ switch (current->role->roletype &
++ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
++ GR_ROLE_SPECIAL)) {
++ case GR_ROLE_DEFAULT:
++ return 'D';
++ case GR_ROLE_USER:
++ return 'U';
++ case GR_ROLE_GROUP:
++ return 'G';
++ case GR_ROLE_SPECIAL:
++ return 'S';
++ }
+
-+ return;
++ return 'X';
+}
+
-+static void
-+insert_acl_role_label(struct acl_role_label *role)
++__inline__ int
++gr_acl_tpe_check(void)
+{
-+ int i;
-+
-+ if (role_list == NULL) {
-+ role_list = role;
-+ role->prev = NULL;
-+ } else {
-+ role->prev = role_list;
-+ role_list = role;
-+ }
-+
-+ /* used for hash chains */
-+ role->next = NULL;
++ if (unlikely(!(gr_status & GR_READY)))
++ return 0;
++ if (current->role->roletype & GR_ROLE_TPE)
++ return 1;
++ else
++ return 0;
++}
+
-+ if (role->roletype & GR_ROLE_DOMAIN) {
-+ for (i = 0; i < role->domain_child_num; i++)
-+ __insert_acl_role_label(role, role->domain_children[i]);
-+ } else
-+ __insert_acl_role_label(role, role->uidgid);
++int
++gr_handle_rawio(const struct inode *inode)
++{
++#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
++ if (inode && S_ISBLK(inode->i_mode) &&
++ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
++ !capable(CAP_SYS_RAWIO))
++ return 1;
++#endif
++ return 0;
+}
-+
++
+static int
-+insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
++gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
+{
-+ struct name_entry **curr, *nentry;
-+ struct inodev_entry *ientry;
-+ unsigned int len = strlen(name);
-+ unsigned int key = full_name_hash(name, len);
-+ unsigned int index = key % name_set.n_size;
++ if (likely(lena != lenb))
++ return 0;
+
-+ curr = &name_set.n_hash[index];
++ return !memcmp(a, b, lena);
++}
+
-+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
-+ curr = &((*curr)->next);
++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;
+
-+ if (*curr != NULL)
-+ return 1;
++ spin_lock(&vfsmount_lock);
++ *--end = '\0';
++ buflen--;
+
-+ nentry = acl_alloc(sizeof (struct name_entry));
-+ if (nentry == NULL)
-+ return 0;
-+ ientry = acl_alloc(sizeof (struct inodev_entry));
-+ if (ientry == NULL)
-+ return 0;
-+ ientry->nentry = nentry;
++ if (buflen < 1)
++ goto Elong;
++ /* Get '/' right */
++ retval = end-1;
++ *retval = '/';
+
-+ nentry->key = key;
-+ nentry->name = name;
-+ nentry->inode = inode;
-+ nentry->device = device;
-+ nentry->len = len;
-+ nentry->deleted = deleted;
++ for (;;) {
++ struct dentry * parent;
+
-+ nentry->prev = NULL;
-+ curr = &name_set.n_hash[index];
-+ if (*curr != NULL)
-+ (*curr)->prev = nentry;
-+ nentry->next = *curr;
-+ *curr = nentry;
++ 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;
++ }
+
-+ /* insert us into the table searchable by inode/dev */
-+ insert_inodev_entry(ientry);
++out:
++ spin_unlock(&vfsmount_lock);
++ return retval;
+
-+ return 1;
++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 void
-+insert_acl_obj_label(struct acl_object_label *obj,
-+ struct acl_subject_label *subj)
++static char *
++gen_full_path(struct dentry *dentry, struct vfsmount *vfsmnt,
++ struct dentry *root, struct vfsmount *rootmnt, char *buf, int buflen)
+{
-+ unsigned int index =
-+ fhash(obj->inode, obj->device, subj->obj_hash_size);
-+ struct acl_object_label **curr;
++ char *retval;
+
-+
-+ obj->prev = NULL;
++ retval = __our_d_path(dentry, vfsmnt, root, rootmnt, buf, buflen);
++ if (unlikely(IS_ERR(retval)))
++ retval = strcpy(buf, "<path too long>");
++ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
++ retval[1] = '\0';
+
-+ curr = &subj->obj_hash[index];
-+ if (*curr != NULL)
-+ (*curr)->prev = obj;
++ return retval;
++}
+
-+ obj->next = *curr;
-+ *curr = obj;
++static char *
++__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
++ char *buf, int buflen)
++{
++ char *res;
+
-+ return;
++ /* we can use real_root, 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);
++
++ return res;
+}
+
-+static void
-+insert_acl_subj_label(struct acl_subject_label *obj,
-+ struct acl_role_label *role)
++static char *
++d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
++ char *buf, int buflen)
+{
-+ unsigned int index = fhash(obj->inode, obj->device, role->subj_hash_size);
-+ struct acl_subject_label **curr;
-+
-+ obj->prev = NULL;
++ char *res;
++ struct dentry *root;
++ struct vfsmount *rootmnt;
++ struct task_struct *reaper = &init_task;
+
-+ curr = &role->subj_hash[index];
-+ if (*curr != NULL)
-+ (*curr)->prev = obj;
++ /* 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);
+
-+ obj->next = *curr;
-+ *curr = obj;
++ spin_lock(&dcache_lock);
++ res = gen_full_path((struct dentry *)dentry, (struct vfsmount *)vfsmnt, root, rootmnt, buf, buflen);
++ spin_unlock(&dcache_lock);
+
-+ return;
++ dput(root);
++ mntput(rootmnt);
++ return res;
+}
+
-+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
-+
-+static void *
-+create_table(__u32 * len, int elementsize)
++static char *
++gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
+{
-+ unsigned int table_sizes[] = {
-+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
-+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
-+ 4194301, 8388593, 16777213, 33554393, 67108859
-+ };
-+ void *newtable = NULL;
-+ unsigned int pwr = 0;
-+
-+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
-+ table_sizes[pwr] <= *len)
-+ pwr++;
++ char *ret;
++ spin_lock(&dcache_lock);
++ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
++ PAGE_SIZE);
++ spin_unlock(&dcache_lock);
++ return ret;
++}
+
-+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
-+ return newtable;
++char *
++gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
++{
++ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
++ PAGE_SIZE);
++}
+
-+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
-+ newtable =
-+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
-+ else
-+ newtable = vmalloc(table_sizes[pwr] * elementsize);
++char *
++gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
++{
++ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
++ PAGE_SIZE);
++}
+
-+ *len = table_sizes[pwr];
++char *
++gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
++{
++ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
++ PAGE_SIZE);
++}
+
-+ return newtable;
++char *
++gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
++{
++ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
++ PAGE_SIZE);
+}
+
-+static int
-+init_variables(const struct gr_arg *arg)
++char *
++gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
+{
-+ struct task_struct *reaper = &init_task;
-+ unsigned int stacksize;
++ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
++ PAGE_SIZE);
++}
++
++__inline__ __u32
++to_gr_audit(const __u32 reqmode)
++{
++ /* masks off auditable permission flags, then shifts them to create
++ auditing flags, and adds the special case of append auditing if
++ we're requesting write */
++ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
++}
++
++struct acl_subject_label *
++lookup_subject_map(const struct acl_subject_label *userp)
++{
++ unsigned int index = shash(userp, subj_map_set.s_size);
++ struct subject_map *match;
++
++ match = subj_map_set.s_hash[index];
++
++ while (match && match->user != userp)
++ match = match->next;
++
++ if (match != NULL)
++ return match->kernel;
++ else
++ return NULL;
++}
++
++static void
++insert_subj_map_entry(struct subject_map *subjmap)
++{
++ unsigned int index = shash(subjmap->user, subj_map_set.s_size);
++ struct subject_map **curr;
++
++ subjmap->prev = NULL;
++
++ curr = &subj_map_set.s_hash[index];
++ if (*curr != NULL)
++ (*curr)->prev = subjmap;
++
++ subjmap->next = *curr;
++ *curr = subjmap;
++
++ return;
++}
++
++static struct acl_role_label *
++lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
++ const gid_t gid)
++{
++ unsigned int index = rhash(uid, GR_ROLE_USER, acl_role_set.r_size);
++ struct acl_role_label *match;
++ struct role_allowed_ip *ipp;
++ unsigned int x;
++
++ match = acl_role_set.r_hash[index];
++
++ while (match) {
++ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
++ for (x = 0; x < match->domain_child_num; x++) {
++ if (match->domain_children[x] == uid)
++ goto found;
++ }
++ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
++ break;
++ match = match->next;
++ }
++found:
++ if (match == NULL) {
++ try_group:
++ index = rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size);
++ match = acl_role_set.r_hash[index];
++
++ while (match) {
++ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
++ for (x = 0; x < match->domain_child_num; x++) {
++ if (match->domain_children[x] == gid)
++ goto found2;
++ }
++ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
++ break;
++ match = match->next;
++ }
++found2:
++ if (match == NULL)
++ match = default_role;
++ if (match->allowed_ips == NULL)
++ return match;
++ else {
++ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
++ if (likely
++ ((ntohl(task->signal->curr_ip) & ipp->netmask) ==
++ (ntohl(ipp->addr) & ipp->netmask)))
++ return match;
++ }
++ match = default_role;
++ }
++ } else if (match->allowed_ips == NULL) {
++ return match;
++ } else {
++ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
++ if (likely
++ ((ntohl(task->signal->curr_ip) & ipp->netmask) ==
++ (ntohl(ipp->addr) & ipp->netmask)))
++ return match;
++ }
++ goto try_group;
++ }
++
++ return match;
++}
++
++struct acl_subject_label *
++lookup_acl_subj_label(const ino_t ino, const dev_t dev,
++ const struct acl_role_label *role)
++{
++ unsigned int index = fhash(ino, dev, role->subj_hash_size);
++ struct acl_subject_label *match;
++
++ match = role->subj_hash[index];
++
++ while (match && (match->inode != ino || match->device != dev ||
++ (match->mode & GR_DELETED))) {
++ match = match->next;
++ }
++
++ if (match && !(match->mode & GR_DELETED))
++ return match;
++ else
++ return NULL;
++}
++
++struct acl_subject_label *
++lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
++ const struct acl_role_label *role)
++{
++ unsigned int index = fhash(ino, dev, role->subj_hash_size);
++ struct acl_subject_label *match;
++
++ match = role->subj_hash[index];
++
++ while (match && (match->inode != ino || match->device != dev ||
++ !(match->mode & GR_DELETED))) {
++ match = match->next;
++ }
++
++ if (match && (match->mode & GR_DELETED))
++ return match;
++ else
++ return NULL;
++}
++
++static struct acl_object_label *
++lookup_acl_obj_label(const ino_t ino, const dev_t dev,
++ const struct acl_subject_label *subj)
++{
++ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
++ struct acl_object_label *match;
++
++ match = subj->obj_hash[index];
++
++ while (match && (match->inode != ino || match->device != dev ||
++ (match->mode & GR_DELETED))) {
++ match = match->next;
++ }
++
++ if (match && !(match->mode & GR_DELETED))
++ return match;
++ else
++ return NULL;
++}
++
++static struct acl_object_label *
++lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
++ const struct acl_subject_label *subj)
++{
++ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
++ struct acl_object_label *match;
++
++ match = subj->obj_hash[index];
++
++ while (match && (match->inode != ino || match->device != dev ||
++ !(match->mode & GR_DELETED))) {
++ match = match->next;
++ }
++
++ if (match && (match->mode & GR_DELETED))
++ return match;
++
++ match = subj->obj_hash[index];
++
++ while (match && (match->inode != ino || match->device != dev ||
++ (match->mode & GR_DELETED))) {
++ match = match->next;
++ }
++
++ if (match && !(match->mode & GR_DELETED))
++ return match;
++ else
++ return NULL;
++}
++
++static struct name_entry *
++lookup_name_entry(const char *name)
++{
++ unsigned int len = strlen(name);
++ unsigned int key = full_name_hash(name, len);
++ unsigned int index = key % name_set.n_size;
++ struct name_entry *match;
++
++ match = name_set.n_hash[index];
++
++ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
++ match = match->next;
++
++ return match;
++}
++
++static struct name_entry *
++lookup_name_entry_create(const char *name)
++{
++ unsigned int len = strlen(name);
++ unsigned int key = full_name_hash(name, len);
++ unsigned int index = key % name_set.n_size;
++ struct name_entry *match;
++
++ match = name_set.n_hash[index];
++
++ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
++ !match->deleted))
++ match = match->next;
++
++ if (match && match->deleted)
++ return match;
++
++ match = name_set.n_hash[index];
++
++ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
++ match->deleted))
++ match = match->next;
++
++ if (match && !match->deleted)
++ return match;
++ else
++ return NULL;
++}
++
++static struct inodev_entry *
++lookup_inodev_entry(const ino_t ino, const dev_t dev)
++{
++ unsigned int index = fhash(ino, dev, inodev_set.i_size);
++ struct inodev_entry *match;
++
++ match = inodev_set.i_hash[index];
++
++ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
++ match = match->next;
++
++ return match;
++}
++
++static void
++insert_inodev_entry(struct inodev_entry *entry)
++{
++ unsigned int index = fhash(entry->nentry->inode, entry->nentry->device,
++ inodev_set.i_size);
++ struct inodev_entry **curr;
++
++ entry->prev = NULL;
++
++ curr = &inodev_set.i_hash[index];
++ if (*curr != NULL)
++ (*curr)->prev = entry;
++
++ entry->next = *curr;
++ *curr = entry;
++
++ return;
++}
++
++static void
++__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
++{
++ unsigned int index =
++ rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
++ struct acl_role_label **curr;
++ struct acl_role_label *tmp;
++
++ curr = &acl_role_set.r_hash[index];
++
++ /* if role was already inserted due to domains and already has
++ a role in the same bucket as it attached, then we need to
++ combine these two buckets
++ */
++ if (role->next) {
++ tmp = role->next;
++ while (tmp->next)
++ tmp = tmp->next;
++ tmp->next = *curr;
++ } else
++ role->next = *curr;
++ *curr = role;
++
++ return;
++}
++
++static void
++insert_acl_role_label(struct acl_role_label *role)
++{
++ int i;
++
++ if (role_list == NULL) {
++ role_list = role;
++ role->prev = NULL;
++ } else {
++ role->prev = role_list;
++ role_list = role;
++ }
++
++ /* used for hash chains */
++ role->next = NULL;
++
++ if (role->roletype & GR_ROLE_DOMAIN) {
++ for (i = 0; i < role->domain_child_num; i++)
++ __insert_acl_role_label(role, role->domain_children[i]);
++ } else
++ __insert_acl_role_label(role, role->uidgid);
++}
++
++static int
++insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
++{
++ struct name_entry **curr, *nentry;
++ struct inodev_entry *ientry;
++ unsigned int len = strlen(name);
++ unsigned int key = full_name_hash(name, len);
++ unsigned int index = key % name_set.n_size;
++
++ curr = &name_set.n_hash[index];
++
++ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
++ curr = &((*curr)->next);
++
++ if (*curr != NULL)
++ return 1;
++
++ nentry = acl_alloc(sizeof (struct name_entry));
++ if (nentry == NULL)
++ return 0;
++ ientry = acl_alloc(sizeof (struct inodev_entry));
++ if (ientry == NULL)
++ return 0;
++ ientry->nentry = nentry;
++
++ nentry->key = key;
++ nentry->name = name;
++ nentry->inode = inode;
++ nentry->device = device;
++ nentry->len = len;
++ nentry->deleted = deleted;
++
++ nentry->prev = NULL;
++ curr = &name_set.n_hash[index];
++ if (*curr != NULL)
++ (*curr)->prev = nentry;
++ nentry->next = *curr;
++ *curr = nentry;
++
++ /* insert us into the table searchable by inode/dev */
++ insert_inodev_entry(ientry);
++
++ return 1;
++}
++
++static void
++insert_acl_obj_label(struct acl_object_label *obj,
++ struct acl_subject_label *subj)
++{
++ unsigned int index =
++ fhash(obj->inode, obj->device, subj->obj_hash_size);
++ struct acl_object_label **curr;
++
++
++ obj->prev = NULL;
++
++ curr = &subj->obj_hash[index];
++ if (*curr != NULL)
++ (*curr)->prev = obj;
++
++ obj->next = *curr;
++ *curr = obj;
++
++ return;
++}
++
++static void
++insert_acl_subj_label(struct acl_subject_label *obj,
++ struct acl_role_label *role)
++{
++ unsigned int index = fhash(obj->inode, obj->device, role->subj_hash_size);
++ struct acl_subject_label **curr;
++
++ obj->prev = NULL;
++
++ curr = &role->subj_hash[index];
++ if (*curr != NULL)
++ (*curr)->prev = obj;
++
++ obj->next = *curr;
++ *curr = obj;
++
++ return;
++}
++
++/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
++
++static void *
++create_table(__u32 * len, int elementsize)
++{
++ unsigned int table_sizes[] = {
++ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
++ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
++ 4194301, 8388593, 16777213, 33554393, 67108859
++ };
++ void *newtable = NULL;
++ unsigned int pwr = 0;
++
++ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
++ table_sizes[pwr] <= *len)
++ pwr++;
++
++ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
++ return newtable;
++
++ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
++ newtable =
++ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
++ else
++ newtable = vmalloc(table_sizes[pwr] * elementsize);
++
++ *len = table_sizes[pwr];
++
++ return newtable;
++}
++
++static int
++init_variables(const struct gr_arg *arg)
++{
++ struct task_struct *reaper = &init_task;
++ unsigned int stacksize;
+
+ subj_map_set.s_size = arg->role_db.num_subjects;
+ acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
+EXPORT_SYMBOL(gr_check_group_change);
+#endif
+
-diff -urNp linux-2.6.34/grsecurity/gracl_cap.c linux-2.6.34/grsecurity/gracl_cap.c
---- linux-2.6.34/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/gracl_cap.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/gracl_alloc.c linux-2.6.34.1/grsecurity/gracl_alloc.c
+--- linux-2.6.34.1/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/gracl_alloc.c 2010-07-07 09:04:56.000000000 -0400
+@@ -0,0 +1,105 @@
++#include <linux/kernel.h>
++#include <linux/mm.h>
++#include <linux/slab.h>
++#include <linux/vmalloc.h>
++#include <linux/gracl.h>
++#include <linux/grsecurity.h>
++
++static unsigned long alloc_stack_next = 1;
++static unsigned long alloc_stack_size = 1;
++static void **alloc_stack;
++
++static __inline__ int
++alloc_pop(void)
++{
++ if (alloc_stack_next == 1)
++ return 0;
++
++ kfree(alloc_stack[alloc_stack_next - 2]);
++
++ alloc_stack_next--;
++
++ return 1;
++}
++
++static __inline__ int
++alloc_push(void *buf)
++{
++ if (alloc_stack_next >= alloc_stack_size)
++ return 1;
++
++ alloc_stack[alloc_stack_next - 1] = buf;
++
++ alloc_stack_next++;
++
++ return 0;
++}
++
++void *
++acl_alloc(unsigned long len)
++{
++ void *ret = NULL;
++
++ if (!len || len > PAGE_SIZE)
++ goto out;
++
++ ret = kmalloc(len, GFP_KERNEL);
++
++ if (ret) {
++ if (alloc_push(ret)) {
++ kfree(ret);
++ ret = NULL;
++ }
++ }
++
++out:
++ return ret;
++}
++
++void *
++acl_alloc_num(unsigned long num, unsigned long len)
++{
++ if (!len || (num > (PAGE_SIZE / len)))
++ return NULL;
++
++ return acl_alloc(num * len);
++}
++
++void
++acl_free_all(void)
++{
++ if (gr_acl_is_enabled() || !alloc_stack)
++ return;
++
++ while (alloc_pop()) ;
++
++ if (alloc_stack) {
++ if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
++ kfree(alloc_stack);
++ else
++ vfree(alloc_stack);
++ }
++
++ alloc_stack = NULL;
++ alloc_stack_size = 1;
++ alloc_stack_next = 1;
++
++ return;
++}
++
++int
++acl_alloc_stack_init(unsigned long size)
++{
++ if ((size * sizeof (void *)) <= PAGE_SIZE)
++ alloc_stack =
++ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
++ else
++ alloc_stack = (void **) vmalloc(size * sizeof (void *));
++
++ alloc_stack_size = size;
++
++ if (!alloc_stack)
++ return 0;
++ else
++ return 1;
++}
+diff -urNp linux-2.6.34.1/grsecurity/gracl_cap.c linux-2.6.34.1/grsecurity/gracl_cap.c
+--- linux-2.6.34.1/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/gracl_cap.c 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,138 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+ return 0;
+}
+
-diff -urNp linux-2.6.34/grsecurity/gracl_fs.c linux-2.6.34/grsecurity/gracl_fs.c
---- linux-2.6.34/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/gracl_fs.c 2010-07-02 19:46:12.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/gracl_fs.c linux-2.6.34.1/grsecurity/gracl_fs.c
+--- linux-2.6.34.1/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/gracl_fs.c 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,424 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+
+ return 0;
+}
-diff -urNp linux-2.6.34/grsecurity/gracl_ip.c linux-2.6.34/grsecurity/gracl_ip.c
---- linux-2.6.34/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/gracl_ip.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/gracl_ip.c linux-2.6.34.1/grsecurity/gracl_ip.c
+--- linux-2.6.34.1/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/gracl_ip.c 2010-07-07 09:04:56.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.34/grsecurity/gracl_learn.c linux-2.6.34/grsecurity/gracl_learn.c
---- linux-2.6.34/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/gracl_learn.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/gracl_learn.c linux-2.6.34.1/grsecurity/gracl_learn.c
+--- linux-2.6.34.1/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/gracl_learn.c 2010-07-07 09:04:56.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.34/grsecurity/gracl_res.c linux-2.6.34/grsecurity/gracl_res.c
---- linux-2.6.34/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/gracl_res.c 2010-07-03 08:50:00.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/gracl_res.c linux-2.6.34.1/grsecurity/gracl_res.c
+--- linux-2.6.34.1/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/gracl_res.c 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,68 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+ rcu_read_unlock();
+ return;
+}
-diff -urNp linux-2.6.34/grsecurity/gracl_segv.c linux-2.6.34/grsecurity/gracl_segv.c
---- linux-2.6.34/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/gracl_segv.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/gracl_segv.c linux-2.6.34.1/grsecurity/gracl_segv.c
+--- linux-2.6.34.1/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/gracl_segv.c 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,310 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
+
+ return;
+}
-diff -urNp linux-2.6.34/grsecurity/gracl_shm.c linux-2.6.34/grsecurity/gracl_shm.c
---- linux-2.6.34/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/gracl_shm.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/gracl_shm.c linux-2.6.34.1/grsecurity/gracl_shm.c
+--- linux-2.6.34.1/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/gracl_shm.c 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,40 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
+
+ return 1;
+}
-diff -urNp linux-2.6.34/grsecurity/grsec_chdir.c linux-2.6.34/grsecurity/grsec_chdir.c
---- linux-2.6.34/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/grsec_chdir.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/grsec_chdir.c linux-2.6.34.1/grsecurity/grsec_chdir.c
+--- linux-2.6.34.1/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/grsec_chdir.c 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,19 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return;
+}
-diff -urNp linux-2.6.34/grsecurity/grsec_chroot.c linux-2.6.34/grsecurity/grsec_chroot.c
---- linux-2.6.34/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/grsec_chroot.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/grsec_chroot.c linux-2.6.34.1/grsecurity/grsec_chroot.c
+--- linux-2.6.34.1/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/grsec_chroot.c 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,366 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#ifdef CONFIG_SECURITY
+EXPORT_SYMBOL(gr_handle_chroot_caps);
+#endif
-diff -urNp linux-2.6.34/grsecurity/grsec_disabled.c linux-2.6.34/grsecurity/grsec_disabled.c
---- linux-2.6.34/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/grsec_disabled.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/grsec_disabled.c linux-2.6.34.1/grsecurity/grsec_disabled.c
+--- linux-2.6.34.1/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/grsec_disabled.c 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,425 @@
+#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.34/grsecurity/grsec_exec.c linux-2.6.34/grsecurity/grsec_exec.c
---- linux-2.6.34/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/grsec_exec.c 2010-07-01 20:54:40.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/grsec_exec.c linux-2.6.34.1/grsecurity/grsec_exec.c
+--- linux-2.6.34.1/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/grsec_exec.c 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,88 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return;
+}
-diff -urNp linux-2.6.34/grsecurity/grsec_fifo.c linux-2.6.34/grsecurity/grsec_fifo.c
---- linux-2.6.34/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/grsec_fifo.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/grsec_fifo.c linux-2.6.34.1/grsecurity/grsec_fifo.c
+--- linux-2.6.34.1/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/grsec_fifo.c 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,24 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.34/grsecurity/grsec_fork.c linux-2.6.34/grsecurity/grsec_fork.c
---- linux-2.6.34/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/grsec_fork.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/grsec_fork.c linux-2.6.34.1/grsecurity/grsec_fork.c
+--- linux-2.6.34.1/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/grsec_fork.c 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,15 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return;
+}
-diff -urNp linux-2.6.34/grsecurity/grsec_init.c linux-2.6.34/grsecurity/grsec_init.c
---- linux-2.6.34/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/grsec_init.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/grsec_init.c linux-2.6.34.1/grsecurity/grsec_init.c
+--- linux-2.6.34.1/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/grsec_init.c 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,258 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+
+ return;
+}
-diff -urNp linux-2.6.34/grsecurity/grsec_link.c linux-2.6.34/grsecurity/grsec_link.c
---- linux-2.6.34/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/grsec_link.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/grsec_link.c linux-2.6.34.1/grsecurity/grsec_link.c
+--- linux-2.6.34.1/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/grsec_link.c 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,43 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.34/grsecurity/grsec_log.c linux-2.6.34/grsecurity/grsec_log.c
---- linux-2.6.34/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/grsec_log.c 2010-07-02 15:53:14.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/grsec_log.c linux-2.6.34.1/grsecurity/grsec_log.c
+--- linux-2.6.34.1/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/grsec_log.c 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,306 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+ gr_log_end(audit);
+ END_LOCKS(audit);
+}
-diff -urNp linux-2.6.34/grsecurity/grsec_mem.c linux-2.6.34/grsecurity/grsec_mem.c
---- linux-2.6.34/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/grsec_mem.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/grsec_mem.c linux-2.6.34.1/grsecurity/grsec_mem.c
+--- linux-2.6.34.1/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/grsec_mem.c 2010-07-07 09:04:56.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.34/grsecurity/grsec_mount.c linux-2.6.34/grsecurity/grsec_mount.c
---- linux-2.6.34/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/grsec_mount.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/grsec_mount.c linux-2.6.34.1/grsecurity/grsec_mount.c
+--- linux-2.6.34.1/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/grsec_mount.c 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,62 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.34/grsecurity/grsec_ptrace.c linux-2.6.34/grsecurity/grsec_ptrace.c
---- linux-2.6.34/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/grsec_ptrace.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/grsec_ptrace.c linux-2.6.34.1/grsecurity/grsec_ptrace.c
+--- linux-2.6.34.1/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/grsec_ptrace.c 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,14 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return;
+}
-diff -urNp linux-2.6.34/grsecurity/grsec_sig.c linux-2.6.34/grsecurity/grsec_sig.c
---- linux-2.6.34/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/grsec_sig.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/grsec_sig.c linux-2.6.34.1/grsecurity/grsec_sig.c
+--- linux-2.6.34.1/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/grsec_sig.c 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,65 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+ return;
+}
+
-diff -urNp linux-2.6.34/grsecurity/grsec_sock.c linux-2.6.34/grsecurity/grsec_sock.c
---- linux-2.6.34/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/grsec_sock.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/grsec_sock.c linux-2.6.34.1/grsecurity/grsec_sock.c
+--- linux-2.6.34.1/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/grsec_sock.c 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,271 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+ return current_cap();
+#endif
+}
-diff -urNp linux-2.6.34/grsecurity/grsec_sysctl.c linux-2.6.34/grsecurity/grsec_sysctl.c
---- linux-2.6.34/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/grsec_sysctl.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/grsecurity/grsec_sysctl.c linux-2.6.34.1/grsecurity/grsec_sysctl.c
+--- linux-2.6.34.1/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/grsec_sysctl.c 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,415 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+ .maxlen = sizeof(int),
+ .mode = 0600,
+ .proc_handler = &proc_dointvec,
-+ },
-+ {
-+ .procname = "socket_client_gid",
-+ .data = &grsec_socket_client_gid,
-+ .maxlen = sizeof(int),
-+ .mode = 0600,
-+ .proc_handler = &proc_dointvec,
-+ },
-+#endif
-+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
-+ {
-+ .procname = "socket_server",
-+ .data = &grsec_enable_socket_server,
-+ .maxlen = sizeof(int),
-+ .mode = 0600,
-+ .proc_handler = &proc_dointvec,
-+ },
-+ {
-+ .procname = "socket_server_gid",
-+ .data = &grsec_socket_server_gid,
-+ .maxlen = sizeof(int),
-+ .mode = 0600,
-+ .proc_handler = &proc_dointvec,
-+ },
-+#endif
-+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
-+ {
-+ .procname = "audit_group",
-+ .data = &grsec_enable_group,
-+ .maxlen = sizeof(int),
-+ .mode = 0600,
-+ .proc_handler = &proc_dointvec,
-+ },
-+ {
-+ .procname = "audit_gid",
-+ .data = &grsec_audit_gid,
-+ .maxlen = sizeof(int),
-+ .mode = 0600,
-+ .proc_handler = &proc_dointvec,
-+ },
-+#endif
-+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
-+ {
-+ .procname = "audit_chdir",
-+ .data = &grsec_enable_chdir,
-+ .maxlen = sizeof(int),
-+ .mode = 0600,
-+ .proc_handler = &proc_dointvec,
-+ },
-+#endif
-+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
-+ {
-+ .procname = "audit_mount",
-+ .data = &grsec_enable_mount,
-+ .maxlen = sizeof(int),
-+ .mode = 0600,
-+ .proc_handler = &proc_dointvec,
-+ },
-+#endif
-+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
-+ {
-+ .procname = "audit_textrel",
-+ .data = &grsec_enable_audit_textrel,
-+ .maxlen = sizeof(int),
-+ .mode = 0600,
-+ .proc_handler = &proc_dointvec,
-+ },
-+#endif
-+#ifdef CONFIG_GRKERNSEC_DMESG
-+ {
-+ .procname = "dmesg",
-+ .data = &grsec_enable_dmesg,
-+ .maxlen = sizeof(int),
-+ .mode = 0600,
-+ .proc_handler = &proc_dointvec,
-+ },
-+#endif
-+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
-+ {
-+ .procname = "chroot_findtask",
-+ .data = &grsec_enable_chroot_findtask,
-+ .maxlen = sizeof(int),
-+ .mode = 0600,
-+ .proc_handler = &proc_dointvec,
-+ },
-+#endif
-+#ifdef CONFIG_GRKERNSEC_RESLOG
-+ {
-+ .procname = "resource_logging",
-+ .data = &grsec_resource_logging,
-+ .maxlen = sizeof(int),
-+ .mode = 0600,
-+ .proc_handler = &proc_dointvec,
-+ },
-+#endif
-+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
-+ {
-+ .procname = "audit_ptrace",
-+ .data = &grsec_enable_audit_ptrace,
-+ .maxlen = sizeof(int),
-+ .mode = 0600,
-+ .proc_handler = &proc_dointvec,
-+ },
-+#endif
-+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
-+ {
-+ .procname = "harden_ptrace",
-+ .data = &grsec_enable_harden_ptrace,
-+ .maxlen = sizeof(int),
-+ .mode = 0600,
-+ .proc_handler = &proc_dointvec,
-+ },
-+#endif
-+ {
-+ .procname = "grsec_lock",
-+ .data = &grsec_lock,
-+ .maxlen = sizeof(int),
-+ .mode = 0600,
-+ .proc_handler = &proc_dointvec,
-+ },
-+#endif
-+#ifdef CONFIG_GRKERNSEC_ROFS
-+ {
-+ .procname = "romount_protect",
-+ .data = &grsec_enable_rofs,
-+ .maxlen = sizeof(int),
-+ .mode = 0600,
-+ .proc_handler = &proc_dointvec_minmax,
-+ .extra1 = &one,
-+ .extra2 = &one,
-+ },
-+#endif
-+ { }
-+};
-+#endif
-diff -urNp linux-2.6.34/grsecurity/grsec_textrel.c linux-2.6.34/grsecurity/grsec_textrel.c
---- linux-2.6.34/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/grsec_textrel.c 2010-07-01 20:45:16.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.34/grsecurity/grsec_time.c linux-2.6.34/grsecurity/grsec_time.c
---- linux-2.6.34/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/grsec_time.c 2010-07-01 20:45:16.000000000 -0400
-@@ -0,0 +1,13 @@
-+#include <linux/kernel.h>
-+#include <linux/sched.h>
-+#include <linux/grinternal.h>
-+
-+void
-+gr_log_timechange(void)
-+{
-+#ifdef CONFIG_GRKERNSEC_TIME
-+ if (grsec_enable_time)
-+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
-+#endif
-+ return;
-+}
-diff -urNp linux-2.6.34/grsecurity/grsec_tpe.c linux-2.6.34/grsecurity/grsec_tpe.c
---- linux-2.6.34/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/grsec_tpe.c 2010-07-01 20:45:16.000000000 -0400
-@@ -0,0 +1,38 @@
-+#include <linux/kernel.h>
-+#include <linux/sched.h>
-+#include <linux/file.h>
-+#include <linux/fs.h>
-+#include <linux/grinternal.h>
-+
-+extern int gr_acl_tpe_check(void);
-+
-+int
-+gr_tpe_allow(const struct file *file)
-+{
-+#ifdef CONFIG_GRKERNSEC
-+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
-+ const struct cred *cred = current_cred();
-+
-+ if (cred->uid && ((grsec_enable_tpe &&
-+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
-+ !in_group_p(grsec_tpe_gid)
-+#else
-+ in_group_p(grsec_tpe_gid)
-+#endif
-+ ) || gr_acl_tpe_check()) &&
-+ (inode->i_uid || (!inode->i_uid && ((inode->i_mode & S_IWGRP) ||
-+ (inode->i_mode & S_IWOTH))))) {
-+ gr_log_fs_generic(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, file->f_path.dentry, file->f_path.mnt);
-+ return 0;
-+ }
-+#ifdef CONFIG_GRKERNSEC_TPE_ALL
-+ if (cred->uid && grsec_enable_tpe && grsec_enable_tpe_all &&
-+ ((inode->i_uid && (inode->i_uid != cred->uid)) ||
-+ (inode->i_mode & S_IWGRP) || (inode->i_mode & S_IWOTH))) {
-+ gr_log_fs_generic(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, file->f_path.dentry, file->f_path.mnt);
-+ return 0;
-+ }
-+#endif
-+#endif
-+ return 1;
-+}
-diff -urNp linux-2.6.34/grsecurity/grsum.c linux-2.6.34/grsecurity/grsum.c
---- linux-2.6.34/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/grsum.c 2010-07-01 20:45:16.000000000 -0400
-@@ -0,0 +1,61 @@
-+#include <linux/err.h>
-+#include <linux/kernel.h>
-+#include <linux/sched.h>
-+#include <linux/mm.h>
-+#include <linux/scatterlist.h>
-+#include <linux/crypto.h>
-+#include <linux/gracl.h>
-+
-+
-+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
-+#error "crypto and sha256 must be built into the kernel"
-+#endif
-+
-+int
-+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
-+{
-+ char *p;
-+ struct crypto_hash *tfm;
-+ struct hash_desc desc;
-+ struct scatterlist sg;
-+ unsigned char temp_sum[GR_SHA_LEN];
-+ volatile int retval = 0;
-+ volatile int dummy = 0;
-+ unsigned int i;
-+
-+ sg_init_table(&sg, 1);
-+
-+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
-+ if (IS_ERR(tfm)) {
-+ /* should never happen, since sha256 should be built in */
-+ return 1;
-+ }
-+
-+ desc.tfm = tfm;
-+ desc.flags = 0;
-+
-+ crypto_hash_init(&desc);
-+
-+ p = salt;
-+ sg_set_buf(&sg, p, GR_SALT_LEN);
-+ crypto_hash_update(&desc, &sg, sg.length);
-+
-+ p = entry->pw;
-+ sg_set_buf(&sg, p, strlen(p));
-+
-+ crypto_hash_update(&desc, &sg, sg.length);
-+
-+ crypto_hash_final(&desc, temp_sum);
-+
-+ memset(entry->pw, 0, GR_PW_LEN);
-+
-+ for (i = 0; i < GR_SHA_LEN; i++)
-+ if (sum[i] != temp_sum[i])
-+ retval = 1;
-+ else
-+ dummy = 1; // waste a cycle
-+
-+ crypto_free_hash(tfm);
-+
-+ return retval;
-+}
-diff -urNp linux-2.6.34/grsecurity/Kconfig linux-2.6.34/grsecurity/Kconfig
---- linux-2.6.34/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/Kconfig 2010-07-01 20:45:16.000000000 -0400
-@@ -0,0 +1,981 @@
-+#
-+# grecurity configuration
-+#
-+
-+menu "Grsecurity"
-+
-+config GRKERNSEC
-+ bool "Grsecurity"
-+ select CRYPTO
-+ select CRYPTO_SHA256
-+ help
-+ If you say Y here, you will be able to configure many features
-+ that will enhance the security of your system. It is highly
-+ recommended that you say Y here and read through the help
-+ for each option so that you fully understand the features and
-+ can evaluate their usefulness for your machine.
-+
-+choice
-+ prompt "Security Level"
-+ depends on GRKERNSEC
-+ default GRKERNSEC_CUSTOM
-+
-+config GRKERNSEC_LOW
-+ bool "Low"
-+ select GRKERNSEC_LINK
-+ select GRKERNSEC_FIFO
-+ select GRKERNSEC_EXECVE
-+ select GRKERNSEC_RANDNET
-+ select GRKERNSEC_DMESG
-+ select GRKERNSEC_CHROOT
-+ select GRKERNSEC_CHROOT_CHDIR
-+
-+ help
-+ If you choose this option, several of the grsecurity options will
-+ be enabled that will give you greater protection against a number
-+ of attacks, while assuring that none of your software will have any
-+ conflicts with the additional security measures. If you run a lot
-+ of unusual software, or you are having problems with the higher
-+ security levels, you should say Y here. With this option, the
-+ following features are enabled:
-+
-+ - Linking restrictions
-+ - FIFO restrictions
-+ - Enforcing RLIMIT_NPROC on execve
-+ - Restricted dmesg
-+ - Enforced chdir("/") on chroot
-+ - Runtime module disabling
-+
-+config GRKERNSEC_MEDIUM
-+ bool "Medium"
-+ select PAX
-+ select PAX_EI_PAX
-+ select PAX_PT_PAX_FLAGS
-+ select PAX_HAVE_ACL_FLAGS
-+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
-+ select GRKERNSEC_CHROOT
-+ select GRKERNSEC_CHROOT_SYSCTL
-+ select GRKERNSEC_LINK
-+ select GRKERNSEC_FIFO
-+ select GRKERNSEC_EXECVE
-+ select GRKERNSEC_DMESG
-+ select GRKERNSEC_RANDNET
-+ select GRKERNSEC_FORKFAIL
-+ select GRKERNSEC_TIME
-+ select GRKERNSEC_SIGNAL
-+ select GRKERNSEC_CHROOT
-+ select GRKERNSEC_CHROOT_UNIX
-+ select GRKERNSEC_CHROOT_MOUNT
-+ select GRKERNSEC_CHROOT_PIVOT
-+ select GRKERNSEC_CHROOT_DOUBLE
-+ select GRKERNSEC_CHROOT_CHDIR
-+ select GRKERNSEC_CHROOT_MKNOD
-+ select GRKERNSEC_PROC
-+ select GRKERNSEC_PROC_USERGROUP
-+ select PAX_RANDUSTACK
-+ select PAX_ASLR
-+ select PAX_RANDMMAP
-+ select PAX_REFCOUNT if (X86 || SPARC64)
-+ select PAX_USERCOPY if ((X86 || SPARC32 || SPARC64 || PPC32 || PPC64) && (SLAB || SLUB || SLOB))
-+
-+ help
-+ If you say Y here, several features in addition to those included
-+ in the low additional security level will be enabled. These
-+ features provide even more security to your system, though in rare
-+ cases they may be incompatible with very old or poorly written
-+ software. If you enable this option, make sure that your auth
-+ service (identd) is running as gid 1001. With this option,
-+ the following features (in addition to those provided in the
-+ low additional security level) will be enabled:
-+
-+ - Failed fork logging
-+ - Time change logging
-+ - Signal logging
-+ - Deny mounts in chroot
-+ - Deny double chrooting
-+ - Deny sysctl writes in chroot
-+ - Deny mknod in chroot
-+ - Deny access to abstract AF_UNIX sockets out of chroot
-+ - Deny pivot_root in chroot
-+ - Denied writes of /dev/kmem, /dev/mem, and /dev/port
-+ - /proc restrictions with special GID set to 10 (usually wheel)
-+ - Address Space Layout Randomization (ASLR)
-+ - Prevent exploitation of most refcount overflows
-+ - Bounds checking of copying between the kernel and userland
-+
-+config GRKERNSEC_HIGH
-+ bool "High"
-+ select GRKERNSEC_LINK
-+ select GRKERNSEC_FIFO
-+ select GRKERNSEC_EXECVE
-+ select GRKERNSEC_DMESG
-+ select GRKERNSEC_FORKFAIL
-+ select GRKERNSEC_TIME
-+ select GRKERNSEC_SIGNAL
-+ select GRKERNSEC_CHROOT
-+ select GRKERNSEC_CHROOT_SHMAT
-+ select GRKERNSEC_CHROOT_UNIX
-+ select GRKERNSEC_CHROOT_MOUNT
-+ select GRKERNSEC_CHROOT_FCHDIR
-+ select GRKERNSEC_CHROOT_PIVOT
-+ select GRKERNSEC_CHROOT_DOUBLE
-+ select GRKERNSEC_CHROOT_CHDIR
-+ select GRKERNSEC_CHROOT_MKNOD
-+ select GRKERNSEC_CHROOT_CAPS
-+ select GRKERNSEC_CHROOT_SYSCTL
-+ select GRKERNSEC_CHROOT_FINDTASK
-+ select GRKERNSEC_PROC
-+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
-+ select GRKERNSEC_HIDESYM
-+ select GRKERNSEC_BRUTE
-+ select GRKERNSEC_PROC_USERGROUP
-+ select GRKERNSEC_KMEM
-+ select GRKERNSEC_RESLOG
-+ select GRKERNSEC_RANDNET
-+ select GRKERNSEC_PROC_ADD
-+ select GRKERNSEC_CHROOT_CHMOD
-+ select GRKERNSEC_CHROOT_NICE
-+ select GRKERNSEC_AUDIT_MOUNT
-+ select GRKERNSEC_MODHARDEN if (MODULES)
-+ select GRKERNSEC_HARDEN_PTRACE
-+ select GRKERNSEC_VM86 if (X86_32)
-+ select PAX
-+ select PAX_RANDUSTACK
-+ select PAX_ASLR
-+ select PAX_RANDMMAP
-+ select PAX_NOEXEC
-+ select PAX_MPROTECT
-+ select PAX_EI_PAX
-+ select PAX_PT_PAX_FLAGS
-+ select PAX_HAVE_ACL_FLAGS
-+ select PAX_KERNEXEC if ((PPC32 || PPC64 || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN)
-+ select PAX_MEMORY_UDEREF if (X86_32 && !XEN)
-+ select PAX_RANDKSTACK if (X86_TSC && !X86_64)
-+ select PAX_SEGMEXEC if (X86_32)
-+ select PAX_PAGEEXEC
-+ select PAX_EMUPLT if (ALPHA || PARISC || SPARC32 || SPARC64)
-+ select PAX_EMUTRAMP if (PARISC)
-+ select PAX_EMUSIGRT if (PARISC)
-+ select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC)
-+ select PAX_REFCOUNT if (X86 || SPARC64)
-+ select PAX_USERCOPY if ((X86 || PPC32 || PPC64 || SPARC32 || SPARC64) && (SLAB || SLUB || SLOB))
-+ help
-+ If you say Y here, many of the features of grsecurity will be
-+ enabled, which will protect you against many kinds of attacks
-+ against your system. The heightened security comes at a cost
-+ of an increased chance of incompatibilities with rare software
-+ on your machine. Since this security level enables PaX, you should
-+ view <http://pax.grsecurity.net> and read about the PaX
-+ project. While you are there, download chpax and run it on
-+ binaries that cause problems with PaX. Also remember that
-+ since the /proc restrictions are enabled, you must run your
-+ identd as gid 1001. This security level enables the following
-+ features in addition to those listed in the low and medium
-+ security levels:
-+
-+ - Additional /proc restrictions
-+ - Chmod restrictions in chroot
-+ - No signals, ptrace, or viewing of processes outside of chroot
-+ - Capability restrictions in chroot
-+ - Deny fchdir out of chroot
-+ - Priority restrictions in chroot
-+ - Segmentation-based implementation of PaX
-+ - Mprotect restrictions
-+ - Removal of addresses from /proc/<pid>/[smaps|maps|stat]
-+ - Kernel stack randomization
-+ - Mount/unmount/remount logging
-+ - Kernel symbol hiding
-+ - Prevention of memory exhaustion-based exploits
-+ - Hardening of module auto-loading
-+ - Ptrace restrictions
-+ - Restricted vm86 mode
-+
-+config GRKERNSEC_CUSTOM
-+ bool "Custom"
-+ help
-+ If you say Y here, you will be able to configure every grsecurity
-+ option, which allows you to enable many more features that aren't
-+ covered in the basic security levels. These additional features
-+ include TPE, socket restrictions, and the sysctl system for
-+ grsecurity. It is advised that you read through the help for
-+ each option to determine its usefulness in your situation.
-+
-+endchoice
-+
-+menu "Address Space Protection"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_KMEM
-+ bool "Deny writing to /dev/kmem, /dev/mem, and /dev/port"
-+ help
-+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
-+ be written to via mmap or otherwise to modify the running kernel.
-+ /dev/port will also not be allowed to be opened. If you have module
-+ support disabled, enabling this will close up four ways that are
-+ currently used to insert malicious code into the running kernel.
-+ Even with all these features enabled, we still highly recommend that
-+ you use the RBAC system, as it is still possible for an attacker to
-+ modify the running kernel through privileged I/O granted by ioperm/iopl.
-+ If you are not using XFree86, you may be able to stop this additional
-+ case by enabling the 'Disable privileged I/O' option. Though nothing
-+ legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
-+ but only to video memory, which is the only writing we allow in this
-+ case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
-+ not be allowed to mprotect it with PROT_WRITE later.
-+ It is highly recommended that you say Y here if you meet all the
-+ conditions above.
-+
-+config GRKERNSEC_VM86
-+ bool "Restrict VM86 mode"
-+ depends on X86_32
-+
-+ help
-+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
-+ make use of a special execution mode on 32bit x86 processors called
-+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
-+ video cards and will still work with this option enabled. The purpose
-+ of the option is to prevent exploitation of emulation errors in
-+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
-+ Nearly all users should be able to enable this option.
-+
-+config GRKERNSEC_IO
-+ bool "Disable privileged I/O"
-+ depends on X86
-+ select RTC_CLASS
-+ select RTC_INTF_DEV
-+ select RTC_DRV_CMOS
-+
-+ help
-+ If you say Y here, all ioperm and iopl calls will return an error.
-+ Ioperm and iopl can be used to modify the running kernel.
-+ Unfortunately, some programs need this access to operate properly,
-+ the most notable of which are XFree86 and hwclock. hwclock can be
-+ remedied by having RTC support in the kernel, so real-time
-+ clock support is enabled if this option is enabled, to ensure
-+ that hwclock operates correctly. XFree86 still will not
-+ operate correctly with this option enabled, so DO NOT CHOOSE Y
-+ IF YOU USE XFree86. If you use XFree86 and you still want to
-+ protect your kernel against modification, use the RBAC system.
-+
-+config GRKERNSEC_PROC_MEMMAP
-+ bool "Remove addresses from /proc/<pid>/[smaps|maps|stat]"
-+ default y if (PAX_NOEXEC || PAX_ASLR)
-+ depends on PAX_NOEXEC || PAX_ASLR
-+ help
-+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
-+ give no information about the addresses of its mappings if
-+ PaX features that rely on random addresses are enabled on the task.
-+ If you use PaX it is greatly recommended that you say Y here as it
-+ closes up a hole that makes the full ASLR useless for suid
-+ binaries.
-+
-+config GRKERNSEC_BRUTE
-+ bool "Deter exploit bruteforcing"
-+ help
-+ If you say Y here, attempts to bruteforce exploits against forking
-+ daemons such as apache or sshd will be deterred. When a child of a
-+ forking daemon is killed by PaX or crashes due to an illegal
-+ instruction, the parent process will be delayed 30 seconds upon every
-+ subsequent fork until the administrator is able to assess the
-+ situation and restart the daemon. It is recommended that you also
-+ enable signal logging in the auditing section so that logs are
-+ generated when a process performs an illegal instruction.
-+
-+config GRKERNSEC_MODHARDEN
-+ bool "Harden module auto-loading"
-+ depends on MODULES
-+ help
-+ If you say Y here, module auto-loading in response to use of some
-+ feature implemented by an unloaded module will be restricted to
-+ root users. Enabling this option helps defend against attacks
-+ by unprivileged users who abuse the auto-loading behavior to
-+ cause a vulnerable module to load that is then exploited.
-+
-+ If this option prevents a legitimate use of auto-loading for a
-+ non-root user, the administrator can execute modprobe manually
-+ with the exact name of the module mentioned in the alert log.
-+ Alternatively, the administrator can add the module to the list
-+ of modules loaded at boot by modifying init scripts.
-+
-+ Modification of init scripts will most likely be needed on
-+ Ubuntu servers with encrypted home directory support enabled,
-+ as the first non-root user logging in will cause the ecb(aes),
-+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
-+
-+config GRKERNSEC_HIDESYM
-+ bool "Hide kernel symbols"
-+ help
-+ If you say Y here, getting information on loaded modules, and
-+ displaying all kernel symbols through a syscall will be restricted
-+ to users with CAP_SYS_MODULE. For software compatibility reasons,
-+ /proc/kallsyms will be restricted to the root user. The RBAC
-+ system can hide that entry even from root. Note that this option
-+ is only effective provided the following conditions are met:
-+ 1) The kernel using grsecurity is not precompiled by some distribution
-+ 2) You are using the RBAC system and hiding other files such as your
-+ kernel image and System.map. Alternatively, enabling this option
-+ causes the permissions on /boot, /lib/modules, and the kernel
-+ source directory to change at compile time to prevent
-+ reading by non-root users.
-+ If the above conditions are met, this option will aid in providing a
-+ useful protection against local kernel exploitation of overflows
-+ and arbitrary read/write vulnerabilities.
-+
-+endmenu
-+menu "Role Based Access Control Options"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_NO_RBAC
-+ bool "Disable RBAC system"
-+ help
-+ If you say Y here, the /dev/grsec device will be removed from the kernel,
-+ preventing the RBAC system from being enabled. You should only say Y
-+ here if you have no intention of using the RBAC system, so as to prevent
-+ an attacker with root access from misusing the RBAC system to hide files
-+ and processes when loadable module support and /dev/[k]mem have been
-+ locked down.
-+
-+config GRKERNSEC_ACL_HIDEKERN
-+ bool "Hide kernel processes"
-+ help
-+ If you say Y here, all kernel threads will be hidden to all
-+ processes but those whose subject has the "view hidden processes"
-+ flag.
-+
-+config GRKERNSEC_ACL_MAXTRIES
-+ int "Maximum tries before password lockout"
-+ default 3
-+ help
-+ This option enforces the maximum number of times a user can attempt
-+ to authorize themselves with the grsecurity RBAC system before being
-+ denied the ability to attempt authorization again for a specified time.
-+ The lower the number, the harder it will be to brute-force a password.
-+
-+config GRKERNSEC_ACL_TIMEOUT
-+ int "Time to wait after max password tries, in seconds"
-+ default 30
-+ help
-+ This option specifies the time the user must wait after attempting to
-+ authorize to the RBAC system with the maximum number of invalid
-+ passwords. The higher the number, the harder it will be to brute-force
-+ a password.
-+
-+endmenu
-+menu "Filesystem Protections"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_PROC
-+ bool "Proc restrictions"
-+ help
-+ If you say Y here, the permissions of the /proc filesystem
-+ will be altered to enhance system security and privacy. You MUST
-+ choose either a user only restriction or a user and group restriction.
-+ Depending upon the option you choose, you can either restrict users to
-+ see only the processes they themselves run, or choose a group that can
-+ view all processes and files normally restricted to root if you choose
-+ the "restrict to user only" option. NOTE: If you're running identd as
-+ a non-root user, you will have to run it as the group you specify here.
-+
-+config GRKERNSEC_PROC_USER
-+ bool "Restrict /proc to user only"
-+ depends on GRKERNSEC_PROC
-+ help
-+ If you say Y here, non-root users will only be able to view their own
-+ processes, and restricts them from viewing network-related information,
-+ and viewing kernel symbol and module information.
-+
-+config GRKERNSEC_PROC_USERGROUP
-+ bool "Allow special group"
-+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
-+ help
-+ If you say Y here, you will be able to select a group that will be
-+ able to view all processes, network-related information, and
-+ kernel and symbol information. This option is useful if you want
-+ to run identd as a non-root user.
-+
-+config GRKERNSEC_PROC_GID
-+ int "GID for special group"
-+ depends on GRKERNSEC_PROC_USERGROUP
-+ default 1001
-+
-+config GRKERNSEC_PROC_ADD
-+ bool "Additional restrictions"
-+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
-+ help
-+ If you say Y here, additional restrictions will be placed on
-+ /proc that keep normal users from viewing device information and
-+ slabinfo information that could be useful for exploits.
-+
-+config GRKERNSEC_LINK
-+ bool "Linking restrictions"
-+ help
-+ If you say Y here, /tmp race exploits will be prevented, since users
-+ will no longer be able to follow symlinks owned by other users in
-+ world-writable +t directories (i.e. /tmp), unless the owner of the
-+ symlink is the owner of the directory. users will also not be
-+ able to hardlink to files they do not own. If the sysctl option is
-+ enabled, a sysctl option with name "linking_restrictions" is created.
-+
-+config GRKERNSEC_FIFO
-+ bool "FIFO restrictions"
-+ help
-+ If you say Y here, users will not be able to write to FIFOs they don't
-+ own in world-writable +t directories (i.e. /tmp), unless the owner of
-+ the FIFO is the same owner of the directory it's held in. If the sysctl
-+ option is enabled, a sysctl option with name "fifo_restrictions" is
-+ created.
-+
-+config GRKERNSEC_ROFS
-+ bool "Runtime read-only mount protection"
-+ help
-+ If you say Y here, a sysctl option with name "romount_protect" will
-+ be created. By setting this option to 1 at runtime, filesystems
-+ will be protected in the following ways:
-+ * No new writable mounts will be allowed
-+ * Existing read-only mounts won't be able to be remounted read/write
-+ * Write operations will be denied on all block devices
-+ This option acts independently of grsec_lock: once it is set to 1,
-+ it cannot be turned off. Therefore, please be mindful of the resulting
-+ behavior if this option is enabled in an init script on a read-only
-+ filesystem. This feature is mainly intended for secure embedded systems.
-+
-+config GRKERNSEC_CHROOT
-+ bool "Chroot jail restrictions"
-+ help
-+ If you say Y here, you will be able to choose several options that will
-+ make breaking out of a chrooted jail much more difficult. If you
-+ encounter no software incompatibilities with the following options, it
-+ is recommended that you enable each one.
-+
-+config GRKERNSEC_CHROOT_MOUNT
-+ bool "Deny mounts"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, processes inside a chroot will not be able to
-+ mount or remount filesystems. If the sysctl option is enabled, a
-+ sysctl option with name "chroot_deny_mount" is created.
-+
-+config GRKERNSEC_CHROOT_DOUBLE
-+ bool "Deny double-chroots"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, processes inside a chroot will not be able to chroot
-+ again outside the chroot. This is a widely used method of breaking
-+ out of a chroot jail and should not be allowed. If the sysctl
-+ option is enabled, a sysctl option with name
-+ "chroot_deny_chroot" is created.
-+
-+config GRKERNSEC_CHROOT_PIVOT
-+ bool "Deny pivot_root in chroot"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, processes inside a chroot will not be able to use
-+ a function called pivot_root() that was introduced in Linux 2.3.41. It
-+ works similar to chroot in that it changes the root filesystem. This
-+ function could be misused in a chrooted process to attempt to break out
-+ of the chroot, and therefore should not be allowed. If the sysctl
-+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
-+ created.
-+
-+config GRKERNSEC_CHROOT_CHDIR
-+ bool "Enforce chdir(\"/\") on all chroots"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, the current working directory of all newly-chrooted
-+ applications will be set to the the root directory of the chroot.
-+ The man page on chroot(2) states:
-+ Note that this call does not change the current working
-+ directory, so that `.' can be outside the tree rooted at
-+ `/'. In particular, the super-user can escape from a
-+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
-+
-+ It is recommended that you say Y here, since it's not known to break
-+ any software. If the sysctl option is enabled, a sysctl option with
-+ name "chroot_enforce_chdir" is created.
-+
-+config GRKERNSEC_CHROOT_CHMOD
-+ bool "Deny (f)chmod +s"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, processes inside a chroot will not be able to chmod
-+ or fchmod files to make them have suid or sgid bits. This protects
-+ against another published method of breaking a chroot. If the sysctl
-+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
-+ created.
-+
-+config GRKERNSEC_CHROOT_FCHDIR
-+ bool "Deny fchdir out of chroot"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
-+ to a file descriptor of the chrooting process that points to a directory
-+ outside the filesystem will be stopped. If the sysctl option
-+ is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
-+
-+config GRKERNSEC_CHROOT_MKNOD
-+ bool "Deny mknod"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, processes inside a chroot will not be allowed to
-+ mknod. The problem with using mknod inside a chroot is that it
-+ would allow an attacker to create a device entry that is the same
-+ as one on the physical root of your system, which could range from
-+ anything from the console device to a device for your harddrive (which
-+ they could then use to wipe the drive or steal data). It is recommended
-+ that you say Y here, unless you run into software incompatibilities.
-+ If the sysctl option is enabled, a sysctl option with name
-+ "chroot_deny_mknod" is created.
-+
-+config GRKERNSEC_CHROOT_SHMAT
-+ bool "Deny shmat() out of chroot"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, processes inside a chroot will not be able to attach
-+ to shared memory segments that were created outside of the chroot jail.
-+ It is recommended that you say Y here. If the sysctl option is enabled,
-+ a sysctl option with name "chroot_deny_shmat" is created.
-+
-+config GRKERNSEC_CHROOT_UNIX
-+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, processes inside a chroot will not be able to
-+ connect to abstract (meaning not belonging to a filesystem) Unix
-+ domain sockets that were bound outside of a chroot. It is recommended
-+ that you say Y here. If the sysctl option is enabled, a sysctl option
-+ with name "chroot_deny_unix" is created.
-+
-+config GRKERNSEC_CHROOT_FINDTASK
-+ bool "Protect outside processes"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, processes inside a chroot will not be able to
-+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
-+ getsid, or view any process outside of the chroot. If the sysctl
-+ option is enabled, a sysctl option with name "chroot_findtask" is
-+ created.
-+
-+config GRKERNSEC_CHROOT_NICE
-+ bool "Restrict priority changes"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, processes inside a chroot will not be able to raise
-+ the priority of processes in the chroot, or alter the priority of
-+ processes outside the chroot. This provides more security than simply
-+ removing CAP_SYS_NICE from the process' capability set. If the
-+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
-+ is created.
-+
-+config GRKERNSEC_CHROOT_SYSCTL
-+ bool "Deny sysctl writes"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, an attacker in a chroot will not be able to
-+ write to sysctl entries, either by sysctl(2) or through a /proc
-+ interface. It is strongly recommended that you say Y here. If the
-+ sysctl option is enabled, a sysctl option with name
-+ "chroot_deny_sysctl" is created.
-+
-+config GRKERNSEC_CHROOT_CAPS
-+ bool "Capability restrictions"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, the capabilities on all root processes within a
-+ chroot jail will be lowered to stop module insertion, raw i/o,
-+ system and net admin tasks, rebooting the system, modifying immutable
-+ files, modifying IPC owned by another, and changing the system time.
-+ This is left an option because it can break some apps. Disable this
-+ if your chrooted apps are having problems performing those kinds of
-+ tasks. If the sysctl option is enabled, a sysctl option with
-+ name "chroot_caps" is created.
-+
-+endmenu
-+menu "Kernel Auditing"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_AUDIT_GROUP
-+ bool "Single group for auditing"
-+ help
-+ If you say Y here, the exec, chdir, and (un)mount logging features
-+ will only operate on a group you specify. This option is recommended
-+ if you only want to watch certain users instead of having a large
-+ amount of logs from the entire system. If the sysctl option is enabled,
-+ a sysctl option with name "audit_group" is created.
-+
-+config GRKERNSEC_AUDIT_GID
-+ int "GID for auditing"
-+ depends on GRKERNSEC_AUDIT_GROUP
-+ default 1007
-+
-+config GRKERNSEC_EXECLOG
-+ bool "Exec logging"
-+ help
-+ If you say Y here, all execve() calls will be logged (since the
-+ other exec*() calls are frontends to execve(), all execution
-+ will be logged). Useful for shell-servers that like to keep track
-+ of their users. If the sysctl option is enabled, a sysctl option with
-+ name "exec_logging" is created.
-+ WARNING: This option when enabled will produce a LOT of logs, especially
-+ on an active system.
-+
-+config GRKERNSEC_RESLOG
-+ bool "Resource logging"
-+ help
-+ If you say Y here, all attempts to overstep resource limits will
-+ be logged with the resource name, the requested size, and the current
-+ limit. It is highly recommended that you say Y here. If the sysctl
-+ option is enabled, a sysctl option with name "resource_logging" is
-+ created. If the RBAC system is enabled, the sysctl value is ignored.
-+
-+config GRKERNSEC_CHROOT_EXECLOG
-+ bool "Log execs within chroot"
-+ help
-+ If you say Y here, all executions inside a chroot jail will be logged
-+ to syslog. This can cause a large amount of logs if certain
-+ applications (eg. djb's daemontools) are installed on the system, and
-+ is therefore left as an option. If the sysctl option is enabled, a
-+ sysctl option with name "chroot_execlog" is created.
-+
-+config GRKERNSEC_AUDIT_PTRACE
-+ bool "Ptrace logging"
-+ help
-+ If you say Y here, all attempts to attach to a process via ptrace
-+ will be logged. If the sysctl option is enabled, a sysctl option
-+ with name "audit_ptrace" is created.
-+
-+config GRKERNSEC_AUDIT_CHDIR
-+ bool "Chdir logging"
-+ help
-+ If you say Y here, all chdir() calls will be logged. If the sysctl
-+ option is enabled, a sysctl option with name "audit_chdir" is created.
-+
-+config GRKERNSEC_AUDIT_MOUNT
-+ bool "(Un)Mount logging"
-+ help
-+ If you say Y here, all mounts and unmounts will be logged. If the
-+ sysctl option is enabled, a sysctl option with name "audit_mount" is
-+ created.
-+
-+config GRKERNSEC_SIGNAL
-+ bool "Signal logging"
-+ help
-+ If you say Y here, certain important signals will be logged, such as
-+ SIGSEGV, which will as a result inform you of when a error in a program
-+ occurred, which in some cases could mean a possible exploit attempt.
-+ If the sysctl option is enabled, a sysctl option with name
-+ "signal_logging" is created.
-+
-+config GRKERNSEC_FORKFAIL
-+ bool "Fork failure logging"
-+ help
-+ If you say Y here, all failed fork() attempts will be logged.
-+ This could suggest a fork bomb, or someone attempting to overstep
-+ their process limit. If the sysctl option is enabled, a sysctl option
-+ with name "forkfail_logging" is created.
-+
-+config GRKERNSEC_TIME
-+ bool "Time change logging"
-+ help
-+ If you say Y here, any changes of the system clock will be logged.
-+ If the sysctl option is enabled, a sysctl option with name
-+ "timechange_logging" is created.
-+
-+config GRKERNSEC_PROC_IPADDR
-+ bool "/proc/<pid>/ipaddr support"
-+ help
-+ If you say Y here, a new entry will be added to each /proc/<pid>
-+ directory that contains the IP address of the person using the task.
-+ The IP is carried across local TCP and AF_UNIX stream sockets.
-+ This information can be useful for IDS/IPSes to perform remote response
-+ to a local attack. The entry is readable by only the owner of the
-+ 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_AUDIT_TEXTREL
-+ bool 'ELF text relocations logging (READ HELP)'
-+ depends on PAX_MPROTECT
-+ help
-+ If you say Y here, text relocations will be logged with the filename
-+ of the offending library or binary. The purpose of the feature is
-+ to help Linux distribution developers get rid of libraries and
-+ binaries that need text relocations which hinder the future progress
-+ of PaX. Only Linux distribution developers should say Y here, and
-+ never on a production machine, as this option creates an information
-+ leak that could aid an attacker in defeating the randomization of
-+ a single memory region. If the sysctl option is enabled, a sysctl
-+ option with name "audit_textrel" is created.
-+
-+endmenu
-+
-+menu "Executable Protections"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_EXECVE
-+ bool "Enforce RLIMIT_NPROC on execs"
-+ help
-+ If you say Y here, users with a resource limit on processes will
-+ have the value checked during execve() calls. The current system
-+ only checks the system limit during fork() calls. If the sysctl option
-+ is enabled, a sysctl option with name "execve_limiting" is created.
-+
-+config GRKERNSEC_DMESG
-+ bool "Dmesg(8) restriction"
-+ help
-+ If you say Y here, non-root users will not be able to use dmesg(8)
-+ to view up to the last 4kb of messages in the kernel's log buffer.
-+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
-+ created.
-+
-+config GRKERNSEC_HARDEN_PTRACE
-+ bool "Deter ptrace-based process snooping"
-+ help
-+ If you say Y here, TTY sniffers and other malicious monitoring
-+ programs implemented through ptrace will be defeated. If you
-+ have been using the RBAC system, this option has already been
-+ enabled for several years for all users, with the ability to make
-+ fine-grained exceptions.
-+
-+ This option only affects the ability of non-root users to ptrace
-+ processes that are not a descendent of the ptracing process.
-+ This means that strace ./binary and gdb ./binary will still work,
-+ but attaching to arbitrary processes will not. If the sysctl
-+ option is enabled, a sysctl option with name "harden_ptrace" is
-+ created.
-+
-+config GRKERNSEC_TPE
-+ bool "Trusted Path Execution (TPE)"
-+ help
-+ If you say Y here, you will be able to choose a gid to add to the
-+ supplementary groups of users you want to mark as "untrusted."
-+ These users will not be able to execute any files that are not in
-+ root-owned directories writable only by root. If the sysctl option
-+ is enabled, a sysctl option with name "tpe" is created.
-+
-+config GRKERNSEC_TPE_ALL
-+ bool "Partially restrict non-root users"
-+ depends on GRKERNSEC_TPE
-+ help
-+ If you say Y here, All non-root users other than the ones in the
-+ group specified in the main TPE option will only be allowed to
-+ execute files in directories they own that are not group or
-+ world-writable, or in directories owned by root and writable only by
-+ root. If the sysctl option is enabled, a sysctl option with name
-+ "tpe_restrict_all" is created.
-+
-+config GRKERNSEC_TPE_INVERT
-+ bool "Invert GID option"
-+ depends on GRKERNSEC_TPE
-+ help
-+ If you say Y here, the group you specify in the TPE configuration will
-+ decide what group TPE restrictions will be *disabled* for. This
-+ option is useful if you want TPE restrictions to be applied to most
-+ users on the system.
-+
-+config GRKERNSEC_TPE_GID
-+ int "GID for untrusted users"
-+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
-+ default 1005
-+ help
-+ If you have selected the "Invert GID option" above, setting this
-+ GID determines what group TPE restrictions will be *disabled* for.
-+ If you have not selected the "Invert GID option" above, setting this
-+ GID determines what group TPE restrictions will be *enabled* for.
-+ If the sysctl option is enabled, a sysctl option with name "tpe_gid"
-+ is created.
-+
-+config GRKERNSEC_TPE_GID
-+ int "GID for trusted users"
-+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
-+ default 1005
-+ help
-+ If you have selected the "Invert GID option" above, setting this
-+ GID determines what group TPE restrictions will be *disabled* for.
-+ If you have not selected the "Invert GID option" above, setting this
-+ GID determines what group TPE restrictions will be *enabled* for.
-+ If the sysctl option is enabled, a sysctl option with name "tpe_gid"
-+ is created.
-+
-+endmenu
-+menu "Network Protections"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_RANDNET
-+ bool "Larger entropy pools"
-+ help
-+ If you say Y here, the entropy pools used for many features of Linux
-+ and grsecurity will be doubled in size. Since several grsecurity
-+ features use additional randomness, it is recommended that you say Y
-+ here. Saying Y here has a similar effect as modifying
-+ /proc/sys/kernel/random/poolsize.
-+
-+config GRKERNSEC_BLACKHOLE
-+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
-+ help
-+ If you say Y here, neither TCP resets nor ICMP
-+ destination-unreachable packets will be sent in response to packets
-+ sent to ports for which no associated listening process exists.
-+ This feature supports both IPV4 and IPV6 and exempts the
-+ loopback interface from blackholing. Enabling this feature
-+ makes a host more resilient to DoS attacks and reduces network
-+ visibility against scanners.
-+
-+ The blackhole feature as-implemented is equivalent to the FreeBSD
-+ blackhole feature, as it prevents RST responses to all packets, not
-+ just SYNs. Under most application behavior this causes no
-+ problems, but applications (like haproxy) may not close certain
-+ connections in a way that cleanly terminates them on the remote
-+ end, leaving the remote host in LAST_ACK state. Because of this
-+ side-effect and to prevent intentional LAST_ACK DoSes, this
-+ feature also adds automatic mitigation against such attacks.
-+ The mitigation drastically reduces the amount of time a socket
-+ can spend in LAST_ACK state. If you're using haproxy and not
-+ all servers it connects to have this option enabled, consider
-+ disabling this feature on the haproxy host.
-+
-+ If the sysctl option is enabled, two sysctl options with names
-+ "ip_blackhole" and "lastack_retries" will be created.
-+ While "ip_blackhole" takes the standard zero/non-zero on/off
-+ toggle, "lastack_retries" uses the same kinds of values as
-+ "tcp_retries1" and "tcp_retries2". The default value of 4
-+ prevents a socket from lasting more than 45 seconds in LAST_ACK
-+ state.
-+
-+config GRKERNSEC_SOCKET
-+ bool "Socket restrictions"
-+ help
-+ If you say Y here, you will be able to choose from several options.
-+ If you assign a GID on your system and add it to the supplementary
-+ groups of users you want to restrict socket access to, this patch
-+ will perform up to three things, based on the option(s) you choose.
-+
-+config GRKERNSEC_SOCKET_ALL
-+ bool "Deny any sockets to group"
-+ depends on GRKERNSEC_SOCKET
-+ help
-+ If you say Y here, you will be able to choose a GID of whose users will
-+ be unable to connect to other hosts from your machine or run server
-+ applications from your machine. If the sysctl option is enabled, a
-+ sysctl option with name "socket_all" is created.
++ },
++ {
++ .procname = "socket_client_gid",
++ .data = &grsec_socket_client_gid,
++ .maxlen = sizeof(int),
++ .mode = 0600,
++ .proc_handler = &proc_dointvec,
++ },
++#endif
++#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
++ {
++ .procname = "socket_server",
++ .data = &grsec_enable_socket_server,
++ .maxlen = sizeof(int),
++ .mode = 0600,
++ .proc_handler = &proc_dointvec,
++ },
++ {
++ .procname = "socket_server_gid",
++ .data = &grsec_socket_server_gid,
++ .maxlen = sizeof(int),
++ .mode = 0600,
++ .proc_handler = &proc_dointvec,
++ },
++#endif
++#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
++ {
++ .procname = "audit_group",
++ .data = &grsec_enable_group,
++ .maxlen = sizeof(int),
++ .mode = 0600,
++ .proc_handler = &proc_dointvec,
++ },
++ {
++ .procname = "audit_gid",
++ .data = &grsec_audit_gid,
++ .maxlen = sizeof(int),
++ .mode = 0600,
++ .proc_handler = &proc_dointvec,
++ },
++#endif
++#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
++ {
++ .procname = "audit_chdir",
++ .data = &grsec_enable_chdir,
++ .maxlen = sizeof(int),
++ .mode = 0600,
++ .proc_handler = &proc_dointvec,
++ },
++#endif
++#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
++ {
++ .procname = "audit_mount",
++ .data = &grsec_enable_mount,
++ .maxlen = sizeof(int),
++ .mode = 0600,
++ .proc_handler = &proc_dointvec,
++ },
++#endif
++#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
++ {
++ .procname = "audit_textrel",
++ .data = &grsec_enable_audit_textrel,
++ .maxlen = sizeof(int),
++ .mode = 0600,
++ .proc_handler = &proc_dointvec,
++ },
++#endif
++#ifdef CONFIG_GRKERNSEC_DMESG
++ {
++ .procname = "dmesg",
++ .data = &grsec_enable_dmesg,
++ .maxlen = sizeof(int),
++ .mode = 0600,
++ .proc_handler = &proc_dointvec,
++ },
++#endif
++#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
++ {
++ .procname = "chroot_findtask",
++ .data = &grsec_enable_chroot_findtask,
++ .maxlen = sizeof(int),
++ .mode = 0600,
++ .proc_handler = &proc_dointvec,
++ },
++#endif
++#ifdef CONFIG_GRKERNSEC_RESLOG
++ {
++ .procname = "resource_logging",
++ .data = &grsec_resource_logging,
++ .maxlen = sizeof(int),
++ .mode = 0600,
++ .proc_handler = &proc_dointvec,
++ },
++#endif
++#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
++ {
++ .procname = "audit_ptrace",
++ .data = &grsec_enable_audit_ptrace,
++ .maxlen = sizeof(int),
++ .mode = 0600,
++ .proc_handler = &proc_dointvec,
++ },
++#endif
++#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
++ {
++ .procname = "harden_ptrace",
++ .data = &grsec_enable_harden_ptrace,
++ .maxlen = sizeof(int),
++ .mode = 0600,
++ .proc_handler = &proc_dointvec,
++ },
++#endif
++ {
++ .procname = "grsec_lock",
++ .data = &grsec_lock,
++ .maxlen = sizeof(int),
++ .mode = 0600,
++ .proc_handler = &proc_dointvec,
++ },
++#endif
++#ifdef CONFIG_GRKERNSEC_ROFS
++ {
++ .procname = "romount_protect",
++ .data = &grsec_enable_rofs,
++ .maxlen = sizeof(int),
++ .mode = 0600,
++ .proc_handler = &proc_dointvec_minmax,
++ .extra1 = &one,
++ .extra2 = &one,
++ },
++#endif
++ { }
++};
++#endif
+diff -urNp linux-2.6.34.1/grsecurity/grsec_textrel.c linux-2.6.34.1/grsecurity/grsec_textrel.c
+--- linux-2.6.34.1/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/grsec_textrel.c 2010-07-07 09:04:56.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>
+
-+config GRKERNSEC_SOCKET_ALL_GID
-+ int "GID to deny all sockets for"
-+ depends on GRKERNSEC_SOCKET_ALL
-+ default 1004
-+ help
-+ Here you can choose the GID to disable socket access for. Remember to
-+ add the users you want socket access disabled for to the GID
-+ specified here. If the sysctl option is enabled, a sysctl option
-+ with name "socket_all_gid" is created.
++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.34.1/grsecurity/grsec_time.c linux-2.6.34.1/grsecurity/grsec_time.c
+--- linux-2.6.34.1/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/grsec_time.c 2010-07-07 09:04:56.000000000 -0400
+@@ -0,0 +1,13 @@
++#include <linux/kernel.h>
++#include <linux/sched.h>
++#include <linux/grinternal.h>
+
-+config GRKERNSEC_SOCKET_CLIENT
-+ bool "Deny client sockets to group"
-+ depends on GRKERNSEC_SOCKET
-+ help
-+ If you say Y here, you will be able to choose a GID of whose users will
-+ be unable to connect to other hosts from your machine, but will be
-+ able to run servers. If this option is enabled, all users in the group
-+ you specify will have to use passive mode when initiating ftp transfers
-+ from the shell on your machine. If the sysctl option is enabled, a
-+ sysctl option with name "socket_client" is created.
++void
++gr_log_timechange(void)
++{
++#ifdef CONFIG_GRKERNSEC_TIME
++ if (grsec_enable_time)
++ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
++#endif
++ return;
++}
+diff -urNp linux-2.6.34.1/grsecurity/grsec_tpe.c linux-2.6.34.1/grsecurity/grsec_tpe.c
+--- linux-2.6.34.1/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/grsec_tpe.c 2010-07-07 09:04:56.000000000 -0400
+@@ -0,0 +1,38 @@
++#include <linux/kernel.h>
++#include <linux/sched.h>
++#include <linux/file.h>
++#include <linux/fs.h>
++#include <linux/grinternal.h>
+
-+config GRKERNSEC_SOCKET_CLIENT_GID
-+ int "GID to deny client sockets for"
-+ depends on GRKERNSEC_SOCKET_CLIENT
-+ default 1003
-+ help
-+ Here you can choose the GID to disable client socket access for.
-+ Remember to add the users you want client socket access disabled for to
-+ the GID specified here. If the sysctl option is enabled, a sysctl
-+ option with name "socket_client_gid" is created.
++extern int gr_acl_tpe_check(void);
+
-+config GRKERNSEC_SOCKET_SERVER
-+ bool "Deny server sockets to group"
-+ depends on GRKERNSEC_SOCKET
-+ help
-+ If you say Y here, you will be able to choose a GID of whose users will
-+ be unable to run server applications from your machine. If the sysctl
-+ option is enabled, a sysctl option with name "socket_server" is created.
++int
++gr_tpe_allow(const struct file *file)
++{
++#ifdef CONFIG_GRKERNSEC
++ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
++ const struct cred *cred = current_cred();
+
-+config GRKERNSEC_SOCKET_SERVER_GID
-+ int "GID to deny server sockets for"
-+ depends on GRKERNSEC_SOCKET_SERVER
-+ default 1002
-+ help
-+ Here you can choose the GID to disable server socket access for.
-+ Remember to add the users you want server socket access disabled for to
-+ the GID specified here. If the sysctl option is enabled, a sysctl
-+ option with name "socket_server_gid" is created.
++ if (cred->uid && ((grsec_enable_tpe &&
++#ifdef CONFIG_GRKERNSEC_TPE_INVERT
++ !in_group_p(grsec_tpe_gid)
++#else
++ in_group_p(grsec_tpe_gid)
++#endif
++ ) || gr_acl_tpe_check()) &&
++ (inode->i_uid || (!inode->i_uid && ((inode->i_mode & S_IWGRP) ||
++ (inode->i_mode & S_IWOTH))))) {
++ gr_log_fs_generic(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, file->f_path.dentry, file->f_path.mnt);
++ return 0;
++ }
++#ifdef CONFIG_GRKERNSEC_TPE_ALL
++ if (cred->uid && grsec_enable_tpe && grsec_enable_tpe_all &&
++ ((inode->i_uid && (inode->i_uid != cred->uid)) ||
++ (inode->i_mode & S_IWGRP) || (inode->i_mode & S_IWOTH))) {
++ gr_log_fs_generic(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, file->f_path.dentry, file->f_path.mnt);
++ return 0;
++ }
++#endif
++#endif
++ return 1;
++}
+diff -urNp linux-2.6.34.1/grsecurity/grsum.c linux-2.6.34.1/grsecurity/grsum.c
+--- linux-2.6.34.1/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/grsecurity/grsum.c 2010-07-07 09:04:56.000000000 -0400
+@@ -0,0 +1,61 @@
++#include <linux/err.h>
++#include <linux/kernel.h>
++#include <linux/sched.h>
++#include <linux/mm.h>
++#include <linux/scatterlist.h>
++#include <linux/crypto.h>
++#include <linux/gracl.h>
+
-+endmenu
-+menu "Sysctl support"
-+depends on GRKERNSEC && SYSCTL
+
-+config GRKERNSEC_SYSCTL
-+ bool "Sysctl support"
-+ help
-+ If you say Y here, you will be able to change the options that
-+ grsecurity runs with at bootup, without having to recompile your
-+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
-+ to enable (1) or disable (0) various features. All the sysctl entries
-+ are mutable until the "grsec_lock" entry is set to a non-zero value.
-+ All features enabled in the kernel configuration are disabled at boot
-+ if you do not say Y to the "Turn on features by default" option.
-+ All options should be set at startup, and the grsec_lock entry should
-+ be set to a non-zero value after all the options are set.
-+ *THIS IS EXTREMELY IMPORTANT*
++#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
++#error "crypto and sha256 must be built into the kernel"
++#endif
+
-+config GRKERNSEC_SYSCTL_DISTRO
-+ bool "Extra sysctl support for distro makers (READ HELP)"
-+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
-+ help
-+ If you say Y here, additional sysctl options will be created
-+ for features that affect processes running as root. Therefore,
-+ it is critical when using this option that the grsec_lock entry be
-+ enabled after boot. Only distros with prebuilt kernel packages
-+ with this option enabled that can ensure grsec_lock is enabled
-+ after boot should use this option.
-+ *Failure to set grsec_lock after boot makes all grsec features
-+ this option covers useless*
++int
++chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
++{
++ char *p;
++ struct crypto_hash *tfm;
++ struct hash_desc desc;
++ struct scatterlist sg;
++ unsigned char temp_sum[GR_SHA_LEN];
++ volatile int retval = 0;
++ volatile int dummy = 0;
++ unsigned int i;
+
-+ Currently this option creates the following sysctl entries:
-+ "Disable Privileged I/O": "disable_priv_io"
++ sg_init_table(&sg, 1);
+
-+config GRKERNSEC_SYSCTL_ON
-+ bool "Turn on features by default"
-+ depends on GRKERNSEC_SYSCTL
-+ help
-+ If you say Y here, instead of having all features enabled in the
-+ kernel configuration disabled at boot time, the features will be
-+ enabled at boot time. It is recommended you say Y here unless
-+ there is some reason you would want all sysctl-tunable features to
-+ be disabled by default. As mentioned elsewhere, it is important
-+ to enable the grsec_lock entry once you have finished modifying
-+ the sysctl entries.
++ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
++ if (IS_ERR(tfm)) {
++ /* should never happen, since sha256 should be built in */
++ return 1;
++ }
+
-+endmenu
-+menu "Logging Options"
-+depends on GRKERNSEC
++ desc.tfm = tfm;
++ desc.flags = 0;
+
-+config GRKERNSEC_FLOODTIME
-+ int "Seconds in between log messages (minimum)"
-+ default 10
-+ help
-+ This option allows you to enforce the number of seconds between
-+ grsecurity log messages. The default should be suitable for most
-+ people, however, if you choose to change it, choose a value small enough
-+ to allow informative logs to be produced, but large enough to
-+ prevent flooding.
++ crypto_hash_init(&desc);
+
-+config GRKERNSEC_FLOODBURST
-+ int "Number of messages in a burst (maximum)"
-+ default 4
-+ help
-+ This option allows you to choose the maximum number of messages allowed
-+ within the flood time interval you chose in a separate option. The
-+ default should be suitable for most people, however if you find that
-+ many of your logs are being interpreted as flooding, you may want to
-+ raise this value.
++ p = salt;
++ sg_set_buf(&sg, p, GR_SALT_LEN);
++ crypto_hash_update(&desc, &sg, sg.length);
+
-+endmenu
++ p = entry->pw;
++ sg_set_buf(&sg, p, strlen(p));
++
++ crypto_hash_update(&desc, &sg, sg.length);
+
-+endmenu
-diff -urNp linux-2.6.34/grsecurity/Makefile linux-2.6.34/grsecurity/Makefile
---- linux-2.6.34/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/grsecurity/Makefile 2010-07-01 20:45:16.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
-+# into an RBAC system
-+#
-+# All code in this directory and various hooks inserted throughout the kernel
-+# are copyright Brad Spengler - Open Source Security, Inc., and released
-+# under the GPL v2 or higher
++ crypto_hash_final(&desc, temp_sum);
+
-+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
++ memset(entry->pw, 0, GR_PW_LEN);
+
-+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 \
-+ gracl_learn.o grsec_log.o
-+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
++ for (i = 0; i < GR_SHA_LEN; i++)
++ if (sum[i] != temp_sum[i])
++ retval = 1;
++ else
++ dummy = 1; // waste a cycle
+
-+ifndef CONFIG_GRKERNSEC
-+obj-y += grsec_disabled.o
-+endif
++ crypto_free_hash(tfm);
+
-+ifdef CONFIG_GRKERNSEC_HIDESYM
-+extra-y := grsec_hidesym.o
-+$(obj)/grsec_hidesym.o:
-+ @-chmod -f 500 /boot
-+ @-chmod -f 500 /lib/modules
-+ @-chmod -f 700 .
-+ @echo ' grsec: protected kernel image paths'
-+endif
-diff -urNp linux-2.6.34/include/acpi/acoutput.h linux-2.6.34/include/acpi/acoutput.h
---- linux-2.6.34/include/acpi/acoutput.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/acpi/acoutput.h 2010-07-01 20:45:15.000000000 -0400
++ return retval;
++}
+diff -urNp linux-2.6.34.1/include/acpi/acoutput.h linux-2.6.34.1/include/acpi/acoutput.h
+--- linux-2.6.34.1/include/acpi/acoutput.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/acpi/acoutput.h 2010-07-07 09:04:56.000000000 -0400
@@ -266,8 +266,8 @@
* leaving no executable debug code!
*/
#endif /* ACPI_DEBUG_OUTPUT */
-diff -urNp linux-2.6.34/include/acpi/acpi_drivers.h linux-2.6.34/include/acpi/acpi_drivers.h
---- linux-2.6.34/include/acpi/acpi_drivers.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/acpi/acpi_drivers.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/include/acpi/acpi_drivers.h linux-2.6.34.1/include/acpi/acpi_drivers.h
+--- linux-2.6.34.1/include/acpi/acpi_drivers.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/acpi/acpi_drivers.h 2010-07-07 09:04:56.000000000 -0400
@@ -122,8 +122,8 @@ int acpi_processor_set_thermal_limit(acp
Dock Station
-------------------------------------------------------------------------- */
void *context)
{
return -ENODEV;
-diff -urNp linux-2.6.34/include/asm-generic/atomic-long.h linux-2.6.34/include/asm-generic/atomic-long.h
---- linux-2.6.34/include/asm-generic/atomic-long.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/asm-generic/atomic-long.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/include/asm-generic/atomic-long.h linux-2.6.34.1/include/asm-generic/atomic-long.h
+--- linux-2.6.34.1/include/asm-generic/atomic-long.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/asm-generic/atomic-long.h 2010-07-07 09:04:56.000000000 -0400
@@ -22,6 +22,12 @@
typedef atomic64_t atomic_long_t;
+#endif
+
#endif /* _ASM_GENERIC_ATOMIC_LONG_H */
-diff -urNp linux-2.6.34/include/asm-generic/dma-mapping-common.h linux-2.6.34/include/asm-generic/dma-mapping-common.h
---- linux-2.6.34/include/asm-generic/dma-mapping-common.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/asm-generic/dma-mapping-common.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/include/asm-generic/dma-mapping-common.h linux-2.6.34.1/include/asm-generic/dma-mapping-common.h
+--- linux-2.6.34.1/include/asm-generic/dma-mapping-common.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/asm-generic/dma-mapping-common.h 2010-07-07 09:04:56.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.34/include/asm-generic/futex.h linux-2.6.34/include/asm-generic/futex.h
---- linux-2.6.34/include/asm-generic/futex.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/asm-generic/futex.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/include/asm-generic/futex.h linux-2.6.34.1/include/asm-generic/futex.h
+--- linux-2.6.34.1/include/asm-generic/futex.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/asm-generic/futex.h 2010-07-07 09:04:56.000000000 -0400
@@ -6,7 +6,7 @@
#include <asm/errno.h>
{
return -ENOSYS;
}
-diff -urNp linux-2.6.34/include/asm-generic/int-l64.h linux-2.6.34/include/asm-generic/int-l64.h
---- linux-2.6.34/include/asm-generic/int-l64.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/asm-generic/int-l64.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/include/asm-generic/int-l64.h linux-2.6.34.1/include/asm-generic/int-l64.h
+--- linux-2.6.34.1/include/asm-generic/int-l64.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/asm-generic/int-l64.h 2010-07-07 09:04:56.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.34/include/asm-generic/int-ll64.h linux-2.6.34/include/asm-generic/int-ll64.h
---- linux-2.6.34/include/asm-generic/int-ll64.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/asm-generic/int-ll64.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/include/asm-generic/int-ll64.h linux-2.6.34.1/include/asm-generic/int-ll64.h
+--- linux-2.6.34.1/include/asm-generic/int-ll64.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/asm-generic/int-ll64.h 2010-07-07 09:04:56.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.34/include/asm-generic/kmap_types.h linux-2.6.34/include/asm-generic/kmap_types.h
---- linux-2.6.34/include/asm-generic/kmap_types.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/asm-generic/kmap_types.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/include/asm-generic/kmap_types.h linux-2.6.34.1/include/asm-generic/kmap_types.h
+--- linux-2.6.34.1/include/asm-generic/kmap_types.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/asm-generic/kmap_types.h 2010-07-07 09:04:56.000000000 -0400
@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY,
KMAP_D(16) KM_IRQ_PTE,
KMAP_D(17) KM_NMI,
};
#undef KMAP_D
-diff -urNp linux-2.6.34/include/asm-generic/pgtable.h linux-2.6.34/include/asm-generic/pgtable.h
---- linux-2.6.34/include/asm-generic/pgtable.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/asm-generic/pgtable.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/include/asm-generic/pgtable.h linux-2.6.34.1/include/asm-generic/pgtable.h
+--- linux-2.6.34.1/include/asm-generic/pgtable.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/asm-generic/pgtable.h 2010-07-07 09:04:56.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.34/include/asm-generic/vmlinux.lds.h linux-2.6.34/include/asm-generic/vmlinux.lds.h
---- linux-2.6.34/include/asm-generic/vmlinux.lds.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/asm-generic/vmlinux.lds.h 2010-07-01 20:45:15.000000000 -0400
+diff -urNp linux-2.6.34.1/include/asm-generic/vmlinux.lds.h linux-2.6.34.1/include/asm-generic/vmlinux.lds.h
+--- linux-2.6.34.1/include/asm-generic/vmlinux.lds.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/asm-generic/vmlinux.lds.h 2010-07-07 09:04:56.000000000 -0400
@@ -203,6 +203,7 @@
.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start_rodata) = .; \
/**
* PERCPU - define output section for percpu area, simple version
-diff -urNp linux-2.6.34/include/drm/drm_pciids.h linux-2.6.34/include/drm/drm_pciids.h
---- linux-2.6.34/include/drm/drm_pciids.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/drm/drm_pciids.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/drm/drmP.h linux-2.6.34.1/include/drm/drmP.h
+--- linux-2.6.34.1/include/drm/drmP.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/drm/drmP.h 2010-07-07 09:04:56.000000000 -0400
+@@ -808,7 +808,7 @@ struct drm_driver {
+ void (*vgaarb_irq)(struct drm_device *dev, bool state);
+
+ /* Driver private ops for this object */
+- struct vm_operations_struct *gem_vm_ops;
++ const struct vm_operations_struct *gem_vm_ops;
+
+ int major;
+ int minor;
+@@ -917,7 +917,7 @@ struct drm_device {
+
+ /** \name Usage Counters */
+ /*@{ */
+- int open_count; /**< Outstanding files open */
++ atomic_t open_count; /**< Outstanding files open */
+ 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 {
+ /*@{ */
+ unsigned long counters;
+ enum drm_stat_type types[15];
+- atomic_t counts[15];
++ atomic_unchecked_t counts[15];
+ /*@} */
+
+ struct list_head filelist;
+diff -urNp linux-2.6.34.1/include/drm/drm_pciids.h linux-2.6.34.1/include/drm/drm_pciids.h
+--- linux-2.6.34.1/include/drm/drm_pciids.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/drm/drm_pciids.h 2010-07-07 09:04:56.000000000 -0400
@@ -412,7 +412,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.34/include/drm/drmP.h linux-2.6.34/include/drm/drmP.h
---- linux-2.6.34/include/drm/drmP.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/drm/drmP.h 2010-07-01 20:45:16.000000000 -0400
-@@ -808,7 +808,7 @@ struct drm_driver {
- void (*vgaarb_irq)(struct drm_device *dev, bool state);
-
- /* Driver private ops for this object */
-- struct vm_operations_struct *gem_vm_ops;
-+ const struct vm_operations_struct *gem_vm_ops;
-
- int major;
- int minor;
-@@ -917,7 +917,7 @@ struct drm_device {
-
- /** \name Usage Counters */
- /*@{ */
-- int open_count; /**< Outstanding files open */
-+ atomic_t open_count; /**< Outstanding files open */
- 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 {
- /*@{ */
- unsigned long counters;
- enum drm_stat_type types[15];
-- atomic_t counts[15];
-+ atomic_unchecked_t counts[15];
- /*@} */
-
- struct list_head filelist;
-diff -urNp linux-2.6.34/include/linux/a.out.h linux-2.6.34/include/linux/a.out.h
---- linux-2.6.34/include/linux/a.out.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/a.out.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/a.out.h linux-2.6.34.1/include/linux/a.out.h
+--- linux-2.6.34.1/include/linux/a.out.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/a.out.h 2010-07-07 09:04:56.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.34/include/linux/atmdev.h linux-2.6.34/include/linux/atmdev.h
---- linux-2.6.34/include/linux/atmdev.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/atmdev.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/atmdev.h linux-2.6.34.1/include/linux/atmdev.h
+--- linux-2.6.34.1/include/linux/atmdev.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/atmdev.h 2010-07-07 09:04:56.000000000 -0400
@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
#endif
__AAL_STAT_ITEMS
#undef __HANDLE_ITEM
};
-diff -urNp linux-2.6.34/include/linux/binfmts.h linux-2.6.34/include/linux/binfmts.h
---- linux-2.6.34/include/linux/binfmts.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/binfmts.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/binfmts.h linux-2.6.34.1/include/linux/binfmts.h
+--- linux-2.6.34.1/include/linux/binfmts.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/binfmts.h 2010-07-07 09:04:56.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.34/include/linux/blkdev.h linux-2.6.34/include/linux/blkdev.h
---- linux-2.6.34/include/linux/blkdev.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/blkdev.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/blkdev.h linux-2.6.34.1/include/linux/blkdev.h
+--- linux-2.6.34.1/include/linux/blkdev.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/blkdev.h 2010-07-07 09:04:56.000000000 -0400
@@ -1275,19 +1275,19 @@ static inline int blk_integrity_rq(struc
#endif /* CONFIG_BLK_DEV_INTEGRITY */
};
extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
-diff -urNp linux-2.6.34/include/linux/cache.h linux-2.6.34/include/linux/cache.h
---- linux-2.6.34/include/linux/cache.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/cache.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/cache.h linux-2.6.34.1/include/linux/cache.h
+--- linux-2.6.34.1/include/linux/cache.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/cache.h 2010-07-07 09:04:56.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.34/include/linux/capability.h linux-2.6.34/include/linux/capability.h
---- linux-2.6.34/include/linux/capability.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/capability.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/capability.h linux-2.6.34.1/include/linux/capability.h
+--- linux-2.6.34.1/include/linux/capability.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/capability.h 2010-07-07 09:04:56.000000000 -0400
@@ -561,6 +561,7 @@ extern const kernel_cap_t __cap_init_eff
(security_real_capable_noaudit((t), (cap)) == 0)
/* audit system wants to get cap info from files as well */
struct dentry;
-diff -urNp linux-2.6.34/include/linux/compiler-gcc4.h linux-2.6.34/include/linux/compiler-gcc4.h
---- linux-2.6.34/include/linux/compiler-gcc4.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/compiler-gcc4.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/compiler-gcc4.h linux-2.6.34.1/include/linux/compiler-gcc4.h
+--- linux-2.6.34.1/include/linux/compiler-gcc4.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/compiler-gcc4.h 2010-07-07 09:04:56.000000000 -0400
@@ -50,6 +50,10 @@
#define unreachable() __builtin_unreachable()
#endif
#endif
#if __GNUC_MINOR__ > 0
-diff -urNp linux-2.6.34/include/linux/compiler.h linux-2.6.34/include/linux/compiler.h
---- linux-2.6.34/include/linux/compiler.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/compiler.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/compiler.h linux-2.6.34.1/include/linux/compiler.h
+--- linux-2.6.34.1/include/linux/compiler.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/compiler.h 2010-07-07 09:04:56.000000000 -0400
@@ -267,6 +267,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.34/include/linux/decompress/mm.h linux-2.6.34/include/linux/decompress/mm.h
---- linux-2.6.34/include/linux/decompress/mm.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/decompress/mm.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/decompress/mm.h linux-2.6.34.1/include/linux/decompress/mm.h
+--- linux-2.6.34.1/include/linux/decompress/mm.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/decompress/mm.h 2010-07-07 09:04:56.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.34/include/linux/dma-mapping.h linux-2.6.34/include/linux/dma-mapping.h
---- linux-2.6.34/include/linux/dma-mapping.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/dma-mapping.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/dma-mapping.h linux-2.6.34.1/include/linux/dma-mapping.h
+--- linux-2.6.34.1/include/linux/dma-mapping.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/dma-mapping.h 2010-07-07 09:04:56.000000000 -0400
@@ -16,50 +16,50 @@ enum dma_data_direction {
};
};
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-diff -urNp linux-2.6.34/include/linux/elf.h linux-2.6.34/include/linux/elf.h
---- linux-2.6.34/include/linux/elf.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/elf.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/elf.h linux-2.6.34.1/include/linux/elf.h
+--- linux-2.6.34.1/include/linux/elf.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/elf.h 2010-07-07 09:04:56.000000000 -0400
@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
#define PT_GNU_EH_FRAME 0x6474e550
#endif
-diff -urNp linux-2.6.34/include/linux/fs.h linux-2.6.34/include/linux/fs.h
---- linux-2.6.34/include/linux/fs.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/fs.h 2010-07-02 17:23:24.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/fs.h linux-2.6.34.1/include/linux/fs.h
+--- linux-2.6.34.1/include/linux/fs.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/fs.h 2010-07-07 09:04:56.000000000 -0400
@@ -90,6 +90,11 @@ struct inodes_stat_t {
/* Expect random access pattern */
#define FMODE_RANDOM ((__force fmode_t)0x1000)
};
/*
-diff -urNp linux-2.6.34/include/linux/fs_struct.h linux-2.6.34/include/linux/fs_struct.h
---- linux-2.6.34/include/linux/fs_struct.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/fs_struct.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/fs_struct.h linux-2.6.34.1/include/linux/fs_struct.h
+--- linux-2.6.34.1/include/linux/fs_struct.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/fs_struct.h 2010-07-07 09:04:56.000000000 -0400
@@ -4,7 +4,7 @@
#include <linux/path.h>
rwlock_t lock;
int umask;
int in_exec;
-diff -urNp linux-2.6.34/include/linux/genhd.h linux-2.6.34/include/linux/genhd.h
---- linux-2.6.34/include/linux/genhd.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/genhd.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/genhd.h linux-2.6.34.1/include/linux/genhd.h
+--- linux-2.6.34.1/include/linux/genhd.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/genhd.h 2010-07-07 09:04:56.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.34/include/linux/gracl.h linux-2.6.34/include/linux/gracl.h
---- linux-2.6.34/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/include/linux/gracl.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/gracl.h linux-2.6.34.1/include/linux/gracl.h
+--- linux-2.6.34.1/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/include/linux/gracl.h 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,310 @@
+#ifndef GR_ACL_H
+#define GR_ACL_H
+
+#endif
+
-diff -urNp linux-2.6.34/include/linux/gralloc.h linux-2.6.34/include/linux/gralloc.h
---- linux-2.6.34/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/include/linux/gralloc.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/gralloc.h linux-2.6.34.1/include/linux/gralloc.h
+--- linux-2.6.34.1/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/include/linux/gralloc.h 2010-07-07 09:04:56.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.34/include/linux/grdefs.h linux-2.6.34/include/linux/grdefs.h
---- linux-2.6.34/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/include/linux/grdefs.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/grdefs.h linux-2.6.34.1/include/linux/grdefs.h
+--- linux-2.6.34.1/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/include/linux/grdefs.h 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,136 @@
+#ifndef GRDEFS_H
+#define GRDEFS_H
+};
+
+#endif
-diff -urNp linux-2.6.34/include/linux/grinternal.h linux-2.6.34/include/linux/grinternal.h
---- linux-2.6.34/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/include/linux/grinternal.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/grinternal.h linux-2.6.34.1/include/linux/grinternal.h
+--- linux-2.6.34.1/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/include/linux/grinternal.h 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,211 @@
+#ifndef __GRINTERNAL_H
+#define __GRINTERNAL_H
+#endif
+
+#endif
-diff -urNp linux-2.6.34/include/linux/grmsg.h linux-2.6.34/include/linux/grmsg.h
---- linux-2.6.34/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/include/linux/grmsg.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/grmsg.h linux-2.6.34.1/include/linux/grmsg.h
+--- linux-2.6.34.1/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/include/linux/grmsg.h 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,108 @@
+#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
+#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
+#define GR_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.34/include/linux/grsecurity.h linux-2.6.34/include/linux/grsecurity.h
---- linux-2.6.34/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/include/linux/grsecurity.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/grsecurity.h linux-2.6.34.1/include/linux/grsecurity.h
+--- linux-2.6.34.1/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/include/linux/grsecurity.h 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,201 @@
+#ifndef GR_SECURITY_H
+#define GR_SECURITY_H
+#endif
+
+#endif
-diff -urNp linux-2.6.34/include/linux/grsock.h linux-2.6.34/include/linux/grsock.h
---- linux-2.6.34/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/include/linux/grsock.h 2010-07-03 19:09:03.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/grsock.h linux-2.6.34.1/include/linux/grsock.h
+--- linux-2.6.34.1/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/include/linux/grsock.h 2010-07-07 09:04:56.000000000 -0400
@@ -0,0 +1,19 @@
+#ifndef __GRSOCK_H
+#define __GRSOCK_H
+ const int protocol);
+
+#endif
-diff -urNp linux-2.6.34/include/linux/hdpu_features.h linux-2.6.34/include/linux/hdpu_features.h
---- linux-2.6.34/include/linux/hdpu_features.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/hdpu_features.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/hdpu_features.h linux-2.6.34.1/include/linux/hdpu_features.h
+--- linux-2.6.34.1/include/linux/hdpu_features.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/hdpu_features.h 2010-07-07 09:04:56.000000000 -0400
@@ -3,7 +3,7 @@
struct cpustate_t {
spinlock_t lock;
unsigned char cached_val;
int inited;
unsigned long *set_addr;
-diff -urNp linux-2.6.34/include/linux/highmem.h linux-2.6.34/include/linux/highmem.h
---- linux-2.6.34/include/linux/highmem.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/highmem.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/highmem.h linux-2.6.34.1/include/linux/highmem.h
+--- linux-2.6.34.1/include/linux/highmem.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/highmem.h 2010-07-07 09:04:56.000000000 -0400
@@ -143,6 +143,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.34/include/linux/interrupt.h linux-2.6.34/include/linux/interrupt.h
---- linux-2.6.34/include/linux/interrupt.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/interrupt.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/interrupt.h linux-2.6.34.1/include/linux/interrupt.h
+--- linux-2.6.34.1/include/linux/interrupt.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/interrupt.h 2010-07-07 09:04:56.000000000 -0400
@@ -357,7 +357,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.34/include/linux/jbd2.h linux-2.6.34/include/linux/jbd2.h
---- linux-2.6.34/include/linux/jbd2.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/jbd2.h 2010-07-01 20:45:16.000000000 -0400
-@@ -67,7 +67,7 @@ extern u8 jbd2_journal_enable_debug;
+diff -urNp linux-2.6.34.1/include/linux/jbd.h linux-2.6.34.1/include/linux/jbd.h
+--- linux-2.6.34.1/include/linux/jbd.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/jbd.h 2010-07-07 09:04:56.000000000 -0400
+@@ -67,7 +67,7 @@ extern u8 journal_enable_debug;
} \
} while (0)
#else
+#define jbd_debug(f, a...) do {} while (0)
#endif
- extern void *jbd2_alloc(size_t size, gfp_t flags);
-diff -urNp linux-2.6.34/include/linux/jbd.h linux-2.6.34/include/linux/jbd.h
---- linux-2.6.34/include/linux/jbd.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/jbd.h 2010-07-01 20:45:16.000000000 -0400
-@@ -67,7 +67,7 @@ extern u8 journal_enable_debug;
+ static inline void *jbd_alloc(size_t size, gfp_t flags)
+diff -urNp linux-2.6.34.1/include/linux/jbd2.h linux-2.6.34.1/include/linux/jbd2.h
+--- linux-2.6.34.1/include/linux/jbd2.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/jbd2.h 2010-07-07 09:04:56.000000000 -0400
+@@ -67,7 +67,7 @@ extern u8 jbd2_journal_enable_debug;
} \
} while (0)
#else
+#define jbd_debug(f, a...) do {} while (0)
#endif
- static inline void *jbd_alloc(size_t size, gfp_t flags)
-diff -urNp linux-2.6.34/include/linux/kallsyms.h linux-2.6.34/include/linux/kallsyms.h
---- linux-2.6.34/include/linux/kallsyms.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/kallsyms.h 2010-07-01 20:45:16.000000000 -0400
+ extern void *jbd2_alloc(size_t size, gfp_t flags);
+diff -urNp linux-2.6.34.1/include/linux/kallsyms.h linux-2.6.34.1/include/linux/kallsyms.h
+--- linux-2.6.34.1/include/linux/kallsyms.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/kallsyms.h 2010-07-07 09:04:56.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.34/include/linux/kgdb.h linux-2.6.34/include/linux/kgdb.h
---- linux-2.6.34/include/linux/kgdb.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/kgdb.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/kgdb.h linux-2.6.34.1/include/linux/kgdb.h
+--- linux-2.6.34.1/include/linux/kgdb.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/kgdb.h 2010-07-07 09:04:56.000000000 -0400
@@ -250,20 +250,20 @@ struct kgdb_arch {
*/
struct kgdb_io {
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.34/include/linux/kvm_host.h linux-2.6.34/include/linux/kvm_host.h
---- linux-2.6.34/include/linux/kvm_host.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/kvm_host.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/kvm_host.h linux-2.6.34.1/include/linux/kvm_host.h
+--- linux-2.6.34.1/include/linux/kvm_host.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/kvm_host.h 2010-07-07 09:04:56.000000000 -0400
@@ -237,7 +237,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
void vcpu_load(struct kvm_vcpu *vcpu);
void vcpu_put(struct kvm_vcpu *vcpu);
void kvm_arch_exit(void);
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff -urNp linux-2.6.34/include/linux/libata.h linux-2.6.34/include/linux/libata.h
---- linux-2.6.34/include/linux/libata.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/libata.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/libata.h linux-2.6.34.1/include/linux/libata.h
+--- linux-2.6.34.1/include/linux/libata.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/libata.h 2010-07-07 09:04:56.000000000 -0400
@@ -64,11 +64,11 @@
#ifdef ATA_VERBOSE_DEBUG
#define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
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.34/include/linux/lockd/bind.h linux-2.6.34/include/linux/lockd/bind.h
---- linux-2.6.34/include/linux/lockd/bind.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/lockd/bind.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/lockd/bind.h linux-2.6.34.1/include/linux/lockd/bind.h
+--- linux-2.6.34.1/include/linux/lockd/bind.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/lockd/bind.h 2010-07-07 09:04:56.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.34/include/linux/mm.h linux-2.6.34/include/linux/mm.h
---- linux-2.6.34/include/linux/mm.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/mm.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/mm.h linux-2.6.34.1/include/linux/mm.h
+--- linux-2.6.34.1/include/linux/mm.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/mm.h 2010-07-07 09:04:56.000000000 -0400
@@ -103,7 +103,14 @@ extern unsigned int kobjsize(const void
#define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
+
#endif /* __KERNEL__ */
#endif /* _LINUX_MM_H */
-diff -urNp linux-2.6.34/include/linux/mm_types.h linux-2.6.34/include/linux/mm_types.h
---- linux-2.6.34/include/linux/mm_types.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/mm_types.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/mm_types.h linux-2.6.34.1/include/linux/mm_types.h
+--- linux-2.6.34.1/include/linux/mm_types.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/mm_types.h 2010-07-07 09:04:56.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.34/include/linux/mmu_notifier.h linux-2.6.34/include/linux/mmu_notifier.h
---- linux-2.6.34/include/linux/mmu_notifier.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/mmu_notifier.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/mmu_notifier.h linux-2.6.34.1/include/linux/mmu_notifier.h
+--- linux-2.6.34.1/include/linux/mmu_notifier.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/mmu_notifier.h 2010-07-07 09:04:56.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.34/include/linux/mod_devicetable.h linux-2.6.34/include/linux/mod_devicetable.h
---- linux-2.6.34/include/linux/mod_devicetable.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/mod_devicetable.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/mod_devicetable.h linux-2.6.34.1/include/linux/mod_devicetable.h
+--- linux-2.6.34.1/include/linux/mod_devicetable.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/mod_devicetable.h 2010-07-07 09:04:56.000000000 -0400
@@ -12,7 +12,7 @@
typedef unsigned long kernel_ulong_t;
#endif
struct hid_device_id {
__u16 bus;
-diff -urNp linux-2.6.34/include/linux/module.h linux-2.6.34/include/linux/module.h
---- linux-2.6.34/include/linux/module.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/module.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/module.h linux-2.6.34.1/include/linux/module.h
+--- linux-2.6.34.1/include/linux/module.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/module.h 2010-07-07 09:04:56.000000000 -0400
@@ -290,16 +290,16 @@ struct module
int (*init)(void);
}
/* Search for module by name: must hold module_mutex. */
-diff -urNp linux-2.6.34/include/linux/moduleloader.h linux-2.6.34/include/linux/moduleloader.h
---- linux-2.6.34/include/linux/moduleloader.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/moduleloader.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/moduleloader.h linux-2.6.34.1/include/linux/moduleloader.h
+--- linux-2.6.34.1/include/linux/moduleloader.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/moduleloader.h 2010-07-07 09:04:56.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.34/include/linux/namei.h linux-2.6.34/include/linux/namei.h
---- linux-2.6.34/include/linux/namei.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/namei.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/namei.h linux-2.6.34.1/include/linux/namei.h
+--- linux-2.6.34.1/include/linux/namei.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/namei.h 2010-07-07 09:04:56.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.34/include/linux/oprofile.h linux-2.6.34/include/linux/oprofile.h
---- linux-2.6.34/include/linux/oprofile.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/oprofile.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/oprofile.h linux-2.6.34.1/include/linux/oprofile.h
+--- linux-2.6.34.1/include/linux/oprofile.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/oprofile.h 2010-07-07 09:04:56.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.34/include/linux/pipe_fs_i.h linux-2.6.34/include/linux/pipe_fs_i.h
---- linux-2.6.34/include/linux/pipe_fs_i.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/pipe_fs_i.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/pipe_fs_i.h linux-2.6.34.1/include/linux/pipe_fs_i.h
+--- linux-2.6.34.1/include/linux/pipe_fs_i.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/pipe_fs_i.h 2010-07-07 09:04:56.000000000 -0400
@@ -46,9 +46,9 @@ struct pipe_inode_info {
wait_queue_head_t wait;
unsigned int nrbufs, curbuf;
unsigned int r_counter;
unsigned int w_counter;
struct fasync_struct *fasync_readers;
-diff -urNp linux-2.6.34/include/linux/poison.h linux-2.6.34/include/linux/poison.h
---- linux-2.6.34/include/linux/poison.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/poison.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/poison.h linux-2.6.34.1/include/linux/poison.h
+--- linux-2.6.34.1/include/linux/poison.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/poison.h 2010-07-07 09:04:56.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.34/include/linux/proc_fs.h linux-2.6.34/include/linux/proc_fs.h
---- linux-2.6.34/include/linux/proc_fs.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/proc_fs.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/proc_fs.h linux-2.6.34.1/include/linux/proc_fs.h
+--- linux-2.6.34.1/include/linux/proc_fs.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/proc_fs.h 2010-07-07 09:04:56.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.34/include/linux/random.h linux-2.6.34/include/linux/random.h
---- linux-2.6.34/include/linux/random.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/random.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/random.h linux-2.6.34.1/include/linux/random.h
+--- linux-2.6.34.1/include/linux/random.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/random.h 2010-07-07 09:04:56.000000000 -0400
@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l
u32 random32(void);
void srandom32(u32 seed);
#endif /* __KERNEL___ */
#endif /* _LINUX_RANDOM_H */
-diff -urNp linux-2.6.34/include/linux/reiserfs_fs.h linux-2.6.34/include/linux/reiserfs_fs.h
---- linux-2.6.34/include/linux/reiserfs_fs.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/reiserfs_fs.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/reiserfs_fs.h linux-2.6.34.1/include/linux/reiserfs_fs.h
+--- linux-2.6.34.1/include/linux/reiserfs_fs.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/reiserfs_fs.h 2010-07-07 09:04:56.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.34/include/linux/reiserfs_fs_sb.h linux-2.6.34/include/linux/reiserfs_fs_sb.h
---- linux-2.6.34/include/linux/reiserfs_fs_sb.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/reiserfs_fs_sb.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/reiserfs_fs_sb.h linux-2.6.34.1/include/linux/reiserfs_fs_sb.h
+--- linux-2.6.34.1/include/linux/reiserfs_fs_sb.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/reiserfs_fs_sb.h 2010-07-07 09:04:56.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.34/include/linux/sched.h linux-2.6.34/include/linux/sched.h
---- linux-2.6.34/include/linux/sched.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/sched.h 2010-07-02 17:25:21.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/sched.h linux-2.6.34.1/include/linux/sched.h
+--- linux-2.6.34.1/include/linux/sched.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/sched.h 2010-07-07 09:04:56.000000000 -0400
@@ -101,6 +101,7 @@ struct bio_list;
struct fs_struct;
struct bts_context;
extern void thread_info_cache_init(void);
#ifdef CONFIG_DEBUG_STACK_USAGE
-diff -urNp linux-2.6.34/include/linux/screen_info.h linux-2.6.34/include/linux/screen_info.h
---- linux-2.6.34/include/linux/screen_info.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/screen_info.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/screen_info.h linux-2.6.34.1/include/linux/screen_info.h
+--- linux-2.6.34.1/include/linux/screen_info.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/screen_info.h 2010-07-07 09:04:56.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.34/include/linux/security.h linux-2.6.34/include/linux/security.h
---- linux-2.6.34/include/linux/security.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/security.h 2010-07-02 17:23:53.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/security.h linux-2.6.34.1/include/linux/security.h
+--- linux-2.6.34.1/include/linux/security.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/security.h 2010-07-07 09:04:57.000000000 -0400
@@ -34,6 +34,7 @@
#include <linux/key.h>
#include <linux/xfrm.h>
#include <net/flow.h>
/* Maximum number of letters for an LSM name string */
-diff -urNp linux-2.6.34/include/linux/shm.h linux-2.6.34/include/linux/shm.h
---- linux-2.6.34/include/linux/shm.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/shm.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/shm.h linux-2.6.34.1/include/linux/shm.h
+--- linux-2.6.34.1/include/linux/shm.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/shm.h 2010-07-07 09:04:57.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.34/include/linux/slab.h linux-2.6.34/include/linux/slab.h
---- linux-2.6.34/include/linux/slab.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/slab.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/slab.h linux-2.6.34.1/include/linux/slab.h
+--- linux-2.6.34.1/include/linux/slab.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/slab.h 2010-07-07 09:04:57.000000000 -0400
@@ -11,6 +11,7 @@
#include <linux/gfp.h>
+})
+
#endif /* _LINUX_SLAB_H */
-diff -urNp linux-2.6.34/include/linux/slub_def.h linux-2.6.34/include/linux/slub_def.h
---- linux-2.6.34/include/linux/slub_def.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/slub_def.h 2010-07-01 20:45:16.000000000 -0400
-@@ -85,7 +85,7 @@ struct kmem_cache {
+diff -urNp linux-2.6.34.1/include/linux/slub_def.h linux-2.6.34.1/include/linux/slub_def.h
+--- linux-2.6.34.1/include/linux/slub_def.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/slub_def.h 2010-07-07 09:04:57.000000000 -0400
+@@ -79,7 +79,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.34/include/linux/sonet.h linux-2.6.34/include/linux/sonet.h
---- linux-2.6.34/include/linux/sonet.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/sonet.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/sonet.h linux-2.6.34.1/include/linux/sonet.h
+--- linux-2.6.34.1/include/linux/sonet.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/sonet.h 2010-07-07 09:04:57.000000000 -0400
@@ -61,7 +61,7 @@ struct sonet_stats {
#include <asm/atomic.h>
__SONET_ITEMS
#undef __HANDLE_ITEM
};
-diff -urNp linux-2.6.34/include/linux/suspend.h linux-2.6.34/include/linux/suspend.h
---- linux-2.6.34/include/linux/suspend.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/suspend.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/suspend.h linux-2.6.34.1/include/linux/suspend.h
+--- linux-2.6.34.1/include/linux/suspend.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/suspend.h 2010-07-07 09:04:57.000000000 -0400
@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
* which require special recovery actions in that situation.
*/
static inline int hibernate(void) { return -ENOSYS; }
static inline bool system_entering_hibernation(void) { return false; }
#endif /* CONFIG_HIBERNATION */
-diff -urNp linux-2.6.34/include/linux/sysctl.h linux-2.6.34/include/linux/sysctl.h
---- linux-2.6.34/include/linux/sysctl.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/sysctl.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/sysctl.h linux-2.6.34.1/include/linux/sysctl.h
+--- linux-2.6.34.1/include/linux/sysctl.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/sysctl.h 2010-07-07 09:04:57.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.34/include/linux/sysfs.h linux-2.6.34/include/linux/sysfs.h
---- linux-2.6.34/include/linux/sysfs.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/sysfs.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/sysfs.h linux-2.6.34.1/include/linux/sysfs.h
+--- linux-2.6.34.1/include/linux/sysfs.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/sysfs.h 2010-07-07 09:04:57.000000000 -0400
@@ -113,8 +113,8 @@ struct bin_attribute {
#define sysfs_bin_attr_init(bin_attr) sysfs_attr_init(&(bin_attr)->attr)
};
struct sysfs_dirent;
-diff -urNp linux-2.6.34/include/linux/thread_info.h linux-2.6.34/include/linux/thread_info.h
---- linux-2.6.34/include/linux/thread_info.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/thread_info.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/thread_info.h linux-2.6.34.1/include/linux/thread_info.h
+--- linux-2.6.34.1/include/linux/thread_info.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/thread_info.h 2010-07-07 09:04:57.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.34/include/linux/tty.h linux-2.6.34/include/linux/tty.h
---- linux-2.6.34/include/linux/tty.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/tty.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/tty.h linux-2.6.34.1/include/linux/tty.h
+--- linux-2.6.34.1/include/linux/tty.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/tty.h 2010-07-07 09:04:57.000000000 -0400
@@ -13,6 +13,7 @@
#include <linux/tty_driver.h>
#include <linux/tty_ldisc.h>
/* n_tty.c */
extern struct tty_ldisc_ops tty_ldisc_N_TTY;
-diff -urNp linux-2.6.34/include/linux/tty_ldisc.h linux-2.6.34/include/linux/tty_ldisc.h
---- linux-2.6.34/include/linux/tty_ldisc.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/tty_ldisc.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/tty_ldisc.h linux-2.6.34.1/include/linux/tty_ldisc.h
+--- linux-2.6.34.1/include/linux/tty_ldisc.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/tty_ldisc.h 2010-07-07 09:04:57.000000000 -0400
@@ -147,7 +147,7 @@ struct tty_ldisc_ops {
struct module *owner;
};
struct tty_ldisc {
-diff -urNp linux-2.6.34/include/linux/types.h linux-2.6.34/include/linux/types.h
---- linux-2.6.34/include/linux/types.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/types.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/types.h linux-2.6.34.1/include/linux/types.h
+--- linux-2.6.34.1/include/linux/types.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/types.h 2010-07-07 09:04:57.000000000 -0400
@@ -191,10 +191,26 @@ typedef struct {
volatile int counter;
} atomic_t;
#endif
struct ustat {
-diff -urNp linux-2.6.34/include/linux/uaccess.h linux-2.6.34/include/linux/uaccess.h
---- linux-2.6.34/include/linux/uaccess.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/uaccess.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/uaccess.h linux-2.6.34.1/include/linux/uaccess.h
+--- linux-2.6.34.1/include/linux/uaccess.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/uaccess.h 2010-07-07 09:04:57.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.34/include/linux/vmalloc.h linux-2.6.34/include/linux/vmalloc.h
---- linux-2.6.34/include/linux/vmalloc.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/linux/vmalloc.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/linux/vmalloc.h linux-2.6.34.1/include/linux/vmalloc.h
+--- linux-2.6.34.1/include/linux/vmalloc.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/linux/vmalloc.h 2010-07-07 09:04:57.000000000 -0400
@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
#define VM_MAP 0x00000004 /* vmap()ed pages */
#define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
+})
+
#endif /* _LINUX_VMALLOC_H */
-diff -urNp linux-2.6.34/include/net/irda/ircomm_tty.h linux-2.6.34/include/net/irda/ircomm_tty.h
---- linux-2.6.34/include/net/irda/ircomm_tty.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/net/irda/ircomm_tty.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/net/irda/ircomm_tty.h linux-2.6.34.1/include/net/irda/ircomm_tty.h
+--- linux-2.6.34.1/include/net/irda/ircomm_tty.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/net/irda/ircomm_tty.h 2010-07-07 09:04:57.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.34/include/net/neighbour.h linux-2.6.34/include/net/neighbour.h
---- linux-2.6.34/include/net/neighbour.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/net/neighbour.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/net/neighbour.h linux-2.6.34.1/include/net/neighbour.h
+--- linux-2.6.34.1/include/net/neighbour.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/net/neighbour.h 2010-07-07 09:04:57.000000000 -0400
@@ -116,12 +116,12 @@ struct neighbour {
struct neigh_ops {
};
struct pneigh_entry {
-diff -urNp linux-2.6.34/include/net/sctp/sctp.h linux-2.6.34/include/net/sctp/sctp.h
---- linux-2.6.34/include/net/sctp/sctp.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/net/sctp/sctp.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/net/sctp/sctp.h linux-2.6.34.1/include/net/sctp/sctp.h
+--- linux-2.6.34.1/include/net/sctp/sctp.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/net/sctp/sctp.h 2010-07-07 09:04:57.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.34/include/net/tcp.h linux-2.6.34/include/net/tcp.h
---- linux-2.6.34/include/net/tcp.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/net/tcp.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/net/tcp.h linux-2.6.34.1/include/net/tcp.h
+--- linux-2.6.34.1/include/net/tcp.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/net/tcp.h 2010-07-07 09:04:57.000000000 -0400
@@ -1395,6 +1395,7 @@ enum tcp_seq_states {
struct tcp_seq_afinfo {
char *name;
struct file_operations seq_fops;
struct seq_operations seq_ops;
};
-diff -urNp linux-2.6.34/include/net/udp.h linux-2.6.34/include/net/udp.h
---- linux-2.6.34/include/net/udp.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/net/udp.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/net/udp.h linux-2.6.34.1/include/net/udp.h
+--- linux-2.6.34.1/include/net/udp.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/net/udp.h 2010-07-07 09:04:57.000000000 -0400
@@ -221,6 +221,7 @@ struct udp_seq_afinfo {
char *name;
sa_family_t family;
struct file_operations seq_fops;
struct seq_operations seq_ops;
};
-diff -urNp linux-2.6.34/include/sound/ac97_codec.h linux-2.6.34/include/sound/ac97_codec.h
---- linux-2.6.34/include/sound/ac97_codec.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/sound/ac97_codec.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/sound/ac97_codec.h linux-2.6.34.1/include/sound/ac97_codec.h
+--- linux-2.6.34.1/include/sound/ac97_codec.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/sound/ac97_codec.h 2010-07-07 09:04:57.000000000 -0400
@@ -419,15 +419,15 @@
struct snd_ac97;
void *private_data;
void (*private_free) (struct snd_ac97 *ac97);
/* --- */
-diff -urNp linux-2.6.34/include/trace/events/irq.h linux-2.6.34/include/trace/events/irq.h
---- linux-2.6.34/include/trace/events/irq.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/trace/events/irq.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/trace/events/irq.h linux-2.6.34.1/include/trace/events/irq.h
+--- linux-2.6.34.1/include/trace/events/irq.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/trace/events/irq.h 2010-07-07 09:04:57.000000000 -0400
@@ -34,7 +34,7 @@
*/
TRACE_EVENT(irq_handler_entry,
TP_ARGS(h, vec)
);
-diff -urNp linux-2.6.34/include/video/uvesafb.h linux-2.6.34/include/video/uvesafb.h
---- linux-2.6.34/include/video/uvesafb.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/include/video/uvesafb.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/include/video/uvesafb.h linux-2.6.34.1/include/video/uvesafb.h
+--- linux-2.6.34.1/include/video/uvesafb.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/include/video/uvesafb.h 2010-07-07 09:04:57.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.34/init/do_mounts.c linux-2.6.34/init/do_mounts.c
---- linux-2.6.34/init/do_mounts.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/init/do_mounts.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/init/Kconfig linux-2.6.34.1/init/Kconfig
+--- linux-2.6.34.1/init/Kconfig 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/init/Kconfig 2010-07-07 09:04:57.000000000 -0400
+@@ -1029,7 +1029,7 @@ config SLUB_DEBUG
+
+ config COMPAT_BRK
+ bool "Disable heap randomization"
+- default y
++ default n
+ help
+ Randomizing heap placement makes heap exploits harder, but it
+ also breaks ancient binaries (including anything libc5 based).
+diff -urNp linux-2.6.34.1/init/do_mounts.c linux-2.6.34.1/init/do_mounts.c
+--- linux-2.6.34.1/init/do_mounts.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/init/do_mounts.c 2010-07-07 09:04:57.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.34/init/do_mounts.h linux-2.6.34/init/do_mounts.h
---- linux-2.6.34/init/do_mounts.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/init/do_mounts.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/init/do_mounts.h linux-2.6.34.1/init/do_mounts.h
+--- linux-2.6.34.1/init/do_mounts.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/init/do_mounts.h 2010-07-07 09:04:57.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.34/init/do_mounts_initrd.c linux-2.6.34/init/do_mounts_initrd.c
---- linux-2.6.34/init/do_mounts_initrd.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/init/do_mounts_initrd.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/init/do_mounts_initrd.c linux-2.6.34.1/init/do_mounts_initrd.c
+--- linux-2.6.34.1/init/do_mounts_initrd.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/init/do_mounts_initrd.c 2010-07-07 09:04:57.000000000 -0400
@@ -43,13 +43,13 @@ static void __init handle_initrd(void)
create_dev("/dev/root.old", Root_RAM0);
/* mount initrd on rootfs' /root */
+ sys_unlink((__force const char __user *)"/initrd.image");
return 0;
}
-diff -urNp linux-2.6.34/init/do_mounts_md.c linux-2.6.34/init/do_mounts_md.c
---- linux-2.6.34/init/do_mounts_md.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/init/do_mounts_md.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/init/do_mounts_md.c linux-2.6.34.1/init/do_mounts_md.c
+--- linux-2.6.34.1/init/do_mounts_md.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/init/do_mounts_md.c 2010-07-07 09:04:57.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.34/init/initramfs.c linux-2.6.34/init/initramfs.c
---- linux-2.6.34/init/initramfs.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/init/initramfs.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/init/initramfs.c linux-2.6.34.1/init/initramfs.c
+--- linux-2.6.34.1/init/initramfs.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/init/initramfs.c 2010-07-07 09:04:57.000000000 -0400
@@ -74,7 +74,7 @@ static void __init free_hash(void)
}
}
state = SkipIt;
next_state = Reset;
return 0;
-diff -urNp linux-2.6.34/init/Kconfig linux-2.6.34/init/Kconfig
---- linux-2.6.34/init/Kconfig 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/init/Kconfig 2010-07-01 20:45:16.000000000 -0400
-@@ -1029,7 +1029,7 @@ config SLUB_DEBUG
-
- config COMPAT_BRK
- bool "Disable heap randomization"
-- default y
-+ default n
- help
- Randomizing heap placement makes heap exploits harder, but it
- also breaks ancient binaries (including anything libc5 based).
-diff -urNp linux-2.6.34/init/main.c linux-2.6.34/init/main.c
---- linux-2.6.34/init/main.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/init/main.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/init/main.c linux-2.6.34.1/init/main.c
+--- linux-2.6.34.1/init/main.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/init/main.c 2010-07-07 09:04:57.000000000 -0400
@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void)
#ifdef CONFIG_TC
extern void tc_init(void);
/*
* Ok, we have completed the initial bootup, and
* we're essentially up and running. Get rid of the
-diff -urNp linux-2.6.34/init/noinitramfs.c linux-2.6.34/init/noinitramfs.c
---- linux-2.6.34/init/noinitramfs.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/init/noinitramfs.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/init/noinitramfs.c linux-2.6.34.1/init/noinitramfs.c
+--- linux-2.6.34.1/init/noinitramfs.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/init/noinitramfs.c 2010-07-07 09:04:57.000000000 -0400
@@ -29,17 +29,17 @@ static int __init default_rootfs(void)
{
int err;
if (err < 0)
goto out;
-diff -urNp linux-2.6.34/ipc/mqueue.c linux-2.6.34/ipc/mqueue.c
---- linux-2.6.34/ipc/mqueue.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/ipc/mqueue.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/ipc/mqueue.c linux-2.6.34.1/ipc/mqueue.c
+--- linux-2.6.34.1/ipc/mqueue.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/ipc/mqueue.c 2010-07-07 09:04:57.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.34/ipc/shm.c linux-2.6.34/ipc/shm.c
---- linux-2.6.34/ipc/shm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/ipc/shm.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/ipc/shm.c linux-2.6.34.1/ipc/shm.c
+--- linux-2.6.34.1/ipc/shm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/ipc/shm.c 2010-07-07 09:04:57.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
size = i_size_read(path.dentry->d_inode);
shm_unlock(shp);
-diff -urNp linux-2.6.34/kernel/acct.c linux-2.6.34/kernel/acct.c
---- linux-2.6.34/kernel/acct.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/acct.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/acct.c linux-2.6.34.1/kernel/acct.c
+--- linux-2.6.34.1/kernel/acct.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/acct.c 2010-07-07 09:04:57.000000000 -0400
@@ -580,7 +580,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.34/kernel/capability.c linux-2.6.34/kernel/capability.c
---- linux-2.6.34/kernel/capability.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/capability.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/capability.c linux-2.6.34.1/kernel/capability.c
+--- linux-2.6.34.1/kernel/capability.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/capability.c 2010-07-07 09:04:57.000000000 -0400
@@ -206,6 +206,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.34/kernel/configs.c linux-2.6.34/kernel/configs.c
---- linux-2.6.34/kernel/configs.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/configs.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/configs.c linux-2.6.34.1/kernel/configs.c
+--- linux-2.6.34.1/kernel/configs.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/configs.c 2010-07-07 09:04:57.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.34/kernel/cpu.c linux-2.6.34/kernel/cpu.c
---- linux-2.6.34/kernel/cpu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/cpu.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/cpu.c linux-2.6.34.1/kernel/cpu.c
+--- linux-2.6.34.1/kernel/cpu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/cpu.c 2010-07-07 09:04:57.000000000 -0400
@@ -20,7 +20,7 @@
/* Serializes the updates to cpu_online_mask, cpu_present_mask */
static DEFINE_MUTEX(cpu_add_remove_lock);
/* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
* Should always be manipulated under cpu_add_remove_lock
-diff -urNp linux-2.6.34/kernel/cred.c linux-2.6.34/kernel/cred.c
---- linux-2.6.34/kernel/cred.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/cred.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/cred.c linux-2.6.34.1/kernel/cred.c
+--- linux-2.6.34.1/kernel/cred.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/cred.c 2010-07-07 09:04:57.000000000 -0400
@@ -527,6 +527,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.34/kernel/exit.c linux-2.6.34/kernel/exit.c
---- linux-2.6.34/kernel/exit.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/exit.c 2010-07-02 17:17:11.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/exit.c linux-2.6.34.1/kernel/exit.c
+--- linux-2.6.34.1/kernel/exit.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/exit.c 2010-07-07 09:04:57.000000000 -0400
@@ -57,6 +57,10 @@
#include <asm/mmu_context.h>
#include "cred-internals.h"
exit_mm(tsk);
if (group_dead)
-diff -urNp linux-2.6.34/kernel/fork.c linux-2.6.34/kernel/fork.c
---- linux-2.6.34/kernel/fork.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/fork.c 2010-07-02 17:19:04.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/fork.c linux-2.6.34.1/kernel/fork.c
+--- linux-2.6.34.1/kernel/fork.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/fork.c 2010-07-07 09:04:57.000000000 -0400
@@ -263,7 +263,7 @@ static struct task_struct *dup_task_stru
*stackend = STACK_END_MAGIC; /* for overflow detection */
new_fs = NULL;
else
new_fs = fs;
-diff -urNp linux-2.6.34/kernel/futex.c linux-2.6.34/kernel/futex.c
---- linux-2.6.34/kernel/futex.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/futex.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/futex.c linux-2.6.34.1/kernel/futex.c
+--- linux-2.6.34.1/kernel/futex.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/futex.c 2010-07-07 09:04:57.000000000 -0400
@@ -54,6 +54,7 @@
#include <linux/mount.h>
#include <linux/pagemap.h>
{
unsigned long uentry;
-diff -urNp linux-2.6.34/kernel/futex_compat.c linux-2.6.34/kernel/futex_compat.c
---- linux-2.6.34/kernel/futex_compat.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/futex_compat.c 2010-07-02 15:48:05.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/futex_compat.c linux-2.6.34.1/kernel/futex_compat.c
+--- linux-2.6.34.1/kernel/futex_compat.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/futex_compat.c 2010-07-07 09:04:57.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.34/kernel/gcov/base.c linux-2.6.34/kernel/gcov/base.c
---- linux-2.6.34/kernel/gcov/base.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/gcov/base.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/gcov/base.c linux-2.6.34.1/kernel/gcov/base.c
+--- linux-2.6.34.1/kernel/gcov/base.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/gcov/base.c 2010-07-07 09:04:57.000000000 -0400
@@ -102,11 +102,6 @@ void gcov_enable_events(void)
}
if (prev)
prev->next = info->next;
else
-diff -urNp linux-2.6.34/kernel/hrtimer.c linux-2.6.34/kernel/hrtimer.c
---- linux-2.6.34/kernel/hrtimer.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/hrtimer.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/hrtimer.c linux-2.6.34.1/kernel/hrtimer.c
+--- linux-2.6.34.1/kernel/hrtimer.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/hrtimer.c 2010-07-07 09:04:57.000000000 -0400
@@ -1398,7 +1398,7 @@ void hrtimer_peek_ahead_timers(void)
local_irq_restore(flags);
}
{
hrtimer_peek_ahead_timers();
}
-diff -urNp linux-2.6.34/kernel/kallsyms.c linux-2.6.34/kernel/kallsyms.c
---- linux-2.6.34/kernel/kallsyms.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/kallsyms.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/kallsyms.c linux-2.6.34.1/kernel/kallsyms.c
+--- linux-2.6.34.1/kernel/kallsyms.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/kallsyms.c 2010-07-07 09:04:57.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.34/kernel/kgdb.c linux-2.6.34/kernel/kgdb.c
---- linux-2.6.34/kernel/kgdb.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/kgdb.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/kgdb.c linux-2.6.34.1/kernel/kgdb.c
+--- linux-2.6.34.1/kernel/kgdb.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/kgdb.c 2010-07-07 09:04:57.000000000 -0400
@@ -93,7 +93,7 @@ static int kgdb_io_module_registered;
/* Guard for recursive entry */
static int exception_level;
{
BUG_ON(kgdb_connected);
-diff -urNp linux-2.6.34/kernel/kmod.c linux-2.6.34/kernel/kmod.c
---- linux-2.6.34/kernel/kmod.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/kmod.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/kmod.c linux-2.6.34.1/kernel/kmod.c
+--- linux-2.6.34.1/kernel/kmod.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/kmod.c 2010-07-07 09:04:57.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.34/kernel/kprobes.c linux-2.6.34/kernel/kprobes.c
---- linux-2.6.34/kernel/kprobes.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/kprobes.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/kprobes.c linux-2.6.34.1/kernel/kprobes.c
+--- linux-2.6.34.1/kernel/kprobes.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/kprobes.c 2010-07-07 09:04:57.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.34/kernel/lockdep.c linux-2.6.34/kernel/lockdep.c
---- linux-2.6.34/kernel/lockdep.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/lockdep.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/lockdep.c linux-2.6.34.1/kernel/lockdep.c
+--- linux-2.6.34.1/kernel/lockdep.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/lockdep.c 2010-07-07 09:04:57.000000000 -0400
@@ -584,6 +584,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.34/kernel/lockdep_proc.c linux-2.6.34/kernel/lockdep_proc.c
---- linux-2.6.34/kernel/lockdep_proc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/lockdep_proc.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/lockdep_proc.c linux-2.6.34.1/kernel/lockdep_proc.c
+--- linux-2.6.34.1/kernel/lockdep_proc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/lockdep_proc.c 2010-07-07 09:04:57.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.34/kernel/module.c linux-2.6.34/kernel/module.c
---- linux-2.6.34/kernel/module.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/module.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/module.c linux-2.6.34.1/kernel/module.c
+--- linux-2.6.34.1/kernel/module.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/module.c 2010-07-07 09:04:57.000000000 -0400
@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq
static BLOCKING_NOTIFIER_HEAD(module_notify_list);
mod = NULL;
}
return mod;
-diff -urNp linux-2.6.34/kernel/panic.c linux-2.6.34/kernel/panic.c
---- linux-2.6.34/kernel/panic.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/panic.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/panic.c linux-2.6.34.1/kernel/panic.c
+--- linux-2.6.34.1/kernel/panic.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/panic.c 2010-07-07 09:04:57.000000000 -0400
@@ -410,7 +410,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.34/kernel/pid.c linux-2.6.34/kernel/pid.c
---- linux-2.6.34/kernel/pid.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/pid.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/pid.c linux-2.6.34.1/kernel/pid.c
+--- linux-2.6.34.1/kernel/pid.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/pid.c 2010-07-07 09:04:57.000000000 -0400
@@ -33,6 +33,7 @@
#include <linux/rculist.h>
#include <linux/bootmem.h>
}
struct task_struct *find_task_by_vpid(pid_t vnr)
-diff -urNp linux-2.6.34/kernel/posix-cpu-timers.c linux-2.6.34/kernel/posix-cpu-timers.c
---- linux-2.6.34/kernel/posix-cpu-timers.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/posix-cpu-timers.c 2010-07-03 08:51:50.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/posix-cpu-timers.c linux-2.6.34.1/kernel/posix-cpu-timers.c
+--- linux-2.6.34.1/kernel/posix-cpu-timers.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/posix-cpu-timers.c 2010-07-07 09:04:57.000000000 -0400
@@ -6,6 +6,7 @@
#include <linux/posix-timers.h>
#include <linux/errno.h>
if (psecs >= hard) {
/*
* At the hard limit, we just die.
-diff -urNp linux-2.6.34/kernel/power/hibernate.c linux-2.6.34/kernel/power/hibernate.c
---- linux-2.6.34/kernel/power/hibernate.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/power/hibernate.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/power/hibernate.c linux-2.6.34.1/kernel/power/hibernate.c
+--- linux-2.6.34.1/kernel/power/hibernate.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/power/hibernate.c 2010-07-07 09:04:57.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.34/kernel/power/poweroff.c linux-2.6.34/kernel/power/poweroff.c
---- linux-2.6.34/kernel/power/poweroff.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/power/poweroff.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/power/poweroff.c linux-2.6.34.1/kernel/power/poweroff.c
+--- linux-2.6.34.1/kernel/power/poweroff.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/power/poweroff.c 2010-07-07 09:04:57.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.34/kernel/power/process.c linux-2.6.34/kernel/power/process.c
---- linux-2.6.34/kernel/power/process.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/power/process.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/power/process.c linux-2.6.34.1/kernel/power/process.c
+--- linux-2.6.34.1/kernel/power/process.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/power/process.c 2010-07-07 09:04:57.000000000 -0400
@@ -38,12 +38,15 @@ static int try_to_freeze_tasks(bool sig_
struct timeval start, end;
u64 elapsed_csecs64;
break;
/*
-diff -urNp linux-2.6.34/kernel/power/suspend.c linux-2.6.34/kernel/power/suspend.c
---- linux-2.6.34/kernel/power/suspend.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/power/suspend.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/power/suspend.c linux-2.6.34.1/kernel/power/suspend.c
+--- linux-2.6.34.1/kernel/power/suspend.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/power/suspend.c 2010-07-07 09:04:57.000000000 -0400
@@ -24,13 +24,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.34/kernel/printk.c linux-2.6.34/kernel/printk.c
---- linux-2.6.34/kernel/printk.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/printk.c 2010-07-02 16:55:07.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/printk.c linux-2.6.34.1/kernel/printk.c
+--- linux-2.6.34.1/kernel/printk.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/printk.c 2010-07-07 09:04:57.000000000 -0400
@@ -265,6 +265,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.34/kernel/ptrace.c linux-2.6.34/kernel/ptrace.c
---- linux-2.6.34/kernel/ptrace.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/ptrace.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/ptrace.c linux-2.6.34.1/kernel/ptrace.c
+--- linux-2.6.34.1/kernel/ptrace.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/ptrace.c 2010-07-07 09:04:57.000000000 -0400
@@ -142,7 +142,7 @@ int __ptrace_may_access(struct task_stru
cred->gid != tcred->egid ||
cred->gid != tcred->sgid ||
}
int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
-diff -urNp linux-2.6.34/kernel/rcutree.c linux-2.6.34/kernel/rcutree.c
---- linux-2.6.34/kernel/rcutree.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/rcutree.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/rcutree.c linux-2.6.34.1/kernel/rcutree.c
+--- linux-2.6.34.1/kernel/rcutree.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/rcutree.c 2010-07-07 09:04:57.000000000 -0400
@@ -1321,7 +1321,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.34/kernel/relay.c linux-2.6.34/kernel/relay.c
---- linux-2.6.34/kernel/relay.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/relay.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/relay.c linux-2.6.34.1/kernel/relay.c
+--- linux-2.6.34.1/kernel/relay.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/relay.c 2010-07-07 09:04:57.000000000 -0400
@@ -1293,7 +1293,7 @@ static ssize_t subbuf_splice_actor(struc
return 0;
return ret;
if (read_start + ret == nonpad_end)
-diff -urNp linux-2.6.34/kernel/resource.c linux-2.6.34/kernel/resource.c
---- linux-2.6.34/kernel/resource.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/resource.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/resource.c linux-2.6.34.1/kernel/resource.c
+--- linux-2.6.34.1/kernel/resource.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/resource.c 2010-07-07 09:04:57.000000000 -0400
@@ -132,8 +132,18 @@ static const struct file_operations proc
static int __init ioresources_init(void)
return 0;
}
__initcall(ioresources_init);
-diff -urNp linux-2.6.34/kernel/sched.c linux-2.6.34/kernel/sched.c
---- linux-2.6.34/kernel/sched.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/sched.c 2010-07-02 17:10:55.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/sched.c linux-2.6.34.1/kernel/sched.c
+--- linux-2.6.34.1/kernel/sched.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/sched.c 2010-07-07 09:04:57.000000000 -0400
@@ -4364,6 +4364,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;
/* can't set/change the rt policy */
if (policy != p->policy && !rlim_rtprio)
return -EPERM;
-diff -urNp linux-2.6.34/kernel/sched_fair.c linux-2.6.34/kernel/sched_fair.c
---- linux-2.6.34/kernel/sched_fair.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/sched_fair.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/sched_fair.c linux-2.6.34.1/kernel/sched_fair.c
+--- linux-2.6.34.1/kernel/sched_fair.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/sched_fair.c 2010-07-07 09:04:57.000000000 -0400
@@ -3432,7 +3432,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.
{
int this_cpu = smp_processor_id();
struct rq *this_rq = cpu_rq(this_cpu);
-diff -urNp linux-2.6.34/kernel/signal.c linux-2.6.34/kernel/signal.c
---- linux-2.6.34/kernel/signal.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/signal.c 2010-07-02 17:20:05.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/signal.c linux-2.6.34.1/kernel/signal.c
+--- linux-2.6.34.1/kernel/signal.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/signal.c 2010-07-07 09:04:57.000000000 -0400
@@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache
int print_fatal_signals __read_mostly;
if (is_global_init(tsk))
return 1;
if (handler != SIG_IGN && handler != SIG_DFL)
-@@ -676,6 +679,9 @@ static int check_kill_permission(int sig
+@@ -678,6 +681,9 @@ static int check_kill_permission(int sig
}
}
return security_task_kill(t, info, sig, 0);
}
-@@ -1023,7 +1029,7 @@ __group_send_sig_info(int sig, struct si
+@@ -1025,7 +1031,7 @@ __group_send_sig_info(int sig, struct si
return send_signal(sig, info, p, 1);
}
specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
{
return send_signal(sig, info, t, 0);
-@@ -1077,6 +1083,9 @@ force_sig_info(int sig, struct siginfo *
+@@ -1079,6 +1085,9 @@ force_sig_info(int sig, struct siginfo *
ret = specific_send_sig_info(sig, info, t);
spin_unlock_irqrestore(&t->sighand->siglock, flags);
return ret;
}
-@@ -1130,8 +1139,11 @@ int group_send_sig_info(int sig, struct
+@@ -1132,8 +1141,11 @@ int group_send_sig_info(int sig, struct
{
int ret = check_kill_permission(sig, info, p);
return ret;
}
-diff -urNp linux-2.6.34/kernel/smp.c linux-2.6.34/kernel/smp.c
---- linux-2.6.34/kernel/smp.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/smp.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/smp.c linux-2.6.34.1/kernel/smp.c
+--- linux-2.6.34.1/kernel/smp.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/smp.c 2010-07-07 09:04:57.000000000 -0400
@@ -499,22 +499,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.34/kernel/softirq.c linux-2.6.34/kernel/softirq.c
---- linux-2.6.34/kernel/softirq.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/softirq.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/softirq.c linux-2.6.34.1/kernel/softirq.c
+--- linux-2.6.34.1/kernel/softirq.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/softirq.c 2010-07-07 09:04:57.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.34/kernel/sys.c linux-2.6.34/kernel/sys.c
---- linux-2.6.34/kernel/sys.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/sys.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/sys.c linux-2.6.34.1/kernel/sys.c
+--- linux-2.6.34.1/kernel/sys.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/sys.c 2010-07-07 09:04:57.000000000 -0400
@@ -134,6 +134,12 @@ static int set_one_prio(struct task_stru
error = -EACCES;
goto out;
error = -EINVAL;
break;
}
-diff -urNp linux-2.6.34/kernel/sysctl.c linux-2.6.34/kernel/sysctl.c
---- linux-2.6.34/kernel/sysctl.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/sysctl.c 2010-07-02 17:21:11.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/sysctl.c linux-2.6.34.1/kernel/sysctl.c
+--- linux-2.6.34.1/kernel/sysctl.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/sysctl.c 2010-07-07 09:04:57.000000000 -0400
@@ -76,6 +76,13 @@
if(copy_to_user(s, buf, len))
return -EFAULT;
left -= len;
-diff -urNp linux-2.6.34/kernel/taskstats.c linux-2.6.34/kernel/taskstats.c
---- linux-2.6.34/kernel/taskstats.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/taskstats.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/taskstats.c linux-2.6.34.1/kernel/taskstats.c
+--- linux-2.6.34.1/kernel/taskstats.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/taskstats.c 2010-07-07 09:04:57.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.34/kernel/time/tick-broadcast.c linux-2.6.34/kernel/time/tick-broadcast.c
---- linux-2.6.34/kernel/time/tick-broadcast.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/time/tick-broadcast.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/time/tick-broadcast.c linux-2.6.34.1/kernel/time/tick-broadcast.c
+--- linux-2.6.34.1/kernel/time/tick-broadcast.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/time/tick-broadcast.c 2010-07-07 09:04:57.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.34/kernel/time.c linux-2.6.34/kernel/time.c
---- linux-2.6.34/kernel/time.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/time.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/time.c linux-2.6.34.1/kernel/time.c
+--- linux-2.6.34.1/kernel/time.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/time.c 2010-07-07 09:04:57.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.34/kernel/timer.c linux-2.6.34/kernel/timer.c
---- linux-2.6.34/kernel/timer.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/timer.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/timer.c linux-2.6.34.1/kernel/timer.c
+--- linux-2.6.34.1/kernel/timer.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/timer.c 2010-07-07 09:04:57.000000000 -0400
@@ -1208,7 +1208,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.34/kernel/trace/ftrace.c linux-2.6.34/kernel/trace/ftrace.c
---- linux-2.6.34/kernel/trace/ftrace.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/trace/ftrace.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/trace/Kconfig linux-2.6.34.1/kernel/trace/Kconfig
+--- linux-2.6.34.1/kernel/trace/Kconfig 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/trace/Kconfig 2010-07-07 09:04:57.000000000 -0400
+@@ -124,6 +124,7 @@ if FTRACE
+ config FUNCTION_TRACER
+ bool "Kernel Function Tracer"
+ depends on HAVE_FUNCTION_TRACER
++ depends on !PAX_KERNEXEC
+ select FRAME_POINTER
+ select KALLSYMS
+ select GENERIC_TRACER
+@@ -353,6 +354,7 @@ config PROFILE_KSYM_TRACER
+ config STACK_TRACER
+ bool "Trace max stack"
+ depends on HAVE_FUNCTION_TRACER
++ depends on !PAX_KERNEXEC
+ select FUNCTION_TRACER
+ select STACKTRACE
+ select KALLSYMS
+diff -urNp linux-2.6.34.1/kernel/trace/ftrace.c linux-2.6.34.1/kernel/trace/ftrace.c
+--- linux-2.6.34.1/kernel/trace/ftrace.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/trace/ftrace.c 2010-07-07 09:04:57.000000000 -0400
@@ -1079,13 +1079,18 @@ ftrace_code_disable(struct module *mod,
ip = rec->ip;
}
/*
-diff -urNp linux-2.6.34/kernel/trace/Kconfig linux-2.6.34/kernel/trace/Kconfig
---- linux-2.6.34/kernel/trace/Kconfig 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/trace/Kconfig 2010-07-01 20:45:16.000000000 -0400
-@@ -124,6 +124,7 @@ if FTRACE
- config FUNCTION_TRACER
- bool "Kernel Function Tracer"
- depends on HAVE_FUNCTION_TRACER
-+ depends on !PAX_KERNEXEC
- select FRAME_POINTER
- select KALLSYMS
- select GENERIC_TRACER
-@@ -353,6 +354,7 @@ config PROFILE_KSYM_TRACER
- config STACK_TRACER
- bool "Trace max stack"
- depends on HAVE_FUNCTION_TRACER
-+ depends on !PAX_KERNEXEC
- select FUNCTION_TRACER
- select STACKTRACE
- select KALLSYMS
-diff -urNp linux-2.6.34/kernel/trace/ring_buffer.c linux-2.6.34/kernel/trace/ring_buffer.c
---- linux-2.6.34/kernel/trace/ring_buffer.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/trace/ring_buffer.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/trace/ring_buffer.c linux-2.6.34.1/kernel/trace/ring_buffer.c
+--- linux-2.6.34.1/kernel/trace/ring_buffer.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/trace/ring_buffer.c 2010-07-07 09:04:57.000000000 -0400
@@ -621,7 +621,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.34/kernel/trace/trace.c linux-2.6.34/kernel/trace/trace.c
---- linux-2.6.34/kernel/trace/trace.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/trace/trace.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/trace/trace.c linux-2.6.34.1/kernel/trace/trace.c
+--- linux-2.6.34.1/kernel/trace/trace.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/trace/trace.c 2010-07-07 09:04:57.000000000 -0400
@@ -3918,10 +3918,9 @@ static const struct file_operations trac
};
#endif
static int once;
struct dentry *d_tracer;
-diff -urNp linux-2.6.34/kernel/trace/trace_output.c linux-2.6.34/kernel/trace/trace_output.c
---- linux-2.6.34/kernel/trace/trace_output.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/trace/trace_output.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/trace/trace_output.c linux-2.6.34.1/kernel/trace/trace_output.c
+--- linux-2.6.34.1/kernel/trace/trace_output.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/trace/trace_output.c 2010-07-07 09:04:57.000000000 -0400
@@ -280,7 +280,7 @@ int trace_seq_path(struct trace_seq *s,
p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
if (p) {
s->len = p - s->buffer;
return 1;
-diff -urNp linux-2.6.34/kernel/trace/trace_stack.c linux-2.6.34/kernel/trace/trace_stack.c
---- linux-2.6.34/kernel/trace/trace_stack.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/kernel/trace/trace_stack.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/kernel/trace/trace_stack.c linux-2.6.34.1/kernel/trace/trace_stack.c
+--- linux-2.6.34.1/kernel/trace/trace_stack.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/kernel/trace/trace_stack.c 2010-07-07 09:04:57.000000000 -0400
@@ -50,7 +50,7 @@ static inline void check_stack(void)
return;
return;
local_irq_save(flags);
-diff -urNp linux-2.6.34/lib/bug.c linux-2.6.34/lib/bug.c
---- linux-2.6.34/lib/bug.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/lib/bug.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/lib/Kconfig.debug linux-2.6.34.1/lib/Kconfig.debug
+--- linux-2.6.34.1/lib/Kconfig.debug 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/lib/Kconfig.debug 2010-07-07 09:04:57.000000000 -0400
+@@ -946,7 +946,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.34.1/lib/bug.c linux-2.6.34.1/lib/bug.c
+--- linux-2.6.34.1/lib/bug.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/lib/bug.c 2010-07-07 09:04:57.000000000 -0400
@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
return BUG_TRAP_TYPE_NONE;
printk(KERN_EMERG "------------[ cut here ]------------\n");
-diff -urNp linux-2.6.34/lib/debugobjects.c linux-2.6.34/lib/debugobjects.c
---- linux-2.6.34/lib/debugobjects.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/lib/debugobjects.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/lib/debugobjects.c linux-2.6.34.1/lib/debugobjects.c
+--- linux-2.6.34.1/lib/debugobjects.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/lib/debugobjects.c 2010-07-07 09:04:57.000000000 -0400
@@ -278,7 +278,7 @@ static void debug_object_is_on_stack(voi
if (limit > 4)
return;
if (is_on_stack == onstack)
return;
-diff -urNp linux-2.6.34/lib/dma-debug.c linux-2.6.34/lib/dma-debug.c
---- linux-2.6.34/lib/dma-debug.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/lib/dma-debug.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/lib/dma-debug.c linux-2.6.34.1/lib/dma-debug.c
+--- linux-2.6.34.1/lib/dma-debug.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/lib/dma-debug.c 2010-07-07 09:04:57.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.34/lib/inflate.c linux-2.6.34/lib/inflate.c
---- linux-2.6.34/lib/inflate.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/lib/inflate.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/lib/inflate.c linux-2.6.34.1/lib/inflate.c
+--- linux-2.6.34.1/lib/inflate.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/lib/inflate.c 2010-07-07 09:04:57.000000000 -0400
@@ -267,7 +267,7 @@ static void free(void *where)
malloc_ptr = free_mem_ptr;
}
#define free(a) kfree(a)
#endif
-diff -urNp linux-2.6.34/lib/Kconfig.debug linux-2.6.34/lib/Kconfig.debug
---- linux-2.6.34/lib/Kconfig.debug 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/lib/Kconfig.debug 2010-07-01 20:45:16.000000000 -0400
-@@ -946,7 +946,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.34/lib/parser.c linux-2.6.34/lib/parser.c
---- linux-2.6.34/lib/parser.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/lib/parser.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/lib/parser.c linux-2.6.34.1/lib/parser.c
+--- linux-2.6.34.1/lib/parser.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/lib/parser.c 2010-07-07 09:04:57.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.34/lib/radix-tree.c linux-2.6.34/lib/radix-tree.c
---- linux-2.6.34/lib/radix-tree.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/lib/radix-tree.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/lib/radix-tree.c linux-2.6.34.1/lib/radix-tree.c
+--- linux-2.6.34.1/lib/radix-tree.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/lib/radix-tree.c 2010-07-07 09:04:57.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.34/lib/random32.c linux-2.6.34/lib/random32.c
---- linux-2.6.34/lib/random32.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/lib/random32.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/lib/random32.c linux-2.6.34.1/lib/random32.c
+--- linux-2.6.34.1/lib/random32.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/lib/random32.c 2010-07-07 09:04:57.000000000 -0400
@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
*/
static inline u32 __seed(u32 x, u32 m)
}
/**
-diff -urNp linux-2.6.34/localversion-grsec linux-2.6.34/localversion-grsec
---- linux-2.6.34/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.34/localversion-grsec 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/localversion-grsec linux-2.6.34.1/localversion-grsec
+--- linux-2.6.34.1/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34.1/localversion-grsec 2010-07-07 09:04:57.000000000 -0400
@@ -0,0 +1 @@
+-grsec
-diff -urNp linux-2.6.34/Makefile linux-2.6.34/Makefile
---- linux-2.6.34/Makefile 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/Makefile 2010-07-01 20:45:16.000000000 -0400
-@@ -227,8 +227,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
-
- HOSTCC = gcc
- HOSTCXX = g++
--HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
--HOSTCXXFLAGS = -O2
-+HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
-+HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks
-
- # Decide whether to build built-in, modular, or both.
- # Normally, just do built-in.
-@@ -650,7 +650,7 @@ export mod_strip_cmd
-
-
- ifeq ($(KBUILD_EXTMOD),)
--core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
-+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
-
- vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
- $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-diff -urNp linux-2.6.34/mm/filemap.c linux-2.6.34/mm/filemap.c
---- linux-2.6.34/mm/filemap.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/filemap.c 2010-07-01 20:45:16.000000000 -0400
-@@ -1601,7 +1601,7 @@ int generic_file_mmap(struct file * file
+diff -urNp linux-2.6.34.1/mm/Kconfig linux-2.6.34.1/mm/Kconfig
+--- linux-2.6.34.1/mm/Kconfig 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/Kconfig 2010-07-07 09:04:57.000000000 -0400
+@@ -226,7 +226,7 @@ config KSM
+ config DEFAULT_MMAP_MIN_ADDR
+ int "Low address space to protect from user allocation"
+ depends on MMU
+- default 4096
++ default 65536
+ 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.34.1/mm/filemap.c linux-2.6.34.1/mm/filemap.c
+--- linux-2.6.34.1/mm/filemap.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/filemap.c 2010-07-07 09:04:57.000000000 -0400
+@@ -1607,7 +1607,7 @@ int generic_file_mmap(struct file * file
struct address_space *mapping = file->f_mapping;
if (!mapping->a_ops->readpage)
file_accessed(file);
vma->vm_ops = &generic_file_vm_ops;
vma->vm_flags |= VM_CAN_NONLINEAR;
-@@ -1997,6 +1997,7 @@ inline int generic_write_checks(struct f
+@@ -2003,6 +2003,7 @@ inline int generic_write_checks(struct f
*pos = i_size_read(inode);
if (limit != RLIM_INFINITY) {
if (*pos >= limit) {
send_sig(SIGXFSZ, current, 0);
return -EFBIG;
-diff -urNp linux-2.6.34/mm/fremap.c linux-2.6.34/mm/fremap.c
---- linux-2.6.34/mm/fremap.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/fremap.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/fremap.c linux-2.6.34.1/mm/fremap.c
+--- linux-2.6.34.1/mm/fremap.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/fremap.c 2010-07-07 09:04:57.000000000 -0400
@@ -153,6 +153,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
-diff -urNp linux-2.6.34/mm/highmem.c linux-2.6.34/mm/highmem.c
---- linux-2.6.34/mm/highmem.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/highmem.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/highmem.c linux-2.6.34.1/mm/highmem.c
+--- linux-2.6.34.1/mm/highmem.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/highmem.c 2010-07-07 09:04:57.000000000 -0400
@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
* So no dangers, even with speculative execution.
*/
pkmap_count[last_pkmap_nr] = 1;
set_page_address(page, (void *)vaddr);
-diff -urNp linux-2.6.34/mm/hugetlb.c linux-2.6.34/mm/hugetlb.c
---- linux-2.6.34/mm/hugetlb.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/hugetlb.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/hugetlb.c linux-2.6.34.1/mm/hugetlb.c
+--- linux-2.6.34.1/mm/hugetlb.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/hugetlb.c 2010-07-07 09:04:57.000000000 -0400
@@ -2268,6 +2268,26 @@ static int unmap_ref_private(struct mm_s
return 1;
}
ptep = huge_pte_alloc(mm, address, huge_page_size(h));
if (!ptep)
return VM_FAULT_OOM;
-diff -urNp linux-2.6.34/mm/Kconfig linux-2.6.34/mm/Kconfig
---- linux-2.6.34/mm/Kconfig 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/Kconfig 2010-07-01 20:45:16.000000000 -0400
-@@ -226,7 +226,7 @@ config KSM
- config DEFAULT_MMAP_MIN_ADDR
- int "Low address space to protect from user allocation"
- depends on MMU
-- default 4096
-+ default 65536
- 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.34/mm/maccess.c linux-2.6.34/mm/maccess.c
---- linux-2.6.34/mm/maccess.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/maccess.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/maccess.c linux-2.6.34.1/mm/maccess.c
+--- linux-2.6.34.1/mm/maccess.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/maccess.c 2010-07-07 09:04:57.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.34/mm/madvise.c linux-2.6.34/mm/madvise.c
---- linux-2.6.34/mm/madvise.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/madvise.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/madvise.c linux-2.6.34.1/mm/madvise.c
+--- linux-2.6.34.1/mm/madvise.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/madvise.c 2010-07-07 09:04:57.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.34/mm/memory.c linux-2.6.34/mm/memory.c
---- linux-2.6.34/mm/memory.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/memory.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/memory-failure.c linux-2.6.34.1/mm/memory-failure.c
+--- linux-2.6.34.1/mm/memory-failure.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/memory-failure.c 2010-07-07 09:04:58.000000000 -0400
+@@ -51,7 +51,7 @@ int sysctl_memory_failure_early_kill __r
+
+ int sysctl_memory_failure_recovery __read_mostly = 1;
+
+-atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
++atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
+
+ #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
+
+@@ -939,7 +939,7 @@ int __memory_failure(unsigned long pfn,
+ return 0;
+ }
+
+- atomic_long_add(1, &mce_bad_pages);
++ atomic_long_add_unchecked(1, &mce_bad_pages);
+
+ /*
+ * We need/can do nothing about count=0 pages.
+@@ -1003,7 +1003,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);
+ return 0;
+@@ -1096,7 +1096,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);
+ pr_debug("MCE: Software-unpoisoned free page %#lx\n", pfn);
+ return 0;
+ }
+@@ -1110,7 +1110,7 @@ int unpoison_memory(unsigned long pfn)
+ */
+ if (TestClearPageHWPoison(p)) {
+ pr_debug("MCE: Software-unpoisoned page %#lx\n", pfn);
+- atomic_long_dec(&mce_bad_pages);
++ atomic_long_dec_unchecked(&mce_bad_pages);
+ freeit = 1;
+ }
+ unlock_page(page);
+@@ -1291,7 +1291,7 @@ int soft_offline_page(struct page *page,
+ return ret;
+
+ done:
+- atomic_long_add(1, &mce_bad_pages);
++ atomic_long_add_unchecked(1, &mce_bad_pages);
+ SetPageHWPoison(page);
+ /* keep elevated page count for bad page */
+ return ret;
+diff -urNp linux-2.6.34.1/mm/memory.c linux-2.6.34.1/mm/memory.c
+--- linux-2.6.34.1/mm/memory.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/memory.c 2010-07-07 09:04:58.000000000 -0400
@@ -48,6 +48,7 @@
#include <linux/ksm.h>
#include <linux/rmap.h>
/*
* Make sure the vDSO gets into every core dump.
* Dumping its contents makes post-mortem fully interpretable later
-diff -urNp linux-2.6.34/mm/memory-failure.c linux-2.6.34/mm/memory-failure.c
---- linux-2.6.34/mm/memory-failure.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/memory-failure.c 2010-07-01 20:45:16.000000000 -0400
-@@ -51,7 +51,7 @@ int sysctl_memory_failure_early_kill __r
-
- int sysctl_memory_failure_recovery __read_mostly = 1;
-
--atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
-+atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
-
- #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
-
-@@ -939,7 +939,7 @@ int __memory_failure(unsigned long pfn,
- return 0;
- }
-
-- atomic_long_add(1, &mce_bad_pages);
-+ atomic_long_add_unchecked(1, &mce_bad_pages);
-
- /*
- * We need/can do nothing about count=0 pages.
-@@ -1003,7 +1003,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);
- return 0;
-@@ -1096,7 +1096,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);
- pr_debug("MCE: Software-unpoisoned free page %#lx\n", pfn);
- return 0;
- }
-@@ -1110,7 +1110,7 @@ int unpoison_memory(unsigned long pfn)
- */
- if (TestClearPageHWPoison(p)) {
- pr_debug("MCE: Software-unpoisoned page %#lx\n", pfn);
-- atomic_long_dec(&mce_bad_pages);
-+ atomic_long_dec_unchecked(&mce_bad_pages);
- freeit = 1;
- }
- unlock_page(page);
-@@ -1291,7 +1291,7 @@ int soft_offline_page(struct page *page,
- return ret;
-
- done:
-- atomic_long_add(1, &mce_bad_pages);
-+ atomic_long_add_unchecked(1, &mce_bad_pages);
- SetPageHWPoison(page);
- /* keep elevated page count for bad page */
- return ret;
-diff -urNp linux-2.6.34/mm/mempolicy.c linux-2.6.34/mm/mempolicy.c
---- linux-2.6.34/mm/mempolicy.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/mempolicy.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/mempolicy.c linux-2.6.34.1/mm/mempolicy.c
+--- linux-2.6.34.1/mm/mempolicy.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/mempolicy.c 2010-07-07 09:04:58.000000000 -0400
@@ -573,6 +573,10 @@ static int mbind_range(struct mm_struct
unsigned long vmstart;
unsigned long vmend;
} 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.34/mm/migrate.c linux-2.6.34/mm/migrate.c
---- linux-2.6.34/mm/migrate.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/migrate.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/migrate.c linux-2.6.34.1/mm/migrate.c
+--- linux-2.6.34.1/mm/migrate.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/migrate.c 2010-07-07 09:04:58.000000000 -0400
@@ -1056,6 +1056,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
if (!mm)
return -EINVAL;
rcu_read_unlock();
err = -EPERM;
goto out;
-diff -urNp linux-2.6.34/mm/mlock.c linux-2.6.34/mm/mlock.c
---- linux-2.6.34/mm/mlock.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/mlock.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/mlock.c linux-2.6.34.1/mm/mlock.c
+--- linux-2.6.34.1/mm/mlock.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/mlock.c 2010-07-07 09:04:58.000000000 -0400
@@ -13,6 +13,7 @@
#include <linux/pagemap.h>
#include <linux/mempolicy.h>
if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
capable(CAP_IPC_LOCK))
ret = do_mlockall(flags);
-diff -urNp linux-2.6.34/mm/mmap.c linux-2.6.34/mm/mmap.c
---- linux-2.6.34/mm/mmap.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/mmap.c 2010-07-01 21:22:01.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/mmap.c linux-2.6.34.1/mm/mmap.c
+--- linux-2.6.34.1/mm/mmap.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/mmap.c 2010-07-07 09:04:58.000000000 -0400
@@ -44,6 +44,16 @@
#define arch_rebalance_pgtables(addr, len) (addr)
#endif
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.34/mm/mprotect.c linux-2.6.34/mm/mprotect.c
---- linux-2.6.34/mm/mprotect.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/mprotect.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/mprotect.c linux-2.6.34.1/mm/mprotect.c
+--- linux-2.6.34.1/mm/mprotect.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/mprotect.c 2010-07-07 09:04:58.000000000 -0400
@@ -23,10 +23,16 @@
#include <linux/mmu_notifier.h>
#include <linux/migrate.h>
nstart = tmp;
if (nstart < prev->vm_end)
-diff -urNp linux-2.6.34/mm/mremap.c linux-2.6.34/mm/mremap.c
---- linux-2.6.34/mm/mremap.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/mremap.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/mremap.c linux-2.6.34.1/mm/mremap.c
+--- linux-2.6.34.1/mm/mremap.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/mremap.c 2010-07-07 09:04:58.000000000 -0400
@@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_str
continue;
pte = ptep_clear_flush(vma, old_addr, old_pte);
}
out:
if (ret & ~PAGE_MASK)
-diff -urNp linux-2.6.34/mm/nommu.c linux-2.6.34/mm/nommu.c
---- linux-2.6.34/mm/nommu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/nommu.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/nommu.c linux-2.6.34.1/mm/nommu.c
+--- linux-2.6.34.1/mm/nommu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/nommu.c 2010-07-07 09:04:58.000000000 -0400
@@ -759,15 +759,6 @@ struct vm_area_struct *find_vma(struct m
EXPORT_SYMBOL(find_vma);
*region = *vma->vm_region;
new->vm_region = region;
-diff -urNp linux-2.6.34/mm/page_alloc.c linux-2.6.34/mm/page_alloc.c
---- linux-2.6.34/mm/page_alloc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/page_alloc.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/page_alloc.c linux-2.6.34.1/mm/page_alloc.c
+--- linux-2.6.34.1/mm/page_alloc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/page_alloc.c 2010-07-07 09:04:58.000000000 -0400
@@ -606,6 +606,10 @@ static void __free_pages_ok(struct page
int bad = 0;
int wasMlocked = __TestClearPageMlocked(page);
struct zone *zone, unsigned long zonesize) {}
#endif /* CONFIG_SPARSEMEM */
-diff -urNp linux-2.6.34/mm/percpu.c linux-2.6.34/mm/percpu.c
---- linux-2.6.34/mm/percpu.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/percpu.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/percpu.c linux-2.6.34.1/mm/percpu.c
+--- linux-2.6.34.1/mm/percpu.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/percpu.c 2010-07-07 09:04:58.000000000 -0400
@@ -116,7 +116,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.34/mm/rmap.c linux-2.6.34/mm/rmap.c
---- linux-2.6.34/mm/rmap.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/rmap.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/rmap.c linux-2.6.34.1/mm/rmap.c
+--- linux-2.6.34.1/mm/rmap.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/rmap.c 2010-07-07 09:04:58.000000000 -0400
@@ -116,15 +116,29 @@ int anon_vma_prepare(struct vm_area_stru
struct anon_vma *anon_vma = vma->anon_vma;
struct anon_vma_chain *avc;
anon_vma_chain_free(avc);
out_enomem:
return -ENOMEM;
-diff -urNp linux-2.6.34/mm/shmem.c linux-2.6.34/mm/shmem.c
---- linux-2.6.34/mm/shmem.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/shmem.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/shmem.c linux-2.6.34.1/mm/shmem.c
+--- linux-2.6.34.1/mm/shmem.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/shmem.c 2010-07-07 09:04:58.000000000 -0400
@@ -30,7 +30,7 @@
#include <linux/module.h>
#include <linux/swap.h>
#ifdef CONFIG_SHMEM
/*
-diff -urNp linux-2.6.34/mm/slab.c linux-2.6.34/mm/slab.c
---- linux-2.6.34/mm/slab.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/slab.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/slab.c linux-2.6.34.1/mm/slab.c
+--- linux-2.6.34.1/mm/slab.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/slab.c 2010-07-07 09:04:58.000000000 -0400
@@ -308,7 +308,7 @@ struct kmem_list3 {
* Need this for bootstrapping a per node allocator.
*/
/**
* ksize - get the actual amount of memory allocated for a given object
* @objp: Pointer to the object
-diff -urNp linux-2.6.34/mm/slob.c linux-2.6.34/mm/slob.c
---- linux-2.6.34/mm/slob.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/slob.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/slob.c linux-2.6.34.1/mm/slob.c
+--- linux-2.6.34.1/mm/slob.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/slob.c 2010-07-07 09:04:58.000000000 -0400
@@ -29,7 +29,7 @@
* If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
* alloc_pages() directly, allocating compound pages so the page order
}
trace_kmem_cache_free(_RET_IP_, b);
-diff -urNp linux-2.6.34/mm/slub.c linux-2.6.34/mm/slub.c
---- linux-2.6.34/mm/slub.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/slub.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/slub.c linux-2.6.34.1/mm/slub.c
+--- linux-2.6.34.1/mm/slub.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/slub.c 2010-07-07 09:04:58.000000000 -0400
@@ -1877,6 +1877,8 @@ void kmem_cache_free(struct kmem_cache *
page = virt_to_head_page(x);
/*
* Calculate the order of allocation given an slab object size.
-@@ -2359,7 +2361,7 @@ static int kmem_cache_open(struct kmem_c
+@@ -2348,7 +2350,7 @@ static int kmem_cache_open(struct kmem_c
* list to avoid pounding the page allocator excessively.
*/
set_min_partial(s, ilog2(s->size));
#ifdef CONFIG_NUMA
s->remote_node_defrag_ratio = 1000;
#endif
-@@ -2499,8 +2501,7 @@ static inline int kmem_cache_close(struc
+@@ -2488,8 +2490,7 @@ static inline int kmem_cache_close(struc
void kmem_cache_destroy(struct kmem_cache *s)
{
down_write(&slub_lock);
list_del(&s->list);
up_write(&slub_lock);
if (kmem_cache_close(s)) {
-@@ -2792,6 +2793,46 @@ void *__kmalloc_node(size_t size, gfp_t
+@@ -2781,6 +2782,46 @@ void *__kmalloc_node(size_t size, gfp_t
EXPORT_SYMBOL(__kmalloc_node);
#endif
size_t ksize(const void *object)
{
struct page *page;
-@@ -3061,7 +3102,7 @@ void __init kmem_cache_init(void)
+@@ -3050,7 +3091,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);
-@@ -3170,7 +3211,7 @@ static int slab_unmergeable(struct kmem_
+@@ -3159,7 +3200,7 @@ static int slab_unmergeable(struct kmem_
/*
* We may have set a slab to be unmergeable during bootstrap.
*/
return 1;
return 0;
-@@ -3228,7 +3269,7 @@ struct kmem_cache *kmem_cache_create(con
+@@ -3217,7 +3258,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.
-@@ -3239,7 +3280,7 @@ struct kmem_cache *kmem_cache_create(con
+@@ -3228,7 +3269,7 @@ struct kmem_cache *kmem_cache_create(con
if (sysfs_slab_alias(s, name)) {
down_write(&slub_lock);
up_write(&slub_lock);
goto err;
}
-@@ -3954,7 +3995,7 @@ SLAB_ATTR_RO(ctor);
+@@ -3943,7 +3984,7 @@ SLAB_ATTR_RO(ctor);
static ssize_t aliases_show(struct kmem_cache *s, char *buf)
{
}
SLAB_ATTR_RO(aliases);
-@@ -4675,7 +4716,13 @@ static const struct file_operations proc
+@@ -4664,7 +4705,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.34/mm/util.c linux-2.6.34/mm/util.c
---- linux-2.6.34/mm/util.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/util.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/util.c linux-2.6.34.1/mm/util.c
+--- linux-2.6.34.1/mm/util.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/util.c 2010-07-07 09:04:58.000000000 -0400
@@ -245,6 +245,12 @@ EXPORT_SYMBOL(strndup_user);
void arch_pick_mmap_layout(struct mm_struct *mm)
{
mm->get_unmapped_area = arch_get_unmapped_area;
mm->unmap_area = arch_unmap_area;
}
-diff -urNp linux-2.6.34/mm/vmalloc.c linux-2.6.34/mm/vmalloc.c
---- linux-2.6.34/mm/vmalloc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/mm/vmalloc.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/mm/vmalloc.c linux-2.6.34.1/mm/vmalloc.c
+--- linux-2.6.34.1/mm/vmalloc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/mm/vmalloc.c 2010-07-07 09:04:58.000000000 -0400
@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
pte = pte_offset_kernel(pmd, addr);
void *vmalloc_32_user(unsigned long size)
{
struct vm_struct *area;
-diff -urNp linux-2.6.34/net/8021q/vlan.c linux-2.6.34/net/8021q/vlan.c
---- linux-2.6.34/net/8021q/vlan.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/8021q/vlan.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/8021q/vlan.c linux-2.6.34.1/net/8021q/vlan.c
+--- linux-2.6.34.1/net/8021q/vlan.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/8021q/vlan.c 2010-07-07 09:04:58.000000000 -0400
@@ -614,8 +614,7 @@ static int vlan_ioctl_handler(struct net
err = -EPERM;
if (!capable(CAP_NET_ADMIN))
struct vlan_net *vn;
vn = net_generic(net, vlan_net_id);
-diff -urNp linux-2.6.34/net/atm/atm_misc.c linux-2.6.34/net/atm/atm_misc.c
---- linux-2.6.34/net/atm/atm_misc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/atm/atm_misc.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/atm/atm_misc.c linux-2.6.34.1/net/atm/atm_misc.c
+--- linux-2.6.34.1/net/atm/atm_misc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/atm/atm_misc.c 2010-07-07 09:04:58.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.34/net/atm/proc.c linux-2.6.34/net/atm/proc.c
---- linux-2.6.34/net/atm/proc.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/atm/proc.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/atm/proc.c linux-2.6.34.1/net/atm/proc.c
+--- linux-2.6.34.1/net/atm/proc.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/atm/proc.c 2010-07-07 09:04:58.000000000 -0400
@@ -44,9 +44,9 @@ static void add_stats(struct seq_file *s
const struct k_atm_aal_stats *stats)
{
}
static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
-diff -urNp linux-2.6.34/net/atm/resources.c linux-2.6.34/net/atm/resources.c
---- linux-2.6.34/net/atm/resources.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/atm/resources.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/atm/resources.c linux-2.6.34.1/net/atm/resources.c
+--- linux-2.6.34.1/net/atm/resources.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/atm/resources.c 2010-07-07 09:04:58.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.34/net/bridge/br_stp_if.c linux-2.6.34/net/bridge/br_stp_if.c
---- linux-2.6.34/net/bridge/br_stp_if.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/bridge/br_stp_if.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/bridge/br_stp_if.c linux-2.6.34.1/net/bridge/br_stp_if.c
+--- linux-2.6.34.1/net/bridge/br_stp_if.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/bridge/br_stp_if.c 2010-07-07 09:04:58.000000000 -0400
@@ -147,7 +147,7 @@ static void br_stp_stop(struct net_bridg
char *envp[] = { NULL };
printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
br->dev->name, r);
-diff -urNp linux-2.6.34/net/bridge/netfilter/ebtables.c linux-2.6.34/net/bridge/netfilter/ebtables.c
---- linux-2.6.34/net/bridge/netfilter/ebtables.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/bridge/netfilter/ebtables.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/bridge/netfilter/ebtables.c linux-2.6.34.1/net/bridge/netfilter/ebtables.c
+--- linux-2.6.34.1/net/bridge/netfilter/ebtables.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/bridge/netfilter/ebtables.c 2010-07-07 09:04:58.000000000 -0400
@@ -1515,7 +1515,7 @@ static int do_ebt_get_ctl(struct sock *s
tmp.valid_hooks = t->table->valid_hooks;
}
BUGPRINT("c2u Didn't work\n");
ret = -EFAULT;
break;
-diff -urNp linux-2.6.34/net/core/dev.c linux-2.6.34/net/core/dev.c
---- linux-2.6.34/net/core/dev.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/core/dev.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/core/dev.c linux-2.6.34.1/net/core/dev.c
+--- linux-2.6.34.1/net/core/dev.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/core/dev.c 2010-07-07 09:04:58.000000000 -0400
@@ -2249,7 +2249,7 @@ int netif_rx_ni(struct sk_buff *skb)
}
EXPORT_SYMBOL(netif_rx_ni);
{
struct list_head *list = &__get_cpu_var(softnet_data).poll_list;
unsigned long time_limit = jiffies + 2;
-diff -urNp linux-2.6.34/net/core/flow.c linux-2.6.34/net/core/flow.c
---- linux-2.6.34/net/core/flow.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/core/flow.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/core/flow.c linux-2.6.34.1/net/core/flow.c
+--- linux-2.6.34.1/net/core/flow.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/core/flow.c 2010-07-07 09:04:58.000000000 -0400
@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(
static u32 flow_hash_shift;
#define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
-diff -urNp linux-2.6.34/net/core/sock.c linux-2.6.34/net/core/sock.c
---- linux-2.6.34/net/core/sock.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/core/sock.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/core/sock.c linux-2.6.34.1/net/core/sock.c
+--- linux-2.6.34.1/net/core/sock.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/core/sock.c 2010-07-07 09:04:58.000000000 -0400
@@ -900,7 +900,7 @@ int sock_getsockopt(struct socket *sock,
return -ENOTCONN;
if (lv < len)
return -EFAULT;
lenout:
if (put_user(len, optlen))
-diff -urNp linux-2.6.34/net/dccp/ccids/ccid3.c linux-2.6.34/net/dccp/ccids/ccid3.c
---- linux-2.6.34/net/dccp/ccids/ccid3.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/dccp/ccids/ccid3.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/dccp/ccids/ccid3.c linux-2.6.34.1/net/dccp/ccids/ccid3.c
+--- linux-2.6.34.1/net/dccp/ccids/ccid3.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/dccp/ccids/ccid3.c 2010-07-07 09:04:58.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.34/net/dccp/dccp.h linux-2.6.34/net/dccp/dccp.h
---- linux-2.6.34/net/dccp/dccp.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/dccp/dccp.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/dccp/dccp.h linux-2.6.34.1/net/dccp/dccp.h
+--- linux-2.6.34.1/net/dccp/dccp.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/dccp/dccp.h 2010-07-07 09:04:58.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.34/net/decnet/sysctl_net_decnet.c linux-2.6.34/net/decnet/sysctl_net_decnet.c
---- linux-2.6.34/net/decnet/sysctl_net_decnet.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/decnet/sysctl_net_decnet.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/decnet/sysctl_net_decnet.c linux-2.6.34.1/net/decnet/sysctl_net_decnet.c
+--- linux-2.6.34.1/net/decnet/sysctl_net_decnet.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/decnet/sysctl_net_decnet.c 2010-07-07 09:04:58.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.34/net/ipv4/inet_hashtables.c linux-2.6.34/net/ipv4/inet_hashtables.c
---- linux-2.6.34/net/ipv4/inet_hashtables.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/ipv4/inet_hashtables.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/ipv4/inet_hashtables.c linux-2.6.34.1/net/ipv4/inet_hashtables.c
+--- linux-2.6.34.1/net/ipv4/inet_hashtables.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/ipv4/inet_hashtables.c 2010-07-07 09:04:58.000000000 -0400
@@ -18,11 +18,14 @@
#include <linux/sched.h>
#include <linux/slab.h>
if (tw) {
inet_twsk_deschedule(tw, death_row);
while (twrefcnt) {
-diff -urNp linux-2.6.34/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.34/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-2.6.34/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.34.1/net/ipv4/netfilter/nf_nat_snmp_basic.c
+--- linux-2.6.34.1/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-07-07 09:04:58.000000000 -0400
@@ -398,7 +398,7 @@ static unsigned char asn1_octets_decode(
*len = 0;
if (*octets == NULL) {
if (net_ratelimit())
printk("OOM in bsalg (%d)\n", __LINE__);
-diff -urNp linux-2.6.34/net/ipv4/tcp_ipv4.c linux-2.6.34/net/ipv4/tcp_ipv4.c
---- linux-2.6.34/net/ipv4/tcp_ipv4.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/ipv4/tcp_ipv4.c 2010-07-02 17:33:36.000000000 -0400
+diff -urNp linux-2.6.34.1/net/ipv4/tcp_ipv4.c linux-2.6.34.1/net/ipv4/tcp_ipv4.c
+--- linux-2.6.34.1/net/ipv4/tcp_ipv4.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/ipv4/tcp_ipv4.c 2010-07-07 09:04:58.000000000 -0400
@@ -85,6 +85,9 @@
int sysctl_tcp_tw_reuse __read_mostly;
int sysctl_tcp_low_latency __read_mostly;
tcp_v4_send_reset(NULL, skb);
}
-diff -urNp linux-2.6.34/net/ipv4/tcp_minisocks.c linux-2.6.34/net/ipv4/tcp_minisocks.c
---- linux-2.6.34/net/ipv4/tcp_minisocks.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/ipv4/tcp_minisocks.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/ipv4/tcp_minisocks.c linux-2.6.34.1/net/ipv4/tcp_minisocks.c
+--- linux-2.6.34.1/net/ipv4/tcp_minisocks.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/ipv4/tcp_minisocks.c 2010-07-07 09:04:58.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.34/net/ipv4/tcp_probe.c linux-2.6.34/net/ipv4/tcp_probe.c
---- linux-2.6.34/net/ipv4/tcp_probe.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/ipv4/tcp_probe.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/ipv4/tcp_probe.c linux-2.6.34.1/net/ipv4/tcp_probe.c
+--- linux-2.6.34.1/net/ipv4/tcp_probe.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/ipv4/tcp_probe.c 2010-07-07 09:04:58.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.34/net/ipv4/tcp_timer.c linux-2.6.34/net/ipv4/tcp_timer.c
---- linux-2.6.34/net/ipv4/tcp_timer.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/ipv4/tcp_timer.c 2010-07-02 17:34:08.000000000 -0400
+diff -urNp linux-2.6.34.1/net/ipv4/tcp_timer.c linux-2.6.34.1/net/ipv4/tcp_timer.c
+--- linux-2.6.34.1/net/ipv4/tcp_timer.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/ipv4/tcp_timer.c 2010-07-07 09:04:58.000000000 -0400
@@ -22,6 +22,10 @@
#include <linux/gfp.h>
#include <net/tcp.h>
if (retransmits_timed_out(sk, retry_until)) {
/* Has it gone just too far? */
tcp_write_err(sk);
-diff -urNp linux-2.6.34/net/ipv4/udp.c linux-2.6.34/net/ipv4/udp.c
---- linux-2.6.34/net/ipv4/udp.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/ipv4/udp.c 2010-07-02 17:32:10.000000000 -0400
+diff -urNp linux-2.6.34.1/net/ipv4/udp.c linux-2.6.34.1/net/ipv4/udp.c
+--- linux-2.6.34.1/net/ipv4/udp.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/ipv4/udp.c 2010-07-07 09:04:58.000000000 -0400
@@ -86,6 +86,7 @@
#include <linux/types.h>
#include <linux/fcntl.h>
icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
/*
-diff -urNp linux-2.6.34/net/ipv6/exthdrs.c linux-2.6.34/net/ipv6/exthdrs.c
---- linux-2.6.34/net/ipv6/exthdrs.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/ipv6/exthdrs.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/ipv6/exthdrs.c linux-2.6.34.1/net/ipv6/exthdrs.c
+--- linux-2.6.34.1/net/ipv6/exthdrs.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/ipv6/exthdrs.c 2010-07-07 09:04:58.000000000 -0400
@@ -636,7 +636,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.34/net/ipv6/raw.c linux-2.6.34/net/ipv6/raw.c
---- linux-2.6.34/net/ipv6/raw.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/ipv6/raw.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/ipv6/raw.c linux-2.6.34.1/net/ipv6/raw.c
+--- linux-2.6.34.1/net/ipv6/raw.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/ipv6/raw.c 2010-07-07 09:04:58.000000000 -0400
@@ -598,7 +598,7 @@ out:
return err;
}
struct flowi *fl, struct rt6_info *rt,
unsigned int flags)
{
-diff -urNp linux-2.6.34/net/ipv6/tcp_ipv6.c linux-2.6.34/net/ipv6/tcp_ipv6.c
---- linux-2.6.34/net/ipv6/tcp_ipv6.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/ipv6/tcp_ipv6.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/ipv6/tcp_ipv6.c linux-2.6.34.1/net/ipv6/tcp_ipv6.c
+--- linux-2.6.34.1/net/ipv6/tcp_ipv6.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/ipv6/tcp_ipv6.c 2010-07-07 09:04:58.000000000 -0400
@@ -89,6 +89,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
}
#endif
tcp_v6_send_reset(NULL, skb);
}
-diff -urNp linux-2.6.34/net/ipv6/udp.c linux-2.6.34/net/ipv6/udp.c
---- linux-2.6.34/net/ipv6/udp.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/ipv6/udp.c 2010-07-02 17:35:17.000000000 -0400
+diff -urNp linux-2.6.34.1/net/ipv6/udp.c linux-2.6.34.1/net/ipv6/udp.c
+--- linux-2.6.34.1/net/ipv6/udp.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/ipv6/udp.c 2010-07-07 09:04:58.000000000 -0400
@@ -50,6 +50,10 @@
#include <linux/seq_file.h>
#include "udp_impl.h"
icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
kfree_skb(skb);
-diff -urNp linux-2.6.34/net/irda/ircomm/ircomm_tty.c linux-2.6.34/net/irda/ircomm/ircomm_tty.c
---- linux-2.6.34/net/irda/ircomm/ircomm_tty.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/irda/ircomm/ircomm_tty.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/irda/ircomm/ircomm_tty.c linux-2.6.34.1/net/irda/ircomm/ircomm_tty.c
+--- linux-2.6.34.1/net/irda/ircomm/ircomm_tty.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/irda/ircomm/ircomm_tty.c 2010-07-07 09:04:58.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.34/net/mac80211/ieee80211_i.h linux-2.6.34/net/mac80211/ieee80211_i.h
---- linux-2.6.34/net/mac80211/ieee80211_i.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/mac80211/ieee80211_i.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/mac80211/ieee80211_i.h linux-2.6.34.1/net/mac80211/ieee80211_i.h
+--- linux-2.6.34.1/net/mac80211/ieee80211_i.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/mac80211/ieee80211_i.h 2010-07-07 09:04:58.000000000 -0400
@@ -630,7 +630,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.34/net/mac80211/iface.c linux-2.6.34/net/mac80211/iface.c
---- linux-2.6.34/net/mac80211/iface.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/mac80211/iface.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/mac80211/iface.c linux-2.6.34.1/net/mac80211/iface.c
+--- linux-2.6.34.1/net/mac80211/iface.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/mac80211/iface.c 2010-07-07 09:04:58.000000000 -0400
@@ -183,7 +183,7 @@ static int ieee80211_open(struct net_dev
break;
}
ieee80211_clear_tx_pending(local);
ieee80211_stop_device(local);
-diff -urNp linux-2.6.34/net/mac80211/main.c linux-2.6.34/net/mac80211/main.c
---- linux-2.6.34/net/mac80211/main.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/mac80211/main.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/mac80211/main.c linux-2.6.34.1/net/mac80211/main.c
+--- linux-2.6.34.1/net/mac80211/main.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/mac80211/main.c 2010-07-07 09:04:58.000000000 -0400
@@ -148,7 +148,7 @@ int ieee80211_hw_config(struct ieee80211
local->hw.conf.power_level = power;
}
ret = drv_config(local, changed);
/*
* Goal:
-diff -urNp linux-2.6.34/net/mac80211/pm.c linux-2.6.34/net/mac80211/pm.c
---- linux-2.6.34/net/mac80211/pm.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/mac80211/pm.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/mac80211/pm.c linux-2.6.34.1/net/mac80211/pm.c
+--- linux-2.6.34.1/net/mac80211/pm.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/mac80211/pm.c 2010-07-07 09:04:58.000000000 -0400
@@ -101,7 +101,7 @@ int __ieee80211_suspend(struct ieee80211
}
ieee80211_stop_device(local);
local->suspended = true;
-diff -urNp linux-2.6.34/net/mac80211/rate.c linux-2.6.34/net/mac80211/rate.c
---- linux-2.6.34/net/mac80211/rate.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/mac80211/rate.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/mac80211/rate.c linux-2.6.34.1/net/mac80211/rate.c
+--- linux-2.6.34.1/net/mac80211/rate.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/mac80211/rate.c 2010-07-07 09:04:58.000000000 -0400
@@ -355,7 +355,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.34/net/mac80211/rc80211_pid_debugfs.c linux-2.6.34/net/mac80211/rc80211_pid_debugfs.c
---- linux-2.6.34/net/mac80211/rc80211_pid_debugfs.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/mac80211/rc80211_pid_debugfs.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/mac80211/rc80211_pid_debugfs.c linux-2.6.34.1/net/mac80211/rc80211_pid_debugfs.c
+--- linux-2.6.34.1/net/mac80211/rc80211_pid_debugfs.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/mac80211/rc80211_pid_debugfs.c 2010-07-07 09:04:58.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.34/net/mac80211/tx.c linux-2.6.34/net/mac80211/tx.c
---- linux-2.6.34/net/mac80211/tx.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/mac80211/tx.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/mac80211/tx.c linux-2.6.34.1/net/mac80211/tx.c
+--- linux-2.6.34.1/net/mac80211/tx.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/mac80211/tx.c 2010-07-07 09:04:58.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.34/net/mac80211/util.c linux-2.6.34/net/mac80211/util.c
---- linux-2.6.34/net/mac80211/util.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/mac80211/util.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/mac80211/util.c linux-2.6.34.1/net/mac80211/util.c
+--- linux-2.6.34.1/net/mac80211/util.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/mac80211/util.c 2010-07-07 09:04:58.000000000 -0400
@@ -1088,7 +1088,7 @@ int ieee80211_reconfig(struct ieee80211_
local->resuming = true;
/*
* Upon resume hardware can sometimes be goofy due to
* various platform / driver / bus issues, so restarting
-diff -urNp linux-2.6.34/net/packet/af_packet.c linux-2.6.34/net/packet/af_packet.c
---- linux-2.6.34/net/packet/af_packet.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/packet/af_packet.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/packet/af_packet.c linux-2.6.34.1/net/packet/af_packet.c
+--- linux-2.6.34.1/net/packet/af_packet.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/packet/af_packet.c 2010-07-07 09:04:58.000000000 -0400
@@ -2034,7 +2034,7 @@ static int packet_getsockopt(struct sock
case PACKET_HDRLEN:
if (len > sizeof(int))
return -EFAULT;
return 0;
}
-diff -urNp linux-2.6.34/net/sctp/socket.c linux-2.6.34/net/sctp/socket.c
---- linux-2.6.34/net/sctp/socket.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/sctp/socket.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/sctp/socket.c linux-2.6.34.1/net/sctp/socket.c
+--- linux-2.6.34.1/net/sctp/socket.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/sctp/socket.c 2010-07-07 09:04:58.000000000 -0400
@@ -1483,7 +1483,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
struct sctp_sndrcvinfo *sinfo;
struct sctp_initmsg *sinit;
SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n");
if (pp->fastreuse && sk->sk_reuse &&
-diff -urNp linux-2.6.34/net/socket.c linux-2.6.34/net/socket.c
---- linux-2.6.34/net/socket.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/socket.c 2010-07-03 19:08:46.000000000 -0400
+diff -urNp linux-2.6.34.1/net/socket.c linux-2.6.34.1/net/socket.c
+--- linux-2.6.34.1/net/socket.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/socket.c 2010-07-07 09:04:58.000000000 -0400
@@ -88,6 +88,7 @@
#include <linux/nsproxy.h>
#include <linux/magic.h>
err =
security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
if (err)
-diff -urNp linux-2.6.34/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.34/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-2.6.34/net/sunrpc/xprtrdma/svc_rdma.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/sunrpc/xprtrdma/svc_rdma.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.34.1/net/sunrpc/xprtrdma/svc_rdma.c
+--- linux-2.6.34.1/net/sunrpc/xprtrdma/svc_rdma.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/sunrpc/xprtrdma/svc_rdma.c 2010-07-07 09:04:58.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.34/net/sysctl_net.c linux-2.6.34/net/sysctl_net.c
---- linux-2.6.34/net/sysctl_net.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/sysctl_net.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/sysctl_net.c linux-2.6.34.1/net/sysctl_net.c
+--- linux-2.6.34.1/net/sysctl_net.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/sysctl_net.c 2010-07-07 09:04:58.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.34/net/tipc/socket.c linux-2.6.34/net/tipc/socket.c
---- linux-2.6.34/net/tipc/socket.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/tipc/socket.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/tipc/socket.c linux-2.6.34.1/net/tipc/socket.c
+--- linux-2.6.34.1/net/tipc/socket.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/tipc/socket.c 2010-07-07 09:04:58.000000000 -0400
@@ -1451,8 +1451,9 @@ static int connect(struct socket *sock,
} else {
if (res == 0)
sock->state = SS_DISCONNECTING;
}
-diff -urNp linux-2.6.34/net/unix/af_unix.c linux-2.6.34/net/unix/af_unix.c
---- linux-2.6.34/net/unix/af_unix.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/unix/af_unix.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/unix/af_unix.c linux-2.6.34.1/net/unix/af_unix.c
+--- linux-2.6.34.1/net/unix/af_unix.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/unix/af_unix.c 2010-07-07 09:04:59.000000000 -0400
@@ -735,6 +735,12 @@ static struct sock *unix_find_other(stru
err = -ECONNREFUSED;
if (!S_ISSOCK(inode->i_mode))
list = &unix_socket_table[addr->hash];
} else {
list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
-diff -urNp linux-2.6.34/net/wireless/wext-core.c linux-2.6.34/net/wireless/wext-core.c
---- linux-2.6.34/net/wireless/wext-core.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/wireless/wext-core.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/wireless/wext-core.c linux-2.6.34.1/net/wireless/wext-core.c
+--- linux-2.6.34.1/net/wireless/wext-core.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/wireless/wext-core.c 2010-07-07 09:04:59.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.34/net/xfrm/xfrm_policy.c linux-2.6.34/net/xfrm/xfrm_policy.c
---- linux-2.6.34/net/xfrm/xfrm_policy.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/net/xfrm/xfrm_policy.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/net/xfrm/xfrm_policy.c linux-2.6.34.1/net/xfrm/xfrm_policy.c
+--- linux-2.6.34.1/net/xfrm/xfrm_policy.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/net/xfrm/xfrm_policy.c 2010-07-07 09:04:59.000000000 -0400
@@ -1510,7 +1510,7 @@ free_dst:
goto out;
}
xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
{
#ifdef CONFIG_XFRM_SUB_POLICY
-diff -urNp linux-2.6.34/scripts/basic/fixdep.c linux-2.6.34/scripts/basic/fixdep.c
---- linux-2.6.34/scripts/basic/fixdep.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/scripts/basic/fixdep.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/scripts/basic/fixdep.c linux-2.6.34.1/scripts/basic/fixdep.c
+--- linux-2.6.34.1/scripts/basic/fixdep.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/scripts/basic/fixdep.c 2010-07-07 09:04:59.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.34/scripts/kallsyms.c linux-2.6.34/scripts/kallsyms.c
---- linux-2.6.34/scripts/kallsyms.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/scripts/kallsyms.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/scripts/kallsyms.c linux-2.6.34.1/scripts/kallsyms.c
+--- linux-2.6.34.1/scripts/kallsyms.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/scripts/kallsyms.c 2010-07-07 09:04:59.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.34/scripts/mod/file2alias.c linux-2.6.34/scripts/mod/file2alias.c
---- linux-2.6.34/scripts/mod/file2alias.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/scripts/mod/file2alias.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/scripts/mod/file2alias.c linux-2.6.34.1/scripts/mod/file2alias.c
+--- linux-2.6.34.1/scripts/mod/file2alias.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/scripts/mod/file2alias.c 2010-07-07 09:04:59.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.34/scripts/mod/modpost.c linux-2.6.34/scripts/mod/modpost.c
---- linux-2.6.34/scripts/mod/modpost.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/scripts/mod/modpost.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/scripts/mod/modpost.c linux-2.6.34.1/scripts/mod/modpost.c
+--- linux-2.6.34.1/scripts/mod/modpost.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/scripts/mod/modpost.c 2010-07-07 09:04:59.000000000 -0400
@@ -842,6 +842,7 @@ enum mismatch {
INIT_TO_EXIT,
EXIT_TO_INIT,
goto close_write;
tmp = NOFAIL(malloc(b->pos));
-diff -urNp linux-2.6.34/scripts/mod/modpost.h linux-2.6.34/scripts/mod/modpost.h
---- linux-2.6.34/scripts/mod/modpost.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/scripts/mod/modpost.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/scripts/mod/modpost.h linux-2.6.34.1/scripts/mod/modpost.h
+--- linux-2.6.34.1/scripts/mod/modpost.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/scripts/mod/modpost.h 2010-07-07 09:04:59.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.34/scripts/mod/sumversion.c linux-2.6.34/scripts/mod/sumversion.c
---- linux-2.6.34/scripts/mod/sumversion.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/scripts/mod/sumversion.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/scripts/mod/sumversion.c linux-2.6.34.1/scripts/mod/sumversion.c
+--- linux-2.6.34.1/scripts/mod/sumversion.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/scripts/mod/sumversion.c 2010-07-07 09:04:59.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.34/scripts/pnmtologo.c linux-2.6.34/scripts/pnmtologo.c
---- linux-2.6.34/scripts/pnmtologo.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/scripts/pnmtologo.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/scripts/pnmtologo.c linux-2.6.34.1/scripts/pnmtologo.c
+--- linux-2.6.34.1/scripts/pnmtologo.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/scripts/pnmtologo.c 2010-07-07 09:04:59.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.34/security/commoncap.c linux-2.6.34/security/commoncap.c
---- linux-2.6.34/security/commoncap.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/security/commoncap.c 2010-07-02 17:30:22.000000000 -0400
-@@ -28,6 +28,7 @@
- #include <linux/prctl.h>
- #include <linux/securebits.h>
- #include <linux/syslog.h>
-+#include <net/sock.h>
-
- /*
- * If a non-root user executes a setuid-root binary in
-@@ -51,9 +52,11 @@ static void warn_setuid_and_fcaps_mixed(
- }
- }
-
-+extern kernel_cap_t gr_cap_rtnetlink(struct sock *sk);
-+
- int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
- {
-- NETLINK_CB(skb).eff_cap = current_cap();
-+ NETLINK_CB(skb).eff_cap = gr_cap_rtnetlink(sk);
- return 0;
- }
-
-diff -urNp linux-2.6.34/security/integrity/ima/ima_api.c linux-2.6.34/security/integrity/ima/ima_api.c
---- linux-2.6.34/security/integrity/ima/ima_api.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/security/integrity/ima/ima_api.c 2010-07-01 20:45:16.000000000 -0400
-@@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino
- int result;
-
- /* can overflow, only indicator */
-- atomic_long_inc(&ima_htable.violations);
-+ atomic_long_inc_unchecked(&ima_htable.violations);
-
- entry = kmalloc(sizeof(*entry), GFP_KERNEL);
- if (!entry) {
-diff -urNp linux-2.6.34/security/integrity/ima/ima_fs.c linux-2.6.34/security/integrity/ima/ima_fs.c
---- linux-2.6.34/security/integrity/ima/ima_fs.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/security/integrity/ima/ima_fs.c 2010-07-01 20:45:16.000000000 -0400
-@@ -28,12 +28,12 @@
- static int valid_policy = 1;
- #define TMPBUFLEN 12
- static ssize_t ima_show_htable_value(char __user *buf, size_t count,
-- loff_t *ppos, atomic_long_t *val)
-+ loff_t *ppos, atomic_long_unchecked_t *val)
- {
- char tmpbuf[TMPBUFLEN];
- ssize_t len;
-
-- len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val));
-+ len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val));
- return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
- }
-
-diff -urNp linux-2.6.34/security/integrity/ima/ima.h linux-2.6.34/security/integrity/ima/ima.h
---- linux-2.6.34/security/integrity/ima/ima.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/security/integrity/ima/ima.h 2010-07-01 20:45:16.000000000 -0400
-@@ -83,8 +83,8 @@ void ima_add_violation(struct inode *ino
- extern spinlock_t ima_queue_lock;
-
- struct ima_h_table {
-- atomic_long_t len; /* number of stored measurements in the list */
-- atomic_long_t violations;
-+ atomic_long_unchecked_t len; /* number of stored measurements in the list */
-+ atomic_long_unchecked_t violations;
- struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
- };
- extern struct ima_h_table ima_htable;
-diff -urNp linux-2.6.34/security/integrity/ima/ima_queue.c linux-2.6.34/security/integrity/ima/ima_queue.c
---- linux-2.6.34/security/integrity/ima/ima_queue.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/security/integrity/ima/ima_queue.c 2010-07-01 20:45:16.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);
-
-- atomic_long_inc(&ima_htable.len);
-+ atomic_long_inc_unchecked(&ima_htable.len);
- key = ima_hash_key(entry->digest);
- hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
- return 0;
-diff -urNp linux-2.6.34/security/Kconfig linux-2.6.34/security/Kconfig
---- linux-2.6.34/security/Kconfig 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/security/Kconfig 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/security/Kconfig linux-2.6.34.1/security/Kconfig
+--- linux-2.6.34.1/security/Kconfig 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/security/Kconfig 2010-07-07 09:04:59.000000000 -0400
@@ -4,6 +4,499 @@
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.34/security/min_addr.c linux-2.6.34/security/min_addr.c
---- linux-2.6.34/security/min_addr.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/security/min_addr.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/security/commoncap.c linux-2.6.34.1/security/commoncap.c
+--- linux-2.6.34.1/security/commoncap.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/security/commoncap.c 2010-07-07 09:04:59.000000000 -0400
+@@ -28,6 +28,7 @@
+ #include <linux/prctl.h>
+ #include <linux/securebits.h>
+ #include <linux/syslog.h>
++#include <net/sock.h>
+
+ /*
+ * If a non-root user executes a setuid-root binary in
+@@ -51,9 +52,11 @@ static void warn_setuid_and_fcaps_mixed(
+ }
+ }
+
++extern kernel_cap_t gr_cap_rtnetlink(struct sock *sk);
++
+ int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
+ {
+- NETLINK_CB(skb).eff_cap = current_cap();
++ NETLINK_CB(skb).eff_cap = gr_cap_rtnetlink(sk);
+ return 0;
+ }
+
+diff -urNp linux-2.6.34.1/security/integrity/ima/ima.h linux-2.6.34.1/security/integrity/ima/ima.h
+--- linux-2.6.34.1/security/integrity/ima/ima.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/security/integrity/ima/ima.h 2010-07-07 09:04:59.000000000 -0400
+@@ -83,8 +83,8 @@ void ima_add_violation(struct inode *ino
+ extern spinlock_t ima_queue_lock;
+
+ struct ima_h_table {
+- atomic_long_t len; /* number of stored measurements in the list */
+- atomic_long_t violations;
++ atomic_long_unchecked_t len; /* number of stored measurements in the list */
++ atomic_long_unchecked_t violations;
+ struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
+ };
+ extern struct ima_h_table ima_htable;
+diff -urNp linux-2.6.34.1/security/integrity/ima/ima_api.c linux-2.6.34.1/security/integrity/ima/ima_api.c
+--- linux-2.6.34.1/security/integrity/ima/ima_api.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/security/integrity/ima/ima_api.c 2010-07-07 09:04:59.000000000 -0400
+@@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino
+ int result;
+
+ /* can overflow, only indicator */
+- atomic_long_inc(&ima_htable.violations);
++ atomic_long_inc_unchecked(&ima_htable.violations);
+
+ entry = kmalloc(sizeof(*entry), GFP_KERNEL);
+ if (!entry) {
+diff -urNp linux-2.6.34.1/security/integrity/ima/ima_fs.c linux-2.6.34.1/security/integrity/ima/ima_fs.c
+--- linux-2.6.34.1/security/integrity/ima/ima_fs.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/security/integrity/ima/ima_fs.c 2010-07-07 09:04:59.000000000 -0400
+@@ -28,12 +28,12 @@
+ static int valid_policy = 1;
+ #define TMPBUFLEN 12
+ static ssize_t ima_show_htable_value(char __user *buf, size_t count,
+- loff_t *ppos, atomic_long_t *val)
++ loff_t *ppos, atomic_long_unchecked_t *val)
+ {
+ char tmpbuf[TMPBUFLEN];
+ ssize_t len;
+
+- len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val));
++ len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val));
+ return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
+ }
+
+diff -urNp linux-2.6.34.1/security/integrity/ima/ima_queue.c linux-2.6.34.1/security/integrity/ima/ima_queue.c
+--- linux-2.6.34.1/security/integrity/ima/ima_queue.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/security/integrity/ima/ima_queue.c 2010-07-07 09:04:59.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);
+
+- atomic_long_inc(&ima_htable.len);
++ atomic_long_inc_unchecked(&ima_htable.len);
+ key = ima_hash_key(entry->digest);
+ hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
+ return 0;
+diff -urNp linux-2.6.34.1/security/min_addr.c linux-2.6.34.1/security/min_addr.c
+--- linux-2.6.34.1/security/min_addr.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/security/min_addr.c 2010-07-07 09:04:59.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.34/sound/aoa/codecs/onyx.c linux-2.6.34/sound/aoa/codecs/onyx.c
---- linux-2.6.34/sound/aoa/codecs/onyx.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/sound/aoa/codecs/onyx.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/sound/aoa/codecs/onyx.c linux-2.6.34.1/sound/aoa/codecs/onyx.c
+--- linux-2.6.34.1/sound/aoa/codecs/onyx.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/sound/aoa/codecs/onyx.c 2010-07-07 09:04:59.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.34/sound/core/oss/pcm_oss.c linux-2.6.34/sound/core/oss/pcm_oss.c
---- linux-2.6.34/sound/core/oss/pcm_oss.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/sound/core/oss/pcm_oss.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/sound/core/oss/pcm_oss.c linux-2.6.34.1/sound/core/oss/pcm_oss.c
+--- linux-2.6.34.1/sound/core/oss/pcm_oss.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/sound/core/oss/pcm_oss.c 2010-07-07 09:04:59.000000000 -0400
@@ -2962,8 +2962,8 @@ static void snd_pcm_oss_proc_done(struct
}
}
#endif /* CONFIG_SND_VERBOSE_PROCFS */
/*
-diff -urNp linux-2.6.34/sound/core/seq/seq_lock.h linux-2.6.34/sound/core/seq/seq_lock.h
---- linux-2.6.34/sound/core/seq/seq_lock.h 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/sound/core/seq/seq_lock.h 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/sound/core/seq/seq_lock.h linux-2.6.34.1/sound/core/seq/seq_lock.h
+--- linux-2.6.34.1/sound/core/seq/seq_lock.h 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/sound/core/seq/seq_lock.h 2010-07-07 09:04:59.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.34/sound/drivers/mts64.c linux-2.6.34/sound/drivers/mts64.c
---- linux-2.6.34/sound/drivers/mts64.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/sound/drivers/mts64.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/sound/drivers/mts64.c linux-2.6.34.1/sound/drivers/mts64.c
+--- linux-2.6.34.1/sound/drivers/mts64.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/sound/drivers/mts64.c 2010-07-07 09:04:59.000000000 -0400
@@ -66,7 +66,7 @@ struct mts64 {
struct pardevice *pardev;
int pardev_claimed;
return 0;
}
-diff -urNp linux-2.6.34/sound/drivers/portman2x4.c linux-2.6.34/sound/drivers/portman2x4.c
---- linux-2.6.34/sound/drivers/portman2x4.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/sound/drivers/portman2x4.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/sound/drivers/portman2x4.c linux-2.6.34.1/sound/drivers/portman2x4.c
+--- linux-2.6.34.1/sound/drivers/portman2x4.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/sound/drivers/portman2x4.c 2010-07-07 09:04:59.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.34/sound/oss/sb_audio.c linux-2.6.34/sound/oss/sb_audio.c
---- linux-2.6.34/sound/oss/sb_audio.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/sound/oss/sb_audio.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/sound/oss/sb_audio.c linux-2.6.34.1/sound/oss/sb_audio.c
+--- linux-2.6.34.1/sound/oss/sb_audio.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/sound/oss/sb_audio.c 2010-07-07 09:04:59.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.34/sound/pci/ac97/ac97_codec.c linux-2.6.34/sound/pci/ac97/ac97_codec.c
---- linux-2.6.34/sound/pci/ac97/ac97_codec.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/sound/pci/ac97/ac97_codec.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/sound/pci/ac97/ac97_codec.c linux-2.6.34.1/sound/pci/ac97/ac97_codec.c
+--- linux-2.6.34.1/sound/pci/ac97/ac97_codec.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/sound/pci/ac97/ac97_codec.c 2010-07-07 09:04:59.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.34/sound/pci/ac97/ac97_patch.c linux-2.6.34/sound/pci/ac97/ac97_patch.c
---- linux-2.6.34/sound/pci/ac97/ac97_patch.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/sound/pci/ac97/ac97_patch.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/sound/pci/ac97/ac97_patch.c linux-2.6.34.1/sound/pci/ac97/ac97_patch.c
+--- linux-2.6.34.1/sound/pci/ac97/ac97_patch.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/sound/pci/ac97/ac97_patch.c 2010-07-07 09:04:59.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.34/sound/pci/ens1370.c linux-2.6.34/sound/pci/ens1370.c
---- linux-2.6.34/sound/pci/ens1370.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/sound/pci/ens1370.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/sound/pci/ens1370.c linux-2.6.34.1/sound/pci/ens1370.c
+--- linux-2.6.34.1/sound/pci/ens1370.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/sound/pci/ens1370.c 2010-07-07 09:04:59.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.34/sound/pci/hda/patch_hdmi.c linux-2.6.34/sound/pci/hda/patch_hdmi.c
---- linux-2.6.34/sound/pci/hda/patch_hdmi.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/sound/pci/hda/patch_hdmi.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/sound/pci/hda/patch_hdmi.c linux-2.6.34.1/sound/pci/hda/patch_hdmi.c
+--- linux-2.6.34.1/sound/pci/hda/patch_hdmi.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/sound/pci/hda/patch_hdmi.c 2010-07-07 09:04:59.000000000 -0400
@@ -657,10 +657,10 @@ static void hdmi_non_intrinsic_event(str
cp_ready);
}
-diff -urNp linux-2.6.34/sound/pci/intel8x0.c linux-2.6.34/sound/pci/intel8x0.c
---- linux-2.6.34/sound/pci/intel8x0.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/sound/pci/intel8x0.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/sound/pci/intel8x0.c linux-2.6.34.1/sound/pci/intel8x0.c
+--- linux-2.6.34.1/sound/pci/intel8x0.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/sound/pci/intel8x0.c 2010-07-07 09:04:59.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.34/sound/pci/intel8x0m.c linux-2.6.34/sound/pci/intel8x0m.c
---- linux-2.6.34/sound/pci/intel8x0m.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/sound/pci/intel8x0m.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/sound/pci/intel8x0m.c linux-2.6.34.1/sound/pci/intel8x0m.c
+--- linux-2.6.34.1/sound/pci/intel8x0m.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/sound/pci/intel8x0m.c 2010-07-07 09:04:59.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.34/usr/gen_init_cpio.c linux-2.6.34/usr/gen_init_cpio.c
---- linux-2.6.34/usr/gen_init_cpio.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/usr/gen_init_cpio.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/usr/gen_init_cpio.c linux-2.6.34.1/usr/gen_init_cpio.c
+--- linux-2.6.34.1/usr/gen_init_cpio.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/usr/gen_init_cpio.c 2010-07-07 09:04:59.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.34/virt/kvm/kvm_main.c linux-2.6.34/virt/kvm/kvm_main.c
---- linux-2.6.34/virt/kvm/kvm_main.c 2010-05-16 17:17:36.000000000 -0400
-+++ linux-2.6.34/virt/kvm/kvm_main.c 2010-07-01 20:45:16.000000000 -0400
+diff -urNp linux-2.6.34.1/virt/kvm/kvm_main.c linux-2.6.34.1/virt/kvm/kvm_main.c
+--- linux-2.6.34.1/virt/kvm/kvm_main.c 2010-07-05 14:24:10.000000000 -0400
++++ linux-2.6.34.1/virt/kvm/kvm_main.c 2010-07-07 09:04:59.000000000 -0400
@@ -1288,6 +1288,7 @@ static int kvm_vcpu_release(struct inode
return 0;
}
projects / ipfire-3.x.git / commitdiff
