diff options
| -rw-r--r-- | main/linux-grsec/APKBUILD | 8 | ||||
| -rw-r--r-- | main/linux-grsec/grsecurity-2.2.2-2.6.38.8-unofficial.patch (renamed from main/linux-grsec/grsecurity-2.2.2-2.6.38.7-201105222331.patch) | 22990 |
2 files changed, 12231 insertions, 10767 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 758226d210..72e5127e05 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -2,7 +2,7 @@ _flavor=grsec pkgname=linux-${_flavor} -pkgver=2.6.38.7 +pkgver=2.6.38.8 _kernver=2.6.38 pkgrel=0 pkgdesc="Linux kernel with grsecurity" @@ -14,7 +14,7 @@ _config=${config:-kernelconfig.${CARCH}} install= source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 - grsecurity-2.2.2-2.6.38.7-201105222331.patch + grsecurity-2.2.2-2.6.38.8-unofficial.patch 0004-arp-flush-arp-cache-on-device-change.patch net-gre-provide-multicast-mappings-for-ipv4-and-ipv6.patch @@ -137,8 +137,8 @@ dev() { } md5sums="7d471477bfa67546f902da62227fa976 linux-2.6.38.tar.bz2 -2639b4b98a2dcfc8b7f091543f289205 patch-2.6.38.7.bz2 -405571538f81e3ebbe8cbfc029c52fdd grsecurity-2.2.2-2.6.38.7-201105222331.patch +c0f416f6a2e916633f697287cc7cb914 patch-2.6.38.8.bz2 +58e1f9194fa75df9afdf2746370fa3cb grsecurity-2.2.2-2.6.38.8-unofficial.patch 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch aa1b82da0cabfb41c5e6da5bddf60bab net-gre-provide-multicast-mappings-for-ipv4-and-ipv6.patch f4cf5b0ddfeef7aa87fb27792aff88a4 kernelconfig.x86 diff --git a/main/linux-grsec/grsecurity-2.2.2-2.6.38.7-201105222331.patch b/main/linux-grsec/grsecurity-2.2.2-2.6.38.8-unofficial.patch index 8ac4f8cdfc..241010df84 100644 --- a/main/linux-grsec/grsecurity-2.2.2-2.6.38.7-201105222331.patch +++ b/main/linux-grsec/grsecurity-2.2.2-2.6.38.8-unofficial.patch @@ -1,6 +1,215 @@ -diff -urNp linux-2.6.38.7/arch/alpha/include/asm/dma-mapping.h linux-2.6.38.7/arch/alpha/include/asm/dma-mapping.h ---- linux-2.6.38.7/arch/alpha/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/alpha/include/asm/dma-mapping.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/Documentation/dontdiff b/Documentation/dontdiff +index 470d3db..c5906b5 100644 +--- a/Documentation/dontdiff ++++ b/Documentation/dontdiff +@@ -1,13 +1,16 @@ + *.a + *.aux + *.bin ++*.cis + *.cpio + *.csp ++*.dbg + *.dsp + *.dvi + *.elf + *.eps + *.fw ++*.gcno + *.gen.S + *.gif + *.grep +@@ -38,8 +41,10 @@ + *.tab.h + *.tex + *.ver ++*.vim + *.xml + *_MODULES ++*_reg_safe.h + *_vga16.c + *~ + *.9 +@@ -49,11 +54,16 @@ + 53c700_d.h + CVS + ChangeSet ++GPATH ++GRTAGS ++GSYMS ++GTAGS + Image + Kerntypes + Module.markers + Module.symvers + PENDING ++PERF* + SCCS + System.map* + TAGS +@@ -80,8 +90,11 @@ btfixupprep + build + bvmlinux + bzImage* ++capability_names.h + capflags.c + classlist.h* ++clut_vga16.c ++common-cmds.h + comp*.log + compile.h* + conf +@@ -106,16 +119,19 @@ fore200e_mkfirm + fore200e_pca_fw.c* + gconf + gen-devlist ++gen-kdb_cmds.c + gen_crc32table + gen_init_cpio + 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 + int16.c +@@ -125,7 +141,6 @@ int32.c + int4.c + int8.c + kallsyms +-kconfig + keywords.c + ksym.c* + ksym.h* +@@ -149,7 +164,9 @@ mkboot + mkbugboot + mkcpustr + mkdep ++mkpiggy + mkprep ++mkregtable + mktables + mktree + modpost +@@ -165,6 +182,7 @@ parse.h + patches* + pca200e.bin + pca200e_ecd.bin2 ++perf-archive + piggy.gz + piggyback + piggy.S +@@ -180,7 +198,9 @@ r600_reg_safe.h + raid6altivec*.c + raid6int*.c + raid6tables.c ++regdb.c + relocs ++rlim_names.h + rn50_reg_safe.h + rs600_reg_safe.h + rv515_reg_safe.h +@@ -189,6 +209,7 @@ setup + setup.bin + setup.elf + sImage ++slabinfo + sm_tbl* + split-include + syscalltab.h +@@ -213,13 +234,17 @@ 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 +diff --git a/Documentation/filesystems/sysfs.txt b/Documentation/filesystems/sysfs.txt +index 5d1335fae..9f4434d 100644 +--- a/Documentation/filesystems/sysfs.txt ++++ b/Documentation/filesystems/sysfs.txt +@@ -123,8 +123,8 @@ set of sysfs operations for forwarding read and write calls to the + show and store methods of the attribute owners. + + struct sysfs_ops { +- ssize_t (*show)(struct kobject *, struct attribute *, char *); +- ssize_t (*store)(struct kobject *, struct attribute *, const char *, size_t); ++ ssize_t (* const show)(struct kobject *, struct attribute *, char *); ++ ssize_t (* const store)(struct kobject *, struct attribute *, const char *, size_t); + }; + + [ Subsystems should have already defined a struct kobj_type as a +diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt +index f4a04c0..a0fc4f4 100644 +--- a/Documentation/kernel-parameters.txt ++++ b/Documentation/kernel-parameters.txt +@@ -1853,6 +1853,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted. + the specified number of seconds. This is to be used if + your oopses keep scrolling off the screen. + ++ pax_nouderef [X86] 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 or the frequent ++ page table updates on X86-64. ++ ++ pax_softmode= 0/1 to disable/enable PaX softmode on boot already. ++ + pcbit= [HW,ISDN] + + pcd. [PARIDE] +diff --git a/Makefile b/Makefile +index 66b7e76..753c72d 100644 +--- a/Makefile ++++ b/Makefile +@@ -233,8 +233,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ + + HOSTCC = gcc + HOSTCXX = g++ +-HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer +-HOSTCXXFLAGS = -O2 ++HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-empty-body -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks ++HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks + + # Decide whether to build built-in, modular, or both. + # Normally, just do built-in. +@@ -352,6 +352,7 @@ LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \ + KBUILD_CPPFLAGS := -D__KERNEL__ + + KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ ++ -W -Wno-empty-body -Wno-unused-parameter -Wno-missing-field-initializers \ + -fno-strict-aliasing -fno-common \ + -Werror-implicit-function-declaration \ + -Wno-format-security \ +@@ -681,7 +682,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 --git a/arch/alpha/include/asm/dma-mapping.h b/arch/alpha/include/asm/dma-mapping.h +index 4567aca..1a7d7a9 100644 +--- a/arch/alpha/include/asm/dma-mapping.h ++++ b/arch/alpha/include/asm/dma-mapping.h @@ -3,9 +3,9 @@ #include <linux/dma-attrs.h> @@ -13,10 +222,11 @@ diff -urNp linux-2.6.38.7/arch/alpha/include/asm/dma-mapping.h linux-2.6.38.7/ar { return dma_ops; } -diff -urNp linux-2.6.38.7/arch/alpha/include/asm/elf.h linux-2.6.38.7/arch/alpha/include/asm/elf.h ---- linux-2.6.38.7/arch/alpha/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/alpha/include/asm/elf.h 2011-04-28 19:34:14.000000000 -0400 -@@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N +diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h +index 9baae8a..8d8bc6b 100644 +--- a/arch/alpha/include/asm/elf.h ++++ b/arch/alpha/include/asm/elf.h +@@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG]; #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) @@ -30,9 +240,10 @@ diff -urNp linux-2.6.38.7/arch/alpha/include/asm/elf.h linux-2.6.38.7/arch/alpha /* $0 is set by ld.so to a pointer to a function which might be registered using atexit. This provides a mean for the dynamic linker to call DT_FINI functions for shared libraries that have -diff -urNp linux-2.6.38.7/arch/alpha/include/asm/pgtable.h linux-2.6.38.7/arch/alpha/include/asm/pgtable.h ---- linux-2.6.38.7/arch/alpha/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/alpha/include/asm/pgtable.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h +index de98a73..bd4f1f8 100644 +--- a/arch/alpha/include/asm/pgtable.h ++++ b/arch/alpha/include/asm/pgtable.h @@ -101,6 +101,17 @@ struct vm_area_struct; #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS) #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW) @@ -51,10 +262,11 @@ diff -urNp linux-2.6.38.7/arch/alpha/include/asm/pgtable.h linux-2.6.38.7/arch/a #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE) #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) -diff -urNp linux-2.6.38.7/arch/alpha/kernel/module.c linux-2.6.38.7/arch/alpha/kernel/module.c ---- linux-2.6.38.7/arch/alpha/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/alpha/kernel/module.c 2011-04-28 19:34:14.000000000 -0400 -@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, +diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c +index ebc3c89..20cfa63 100644 +--- a/arch/alpha/kernel/module.c ++++ b/arch/alpha/kernel/module.c +@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab, /* The small sections were sorted to the end of the segment. The following should definitely cover them. */ @@ -63,10 +275,11 @@ diff -urNp linux-2.6.38.7/arch/alpha/kernel/module.c linux-2.6.38.7/arch/alpha/k got = sechdrs[me->arch.gotsecindex].sh_addr; for (i = 0; i < n; i++) { -diff -urNp linux-2.6.38.7/arch/alpha/kernel/osf_sys.c linux-2.6.38.7/arch/alpha/kernel/osf_sys.c ---- linux-2.6.38.7/arch/alpha/kernel/osf_sys.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/alpha/kernel/osf_sys.c 2011-04-28 19:34:14.000000000 -0400 -@@ -1162,7 +1162,7 @@ arch_get_unmapped_area_1(unsigned long a +diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c +index fe698b5..93b415a 100644 +--- a/arch/alpha/kernel/osf_sys.c ++++ b/arch/alpha/kernel/osf_sys.c +@@ -1162,7 +1162,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len, /* At this point: (!vma || addr < vma->vm_end). */ if (limit - len < addr) return -ENOMEM; @@ -75,7 +288,7 @@ diff -urNp linux-2.6.38.7/arch/alpha/kernel/osf_sys.c linux-2.6.38.7/arch/alpha/ return addr; addr = vma->vm_end; vma = vma->vm_next; -@@ -1198,6 +1198,10 @@ arch_get_unmapped_area(struct file *filp +@@ -1198,6 +1198,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, merely specific addresses, but regions of memory -- perhaps this feature should be incorporated into all ports? */ @@ -86,7 +299,7 @@ diff -urNp linux-2.6.38.7/arch/alpha/kernel/osf_sys.c linux-2.6.38.7/arch/alpha/ if (addr) { addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit); if (addr != (unsigned long) -ENOMEM) -@@ -1205,8 +1209,8 @@ arch_get_unmapped_area(struct file *filp +@@ -1205,8 +1209,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, } /* Next, try allocating at TASK_UNMAPPED_BASE. */ @@ -97,29 +310,11 @@ diff -urNp linux-2.6.38.7/arch/alpha/kernel/osf_sys.c linux-2.6.38.7/arch/alpha/ if (addr != (unsigned long) -ENOMEM) return addr; -diff -urNp linux-2.6.38.7/arch/alpha/kernel/pci_iommu.c linux-2.6.38.7/arch/alpha/kernel/pci_iommu.c ---- linux-2.6.38.7/arch/alpha/kernel/pci_iommu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/alpha/kernel/pci_iommu.c 2011-04-28 19:34:14.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.38.7/arch/alpha/kernel/pci-noop.c linux-2.6.38.7/arch/alpha/kernel/pci-noop.c ---- linux-2.6.38.7/arch/alpha/kernel/pci-noop.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/alpha/kernel/pci-noop.c 2011-04-28 19:34:14.000000000 -0400 -@@ -173,7 +173,7 @@ static int alpha_noop_set_mask(struct de +diff --git a/arch/alpha/kernel/pci-noop.c b/arch/alpha/kernel/pci-noop.c +index 246100e..f05bd14 100644 +--- a/arch/alpha/kernel/pci-noop.c ++++ b/arch/alpha/kernel/pci-noop.c +@@ -173,7 +173,7 @@ static int alpha_noop_set_mask(struct device *dev, u64 mask) return 0; } @@ -137,10 +332,31 @@ diff -urNp linux-2.6.38.7/arch/alpha/kernel/pci-noop.c linux-2.6.38.7/arch/alpha EXPORT_SYMBOL(dma_ops); void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen) -diff -urNp linux-2.6.38.7/arch/alpha/mm/fault.c linux-2.6.38.7/arch/alpha/mm/fault.c ---- linux-2.6.38.7/arch/alpha/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/alpha/mm/fault.c 2011-04-28 19:34:14.000000000 -0400 -@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * +diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c +index 022c2748..943735c 100644 +--- a/arch/alpha/kernel/pci_iommu.c ++++ b/arch/alpha/kernel/pci_iommu.c +@@ -950,7 +950,7 @@ static int alpha_pci_set_mask(struct device *dev, u64 mask) + 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 --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c +index fadd5f8..3168191 100644 +--- a/arch/alpha/mm/fault.c ++++ b/arch/alpha/mm/fault.c +@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *next_mm) __reload_thread(pcb); } @@ -265,7 +481,7 @@ diff -urNp linux-2.6.38.7/arch/alpha/mm/fault.c linux-2.6.38.7/arch/alpha/mm/fau /* * This routine handles page faults. It determines the address, -@@ -131,8 +249,29 @@ do_page_fault(unsigned long address, uns +@@ -131,8 +249,29 @@ do_page_fault(unsigned long address, unsigned long mmcsr, good_area: si_code = SEGV_ACCERR; if (cause < 0) { @@ -296,10 +512,11 @@ diff -urNp linux-2.6.38.7/arch/alpha/mm/fault.c linux-2.6.38.7/arch/alpha/mm/fau } else if (!cause) { /* Allow reads even for write-only mappings */ if (!(vma->vm_flags & (VM_READ | VM_WRITE))) -diff -urNp linux-2.6.38.7/arch/arm/include/asm/elf.h linux-2.6.38.7/arch/arm/include/asm/elf.h ---- linux-2.6.38.7/arch/arm/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/arm/include/asm/elf.h 2011-04-28 19:34:14.000000000 -0400 -@@ -115,7 +115,14 @@ int dump_task_regs(struct task_struct *t +diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h +index c3cd875..be2aa19 100644 +--- a/arch/arm/include/asm/elf.h ++++ b/arch/arm/include/asm/elf.h +@@ -115,7 +115,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs); 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. */ @@ -315,7 +532,7 @@ diff -urNp linux-2.6.38.7/arch/arm/include/asm/elf.h linux-2.6.38.7/arch/arm/inc /* 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 -@@ -125,10 +132,6 @@ int dump_task_regs(struct task_struct *t +@@ -125,10 +132,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs); extern void elf_set_personality(const struct elf32_hdr *); #define SET_PERSONALITY(ex) elf_set_personality(&(ex)) @@ -326,9 +543,10 @@ diff -urNp linux-2.6.38.7/arch/arm/include/asm/elf.h linux-2.6.38.7/arch/arm/inc extern int vectors_user_mapping(void); #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping() #define ARCH_HAS_SETUP_ADDITIONAL_PAGES -diff -urNp linux-2.6.38.7/arch/arm/include/asm/kmap_types.h linux-2.6.38.7/arch/arm/include/asm/kmap_types.h ---- linux-2.6.38.7/arch/arm/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/arm/include/asm/kmap_types.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h +index e51b1e8..32a3113 100644 +--- a/arch/arm/include/asm/kmap_types.h ++++ b/arch/arm/include/asm/kmap_types.h @@ -21,6 +21,7 @@ enum km_type { KM_L1_CACHE, KM_L2_CACHE, @@ -337,10 +555,11 @@ diff -urNp linux-2.6.38.7/arch/arm/include/asm/kmap_types.h linux-2.6.38.7/arch/ KM_TYPE_NR }; -diff -urNp linux-2.6.38.7/arch/arm/include/asm/uaccess.h linux-2.6.38.7/arch/arm/include/asm/uaccess.h ---- linux-2.6.38.7/arch/arm/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/arm/include/asm/uaccess.h 2011-04-28 19:34:14.000000000 -0400 -@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn +diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h +index b293616..5009ca1 100644 +--- a/arch/arm/include/asm/uaccess.h ++++ b/arch/arm/include/asm/uaccess.h +@@ -403,6 +403,9 @@ extern unsigned long __must_check __strnlen_user(const char __user *s, long n); static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) { @@ -350,7 +569,7 @@ diff -urNp linux-2.6.38.7/arch/arm/include/asm/uaccess.h linux-2.6.38.7/arch/arm if (access_ok(VERIFY_READ, from, n)) n = __copy_from_user(to, from, n); else /* security hole - plug it */ -@@ -412,6 +415,9 @@ static inline unsigned long __must_check +@@ -412,6 +415,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { @@ -360,9 +579,10 @@ diff -urNp linux-2.6.38.7/arch/arm/include/asm/uaccess.h linux-2.6.38.7/arch/arm if (access_ok(VERIFY_WRITE, to, n)) n = __copy_to_user(to, from, n); return n; -diff -urNp linux-2.6.38.7/arch/arm/kernel/kgdb.c linux-2.6.38.7/arch/arm/kernel/kgdb.c ---- linux-2.6.38.7/arch/arm/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/arm/kernel/kgdb.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/arm/kernel/kgdb.c b/arch/arm/kernel/kgdb.c +index 778c2f7..f0b9267 100644 +--- a/arch/arm/kernel/kgdb.c ++++ b/arch/arm/kernel/kgdb.c @@ -246,7 +246,7 @@ void kgdb_arch_exit(void) * and we handle the normal undef case within the do_undefinstr * handler. @@ -372,9 +592,10 @@ diff -urNp linux-2.6.38.7/arch/arm/kernel/kgdb.c linux-2.6.38.7/arch/arm/kernel/ #ifndef __ARMEB__ .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} #else /* ! __ARMEB__ */ -diff -urNp linux-2.6.38.7/arch/arm/kernel/process.c linux-2.6.38.7/arch/arm/kernel/process.c ---- linux-2.6.38.7/arch/arm/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/arm/kernel/process.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c +index 94bbedb..9c43843 100644 +--- a/arch/arm/kernel/process.c ++++ b/arch/arm/kernel/process.c @@ -28,7 +28,6 @@ #include <linux/tick.h> #include <linux/utsname.h> @@ -383,7 +604,7 @@ diff -urNp linux-2.6.38.7/arch/arm/kernel/process.c linux-2.6.38.7/arch/arm/kern #include <linux/hw_breakpoint.h> #include <asm/cacheflush.h> -@@ -477,12 +476,6 @@ unsigned long get_wchan(struct task_stru +@@ -477,12 +476,6 @@ unsigned long get_wchan(struct task_struct *p) return 0; } @@ -396,10 +617,11 @@ diff -urNp linux-2.6.38.7/arch/arm/kernel/process.c linux-2.6.38.7/arch/arm/kern #ifdef CONFIG_MMU /* * The vectors page is always readable from user space for the -diff -urNp linux-2.6.38.7/arch/arm/mach-msm/last_radio_log.c linux-2.6.38.7/arch/arm/mach-msm/last_radio_log.c ---- linux-2.6.38.7/arch/arm/mach-msm/last_radio_log.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/arm/mach-msm/last_radio_log.c 2011-04-28 19:34:14.000000000 -0400 -@@ -47,7 +47,7 @@ static ssize_t last_radio_log_read(struc +diff --git a/arch/arm/mach-msm/last_radio_log.c b/arch/arm/mach-msm/last_radio_log.c +index 1e243f4..07aba84 100644 +--- a/arch/arm/mach-msm/last_radio_log.c ++++ b/arch/arm/mach-msm/last_radio_log.c +@@ -47,7 +47,7 @@ static ssize_t last_radio_log_read(struct file *file, char __user *buf, return count; } @@ -408,10 +630,11 @@ diff -urNp linux-2.6.38.7/arch/arm/mach-msm/last_radio_log.c linux-2.6.38.7/arch .read = last_radio_log_read, .llseek = default_llseek, }; -diff -urNp linux-2.6.38.7/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.38.7/arch/arm/mach-ux500/mbox-db5500.c ---- linux-2.6.38.7/arch/arm/mach-ux500/mbox-db5500.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/arm/mach-ux500/mbox-db5500.c 2011-04-28 19:34:14.000000000 -0400 -@@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev +diff --git a/arch/arm/mach-ux500/mbox-db5500.c b/arch/arm/mach-ux500/mbox-db5500.c +index cbf1571..402c00d 100644 +--- a/arch/arm/mach-ux500/mbox-db5500.c ++++ b/arch/arm/mach-ux500/mbox-db5500.c +@@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct device *dev, return sprintf(buf, "0x%X\n", mbox_value); } @@ -420,10 +643,11 @@ diff -urNp linux-2.6.38.7/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.38.7/arch/ static int mbox_show(struct seq_file *s, void *data) { -diff -urNp linux-2.6.38.7/arch/arm/mm/fault.c linux-2.6.38.7/arch/arm/mm/fault.c ---- linux-2.6.38.7/arch/arm/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/arm/mm/fault.c 2011-04-28 19:34:14.000000000 -0400 -@@ -167,6 +167,13 @@ __do_user_fault(struct task_struct *tsk, +diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c +index f10f9ba..1ab528f 100644 +--- a/arch/arm/mm/fault.c ++++ b/arch/arm/mm/fault.c +@@ -167,6 +167,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr, } #endif @@ -437,7 +661,7 @@ diff -urNp linux-2.6.38.7/arch/arm/mm/fault.c linux-2.6.38.7/arch/arm/mm/fault.c tsk->thread.address = addr; tsk->thread.error_code = fsr; tsk->thread.trap_no = 14; -@@ -364,6 +371,33 @@ do_page_fault(unsigned long addr, unsign +@@ -364,6 +371,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) } #endif /* CONFIG_MMU */ @@ -471,10 +695,11 @@ diff -urNp linux-2.6.38.7/arch/arm/mm/fault.c linux-2.6.38.7/arch/arm/mm/fault.c /* * First Level Translation Fault Handler * -diff -urNp linux-2.6.38.7/arch/arm/mm/mmap.c linux-2.6.38.7/arch/arm/mm/mmap.c ---- linux-2.6.38.7/arch/arm/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/arm/mm/mmap.c 2011-04-28 19:34:14.000000000 -0400 -@@ -64,6 +64,10 @@ arch_get_unmapped_area(struct file *filp +diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c +index b0a9830..9ce80c6 100644 +--- a/arch/arm/mm/mmap.c ++++ b/arch/arm/mm/mmap.c +@@ -64,6 +64,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, if (len > TASK_SIZE) return -ENOMEM; @@ -485,7 +710,7 @@ diff -urNp linux-2.6.38.7/arch/arm/mm/mmap.c linux-2.6.38.7/arch/arm/mm/mmap.c if (addr) { if (do_align) addr = COLOUR_ALIGN(addr, pgoff); -@@ -71,15 +75,14 @@ arch_get_unmapped_area(struct file *filp +@@ -71,15 +75,14 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, addr = PAGE_ALIGN(addr); vma = find_vma(mm, addr); @@ -523,10 +748,11 @@ diff -urNp linux-2.6.38.7/arch/arm/mm/mmap.c linux-2.6.38.7/arch/arm/mm/mmap.c /* * Remember the place where we stopped the search: */ -diff -urNp linux-2.6.38.7/arch/avr32/include/asm/elf.h linux-2.6.38.7/arch/avr32/include/asm/elf.h ---- linux-2.6.38.7/arch/avr32/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/avr32/include/asm/elf.h 2011-04-28 19:34:14.000000000 -0400 -@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpreg +diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h +index 3b3159b..425ea94 100644 +--- a/arch/avr32/include/asm/elf.h ++++ b/arch/avr32/include/asm/elf.h +@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_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. */ @@ -542,9 +768,10 @@ diff -urNp linux-2.6.38.7/arch/avr32/include/asm/elf.h linux-2.6.38.7/arch/avr32 /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, -diff -urNp linux-2.6.38.7/arch/avr32/include/asm/kmap_types.h linux-2.6.38.7/arch/avr32/include/asm/kmap_types.h ---- linux-2.6.38.7/arch/avr32/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/avr32/include/asm/kmap_types.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h +index b7f5c68..556135c 100644 +--- a/arch/avr32/include/asm/kmap_types.h ++++ b/arch/avr32/include/asm/kmap_types.h @@ -22,7 +22,8 @@ D(10) KM_IRQ0, D(11) KM_IRQ1, D(12) KM_SOFTIRQ0, @@ -555,10 +782,11 @@ diff -urNp linux-2.6.38.7/arch/avr32/include/asm/kmap_types.h linux-2.6.38.7/arc }; #undef D -diff -urNp linux-2.6.38.7/arch/avr32/mm/fault.c linux-2.6.38.7/arch/avr32/mm/fault.c ---- linux-2.6.38.7/arch/avr32/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/avr32/mm/fault.c 2011-04-28 19:34:14.000000000 -0400 -@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru +diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c +index f7040a1..16169bf 100644 +--- a/arch/avr32/mm/fault.c ++++ b/arch/avr32/mm/fault.c +@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap) int exception_trace = 1; @@ -599,10 +827,11 @@ diff -urNp linux-2.6.38.7/arch/avr32/mm/fault.c linux-2.6.38.7/arch/avr32/mm/fau if (exception_trace && printk_ratelimit()) printk("%s%s[%d]: segfault at %08lx pc %08lx " "sp %08lx ecr %lu\n", -diff -urNp linux-2.6.38.7/arch/blackfin/kernel/kgdb.c linux-2.6.38.7/arch/blackfin/kernel/kgdb.c ---- linux-2.6.38.7/arch/blackfin/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/blackfin/kernel/kgdb.c 2011-04-28 19:34:14.000000000 -0400 -@@ -420,7 +420,7 @@ int kgdb_arch_handle_exception(int vecto +diff --git a/arch/blackfin/kernel/kgdb.c b/arch/blackfin/kernel/kgdb.c +index eb92592..7cdfa12 100644 +--- a/arch/blackfin/kernel/kgdb.c ++++ b/arch/blackfin/kernel/kgdb.c +@@ -420,7 +420,7 @@ int kgdb_arch_handle_exception(int vector, int signo, return -1; /* this means that we do not want to exit from the handler */ } @@ -611,10 +840,11 @@ diff -urNp linux-2.6.38.7/arch/blackfin/kernel/kgdb.c linux-2.6.38.7/arch/blackf .gdb_bpt_instr = {0xa1}, #ifdef CONFIG_SMP .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, -diff -urNp linux-2.6.38.7/arch/blackfin/mm/maccess.c linux-2.6.38.7/arch/blackfin/mm/maccess.c ---- linux-2.6.38.7/arch/blackfin/mm/maccess.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/blackfin/mm/maccess.c 2011-04-28 19:34:14.000000000 -0400 -@@ -16,7 +16,7 @@ static int validate_memory_access_addres +diff --git a/arch/blackfin/mm/maccess.c b/arch/blackfin/mm/maccess.c +index b71cebc..e253211 100644 +--- a/arch/blackfin/mm/maccess.c ++++ b/arch/blackfin/mm/maccess.c +@@ -16,7 +16,7 @@ static int validate_memory_access_address(unsigned long addr, int size) return bfin_mem_access_type(addr, size); } @@ -623,7 +853,7 @@ diff -urNp linux-2.6.38.7/arch/blackfin/mm/maccess.c linux-2.6.38.7/arch/blackfi { unsigned long lsrc = (unsigned long)src; int mem_type; -@@ -55,7 +55,7 @@ long probe_kernel_read(void *dst, void * +@@ -55,7 +55,7 @@ long probe_kernel_read(void *dst, void *src, size_t size) return -EFAULT; } @@ -632,9 +862,10 @@ diff -urNp linux-2.6.38.7/arch/blackfin/mm/maccess.c linux-2.6.38.7/arch/blackfi { unsigned long ldst = (unsigned long)dst; int mem_type; -diff -urNp linux-2.6.38.7/arch/frv/include/asm/kmap_types.h linux-2.6.38.7/arch/frv/include/asm/kmap_types.h ---- linux-2.6.38.7/arch/frv/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/frv/include/asm/kmap_types.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h +index f8e16b2..c73ff79 100644 +--- a/arch/frv/include/asm/kmap_types.h ++++ b/arch/frv/include/asm/kmap_types.h @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -643,10 +874,11 @@ diff -urNp linux-2.6.38.7/arch/frv/include/asm/kmap_types.h linux-2.6.38.7/arch/ KM_TYPE_NR }; -diff -urNp linux-2.6.38.7/arch/frv/mm/elf-fdpic.c linux-2.6.38.7/arch/frv/mm/elf-fdpic.c ---- linux-2.6.38.7/arch/frv/mm/elf-fdpic.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/frv/mm/elf-fdpic.c 2011-04-28 19:34:14.000000000 -0400 -@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str +diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c +index 385fd30..6c3d97e 100644 +--- a/arch/frv/mm/elf-fdpic.c ++++ b/arch/frv/mm/elf-fdpic.c +@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi if (addr) { addr = PAGE_ALIGN(addr); vma = find_vma(current->mm, addr); @@ -656,7 +888,7 @@ diff -urNp linux-2.6.38.7/arch/frv/mm/elf-fdpic.c linux-2.6.38.7/arch/frv/mm/elf goto success; } -@@ -89,7 +88,7 @@ unsigned long arch_get_unmapped_area(str +@@ -89,7 +88,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi for (; vma; vma = vma->vm_next) { if (addr > limit) break; @@ -665,7 +897,7 @@ diff -urNp linux-2.6.38.7/arch/frv/mm/elf-fdpic.c linux-2.6.38.7/arch/frv/mm/elf goto success; addr = vma->vm_end; } -@@ -104,7 +103,7 @@ unsigned long arch_get_unmapped_area(str +@@ -104,7 +103,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi for (; vma; vma = vma->vm_next) { if (addr > limit) break; @@ -674,9 +906,10 @@ diff -urNp linux-2.6.38.7/arch/frv/mm/elf-fdpic.c linux-2.6.38.7/arch/frv/mm/elf goto success; addr = vma->vm_end; } -diff -urNp linux-2.6.38.7/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.38.7/arch/ia64/hp/common/hwsw_iommu.c ---- linux-2.6.38.7/arch/ia64/hp/common/hwsw_iommu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/ia64/hp/common/hwsw_iommu.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/ia64/hp/common/hwsw_iommu.c b/arch/ia64/hp/common/hwsw_iommu.c +index e4a80d8..11a7ea1 100644 +--- a/arch/ia64/hp/common/hwsw_iommu.c ++++ b/arch/ia64/hp/common/hwsw_iommu.c @@ -17,7 +17,7 @@ #include <linux/swiotlb.h> #include <asm/machvec.h> @@ -686,7 +919,7 @@ diff -urNp linux-2.6.38.7/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.38.7/arch/i /* swiotlb declarations & definitions: */ extern int swiotlb_late_init_with_default_size (size_t size); -@@ -33,7 +33,7 @@ static inline int use_swiotlb(struct dev +@@ -33,7 +33,7 @@ static inline int use_swiotlb(struct device *dev) !sba_dma_ops.dma_supported(dev, *dev->dma_mask); } @@ -695,10 +928,11 @@ diff -urNp linux-2.6.38.7/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.38.7/arch/i { if (use_swiotlb(dev)) return &swiotlb_dma_ops; -diff -urNp linux-2.6.38.7/arch/ia64/hp/common/sba_iommu.c linux-2.6.38.7/arch/ia64/hp/common/sba_iommu.c ---- linux-2.6.38.7/arch/ia64/hp/common/sba_iommu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/ia64/hp/common/sba_iommu.c 2011-04-28 19:34:14.000000000 -0400 -@@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d +diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c +index 4ce8d13..62d8118 100644 +--- a/arch/ia64/hp/common/sba_iommu.c ++++ b/arch/ia64/hp/common/sba_iommu.c +@@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_driver = { }, }; @@ -716,9 +950,10 @@ diff -urNp linux-2.6.38.7/arch/ia64/hp/common/sba_iommu.c linux-2.6.38.7/arch/ia .alloc_coherent = sba_alloc_coherent, .free_coherent = sba_free_coherent, .map_page = sba_map_page, -diff -urNp linux-2.6.38.7/arch/ia64/include/asm/dma-mapping.h linux-2.6.38.7/arch/ia64/include/asm/dma-mapping.h ---- linux-2.6.38.7/arch/ia64/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/ia64/include/asm/dma-mapping.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/ia64/include/asm/dma-mapping.h b/arch/ia64/include/asm/dma-mapping.h +index a2e7368..f1cbb57 100644 +--- a/arch/ia64/include/asm/dma-mapping.h ++++ b/arch/ia64/include/asm/dma-mapping.h @@ -12,7 +12,7 @@ #define ARCH_HAS_DMA_GET_REQUIRED_MASK @@ -728,7 +963,7 @@ diff -urNp linux-2.6.38.7/arch/ia64/include/asm/dma-mapping.h linux-2.6.38.7/arc extern struct ia64_machine_vector ia64_mv; extern void set_iommu_machvec(void); -@@ -24,7 +24,7 @@ extern void machvec_dma_sync_sg(struct d +@@ -24,7 +24,7 @@ extern void machvec_dma_sync_sg(struct device *, struct scatterlist *, int, static inline void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *daddr, gfp_t gfp) { @@ -737,7 +972,7 @@ diff -urNp linux-2.6.38.7/arch/ia64/include/asm/dma-mapping.h linux-2.6.38.7/arc void *caddr; caddr = ops->alloc_coherent(dev, size, daddr, gfp); -@@ -35,7 +35,7 @@ static inline void *dma_alloc_coherent(s +@@ -35,7 +35,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size, static inline void dma_free_coherent(struct device *dev, size_t size, void *caddr, dma_addr_t daddr) { @@ -746,7 +981,7 @@ diff -urNp linux-2.6.38.7/arch/ia64/include/asm/dma-mapping.h linux-2.6.38.7/arc debug_dma_free_coherent(dev, size, caddr, daddr); ops->free_coherent(dev, size, caddr, daddr); } -@@ -49,13 +49,13 @@ static inline void dma_free_coherent(str +@@ -49,13 +49,13 @@ static inline void dma_free_coherent(struct device *dev, size_t size, static inline int dma_mapping_error(struct device *dev, dma_addr_t daddr) { @@ -762,9 +997,10 @@ diff -urNp linux-2.6.38.7/arch/ia64/include/asm/dma-mapping.h linux-2.6.38.7/arc return ops->dma_supported(dev, mask); } -diff -urNp linux-2.6.38.7/arch/ia64/include/asm/elf.h linux-2.6.38.7/arch/ia64/include/asm/elf.h ---- linux-2.6.38.7/arch/ia64/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/ia64/include/asm/elf.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h +index b5298eb..67c6e62 100644 +--- a/arch/ia64/include/asm/elf.h ++++ b/arch/ia64/include/asm/elf.h @@ -42,6 +42,13 @@ */ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) @@ -779,10 +1015,11 @@ diff -urNp linux-2.6.38.7/arch/ia64/include/asm/elf.h linux-2.6.38.7/arch/ia64/i #define PT_IA_64_UNWIND 0x70000001 /* IA-64 relocations: */ -diff -urNp linux-2.6.38.7/arch/ia64/include/asm/machvec.h linux-2.6.38.7/arch/ia64/include/asm/machvec.h ---- linux-2.6.38.7/arch/ia64/include/asm/machvec.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/ia64/include/asm/machvec.h 2011-04-28 19:34:14.000000000 -0400 -@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event +diff --git a/arch/ia64/include/asm/machvec.h b/arch/ia64/include/asm/machvec.h +index 367d299..9ad4279 100644 +--- a/arch/ia64/include/asm/machvec.h ++++ b/arch/ia64/include/asm/machvec.h +@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event_t(void); /* DMA-mapping interface: */ typedef void ia64_mv_dma_init (void); typedef u64 ia64_mv_dma_get_required_mask (struct device *); @@ -791,7 +1028,7 @@ diff -urNp linux-2.6.38.7/arch/ia64/include/asm/machvec.h linux-2.6.38.7/arch/ia /* * WARNING: The legacy I/O space is _architected_. Platforms are -@@ -251,7 +251,7 @@ extern void machvec_init_from_cmdline(co +@@ -251,7 +251,7 @@ extern void machvec_init_from_cmdline(const char *cmdline); # endif /* CONFIG_IA64_GENERIC */ extern void swiotlb_dma_init(void); @@ -800,9 +1037,10 @@ diff -urNp linux-2.6.38.7/arch/ia64/include/asm/machvec.h linux-2.6.38.7/arch/ia /* * Define default versions so we can extend machvec for new platforms without having -diff -urNp linux-2.6.38.7/arch/ia64/include/asm/pgtable.h linux-2.6.38.7/arch/ia64/include/asm/pgtable.h ---- linux-2.6.38.7/arch/ia64/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/ia64/include/asm/pgtable.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h +index 1a97af3..7529d31 100644 +--- a/arch/ia64/include/asm/pgtable.h ++++ b/arch/ia64/include/asm/pgtable.h @@ -12,7 +12,7 @@ * David Mosberger-Tang <davidm@hpl.hp.com> */ @@ -830,10 +1068,11 @@ diff -urNp linux-2.6.38.7/arch/ia64/include/asm/pgtable.h linux-2.6.38.7/arch/ia #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX) -diff -urNp linux-2.6.38.7/arch/ia64/include/asm/spinlock.h linux-2.6.38.7/arch/ia64/include/asm/spinlock.h ---- linux-2.6.38.7/arch/ia64/include/asm/spinlock.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/ia64/include/asm/spinlock.h 2011-04-28 19:34:14.000000000 -0400 -@@ -72,7 +72,7 @@ static __always_inline void __ticket_spi +diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h +index 1a91c91..120e693 100644 +--- a/arch/ia64/include/asm/spinlock.h ++++ b/arch/ia64/include/asm/spinlock.h +@@ -72,7 +72,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock) unsigned short *p = (unsigned short *)&lock->lock + 1, tmp; asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p)); @@ -842,10 +1081,11 @@ diff -urNp linux-2.6.38.7/arch/ia64/include/asm/spinlock.h linux-2.6.38.7/arch/i } static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock) -diff -urNp linux-2.6.38.7/arch/ia64/include/asm/uaccess.h linux-2.6.38.7/arch/ia64/include/asm/uaccess.h ---- linux-2.6.38.7/arch/ia64/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/ia64/include/asm/uaccess.h 2011-04-28 19:34:14.000000000 -0400 -@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ +diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h +index 449c8c0..432a3d2 100644 +--- a/arch/ia64/include/asm/uaccess.h ++++ b/arch/ia64/include/asm/uaccess.h +@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count) const void *__cu_from = (from); \ long __cu_len = (n); \ \ @@ -854,7 +1094,7 @@ diff -urNp linux-2.6.38.7/arch/ia64/include/asm/uaccess.h linux-2.6.38.7/arch/ia __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \ __cu_len; \ }) -@@ -269,7 +269,7 @@ __copy_from_user (void *to, const void _ +@@ -269,7 +269,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count) long __cu_len = (n); \ \ __chk_user_ptr(__cu_from); \ @@ -863,9 +1103,10 @@ diff -urNp linux-2.6.38.7/arch/ia64/include/asm/uaccess.h linux-2.6.38.7/arch/ia __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ __cu_len; \ }) -diff -urNp linux-2.6.38.7/arch/ia64/kernel/dma-mapping.c linux-2.6.38.7/arch/ia64/kernel/dma-mapping.c ---- linux-2.6.38.7/arch/ia64/kernel/dma-mapping.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/ia64/kernel/dma-mapping.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/ia64/kernel/dma-mapping.c b/arch/ia64/kernel/dma-mapping.c +index f2c1600..969398a 100644 +--- a/arch/ia64/kernel/dma-mapping.c ++++ b/arch/ia64/kernel/dma-mapping.c @@ -3,7 +3,7 @@ /* Set this to 1 if there is a HW IOMMU in the system */ int iommu_detected __read_mostly; @@ -884,9 +1125,10 @@ diff -urNp linux-2.6.38.7/arch/ia64/kernel/dma-mapping.c linux-2.6.38.7/arch/ia6 { return dma_ops; } -diff -urNp linux-2.6.38.7/arch/ia64/kernel/module.c linux-2.6.38.7/arch/ia64/kernel/module.c ---- linux-2.6.38.7/arch/ia64/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/ia64/kernel/module.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c +index 1481b0a..e7d38ff 100644 +--- a/arch/ia64/kernel/module.c ++++ b/arch/ia64/kernel/module.c @@ -315,8 +315,7 @@ module_alloc (unsigned long size) void module_free (struct module *mod, void *module_region) @@ -897,7 +1139,7 @@ diff -urNp linux-2.6.38.7/arch/ia64/kernel/module.c linux-2.6.38.7/arch/ia64/ker unw_remove_unwind_table(mod->arch.init_unw_table); mod->arch.init_unw_table = NULL; } -@@ -502,15 +501,39 @@ module_frob_arch_sections (Elf_Ehdr *ehd +@@ -502,15 +501,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings, } static inline int @@ -939,7 +1181,7 @@ diff -urNp linux-2.6.38.7/arch/ia64/kernel/module.c linux-2.6.38.7/arch/ia64/ker } static inline int -@@ -693,7 +716,14 @@ do_reloc (struct module *mod, uint8_t r_ +@@ -693,7 +716,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend, break; case RV_BDREL: @@ -955,7 +1197,7 @@ diff -urNp linux-2.6.38.7/arch/ia64/kernel/module.c linux-2.6.38.7/arch/ia64/ker break; case RV_LTV: -@@ -828,15 +858,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, +@@ -828,15 +858,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind * addresses have been selected... */ uint64_t gp; @@ -975,9 +1217,10 @@ diff -urNp linux-2.6.38.7/arch/ia64/kernel/module.c linux-2.6.38.7/arch/ia64/ker mod->arch.gp = gp; DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); } -diff -urNp linux-2.6.38.7/arch/ia64/kernel/pci-dma.c linux-2.6.38.7/arch/ia64/kernel/pci-dma.c ---- linux-2.6.38.7/arch/ia64/kernel/pci-dma.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/ia64/kernel/pci-dma.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c +index f6b1ff0..ccacc2f 100644 +--- a/arch/ia64/kernel/pci-dma.c ++++ b/arch/ia64/kernel/pci-dma.c @@ -43,7 +43,7 @@ struct device fallback_dev = { .dma_mask = &fallback_dev.coherent_dma_mask, }; @@ -987,10 +1230,11 @@ diff -urNp linux-2.6.38.7/arch/ia64/kernel/pci-dma.c linux-2.6.38.7/arch/ia64/ke static int __init pci_iommu_init(void) { -diff -urNp linux-2.6.38.7/arch/ia64/kernel/pci-swiotlb.c linux-2.6.38.7/arch/ia64/kernel/pci-swiotlb.c ---- linux-2.6.38.7/arch/ia64/kernel/pci-swiotlb.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/ia64/kernel/pci-swiotlb.c 2011-04-28 19:34:14.000000000 -0400 -@@ -22,7 +22,7 @@ static void *ia64_swiotlb_alloc_coherent +diff --git a/arch/ia64/kernel/pci-swiotlb.c b/arch/ia64/kernel/pci-swiotlb.c +index d9485d9..e3deb12 100644 +--- a/arch/ia64/kernel/pci-swiotlb.c ++++ b/arch/ia64/kernel/pci-swiotlb.c +@@ -22,7 +22,7 @@ static void *ia64_swiotlb_alloc_coherent(struct device *dev, size_t size, return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); } @@ -999,10 +1243,11 @@ diff -urNp linux-2.6.38.7/arch/ia64/kernel/pci-swiotlb.c linux-2.6.38.7/arch/ia6 .alloc_coherent = ia64_swiotlb_alloc_coherent, .free_coherent = swiotlb_free_coherent, .map_page = swiotlb_map_page, -diff -urNp linux-2.6.38.7/arch/ia64/kernel/sys_ia64.c linux-2.6.38.7/arch/ia64/kernel/sys_ia64.c ---- linux-2.6.38.7/arch/ia64/kernel/sys_ia64.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/ia64/kernel/sys_ia64.c 2011-04-28 19:34:14.000000000 -0400 -@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil +diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c +index 609d500..7dde2a8 100644 +--- a/arch/ia64/kernel/sys_ia64.c ++++ b/arch/ia64/kernel/sys_ia64.c +@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len if (REGION_NUMBER(addr) == RGN_HPAGE) addr = 0; #endif @@ -1016,7 +1261,7 @@ diff -urNp linux-2.6.38.7/arch/ia64/kernel/sys_ia64.c linux-2.6.38.7/arch/ia64/k if (!addr) addr = mm->free_area_cache; -@@ -61,14 +68,14 @@ arch_get_unmapped_area (struct file *fil +@@ -61,14 +68,14 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len for (vma = find_vma(mm, addr); ; vma = vma->vm_next) { /* At this point: (!vma || addr < vma->vm_end). */ if (TASK_SIZE - len < addr || RGN_MAP_LIMIT - len < REGION_OFFSET(addr)) { @@ -1034,9 +1279,10 @@ diff -urNp linux-2.6.38.7/arch/ia64/kernel/sys_ia64.c linux-2.6.38.7/arch/ia64/k /* Remember the address where we stopped this search: */ mm->free_area_cache = addr + len; return addr; -diff -urNp linux-2.6.38.7/arch/ia64/kernel/vmlinux.lds.S linux-2.6.38.7/arch/ia64/kernel/vmlinux.lds.S ---- linux-2.6.38.7/arch/ia64/kernel/vmlinux.lds.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/ia64/kernel/vmlinux.lds.S 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S +index 5a4d044..19c2e6d 100644 +--- a/arch/ia64/kernel/vmlinux.lds.S ++++ b/arch/ia64/kernel/vmlinux.lds.S @@ -199,7 +199,7 @@ SECTIONS { /* Per-cpu data: */ . = ALIGN(PERCPU_PAGE_SIZE); @@ -1046,10 +1292,11 @@ diff -urNp linux-2.6.38.7/arch/ia64/kernel/vmlinux.lds.S linux-2.6.38.7/arch/ia6 /* * ensure percpu data fits * into percpu page size -diff -urNp linux-2.6.38.7/arch/ia64/mm/fault.c linux-2.6.38.7/arch/ia64/mm/fault.c ---- linux-2.6.38.7/arch/ia64/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/ia64/mm/fault.c 2011-04-28 19:34:14.000000000 -0400 -@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned +diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c +index 0799fea..4879544 100644 +--- a/arch/ia64/mm/fault.c ++++ b/arch/ia64/mm/fault.c +@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address) return pte_present(pte); } @@ -1073,7 +1320,7 @@ diff -urNp linux-2.6.38.7/arch/ia64/mm/fault.c linux-2.6.38.7/arch/ia64/mm/fault void __kprobes ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *regs) { -@@ -145,9 +162,23 @@ ia64_do_page_fault (unsigned long addres +@@ -145,9 +162,23 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re mask = ( (((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT) | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT)); @@ -1098,10 +1345,11 @@ diff -urNp linux-2.6.38.7/arch/ia64/mm/fault.c linux-2.6.38.7/arch/ia64/mm/fault /* * If for any reason at all we couldn't handle the fault, make * sure we exit gracefully rather than endlessly redo the -diff -urNp linux-2.6.38.7/arch/ia64/mm/hugetlbpage.c linux-2.6.38.7/arch/ia64/mm/hugetlbpage.c ---- linux-2.6.38.7/arch/ia64/mm/hugetlbpage.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/ia64/mm/hugetlbpage.c 2011-04-28 19:34:14.000000000 -0400 -@@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area( +diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c +index 5ca674b..e0e1b70 100644 +--- a/arch/ia64/mm/hugetlbpage.c ++++ b/arch/ia64/mm/hugetlbpage.c +@@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u /* At this point: (!vmm || addr < vmm->vm_end). */ if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT) return -ENOMEM; @@ -1110,9 +1358,10 @@ diff -urNp linux-2.6.38.7/arch/ia64/mm/hugetlbpage.c linux-2.6.38.7/arch/ia64/mm return addr; addr = ALIGN(vmm->vm_end, HPAGE_SIZE); } -diff -urNp linux-2.6.38.7/arch/ia64/mm/init.c linux-2.6.38.7/arch/ia64/mm/init.c ---- linux-2.6.38.7/arch/ia64/mm/init.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/ia64/mm/init.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c +index ed41759..fcaf88a 100644 +--- a/arch/ia64/mm/init.c ++++ b/arch/ia64/mm/init.c @@ -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; @@ -1133,10 +1382,11 @@ diff -urNp linux-2.6.38.7/arch/ia64/mm/init.c linux-2.6.38.7/arch/ia64/mm/init.c vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); down_write(¤t->mm->mmap_sem); if (insert_vm_struct(current->mm, vma)) { -diff -urNp linux-2.6.38.7/arch/ia64/sn/pci/pci_dma.c linux-2.6.38.7/arch/ia64/sn/pci/pci_dma.c ---- linux-2.6.38.7/arch/ia64/sn/pci/pci_dma.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/ia64/sn/pci/pci_dma.c 2011-04-28 19:34:14.000000000 -0400 -@@ -465,7 +465,7 @@ int sn_pci_legacy_write(struct pci_bus * +diff --git a/arch/ia64/sn/pci/pci_dma.c b/arch/ia64/sn/pci/pci_dma.c +index a9d310d..447c7cc 100644 +--- a/arch/ia64/sn/pci/pci_dma.c ++++ b/arch/ia64/sn/pci/pci_dma.c +@@ -465,7 +465,7 @@ int sn_pci_legacy_write(struct pci_bus *bus, u16 port, u32 val, u8 size) return ret; } @@ -1145,9 +1395,10 @@ diff -urNp linux-2.6.38.7/arch/ia64/sn/pci/pci_dma.c linux-2.6.38.7/arch/ia64/sn .alloc_coherent = sn_dma_alloc_coherent, .free_coherent = sn_dma_free_coherent, .map_page = sn_dma_map_page, -diff -urNp linux-2.6.38.7/arch/m32r/lib/usercopy.c linux-2.6.38.7/arch/m32r/lib/usercopy.c ---- linux-2.6.38.7/arch/m32r/lib/usercopy.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/m32r/lib/usercopy.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c +index 82abd15..d95ae5d 100644 +--- a/arch/m32r/lib/usercopy.c ++++ b/arch/m32r/lib/usercopy.c @@ -14,6 +14,9 @@ unsigned long __generic_copy_to_user(void __user *to, const void *from, unsigned long n) @@ -1158,7 +1409,7 @@ diff -urNp linux-2.6.38.7/arch/m32r/lib/usercopy.c linux-2.6.38.7/arch/m32r/lib/ prefetch(from); if (access_ok(VERIFY_WRITE, to, n)) __copy_user(to,from,n); -@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, +@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n) unsigned long __generic_copy_from_user(void *to, const void __user *from, unsigned long n) { @@ -1168,9 +1419,10 @@ diff -urNp linux-2.6.38.7/arch/m32r/lib/usercopy.c linux-2.6.38.7/arch/m32r/lib/ prefetchw(to); if (access_ok(VERIFY_READ, from, n)) __copy_user_zeroing(to,from,n); -diff -urNp linux-2.6.38.7/arch/microblaze/include/asm/device.h linux-2.6.38.7/arch/microblaze/include/asm/device.h ---- linux-2.6.38.7/arch/microblaze/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/microblaze/include/asm/device.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/microblaze/include/asm/device.h b/arch/microblaze/include/asm/device.h +index 123b2fe..f8926eb 100644 +--- a/arch/microblaze/include/asm/device.h ++++ b/arch/microblaze/include/asm/device.h @@ -13,7 +13,7 @@ struct device_node; struct dev_archdata { @@ -1180,10 +1432,11 @@ diff -urNp linux-2.6.38.7/arch/microblaze/include/asm/device.h linux-2.6.38.7/ar void *dma_data; }; -diff -urNp linux-2.6.38.7/arch/microblaze/include/asm/dma-mapping.h linux-2.6.38.7/arch/microblaze/include/asm/dma-mapping.h ---- linux-2.6.38.7/arch/microblaze/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/microblaze/include/asm/dma-mapping.h 2011-04-28 19:34:14.000000000 -0400 -@@ -43,14 +43,14 @@ static inline unsigned long device_to_ma +diff --git a/arch/microblaze/include/asm/dma-mapping.h b/arch/microblaze/include/asm/dma-mapping.h +index 8fbb0ec..c727dc4 100644 +--- a/arch/microblaze/include/asm/dma-mapping.h ++++ b/arch/microblaze/include/asm/dma-mapping.h +@@ -43,14 +43,14 @@ static inline unsigned long device_to_mask(struct device *dev) return 0xfffffffful; } @@ -1201,7 +1454,7 @@ diff -urNp linux-2.6.38.7/arch/microblaze/include/asm/dma-mapping.h linux-2.6.38 { /* We don't handle the NULL dev case for ISA for now. We could * do it via an out of line call but it is not needed for now. The -@@ -63,14 +63,14 @@ static inline struct dma_map_ops *get_dm +@@ -63,14 +63,14 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) return dev->archdata.dma_ops; } @@ -1218,7 +1471,7 @@ diff -urNp linux-2.6.38.7/arch/microblaze/include/asm/dma-mapping.h linux-2.6.38 if (unlikely(!ops)) return 0; -@@ -81,7 +81,7 @@ static inline int dma_supported(struct d +@@ -81,7 +81,7 @@ static inline int dma_supported(struct device *dev, u64 mask) static inline int dma_set_mask(struct device *dev, u64 dma_mask) { @@ -1227,7 +1480,7 @@ diff -urNp linux-2.6.38.7/arch/microblaze/include/asm/dma-mapping.h linux-2.6.38 if (unlikely(ops == NULL)) return -EIO; -@@ -97,7 +97,7 @@ static inline int dma_set_mask(struct de +@@ -97,7 +97,7 @@ static inline int dma_set_mask(struct device *dev, u64 dma_mask) static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { @@ -1236,7 +1489,7 @@ diff -urNp linux-2.6.38.7/arch/microblaze/include/asm/dma-mapping.h linux-2.6.38 if (ops->mapping_error) return ops->mapping_error(dev, dma_addr); -@@ -110,7 +110,7 @@ static inline int dma_mapping_error(stru +@@ -110,7 +110,7 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) static inline void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag) { @@ -1245,7 +1498,7 @@ diff -urNp linux-2.6.38.7/arch/microblaze/include/asm/dma-mapping.h linux-2.6.38 void *memory; BUG_ON(!ops); -@@ -124,7 +124,7 @@ static inline void *dma_alloc_coherent(s +@@ -124,7 +124,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size, static inline void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr_t dma_handle) { @@ -1254,10 +1507,11 @@ diff -urNp linux-2.6.38.7/arch/microblaze/include/asm/dma-mapping.h linux-2.6.38 BUG_ON(!ops); debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); -diff -urNp linux-2.6.38.7/arch/microblaze/include/asm/pci.h linux-2.6.38.7/arch/microblaze/include/asm/pci.h ---- linux-2.6.38.7/arch/microblaze/include/asm/pci.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/microblaze/include/asm/pci.h 2011-04-28 19:34:14.000000000 -0400 -@@ -54,8 +54,8 @@ static inline void pcibios_penalize_isa_ +diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h +index 2232ff94..733e788 100644 +--- a/arch/microblaze/include/asm/pci.h ++++ b/arch/microblaze/include/asm/pci.h +@@ -54,8 +54,8 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) } #ifdef CONFIG_PCI @@ -1268,10 +1522,11 @@ diff -urNp linux-2.6.38.7/arch/microblaze/include/asm/pci.h linux-2.6.38.7/arch/ #else /* CONFIG_PCI */ #define set_pci_dma_ops(d) #define get_pci_dma_ops() NULL -diff -urNp linux-2.6.38.7/arch/microblaze/kernel/dma.c linux-2.6.38.7/arch/microblaze/kernel/dma.c ---- linux-2.6.38.7/arch/microblaze/kernel/dma.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/microblaze/kernel/dma.c 2011-04-28 19:34:14.000000000 -0400 -@@ -133,7 +133,7 @@ static inline void dma_direct_unmap_page +diff --git a/arch/microblaze/kernel/dma.c b/arch/microblaze/kernel/dma.c +index 79c7465..95a4dbe 100644 +--- a/arch/microblaze/kernel/dma.c ++++ b/arch/microblaze/kernel/dma.c +@@ -133,7 +133,7 @@ static inline void dma_direct_unmap_page(struct device *dev, __dma_sync_page(dma_address, 0 , size, direction); } @@ -1280,9 +1535,10 @@ diff -urNp linux-2.6.38.7/arch/microblaze/kernel/dma.c linux-2.6.38.7/arch/micro .alloc_coherent = dma_direct_alloc_coherent, .free_coherent = dma_direct_free_coherent, .map_sg = dma_direct_map_sg, -diff -urNp linux-2.6.38.7/arch/microblaze/kernel/kgdb.c linux-2.6.38.7/arch/microblaze/kernel/kgdb.c ---- linux-2.6.38.7/arch/microblaze/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/microblaze/kernel/kgdb.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/microblaze/kernel/kgdb.c b/arch/microblaze/kernel/kgdb.c +index 09a5e82..b5dd424 100644 +--- a/arch/microblaze/kernel/kgdb.c ++++ b/arch/microblaze/kernel/kgdb.c @@ -141,10 +141,11 @@ void kgdb_arch_exit(void) /* * Global data @@ -1296,9 +1552,10 @@ diff -urNp linux-2.6.38.7/arch/microblaze/kernel/kgdb.c linux-2.6.38.7/arch/micr .gdb_bpt_instr = {0xba, 0x0c, 0x00, 0x18}, /* brki r16, 0x18 */ #endif }; -diff -urNp linux-2.6.38.7/arch/microblaze/pci/pci-common.c linux-2.6.38.7/arch/microblaze/pci/pci-common.c ---- linux-2.6.38.7/arch/microblaze/pci/pci-common.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/microblaze/pci/pci-common.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c +index e363615..a959ed4 100644 +--- a/arch/microblaze/pci/pci-common.c ++++ b/arch/microblaze/pci/pci-common.c @@ -47,14 +47,14 @@ resource_size_t isa_mem_base; /* Default PCI flags is 0 on ppc32, modified at boot on ppc64 */ unsigned int pci_flags; @@ -1317,10 +1574,11 @@ diff -urNp linux-2.6.38.7/arch/microblaze/pci/pci-common.c linux-2.6.38.7/arch/m { return pci_dma_ops; } -diff -urNp linux-2.6.38.7/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.38.7/arch/mips/cavium-octeon/dma-octeon.c ---- linux-2.6.38.7/arch/mips/cavium-octeon/dma-octeon.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/mips/cavium-octeon/dma-octeon.c 2011-04-28 19:34:14.000000000 -0400 -@@ -202,7 +202,7 @@ static phys_addr_t octeon_unity_dma_to_p +diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c +index 1abb66c..4554dbb 100644 +--- a/arch/mips/cavium-octeon/dma-octeon.c ++++ b/arch/mips/cavium-octeon/dma-octeon.c +@@ -202,7 +202,7 @@ static phys_addr_t octeon_unity_dma_to_phys(struct device *dev, dma_addr_t daddr } struct octeon_dma_map_ops { @@ -1329,7 +1587,7 @@ diff -urNp linux-2.6.38.7/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.38.7/ar dma_addr_t (*phys_to_dma)(struct device *dev, phys_addr_t paddr); phys_addr_t (*dma_to_phys)(struct device *dev, dma_addr_t daddr); }; -@@ -324,7 +324,7 @@ static struct octeon_dma_map_ops _octeon +@@ -324,7 +324,7 @@ static struct octeon_dma_map_ops _octeon_pci_dma_map_ops = { }, }; @@ -1338,9 +1596,10 @@ diff -urNp linux-2.6.38.7/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.38.7/ar void __init octeon_pci_dma_init(void) { -diff -urNp linux-2.6.38.7/arch/mips/include/asm/device.h linux-2.6.38.7/arch/mips/include/asm/device.h ---- linux-2.6.38.7/arch/mips/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/mips/include/asm/device.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/mips/include/asm/device.h b/arch/mips/include/asm/device.h +index c94fafb..3c1964a 100644 +--- a/arch/mips/include/asm/device.h ++++ b/arch/mips/include/asm/device.h @@ -10,7 +10,7 @@ struct dma_map_ops; struct dev_archdata { @@ -1350,9 +1609,10 @@ diff -urNp linux-2.6.38.7/arch/mips/include/asm/device.h linux-2.6.38.7/arch/mip }; struct pdev_archdata { -diff -urNp linux-2.6.38.7/arch/mips/include/asm/dma-mapping.h linux-2.6.38.7/arch/mips/include/asm/dma-mapping.h ---- linux-2.6.38.7/arch/mips/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/mips/include/asm/dma-mapping.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/mips/include/asm/dma-mapping.h b/arch/mips/include/asm/dma-mapping.h +index 655f849..4a4737f 100644 +--- a/arch/mips/include/asm/dma-mapping.h ++++ b/arch/mips/include/asm/dma-mapping.h @@ -7,9 +7,9 @@ #include <dma-coherence.h> @@ -1365,7 +1625,7 @@ diff -urNp linux-2.6.38.7/arch/mips/include/asm/dma-mapping.h linux-2.6.38.7/arc { if (dev && dev->archdata.dma_ops) return dev->archdata.dma_ops; -@@ -31,13 +31,13 @@ static inline void dma_mark_clean(void * +@@ -31,13 +31,13 @@ static inline void dma_mark_clean(void *addr, size_t size) {} static inline int dma_supported(struct device *dev, u64 mask) { @@ -1381,7 +1641,7 @@ diff -urNp linux-2.6.38.7/arch/mips/include/asm/dma-mapping.h linux-2.6.38.7/arc return ops->mapping_error(dev, mask); } -@@ -59,7 +59,7 @@ static inline void *dma_alloc_coherent(s +@@ -59,7 +59,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp) { void *ret; @@ -1390,7 +1650,7 @@ diff -urNp linux-2.6.38.7/arch/mips/include/asm/dma-mapping.h linux-2.6.38.7/arc ret = ops->alloc_coherent(dev, size, dma_handle, gfp); -@@ -71,7 +71,7 @@ static inline void *dma_alloc_coherent(s +@@ -71,7 +71,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size, static inline void dma_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle) { @@ -1399,9 +1659,10 @@ diff -urNp linux-2.6.38.7/arch/mips/include/asm/dma-mapping.h linux-2.6.38.7/arc ops->free_coherent(dev, size, vaddr, dma_handle); -diff -urNp linux-2.6.38.7/arch/mips/include/asm/elf.h linux-2.6.38.7/arch/mips/include/asm/elf.h ---- linux-2.6.38.7/arch/mips/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/mips/include/asm/elf.h 2011-04-30 19:58:48.000000000 -0400 +diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h +index 455c0ac..ad65fbe 100644 +--- a/arch/mips/include/asm/elf.h ++++ b/arch/mips/include/asm/elf.h @@ -372,13 +372,16 @@ extern const char *__elf_platform; #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) #endif @@ -1423,10 +1684,11 @@ diff -urNp linux-2.6.38.7/arch/mips/include/asm/elf.h linux-2.6.38.7/arch/mips/i -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_ELF_H */ -diff -urNp linux-2.6.38.7/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h linux-2.6.38.7/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h ---- linux-2.6.38.7/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-04-28 19:34:14.000000000 -0400 -@@ -66,7 +66,7 @@ dma_addr_t phys_to_dma(struct device *de +diff --git a/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h b/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h +index be8fb42..e7ae1b6 100644 +--- a/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h ++++ b/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h +@@ -66,7 +66,7 @@ dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr); phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr); struct dma_map_ops; @@ -1435,10 +1697,11 @@ diff -urNp linux-2.6.38.7/arch/mips/include/asm/mach-cavium-octeon/dma-coherence extern char *octeon_swiotlb; #endif /* __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H */ -diff -urNp linux-2.6.38.7/arch/mips/include/asm/page.h linux-2.6.38.7/arch/mips/include/asm/page.h ---- linux-2.6.38.7/arch/mips/include/asm/page.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/mips/include/asm/page.h 2011-04-28 19:34:14.000000000 -0400 -@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa +diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h +index e59cd1a..8e329d6 100644 +--- a/arch/mips/include/asm/page.h ++++ b/arch/mips/include/asm/page.h +@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct page *to, struct page *from, #ifdef CONFIG_CPU_MIPS32 typedef struct { unsigned long pte_low, pte_high; } pte_t; #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32)) @@ -1447,9 +1710,10 @@ diff -urNp linux-2.6.38.7/arch/mips/include/asm/page.h linux-2.6.38.7/arch/mips/ #else typedef struct { unsigned long long pte; } pte_t; #define pte_val(x) ((x).pte) -diff -urNp linux-2.6.38.7/arch/mips/include/asm/system.h linux-2.6.38.7/arch/mips/include/asm/system.h ---- linux-2.6.38.7/arch/mips/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/mips/include/asm/system.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/mips/include/asm/system.h b/arch/mips/include/asm/system.h +index 6018c80..7c37203 100644 +--- a/arch/mips/include/asm/system.h ++++ b/arch/mips/include/asm/system.h @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); */ #define __ARCH_WANT_UNLOCKED_CTXSW @@ -1458,10 +1722,11 @@ diff -urNp linux-2.6.38.7/arch/mips/include/asm/system.h linux-2.6.38.7/arch/mip +#define arch_align_stack(x) ((x) & ~0xfUL) #endif /* _ASM_SYSTEM_H */ -diff -urNp linux-2.6.38.7/arch/mips/kernel/binfmt_elfn32.c linux-2.6.38.7/arch/mips/kernel/binfmt_elfn32.c ---- linux-2.6.38.7/arch/mips/kernel/binfmt_elfn32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/mips/kernel/binfmt_elfn32.c 2011-04-30 19:58:48.000000000 -0400 -@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N +diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c +index 9fdd8bc..4bd7f1a 100644 +--- a/arch/mips/kernel/binfmt_elfn32.c ++++ b/arch/mips/kernel/binfmt_elfn32.c +@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG]; #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) @@ -1475,10 +1740,11 @@ diff -urNp linux-2.6.38.7/arch/mips/kernel/binfmt_elfn32.c linux-2.6.38.7/arch/m #include <asm/processor.h> #include <linux/module.h> #include <linux/elfcore.h> -diff -urNp linux-2.6.38.7/arch/mips/kernel/binfmt_elfo32.c linux-2.6.38.7/arch/mips/kernel/binfmt_elfo32.c ---- linux-2.6.38.7/arch/mips/kernel/binfmt_elfo32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/mips/kernel/binfmt_elfo32.c 2011-04-30 19:58:48.000000000 -0400 -@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N +diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c +index ff44823..97f8906 100644 +--- a/arch/mips/kernel/binfmt_elfo32.c ++++ b/arch/mips/kernel/binfmt_elfo32.c +@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG]; #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) @@ -1492,10 +1758,11 @@ diff -urNp linux-2.6.38.7/arch/mips/kernel/binfmt_elfo32.c linux-2.6.38.7/arch/m #include <asm/processor.h> /* -diff -urNp linux-2.6.38.7/arch/mips/kernel/kgdb.c linux-2.6.38.7/arch/mips/kernel/kgdb.c ---- linux-2.6.38.7/arch/mips/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/mips/kernel/kgdb.c 2011-04-28 19:34:14.000000000 -0400 -@@ -351,7 +351,7 @@ int kgdb_arch_handle_exception(int vecto +diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c +index f4546e9..f13b233 100644 +--- a/arch/mips/kernel/kgdb.c ++++ b/arch/mips/kernel/kgdb.c +@@ -351,7 +351,7 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code, return -1; } @@ -1504,10 +1771,11 @@ diff -urNp linux-2.6.38.7/arch/mips/kernel/kgdb.c linux-2.6.38.7/arch/mips/kerne /* * We use kgdb_early_setup so that functions we need to call now don't -diff -urNp linux-2.6.38.7/arch/mips/kernel/process.c linux-2.6.38.7/arch/mips/kernel/process.c ---- linux-2.6.38.7/arch/mips/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/mips/kernel/process.c 2011-04-28 19:34:14.000000000 -0400 -@@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_stru +diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c +index ae167df..15dd7bd 100644 +--- a/arch/mips/kernel/process.c ++++ b/arch/mips/kernel/process.c +@@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_struct *task) out: return pc; } @@ -1523,10 +1791,11 @@ diff -urNp linux-2.6.38.7/arch/mips/kernel/process.c linux-2.6.38.7/arch/mips/ke - - return sp & ALMASK; -} -diff -urNp linux-2.6.38.7/arch/mips/kernel/syscall.c linux-2.6.38.7/arch/mips/kernel/syscall.c ---- linux-2.6.38.7/arch/mips/kernel/syscall.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/mips/kernel/syscall.c 2011-04-30 19:58:48.000000000 -0400 -@@ -108,14 +108,18 @@ unsigned long arch_get_unmapped_area(str +diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c +index 58beabf..ae38811 100644 +--- a/arch/mips/kernel/syscall.c ++++ b/arch/mips/kernel/syscall.c +@@ -108,14 +108,18 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, do_color_align = 0; if (filp || (flags & MAP_SHARED)) do_color_align = 1; @@ -1547,7 +1816,7 @@ diff -urNp linux-2.6.38.7/arch/mips/kernel/syscall.c linux-2.6.38.7/arch/mips/ke return addr; } addr = current->mm->mmap_base; -@@ -128,7 +132,7 @@ unsigned long arch_get_unmapped_area(str +@@ -128,7 +132,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, /* At this point: (!vmm || addr < vmm->vm_end). */ if (task_size - len < addr) return -ENOMEM; @@ -1556,7 +1825,7 @@ diff -urNp linux-2.6.38.7/arch/mips/kernel/syscall.c linux-2.6.38.7/arch/mips/ke return addr; addr = vmm->vm_end; if (do_color_align) -@@ -154,33 +158,6 @@ void arch_pick_mmap_layout(struct mm_str +@@ -154,33 +158,6 @@ void arch_pick_mmap_layout(struct mm_struct *mm) mm->unmap_area = arch_unmap_area; } @@ -1590,10 +1859,11 @@ diff -urNp linux-2.6.38.7/arch/mips/kernel/syscall.c linux-2.6.38.7/arch/mips/ke SYSCALL_DEFINE6(mips_mmap, unsigned long, addr, unsigned long, len, unsigned long, prot, unsigned long, flags, unsigned long, fd, off_t, offset) -diff -urNp linux-2.6.38.7/arch/mips/mm/dma-default.c linux-2.6.38.7/arch/mips/mm/dma-default.c ---- linux-2.6.38.7/arch/mips/mm/dma-default.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/mips/mm/dma-default.c 2011-04-28 19:34:14.000000000 -0400 -@@ -300,7 +300,7 @@ void dma_cache_sync(struct device *dev, +diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c +index 21ea14e..5265671 100644 +--- a/arch/mips/mm/dma-default.c ++++ b/arch/mips/mm/dma-default.c +@@ -300,7 +300,7 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size, EXPORT_SYMBOL(dma_cache_sync); @@ -1602,7 +1872,7 @@ diff -urNp linux-2.6.38.7/arch/mips/mm/dma-default.c linux-2.6.38.7/arch/mips/mm .alloc_coherent = mips_dma_alloc_coherent, .free_coherent = mips_dma_free_coherent, .map_page = mips_dma_map_page, -@@ -315,7 +315,7 @@ static struct dma_map_ops mips_default_d +@@ -315,7 +315,7 @@ static struct dma_map_ops mips_default_dma_map_ops = { .dma_supported = mips_dma_supported }; @@ -1611,9 +1881,10 @@ diff -urNp linux-2.6.38.7/arch/mips/mm/dma-default.c linux-2.6.38.7/arch/mips/mm EXPORT_SYMBOL(mips_dma_map_ops); #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16) -diff -urNp linux-2.6.38.7/arch/mips/mm/fault.c linux-2.6.38.7/arch/mips/mm/fault.c ---- linux-2.6.38.7/arch/mips/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/mips/mm/fault.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c +index 137ee76..1bc42da 100644 +--- a/arch/mips/mm/fault.c ++++ b/arch/mips/mm/fault.c @@ -28,6 +28,23 @@ #include <asm/highmem.h> /* For VMALLOC_END */ #include <linux/kdebug.h> @@ -1638,10 +1909,11 @@ diff -urNp linux-2.6.38.7/arch/mips/mm/fault.c linux-2.6.38.7/arch/mips/mm/fault /* * This routine handles page faults. It determines the address, * and the problem, and then passes it off to one of the appropriate -diff -urNp linux-2.6.38.7/arch/parisc/include/asm/elf.h linux-2.6.38.7/arch/parisc/include/asm/elf.h ---- linux-2.6.38.7/arch/parisc/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/parisc/include/asm/elf.h 2011-04-28 19:34:14.000000000 -0400 -@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration.. +diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h +index 19f6cb1..6c78cf2 100644 +--- a/arch/parisc/include/asm/elf.h ++++ b/arch/parisc/include/asm/elf.h +@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) @@ -1655,9 +1927,10 @@ diff -urNp linux-2.6.38.7/arch/parisc/include/asm/elf.h linux-2.6.38.7/arch/pari /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, but it's not easy, and we've already done it here. */ -diff -urNp linux-2.6.38.7/arch/parisc/include/asm/pgtable.h linux-2.6.38.7/arch/parisc/include/asm/pgtable.h ---- linux-2.6.38.7/arch/parisc/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/parisc/include/asm/pgtable.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h +index 6f1f65d..50d5417 100644 +--- a/arch/parisc/include/asm/pgtable.h ++++ b/arch/parisc/include/asm/pgtable.h @@ -209,6 +209,17 @@ struct vm_area_struct; #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) #define PAGE_COPY PAGE_EXECREAD @@ -1676,9 +1949,10 @@ diff -urNp linux-2.6.38.7/arch/parisc/include/asm/pgtable.h linux-2.6.38.7/arch/ #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) -diff -urNp linux-2.6.38.7/arch/parisc/kernel/module.c linux-2.6.38.7/arch/parisc/kernel/module.c ---- linux-2.6.38.7/arch/parisc/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/parisc/kernel/module.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c +index 6e81bb5..9c280d2 100644 +--- a/arch/parisc/kernel/module.c ++++ b/arch/parisc/kernel/module.c @@ -96,16 +96,38 @@ /* three functions to determine where in the module core @@ -1722,28 +1996,27 @@ diff -urNp linux-2.6.38.7/arch/parisc/kernel/module.c linux-2.6.38.7/arch/parisc } static inline int in_local(struct module *me, void *loc) -@@ -365,13 +387,13 @@ int module_frob_arch_sections(CONST Elf_ +@@ -365,13 +387,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr, } /* align things a bit */ - me->core_size = ALIGN(me->core_size, 16); - me->arch.got_offset = me->core_size; - me->core_size += gots * sizeof(struct got_entry); -- -- me->core_size = ALIGN(me->core_size, 16); -- me->arch.fdesc_offset = me->core_size; -- me->core_size += fdescs * sizeof(Elf_Fdesc); + me->core_size_rw = ALIGN(me->core_size_rw, 16); + me->arch.got_offset = me->core_size_rw; + me->core_size_rw += gots * sizeof(struct got_entry); -+ + +- me->core_size = ALIGN(me->core_size, 16); +- me->arch.fdesc_offset = me->core_size; +- me->core_size += fdescs * sizeof(Elf_Fdesc); + me->core_size_rw = ALIGN(me->core_size_rw, 16); + me->arch.fdesc_offset = me->core_size_rw; + me->core_size_rw += fdescs * sizeof(Elf_Fdesc); me->arch.got_max = gots; me->arch.fdesc_max = fdescs; -@@ -389,7 +411,7 @@ static Elf64_Word get_got(struct module +@@ -389,7 +411,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend) BUG_ON(value == 0); @@ -1752,7 +2025,7 @@ diff -urNp linux-2.6.38.7/arch/parisc/kernel/module.c linux-2.6.38.7/arch/parisc for (i = 0; got[i].addr; i++) if (got[i].addr == value) goto out; -@@ -407,7 +429,7 @@ static Elf64_Word get_got(struct module +@@ -407,7 +429,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend) #ifdef CONFIG_64BIT static Elf_Addr get_fdesc(struct module *me, unsigned long value) { @@ -1761,7 +2034,7 @@ diff -urNp linux-2.6.38.7/arch/parisc/kernel/module.c linux-2.6.38.7/arch/parisc if (!value) { printk(KERN_ERR "%s: zero OPD requested!\n", me->name); -@@ -425,7 +447,7 @@ static Elf_Addr get_fdesc(struct module +@@ -425,7 +447,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value) /* Create new one */ fdesc->addr = value; @@ -1779,10 +2052,11 @@ diff -urNp linux-2.6.38.7/arch/parisc/kernel/module.c linux-2.6.38.7/arch/parisc DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", me->arch.unwind_section, table, end, gp); -diff -urNp linux-2.6.38.7/arch/parisc/kernel/sys_parisc.c linux-2.6.38.7/arch/parisc/kernel/sys_parisc.c ---- linux-2.6.38.7/arch/parisc/kernel/sys_parisc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/parisc/kernel/sys_parisc.c 2011-04-28 19:34:14.000000000 -0400 -@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u +diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c +index c9b9322..02d8940 100644 +--- a/arch/parisc/kernel/sys_parisc.c ++++ b/arch/parisc/kernel/sys_parisc.c +@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len) /* At this point: (!vma || addr < vma->vm_end). */ if (TASK_SIZE - len < addr) return -ENOMEM; @@ -1791,7 +2065,7 @@ diff -urNp linux-2.6.38.7/arch/parisc/kernel/sys_parisc.c linux-2.6.38.7/arch/pa return addr; addr = vma->vm_end; } -@@ -79,7 +79,7 @@ static unsigned long get_shared_area(str +@@ -79,7 +79,7 @@ static unsigned long get_shared_area(struct address_space *mapping, /* At this point: (!vma || addr < vma->vm_end). */ if (TASK_SIZE - len < addr) return -ENOMEM; @@ -1800,7 +2074,7 @@ diff -urNp linux-2.6.38.7/arch/parisc/kernel/sys_parisc.c linux-2.6.38.7/arch/pa return addr; addr = DCACHE_ALIGN(vma->vm_end - offset) + offset; if (addr < vma->vm_end) /* handle wraparound */ -@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str +@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, if (flags & MAP_FIXED) return addr; if (!addr) @@ -1809,10 +2083,11 @@ diff -urNp linux-2.6.38.7/arch/parisc/kernel/sys_parisc.c linux-2.6.38.7/arch/pa if (filp) { addr = get_shared_area(filp->f_mapping, addr, len, pgoff); -diff -urNp linux-2.6.38.7/arch/parisc/kernel/traps.c linux-2.6.38.7/arch/parisc/kernel/traps.c ---- linux-2.6.38.7/arch/parisc/kernel/traps.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/parisc/kernel/traps.c 2011-04-28 19:34:14.000000000 -0400 -@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod +diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c +index 8b58bf0..7afff03 100644 +--- a/arch/parisc/kernel/traps.c ++++ b/arch/parisc/kernel/traps.c +@@ -733,9 +733,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs) down_read(¤t->mm->mmap_sem); vma = find_vma(current->mm,regs->iaoq[0]); @@ -1823,9 +2098,10 @@ diff -urNp linux-2.6.38.7/arch/parisc/kernel/traps.c linux-2.6.38.7/arch/parisc/ fault_address = regs->iaoq[0]; fault_space = regs->iasq[0]; -diff -urNp linux-2.6.38.7/arch/parisc/mm/fault.c linux-2.6.38.7/arch/parisc/mm/fault.c ---- linux-2.6.38.7/arch/parisc/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/parisc/mm/fault.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c +index 18162ce..4d274ba 100644 +--- a/arch/parisc/mm/fault.c ++++ b/arch/parisc/mm/fault.c @@ -15,6 +15,7 @@ #include <linux/sched.h> #include <linux/interrupt.h> @@ -1834,7 +2110,7 @@ diff -urNp linux-2.6.38.7/arch/parisc/mm/fault.c linux-2.6.38.7/arch/parisc/mm/f #include <asm/uaccess.h> #include <asm/traps.h> -@@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, ex +@@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, exception_data); static unsigned long parisc_acctyp(unsigned long code, unsigned int inst) { @@ -1843,7 +2119,7 @@ diff -urNp linux-2.6.38.7/arch/parisc/mm/fault.c linux-2.6.38.7/arch/parisc/mm/f return VM_EXEC; switch (inst & 0xf0000000) { -@@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsign +@@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsigned int inst) } #endif @@ -1995,9 +2271,10 @@ diff -urNp linux-2.6.38.7/arch/parisc/mm/fault.c linux-2.6.38.7/arch/parisc/mm/f /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/device.h linux-2.6.38.7/arch/powerpc/include/asm/device.h ---- linux-2.6.38.7/arch/powerpc/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/include/asm/device.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/powerpc/include/asm/device.h b/arch/powerpc/include/asm/device.h +index 16d25c0..0628dfd 100644 +--- a/arch/powerpc/include/asm/device.h ++++ b/arch/powerpc/include/asm/device.h @@ -17,7 +17,7 @@ struct device_node; */ struct dev_archdata { @@ -2007,10 +2284,11 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/device.h linux-2.6.38.7/arch/ /* * When an iommu is in use, dma_data is used as a ptr to the base of the -diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/dma-mapping.h linux-2.6.38.7/arch/powerpc/include/asm/dma-mapping.h ---- linux-2.6.38.7/arch/powerpc/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/include/asm/dma-mapping.h 2011-04-28 19:34:14.000000000 -0400 -@@ -66,12 +66,13 @@ static inline unsigned long device_to_ma +diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h +index 6d2416a..ae0b752 100644 +--- a/arch/powerpc/include/asm/dma-mapping.h ++++ b/arch/powerpc/include/asm/dma-mapping.h +@@ -66,12 +66,13 @@ static inline unsigned long device_to_mask(struct device *dev) /* * Available generic sets of operations */ @@ -2027,7 +2305,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/dma-mapping.h linux-2.6.38.7/ { /* We don't handle the NULL dev case for ISA for now. We could * do it via an out of line call but it is not needed for now. The -@@ -84,7 +85,7 @@ static inline struct dma_map_ops *get_dm +@@ -84,7 +85,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) return dev->archdata.dma_ops; } @@ -2036,7 +2314,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/dma-mapping.h linux-2.6.38.7/ { dev->archdata.dma_ops = ops; } -@@ -118,7 +119,7 @@ static inline void set_dma_offset(struct +@@ -118,7 +119,7 @@ static inline void set_dma_offset(struct device *dev, dma_addr_t off) static inline int dma_supported(struct device *dev, u64 mask) { @@ -2045,7 +2323,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/dma-mapping.h linux-2.6.38.7/ if (unlikely(dma_ops == NULL)) return 0; -@@ -132,7 +133,7 @@ extern int dma_set_mask(struct device *d +@@ -132,7 +133,7 @@ extern int dma_set_mask(struct device *dev, u64 dma_mask); static inline void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag) { @@ -2054,7 +2332,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/dma-mapping.h linux-2.6.38.7/ void *cpu_addr; BUG_ON(!dma_ops); -@@ -147,7 +148,7 @@ static inline void *dma_alloc_coherent(s +@@ -147,7 +148,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size, static inline void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr_t dma_handle) { @@ -2063,7 +2341,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/dma-mapping.h linux-2.6.38.7/ BUG_ON(!dma_ops); -@@ -158,7 +159,7 @@ static inline void dma_free_coherent(str +@@ -158,7 +159,7 @@ static inline void dma_free_coherent(struct device *dev, size_t size, static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { @@ -2072,10 +2350,11 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/dma-mapping.h linux-2.6.38.7/ if (dma_ops->mapping_error) return dma_ops->mapping_error(dev, dma_addr); -diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/elf.h linux-2.6.38.7/arch/powerpc/include/asm/elf.h ---- linux-2.6.38.7/arch/powerpc/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/include/asm/elf.h 2011-04-28 19:34:14.000000000 -0400 -@@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E +diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h +index 2b917c6..9859a0c 100644 +--- a/arch/powerpc/include/asm/elf.h ++++ b/arch/powerpc/include/asm/elf.h +@@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG]; 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. */ @@ -2097,7 +2376,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/elf.h linux-2.6.38.7/arch/pow /* * Our registers are always unsigned longs, whether we're a 32 bit -@@ -274,9 +285,6 @@ extern int arch_setup_additional_pages(s +@@ -274,9 +285,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm, (0x7ff >> (PAGE_SHIFT - 12)) : \ (0x3ffff >> (PAGE_SHIFT - 12))) @@ -2107,10 +2386,11 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/elf.h linux-2.6.38.7/arch/pow #endif /* __KERNEL__ */ /* -diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/iommu.h linux-2.6.38.7/arch/powerpc/include/asm/iommu.h ---- linux-2.6.38.7/arch/powerpc/include/asm/iommu.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/include/asm/iommu.h 2011-04-28 19:34:14.000000000 -0400 -@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi +diff --git a/arch/powerpc/include/asm/iommu.h b/arch/powerpc/include/asm/iommu.h +index edfc980..1766f59 100644 +--- a/arch/powerpc/include/asm/iommu.h ++++ b/arch/powerpc/include/asm/iommu.h +@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(void); extern void iommu_init_early_dart(void); extern void iommu_init_early_pasemi(void); @@ -2120,9 +2400,10 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/iommu.h linux-2.6.38.7/arch/p #ifdef CONFIG_PCI extern void pci_iommu_init(void); extern void pci_direct_iommu_init(void); -diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/kmap_types.h linux-2.6.38.7/arch/powerpc/include/asm/kmap_types.h ---- linux-2.6.38.7/arch/powerpc/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/include/asm/kmap_types.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h +index bca8fdc..61e9580 100644 +--- a/arch/powerpc/include/asm/kmap_types.h ++++ b/arch/powerpc/include/asm/kmap_types.h @@ -27,6 +27,7 @@ enum km_type { KM_PPC_SYNC_PAGE, KM_PPC_SYNC_ICACHE, @@ -2131,33 +2412,10 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/kmap_types.h linux-2.6.38.7/a KM_TYPE_NR }; -diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/page_64.h linux-2.6.38.7/arch/powerpc/include/asm/page_64.h ---- linux-2.6.38.7/arch/powerpc/include/asm/page_64.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/include/asm/page_64.h 2011-04-28 19:34:14.000000000 -0400 -@@ -172,15 +172,18 @@ do { \ - * stack by default, so in the absense of a PT_GNU_STACK program header - * we turn execute permission off. - */ --#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 \ - (is_32bit_task() ? \ - VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64) -+#endif - - #include <asm-generic/getorder.h> - -diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/page.h linux-2.6.38.7/arch/powerpc/include/asm/page.h ---- linux-2.6.38.7/arch/powerpc/include/asm/page.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/include/asm/page.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h +index da4b200..3fc8701 100644 +--- a/arch/powerpc/include/asm/page.h ++++ b/arch/powerpc/include/asm/page.h @@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr; * and needs to be executable. This means the whole heap ends * up being executable. @@ -2180,10 +2438,36 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/page.h linux-2.6.38.7/arch/po #ifndef __ASSEMBLY__ #undef STRICT_MM_TYPECHECKS -diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/pci.h linux-2.6.38.7/arch/powerpc/include/asm/pci.h ---- linux-2.6.38.7/arch/powerpc/include/asm/pci.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/include/asm/pci.h 2011-04-28 19:34:14.000000000 -0400 -@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq +diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h +index 932f88d..f339eed 100644 +--- a/arch/powerpc/include/asm/page_64.h ++++ b/arch/powerpc/include/asm/page_64.h +@@ -172,15 +172,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 \ + (is_32bit_task() ? \ + VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64) ++#endif + + #include <asm-generic/getorder.h> + +diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h +index a20a9ad..158bb9a 100644 +--- a/arch/powerpc/include/asm/pci.h ++++ b/arch/powerpc/include/asm/pci.h +@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) } #ifdef CONFIG_PCI @@ -2194,9 +2478,10 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/pci.h linux-2.6.38.7/arch/pow #else /* CONFIG_PCI */ #define set_pci_dma_ops(d) #define get_pci_dma_ops() NULL -diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/pgtable.h linux-2.6.38.7/arch/powerpc/include/asm/pgtable.h ---- linux-2.6.38.7/arch/powerpc/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/include/asm/pgtable.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h +index 89f1587..807df80 100644 +--- a/arch/powerpc/include/asm/pgtable.h ++++ b/arch/powerpc/include/asm/pgtable.h @@ -2,6 +2,7 @@ #define _ASM_POWERPC_PGTABLE_H #ifdef __KERNEL__ @@ -2205,9 +2490,10 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/pgtable.h linux-2.6.38.7/arch #ifndef __ASSEMBLY__ #include <asm/processor.h> /* For TASK_SIZE */ #include <asm/mmu.h> -diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/pte-hash32.h linux-2.6.38.7/arch/powerpc/include/asm/pte-hash32.h ---- linux-2.6.38.7/arch/powerpc/include/asm/pte-hash32.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/include/asm/pte-hash32.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h +index 4aad413..85d86bf 100644 +--- a/arch/powerpc/include/asm/pte-hash32.h ++++ b/arch/powerpc/include/asm/pte-hash32.h @@ -21,6 +21,7 @@ #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ #define _PAGE_USER 0x004 /* usermode access allowed */ @@ -2216,9 +2502,10 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/pte-hash32.h linux-2.6.38.7/a #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ -diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/reg.h linux-2.6.38.7/arch/powerpc/include/asm/reg.h ---- linux-2.6.38.7/arch/powerpc/include/asm/reg.h 2011-04-18 17:27:13.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/include/asm/reg.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h +index 7626fa7..bc05be4 100644 +--- a/arch/powerpc/include/asm/reg.h ++++ b/arch/powerpc/include/asm/reg.h @@ -191,6 +191,7 @@ #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ @@ -2227,9 +2514,10 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/reg.h linux-2.6.38.7/arch/pow #define DSISR_PROTFAULT 0x08000000 /* protection fault */ #define DSISR_ISSTORE 0x02000000 /* access was a store */ #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ -diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/swiotlb.h linux-2.6.38.7/arch/powerpc/include/asm/swiotlb.h ---- linux-2.6.38.7/arch/powerpc/include/asm/swiotlb.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/include/asm/swiotlb.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/powerpc/include/asm/swiotlb.h b/arch/powerpc/include/asm/swiotlb.h +index 8979d4c..d2fd0d3 100644 +--- a/arch/powerpc/include/asm/swiotlb.h ++++ b/arch/powerpc/include/asm/swiotlb.h @@ -13,7 +13,7 @@ #include <linux/swiotlb.h> @@ -2239,10 +2527,11 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/swiotlb.h linux-2.6.38.7/arch static inline void dma_mark_clean(void *addr, size_t size) {} -diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/system.h linux-2.6.38.7/arch/powerpc/include/asm/system.h ---- linux-2.6.38.7/arch/powerpc/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/include/asm/system.h 2011-04-28 19:34:14.000000000 -0400 -@@ -533,7 +533,7 @@ __cmpxchg_local(volatile void *ptr, unsi +diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h +index 5e474dd..a66d0a0 100644 +--- a/arch/powerpc/include/asm/system.h ++++ b/arch/powerpc/include/asm/system.h +@@ -533,7 +533,7 @@ __cmpxchg_local(volatile void *ptr, unsigned long old, unsigned long new, #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n)) #endif @@ -2251,9 +2540,10 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/system.h linux-2.6.38.7/arch/ /* Used in very early kernel initialization. */ extern unsigned long reloc_offset(void); -diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/uaccess.h linux-2.6.38.7/arch/powerpc/include/asm/uaccess.h ---- linux-2.6.38.7/arch/powerpc/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/include/asm/uaccess.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h +index bd0fb84..a42a14b 100644 +--- a/arch/powerpc/include/asm/uaccess.h ++++ b/arch/powerpc/include/asm/uaccess.h @@ -13,6 +13,8 @@ #define VERIFY_READ 0 #define VERIFY_WRITE 1 @@ -2316,7 +2606,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/uaccess.h linux-2.6.38.7/arch static inline unsigned long __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n) { -@@ -396,6 +352,10 @@ static inline unsigned long __copy_from_ +@@ -396,6 +352,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to, if (ret == 0) return 0; } @@ -2327,7 +2617,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/uaccess.h linux-2.6.38.7/arch return __copy_tofrom_user((__force void __user *)to, from, n); } -@@ -422,6 +382,10 @@ static inline unsigned long __copy_to_us +@@ -422,6 +382,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to, if (ret == 0) return 0; } @@ -2338,7 +2628,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/uaccess.h linux-2.6.38.7/arch return __copy_tofrom_user(to, (__force const void __user *)from, n); } -@@ -439,6 +403,92 @@ static inline unsigned long __copy_to_us +@@ -439,6 +403,92 @@ static inline unsigned long __copy_to_user(void __user *to, return __copy_to_user_inatomic(to, from, size); } @@ -2431,31 +2721,11 @@ diff -urNp linux-2.6.38.7/arch/powerpc/include/asm/uaccess.h linux-2.6.38.7/arch extern unsigned long __clear_user(void __user *addr, unsigned long size); static inline unsigned long clear_user(void __user *addr, unsigned long size) -diff -urNp linux-2.6.38.7/arch/powerpc/kernel/dma.c linux-2.6.38.7/arch/powerpc/kernel/dma.c ---- linux-2.6.38.7/arch/powerpc/kernel/dma.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/kernel/dma.c 2011-04-28 19:34:14.000000000 -0400 -@@ -136,7 +136,7 @@ static inline void dma_direct_sync_singl - } - #endif - --struct dma_map_ops dma_direct_ops = { -+const struct dma_map_ops dma_direct_ops = { - .alloc_coherent = dma_direct_alloc_coherent, - .free_coherent = dma_direct_free_coherent, - .map_sg = dma_direct_map_sg, -@@ -157,7 +157,7 @@ EXPORT_SYMBOL(dma_direct_ops); - - int dma_set_mask(struct device *dev, u64 dma_mask) - { -- struct dma_map_ops *dma_ops = get_dma_ops(dev); -+ const struct dma_map_ops *dma_ops = get_dma_ops(dev); - - if (ppc_md.dma_set_mask) - return ppc_md.dma_set_mask(dev, dma_mask); -diff -urNp linux-2.6.38.7/arch/powerpc/kernel/dma-iommu.c linux-2.6.38.7/arch/powerpc/kernel/dma-iommu.c ---- linux-2.6.38.7/arch/powerpc/kernel/dma-iommu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/kernel/dma-iommu.c 2011-04-28 19:34:14.000000000 -0400 -@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de +diff --git a/arch/powerpc/kernel/dma-iommu.c b/arch/powerpc/kernel/dma-iommu.c +index e755415..a37c215 100644 +--- a/arch/powerpc/kernel/dma-iommu.c ++++ b/arch/powerpc/kernel/dma-iommu.c +@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct device *dev, struct scatterlist *sglist, } /* We support DMA to/from any memory page via the iommu */ @@ -2464,7 +2734,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/kernel/dma-iommu.c linux-2.6.38.7/arch/po { struct iommu_table *tbl = get_iommu_table_base(dev); -@@ -90,7 +90,7 @@ static int dma_iommu_dma_supported(struc +@@ -90,7 +90,7 @@ static int dma_iommu_dma_supported(struct device *dev, u64 mask) return 1; } @@ -2473,9 +2743,10 @@ diff -urNp linux-2.6.38.7/arch/powerpc/kernel/dma-iommu.c linux-2.6.38.7/arch/po .alloc_coherent = dma_iommu_alloc_coherent, .free_coherent = dma_iommu_free_coherent, .map_sg = dma_iommu_map_sg, -diff -urNp linux-2.6.38.7/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.38.7/arch/powerpc/kernel/dma-swiotlb.c ---- linux-2.6.38.7/arch/powerpc/kernel/dma-swiotlb.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/kernel/dma-swiotlb.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c +index 4295e0b..019bad4 100644 +--- a/arch/powerpc/kernel/dma-swiotlb.c ++++ b/arch/powerpc/kernel/dma-swiotlb.c @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; * map_page, and unmap_page on highmem, use normal dma_ops * for everything else. @@ -2485,9 +2756,32 @@ diff -urNp linux-2.6.38.7/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.38.7/arch/ .alloc_coherent = dma_direct_alloc_coherent, .free_coherent = dma_direct_free_coherent, .map_sg = swiotlb_map_sg_attrs, -diff -urNp linux-2.6.38.7/arch/powerpc/kernel/exceptions-64e.S linux-2.6.38.7/arch/powerpc/kernel/exceptions-64e.S ---- linux-2.6.38.7/arch/powerpc/kernel/exceptions-64e.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/kernel/exceptions-64e.S 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c +index cf02cad..88bf1d0 100644 +--- a/arch/powerpc/kernel/dma.c ++++ b/arch/powerpc/kernel/dma.c +@@ -136,7 +136,7 @@ static inline void dma_direct_sync_single(struct device *dev, + } + #endif + +-struct dma_map_ops dma_direct_ops = { ++const struct dma_map_ops dma_direct_ops = { + .alloc_coherent = dma_direct_alloc_coherent, + .free_coherent = dma_direct_free_coherent, + .map_sg = dma_direct_map_sg, +@@ -157,7 +157,7 @@ EXPORT_SYMBOL(dma_direct_ops); + + int dma_set_mask(struct device *dev, u64 dma_mask) + { +- struct dma_map_ops *dma_ops = get_dma_ops(dev); ++ const struct dma_map_ops *dma_ops = get_dma_ops(dev); + + if (ppc_md.dma_set_mask) + return ppc_md.dma_set_mask(dev, dma_mask); +diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S +index 5c43063..f368c46 100644 +--- a/arch/powerpc/kernel/exceptions-64e.S ++++ b/arch/powerpc/kernel/exceptions-64e.S @@ -495,6 +495,7 @@ storage_fault_common: std r14,_DAR(r1) std r15,_DSISR(r1) @@ -2506,9 +2800,10 @@ diff -urNp linux-2.6.38.7/arch/powerpc/kernel/exceptions-64e.S linux-2.6.38.7/ar addi r3,r1,STACK_FRAME_OVERHEAD ld r4,_DAR(r1) bl .bad_page_fault -diff -urNp linux-2.6.38.7/arch/powerpc/kernel/exceptions-64s.S linux-2.6.38.7/arch/powerpc/kernel/exceptions-64s.S ---- linux-2.6.38.7/arch/powerpc/kernel/exceptions-64s.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/kernel/exceptions-64s.S 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S +index 8a81799..633215c 100644 +--- a/arch/powerpc/kernel/exceptions-64s.S ++++ b/arch/powerpc/kernel/exceptions-64s.S @@ -848,10 +848,10 @@ handle_page_fault: 11: ld r4,_DAR(r1) ld r5,_DSISR(r1) @@ -2521,10 +2816,11 @@ diff -urNp linux-2.6.38.7/arch/powerpc/kernel/exceptions-64s.S linux-2.6.38.7/ar mr r5,r3 addi r3,r1,STACK_FRAME_OVERHEAD lwz r4,_DAR(r1) -diff -urNp linux-2.6.38.7/arch/powerpc/kernel/ibmebus.c linux-2.6.38.7/arch/powerpc/kernel/ibmebus.c ---- linux-2.6.38.7/arch/powerpc/kernel/ibmebus.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/kernel/ibmebus.c 2011-04-28 19:34:14.000000000 -0400 -@@ -128,7 +128,7 @@ static int ibmebus_dma_supported(struct +diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c +index f62efdf..50c4a83 100644 +--- a/arch/powerpc/kernel/ibmebus.c ++++ b/arch/powerpc/kernel/ibmebus.c +@@ -128,7 +128,7 @@ static int ibmebus_dma_supported(struct device *dev, u64 mask) return 1; } @@ -2533,10 +2829,11 @@ diff -urNp linux-2.6.38.7/arch/powerpc/kernel/ibmebus.c linux-2.6.38.7/arch/powe .alloc_coherent = ibmebus_alloc_coherent, .free_coherent = ibmebus_free_coherent, .map_sg = ibmebus_map_sg, -diff -urNp linux-2.6.38.7/arch/powerpc/kernel/kgdb.c linux-2.6.38.7/arch/powerpc/kernel/kgdb.c ---- linux-2.6.38.7/arch/powerpc/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/kernel/kgdb.c 2011-04-28 19:34:14.000000000 -0400 -@@ -422,7 +422,7 @@ int kgdb_arch_handle_exception(int vecto +diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c +index 42850ee..2d17986 100644 +--- a/arch/powerpc/kernel/kgdb.c ++++ b/arch/powerpc/kernel/kgdb.c +@@ -422,7 +422,7 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code, /* * Global data */ @@ -2545,41 +2842,10 @@ diff -urNp linux-2.6.38.7/arch/powerpc/kernel/kgdb.c linux-2.6.38.7/arch/powerpc .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, }; -diff -urNp linux-2.6.38.7/arch/powerpc/kernel/module_32.c linux-2.6.38.7/arch/powerpc/kernel/module_32.c ---- linux-2.6.38.7/arch/powerpc/kernel/module_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/kernel/module_32.c 2011-04-28 19:34: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.38.7/arch/powerpc/kernel/module.c linux-2.6.38.7/arch/powerpc/kernel/module.c ---- linux-2.6.38.7/arch/powerpc/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/kernel/module.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/powerpc/kernel/module.c b/arch/powerpc/kernel/module.c +index 49cee9d..e8be236 100644 +--- a/arch/powerpc/kernel/module.c ++++ b/arch/powerpc/kernel/module.c @@ -31,11 +31,24 @@ LIST_HEAD(module_bug_list); @@ -2605,7 +2871,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/kernel/module.c linux-2.6.38.7/arch/power return vmalloc_exec(size); } -@@ -45,6 +58,13 @@ void module_free(struct module *mod, voi +@@ -45,6 +58,13 @@ void module_free(struct module *mod, void *module_region) vfree(module_region); } @@ -2619,9 +2885,43 @@ diff -urNp linux-2.6.38.7/arch/powerpc/kernel/module.c linux-2.6.38.7/arch/power static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, const char *name) -diff -urNp linux-2.6.38.7/arch/powerpc/kernel/pci-common.c linux-2.6.38.7/arch/powerpc/kernel/pci-common.c ---- linux-2.6.38.7/arch/powerpc/kernel/pci-common.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/kernel/pci-common.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c +index f832773..0507238 100644 +--- a/arch/powerpc/kernel/module_32.c ++++ b/arch/powerpc/kernel/module_32.c +@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr, + 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 *location, + + 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 --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c +index 10a44e6..76b77a8 100644 +--- a/arch/powerpc/kernel/pci-common.c ++++ b/arch/powerpc/kernel/pci-common.c @@ -52,14 +52,14 @@ resource_size_t isa_mem_base; unsigned int ppc_pci_flags = 0; @@ -2640,9 +2940,10 @@ diff -urNp linux-2.6.38.7/arch/powerpc/kernel/pci-common.c linux-2.6.38.7/arch/p { return pci_dma_ops; } -diff -urNp linux-2.6.38.7/arch/powerpc/kernel/process.c linux-2.6.38.7/arch/powerpc/kernel/process.c ---- linux-2.6.38.7/arch/powerpc/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/kernel/process.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c +index 8303a6c..4111701 100644 +--- a/arch/powerpc/kernel/process.c ++++ b/arch/powerpc/kernel/process.c @@ -655,8 +655,8 @@ void show_regs(struct pt_regs * regs) * Lookup NIP late so we have the best change of getting the * above info out without failing @@ -2654,7 +2955,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/kernel/process.c linux-2.6.38.7/arch/powe #endif show_stack(current, (unsigned long *) regs->gpr[1]); if (!user_mode(regs)) -@@ -1146,10 +1146,10 @@ void show_stack(struct task_struct *tsk, +@@ -1146,10 +1146,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack) newsp = stack[0]; ip = stack[STACK_FRAME_LR_SAVE]; if (!firstframe || ip != lr) { @@ -2667,7 +2968,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/kernel/process.c linux-2.6.38.7/arch/powe (void *)current->ret_stack[curr_frame].ret); curr_frame--; } -@@ -1169,7 +1169,7 @@ void show_stack(struct task_struct *tsk, +@@ -1169,7 +1169,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack) struct pt_regs *regs = (struct pt_regs *) (sp + STACK_FRAME_OVERHEAD); lr = regs->link; @@ -2735,10 +3036,11 @@ diff -urNp linux-2.6.38.7/arch/powerpc/kernel/process.c linux-2.6.38.7/arch/powe - - return ret; -} -diff -urNp linux-2.6.38.7/arch/powerpc/kernel/signal_32.c linux-2.6.38.7/arch/powerpc/kernel/signal_32.c ---- linux-2.6.38.7/arch/powerpc/kernel/signal_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/kernel/signal_32.c 2011-04-28 19:34:14.000000000 -0400 -@@ -858,7 +858,7 @@ int handle_rt_signal32(unsigned long sig +diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c +index b96a3a0..f599bde 100644 +--- a/arch/powerpc/kernel/signal_32.c ++++ b/arch/powerpc/kernel/signal_32.c +@@ -858,7 +858,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka, /* Save user registers on the stack */ frame = &rt_sf->uc.uc_mcontext; addr = frame; @@ -2747,10 +3049,11 @@ diff -urNp linux-2.6.38.7/arch/powerpc/kernel/signal_32.c linux-2.6.38.7/arch/po if (save_user_regs(regs, frame, 0, 1)) goto badframe; regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; -diff -urNp linux-2.6.38.7/arch/powerpc/kernel/signal_64.c linux-2.6.38.7/arch/powerpc/kernel/signal_64.c ---- linux-2.6.38.7/arch/powerpc/kernel/signal_64.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/kernel/signal_64.c 2011-04-28 19:34:14.000000000 -0400 -@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct +diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c +index 27c4a45..1278a77 100644 +--- a/arch/powerpc/kernel/signal_64.c ++++ b/arch/powerpc/kernel/signal_64.c +@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info, current->thread.fpscr.val = 0; /* Set up to return from userspace. */ @@ -2759,9 +3062,10 @@ diff -urNp linux-2.6.38.7/arch/powerpc/kernel/signal_64.c linux-2.6.38.7/arch/po regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; } else { err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); -diff -urNp linux-2.6.38.7/arch/powerpc/kernel/vdso.c linux-2.6.38.7/arch/powerpc/kernel/vdso.c ---- linux-2.6.38.7/arch/powerpc/kernel/vdso.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/kernel/vdso.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c +index fd87287..e4ebb15 100644 +--- a/arch/powerpc/kernel/vdso.c ++++ b/arch/powerpc/kernel/vdso.c @@ -36,6 +36,7 @@ #include <asm/firmware.h> #include <asm/vdso.h> @@ -2770,7 +3074,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/kernel/vdso.c linux-2.6.38.7/arch/powerpc #include "setup.h" -@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct l +@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) vdso_base = VDSO32_MBASE; #endif @@ -2779,7 +3083,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/kernel/vdso.c linux-2.6.38.7/arch/powerpc /* vDSO has a problem and was disabled, just don't "enable" it for the * process -@@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct l +@@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) vdso_base = get_unmapped_area(NULL, vdso_base, (vdso_pages << PAGE_SHIFT) + ((VDSO_ALIGNMENT - 1) & PAGE_MASK), @@ -2788,10 +3092,11 @@ diff -urNp linux-2.6.38.7/arch/powerpc/kernel/vdso.c linux-2.6.38.7/arch/powerpc if (IS_ERR_VALUE(vdso_base)) { rc = vdso_base; goto fail_mmapsem; -diff -urNp linux-2.6.38.7/arch/powerpc/kernel/vio.c linux-2.6.38.7/arch/powerpc/kernel/vio.c ---- linux-2.6.38.7/arch/powerpc/kernel/vio.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/kernel/vio.c 2011-04-28 19:34:14.000000000 -0400 -@@ -605,11 +605,12 @@ static int vio_dma_iommu_dma_supported(s +diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c +index 1b695fd..6530b20 100644 +--- a/arch/powerpc/kernel/vio.c ++++ b/arch/powerpc/kernel/vio.c +@@ -605,11 +605,12 @@ static int vio_dma_iommu_dma_supported(struct device *dev, u64 mask) return dma_iommu_ops.dma_supported(dev, mask); } @@ -2805,9 +3110,10 @@ diff -urNp linux-2.6.38.7/arch/powerpc/kernel/vio.c linux-2.6.38.7/arch/powerpc/ .map_page = vio_dma_iommu_map_page, .unmap_page = vio_dma_iommu_unmap_page, .dma_supported = vio_dma_iommu_dma_supported, -diff -urNp linux-2.6.38.7/arch/powerpc/lib/usercopy_64.c linux-2.6.38.7/arch/powerpc/lib/usercopy_64.c ---- linux-2.6.38.7/arch/powerpc/lib/usercopy_64.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/lib/usercopy_64.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c +index 5eea6f3..5d10396 100644 +--- a/arch/powerpc/lib/usercopy_64.c ++++ b/arch/powerpc/lib/usercopy_64.c @@ -9,22 +9,6 @@ #include <linux/module.h> #include <asm/uaccess.h> @@ -2831,7 +3137,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/lib/usercopy_64.c linux-2.6.38.7/arch/pow unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long n) { -@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user * +@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from, return n; } @@ -2839,9 +3145,10 @@ diff -urNp linux-2.6.38.7/arch/powerpc/lib/usercopy_64.c linux-2.6.38.7/arch/pow -EXPORT_SYMBOL(copy_to_user); EXPORT_SYMBOL(copy_in_user); -diff -urNp linux-2.6.38.7/arch/powerpc/mm/fault.c linux-2.6.38.7/arch/powerpc/mm/fault.c ---- linux-2.6.38.7/arch/powerpc/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/mm/fault.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c +index 54f4fb9..5d44d49 100644 +--- a/arch/powerpc/mm/fault.c ++++ b/arch/powerpc/mm/fault.c @@ -31,6 +31,10 @@ #include <linux/kdebug.h> #include <linux/perf_event.h> @@ -2861,7 +3168,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/mm/fault.c linux-2.6.38.7/arch/powerpc/mm #ifdef CONFIG_KPROBES static inline int notify_page_fault(struct pt_regs *regs) -@@ -65,6 +70,33 @@ static inline int notify_page_fault(stru +@@ -65,6 +70,33 @@ static inline int notify_page_fault(struct pt_regs *regs) } #endif @@ -2895,7 +3202,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/mm/fault.c linux-2.6.38.7/arch/powerpc/mm /* * Check whether the instruction at regs->nip is a store using * an update addressing form which will update r1. -@@ -135,7 +167,7 @@ int __kprobes do_page_fault(struct pt_re +@@ -135,7 +167,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address, * indicate errors in DSISR but can validly be set in SRR1. */ if (trap == 0x400) @@ -2946,10 +3253,11 @@ diff -urNp linux-2.6.38.7/arch/powerpc/mm/fault.c linux-2.6.38.7/arch/powerpc/mm _exception(SIGSEGV, regs, code, address); return 0; } -diff -urNp linux-2.6.38.7/arch/powerpc/mm/mmap_64.c linux-2.6.38.7/arch/powerpc/mm/mmap_64.c ---- linux-2.6.38.7/arch/powerpc/mm/mmap_64.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/mm/mmap_64.c 2011-04-28 19:34:14.000000000 -0400 -@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str +diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c +index 5a783d8..c23e14b 100644 +--- a/arch/powerpc/mm/mmap_64.c ++++ b/arch/powerpc/mm/mmap_64.c +@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm) */ if (mmap_is_legacy()) { mm->mmap_base = TASK_UNMAPPED_BASE; @@ -2972,10 +3280,11 @@ diff -urNp linux-2.6.38.7/arch/powerpc/mm/mmap_64.c linux-2.6.38.7/arch/powerpc/ mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.38.7/arch/powerpc/mm/slice.c linux-2.6.38.7/arch/powerpc/mm/slice.c ---- linux-2.6.38.7/arch/powerpc/mm/slice.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/mm/slice.c 2011-04-28 19:34:14.000000000 -0400 -@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_ +diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c +index ba51948..23009d9 100644 +--- a/arch/powerpc/mm/slice.c ++++ b/arch/powerpc/mm/slice.c +@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr, if ((mm->task_size - len) < addr) return 0; vma = find_vma(mm, addr); @@ -2993,7 +3302,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/mm/slice.c linux-2.6.38.7/arch/powerpc/mm /* * Remember the place where we stopped the search: */ -@@ -313,10 +313,14 @@ static unsigned long slice_find_area_top +@@ -313,10 +313,14 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm, } } @@ -3011,7 +3320,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/mm/slice.c linux-2.6.38.7/arch/powerpc/mm /* Check for hit with different page size */ mask = slice_range_to_mask(addr, len); -@@ -336,7 +340,7 @@ static unsigned long slice_find_area_top +@@ -336,7 +340,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm, * return with success: */ vma = find_vma(mm, addr); @@ -3020,7 +3329,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/mm/slice.c linux-2.6.38.7/arch/powerpc/mm /* remember the address as a hint for next time */ if (use_cache) mm->free_area_cache = addr; -@@ -348,7 +352,7 @@ static unsigned long slice_find_area_top +@@ -348,7 +352,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm, mm->cached_hole_size = vma->vm_start - addr; /* try just below the current vma->vm_start */ @@ -3029,7 +3338,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/mm/slice.c linux-2.6.38.7/arch/powerpc/mm } /* -@@ -426,6 +430,11 @@ unsigned long slice_get_unmapped_area(un +@@ -426,6 +430,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len, if (fixed && addr > (mm->task_size - len)) return -EINVAL; @@ -3041,10 +3350,11 @@ diff -urNp linux-2.6.38.7/arch/powerpc/mm/slice.c linux-2.6.38.7/arch/powerpc/mm /* If hint, make sure it matches our alignment restrictions */ if (!fixed && addr) { addr = _ALIGN_UP(addr, 1ul << pshift); -diff -urNp linux-2.6.38.7/arch/powerpc/platforms/cell/iommu.c linux-2.6.38.7/arch/powerpc/platforms/cell/iommu.c ---- linux-2.6.38.7/arch/powerpc/platforms/cell/iommu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/platforms/cell/iommu.c 2011-04-28 19:34:14.000000000 -0400 -@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc +diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c +index 26a0671..c581d68 100644 +--- a/arch/powerpc/platforms/cell/iommu.c ++++ b/arch/powerpc/platforms/cell/iommu.c +@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struct device *dev, u64 mask) static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); @@ -3053,10 +3363,11 @@ diff -urNp linux-2.6.38.7/arch/powerpc/platforms/cell/iommu.c linux-2.6.38.7/arc .alloc_coherent = dma_fixed_alloc_coherent, .free_coherent = dma_fixed_free_coherent, .map_sg = dma_fixed_map_sg, -diff -urNp linux-2.6.38.7/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.38.7/arch/powerpc/platforms/ps3/system-bus.c ---- linux-2.6.38.7/arch/powerpc/platforms/ps3/system-bus.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/platforms/ps3/system-bus.c 2011-04-28 19:34:14.000000000 -0400 -@@ -695,7 +695,7 @@ static int ps3_dma_supported(struct devi +diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c +index 23083c3..ec00e40 100644 +--- a/arch/powerpc/platforms/ps3/system-bus.c ++++ b/arch/powerpc/platforms/ps3/system-bus.c +@@ -695,7 +695,7 @@ static int ps3_dma_supported(struct device *_dev, u64 mask) return mask >= DMA_BIT_MASK(32); } @@ -3065,7 +3376,7 @@ diff -urNp linux-2.6.38.7/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.38.7 .alloc_coherent = ps3_alloc_coherent, .free_coherent = ps3_free_coherent, .map_sg = ps3_sb_map_sg, -@@ -705,7 +705,7 @@ static struct dma_map_ops ps3_sb_dma_ops +@@ -705,7 +705,7 @@ static struct dma_map_ops ps3_sb_dma_ops = { .unmap_page = ps3_unmap_page, }; @@ -3074,10 +3385,11 @@ diff -urNp linux-2.6.38.7/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.38.7 .alloc_coherent = ps3_alloc_coherent, .free_coherent = ps3_free_coherent, .map_sg = ps3_ioc0_map_sg, -diff -urNp linux-2.6.38.7/arch/powerpc/sysdev/ppc4xx_cpm.c linux-2.6.38.7/arch/powerpc/sysdev/ppc4xx_cpm.c ---- linux-2.6.38.7/arch/powerpc/sysdev/ppc4xx_cpm.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/powerpc/sysdev/ppc4xx_cpm.c 2011-04-28 19:34:14.000000000 -0400 -@@ -240,7 +240,7 @@ static int cpm_suspend_enter(suspend_sta +diff --git a/arch/powerpc/sysdev/ppc4xx_cpm.c b/arch/powerpc/sysdev/ppc4xx_cpm.c +index 73b86cc..4c57946 100644 +--- a/arch/powerpc/sysdev/ppc4xx_cpm.c ++++ b/arch/powerpc/sysdev/ppc4xx_cpm.c +@@ -240,7 +240,7 @@ static int cpm_suspend_enter(suspend_state_t state) return 0; } @@ -3086,9 +3398,29 @@ diff -urNp linux-2.6.38.7/arch/powerpc/sysdev/ppc4xx_cpm.c linux-2.6.38.7/arch/p .valid = cpm_suspend_valid, .enter = cpm_suspend_enter, }; -diff -urNp linux-2.6.38.7/arch/s390/include/asm/elf.h linux-2.6.38.7/arch/s390/include/asm/elf.h ---- linux-2.6.38.7/arch/s390/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/s390/include/asm/elf.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig +index 636bcb8..8410fa1 100644 +--- a/arch/s390/Kconfig ++++ b/arch/s390/Kconfig +@@ -233,11 +233,9 @@ config S390_EXEC_PROTECT + prompt "Data execute protection" + 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 this will +- reduce system performance. ++ space programs. ++ Enabling this (via kernel parameter) on machines earlier than IBM ++ System z9 this will reduce system performance. + + comment "Code generation options" + +diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h +index 10c029c..19a4f9b 100644 +--- a/arch/s390/include/asm/elf.h ++++ b/arch/s390/include/asm/elf.h @@ -162,8 +162,14 @@ extern unsigned int vdso_enabled; the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ @@ -3114,10 +3446,11 @@ diff -urNp linux-2.6.38.7/arch/s390/include/asm/elf.h linux-2.6.38.7/arch/s390/i -#define arch_randomize_brk arch_randomize_brk - #endif -diff -urNp linux-2.6.38.7/arch/s390/include/asm/system.h linux-2.6.38.7/arch/s390/include/asm/system.h ---- linux-2.6.38.7/arch/s390/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/s390/include/asm/system.h 2011-04-28 19:34:14.000000000 -0400 -@@ -449,7 +449,7 @@ extern void (*_machine_restart)(char *co +diff --git a/arch/s390/include/asm/system.h b/arch/s390/include/asm/system.h +index 8f8d759..80456a5 100644 +--- a/arch/s390/include/asm/system.h ++++ b/arch/s390/include/asm/system.h +@@ -449,7 +449,7 @@ extern void (*_machine_restart)(char *command); extern void (*_machine_halt)(void); extern void (*_machine_power_off)(void); @@ -3126,9 +3459,10 @@ diff -urNp linux-2.6.38.7/arch/s390/include/asm/system.h linux-2.6.38.7/arch/s39 static inline int tprot(unsigned long addr) { -diff -urNp linux-2.6.38.7/arch/s390/include/asm/uaccess.h linux-2.6.38.7/arch/s390/include/asm/uaccess.h ---- linux-2.6.38.7/arch/s390/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/s390/include/asm/uaccess.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h +index d6b1ed0..071ffbd 100644 +--- a/arch/s390/include/asm/uaccess.h ++++ b/arch/s390/include/asm/uaccess.h @@ -234,6 +234,10 @@ static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { @@ -3140,7 +3474,7 @@ diff -urNp linux-2.6.38.7/arch/s390/include/asm/uaccess.h linux-2.6.38.7/arch/s3 if (access_ok(VERIFY_WRITE, to, n)) n = __copy_to_user(to, from, n); return n; -@@ -259,6 +263,9 @@ copy_to_user(void __user *to, const void +@@ -259,6 +263,9 @@ copy_to_user(void __user *to, const void *from, unsigned long n) static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n) { @@ -3150,7 +3484,7 @@ diff -urNp linux-2.6.38.7/arch/s390/include/asm/uaccess.h linux-2.6.38.7/arch/s3 if (__builtin_constant_p(n) && (n <= 256)) return uaccess.copy_from_user_small(n, from, to); else -@@ -293,6 +300,10 @@ copy_from_user(void *to, const void __us +@@ -293,6 +300,10 @@ copy_from_user(void *to, const void __user *from, unsigned long n) unsigned int sz = __compiletime_object_size(to); might_fault(); @@ -3161,28 +3495,11 @@ diff -urNp linux-2.6.38.7/arch/s390/include/asm/uaccess.h linux-2.6.38.7/arch/s3 if (unlikely(sz != -1 && sz < n)) { copy_from_user_overflow(); return n; -diff -urNp linux-2.6.38.7/arch/s390/Kconfig linux-2.6.38.7/arch/s390/Kconfig ---- linux-2.6.38.7/arch/s390/Kconfig 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/s390/Kconfig 2011-04-28 19:34:14.000000000 -0400 -@@ -233,11 +233,9 @@ config S390_EXEC_PROTECT - prompt "Data execute protection" - 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 this will -- reduce system performance. -+ space programs. -+ Enabling this (via kernel parameter) on machines earlier than IBM -+ System z9 this will reduce system performance. - - comment "Code generation options" - -diff -urNp linux-2.6.38.7/arch/s390/kernel/module.c linux-2.6.38.7/arch/s390/kernel/module.c ---- linux-2.6.38.7/arch/s390/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/s390/kernel/module.c 2011-04-28 19:34:14.000000000 -0400 -@@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, +diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c +index f7167ee..e22b6d5 100644 +--- a/arch/s390/kernel/module.c ++++ b/arch/s390/kernel/module.c +@@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, /* Increase core size by size of got & plt and set start offsets for got and plt. */ @@ -3199,7 +3516,7 @@ diff -urNp linux-2.6.38.7/arch/s390/kernel/module.c linux-2.6.38.7/arch/s390/ker return 0; } -@@ -258,7 +258,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base +@@ -258,7 +258,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab, if (info->got_initialized == 0) { Elf_Addr *gotent; @@ -3208,7 +3525,7 @@ diff -urNp linux-2.6.38.7/arch/s390/kernel/module.c linux-2.6.38.7/arch/s390/ker info->got_offset; *gotent = val; info->got_initialized = 1; -@@ -282,7 +282,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base +@@ -282,7 +282,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab, else if (r_type == R_390_GOTENT || r_type == R_390_GOTPLTENT) *(unsigned int *) loc = @@ -3217,7 +3534,7 @@ diff -urNp linux-2.6.38.7/arch/s390/kernel/module.c linux-2.6.38.7/arch/s390/ker else if (r_type == R_390_GOT64 || r_type == R_390_GOTPLT64) *(unsigned long *) loc = val; -@@ -296,7 +296,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base +@@ -296,7 +296,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab, case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */ if (info->plt_initialized == 0) { unsigned int *ip; @@ -3226,7 +3543,7 @@ diff -urNp linux-2.6.38.7/arch/s390/kernel/module.c linux-2.6.38.7/arch/s390/ker info->plt_offset; #ifndef CONFIG_64BIT ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */ -@@ -321,7 +321,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base +@@ -321,7 +321,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab, val - loc + 0xffffUL < 0x1ffffeUL) || (r_type == R_390_PLT32DBL && val - loc + 0xffffffffULL < 0x1fffffffeULL))) @@ -3235,7 +3552,7 @@ diff -urNp linux-2.6.38.7/arch/s390/kernel/module.c linux-2.6.38.7/arch/s390/ker me->arch.plt_offset + info->plt_offset; val += rela->r_addend - loc; -@@ -343,7 +343,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base +@@ -343,7 +343,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab, case R_390_GOTOFF32: /* 32 bit offset to GOT. */ case R_390_GOTOFF64: /* 64 bit offset to GOT. */ val = val + rela->r_addend - @@ -3244,7 +3561,7 @@ diff -urNp linux-2.6.38.7/arch/s390/kernel/module.c linux-2.6.38.7/arch/s390/ker if (r_type == R_390_GOTOFF16) *(unsigned short *) loc = val; else if (r_type == R_390_GOTOFF32) -@@ -353,7 +353,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base +@@ -353,7 +353,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab, break; case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */ case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */ @@ -3253,10 +3570,11 @@ diff -urNp linux-2.6.38.7/arch/s390/kernel/module.c linux-2.6.38.7/arch/s390/ker rela->r_addend - loc; if (r_type == R_390_GOTPC) *(unsigned int *) loc = val; -diff -urNp linux-2.6.38.7/arch/s390/kernel/process.c linux-2.6.38.7/arch/s390/kernel/process.c ---- linux-2.6.38.7/arch/s390/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/s390/kernel/process.c 2011-04-28 19:34:14.000000000 -0400 -@@ -334,39 +334,3 @@ unsigned long get_wchan(struct task_stru +diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c +index a895e69..5257f03 100644 +--- a/arch/s390/kernel/process.c ++++ b/arch/s390/kernel/process.c +@@ -334,39 +334,3 @@ unsigned long get_wchan(struct task_struct *p) } return 0; } @@ -3296,10 +3614,11 @@ diff -urNp linux-2.6.38.7/arch/s390/kernel/process.c linux-2.6.38.7/arch/s390/ke - return base; - return ret; -} -diff -urNp linux-2.6.38.7/arch/s390/kernel/setup.c linux-2.6.38.7/arch/s390/kernel/setup.c ---- linux-2.6.38.7/arch/s390/kernel/setup.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/s390/kernel/setup.c 2011-04-28 19:34:14.000000000 -0400 -@@ -281,7 +281,7 @@ static int __init early_parse_mem(char * +diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c +index 6f63508..d607c4a 100644 +--- a/arch/s390/kernel/setup.c ++++ b/arch/s390/kernel/setup.c +@@ -281,7 +281,7 @@ static int __init early_parse_mem(char *p) } early_param("mem", early_parse_mem); @@ -3308,7 +3627,7 @@ diff -urNp linux-2.6.38.7/arch/s390/kernel/setup.c linux-2.6.38.7/arch/s390/kern EXPORT_SYMBOL_GPL(user_mode); static int set_amode_and_uaccess(unsigned long user_amode, -@@ -310,17 +310,6 @@ static int set_amode_and_uaccess(unsigne +@@ -310,17 +310,6 @@ static int set_amode_and_uaccess(unsigned long user_amode, } } @@ -3326,7 +3645,7 @@ diff -urNp linux-2.6.38.7/arch/s390/kernel/setup.c linux-2.6.38.7/arch/s390/kern static int __init early_parse_user_mode(char *p) { if (p && strcmp(p, "primary") == 0) -@@ -337,20 +326,6 @@ static int __init early_parse_user_mode( +@@ -337,20 +326,6 @@ static int __init early_parse_user_mode(char *p) } early_param("user_mode", early_parse_user_mode); @@ -3347,10 +3666,11 @@ diff -urNp linux-2.6.38.7/arch/s390/kernel/setup.c linux-2.6.38.7/arch/s390/kern static void setup_addressing_mode(void) { if (user_mode == SECONDARY_SPACE_MODE) { -diff -urNp linux-2.6.38.7/arch/s390/mm/maccess.c linux-2.6.38.7/arch/s390/mm/maccess.c ---- linux-2.6.38.7/arch/s390/mm/maccess.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/s390/mm/maccess.c 2011-04-28 19:34:14.000000000 -0400 -@@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void +diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c +index 71a4b0d..4c54d7f 100644 +--- a/arch/s390/mm/maccess.c ++++ b/arch/s390/mm/maccess.c +@@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void *dst, void *src, size_t size) return rc ? rc : count; } @@ -3359,10 +3679,11 @@ diff -urNp linux-2.6.38.7/arch/s390/mm/maccess.c linux-2.6.38.7/arch/s390/mm/mac { long copied = 0; -diff -urNp linux-2.6.38.7/arch/s390/mm/mmap.c linux-2.6.38.7/arch/s390/mm/mmap.c ---- linux-2.6.38.7/arch/s390/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/s390/mm/mmap.c 2011-04-28 19:34:14.000000000 -0400 -@@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_str +diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c +index c9a9f7f..60d0315 100644 +--- a/arch/s390/mm/mmap.c ++++ b/arch/s390/mm/mmap.c +@@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm) */ if (mmap_is_legacy()) { mm->mmap_base = TASK_UNMAPPED_BASE; @@ -3385,7 +3706,7 @@ diff -urNp linux-2.6.38.7/arch/s390/mm/mmap.c linux-2.6.38.7/arch/s390/mm/mmap.c mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -@@ -166,10 +178,22 @@ void arch_pick_mmap_layout(struct mm_str +@@ -166,10 +178,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm) */ if (mmap_is_legacy()) { mm->mmap_base = TASK_UNMAPPED_BASE; @@ -3408,9 +3729,10 @@ diff -urNp linux-2.6.38.7/arch/s390/mm/mmap.c linux-2.6.38.7/arch/s390/mm/mmap.c mm->get_unmapped_area = s390_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.38.7/arch/score/include/asm/system.h linux-2.6.38.7/arch/score/include/asm/system.h ---- linux-2.6.38.7/arch/score/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/score/include/asm/system.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/score/include/asm/system.h b/arch/score/include/asm/system.h +index 589d5c7..669e274 100644 +--- a/arch/score/include/asm/system.h ++++ b/arch/score/include/asm/system.h @@ -17,7 +17,7 @@ do { \ #define finish_arch_switch(prev) do {} while (0) @@ -3420,10 +3742,11 @@ diff -urNp linux-2.6.38.7/arch/score/include/asm/system.h linux-2.6.38.7/arch/sc #define mb() barrier() #define rmb() barrier() -diff -urNp linux-2.6.38.7/arch/score/kernel/process.c linux-2.6.38.7/arch/score/kernel/process.c ---- linux-2.6.38.7/arch/score/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/score/kernel/process.c 2011-04-28 19:34:14.000000000 -0400 -@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru +diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c +index 25d0803..d6c8e36 100644 +--- a/arch/score/kernel/process.c ++++ b/arch/score/kernel/process.c +@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_struct *task) return task_pt_regs(task)->cp0_epc; } @@ -3432,9 +3755,10 @@ diff -urNp linux-2.6.38.7/arch/score/kernel/process.c linux-2.6.38.7/arch/score/ -{ - return sp; -} -diff -urNp linux-2.6.38.7/arch/sh/include/asm/dma-mapping.h linux-2.6.38.7/arch/sh/include/asm/dma-mapping.h ---- linux-2.6.38.7/arch/sh/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sh/include/asm/dma-mapping.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/sh/include/asm/dma-mapping.h b/arch/sh/include/asm/dma-mapping.h +index 1a73c3e..e812698 100644 +--- a/arch/sh/include/asm/dma-mapping.h ++++ b/arch/sh/include/asm/dma-mapping.h @@ -1,10 +1,10 @@ #ifndef __ASM_SH_DMA_MAPPING_H #define __ASM_SH_DMA_MAPPING_H @@ -3448,7 +3772,7 @@ diff -urNp linux-2.6.38.7/arch/sh/include/asm/dma-mapping.h linux-2.6.38.7/arch/ { return dma_ops; } -@@ -14,7 +14,7 @@ static inline struct dma_map_ops *get_dm +@@ -14,7 +14,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) static inline int dma_supported(struct device *dev, u64 mask) { @@ -3457,7 +3781,7 @@ diff -urNp linux-2.6.38.7/arch/sh/include/asm/dma-mapping.h linux-2.6.38.7/arch/ if (ops->dma_supported) return ops->dma_supported(dev, mask); -@@ -24,7 +24,7 @@ static inline int dma_supported(struct d +@@ -24,7 +24,7 @@ static inline int dma_supported(struct device *dev, u64 mask) static inline int dma_set_mask(struct device *dev, u64 mask) { @@ -3466,7 +3790,7 @@ diff -urNp linux-2.6.38.7/arch/sh/include/asm/dma-mapping.h linux-2.6.38.7/arch/ if (!dev->dma_mask || !dma_supported(dev, mask)) return -EIO; -@@ -44,7 +44,7 @@ void dma_cache_sync(struct device *dev, +@@ -44,7 +44,7 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size, static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { @@ -3475,7 +3799,7 @@ diff -urNp linux-2.6.38.7/arch/sh/include/asm/dma-mapping.h linux-2.6.38.7/arch/ if (ops->mapping_error) return ops->mapping_error(dev, dma_addr); -@@ -55,7 +55,7 @@ static inline int dma_mapping_error(stru +@@ -55,7 +55,7 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) static inline void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp) { @@ -3484,7 +3808,7 @@ diff -urNp linux-2.6.38.7/arch/sh/include/asm/dma-mapping.h linux-2.6.38.7/arch/ void *memory; if (dma_alloc_from_coherent(dev, size, dma_handle, &memory)) -@@ -72,7 +72,7 @@ static inline void *dma_alloc_coherent(s +@@ -72,7 +72,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size, static inline void dma_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle) { @@ -3493,10 +3817,11 @@ diff -urNp linux-2.6.38.7/arch/sh/include/asm/dma-mapping.h linux-2.6.38.7/arch/ if (dma_release_from_coherent(dev, get_order(size), vaddr)) return; -diff -urNp linux-2.6.38.7/arch/sh/kernel/dma-nommu.c linux-2.6.38.7/arch/sh/kernel/dma-nommu.c ---- linux-2.6.38.7/arch/sh/kernel/dma-nommu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sh/kernel/dma-nommu.c 2011-04-28 19:34:14.000000000 -0400 -@@ -62,7 +62,7 @@ static void nommu_sync_sg(struct device +diff --git a/arch/sh/kernel/dma-nommu.c b/arch/sh/kernel/dma-nommu.c +index 3c55b87..92ccab3 100644 +--- a/arch/sh/kernel/dma-nommu.c ++++ b/arch/sh/kernel/dma-nommu.c +@@ -62,7 +62,7 @@ static void nommu_sync_sg(struct device *dev, struct scatterlist *sg, } #endif @@ -3505,9 +3830,10 @@ diff -urNp linux-2.6.38.7/arch/sh/kernel/dma-nommu.c linux-2.6.38.7/arch/sh/kern .alloc_coherent = dma_generic_alloc_coherent, .free_coherent = dma_generic_free_coherent, .map_page = nommu_map_page, -diff -urNp linux-2.6.38.7/arch/sh/kernel/kgdb.c linux-2.6.38.7/arch/sh/kernel/kgdb.c ---- linux-2.6.38.7/arch/sh/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sh/kernel/kgdb.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/sh/kernel/kgdb.c b/arch/sh/kernel/kgdb.c +index efb6d39..49e7304 100644 +--- a/arch/sh/kernel/kgdb.c ++++ b/arch/sh/kernel/kgdb.c @@ -319,7 +319,7 @@ void kgdb_arch_exit(void) unregister_die_notifier(&kgdb_notifier); } @@ -3517,9 +3843,10 @@ diff -urNp linux-2.6.38.7/arch/sh/kernel/kgdb.c linux-2.6.38.7/arch/sh/kernel/kg /* Breakpoint instruction: trapa #0x3c */ #ifdef CONFIG_CPU_LITTLE_ENDIAN .gdb_bpt_instr = { 0x3c, 0xc3 }, -diff -urNp linux-2.6.38.7/arch/sh/mm/consistent.c linux-2.6.38.7/arch/sh/mm/consistent.c ---- linux-2.6.38.7/arch/sh/mm/consistent.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sh/mm/consistent.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c +index 40733a9..8011a6a 100644 +--- a/arch/sh/mm/consistent.c ++++ b/arch/sh/mm/consistent.c @@ -22,7 +22,7 @@ #define PREALLOC_DMA_DEBUG_ENTRIES 4096 @@ -3529,10 +3856,11 @@ diff -urNp linux-2.6.38.7/arch/sh/mm/consistent.c linux-2.6.38.7/arch/sh/mm/cons EXPORT_SYMBOL(dma_ops); static int __init dma_init(void) -diff -urNp linux-2.6.38.7/arch/sh/mm/mmap.c linux-2.6.38.7/arch/sh/mm/mmap.c ---- linux-2.6.38.7/arch/sh/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sh/mm/mmap.c 2011-04-28 19:34:14.000000000 -0400 -@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str +diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c +index afeb710..d1d1289 100644 +--- a/arch/sh/mm/mmap.c ++++ b/arch/sh/mm/mmap.c +@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, addr = PAGE_ALIGN(addr); vma = find_vma(mm, addr); @@ -3551,7 +3879,7 @@ diff -urNp linux-2.6.38.7/arch/sh/mm/mmap.c linux-2.6.38.7/arch/sh/mm/mmap.c /* * Remember the place where we stopped the search: */ -@@ -157,8 +156,7 @@ arch_get_unmapped_area_topdown(struct fi +@@ -157,8 +156,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, addr = PAGE_ALIGN(addr); vma = find_vma(mm, addr); @@ -3561,7 +3889,7 @@ diff -urNp linux-2.6.38.7/arch/sh/mm/mmap.c linux-2.6.38.7/arch/sh/mm/mmap.c return addr; } -@@ -179,7 +177,7 @@ arch_get_unmapped_area_topdown(struct fi +@@ -179,7 +177,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, /* make sure it can fit in the remaining address space */ if (likely(addr > len)) { vma = find_vma(mm, addr-len); @@ -3570,7 +3898,7 @@ diff -urNp linux-2.6.38.7/arch/sh/mm/mmap.c linux-2.6.38.7/arch/sh/mm/mmap.c /* remember the address as a hint for next time */ return (mm->free_area_cache = addr-len); } -@@ -188,18 +186,18 @@ arch_get_unmapped_area_topdown(struct fi +@@ -188,18 +186,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, if (unlikely(mm->mmap_base < len)) goto bottomup; @@ -3593,7 +3921,7 @@ diff -urNp linux-2.6.38.7/arch/sh/mm/mmap.c linux-2.6.38.7/arch/sh/mm/mmap.c /* remember the address as a hint for next time */ return (mm->free_area_cache = addr); } -@@ -209,10 +207,8 @@ arch_get_unmapped_area_topdown(struct fi +@@ -209,10 +207,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, mm->cached_hole_size = vma->vm_start - addr; /* try just below the current vma->vm_start */ @@ -3606,9 +3934,23 @@ diff -urNp linux-2.6.38.7/arch/sh/mm/mmap.c linux-2.6.38.7/arch/sh/mm/mmap.c bottomup: /* -diff -urNp linux-2.6.38.7/arch/sparc/include/asm/atomic_64.h linux-2.6.38.7/arch/sparc/include/asm/atomic_64.h ---- linux-2.6.38.7/arch/sparc/include/asm/atomic_64.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/include/asm/atomic_64.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile +index 113225b..7fd04e7 100644 +--- a/arch/sparc/Makefile ++++ b/arch/sparc/Makefile +@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc/oprofile/ + # 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 --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h +index bdb2ff8..c00c51b 100644 +--- a/arch/sparc/include/asm/atomic_64.h ++++ b/arch/sparc/include/asm/atomic_64.h @@ -14,18 +14,40 @@ #define ATOMIC64_INIT(i) { (i) } @@ -3650,7 +3992,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/atomic_64.h linux-2.6.38.7/arch extern int atomic_sub_ret(int, atomic_t *); extern long atomic64_sub_ret(long, atomic64_t *); -@@ -33,12 +55,24 @@ extern long atomic64_sub_ret(long, atomi +@@ -33,12 +55,24 @@ extern long atomic64_sub_ret(long, atomic64_t *); #define atomic64_dec_return(v) atomic64_sub_ret(1, v) #define atomic_inc_return(v) atomic_add_ret(1, v) @@ -3675,7 +4017,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/atomic_64.h linux-2.6.38.7/arch #define atomic64_add_return(i, v) atomic64_add_ret(i, v) /* -@@ -50,6 +84,7 @@ extern long atomic64_sub_ret(long, atomi +@@ -50,6 +84,7 @@ extern long atomic64_sub_ret(long, atomic64_t *); * other cases. */ #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0) @@ -3683,7 +4025,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/atomic_64.h linux-2.6.38.7/arch #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0) #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0) -@@ -59,30 +94,59 @@ extern long atomic64_sub_ret(long, atomi +@@ -59,30 +94,59 @@ extern long atomic64_sub_ret(long, atomic64_t *); #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0) #define atomic_inc(v) atomic_add(1, v) @@ -3747,7 +4089,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/atomic_64.h linux-2.6.38.7/arch } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) -@@ -93,17 +157,28 @@ static inline int atomic_add_unless(atom +@@ -93,17 +157,28 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) static inline long atomic64_add_unless(atomic64_t *v, long a, long u) { @@ -3780,9 +4122,10 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/atomic_64.h linux-2.6.38.7/arch } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) -diff -urNp linux-2.6.38.7/arch/sparc/include/asm/cache.h linux-2.6.38.7/arch/sparc/include/asm/cache.h ---- linux-2.6.38.7/arch/sparc/include/asm/cache.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/include/asm/cache.h 2011-05-17 19:31:43.000000000 -0400 +diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h +index 69358b5..317982b 100644 +--- a/arch/sparc/include/asm/cache.h ++++ b/arch/sparc/include/asm/cache.h @@ -10,7 +10,7 @@ #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long) @@ -3792,10 +4135,11 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/cache.h linux-2.6.38.7/arch/spa #ifdef CONFIG_SPARC32 #define SMP_CACHE_BYTES_SHIFT 5 -diff -urNp linux-2.6.38.7/arch/sparc/include/asm/dma-mapping.h linux-2.6.38.7/arch/sparc/include/asm/dma-mapping.h ---- linux-2.6.38.7/arch/sparc/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/include/asm/dma-mapping.h 2011-04-28 19:34:14.000000000 -0400 -@@ -12,10 +12,10 @@ extern int dma_supported(struct device * +diff --git a/arch/sparc/include/asm/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h +index 8c0e4f7..4975d68 100644 +--- a/arch/sparc/include/asm/dma-mapping.h ++++ b/arch/sparc/include/asm/dma-mapping.h +@@ -12,10 +12,10 @@ extern int dma_supported(struct device *dev, u64 mask); #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) @@ -3808,7 +4152,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/dma-mapping.h linux-2.6.38.7/ar { #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI) if (dev->bus == &pci_bus_type) -@@ -29,7 +29,7 @@ static inline struct dma_map_ops *get_dm +@@ -29,7 +29,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) static inline void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag) { @@ -3817,7 +4161,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/dma-mapping.h linux-2.6.38.7/ar void *cpu_addr; cpu_addr = ops->alloc_coherent(dev, size, dma_handle, flag); -@@ -40,7 +40,7 @@ static inline void *dma_alloc_coherent(s +@@ -40,7 +40,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size, static inline void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr_t dma_handle) { @@ -3826,9 +4170,10 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/dma-mapping.h linux-2.6.38.7/ar debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); ops->free_coherent(dev, size, cpu_addr, dma_handle); -diff -urNp linux-2.6.38.7/arch/sparc/include/asm/elf_32.h linux-2.6.38.7/arch/sparc/include/asm/elf_32.h ---- linux-2.6.38.7/arch/sparc/include/asm/elf_32.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/include/asm/elf_32.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h +index 4269ca6..e3da77f 100644 +--- a/arch/sparc/include/asm/elf_32.h ++++ b/arch/sparc/include/asm/elf_32.h @@ -114,6 +114,13 @@ typedef struct { #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) @@ -3843,9 +4188,10 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/elf_32.h linux-2.6.38.7/arch/sp /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. This can NOT be done in userspace on Sparc. */ -diff -urNp linux-2.6.38.7/arch/sparc/include/asm/elf_64.h linux-2.6.38.7/arch/sparc/include/asm/elf_64.h ---- linux-2.6.38.7/arch/sparc/include/asm/elf_64.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/include/asm/elf_64.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h +index e678803..dfb3071 100644 +--- a/arch/sparc/include/asm/elf_64.h ++++ b/arch/sparc/include/asm/elf_64.h @@ -162,6 +162,12 @@ typedef struct { #define ELF_ET_DYN_BASE 0x0000010000000000UL #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL @@ -3859,9 +4205,10 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/elf_64.h linux-2.6.38.7/arch/sp /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. */ -diff -urNp linux-2.6.38.7/arch/sparc/include/asm/pgtable_32.h linux-2.6.38.7/arch/sparc/include/asm/pgtable_32.h ---- linux-2.6.38.7/arch/sparc/include/asm/pgtable_32.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/include/asm/pgtable_32.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h +index 303bd4d..341e34e 100644 +--- a/arch/sparc/include/asm/pgtable_32.h ++++ b/arch/sparc/include/asm/pgtable_32.h @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) BTFIXUPDEF_INT(page_none) BTFIXUPDEF_INT(page_copy) @@ -3893,9 +4240,10 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/pgtable_32.h linux-2.6.38.7/arc extern unsigned long page_kernel; #ifdef MODULE -diff -urNp linux-2.6.38.7/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.38.7/arch/sparc/include/asm/pgtsrmmu.h ---- linux-2.6.38.7/arch/sparc/include/asm/pgtsrmmu.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/include/asm/pgtsrmmu.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h +index 1407c07..7e10231 100644 +--- a/arch/sparc/include/asm/pgtsrmmu.h ++++ b/arch/sparc/include/asm/pgtsrmmu.h @@ -115,6 +115,13 @@ SRMMU_EXEC | SRMMU_REF) #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ @@ -3910,10 +4258,11 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.38.7/arch/ #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ SRMMU_DIRTY | SRMMU_REF) -diff -urNp linux-2.6.38.7/arch/sparc/include/asm/spinlock_64.h linux-2.6.38.7/arch/sparc/include/asm/spinlock_64.h ---- linux-2.6.38.7/arch/sparc/include/asm/spinlock_64.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/include/asm/spinlock_64.h 2011-04-28 19:57:25.000000000 -0400 -@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags( +diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h +index 073936a..8f11ced 100644 +--- a/arch/sparc/include/asm/spinlock_64.h ++++ b/arch/sparc/include/asm/spinlock_64.h +@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */ @@ -3935,7 +4284,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/spinlock_64.h linux-2.6.38.7/ar " cas [%2], %0, %1\n" " cmp %0, %1\n" " bne,pn %%icc, 1b\n" -@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_r +@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock) " .previous" : "=&r" (tmp1), "=&r" (tmp2) : "r" (lock) @@ -3948,7 +4297,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/spinlock_64.h linux-2.6.38.7/ar { int tmp1, tmp2; -@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch +@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock) "1: ldsw [%2], %0\n" " brlz,a,pn %0, 2f\n" " mov 0, %0\n" @@ -3962,7 +4311,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/spinlock_64.h linux-2.6.38.7/ar " cas [%2], %0, %1\n" " cmp %0, %1\n" " bne,pn %%icc, 1b\n" -@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch +@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock) return tmp1; } @@ -3983,7 +4332,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/spinlock_64.h linux-2.6.38.7/ar " cas [%2], %0, %1\n" " cmp %0, %1\n" " bne,pn %%xcc, 1b\n" -@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch +@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock) : "memory"); } @@ -3992,7 +4341,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/spinlock_64.h linux-2.6.38.7/ar { unsigned long mask, tmp1, tmp2; -@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_ +@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock) : "memory"); } @@ -4001,7 +4350,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/spinlock_64.h linux-2.6.38.7/ar { __asm__ __volatile__( " stw %%g0, [%0]" -@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arc +@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock) : "memory"); } @@ -4010,10 +4359,29 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/spinlock_64.h linux-2.6.38.7/ar { unsigned long mask, tmp1, tmp2, result; -diff -urNp linux-2.6.38.7/arch/sparc/include/asm/uaccess_32.h linux-2.6.38.7/arch/sparc/include/asm/uaccess_32.h ---- linux-2.6.38.7/arch/sparc/include/asm/uaccess_32.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/include/asm/uaccess_32.h 2011-04-28 19:34:14.000000000 -0400 -@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ +diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h +index e88fbe5..96b0ce5 100644 +--- a/arch/sparc/include/asm/uaccess.h ++++ b/arch/sparc/include/asm/uaccess.h +@@ -1,5 +1,13 @@ + #ifndef ___ASM_SPARC_UACCESS_H + #define ___ASM_SPARC_UACCESS_H ++ ++#ifdef __KERNEL__ ++#ifndef __ASSEMBLY__ ++#include <linux/types.h> ++extern void check_object_size(const void *ptr, unsigned long n, bool to); ++#endif ++#endif ++ + #if defined(__sparc__) && defined(__arch64__) + #include <asm/uaccess_64.h> + #else +diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h +index 8303ac4..07f333d 100644 +--- a/arch/sparc/include/asm/uaccess_32.h ++++ b/arch/sparc/include/asm/uaccess_32.h +@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) { @@ -4064,9 +4432,10 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/uaccess_32.h linux-2.6.38.7/arc return __copy_user((__force void __user *) to, from, n); } -diff -urNp linux-2.6.38.7/arch/sparc/include/asm/uaccess_64.h linux-2.6.38.7/arch/sparc/include/asm/uaccess_64.h ---- linux-2.6.38.7/arch/sparc/include/asm/uaccess_64.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/include/asm/uaccess_64.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h +index 3e1449f..5293a0e 100644 +--- a/arch/sparc/include/asm/uaccess_64.h ++++ b/arch/sparc/include/asm/uaccess_64.h @@ -10,6 +10,7 @@ #include <linux/compiler.h> #include <linux/string.h> @@ -4075,7 +4444,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/uaccess_64.h linux-2.6.38.7/arc #include <asm/asi.h> #include <asm/system.h> #include <asm/spitfire.h> -@@ -213,8 +214,15 @@ extern unsigned long copy_from_user_fixu +@@ -213,8 +214,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from, static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long size) { @@ -4092,7 +4461,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/uaccess_64.h linux-2.6.38.7/arc if (unlikely(ret)) ret = copy_from_user_fixup(to, from, size); -@@ -230,8 +238,15 @@ extern unsigned long copy_to_user_fixup( +@@ -230,8 +238,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from, static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long size) { @@ -4109,27 +4478,24 @@ diff -urNp linux-2.6.38.7/arch/sparc/include/asm/uaccess_64.h linux-2.6.38.7/arc if (unlikely(ret)) ret = copy_to_user_fixup(to, from, size); return ret; -diff -urNp linux-2.6.38.7/arch/sparc/include/asm/uaccess.h linux-2.6.38.7/arch/sparc/include/asm/uaccess.h ---- linux-2.6.38.7/arch/sparc/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/include/asm/uaccess.h 2011-04-28 19:34:14.000000000 -0400 -@@ -1,5 +1,13 @@ - #ifndef ___ASM_SPARC_UACCESS_H - #define ___ASM_SPARC_UACCESS_H -+ -+#ifdef __KERNEL__ -+#ifndef __ASSEMBLY__ -+#include <linux/types.h> -+extern void check_object_size(const void *ptr, unsigned long n, bool to); -+#endif -+#endif -+ - #if defined(__sparc__) && defined(__arch64__) - #include <asm/uaccess_64.h> - #else -diff -urNp linux-2.6.38.7/arch/sparc/kernel/iommu.c linux-2.6.38.7/arch/sparc/kernel/iommu.c ---- linux-2.6.38.7/arch/sparc/kernel/iommu.c 2011-04-22 19:20:59.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/kernel/iommu.c 2011-04-28 19:34:14.000000000 -0400 -@@ -824,7 +824,7 @@ static void dma_4u_sync_sg_for_cpu(struc +diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile +index 599398f..76db0f4 100644 +--- a/arch/sparc/kernel/Makefile ++++ b/arch/sparc/kernel/Makefile +@@ -3,7 +3,7 @@ + # + + asflags-y := -ansi +-ccflags-y := -Werror ++#ccflags-y := -Werror + + extra-y := head_$(BITS).o + extra-y += init_task.o +diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c +index 6f01e8c..13414a2 100644 +--- a/arch/sparc/kernel/iommu.c ++++ b/arch/sparc/kernel/iommu.c +@@ -824,7 +824,7 @@ static void dma_4u_sync_sg_for_cpu(struct device *dev, spin_unlock_irqrestore(&iommu->lock, flags); } @@ -4138,7 +4504,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/iommu.c linux-2.6.38.7/arch/sparc/ke .alloc_coherent = dma_4u_alloc_coherent, .free_coherent = dma_4u_free_coherent, .map_page = dma_4u_map_page, -@@ -835,7 +835,7 @@ static struct dma_map_ops sun4u_dma_ops +@@ -835,7 +835,7 @@ static struct dma_map_ops sun4u_dma_ops = { .sync_sg_for_cpu = dma_4u_sync_sg_for_cpu, }; @@ -4147,10 +4513,11 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/iommu.c linux-2.6.38.7/arch/sparc/ke EXPORT_SYMBOL(dma_ops); extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); -diff -urNp linux-2.6.38.7/arch/sparc/kernel/ioport.c linux-2.6.38.7/arch/sparc/kernel/ioport.c ---- linux-2.6.38.7/arch/sparc/kernel/ioport.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/kernel/ioport.c 2011-04-28 19:34:14.000000000 -0400 -@@ -397,7 +397,7 @@ static void sbus_sync_sg_for_device(stru +diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c +index 41f7e4e..95e7de3 100644 +--- a/arch/sparc/kernel/ioport.c ++++ b/arch/sparc/kernel/ioport.c +@@ -397,7 +397,7 @@ static void sbus_sync_sg_for_device(struct device *dev, struct scatterlist *sg, BUG(); } @@ -4168,7 +4535,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/ioport.c linux-2.6.38.7/arch/sparc/k EXPORT_SYMBOL(dma_ops); static int __init sparc_register_ioport(void) -@@ -645,7 +645,7 @@ static void pci32_sync_sg_for_device(str +@@ -645,7 +645,7 @@ static void pci32_sync_sg_for_device(struct device *device, struct scatterlist * } } @@ -4177,10 +4544,11 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/ioport.c linux-2.6.38.7/arch/sparc/k .alloc_coherent = pci32_alloc_coherent, .free_coherent = pci32_free_coherent, .map_page = pci32_map_page, -diff -urNp linux-2.6.38.7/arch/sparc/kernel/kgdb_32.c linux-2.6.38.7/arch/sparc/kernel/kgdb_32.c ---- linux-2.6.38.7/arch/sparc/kernel/kgdb_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/kernel/kgdb_32.c 2011-04-28 19:34:14.000000000 -0400 -@@ -164,7 +164,7 @@ void kgdb_arch_set_pc(struct pt_regs *re +diff --git a/arch/sparc/kernel/kgdb_32.c b/arch/sparc/kernel/kgdb_32.c +index 539243b..d61227d 100644 +--- a/arch/sparc/kernel/kgdb_32.c ++++ b/arch/sparc/kernel/kgdb_32.c +@@ -164,7 +164,7 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip) regs->npc = regs->pc + 4; } @@ -4189,10 +4557,11 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/kgdb_32.c linux-2.6.38.7/arch/sparc/ /* Breakpoint instruction: ta 0x7d */ .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, }; -diff -urNp linux-2.6.38.7/arch/sparc/kernel/kgdb_64.c linux-2.6.38.7/arch/sparc/kernel/kgdb_64.c ---- linux-2.6.38.7/arch/sparc/kernel/kgdb_64.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/kernel/kgdb_64.c 2011-04-28 19:34:14.000000000 -0400 -@@ -187,7 +187,7 @@ void kgdb_arch_set_pc(struct pt_regs *re +diff --git a/arch/sparc/kernel/kgdb_64.c b/arch/sparc/kernel/kgdb_64.c +index 768290a..d8a4286 100644 +--- a/arch/sparc/kernel/kgdb_64.c ++++ b/arch/sparc/kernel/kgdb_64.c +@@ -187,7 +187,7 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip) regs->tnpc = regs->tpc + 4; } @@ -4201,22 +4570,11 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/kgdb_64.c linux-2.6.38.7/arch/sparc/ /* Breakpoint instruction: ta 0x72 */ .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, }; -diff -urNp linux-2.6.38.7/arch/sparc/kernel/Makefile linux-2.6.38.7/arch/sparc/kernel/Makefile ---- linux-2.6.38.7/arch/sparc/kernel/Makefile 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/kernel/Makefile 2011-04-28 19:34: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.38.7/arch/sparc/kernel/pci_sun4v.c linux-2.6.38.7/arch/sparc/kernel/pci_sun4v.c ---- linux-2.6.38.7/arch/sparc/kernel/pci_sun4v.c 2011-04-22 19:20:59.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/kernel/pci_sun4v.c 2011-04-28 19:34:14.000000000 -0400 -@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic +diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c +index 859abfd..603dfe0 100644 +--- a/arch/sparc/kernel/pci_sun4v.c ++++ b/arch/sparc/kernel/pci_sun4v.c +@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct device *dev, struct scatterlist *sglist, spin_unlock_irqrestore(&iommu->lock, flags); } @@ -4225,9 +4583,10 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/pci_sun4v.c linux-2.6.38.7/arch/spar .alloc_coherent = dma_4v_alloc_coherent, .free_coherent = dma_4v_free_coherent, .map_page = dma_4v_map_page, -diff -urNp linux-2.6.38.7/arch/sparc/kernel/process_32.c linux-2.6.38.7/arch/sparc/kernel/process_32.c ---- linux-2.6.38.7/arch/sparc/kernel/process_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/kernel/process_32.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c +index 1752929..f4000bc 100644 +--- a/arch/sparc/kernel/process_32.c ++++ b/arch/sparc/kernel/process_32.c @@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp) rw->ins[4], rw->ins[5], rw->ins[6], @@ -4254,7 +4613,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/process_32.c linux-2.6.38.7/arch/spa printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3], -@@ -305,7 +305,7 @@ void show_stack(struct task_struct *tsk, +@@ -305,7 +305,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp) rw = (struct reg_window32 *) fp; pc = rw->ins[7]; printk("[%08lx : ", pc); @@ -4263,10 +4622,11 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/process_32.c linux-2.6.38.7/arch/spa fp = rw->ins[6]; } while (++count < 16); printk("\n"); -diff -urNp linux-2.6.38.7/arch/sparc/kernel/process_64.c linux-2.6.38.7/arch/sparc/kernel/process_64.c ---- linux-2.6.38.7/arch/sparc/kernel/process_64.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/kernel/process_64.c 2011-04-28 19:34:14.000000000 -0400 -@@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg +diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c +index c158a95..f041966 100644 +--- a/arch/sparc/kernel/process_64.c ++++ b/arch/sparc/kernel/process_64.c +@@ -180,14 +180,14 @@ static void show_regwindow(struct pt_regs *regs) printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n", rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]); if (regs->tstate & TSTATE_PRIV) @@ -4292,7 +4652,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/process_64.c linux-2.6.38.7/arch/spa show_regwindow(regs); show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]); } -@@ -285,7 +285,7 @@ void arch_trigger_all_cpu_backtrace(void +@@ -285,7 +285,7 @@ void arch_trigger_all_cpu_backtrace(void) ((tp && tp->task) ? tp->task->pid : -1)); if (gp->tstate & TSTATE_PRIV) { @@ -4301,10 +4661,11 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/process_64.c linux-2.6.38.7/arch/spa (void *) gp->tpc, (void *) gp->o7, (void *) gp->i7, -diff -urNp linux-2.6.38.7/arch/sparc/kernel/sys_sparc_32.c linux-2.6.38.7/arch/sparc/kernel/sys_sparc_32.c ---- linux-2.6.38.7/arch/sparc/kernel/sys_sparc_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/kernel/sys_sparc_32.c 2011-04-28 19:34:14.000000000 -0400 -@@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str +diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c +index 42b282f..28ce9f2 100644 +--- a/arch/sparc/kernel/sys_sparc_32.c ++++ b/arch/sparc/kernel/sys_sparc_32.c +@@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi if (ARCH_SUN4C && len > 0x20000000) return -ENOMEM; if (!addr) @@ -4313,7 +4674,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/sys_sparc_32.c linux-2.6.38.7/arch/s if (flags & MAP_SHARED) addr = COLOUR_ALIGN(addr); -@@ -71,7 +71,7 @@ unsigned long arch_get_unmapped_area(str +@@ -71,7 +71,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi } if (TASK_SIZE - PAGE_SIZE - len < addr) return -ENOMEM; @@ -4322,10 +4683,11 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/sys_sparc_32.c linux-2.6.38.7/arch/s return addr; addr = vmm->vm_end; if (flags & MAP_SHARED) -diff -urNp linux-2.6.38.7/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.7/arch/sparc/kernel/sys_sparc_64.c ---- linux-2.6.38.7/arch/sparc/kernel/sys_sparc_64.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/kernel/sys_sparc_64.c 2011-04-28 19:34:14.000000000 -0400 -@@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str +diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c +index f836f4e..42d165e 100644 +--- a/arch/sparc/kernel/sys_sparc_64.c ++++ b/arch/sparc/kernel/sys_sparc_64.c +@@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi /* We do not accept a shared mapping if it would violate * cache aliasing constraints. */ @@ -4334,7 +4696,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.7/arch/s ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1))) return -EINVAL; return addr; -@@ -139,6 +139,10 @@ unsigned long arch_get_unmapped_area(str +@@ -139,6 +139,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi if (filp || (flags & MAP_SHARED)) do_color_align = 1; @@ -4345,7 +4707,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.7/arch/s if (addr) { if (do_color_align) addr = COLOUR_ALIGN(addr, pgoff); -@@ -146,15 +150,14 @@ unsigned long arch_get_unmapped_area(str +@@ -146,15 +150,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi addr = PAGE_ALIGN(addr); vma = find_vma(mm, addr); @@ -4382,7 +4744,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.7/arch/s /* * Remember the place where we stopped the search: */ -@@ -215,7 +218,7 @@ arch_get_unmapped_area_topdown(struct fi +@@ -215,7 +218,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, /* We do not accept a shared mapping if it would violate * cache aliasing constraints. */ @@ -4391,7 +4753,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.7/arch/s ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1))) return -EINVAL; return addr; -@@ -236,8 +239,7 @@ arch_get_unmapped_area_topdown(struct fi +@@ -236,8 +239,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, addr = PAGE_ALIGN(addr); vma = find_vma(mm, addr); @@ -4401,7 +4763,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.7/arch/s return addr; } -@@ -258,7 +260,7 @@ arch_get_unmapped_area_topdown(struct fi +@@ -258,7 +260,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, /* make sure it can fit in the remaining address space */ if (likely(addr > len)) { vma = find_vma(mm, addr-len); @@ -4410,7 +4772,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.7/arch/s /* remember the address as a hint for next time */ return (mm->free_area_cache = addr-len); } -@@ -267,18 +269,18 @@ arch_get_unmapped_area_topdown(struct fi +@@ -267,18 +269,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, if (unlikely(mm->mmap_base < len)) goto bottomup; @@ -4433,7 +4795,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.7/arch/s /* remember the address as a hint for next time */ return (mm->free_area_cache = addr); } -@@ -288,10 +290,8 @@ arch_get_unmapped_area_topdown(struct fi +@@ -288,10 +290,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, mm->cached_hole_size = vma->vm_start - addr; /* try just below the current vma->vm_start */ @@ -4446,7 +4808,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.7/arch/s bottomup: /* -@@ -385,6 +385,12 @@ void arch_pick_mmap_layout(struct mm_str +@@ -385,6 +385,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm) gap == RLIM_INFINITY || sysctl_legacy_va_layout) { mm->mmap_base = TASK_UNMAPPED_BASE + random_factor; @@ -4459,7 +4821,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.7/arch/s mm->get_unmapped_area = arch_get_unmapped_area; mm->unmap_area = arch_unmap_area; } else { -@@ -397,6 +403,12 @@ void arch_pick_mmap_layout(struct mm_str +@@ -397,6 +403,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm) gap = (task_size / 6 * 5); mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor); @@ -4472,10 +4834,11 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.7/arch/s mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.38.7/arch/sparc/kernel/traps_32.c linux-2.6.38.7/arch/sparc/kernel/traps_32.c ---- linux-2.6.38.7/arch/sparc/kernel/traps_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/kernel/traps_32.c 2011-04-28 19:34:14.000000000 -0400 -@@ -76,7 +76,7 @@ void die_if_kernel(char *str, struct pt_ +diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c +index c0490c7..176085e 100644 +--- a/arch/sparc/kernel/traps_32.c ++++ b/arch/sparc/kernel/traps_32.c +@@ -76,7 +76,7 @@ void die_if_kernel(char *str, struct pt_regs *regs) count++ < 30 && (((unsigned long) rw) >= PAGE_OFFSET) && !(((unsigned long) rw) & 0x7)) { @@ -4484,10 +4847,11 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/traps_32.c linux-2.6.38.7/arch/sparc (void *) rw->ins[7]); rw = (struct reg_window32 *)rw->ins[6]; } -diff -urNp linux-2.6.38.7/arch/sparc/kernel/traps_64.c linux-2.6.38.7/arch/sparc/kernel/traps_64.c ---- linux-2.6.38.7/arch/sparc/kernel/traps_64.c 2011-04-22 19:20:59.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/kernel/traps_64.c 2011-04-28 19:34:14.000000000 -0400 -@@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_ +diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c +index 1ed547b..7681cd5 100644 +--- a/arch/sparc/kernel/traps_64.c ++++ b/arch/sparc/kernel/traps_64.c +@@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p) i + 1, p->trapstack[i].tstate, p->trapstack[i].tpc, p->trapstack[i].tnpc, p->trapstack[i].tt); @@ -4496,7 +4860,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/traps_64.c linux-2.6.38.7/arch/sparc } } -@@ -95,6 +95,12 @@ void bad_trap(struct pt_regs *regs, long +@@ -95,6 +95,12 @@ void bad_trap(struct pt_regs *regs, long lvl) lvl -= 0x100; if (regs->tstate & TSTATE_PRIV) { @@ -4509,7 +4873,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/traps_64.c linux-2.6.38.7/arch/sparc sprintf(buffer, "Kernel bad sw trap %lx", lvl); die_if_kernel(buffer, regs); } -@@ -113,11 +119,16 @@ void bad_trap(struct pt_regs *regs, long +@@ -113,11 +119,16 @@ void bad_trap(struct pt_regs *regs, long lvl) void bad_trap_tl1(struct pt_regs *regs, long lvl) { char buffer[32]; @@ -4527,7 +4891,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/traps_64.c linux-2.6.38.7/arch/sparc dump_tl1_traplog((struct tl1_traplog *)(regs + 1)); sprintf (buffer, "Bad trap %lx at tl>0", lvl); -@@ -1141,7 +1152,7 @@ static void cheetah_log_errors(struct pt +@@ -1141,7 +1152,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate); printk("%s" "ERROR(%d): ", (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id()); @@ -4536,7 +4900,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/traps_64.c linux-2.6.38.7/arch/sparc printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n", (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(), (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT, -@@ -1748,7 +1759,7 @@ void cheetah_plus_parity_error(int type, +@@ -1748,7 +1759,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs) smp_processor_id(), (type & 0x1) ? 'I' : 'D', regs->tpc); @@ -4545,7 +4909,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/traps_64.c linux-2.6.38.7/arch/sparc panic("Irrecoverable Cheetah+ parity error."); } -@@ -1756,7 +1767,7 @@ void cheetah_plus_parity_error(int type, +@@ -1756,7 +1767,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs) smp_processor_id(), (type & 0x1) ? 'I' : 'D', regs->tpc); @@ -4554,7 +4918,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/traps_64.c linux-2.6.38.7/arch/sparc } struct sun4v_error_entry { -@@ -1963,9 +1974,9 @@ void sun4v_itlb_error_report(struct pt_r +@@ -1963,9 +1974,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl) printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n", regs->tpc, tl); @@ -4566,7 +4930,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/traps_64.c linux-2.6.38.7/arch/sparc (void *) regs->u_regs[UREG_I7]); printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] " "pte[%lx] error[%lx]\n", -@@ -1987,9 +1998,9 @@ void sun4v_dtlb_error_report(struct pt_r +@@ -1987,9 +1998,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl) printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n", regs->tpc, tl); @@ -4578,7 +4942,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/traps_64.c linux-2.6.38.7/arch/sparc (void *) regs->u_regs[UREG_I7]); printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] " "pte[%lx] error[%lx]\n", -@@ -2195,13 +2206,13 @@ void show_stack(struct task_struct *tsk, +@@ -2195,13 +2206,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp) fp = (unsigned long)sf->fp + STACK_BIAS; } @@ -4594,7 +4958,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/traps_64.c linux-2.6.38.7/arch/sparc graph++; } } -@@ -2254,7 +2265,7 @@ void die_if_kernel(char *str, struct pt_ +@@ -2254,7 +2265,7 @@ void die_if_kernel(char *str, struct pt_regs *regs) while (rw && count++ < 30 && kstack_valid(tp, (unsigned long) rw)) { @@ -4603,10 +4967,11 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/traps_64.c linux-2.6.38.7/arch/sparc (void *) rw->ins[7]); rw = kernel_stack_up(rw); -diff -urNp linux-2.6.38.7/arch/sparc/kernel/unaligned_64.c linux-2.6.38.7/arch/sparc/kernel/unaligned_64.c ---- linux-2.6.38.7/arch/sparc/kernel/unaligned_64.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/kernel/unaligned_64.c 2011-04-28 19:34:14.000000000 -0400 -@@ -278,7 +278,7 @@ static void log_unaligned(struct pt_regs +diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c +index c752c4c..0a6b0c7 100644 +--- a/arch/sparc/kernel/unaligned_64.c ++++ b/arch/sparc/kernel/unaligned_64.c +@@ -278,7 +278,7 @@ static void log_unaligned(struct pt_regs *regs) static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5); if (__ratelimit(&ratelimit)) { @@ -4615,9 +4980,23 @@ diff -urNp linux-2.6.38.7/arch/sparc/kernel/unaligned_64.c linux-2.6.38.7/arch/s regs->tpc, (void *) regs->tpc); } } -diff -urNp linux-2.6.38.7/arch/sparc/lib/atomic_64.S linux-2.6.38.7/arch/sparc/lib/atomic_64.S ---- linux-2.6.38.7/arch/sparc/lib/atomic_64.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/lib/atomic_64.S 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile +index 846d1c4..613b871 100644 +--- a/arch/sparc/lib/Makefile ++++ b/arch/sparc/lib/Makefile +@@ -2,7 +2,7 @@ + # + + asflags-y := -ansi -DST_DIV0=0x02 +-ccflags-y := -Werror ++#ccflags-y := -Werror + + lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o + lib-$(CONFIG_SPARC32) += memcpy.o memset.o +diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S +index 59186e0..f747d7a 100644 +--- a/arch/sparc/lib/atomic_64.S ++++ b/arch/sparc/lib/atomic_64.S @@ -18,7 +18,12 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) @@ -4632,7 +5011,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/lib/atomic_64.S linux-2.6.38.7/arch/sparc/l cas [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %icc, BACKOFF_LABEL(2f, 1b) -@@ -28,12 +33,32 @@ atomic_add: /* %o0 = increment, %o1 = at +@@ -28,12 +33,32 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ 2: BACKOFF_SPIN(%o2, %o3, 1b) .size atomic_add, .-atomic_add @@ -4666,7 +5045,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/lib/atomic_64.S linux-2.6.38.7/arch/sparc/l cas [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %icc, BACKOFF_LABEL(2f, 1b) -@@ -43,12 +68,32 @@ atomic_sub: /* %o0 = decrement, %o1 = at +@@ -43,12 +68,32 @@ atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */ 2: BACKOFF_SPIN(%o2, %o3, 1b) .size atomic_sub, .-atomic_sub @@ -4700,7 +5079,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/lib/atomic_64.S linux-2.6.38.7/arch/sparc/l cas [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %icc, BACKOFF_LABEL(2f, 1b) -@@ -58,12 +103,33 @@ atomic_add_ret: /* %o0 = increment, %o1 +@@ -58,12 +103,33 @@ atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */ 2: BACKOFF_SPIN(%o2, %o3, 1b) .size atomic_add_ret, .-atomic_add_ret @@ -4735,7 +5114,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/lib/atomic_64.S linux-2.6.38.7/arch/sparc/l cas [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %icc, BACKOFF_LABEL(2f, 1b) -@@ -78,7 +144,12 @@ atomic_sub_ret: /* %o0 = decrement, %o1 +@@ -78,7 +144,12 @@ atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */ atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) 1: ldx [%o1], %g1 @@ -4749,7 +5128,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/lib/atomic_64.S linux-2.6.38.7/arch/sparc/l casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, BACKOFF_LABEL(2f, 1b) -@@ -88,12 +159,32 @@ atomic64_add: /* %o0 = increment, %o1 = +@@ -88,12 +159,32 @@ atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */ 2: BACKOFF_SPIN(%o2, %o3, 1b) .size atomic64_add, .-atomic64_add @@ -4783,7 +5162,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/lib/atomic_64.S linux-2.6.38.7/arch/sparc/l casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, BACKOFF_LABEL(2f, 1b) -@@ -103,12 +194,32 @@ atomic64_sub: /* %o0 = decrement, %o1 = +@@ -103,12 +194,32 @@ atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */ 2: BACKOFF_SPIN(%o2, %o3, 1b) .size atomic64_sub, .-atomic64_sub @@ -4817,7 +5196,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/lib/atomic_64.S linux-2.6.38.7/arch/sparc/l casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, BACKOFF_LABEL(2f, 1b) -@@ -118,12 +229,33 @@ atomic64_add_ret: /* %o0 = increment, %o +@@ -118,12 +229,33 @@ atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */ 2: BACKOFF_SPIN(%o2, %o3, 1b) .size atomic64_add_ret, .-atomic64_add_ret @@ -4852,9 +5231,10 @@ diff -urNp linux-2.6.38.7/arch/sparc/lib/atomic_64.S linux-2.6.38.7/arch/sparc/l casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, BACKOFF_LABEL(2f, 1b) -diff -urNp linux-2.6.38.7/arch/sparc/lib/ksyms.c linux-2.6.38.7/arch/sparc/lib/ksyms.c ---- linux-2.6.38.7/arch/sparc/lib/ksyms.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/lib/ksyms.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c +index 1b30bb3..ab5bb67 100644 +--- a/arch/sparc/lib/ksyms.c ++++ b/arch/sparc/lib/ksyms.c @@ -142,12 +142,17 @@ EXPORT_SYMBOL(__downgrade_write); /* Atomic counter implementation. */ @@ -4873,33 +5253,23 @@ diff -urNp linux-2.6.38.7/arch/sparc/lib/ksyms.c linux-2.6.38.7/arch/sparc/lib/k EXPORT_SYMBOL(atomic64_sub_ret); /* Atomic bit operations. */ -diff -urNp linux-2.6.38.7/arch/sparc/lib/Makefile linux-2.6.38.7/arch/sparc/lib/Makefile ---- linux-2.6.38.7/arch/sparc/lib/Makefile 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/lib/Makefile 2011-05-17 19:31:43.000000000 -0400 +diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile +index 79836a7..62f47a2 100644 +--- a/arch/sparc/mm/Makefile ++++ b/arch/sparc/mm/Makefile @@ -2,7 +2,7 @@ # - asflags-y := -ansi -DST_DIV0=0x02 + asflags-y := -ansi -ccflags-y := -Werror +#ccflags-y := -Werror - lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o - lib-$(CONFIG_SPARC32) += memcpy.o memset.o -diff -urNp linux-2.6.38.7/arch/sparc/Makefile linux-2.6.38.7/arch/sparc/Makefile ---- linux-2.6.38.7/arch/sparc/Makefile 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/Makefile 2011-04-28 19:34:14.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.38.7/arch/sparc/mm/fault_32.c linux-2.6.38.7/arch/sparc/mm/fault_32.c ---- linux-2.6.38.7/arch/sparc/mm/fault_32.c 2011-04-22 19:20:59.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/mm/fault_32.c 2011-04-28 19:34:14.000000000 -0400 + obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o + obj-y += fault_$(BITS).o +diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c +index b10ac4d..07c4cdc 100644 +--- a/arch/sparc/mm/fault_32.c ++++ b/arch/sparc/mm/fault_32.c @@ -22,6 +22,9 @@ #include <linux/interrupt.h> #include <linux/module.h> @@ -4910,7 +5280,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/mm/fault_32.c linux-2.6.38.7/arch/sparc/mm/ #include <asm/system.h> #include <asm/page.h> -@@ -209,6 +212,268 @@ static unsigned long compute_si_addr(str +@@ -209,6 +212,268 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault) return safe_compute_effective_address(regs, insn); } @@ -5204,9 +5574,10 @@ diff -urNp linux-2.6.38.7/arch/sparc/mm/fault_32.c linux-2.6.38.7/arch/sparc/mm/ /* Allow reads even for write-only mappings */ if(!(vma->vm_flags & (VM_READ | VM_EXEC))) goto bad_area; -diff -urNp linux-2.6.38.7/arch/sparc/mm/fault_64.c linux-2.6.38.7/arch/sparc/mm/fault_64.c ---- linux-2.6.38.7/arch/sparc/mm/fault_64.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/mm/fault_64.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c +index f92ce56..869924b 100644 +--- a/arch/sparc/mm/fault_64.c ++++ b/arch/sparc/mm/fault_64.c @@ -21,6 +21,9 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -5217,7 +5588,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/mm/fault_64.c linux-2.6.38.7/arch/sparc/mm/ #include <asm/page.h> #include <asm/pgtable.h> -@@ -74,7 +77,7 @@ static void __kprobes bad_kernel_pc(stru +@@ -74,7 +77,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr) printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n", regs->tpc); printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]); @@ -5226,7 +5597,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/mm/fault_64.c linux-2.6.38.7/arch/sparc/mm/ printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr); dump_stack(); unhandled_fault(regs->tpc, current, regs); -@@ -272,6 +275,457 @@ static void noinline __kprobes bogus_32b +@@ -272,6 +275,457 @@ static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs, show_regs(regs); } @@ -5684,7 +6055,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/mm/fault_64.c linux-2.6.38.7/arch/sparc/mm/ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs) { struct mm_struct *mm = current->mm; -@@ -340,6 +794,29 @@ asmlinkage void __kprobes do_sparc64_fau +@@ -340,6 +794,29 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs) if (!vma) goto bad_area; @@ -5714,9 +6085,10 @@ diff -urNp linux-2.6.38.7/arch/sparc/mm/fault_64.c linux-2.6.38.7/arch/sparc/mm/ /* Pure DTLB misses do not tell us whether the fault causing * load/store/atomic was a write or not, it only says that there * was no match. So in such a case we (carefully) read the -diff -urNp linux-2.6.38.7/arch/sparc/mm/hugetlbpage.c linux-2.6.38.7/arch/sparc/mm/hugetlbpage.c ---- linux-2.6.38.7/arch/sparc/mm/hugetlbpage.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/mm/hugetlbpage.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c +index f4e9764..5682724 100644 +--- a/arch/sparc/mm/hugetlbpage.c ++++ b/arch/sparc/mm/hugetlbpage.c @@ -68,7 +68,7 @@ full_search: } return -ENOMEM; @@ -5726,7 +6098,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/mm/hugetlbpage.c linux-2.6.38.7/arch/sparc/ /* * Remember the place where we stopped the search: */ -@@ -107,7 +107,7 @@ hugetlb_get_unmapped_area_topdown(struct +@@ -107,7 +107,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, /* make sure it can fit in the remaining address space */ if (likely(addr > len)) { vma = find_vma(mm, addr-len); @@ -5735,7 +6107,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/mm/hugetlbpage.c linux-2.6.38.7/arch/sparc/ /* remember the address as a hint for next time */ return (mm->free_area_cache = addr-len); } -@@ -116,16 +116,17 @@ hugetlb_get_unmapped_area_topdown(struct +@@ -116,16 +116,17 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, if (unlikely(mm->mmap_base < len)) goto bottomup; @@ -5755,7 +6127,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/mm/hugetlbpage.c linux-2.6.38.7/arch/sparc/ /* remember the address as a hint for next time */ return (mm->free_area_cache = addr); } -@@ -135,8 +136,8 @@ hugetlb_get_unmapped_area_topdown(struct +@@ -135,8 +136,8 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, mm->cached_hole_size = vma->vm_start - addr; /* try just below the current vma->vm_start */ @@ -5766,7 +6138,7 @@ diff -urNp linux-2.6.38.7/arch/sparc/mm/hugetlbpage.c linux-2.6.38.7/arch/sparc/ bottomup: /* -@@ -182,8 +183,7 @@ hugetlb_get_unmapped_area(struct file *f +@@ -182,8 +183,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, if (addr) { addr = ALIGN(addr, HPAGE_SIZE); vma = find_vma(mm, addr); @@ -5776,9 +6148,10 @@ diff -urNp linux-2.6.38.7/arch/sparc/mm/hugetlbpage.c linux-2.6.38.7/arch/sparc/ return addr; } if (mm->get_unmapped_area == arch_get_unmapped_area) -diff -urNp linux-2.6.38.7/arch/sparc/mm/init_32.c linux-2.6.38.7/arch/sparc/mm/init_32.c ---- linux-2.6.38.7/arch/sparc/mm/init_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/mm/init_32.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c +index 6d0e02c..c0b5fa7 100644 +--- a/arch/sparc/mm/init_32.c ++++ b/arch/sparc/mm/init_32.c @@ -318,6 +318,9 @@ extern void device_scan(void); pgprot_t PAGE_SHARED __read_mostly; EXPORT_SYMBOL(PAGE_SHARED); @@ -5813,21 +6186,10 @@ diff -urNp linux-2.6.38.7/arch/sparc/mm/init_32.c linux-2.6.38.7/arch/sparc/mm/i protection_map[12] = PAGE_READONLY; protection_map[13] = PAGE_READONLY; protection_map[14] = PAGE_SHARED; -diff -urNp linux-2.6.38.7/arch/sparc/mm/Makefile linux-2.6.38.7/arch/sparc/mm/Makefile ---- linux-2.6.38.7/arch/sparc/mm/Makefile 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/mm/Makefile 2011-04-28 19:34: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.38.7/arch/sparc/mm/srmmu.c linux-2.6.38.7/arch/sparc/mm/srmmu.c ---- linux-2.6.38.7/arch/sparc/mm/srmmu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/sparc/mm/srmmu.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c +index 92319aa..7022f70 100644 +--- a/arch/sparc/mm/srmmu.c ++++ b/arch/sparc/mm/srmmu.c @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); @@ -5842,9 +6204,10 @@ diff -urNp linux-2.6.38.7/arch/sparc/mm/srmmu.c linux-2.6.38.7/arch/sparc/mm/srm BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); -diff -urNp linux-2.6.38.7/arch/um/include/asm/kmap_types.h linux-2.6.38.7/arch/um/include/asm/kmap_types.h ---- linux-2.6.38.7/arch/um/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/um/include/asm/kmap_types.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h +index 6c03acd..a5e0215 100644 +--- a/arch/um/include/asm/kmap_types.h ++++ b/arch/um/include/asm/kmap_types.h @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -5853,9 +6216,10 @@ diff -urNp linux-2.6.38.7/arch/um/include/asm/kmap_types.h linux-2.6.38.7/arch/u KM_TYPE_NR }; -diff -urNp linux-2.6.38.7/arch/um/include/asm/page.h linux-2.6.38.7/arch/um/include/asm/page.h ---- linux-2.6.38.7/arch/um/include/asm/page.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/um/include/asm/page.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h +index 4cc9b6c..02e5029 100644 +--- a/arch/um/include/asm/page.h ++++ b/arch/um/include/asm/page.h @@ -14,6 +14,9 @@ #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) @@ -5866,9 +6230,10 @@ diff -urNp linux-2.6.38.7/arch/um/include/asm/page.h linux-2.6.38.7/arch/um/incl #ifndef __ASSEMBLY__ struct page; -diff -urNp linux-2.6.38.7/arch/um/kernel/process.c linux-2.6.38.7/arch/um/kernel/process.c ---- linux-2.6.38.7/arch/um/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/um/kernel/process.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c +index fab4371..dfaf1a5 100644 +--- a/arch/um/kernel/process.c ++++ b/arch/um/kernel/process.c @@ -404,22 +404,6 @@ int singlestepping(void * t) return 2; } @@ -5892,9 +6257,10 @@ diff -urNp linux-2.6.38.7/arch/um/kernel/process.c linux-2.6.38.7/arch/um/kernel unsigned long get_wchan(struct task_struct *p) { unsigned long stack_page, sp, ip; -diff -urNp linux-2.6.38.7/arch/um/sys-i386/syscalls.c linux-2.6.38.7/arch/um/sys-i386/syscalls.c ---- linux-2.6.38.7/arch/um/sys-i386/syscalls.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/um/sys-i386/syscalls.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/um/sys-i386/syscalls.c b/arch/um/sys-i386/syscalls.c +index 70ca357..728d1cc 100644 +--- a/arch/um/sys-i386/syscalls.c ++++ b/arch/um/sys-i386/syscalls.c @@ -11,6 +11,21 @@ #include "asm/uaccess.h" #include "asm/unistd.h" @@ -5917,10 +6283,166 @@ diff -urNp linux-2.6.38.7/arch/um/sys-i386/syscalls.c linux-2.6.38.7/arch/um/sys /* * The prototype on i386 is: * -diff -urNp linux-2.6.38.7/arch/x86/boot/bitops.h linux-2.6.38.7/arch/x86/boot/bitops.h ---- linux-2.6.38.7/arch/x86/boot/bitops.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/boot/bitops.h 2011-04-28 19:34:14.000000000 -0400 -@@ -26,7 +26,7 @@ static inline int variable_test_bit(int +diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig +index d5ed94d..9779d57 100644 +--- a/arch/x86/Kconfig ++++ b/arch/x86/Kconfig +@@ -223,7 +223,7 @@ config X86_TRAMPOLINE + + config X86_32_LAZY_GS + def_bool y +- depends on X86_32 && !CC_STACKPROTECTOR ++ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF + + config ARCH_HWEIGHT_CFLAGS + string +@@ -1019,7 +1019,7 @@ choice + + config NOHIGHMEM + bool "off" +- depends on !X86_NUMAQ ++ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE) + ---help--- + Linux can use up to 64 Gigabytes of physical memory on x86 systems. + However, the address space of 32-bit x86 processors is only 4 +@@ -1056,7 +1056,7 @@ config NOHIGHMEM + + config HIGHMEM4G + bool "4GB" +- depends on !X86_NUMAQ ++ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE) + ---help--- + Select this if you have a 32-bit processor and between 1 and 4 + gigabytes of physical RAM. +@@ -1110,7 +1110,7 @@ config PAGE_OFFSET + 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 +@@ -1454,7 +1454,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). +@@ -1484,6 +1484,7 @@ config SECCOMP + + config CC_STACKPROTECTOR + bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" ++ depends on X86_64 || !PAX_MEMORY_UDEREF + ---help--- + This option turns on the -fstack-protector GCC feature. This + feature puts, at the beginning of functions, a canary value on +@@ -1541,6 +1542,7 @@ config KEXEC_JUMP + config PHYSICAL_START + hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP) + default "0x1000000" ++ range 0x400000 0x40000000 + ---help--- + This gives the physical address where the kernel is loaded. + +@@ -1604,6 +1606,7 @@ config X86_NEED_RELOCS + config PHYSICAL_ALIGN + hex "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 +@@ -1635,9 +1638,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 --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu +index 283c5a6..8fc0772 100644 +--- a/arch/x86/Kconfig.cpu ++++ b/arch/x86/Kconfig.cpu +@@ -339,7 +339,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_INVD_BUG + def_bool y +@@ -363,7 +363,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 +@@ -409,7 +409,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 --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug +index 615e188..0d1fa9d 100644 +--- a/arch/x86/Kconfig.debug ++++ b/arch/x86/Kconfig.debug +@@ -101,7 +101,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 +@@ -119,7 +119,7 @@ config DEBUG_RODATA_TEST + + config DEBUG_SET_MODULE_RONX + bool "Set loadable kernel module data as NX and text as RO" +- depends on MODULES ++ depends on MODULES && BROKEN + ---help--- + This option helps catch unintended modifications to loadable + kernel module's text and read-only data. It also prevents execution +diff --git a/arch/x86/Makefile b/arch/x86/Makefile +index b02e509..25a1f43 100644 +--- a/arch/x86/Makefile ++++ b/arch/x86/Makefile +@@ -195,3 +195,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 --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h +index 878e4b9..20537ab 100644 +--- a/arch/x86/boot/bitops.h ++++ b/arch/x86/boot/bitops.h +@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr) u8 v; const u32 *p = (const u32 *)addr; @@ -5929,7 +6451,7 @@ diff -urNp linux-2.6.38.7/arch/x86/boot/bitops.h linux-2.6.38.7/arch/x86/boot/bi return v; } -@@ -37,7 +37,7 @@ static inline int variable_test_bit(int +@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr) static inline void set_bit(int nr, void *addr) { @@ -5938,9 +6460,10 @@ diff -urNp linux-2.6.38.7/arch/x86/boot/bitops.h linux-2.6.38.7/arch/x86/boot/bi } #endif /* BOOT_BITOPS_H */ -diff -urNp linux-2.6.38.7/arch/x86/boot/boot.h linux-2.6.38.7/arch/x86/boot/boot.h ---- linux-2.6.38.7/arch/x86/boot/boot.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/boot/boot.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h +index c7093bd..d4247ffe0 100644 +--- a/arch/x86/boot/boot.h ++++ b/arch/x86/boot/boot.h @@ -85,7 +85,7 @@ static inline void io_delay(void) static inline u16 ds(void) { @@ -5950,7 +6473,7 @@ diff -urNp linux-2.6.38.7/arch/x86/boot/boot.h linux-2.6.38.7/arch/x86/boot/boot return seg; } -@@ -181,7 +181,7 @@ static inline void wrgs32(u32 v, addr_t +@@ -181,7 +181,7 @@ static inline void wrgs32(u32 v, addr_t addr) static inline int memcmp(const void *s1, const void *s2, size_t len) { u8 diff; @@ -5959,9 +6482,10 @@ diff -urNp linux-2.6.38.7/arch/x86/boot/boot.h linux-2.6.38.7/arch/x86/boot/boot : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); return diff; } -diff -urNp linux-2.6.38.7/arch/x86/boot/compressed/head_32.S linux-2.6.38.7/arch/x86/boot/compressed/head_32.S ---- linux-2.6.38.7/arch/x86/boot/compressed/head_32.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/boot/compressed/head_32.S 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S +index 67a655a..b924059 100644 +--- a/arch/x86/boot/compressed/head_32.S ++++ b/arch/x86/boot/compressed/head_32.S @@ -76,7 +76,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -5990,9 +6514,10 @@ diff -urNp linux-2.6.38.7/arch/x86/boot/compressed/head_32.S linux-2.6.38.7/arch addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) jmp 1b 2: -diff -urNp linux-2.6.38.7/arch/x86/boot/compressed/head_64.S linux-2.6.38.7/arch/x86/boot/compressed/head_64.S ---- linux-2.6.38.7/arch/x86/boot/compressed/head_64.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/boot/compressed/head_64.S 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S +index 35af09d..99c9676 100644 +--- a/arch/x86/boot/compressed/head_64.S ++++ b/arch/x86/boot/compressed/head_64.S @@ -91,7 +91,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -6011,9 +6536,10 @@ diff -urNp linux-2.6.38.7/arch/x86/boot/compressed/head_64.S linux-2.6.38.7/arch #endif /* Target address to relocate to for decompression */ -diff -urNp linux-2.6.38.7/arch/x86/boot/compressed/misc.c linux-2.6.38.7/arch/x86/boot/compressed/misc.c ---- linux-2.6.38.7/arch/x86/boot/compressed/misc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/boot/compressed/misc.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c +index 3a19d04..7c1d55a 100644 +--- a/arch/x86/boot/compressed/misc.c ++++ b/arch/x86/boot/compressed/misc.c @@ -310,7 +310,7 @@ static void parse_elf(void *output) case PT_LOAD: #ifdef CONFIG_RELOCATABLE @@ -6023,7 +6549,7 @@ diff -urNp linux-2.6.38.7/arch/x86/boot/compressed/misc.c linux-2.6.38.7/arch/x8 #else dest = (void *)(phdr->p_paddr); #endif -@@ -363,7 +363,7 @@ asmlinkage void decompress_kernel(void * +@@ -363,7 +363,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap, error("Destination address too large"); #endif #ifndef CONFIG_RELOCATABLE @@ -6032,9 +6558,10 @@ diff -urNp linux-2.6.38.7/arch/x86/boot/compressed/misc.c linux-2.6.38.7/arch/x8 error("Wrong destination address"); #endif -diff -urNp linux-2.6.38.7/arch/x86/boot/compressed/relocs.c linux-2.6.38.7/arch/x86/boot/compressed/relocs.c ---- linux-2.6.38.7/arch/x86/boot/compressed/relocs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/boot/compressed/relocs.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c +index 89bbf4e..869908e 100644 +--- a/arch/x86/boot/compressed/relocs.c ++++ b/arch/x86/boot/compressed/relocs.c @@ -13,8 +13,11 @@ static void die(char *fmt, ...); @@ -6187,7 +6714,7 @@ diff -urNp linux-2.6.38.7/arch/x86/boot/compressed/relocs.c linux-2.6.38.7/arch/ struct section *sec = &secs[i]; if (sec->shdr.sh_type != SHT_REL) { -@@ -530,6 +574,22 @@ static void walk_relocs(void (*visit)(El +@@ -530,6 +574,22 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym)) !is_rel_reloc(sym_name(sym_strtab, sym))) { continue; } @@ -6210,7 +6737,7 @@ diff -urNp linux-2.6.38.7/arch/x86/boot/compressed/relocs.c linux-2.6.38.7/arch/ switch (r_type) { case R_386_NONE: case R_386_PC32: -@@ -571,7 +631,7 @@ static int cmp_relocs(const void *va, co +@@ -571,7 +631,7 @@ static int cmp_relocs(const void *va, const void *vb) static void emit_relocs(int as_text) { @@ -6227,9 +6754,10 @@ diff -urNp linux-2.6.38.7/arch/x86/boot/compressed/relocs.c linux-2.6.38.7/arch/ read_shdrs(fp); read_strtabs(fp); read_symtabs(fp); -diff -urNp linux-2.6.38.7/arch/x86/boot/cpucheck.c linux-2.6.38.7/arch/x86/boot/cpucheck.c ---- linux-2.6.38.7/arch/x86/boot/cpucheck.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/boot/cpucheck.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c +index 4d3ff03..e4972ff 100644 +--- a/arch/x86/boot/cpucheck.c ++++ b/arch/x86/boot/cpucheck.c @@ -74,7 +74,7 @@ static int has_fpu(void) u16 fcw = -1, fsw = -1; u32 cr0; @@ -6284,7 +6812,7 @@ diff -urNp linux-2.6.38.7/arch/x86/boot/cpucheck.c linux-2.6.38.7/arch/x86/boot/ : "+a" (eax), "=c" (cpu.flags[6]), "=d" (cpu.flags[1]) -@@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *r +@@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr) u32 ecx = MSR_K7_HWCR; u32 eax, edx; @@ -6296,7 +6824,7 @@ diff -urNp linux-2.6.38.7/arch/x86/boot/cpucheck.c linux-2.6.38.7/arch/x86/boot/ get_flags(); /* Make sure it really did something */ err = check_flags(); -@@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *r +@@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr) u32 ecx = MSR_VIA_FCR; u32 eax, edx; @@ -6308,7 +6836,7 @@ diff -urNp linux-2.6.38.7/arch/x86/boot/cpucheck.c linux-2.6.38.7/arch/x86/boot/ set_bit(X86_FEATURE_CX8, cpu.flags); err = check_flags(); -@@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *r +@@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr) u32 eax, edx; u32 level = 1; @@ -6325,10 +6853,11 @@ diff -urNp linux-2.6.38.7/arch/x86/boot/cpucheck.c linux-2.6.38.7/arch/x86/boot/ err = check_flags(); } -diff -urNp linux-2.6.38.7/arch/x86/boot/header.S linux-2.6.38.7/arch/x86/boot/header.S ---- linux-2.6.38.7/arch/x86/boot/header.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/boot/header.S 2011-04-28 19:34:14.000000000 -0400 -@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical +diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S +index 93e689f..504ba09 100644 +--- a/arch/x86/boot/header.S ++++ b/arch/x86/boot/header.S +@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical pointer to # single linked list of # struct setup_data @@ -6337,9 +6866,10 @@ diff -urNp linux-2.6.38.7/arch/x86/boot/header.S linux-2.6.38.7/arch/x86/boot/he #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) #define VO_INIT_SIZE (VO__end - VO__text) -diff -urNp linux-2.6.38.7/arch/x86/boot/memory.c linux-2.6.38.7/arch/x86/boot/memory.c ---- linux-2.6.38.7/arch/x86/boot/memory.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/boot/memory.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c +index cae3feb..ff8ff2a 100644 +--- a/arch/x86/boot/memory.c ++++ b/arch/x86/boot/memory.c @@ -19,7 +19,7 @@ static int detect_memory_e820(void) @@ -6349,9 +6879,22 @@ diff -urNp linux-2.6.38.7/arch/x86/boot/memory.c linux-2.6.38.7/arch/x86/boot/me struct biosregs ireg, oreg; struct e820entry *desc = boot_params.e820_map; static struct e820entry buf; /* static so it is zeroed */ -diff -urNp linux-2.6.38.7/arch/x86/boot/video.c linux-2.6.38.7/arch/x86/boot/video.c ---- linux-2.6.38.7/arch/x86/boot/video.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/boot/video.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c +index 11e8c6e..fdbb1ed 100644 +--- a/arch/x86/boot/video-vesa.c ++++ b/arch/x86/boot/video-vesa.c +@@ -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 --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c +index 43eda28..5ab5fdb 100644 +--- a/arch/x86/boot/video.c ++++ b/arch/x86/boot/video.c @@ -96,7 +96,7 @@ static void store_mode_params(void) static unsigned int get_entry(void) { @@ -6361,21 +6904,11 @@ diff -urNp linux-2.6.38.7/arch/x86/boot/video.c linux-2.6.38.7/arch/x86/boot/vid int key; unsigned int v; -diff -urNp linux-2.6.38.7/arch/x86/boot/video-vesa.c linux-2.6.38.7/arch/x86/boot/video-vesa.c ---- linux-2.6.38.7/arch/x86/boot/video-vesa.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/boot/video-vesa.c 2011-04-28 19:34: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.38.7/arch/x86/ia32/ia32_aout.c linux-2.6.38.7/arch/x86/ia32/ia32_aout.c ---- linux-2.6.38.7/arch/x86/ia32/ia32_aout.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/ia32/ia32_aout.c 2011-04-28 19:34:14.000000000 -0400 -@@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st +diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c +index 2d93bdb..16e4817 100644 +--- a/arch/x86/ia32/ia32_aout.c ++++ b/arch/x86/ia32/ia32_aout.c +@@ -162,6 +162,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file, unsigned long dump_start, dump_size; struct user32 dump; @@ -6384,9 +6917,63 @@ diff -urNp linux-2.6.38.7/arch/x86/ia32/ia32_aout.c linux-2.6.38.7/arch/x86/ia32 fs = get_fs(); set_fs(KERNEL_DS); has_dumped = 1; -diff -urNp linux-2.6.38.7/arch/x86/ia32/ia32entry.S linux-2.6.38.7/arch/x86/ia32/ia32entry.S ---- linux-2.6.38.7/arch/x86/ia32/ia32entry.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/ia32/ia32entry.S 2011-05-22 23:15:39.000000000 -0400 +diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c +index 588a7aa..663dc7d 100644 +--- a/arch/x86/ia32/ia32_signal.c ++++ b/arch/x86/ia32/ia32_signal.c +@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, + 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; + } + +@@ -461,7 +461,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka, + * These are actually not used anymore, but left because some + * gdb versions depend on them as a marker. + */ +- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode); ++ put_user_ex(*((const u64 *)&code), (u64 *)frame->retcode); + } put_user_catch(err); + + if (err) +@@ -503,7 +503,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, + 0xb8, + __NR_ia32_rt_sigreturn, + 0x80cd, +- 0, ++ 0 + }; + + frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); +@@ -533,16 +533,18 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, + + if (ka->sa.sa_flags & SA_RESTORER) + restorer = ka->sa.sa_restorer; ++ else if (current->mm->context.vdso) ++ /* Return stub is in 32bit vsyscall page */ ++ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); + else +- restorer = VDSO32_SYMBOL(current->mm->context.vdso, +- rt_sigreturn); ++ restorer = &frame->retcode; + put_user_ex(ptr_to_compat(restorer), &frame->pretcode); + + /* + * Not actually used anymore, but left because some gdb + * versions need it. + */ +- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode); ++ put_user_ex(*((const u64 *)&code), (u64 *)frame->retcode); + } put_user_catch(err); + + if (err) +diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S +index 518bb99..e0c51d5 100644 +--- a/arch/x86/ia32/ia32entry.S ++++ b/arch/x86/ia32/ia32entry.S @@ -13,6 +13,7 @@ #include <asm/thread_info.h> #include <asm/segment.h> @@ -6554,7 +7141,7 @@ diff -urNp linux-2.6.38.7/arch/x86/ia32/ia32entry.S linux-2.6.38.7/arch/x86/ia32 /* * No need to follow this irqs on/off section: the syscall * disabled irqs and here we enable it straight after entry: -@@ -448,6 +505,9 @@ ia32_tracesys: +@@ -448,6 +505,9 @@ ia32_tracesys: movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */ movq %rsp,%rdi /* &pt_regs -> arg1 */ call syscall_trace_enter @@ -6564,62 +7151,11 @@ diff -urNp linux-2.6.38.7/arch/x86/ia32/ia32entry.S linux-2.6.38.7/arch/x86/ia32 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */ RESTORE_REST cmpq $(IA32_NR_syscalls-1),%rax -diff -urNp linux-2.6.38.7/arch/x86/ia32/ia32_signal.c linux-2.6.38.7/arch/x86/ia32/ia32_signal.c ---- linux-2.6.38.7/arch/x86/ia32/ia32_signal.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/ia32/ia32_signal.c 2011-04-28 19:34: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; - } - -@@ -461,7 +461,7 @@ int ia32_setup_frame(int sig, struct k_s - * These are actually not used anymore, but left because some - * gdb versions depend on them as a marker. - */ -- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode); -+ put_user_ex(*((const u64 *)&code), (u64 *)frame->retcode); - } put_user_catch(err); - - if (err) -@@ -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); -@@ -533,16 +533,18 @@ int ia32_setup_rt_frame(int sig, struct - - if (ka->sa.sa_flags & SA_RESTORER) - restorer = ka->sa.sa_restorer; -+ else if (current->mm->context.vdso) -+ /* Return stub is in 32bit vsyscall page */ -+ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); - else -- restorer = VDSO32_SYMBOL(current->mm->context.vdso, -- rt_sigreturn); -+ restorer = &frame->retcode; - put_user_ex(ptr_to_compat(restorer), &frame->pretcode); - - /* - * Not actually used anymore, but left because some gdb - * versions need it. - */ -- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode); -+ put_user_ex(*((const u64 *)&code), (u64 *)frame->retcode); - } put_user_catch(err); - - if (err) -diff -urNp linux-2.6.38.7/arch/x86/include/asm/alternative.h linux-2.6.38.7/arch/x86/include/asm/alternative.h ---- linux-2.6.38.7/arch/x86/include/asm/alternative.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/alternative.h 2011-04-28 19:34:14.000000000 -0400 -@@ -94,7 +94,7 @@ static inline int alternatives_text_rese +diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h +index 13009d1..0c84f92 100644 +--- a/arch/x86/include/asm/alternative.h ++++ b/arch/x86/include/asm/alternative.h +@@ -94,7 +94,7 @@ static inline int alternatives_text_reserved(void *start, void *end) ".section .discard,\"aw\",@progbits\n" \ " .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \ ".previous\n" \ @@ -6628,10 +7164,11 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/alternative.h linux-2.6.38.7/arch "663:\n\t" newinstr "\n664:\n" /* replacement */ \ ".previous" -diff -urNp linux-2.6.38.7/arch/x86/include/asm/apm.h linux-2.6.38.7/arch/x86/include/asm/apm.h ---- linux-2.6.38.7/arch/x86/include/asm/apm.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/apm.h 2011-04-28 19:34:14.000000000 -0400 -@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 +diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h +index 20370c6..a2eb9b0 100644 +--- a/arch/x86/include/asm/apm.h ++++ b/arch/x86/include/asm/apm.h +@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in, __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" "pushl %%ebp\n\t" @@ -6640,7 +7177,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/apm.h linux-2.6.38.7/arch/x86/inc "setc %%al\n\t" "popl %%ebp\n\t" "popl %%edi\n\t" -@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_as +@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in, __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" "pushl %%ebp\n\t" @@ -6649,9 +7186,426 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/apm.h linux-2.6.38.7/arch/x86/inc "setc %%bl\n\t" "popl %%ebp\n\t" "popl %%edi\n\t" -diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_32.h linux-2.6.38.7/arch/x86/include/asm/atomic64_32.h ---- linux-2.6.38.7/arch/x86/include/asm/atomic64_32.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/atomic64_32.h 2011-05-11 18:35:16.000000000 -0400 +diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h +index 952a826..8a9371d 100644 +--- a/arch/x86/include/asm/atomic.h ++++ b/arch/x86/include/asm/atomic.h +@@ -22,7 +22,18 @@ + */ + static inline int atomic_read(const atomic_t *v) + { +- return (*(volatile int *)&(v)->counter); ++ return (*(volatile const int *)&(v)->counter); ++} ++ ++/** ++ * 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 (*(volatile const int *)&(v)->counter); + } + + /** +@@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t *v, int i) + } + + /** ++ * 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 *v, int i) + */ + 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" ++ "int $4\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, atomic_t *v) + */ + 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" ++ "int $4\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_unchecked_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(int i, atomic_t *v) + { + 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" ++ "int $4\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(int i, atomic_t *v) + */ + 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" ++ "int $4\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 *v) + */ + 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" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "+m" (v->counter)); ++} ++ ++/** ++ * atomic_dec_unchecked - decrement atomic variable ++ * @v: pointer of type atomic_unchecked_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(atomic_t *v) + { + 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" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sete %1\n" + : "+m" (v->counter), "=qm" (c) + : : "memory"); + return c != 0; +@@ -138,7 +263,35 @@ static inline int atomic_inc_and_test(atomic_t *v) + { + 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" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sete %1\n" ++ : "+m" (v->counter), "=qm" (c) ++ : : "memory"); ++ return c != 0; ++} ++ ++/** ++ * atomic_inc_and_test_unchecked - increment and test ++ * @v: pointer of type atomic_unchecked_t ++ * ++ * Atomically increments @v by 1 ++ * and returns true if the result is zero, or false for all ++ * other cases. ++ */ ++static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v) ++{ ++ unsigned char c; ++ ++ asm volatile(LOCK_PREFIX "incl %0\n" ++ "sete %1\n" + : "+m" (v->counter), "=qm" (c) + : : "memory"); + return c != 0; +@@ -157,7 +310,16 @@ static inline int atomic_add_negative(int i, atomic_t *v) + { + 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" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sets %1\n" + : "+m" (v->counter), "=qm" (c) + : "ir" (i) : "memory"); + return c; +@@ -180,6 +342,46 @@ static inline int atomic_add_return(int i, atomic_t *v) + #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" ++ "int $4\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 +410,10 @@ static inline int atomic_sub_return(int i, atomic_t *v) + } + + #define atomic_inc_return(v) (atomic_add_return(1, v)) ++static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v) ++{ ++ return 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) +@@ -215,11 +421,21 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new) + return cmpxchg(&v->counter, old, new); + } + ++static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new) ++{ ++ return cmpxchg(&v->counter, old, new); ++} ++ + static inline int atomic_xchg(atomic_t *v, int new) + { + return xchg(&v->counter, new); + } + ++static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new) ++{ ++ return xchg(&v->counter, new); ++} ++ + /** + * atomic_add_unless - add unless the number is already a given value + * @v: pointer of type atomic_t +@@ -231,21 +447,77 @@ static inline int atomic_xchg(atomic_t *v, int new) + */ + 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" ++ "subl %2,%0\n" ++ "int $4\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) + ++/** ++ * atomic_inc_not_zero_hint - increment if not null ++ * @v: pointer of type atomic_t ++ * @hint: probable value of the atomic before the increment ++ * ++ * This version of atomic_inc_not_zero() gives a hint of probable ++ * value of the atomic. This helps processor to not read the memory ++ * before doing the atomic read/modify/write cycle, lowering ++ * number of bus transactions on some arches. ++ * ++ * Returns: 0 if increment was not done, 1 otherwise. ++ */ ++#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint ++static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint) ++{ ++ int val, c = hint, new; ++ ++ /* sanity test, should be removed by compiler if hint is a constant */ ++ if (!hint) ++ return atomic_inc_not_zero(v); ++ ++ do { ++ asm volatile("incl %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ "decl %0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "=r" (new) ++ : "0" (c)); ++ ++ val = atomic_cmpxchg(v, c, new); ++ if (val == c) ++ return 1; ++ c = val; ++ } while (c); ++ ++ return 0; ++} ++ + /* + * atomic_dec_if_positive - decrement by 1 if old value positive + * @v: pointer of type atomic_t +diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h +index 2a934aa..42d2411 100644 +--- a/arch/x86/include/asm/atomic64_32.h ++++ b/arch/x86/include/asm/atomic64_32.h @@ -12,6 +12,14 @@ typedef struct { u64 __aligned(8) counter; } atomic64_t; @@ -6667,7 +7621,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_32.h linux-2.6.38.7/arch #define ATOMIC64_INIT(val) { (val) } #ifdef CONFIG_X86_CMPXCHG64 -@@ -38,6 +46,21 @@ static inline long long atomic64_cmpxchg +@@ -38,6 +46,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n } /** @@ -6689,7 +7643,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_32.h linux-2.6.38.7/arch * atomic64_xchg - xchg atomic64 variable * @v: pointer to type atomic64_t * @n: value to assign -@@ -77,6 +100,24 @@ static inline void atomic64_set(atomic64 +@@ -77,6 +100,24 @@ static inline void atomic64_set(atomic64_t *v, long long i) } /** @@ -6714,7 +7668,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_32.h linux-2.6.38.7/arch * atomic64_read - read atomic64 variable * @v: pointer to type atomic64_t * -@@ -93,6 +134,22 @@ static inline long long atomic64_read(at +@@ -93,6 +134,22 @@ static inline long long atomic64_read(atomic64_t *v) } /** @@ -6737,7 +7691,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_32.h linux-2.6.38.7/arch * atomic64_add_return - add and return * @i: integer value to add * @v: pointer to type atomic64_t -@@ -108,6 +165,22 @@ static inline long long atomic64_add_ret +@@ -108,6 +165,22 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v) return i; } @@ -6760,7 +7714,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_32.h linux-2.6.38.7/arch /* * Other variants with different arithmetic operators: */ -@@ -131,6 +204,17 @@ static inline long long atomic64_inc_ret +@@ -131,6 +204,17 @@ static inline long long atomic64_inc_return(atomic64_t *v) return a; } @@ -6778,7 +7732,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_32.h linux-2.6.38.7/arch static inline long long atomic64_dec_return(atomic64_t *v) { long long a; -@@ -159,6 +243,22 @@ static inline long long atomic64_add(lon +@@ -159,6 +243,22 @@ static inline long long atomic64_add(long long i, atomic64_t *v) } /** @@ -6801,9 +7755,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_32.h linux-2.6.38.7/arch * atomic64_sub - subtract the atomic64 variable * @i: integer value to subtract * @v: pointer to type atomic64_t -diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_64.h linux-2.6.38.7/arch/x86/include/asm/atomic64_64.h ---- linux-2.6.38.7/arch/x86/include/asm/atomic64_64.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/atomic64_64.h 2011-05-16 21:47:08.000000000 -0400 +diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h +index 49fd1ea..8c58977 100644 +--- a/arch/x86/include/asm/atomic64_64.h ++++ b/arch/x86/include/asm/atomic64_64.h @@ -18,7 +18,19 @@ */ static inline long atomic64_read(const atomic64_t *v) @@ -6825,7 +7780,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_64.h linux-2.6.38.7/arch } /** -@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64 +@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i) } /** @@ -6844,7 +7799,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_64.h linux-2.6.38.7/arch * atomic64_add - add integer to atomic64 variable * @i: integer value to add * @v: pointer to type atomic64_t -@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64 +@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i) */ static inline void atomic64_add(long i, atomic64_t *v) { @@ -6873,7 +7828,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_64.h linux-2.6.38.7/arch asm volatile(LOCK_PREFIX "addq %1,%0" : "=m" (v->counter) : "er" (i), "m" (v->counter)); -@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, +@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v) */ static inline void atomic64_sub(long i, atomic64_t *v) { @@ -6904,7 +7859,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_64.h linux-2.6.38.7/arch : "=m" (v->counter) : "er" (i), "m" (v->counter)); } -@@ -74,7 +142,16 @@ static inline int atomic64_sub_and_test( +@@ -74,7 +142,16 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v) { unsigned char c; @@ -6922,7 +7877,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_64.h linux-2.6.38.7/arch : "=m" (v->counter), "=qm" (c) : "er" (i), "m" (v->counter) : "memory"); return c; -@@ -88,6 +165,27 @@ static inline int atomic64_sub_and_test( +@@ -88,6 +165,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v) */ static inline void atomic64_inc(atomic64_t *v) { @@ -6950,7 +7905,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_64.h linux-2.6.38.7/arch asm volatile(LOCK_PREFIX "incq %0" : "=m" (v->counter) : "m" (v->counter)); -@@ -101,7 +199,28 @@ static inline void atomic64_inc(atomic64 +@@ -101,7 +199,28 @@ static inline void atomic64_inc(atomic64_t *v) */ static inline void atomic64_dec(atomic64_t *v) { @@ -6980,7 +7935,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_64.h linux-2.6.38.7/arch : "=m" (v->counter) : "m" (v->counter)); } -@@ -118,7 +237,16 @@ static inline int atomic64_dec_and_test( +@@ -118,7 +237,16 @@ static inline int atomic64_dec_and_test(atomic64_t *v) { unsigned char c; @@ -6998,7 +7953,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_64.h linux-2.6.38.7/arch : "=m" (v->counter), "=qm" (c) : "m" (v->counter) : "memory"); return c != 0; -@@ -136,7 +264,16 @@ static inline int atomic64_inc_and_test( +@@ -136,7 +264,16 @@ static inline int atomic64_inc_and_test(atomic64_t *v) { unsigned char c; @@ -7016,7 +7971,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_64.h linux-2.6.38.7/arch : "=m" (v->counter), "=qm" (c) : "m" (v->counter) : "memory"); return c != 0; -@@ -155,7 +292,16 @@ static inline int atomic64_add_negative( +@@ -155,7 +292,16 @@ static inline int atomic64_add_negative(long i, atomic64_t *v) { unsigned char c; @@ -7034,7 +7989,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_64.h linux-2.6.38.7/arch : "=m" (v->counter), "=qm" (c) : "er" (i), "m" (v->counter) : "memory"); return c; -@@ -171,7 +317,31 @@ static inline int atomic64_add_negative( +@@ -171,7 +317,31 @@ static inline int atomic64_add_negative(long i, atomic64_t *v) static inline long atomic64_add_return(long i, atomic64_t *v) { long __i = i; @@ -7067,7 +8022,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_64.h linux-2.6.38.7/arch : "+r" (i), "+m" (v->counter) : : "memory"); return i + __i; -@@ -183,6 +353,10 @@ static inline long atomic64_sub_return(l +@@ -183,6 +353,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v) } #define atomic64_inc_return(v) (atomic64_add_return(1, (v))) @@ -7078,7 +8033,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_64.h linux-2.6.38.7/arch #define atomic64_dec_return(v) (atomic64_sub_return(1, (v))) static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new) -@@ -190,6 +364,11 @@ static inline long atomic64_cmpxchg(atom +@@ -190,6 +364,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new) return cmpxchg(&v->counter, old, new); } @@ -7090,7 +8045,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_64.h linux-2.6.38.7/arch static inline long atomic64_xchg(atomic64_t *v, long new) { return xchg(&v->counter, new); -@@ -206,17 +385,30 @@ static inline long atomic64_xchg(atomic6 +@@ -206,17 +385,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new) */ static inline int atomic64_add_unless(atomic64_t *v, long a, long u) { @@ -7125,424 +8080,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic64_64.h linux-2.6.38.7/arch } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) -diff -urNp linux-2.6.38.7/arch/x86/include/asm/atomic.h linux-2.6.38.7/arch/x86/include/asm/atomic.h ---- linux-2.6.38.7/arch/x86/include/asm/atomic.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/atomic.h 2011-04-28 19:57:25.000000000 -0400 -@@ -22,7 +22,18 @@ - */ - static inline int atomic_read(const atomic_t *v) - { -- return (*(volatile int *)&(v)->counter); -+ return (*(volatile const int *)&(v)->counter); -+} -+ -+/** -+ * 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 (*(volatile const int *)&(v)->counter); - } - - /** -@@ -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" -+ "int $4\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" -+ "int $4\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_unchecked_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" -+ "int $4\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" -+ "int $4\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" -+ "int $4\n0:\n" -+ _ASM_EXTABLE(0b, 0b) -+#endif -+ -+ : "+m" (v->counter)); -+} -+ -+/** -+ * atomic_dec_unchecked - decrement atomic variable -+ * @v: pointer of type atomic_unchecked_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" -+ "int $4\n0:\n" -+ _ASM_EXTABLE(0b, 0b) -+#endif -+ -+ "sete %1\n" - : "+m" (v->counter), "=qm" (c) - : : "memory"); - return c != 0; -@@ -138,7 +263,35 @@ 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" -+ "int $4\n0:\n" -+ _ASM_EXTABLE(0b, 0b) -+#endif -+ -+ "sete %1\n" -+ : "+m" (v->counter), "=qm" (c) -+ : : "memory"); -+ return c != 0; -+} -+ -+/** -+ * atomic_inc_and_test_unchecked - increment and test -+ * @v: pointer of type atomic_unchecked_t -+ * -+ * Atomically increments @v by 1 -+ * and returns true if the result is zero, or false for all -+ * other cases. -+ */ -+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v) -+{ -+ unsigned char c; -+ -+ asm volatile(LOCK_PREFIX "incl %0\n" -+ "sete %1\n" - : "+m" (v->counter), "=qm" (c) - : : "memory"); - return c != 0; -@@ -157,7 +310,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" -+ "int $4\n0:\n" -+ _ASM_EXTABLE(0b, 0b) -+#endif -+ -+ "sets %1\n" - : "+m" (v->counter), "=qm" (c) - : "ir" (i) : "memory"); - return c; -@@ -180,6 +342,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" -+ "int $4\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 +410,10 @@ static inline int atomic_sub_return(int - } - - #define atomic_inc_return(v) (atomic_add_return(1, v)) -+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v) -+{ -+ return 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) -@@ -215,11 +421,21 @@ static inline int atomic_cmpxchg(atomic_ - return cmpxchg(&v->counter, old, new); - } - -+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new) -+{ -+ return cmpxchg(&v->counter, old, new); -+} -+ - static inline int atomic_xchg(atomic_t *v, int new) - { - return xchg(&v->counter, new); - } - -+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new) -+{ -+ return xchg(&v->counter, new); -+} -+ - /** - * atomic_add_unless - add unless the number is already a given value - * @v: pointer of type atomic_t -@@ -231,21 +447,77 @@ 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" -+ "subl %2,%0\n" -+ "int $4\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) - -+/** -+ * atomic_inc_not_zero_hint - increment if not null -+ * @v: pointer of type atomic_t -+ * @hint: probable value of the atomic before the increment -+ * -+ * This version of atomic_inc_not_zero() gives a hint of probable -+ * value of the atomic. This helps processor to not read the memory -+ * before doing the atomic read/modify/write cycle, lowering -+ * number of bus transactions on some arches. -+ * -+ * Returns: 0 if increment was not done, 1 otherwise. -+ */ -+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint -+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint) -+{ -+ int val, c = hint, new; -+ -+ /* sanity test, should be removed by compiler if hint is a constant */ -+ if (!hint) -+ return atomic_inc_not_zero(v); -+ -+ do { -+ asm volatile("incl %0\n" -+ -+#ifdef CONFIG_PAX_REFCOUNT -+ "jno 0f\n" -+ "decl %0\n" -+ "int $4\n0:\n" -+ _ASM_EXTABLE(0b, 0b) -+#endif -+ -+ : "=r" (new) -+ : "0" (c)); -+ -+ val = atomic_cmpxchg(v, c, new); -+ if (val == c) -+ return 1; -+ c = val; -+ } while (c); -+ -+ return 0; -+} -+ - /* - * atomic_dec_if_positive - decrement by 1 if old value positive - * @v: pointer of type atomic_t -diff -urNp linux-2.6.38.7/arch/x86/include/asm/bitops.h linux-2.6.38.7/arch/x86/include/asm/bitops.h ---- linux-2.6.38.7/arch/x86/include/asm/bitops.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/bitops.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h +index 903683b..bb219df 100644 +--- a/arch/x86/include/asm/bitops.h ++++ b/arch/x86/include/asm/bitops.h @@ -38,7 +38,7 @@ * a mask operation on a byte. */ @@ -7552,9 +8093,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/bitops.h linux-2.6.38.7/arch/x86/ #define CONST_MASK(nr) (1 << ((nr) & 7)) /** -diff -urNp linux-2.6.38.7/arch/x86/include/asm/boot.h linux-2.6.38.7/arch/x86/include/asm/boot.h ---- linux-2.6.38.7/arch/x86/include/asm/boot.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/boot.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h +index 5e1a2ee..c9f9533 100644 +--- a/arch/x86/include/asm/boot.h ++++ b/arch/x86/include/asm/boot.h @@ -11,10 +11,15 @@ #include <asm/pgtable_types.h> @@ -7572,21 +8114,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/boot.h linux-2.6.38.7/arch/x86/in /* Minimum kernel alignment, as a power of two */ #ifdef CONFIG_X86_64 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT -diff -urNp linux-2.6.38.7/arch/x86/include/asm/cacheflush.h linux-2.6.38.7/arch/x86/include/asm/cacheflush.h ---- linux-2.6.38.7/arch/x86/include/asm/cacheflush.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/cacheflush.h 2011-04-28 19:34:14.000000000 -0400 -@@ -26,7 +26,7 @@ static inline unsigned long get_page_mem - unsigned long pg_flags = pg->flags & _PGMT_MASK; - - if (pg_flags == _PGMT_DEFAULT) -- return -1; -+ return ~0UL; - else if (pg_flags == _PGMT_WC) - return _PAGE_CACHE_WC; - else if (pg_flags == _PGMT_UC_MINUS) -diff -urNp linux-2.6.38.7/arch/x86/include/asm/cache.h linux-2.6.38.7/arch/x86/include/asm/cache.h ---- linux-2.6.38.7/arch/x86/include/asm/cache.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/cache.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h +index 48f99f1..287b0eb 100644 +--- a/arch/x86/include/asm/cache.h ++++ b/arch/x86/include/asm/cache.h @@ -5,12 +5,13 @@ /* L1 cache line size */ @@ -7603,10 +8134,24 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/cache.h linux-2.6.38.7/arch/x86/i #ifdef CONFIG_X86_VSMP #ifdef CONFIG_SMP -diff -urNp linux-2.6.38.7/arch/x86/include/asm/checksum_32.h linux-2.6.38.7/arch/x86/include/asm/checksum_32.h ---- linux-2.6.38.7/arch/x86/include/asm/checksum_32.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/checksum_32.h 2011-04-28 19:34:14.000000000 -0400 -@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene +diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h +index 62f0844..ef26ade 100644 +--- a/arch/x86/include/asm/cacheflush.h ++++ b/arch/x86/include/asm/cacheflush.h +@@ -26,7 +26,7 @@ static inline unsigned long get_page_memtype(struct page *pg) + unsigned long pg_flags = pg->flags & _PGMT_MASK; + + if (pg_flags == _PGMT_DEFAULT) +- return -1; ++ return ~0UL; + else if (pg_flags == _PGMT_WC) + return _PAGE_CACHE_WC; + else if (pg_flags == _PGMT_UC_MINUS) +diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h +index 46fc474..b02b0f9 100644 +--- a/arch/x86/include/asm/checksum_32.h ++++ b/arch/x86/include/asm/checksum_32.h +@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst, int len, __wsum sum, int *src_err_ptr, int *dst_err_ptr); @@ -7621,7 +8166,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/checksum_32.h linux-2.6.38.7/arch /* * 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 +@@ -50,7 +58,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src, int *err_ptr) { might_sleep(); @@ -7630,7 +8175,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/checksum_32.h linux-2.6.38.7/arch len, sum, err_ptr, NULL); } -@@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_us +@@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_user(const void *src, { might_sleep(); if (access_ok(VERIFY_WRITE, dst, len)) @@ -7639,10 +8184,11 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/checksum_32.h linux-2.6.38.7/arch len, sum, NULL, err_ptr); if (len) -diff -urNp linux-2.6.38.7/arch/x86/include/asm/cpufeature.h linux-2.6.38.7/arch/x86/include/asm/cpufeature.h ---- linux-2.6.38.7/arch/x86/include/asm/cpufeature.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/cpufeature.h 2011-04-28 19:34:14.000000000 -0400 -@@ -349,7 +349,7 @@ static __always_inline __pure bool __sta +diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h +index 3b98f78..2bc9667 100644 +--- a/arch/x86/include/asm/cpufeature.h ++++ b/arch/x86/include/asm/cpufeature.h +@@ -349,7 +349,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit) ".section .discard,\"aw\",@progbits\n" " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */ ".previous\n" @@ -7651,25 +8197,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/cpufeature.h linux-2.6.38.7/arch/ "3: movb $1,%0\n" "4:\n" ".previous\n" -diff -urNp linux-2.6.38.7/arch/x86/include/asm/desc_defs.h linux-2.6.38.7/arch/x86/include/asm/desc_defs.h ---- linux-2.6.38.7/arch/x86/include/asm/desc_defs.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/desc_defs.h 2011-04-28 19:34:14.000000000 -0400 -@@ -31,6 +31,12 @@ struct desc_struct { - unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1; - unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8; - }; -+ struct { -+ u16 offset_low; -+ u16 seg; -+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1; -+ unsigned offset_high: 16; -+ } gate; - }; - } __attribute__((packed)); - -diff -urNp linux-2.6.38.7/arch/x86/include/asm/desc.h linux-2.6.38.7/arch/x86/include/asm/desc.h ---- linux-2.6.38.7/arch/x86/include/asm/desc.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/desc.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h +index 617bd56..7b047a1 100644 +--- a/arch/x86/include/asm/desc.h ++++ b/arch/x86/include/asm/desc.h @@ -4,6 +4,7 @@ #include <asm/desc_defs.h> #include <asm/ldt.h> @@ -7678,7 +8209,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/desc.h linux-2.6.38.7/arch/x86/in #include <linux/smp.h> static inline void fill_ldt(struct desc_struct *desc, -@@ -15,6 +16,7 @@ static inline void fill_ldt(struct desc_ +@@ -15,6 +16,7 @@ static inline void fill_ldt(struct desc_struct *desc, desc->base1 = (info->base_addr & 0x00ff0000) >> 16; desc->type = (info->read_exec_only ^ 1) << 1; desc->type |= info->contents << 2; @@ -7686,7 +8217,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/desc.h linux-2.6.38.7/arch/x86/in desc->s = 1; desc->dpl = 0x3; desc->p = info->seg_not_present ^ 1; -@@ -31,16 +33,12 @@ static inline void fill_ldt(struct desc_ +@@ -31,16 +33,12 @@ static inline void fill_ldt(struct desc_struct *desc, } extern struct desc_ptr idt_descr; @@ -7706,7 +8237,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/desc.h linux-2.6.38.7/arch/x86/in } #ifdef CONFIG_X86_64 -@@ -65,9 +63,14 @@ static inline void pack_gate(gate_desc * +@@ -65,9 +63,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type, unsigned long base, unsigned dpl, unsigned flags, unsigned short seg) { @@ -7724,7 +8255,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/desc.h linux-2.6.38.7/arch/x86/in } #endif -@@ -115,13 +118,17 @@ static inline void paravirt_free_ldt(str +@@ -115,13 +118,17 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries) static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate) { @@ -7742,7 +8273,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/desc.h linux-2.6.38.7/arch/x86/in } static inline void native_write_gdt_entry(struct desc_struct *gdt, int entry, -@@ -139,7 +146,10 @@ static inline void native_write_gdt_entr +@@ -139,7 +146,10 @@ static inline void native_write_gdt_entry(struct desc_struct *gdt, int entry, size = sizeof(struct desc_struct); break; } @@ -7753,7 +8284,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/desc.h linux-2.6.38.7/arch/x86/in } static inline void pack_descriptor(struct desc_struct *desc, unsigned long base, -@@ -211,7 +221,9 @@ static inline void native_set_ldt(const +@@ -211,7 +221,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries) static inline void native_load_tr_desc(void) { @@ -7763,7 +8294,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/desc.h linux-2.6.38.7/arch/x86/in } static inline void native_load_gdt(const struct desc_ptr *dtr) -@@ -246,8 +258,10 @@ static inline void native_load_tls(struc +@@ -246,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu) unsigned int i; struct desc_struct *gdt = get_cpu_gdt_table(cpu); @@ -7774,7 +8305,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/desc.h linux-2.6.38.7/arch/x86/in } #define _LDT_empty(info) \ -@@ -309,7 +323,7 @@ static inline void set_desc_limit(struct +@@ -309,7 +323,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit) desc->limit = (limit >> 16) & 0xf; } @@ -7783,7 +8314,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/desc.h linux-2.6.38.7/arch/x86/in unsigned dpl, unsigned ist, unsigned seg) { gate_desc s; -@@ -327,7 +341,7 @@ static inline void _set_gate(int gate, u +@@ -327,7 +341,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr, * Pentium F0 0F bugfix can have resulted in the mapped * IDT being write-protected. */ @@ -7792,7 +8323,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/desc.h linux-2.6.38.7/arch/x86/in { BUG_ON((unsigned)n > 0xFF); _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS); -@@ -356,19 +370,19 @@ static inline void alloc_intr_gate(unsig +@@ -356,19 +370,19 @@ static inline void alloc_intr_gate(unsigned int n, void *addr) /* * This routine sets up an interrupt gate at directory privilege level 3. */ @@ -7815,7 +8346,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/desc.h linux-2.6.38.7/arch/x86/in { BUG_ON((unsigned)n > 0xFF); _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS); -@@ -377,19 +391,31 @@ static inline void set_trap_gate(unsigne +@@ -377,19 +391,31 @@ static inline void set_trap_gate(unsigned int n, void *addr) static inline void set_task_gate(unsigned int n, unsigned int gdt_entry) { BUG_ON((unsigned)n > 0xFF); @@ -7850,9 +8381,27 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/desc.h linux-2.6.38.7/arch/x86/in +#endif + #endif /* _ASM_X86_DESC_H */ -diff -urNp linux-2.6.38.7/arch/x86/include/asm/device.h linux-2.6.38.7/arch/x86/include/asm/device.h ---- linux-2.6.38.7/arch/x86/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/device.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h +index 278441f..b95a174 100644 +--- a/arch/x86/include/asm/desc_defs.h ++++ b/arch/x86/include/asm/desc_defs.h +@@ -31,6 +31,12 @@ struct desc_struct { + unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1; + unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8; + }; ++ struct { ++ u16 offset_low; ++ u16 seg; ++ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1; ++ unsigned offset_high: 16; ++ } gate; + }; + } __attribute__((packed)); + +diff --git a/arch/x86/include/asm/device.h b/arch/x86/include/asm/device.h +index 029f230..0b9b1b3 100644 +--- a/arch/x86/include/asm/device.h ++++ b/arch/x86/include/asm/device.h @@ -6,7 +6,7 @@ struct dev_archdata { void *acpi_handle; #endif @@ -7862,9 +8411,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/device.h linux-2.6.38.7/arch/x86/ #endif #if defined(CONFIG_DMAR) || defined(CONFIG_AMD_IOMMU) void *iommu; /* hook for IOMMU specific extension */ -diff -urNp linux-2.6.38.7/arch/x86/include/asm/dma-mapping.h linux-2.6.38.7/arch/x86/include/asm/dma-mapping.h ---- linux-2.6.38.7/arch/x86/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/dma-mapping.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h +index d4c419f..0c186bd 100644 +--- a/arch/x86/include/asm/dma-mapping.h ++++ b/arch/x86/include/asm/dma-mapping.h @@ -26,9 +26,9 @@ extern int iommu_merge; extern struct device x86_dma_fallback_dev; extern int panic_on_overflow; @@ -7877,7 +8427,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/dma-mapping.h linux-2.6.38.7/arch { #ifdef CONFIG_X86_32 return dma_ops; -@@ -45,7 +45,7 @@ static inline struct dma_map_ops *get_dm +@@ -45,7 +45,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) /* Make sure we keep the same behaviour */ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { @@ -7895,7 +8445,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/dma-mapping.h linux-2.6.38.7/arch void *memory; gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); -@@ -142,7 +142,7 @@ dma_alloc_coherent(struct device *dev, s +@@ -142,7 +142,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, static inline void dma_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t bus) { @@ -7904,9 +8454,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/dma-mapping.h linux-2.6.38.7/arch WARN_ON(irqs_disabled()); /* for portability */ -diff -urNp linux-2.6.38.7/arch/x86/include/asm/e820.h linux-2.6.38.7/arch/x86/include/asm/e820.h ---- linux-2.6.38.7/arch/x86/include/asm/e820.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/e820.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h +index e99d55d..a32833f 100644 +--- a/arch/x86/include/asm/e820.h ++++ b/arch/x86/include/asm/e820.h @@ -69,7 +69,7 @@ struct e820map { #define ISA_START_ADDRESS 0xa0000 #define ISA_END_ADDRESS 0x100000 @@ -7916,9 +8467,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/e820.h linux-2.6.38.7/arch/x86/in #define BIOS_END 0x00100000 #define BIOS_ROM_BASE 0xffe00000 -diff -urNp linux-2.6.38.7/arch/x86/include/asm/elf.h linux-2.6.38.7/arch/x86/include/asm/elf.h ---- linux-2.6.38.7/arch/x86/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/elf.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h +index f2ad216..569e1f7 100644 +--- a/arch/x86/include/asm/elf.h ++++ b/arch/x86/include/asm/elf.h @@ -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. */ @@ -7964,7 +8516,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/elf.h linux-2.6.38.7/arch/x86/inc #define VDSO_ENTRY \ ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall)) -@@ -317,7 +334,4 @@ extern int arch_setup_additional_pages(s +@@ -317,7 +334,4 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm, extern int syscall32_setup_pages(struct linux_binprm *, int exstack); #define compat_arch_setup_additional_pages syscall32_setup_pages @@ -7972,9 +8524,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/elf.h linux-2.6.38.7/arch/x86/inc -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_X86_ELF_H */ -diff -urNp linux-2.6.38.7/arch/x86/include/asm/emergency-restart.h linux-2.6.38.7/arch/x86/include/asm/emergency-restart.h ---- linux-2.6.38.7/arch/x86/include/asm/emergency-restart.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/emergency-restart.h 2011-05-22 23:03:34.000000000 -0400 +diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h +index cc70c1c..d96d011 100644 +--- a/arch/x86/include/asm/emergency-restart.h ++++ b/arch/x86/include/asm/emergency-restart.h @@ -15,6 +15,6 @@ enum reboot_type { extern enum reboot_type reboot_type; @@ -7983,9 +8536,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/emergency-restart.h linux-2.6.38. +extern void machine_emergency_restart(void) __noreturn; #endif /* _ASM_X86_EMERGENCY_RESTART_H */ -diff -urNp linux-2.6.38.7/arch/x86/include/asm/futex.h linux-2.6.38.7/arch/x86/include/asm/futex.h ---- linux-2.6.38.7/arch/x86/include/asm/futex.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/futex.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h +index 1f11ce4..6f49a5a 100644 +--- a/arch/x86/include/asm/futex.h ++++ b/arch/x86/include/asm/futex.h @@ -12,16 +12,18 @@ #include <asm/system.h> @@ -8019,7 +8573,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/futex.h linux-2.6.38.7/arch/x86/i { int op = (encoded_op >> 28) & 7; int cmp = (encoded_op >> 24) & 15; -@@ -61,10 +63,10 @@ static inline int futex_atomic_op_inuser +@@ -61,10 +63,10 @@ static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr) switch (op) { case FUTEX_OP_SET: @@ -8032,7 +8586,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/futex.h linux-2.6.38.7/arch/x86/i uaddr, oparg); break; case FUTEX_OP_OR: -@@ -109,7 +111,7 @@ static inline int futex_atomic_op_inuser +@@ -109,7 +111,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr) return ret; } @@ -8041,7 +8595,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/futex.h linux-2.6.38.7/arch/x86/i int newval) { -@@ -119,16 +121,16 @@ static inline int futex_atomic_cmpxchg_i +@@ -119,16 +121,16 @@ static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, return -ENOSYS; #endif @@ -8061,9 +8615,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/futex.h linux-2.6.38.7/arch/x86/i : "i" (-EFAULT), "r" (newval), "0" (oldval) : "memory" ); -diff -urNp linux-2.6.38.7/arch/x86/include/asm/hw_irq.h linux-2.6.38.7/arch/x86/include/asm/hw_irq.h ---- linux-2.6.38.7/arch/x86/include/asm/hw_irq.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/hw_irq.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h +index 0274ec5..037eccb 100644 +--- a/arch/x86/include/asm/hw_irq.h ++++ b/arch/x86/include/asm/hw_irq.h @@ -113,8 +113,8 @@ extern void setup_ioapic_dest(void); extern void enable_IO_APIC(void); @@ -8075,10 +8630,11 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/hw_irq.h linux-2.6.38.7/arch/x86/ /* EISA */ extern void eisa_set_level_irq(unsigned int irq); -diff -urNp linux-2.6.38.7/arch/x86/include/asm/i387.h linux-2.6.38.7/arch/x86/include/asm/i387.h ---- linux-2.6.38.7/arch/x86/include/asm/i387.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/i387.h 2011-04-28 19:34:14.000000000 -0400 -@@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc +diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h +index ef32890..ce9d520 100644 +--- a/arch/x86/include/asm/i387.h ++++ b/arch/x86/include/asm/i387.h +@@ -92,6 +92,11 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx) { int err; @@ -8090,7 +8646,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/i387.h linux-2.6.38.7/arch/x86/in /* See comment in fxsave() below. */ #ifdef CONFIG_AS_FXSAVEQ asm volatile("1: fxrstorq %[fx]\n\t" -@@ -121,6 +126,11 @@ static inline int fxsave_user(struct i38 +@@ -121,6 +126,11 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx) { int err; @@ -8102,7 +8658,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/i387.h linux-2.6.38.7/arch/x86/in /* * Clear the bytes not touched by the fxsave and reserved * for the SW usage. -@@ -213,13 +223,8 @@ static inline void fpu_fxsave(struct fpu +@@ -213,13 +223,8 @@ static inline void fpu_fxsave(struct fpu *fpu) #endif /* CONFIG_X86_64 */ /* We need a safe address that is cheap to find and that is already @@ -8118,7 +8674,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/i387.h linux-2.6.38.7/arch/x86/in /* * These must be called with preempt disabled -@@ -237,7 +242,7 @@ static inline void fpu_save_init(struct +@@ -237,7 +242,7 @@ static inline void fpu_save_init(struct fpu *fpu) } else if (use_fxsr()) { fpu_fxsave(fpu); } else { @@ -8127,7 +8683,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/i387.h linux-2.6.38.7/arch/x86/in : [fx] "=m" (fpu->state->fsave)); return; } -@@ -312,7 +317,7 @@ static inline void kernel_fpu_begin(void +@@ -312,7 +317,7 @@ static inline void kernel_fpu_begin(void) struct thread_info *me = current_thread_info(); preempt_disable(); if (me->status & TS_USEDFPU) @@ -8136,9 +8692,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/i387.h linux-2.6.38.7/arch/x86/in else clts(); } -diff -urNp linux-2.6.38.7/arch/x86/include/asm/io.h linux-2.6.38.7/arch/x86/include/asm/io.h ---- linux-2.6.38.7/arch/x86/include/asm/io.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/io.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h +index 0722730..11502d1 100644 +--- a/arch/x86/include/asm/io.h ++++ b/arch/x86/include/asm/io.h @@ -216,6 +216,17 @@ extern void set_iounmap_nonlazy(void); #include <linux/vmalloc.h> @@ -8157,9 +8714,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/io.h linux-2.6.38.7/arch/x86/incl /* * Convert a virtual cached pointer to an uncached pointer */ -diff -urNp linux-2.6.38.7/arch/x86/include/asm/iommu.h linux-2.6.38.7/arch/x86/include/asm/iommu.h ---- linux-2.6.38.7/arch/x86/include/asm/iommu.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/iommu.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h +index 345c99c..7938698 100644 +--- a/arch/x86/include/asm/iommu.h ++++ b/arch/x86/include/asm/iommu.h @@ -1,7 +1,7 @@ #ifndef _ASM_X86_IOMMU_H #define _ASM_X86_IOMMU_H @@ -8169,10 +8727,11 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/iommu.h linux-2.6.38.7/arch/x86/i extern int force_iommu, no_iommu; extern int iommu_detected; extern int iommu_pass_through; -diff -urNp linux-2.6.38.7/arch/x86/include/asm/irqflags.h linux-2.6.38.7/arch/x86/include/asm/irqflags.h ---- linux-2.6.38.7/arch/x86/include/asm/irqflags.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/irqflags.h 2011-04-28 19:34:14.000000000 -0400 -@@ -140,6 +140,11 @@ static inline unsigned long arch_local_i +diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h +index 5745ce8..949fb75 100644 +--- a/arch/x86/include/asm/irqflags.h ++++ b/arch/x86/include/asm/irqflags.h +@@ -140,6 +140,11 @@ static inline unsigned long arch_local_irq_save(void) sti; \ sysexit @@ -8184,9 +8743,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/irqflags.h linux-2.6.38.7/arch/x8 #else #define INTERRUPT_RETURN iret #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit -diff -urNp linux-2.6.38.7/arch/x86/include/asm/kprobes.h linux-2.6.38.7/arch/x86/include/asm/kprobes.h ---- linux-2.6.38.7/arch/x86/include/asm/kprobes.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/kprobes.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h +index 5478825..839e88c 100644 +--- a/arch/x86/include/asm/kprobes.h ++++ b/arch/x86/include/asm/kprobes.h @@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t; #define RELATIVEJUMP_SIZE 5 #define RELATIVECALL_OPCODE 0xe8 @@ -8203,9 +8763,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/kprobes.h linux-2.6.38.7/arch/x86 #define flush_insn_slot(p) do { } while (0) -diff -urNp linux-2.6.38.7/arch/x86/include/asm/kvm_host.h linux-2.6.38.7/arch/x86/include/asm/kvm_host.h ---- linux-2.6.38.7/arch/x86/include/asm/kvm_host.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/kvm_host.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h +index ffd7f8d..0567319 100644 +--- a/arch/x86/include/asm/kvm_host.h ++++ b/arch/x86/include/asm/kvm_host.h @@ -423,7 +423,7 @@ struct kvm_arch { unsigned int n_used_mmu_pages; unsigned int n_requested_mmu_pages; @@ -8224,9 +8785,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/kvm_host.h linux-2.6.38.7/arch/x8 int kvm_mmu_module_init(void); void kvm_mmu_module_exit(void); -diff -urNp linux-2.6.38.7/arch/x86/include/asm/local.h linux-2.6.38.7/arch/x86/include/asm/local.h ---- linux-2.6.38.7/arch/x86/include/asm/local.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/local.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h +index 2e99724..e6110cc 100644 +--- a/arch/x86/include/asm/local.h ++++ b/arch/x86/include/asm/local.h @@ -18,26 +18,58 @@ typedef struct { static inline void local_inc(local_t *l) @@ -8290,7 +8852,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/local.h linux-2.6.38.7/arch/x86/i : "+m" (l->a.counter) : "ir" (i)); } -@@ -55,7 +87,16 @@ static inline int local_sub_and_test(lon +@@ -55,7 +87,16 @@ static inline int local_sub_and_test(long i, local_t *l) { unsigned char c; @@ -8308,7 +8870,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/local.h linux-2.6.38.7/arch/x86/i : "+m" (l->a.counter), "=qm" (c) : "ir" (i) : "memory"); return c; -@@ -73,7 +114,16 @@ static inline int local_dec_and_test(loc +@@ -73,7 +114,16 @@ static inline int local_dec_and_test(local_t *l) { unsigned char c; @@ -8326,7 +8888,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/local.h linux-2.6.38.7/arch/x86/i : "+m" (l->a.counter), "=qm" (c) : : "memory"); return c != 0; -@@ -91,7 +141,16 @@ static inline int local_inc_and_test(loc +@@ -91,7 +141,16 @@ static inline int local_inc_and_test(local_t *l) { unsigned char c; @@ -8344,7 +8906,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/local.h linux-2.6.38.7/arch/x86/i : "+m" (l->a.counter), "=qm" (c) : : "memory"); return c != 0; -@@ -110,7 +169,16 @@ static inline int local_add_negative(lon +@@ -110,7 +169,16 @@ static inline int local_add_negative(long i, local_t *l) { unsigned char c; @@ -8362,7 +8924,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/local.h linux-2.6.38.7/arch/x86/i : "+m" (l->a.counter), "=qm" (c) : "ir" (i) : "memory"); return c; -@@ -133,7 +201,15 @@ static inline long local_add_return(long +@@ -133,7 +201,15 @@ static inline long local_add_return(long i, local_t *l) #endif /* Modern 486+ processor */ __i = i; @@ -8379,9 +8941,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/local.h linux-2.6.38.7/arch/x86/i : "+r" (i), "+m" (l->a.counter) : : "memory"); return i + __i; -diff -urNp linux-2.6.38.7/arch/x86/include/asm/mce.h linux-2.6.38.7/arch/x86/include/asm/mce.h ---- linux-2.6.38.7/arch/x86/include/asm/mce.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/mce.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h +index eb16e94..f229648 100644 +--- a/arch/x86/include/asm/mce.h ++++ b/arch/x86/include/asm/mce.h @@ -198,7 +198,7 @@ int mce_notify_irq(void); void mce_notify_process(void); @@ -8391,9 +8954,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/mce.h linux-2.6.38.7/arch/x86/inc /* * Exception handler -diff -urNp linux-2.6.38.7/arch/x86/include/asm/microcode.h linux-2.6.38.7/arch/x86/include/asm/microcode.h ---- linux-2.6.38.7/arch/x86/include/asm/microcode.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/microcode.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h +index 2421507..d155f20 100644 +--- a/arch/x86/include/asm/microcode.h ++++ b/arch/x86/include/asm/microcode.h @@ -12,13 +12,13 @@ struct device; enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; @@ -8431,7 +8995,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/microcode.h linux-2.6.38.7/arch/x static inline void get_ucode_data(void *to, const u8 *from, size_t n) { -@@ -55,7 +55,7 @@ static inline void get_ucode_data(void * +@@ -55,7 +55,7 @@ static inline void get_ucode_data(void *to, const u8 *from, size_t n) } #else @@ -8440,9 +9004,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/microcode.h linux-2.6.38.7/arch/x { return NULL; } -diff -urNp linux-2.6.38.7/arch/x86/include/asm/mman.h linux-2.6.38.7/arch/x86/include/asm/mman.h ---- linux-2.6.38.7/arch/x86/include/asm/mman.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/mman.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h +index 593e51d..fa69c9a 100644 +--- a/arch/x86/include/asm/mman.h ++++ b/arch/x86/include/asm/mman.h @@ -5,4 +5,14 @@ #include <asm-generic/mman.h> @@ -8458,10 +9023,41 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/mman.h linux-2.6.38.7/arch/x86/in +#endif + #endif /* _ASM_X86_MMAN_H */ -diff -urNp linux-2.6.38.7/arch/x86/include/asm/mmu_context.h linux-2.6.38.7/arch/x86/include/asm/mmu_context.h ---- linux-2.6.38.7/arch/x86/include/asm/mmu_context.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/mmu_context.h 2011-04-28 19:34:14.000000000 -0400 -@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m +diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h +index 80a1dee..239c67d 100644 +--- a/arch/x86/include/asm/mmu.h ++++ b/arch/x86/include/asm/mmu.h +@@ -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 --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h +index 8b5393e..cc873d9 100644 +--- a/arch/x86/include/asm/mmu_context.h ++++ b/arch/x86/include/asm/mmu_context.h +@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *mm); static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) { @@ -8483,7 +9079,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/mmu_context.h linux-2.6.38.7/arch #ifdef CONFIG_SMP if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK) percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY); -@@ -34,16 +49,30 @@ static inline void switch_mm(struct mm_s +@@ -34,16 +49,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk) { unsigned cpu = smp_processor_id(); @@ -8514,7 +9110,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/mmu_context.h linux-2.6.38.7/arch /* stop flush ipis for the previous mm */ cpumask_clear_cpu(cpu, mm_cpumask(prev)); -@@ -53,9 +82,38 @@ static inline void switch_mm(struct mm_s +@@ -53,9 +82,38 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, */ if (unlikely(prev->context.ldt != next->context.ldt)) load_LDT_nolock(&next->context); @@ -8554,7 +9150,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/mmu_context.h linux-2.6.38.7/arch percpu_write(cpu_tlbstate.state, TLBSTATE_OK); BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next); -@@ -64,11 +122,28 @@ static inline void switch_mm(struct mm_s +@@ -64,11 +122,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, * tlb flush IPI delivery. We must reload CR3 * to make sure to use no freed page tables. */ @@ -8584,38 +9180,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/mmu_context.h linux-2.6.38.7/arch } #define activate_mm(prev, next) \ -diff -urNp linux-2.6.38.7/arch/x86/include/asm/mmu.h linux-2.6.38.7/arch/x86/include/asm/mmu.h ---- linux-2.6.38.7/arch/x86/include/asm/mmu.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/mmu.h 2011-04-28 19:34: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.38.7/arch/x86/include/asm/module.h linux-2.6.38.7/arch/x86/include/asm/module.h ---- linux-2.6.38.7/arch/x86/include/asm/module.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/module.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h +index 67763c5..b80c028 100644 +--- a/arch/x86/include/asm/module.h ++++ b/arch/x86/include/asm/module.h @@ -5,6 +5,7 @@ #ifdef CONFIG_X86_64 @@ -8657,9 +9225,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/module.h linux-2.6.38.7/arch/x86/ +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_GRSEC MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF MODULE_PAX_REFCOUNT + #endif /* _ASM_X86_MODULE_H */ -diff -urNp linux-2.6.38.7/arch/x86/include/asm/page_64_types.h linux-2.6.38.7/arch/x86/include/asm/page_64_types.h ---- linux-2.6.38.7/arch/x86/include/asm/page_64_types.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/page_64_types.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h +index 7639dbf..e08a58c 100644 +--- a/arch/x86/include/asm/page_64_types.h ++++ b/arch/x86/include/asm/page_64_types.h @@ -56,7 +56,7 @@ void copy_page(void *to, void *from); /* duplicated to the one in bootmem.h */ @@ -8669,10 +9238,11 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/page_64_types.h linux-2.6.38.7/ar extern unsigned long __phys_addr(unsigned long); #define __phys_reloc_hide(x) (x) -diff -urNp linux-2.6.38.7/arch/x86/include/asm/paravirt.h linux-2.6.38.7/arch/x86/include/asm/paravirt.h ---- linux-2.6.38.7/arch/x86/include/asm/paravirt.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/paravirt.h 2011-04-28 19:34:14.000000000 -0400 -@@ -739,6 +739,21 @@ static inline void __set_fixmap(unsigned +diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h +index ebbc4d8..295929f1 100644 +--- a/arch/x86/include/asm/paravirt.h ++++ b/arch/x86/include/asm/paravirt.h +@@ -739,6 +739,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx, pv_mmu_ops.set_fixmap(idx, phys, flags); } @@ -8725,9 +9295,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/paravirt.h linux-2.6.38.7/arch/x8 #endif /* CONFIG_X86_32 */ #endif /* __ASSEMBLY__ */ -diff -urNp linux-2.6.38.7/arch/x86/include/asm/paravirt_types.h linux-2.6.38.7/arch/x86/include/asm/paravirt_types.h ---- linux-2.6.38.7/arch/x86/include/asm/paravirt_types.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/paravirt_types.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h +index 8288509..0a95063 100644 +--- a/arch/x86/include/asm/paravirt_types.h ++++ b/arch/x86/include/asm/paravirt_types.h @@ -317,6 +317,12 @@ struct pv_mmu_ops { an mfn. We can tell which is which from the index. */ void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, @@ -8741,10 +9312,11 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/paravirt_types.h linux-2.6.38.7/a }; struct arch_spinlock; -diff -urNp linux-2.6.38.7/arch/x86/include/asm/pci_x86.h linux-2.6.38.7/arch/x86/include/asm/pci_x86.h ---- linux-2.6.38.7/arch/x86/include/asm/pci_x86.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/pci_x86.h 2011-04-28 19:34:14.000000000 -0400 -@@ -93,16 +93,16 @@ extern int (*pcibios_enable_irq)(struct +diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h +index 7045267..6d819a2 100644 +--- a/arch/x86/include/asm/pci_x86.h ++++ b/arch/x86/include/asm/pci_x86.h +@@ -93,16 +93,16 @@ extern int (*pcibios_enable_irq)(struct pci_dev *dev); extern void (*pcibios_disable_irq)(struct pci_dev *dev); struct pci_raw_ops { @@ -8766,10 +9338,11 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/pci_x86.h linux-2.6.38.7/arch/x86 extern bool port_cf9_safe; /* arch_initcall level */ -diff -urNp linux-2.6.38.7/arch/x86/include/asm/pgalloc.h linux-2.6.38.7/arch/x86/include/asm/pgalloc.h ---- linux-2.6.38.7/arch/x86/include/asm/pgalloc.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/pgalloc.h 2011-04-28 19:34:14.000000000 -0400 -@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s +diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h +index b4389a4..b7ff22c 100644 +--- a/arch/x86/include/asm/pgalloc.h ++++ b/arch/x86/include/asm/pgalloc.h +@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, pte_t *pte) { paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT); @@ -8783,10 +9356,11 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/pgalloc.h linux-2.6.38.7/arch/x86 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); } -diff -urNp linux-2.6.38.7/arch/x86/include/asm/pgtable-2level.h linux-2.6.38.7/arch/x86/include/asm/pgtable-2level.h ---- linux-2.6.38.7/arch/x86/include/asm/pgtable-2level.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/pgtable-2level.h 2011-04-28 19:34:14.000000000 -0400 -@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t +diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h +index 98391db..8f6984e 100644 +--- a/arch/x86/include/asm/pgtable-2level.h ++++ b/arch/x86/include/asm/pgtable-2level.h +@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte) static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) { @@ -8796,88 +9370,11 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/pgtable-2level.h linux-2.6.38.7/a } static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) -diff -urNp linux-2.6.38.7/arch/x86/include/asm/pgtable_32.h linux-2.6.38.7/arch/x86/include/asm/pgtable_32.h ---- linux-2.6.38.7/arch/x86/include/asm/pgtable_32.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/pgtable_32.h 2011-04-28 19:34:14.000000000 -0400 -@@ -25,9 +25,6 @@ - struct mm_struct; - struct vm_area_struct; - --extern pgd_t swapper_pg_dir[1024]; --extern pgd_t initial_page_table[1024]; -- - static inline void pgtable_cache_init(void) { } - static inline void check_pgt_cache(void) { } - void paging_init(void); -@@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, u - # include <asm/pgtable-2level.h> - #endif - -+extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; -+extern pgd_t initial_page_table[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 pte_offset_map(dir, address) \ - ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \ -@@ -62,7 +65,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) - -@@ -74,6 +79,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.38.7/arch/x86/include/asm/pgtable_32_types.h linux-2.6.38.7/arch/x86/include/asm/pgtable_32_types.h ---- linux-2.6.38.7/arch/x86/include/asm/pgtable_32_types.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/pgtable_32_types.h 2011-04-28 19:34: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.38.7/arch/x86/include/asm/pgtable-3level.h linux-2.6.38.7/arch/x86/include/asm/pgtable-3level.h ---- linux-2.6.38.7/arch/x86/include/asm/pgtable-3level.h 2011-04-18 17:27:13.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/pgtable-3level.h 2011-04-28 19:34:14.000000000 -0400 -@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic +diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h +index effff47..f9e4035 100644 +--- a/arch/x86/include/asm/pgtable-3level.h ++++ b/arch/x86/include/asm/pgtable-3level.h +@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) { @@ -8894,63 +9391,11 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/pgtable-3level.h linux-2.6.38.7/a } /* -diff -urNp linux-2.6.38.7/arch/x86/include/asm/pgtable_64.h linux-2.6.38.7/arch/x86/include/asm/pgtable_64.h ---- linux-2.6.38.7/arch/x86/include/asm/pgtable_64.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/pgtable_64.h 2011-04-28 19:34: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 - -@@ -61,7 +64,9 @@ static inline void native_set_pte_atomic - - 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) -@@ -107,7 +112,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.38.7/arch/x86/include/asm/pgtable_64_types.h linux-2.6.38.7/arch/x86/include/asm/pgtable_64_types.h ---- linux-2.6.38.7/arch/x86/include/asm/pgtable_64_types.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/pgtable_64_types.h 2011-04-28 19:34:14.000000000 -0400 -@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t; - #define MODULES_VADDR _AC(0xffffffffa0000000, UL) - #define MODULES_END _AC(0xffffffffff000000, UL) - #define MODULES_LEN (MODULES_END - MODULES_VADDR) -+#define MODULES_EXEC_VADDR MODULES_VADDR -+#define MODULES_EXEC_END MODULES_END -+ -+#define ktla_ktva(addr) (addr) -+#define ktva_ktla(addr) (addr) - - #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ -diff -urNp linux-2.6.38.7/arch/x86/include/asm/pgtable.h linux-2.6.38.7/arch/x86/include/asm/pgtable.h ---- linux-2.6.38.7/arch/x86/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/pgtable.h 2011-04-28 19:34:14.000000000 -0400 -@@ -81,12 +81,51 @@ extern struct mm_struct *pgd_page_get_mm +diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h +index 18601c8..6790ac7 100644 +--- a/arch/x86/include/asm/pgtable.h ++++ b/arch/x86/include/asm/pgtable.h +@@ -81,12 +81,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page); #define arch_end_context_switch(prev) do {} while(0) @@ -9002,7 +9447,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/pgtable.h linux-2.6.38.7/arch/x86 static inline int pte_dirty(pte_t pte) { return pte_flags(pte) & _PAGE_DIRTY; -@@ -196,9 +235,29 @@ static inline pte_t pte_wrprotect(pte_t +@@ -196,9 +235,29 @@ static inline pte_t pte_wrprotect(pte_t pte) return pte_clear_flags(pte, _PAGE_RW); } @@ -9033,7 +9478,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/pgtable.h linux-2.6.38.7/arch/x86 } static inline pte_t pte_mkdirty(pte_t pte) -@@ -390,6 +449,15 @@ pte_t *populate_extra_pte(unsigned long +@@ -390,6 +449,15 @@ pte_t *populate_extra_pte(unsigned long vaddr); #endif #ifndef __ASSEMBLY__ @@ -9049,7 +9494,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/pgtable.h linux-2.6.38.7/arch/x86 #include <linux/mm_types.h> static inline int pte_none(pte_t pte) -@@ -560,7 +628,7 @@ static inline pud_t *pud_offset(pgd_t *p +@@ -560,7 +628,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address) static inline int pgd_bad(pgd_t pgd) { @@ -9093,7 +9538,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/pgtable.h linux-2.6.38.7/arch/x86 #ifndef __ASSEMBLY__ extern int direct_gbpages; -@@ -758,11 +845,23 @@ static inline void pmdp_set_wrprotect(st +@@ -758,11 +845,23 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm, * dst and src can be on the same page, but the range must not overlap, * and must not cross a page boundary. */ @@ -9119,9 +9564,145 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/pgtable.h linux-2.6.38.7/arch/x86 #include <asm-generic/pgtable.h> #endif /* __ASSEMBLY__ */ -diff -urNp linux-2.6.38.7/arch/x86/include/asm/pgtable_types.h linux-2.6.38.7/arch/x86/include/asm/pgtable_types.h ---- linux-2.6.38.7/arch/x86/include/asm/pgtable_types.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/pgtable_types.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h +index 0c92113..34a77c6 100644 +--- a/arch/x86/include/asm/pgtable_32.h ++++ b/arch/x86/include/asm/pgtable_32.h +@@ -25,9 +25,6 @@ + struct mm_struct; + struct vm_area_struct; + +-extern pgd_t swapper_pg_dir[1024]; +-extern pgd_t initial_page_table[1024]; +- + static inline void pgtable_cache_init(void) { } + static inline void check_pgt_cache(void) { } + void paging_init(void); +@@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t); + # include <asm/pgtable-2level.h> + #endif + ++extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; ++extern pgd_t initial_page_table[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 pte_offset_map(dir, address) \ + ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \ +@@ -62,7 +65,9 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t); + /* 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) + +@@ -74,6 +79,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 --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h +index ed5903b..c7fe163 100644 +--- a/arch/x86/include/asm/pgtable_32_types.h ++++ b/arch/x86/include/asm/pgtable_32_types.h +@@ -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 once high_memory is 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 --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h +index 975f709..253efcb 100644 +--- a/arch/x86/include/asm/pgtable_64.h ++++ b/arch/x86/include/asm/pgtable_64.h +@@ -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 + +@@ -61,7 +64,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) + + 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) +@@ -107,7 +112,9 @@ static inline void native_pud_clear(pud_t *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 --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h +index 766ea16..5b96cb3 100644 +--- a/arch/x86/include/asm/pgtable_64_types.h ++++ b/arch/x86/include/asm/pgtable_64_types.h +@@ -59,5 +59,10 @@ 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 ++ ++#define ktla_ktva(addr) (addr) ++#define ktva_ktla(addr) (addr) + + #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ +diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h +index 7db7723..4678d89 100644 +--- a/arch/x86/include/asm/pgtable_types.h ++++ b/arch/x86/include/asm/pgtable_types.h @@ -16,13 +16,12 @@ #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ #define _PAGE_BIT_PAT 7 /* on 4KB pages */ @@ -9191,7 +9772,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/pgtable_types.h linux-2.6.38.7/ar #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */ #endif -@@ -205,7 +208,17 @@ static inline pgdval_t pgd_flags(pgd_t p +@@ -205,7 +208,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd) { return native_pgd_val(pgd) & PTE_FLAGS_MASK; } @@ -9209,7 +9790,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/pgtable_types.h linux-2.6.38.7/ar #if PAGETABLE_LEVELS > 3 typedef struct { pudval_t pud; } pud_t; -@@ -219,8 +232,6 @@ static inline pudval_t native_pud_val(pu +@@ -219,8 +232,6 @@ static inline pudval_t native_pud_val(pud_t pud) return pud.pud; } #else @@ -9218,7 +9799,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/pgtable_types.h linux-2.6.38.7/ar static inline pudval_t native_pud_val(pud_t pud) { return native_pgd_val(pud.pgd); -@@ -240,8 +251,6 @@ static inline pmdval_t native_pmd_val(pm +@@ -240,8 +251,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd) return pmd.pmd; } #else @@ -9235,9 +9816,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/pgtable_types.h linux-2.6.38.7/ar #define pgprot_writecombine pgprot_writecombine extern pgprot_t pgprot_writecombine(pgprot_t prot); -diff -urNp linux-2.6.38.7/arch/x86/include/asm/processor.h linux-2.6.38.7/arch/x86/include/asm/processor.h ---- linux-2.6.38.7/arch/x86/include/asm/processor.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/processor.h 2011-05-11 18:34:57.000000000 -0400 +diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h +index 45636ce..1f19db8 100644 +--- a/arch/x86/include/asm/processor.h ++++ b/arch/x86/include/asm/processor.h @@ -270,7 +270,7 @@ struct tss_struct { } ____cacheline_aligned; @@ -9247,7 +9829,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/processor.h linux-2.6.38.7/arch/x /* * Save the original ist values for checking stack pointers during debugging -@@ -864,11 +864,18 @@ static inline void spin_lock_prefetch(co +@@ -864,11 +864,18 @@ static inline void spin_lock_prefetch(const void *x) */ #define TASK_SIZE PAGE_OFFSET #define TASK_SIZE_MAX TASK_SIZE @@ -9268,7 +9850,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/processor.h linux-2.6.38.7/arch/x .vm86_info = NULL, \ .sysenter_cs = __KERNEL_CS, \ .io_bitmap_ptr = NULL, \ -@@ -882,7 +889,7 @@ static inline void spin_lock_prefetch(co +@@ -882,7 +889,7 @@ static inline void spin_lock_prefetch(const void *x) */ #define INIT_TSS { \ .x86_tss = { \ @@ -9277,7 +9859,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/processor.h linux-2.6.38.7/arch/x .ss0 = __KERNEL_DS, \ .ss1 = __KERNEL_CS, \ .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \ -@@ -893,11 +900,7 @@ static inline void spin_lock_prefetch(co +@@ -893,11 +900,7 @@ static inline void spin_lock_prefetch(const void *x) extern unsigned long thread_saved_pc(struct task_struct *tsk); #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long)) @@ -9290,7 +9872,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/processor.h linux-2.6.38.7/arch/x /* * The below -8 is to reserve 8 bytes on top of the ring0 stack. -@@ -912,7 +915,7 @@ extern unsigned long thread_saved_pc(str +@@ -912,7 +915,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk); #define task_pt_regs(task) \ ({ \ struct pt_regs *__regs__; \ @@ -9299,7 +9881,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/processor.h linux-2.6.38.7/arch/x __regs__ - 1; \ }) -@@ -922,13 +925,13 @@ extern unsigned long thread_saved_pc(str +@@ -922,13 +925,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk); /* * User space process size. 47bits minus one guard page. */ @@ -9315,7 +9897,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/processor.h linux-2.6.38.7/arch/x #define TASK_SIZE (test_thread_flag(TIF_IA32) ? \ IA32_PAGE_OFFSET : TASK_SIZE_MAX) -@@ -939,11 +942,11 @@ extern unsigned long thread_saved_pc(str +@@ -939,11 +942,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk); #define STACK_TOP_MAX TASK_SIZE_MAX #define INIT_THREAD { \ @@ -9329,7 +9911,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/processor.h linux-2.6.38.7/arch/x } /* -@@ -965,6 +968,10 @@ extern void start_thread(struct pt_regs +@@ -965,6 +968,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip, */ #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3)) @@ -9340,10 +9922,11 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/processor.h linux-2.6.38.7/arch/x #define KSTK_EIP(task) (task_pt_regs(task)->ip) /* Get/set a process' ability to use the timestamp counter instruction */ -diff -urNp linux-2.6.38.7/arch/x86/include/asm/ptrace.h linux-2.6.38.7/arch/x86/include/asm/ptrace.h ---- linux-2.6.38.7/arch/x86/include/asm/ptrace.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/ptrace.h 2011-04-28 19:34:14.000000000 -0400 -@@ -152,28 +152,29 @@ static inline unsigned long regs_return_ +diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h +index 78cd1ea..37bd171 100644 +--- a/arch/x86/include/asm/ptrace.h ++++ b/arch/x86/include/asm/ptrace.h +@@ -152,28 +152,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs) } /* @@ -9379,9 +9962,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/ptrace.h linux-2.6.38.7/arch/x86/ #endif } -diff -urNp linux-2.6.38.7/arch/x86/include/asm/reboot.h linux-2.6.38.7/arch/x86/include/asm/reboot.h ---- linux-2.6.38.7/arch/x86/include/asm/reboot.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/reboot.h 2011-05-22 23:03:34.000000000 -0400 +diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h +index 562d4fd..49e31e7 100644 +--- a/arch/x86/include/asm/reboot.h ++++ b/arch/x86/include/asm/reboot.h @@ -6,19 +6,19 @@ struct pt_regs; @@ -9407,10 +9991,11 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/reboot.h linux-2.6.38.7/arch/x86/ typedef void (*nmi_shootdown_cb)(int, struct die_args*); void nmi_shootdown_cpus(nmi_shootdown_cb callback); -diff -urNp linux-2.6.38.7/arch/x86/include/asm/rwsem.h linux-2.6.38.7/arch/x86/include/asm/rwsem.h ---- linux-2.6.38.7/arch/x86/include/asm/rwsem.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/rwsem.h 2011-04-28 19:34:14.000000000 -0400 -@@ -118,6 +118,14 @@ static inline void __down_read(struct rw +diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h +index d1e41b0..e6de248 100644 +--- a/arch/x86/include/asm/rwsem.h ++++ b/arch/x86/include/asm/rwsem.h +@@ -118,6 +118,14 @@ static inline void __down_read(struct rw_semaphore *sem) { asm volatile("# beginning down_read\n\t" LOCK_PREFIX _ASM_INC "(%1)\n\t" @@ -9425,7 +10010,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/rwsem.h linux-2.6.38.7/arch/x86/i /* adds 0x00000001 */ " jns 1f\n" " call call_rwsem_down_read_failed\n" -@@ -139,6 +147,14 @@ static inline int __down_read_trylock(st +@@ -139,6 +147,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem) "1:\n\t" " mov %1,%2\n\t" " add %3,%2\n\t" @@ -9440,7 +10025,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/rwsem.h linux-2.6.38.7/arch/x86/i " jle 2f\n\t" LOCK_PREFIX " cmpxchg %2,%0\n\t" " jnz 1b\n\t" -@@ -158,6 +174,14 @@ static inline void __down_write_nested(s +@@ -158,6 +174,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass) rwsem_count_t tmp; asm volatile("# beginning down_write\n\t" LOCK_PREFIX " xadd %1,(%2)\n\t" @@ -9455,7 +10040,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/rwsem.h linux-2.6.38.7/arch/x86/i /* adds 0xffff0001, returns the old value */ " test %1,%1\n\t" /* was the count 0 before? */ -@@ -196,6 +220,14 @@ static inline void __up_read(struct rw_s +@@ -196,6 +220,14 @@ static inline void __up_read(struct rw_semaphore *sem) rwsem_count_t tmp; asm volatile("# beginning __up_read\n\t" LOCK_PREFIX " xadd %1,(%2)\n\t" @@ -9470,7 +10055,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/rwsem.h linux-2.6.38.7/arch/x86/i /* subtracts 1, returns the old value */ " jns 1f\n\t" " call call_rwsem_wake\n" /* expects old value in %edx */ -@@ -214,6 +246,14 @@ static inline void __up_write(struct rw_ +@@ -214,6 +246,14 @@ static inline void __up_write(struct rw_semaphore *sem) rwsem_count_t tmp; asm volatile("# beginning __up_write\n\t" LOCK_PREFIX " xadd %1,(%2)\n\t" @@ -9485,7 +10070,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/rwsem.h linux-2.6.38.7/arch/x86/i /* subtracts 0xffff0001, returns the old value */ " jns 1f\n\t" " call call_rwsem_wake\n" /* expects old value in %edx */ -@@ -231,6 +271,14 @@ static inline void __downgrade_write(str +@@ -231,6 +271,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem) { asm volatile("# beginning __downgrade_write\n\t" LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t" @@ -9500,7 +10085,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/rwsem.h linux-2.6.38.7/arch/x86/i /* * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386) * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64) -@@ -250,7 +298,15 @@ static inline void __downgrade_write(str +@@ -250,7 +298,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem) static inline void rwsem_atomic_add(rwsem_count_t delta, struct rw_semaphore *sem) { @@ -9517,7 +10102,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/rwsem.h linux-2.6.38.7/arch/x86/i : "+m" (sem->count) : "er" (delta)); } -@@ -263,7 +319,15 @@ static inline rwsem_count_t rwsem_atomic +@@ -263,7 +319,15 @@ static inline rwsem_count_t rwsem_atomic_update(rwsem_count_t delta, { rwsem_count_t tmp = delta; @@ -9534,9 +10119,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/rwsem.h linux-2.6.38.7/arch/x86/i : "+r" (tmp), "+m" (sem->count) : : "memory"); -diff -urNp linux-2.6.38.7/arch/x86/include/asm/segment.h linux-2.6.38.7/arch/x86/include/asm/segment.h ---- linux-2.6.38.7/arch/x86/include/asm/segment.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/segment.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h +index 231f1c1..538833a 100644 +--- a/arch/x86/include/asm/segment.h ++++ b/arch/x86/include/asm/segment.h @@ -62,8 +62,8 @@ * 26 - ESPFIX small SS * 27 - per-cpu [ offset to per-cpu data area ] @@ -9596,9 +10182,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/segment.h linux-2.6.38.7/arch/x86 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8) #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3) #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3) -diff -urNp linux-2.6.38.7/arch/x86/include/asm/smp.h linux-2.6.38.7/arch/x86/include/asm/smp.h ---- linux-2.6.38.7/arch/x86/include/asm/smp.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/smp.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h +index 1f46951..57ac225 100644 +--- a/arch/x86/include/asm/smp.h ++++ b/arch/x86/include/asm/smp.h @@ -24,7 +24,7 @@ extern unsigned int num_processors; DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map); DECLARE_PER_CPU(cpumask_var_t, cpu_core_map); @@ -9608,7 +10195,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/smp.h linux-2.6.38.7/arch/x86/inc static inline struct cpumask *cpu_sibling_mask(int cpu) { -@@ -172,14 +172,8 @@ extern unsigned disabled_cpus __cpuinitd +@@ -172,14 +172,8 @@ extern unsigned disabled_cpus __cpuinitdata; extern int safe_smp_processor_id(void); #elif defined(CONFIG_X86_64_SMP) @@ -9625,10 +10212,11 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/smp.h linux-2.6.38.7/arch/x86/inc #define safe_smp_processor_id() smp_processor_id() #endif -diff -urNp linux-2.6.38.7/arch/x86/include/asm/spinlock.h linux-2.6.38.7/arch/x86/include/asm/spinlock.h ---- linux-2.6.38.7/arch/x86/include/asm/spinlock.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/spinlock.h 2011-04-28 19:34:14.000000000 -0400 -@@ -249,6 +249,14 @@ static inline int arch_write_can_lock(ar +diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h +index 3089f70..db20eed 100644 +--- a/arch/x86/include/asm/spinlock.h ++++ b/arch/x86/include/asm/spinlock.h +@@ -249,6 +249,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock) static inline void arch_read_lock(arch_rwlock_t *rw) { asm volatile(LOCK_PREFIX " subl $1,(%0)\n\t" @@ -9643,7 +10231,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/spinlock.h linux-2.6.38.7/arch/x8 "jns 1f\n" "call __read_lock_failed\n\t" "1:\n" -@@ -258,6 +266,14 @@ static inline void arch_read_lock(arch_r +@@ -258,6 +266,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw) static inline void arch_write_lock(arch_rwlock_t *rw) { asm volatile(LOCK_PREFIX " subl %1,(%0)\n\t" @@ -9658,7 +10246,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/spinlock.h linux-2.6.38.7/arch/x8 "jz 1f\n" "call __write_lock_failed\n\t" "1:\n" -@@ -286,12 +302,29 @@ static inline int arch_write_trylock(arc +@@ -286,12 +302,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock) static inline void arch_read_unlock(arch_rwlock_t *rw) { @@ -9690,10 +10278,11 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/spinlock.h linux-2.6.38.7/arch/x8 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); } -diff -urNp linux-2.6.38.7/arch/x86/include/asm/stackprotector.h linux-2.6.38.7/arch/x86/include/asm/stackprotector.h ---- linux-2.6.38.7/arch/x86/include/asm/stackprotector.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/stackprotector.h 2011-04-28 19:34:14.000000000 -0400 -@@ -113,7 +113,7 @@ static inline void setup_stack_canary_se +diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h +index 1575177..dbc9f36 100644 +--- a/arch/x86/include/asm/stackprotector.h ++++ b/arch/x86/include/asm/stackprotector.h +@@ -113,7 +113,7 @@ static inline void setup_stack_canary_segment(int cpu) static inline void load_stack_canary_segment(void) { @@ -9702,9 +10291,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/stackprotector.h linux-2.6.38.7/a asm volatile ("mov %0, %%gs" : : "r" (0)); #endif } -diff -urNp linux-2.6.38.7/arch/x86/include/asm/stacktrace.h linux-2.6.38.7/arch/x86/include/asm/stacktrace.h ---- linux-2.6.38.7/arch/x86/include/asm/stacktrace.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/stacktrace.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h +index 52b5c7e..92a8655 100644 +--- a/arch/x86/include/asm/stacktrace.h ++++ b/arch/x86/include/asm/stacktrace.h @@ -11,28 +11,20 @@ extern int kstack_depth_to_print; @@ -9755,9 +10345,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/stacktrace.h linux-2.6.38.7/arch/ }; void dump_trace(struct task_struct *tsk, struct pt_regs *regs, -diff -urNp linux-2.6.38.7/arch/x86/include/asm/system.h linux-2.6.38.7/arch/x86/include/asm/system.h ---- linux-2.6.38.7/arch/x86/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/system.h 2011-05-22 23:03:34.000000000 -0400 +diff --git a/arch/x86/include/asm/system.h b/arch/x86/include/asm/system.h +index 33ecc3e..e936220 100644 +--- a/arch/x86/include/asm/system.h ++++ b/arch/x86/include/asm/system.h @@ -131,7 +131,7 @@ do { \ "call __switch_to\n\t" \ "movq "__percpu_arg([current_task])",%%rsi\n\t" \ @@ -9776,7 +10367,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/system.h linux-2.6.38.7/arch/x86/ [current_task] "m" (current_task) \ __switch_canary_iparam \ : "memory", "cc" __EXTRA_CLOBBER) -@@ -202,7 +202,7 @@ static inline unsigned long get_limit(un +@@ -202,7 +202,7 @@ static inline unsigned long get_limit(unsigned long segment) { unsigned long __limit; asm("lsll %1,%0" : "=r" (__limit) : "r" (segment)); @@ -9800,9 +10391,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/system.h linux-2.6.38.7/arch/x86/ /* * Force strict CPU ordering. -diff -urNp linux-2.6.38.7/arch/x86/include/asm/thread_info.h linux-2.6.38.7/arch/x86/include/asm/thread_info.h ---- linux-2.6.38.7/arch/x86/include/asm/thread_info.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/thread_info.h 2011-05-17 19:31:43.000000000 -0400 +diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h +index f0b6e5d..83cb269 100644 +--- a/arch/x86/include/asm/thread_info.h ++++ b/arch/x86/include/asm/thread_info.h @@ -10,6 +10,7 @@ #include <linux/compiler.h> #include <asm/page.h> @@ -9909,7 +10501,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/thread_info.h linux-2.6.38.7/arch /* * macros/functions for gaining access to the thread information structure * preempt_count needs to be 1 initially, until the scheduler is functional. -@@ -210,21 +199,8 @@ static inline struct thread_info *curren +@@ -210,21 +199,8 @@ static inline struct thread_info *current_thread_info(void) #ifndef __ASSEMBLY__ DECLARE_PER_CPU(unsigned long, kernel_stack); @@ -9950,10 +10542,233 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/thread_info.h linux-2.6.38.7/arch + #endif #endif /* _ASM_X86_THREAD_INFO_H */ -diff -urNp linux-2.6.38.7/arch/x86/include/asm/uaccess_32.h linux-2.6.38.7/arch/x86/include/asm/uaccess_32.h ---- linux-2.6.38.7/arch/x86/include/asm/uaccess_32.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/uaccess_32.h 2011-05-16 21:47:08.000000000 -0400 -@@ -44,6 +44,11 @@ unsigned long __must_check __copy_from_u +diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h +index 99f0ad7..a3b4be3 100644 +--- a/arch/x86/include/asm/uaccess.h ++++ b/arch/x86/include/asm/uaccess.h +@@ -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); ++ + /* + * 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) ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) ++void __set_fs(mm_segment_t x); ++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,12 +217,20 @@ extern int __get_user_bad(void); + asm volatile("call __put_user_" #size : "=a" (__ret_pu) \ + : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") + +- ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) ++#define __copyuser_seg "gs;" ++#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n" ++#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n" ++#else ++#define __copyuser_seg ++#define __COPYUSER_SET_ES ++#define __COPYUSER_RESTORE_ES ++#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("1: "__copyuser_seg"movl %%eax,0(%2)\n" \ ++ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \ + "3:\n" \ + ".section .fixup,\"ax\"\n" \ + "4: movl %3,%0\n" \ +@@ -200,8 +242,8 @@ extern int __get_user_bad(void); + : "A" (x), "r" (addr), "i" (errret), "0" (err)) + + #define __put_user_asm_ex_u64(x, addr) \ +- asm volatile("1: movl %%eax,0(%1)\n" \ +- "2: movl %%edx,4(%1)\n" \ ++ asm volatile("1: "__copyuser_seg"movl %%eax,0(%1)\n" \ ++ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \ + "3:\n" \ + _ASM_EXTABLE(1b, 2b - 1b) \ + _ASM_EXTABLE(2b, 3b - 2b) \ +@@ -374,7 +416,7 @@ 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("1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\ + "2:\n" \ + ".section .fixup,\"ax\"\n" \ + "3: mov %3,%0\n" \ +@@ -382,7 +424,7 @@ do { \ + " jmp 2b\n" \ + ".previous\n" \ + _ASM_EXTABLE(1b, 3b) \ +- : "=r" (err), ltype(x) \ ++ : "=r" (err), ltype (x) \ + : "m" (__m(addr)), "i" (errret), "0" (err)) + + #define __get_user_size_ex(x, ptr, size) \ +@@ -407,7 +449,7 @@ do { \ + } while (0) + + #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \ +- asm volatile("1: mov"itype" %1,%"rtype"0\n" \ ++ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\ + "2:\n" \ + _ASM_EXTABLE(1b, 2b - 1b) \ + : ltype(x) : "m" (__m(addr))) +@@ -424,13 +466,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,7 +491,7 @@ struct __large_struct { unsigned long buf[100]; }; + * aliasing issues. + */ + #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \ +- asm volatile("1: mov"itype" %"rtype"1,%2\n" \ ++ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\ + "2:\n" \ + ".section .fixup,\"ax\"\n" \ + "3: mov %3,%0\n" \ +@@ -446,10 +499,10 @@ struct __large_struct { unsigned long buf[100]; }; + ".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)) + + #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \ +- asm volatile("1: mov"itype" %"rtype"0,%1\n" \ ++ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\ + "2:\n" \ + _ASM_EXTABLE(1b, 2b - 1b) \ + : : ltype(x), "m" (__m(addr))) +@@ -488,8 +541,12 @@ struct __large_struct { unsigned long buf[100]; }; + * On error, the variable @x is set to zero. + */ + ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++#define __get_user(x, ptr) get_user((x), (ptr)) ++#else + #define __get_user(x, ptr) \ + __get_user_nocheck((x), (ptr), sizeof(*(ptr))) ++#endif + + /** + * __put_user: - Write a simple value into user space, with less checking. +@@ -511,8 +568,12 @@ struct __large_struct { unsigned long buf[100]; }; + * Returns zero on success, or -EFAULT on error. + */ + ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++#define __put_user(x, ptr) put_user((x), (ptr)) ++#else + #define __put_user(x, ptr) \ + __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr))) ++#endif + + #define __get_user_unaligned __get_user + #define __put_user_unaligned __put_user +@@ -530,7 +591,7 @@ struct __large_struct { unsigned long buf[100]; }; + #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 +628,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 --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h +index 088d09f..32f165f 100644 +--- a/arch/x86/include/asm/uaccess_32.h ++++ b/arch/x86/include/asm/uaccess_32.h +@@ -44,6 +44,11 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero static __always_inline unsigned long __must_check __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) { @@ -9965,7 +10780,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/uaccess_32.h linux-2.6.38.7/arch/ if (__builtin_constant_p(n)) { unsigned long ret; -@@ -62,6 +67,8 @@ __copy_to_user_inatomic(void __user *to, +@@ -62,6 +67,8 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) return ret; } } @@ -9974,7 +10789,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/uaccess_32.h linux-2.6.38.7/arch/ return __copy_to_user_ll(to, from, n); } -@@ -83,12 +90,16 @@ static __always_inline unsigned long __m +@@ -83,12 +90,16 @@ static __always_inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n) { might_fault(); @@ -10004,7 +10819,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/uaccess_32.h linux-2.6.38.7/arch/ if (__builtin_constant_p(n)) { unsigned long ret; -@@ -153,6 +170,8 @@ __copy_from_user(void *to, const void __ +@@ -153,6 +170,8 @@ __copy_from_user(void *to, const void __user *from, unsigned long n) return ret; } } @@ -10013,7 +10828,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/uaccess_32.h linux-2.6.38.7/arch/ return __copy_from_user_ll(to, from, n); } -@@ -160,6 +179,10 @@ static __always_inline unsigned long __c +@@ -160,6 +179,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to, const void __user *from, unsigned long n) { might_fault(); @@ -10051,7 +10866,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/uaccess_32.h linux-2.6.38.7/arch/ extern void copy_from_user_overflow(void) #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS -@@ -200,17 +227,61 @@ extern void copy_from_user_overflow(void +@@ -200,17 +227,61 @@ extern void copy_from_user_overflow(void) #endif ; @@ -10120,9 +10935,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/uaccess_32.h linux-2.6.38.7/arch/ return n; } -diff -urNp linux-2.6.38.7/arch/x86/include/asm/uaccess_64.h linux-2.6.38.7/arch/x86/include/asm/uaccess_64.h ---- linux-2.6.38.7/arch/x86/include/asm/uaccess_64.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/uaccess_64.h 2011-05-16 21:47:08.000000000 -0400 +diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h +index 316708d..4610991 100644 +--- a/arch/x86/include/asm/uaccess_64.h ++++ b/arch/x86/include/asm/uaccess_64.h @@ -11,6 +11,9 @@ #include <asm/alternative.h> #include <asm/cpufeature.h> @@ -10133,7 +10949,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/uaccess_64.h linux-2.6.38.7/arch/ /* * Copy To/From Userspace -@@ -37,26 +40,26 @@ copy_user_generic(void *to, const void * +@@ -37,26 +40,26 @@ copy_user_generic(void *to, const void *from, unsigned len) return ret; } @@ -10173,7 +10989,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/uaccess_64.h linux-2.6.38.7/arch/ return n; } -@@ -65,110 +68,198 @@ int copy_to_user(void __user *dst, const +@@ -65,110 +68,198 @@ int copy_to_user(void __user *dst, const void *src, unsigned size) { might_fault(); @@ -10402,7 +11218,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/uaccess_64.h linux-2.6.38.7/arch/ ret, "b", "b", "=q", 1); if (likely(!ret)) __put_user_asm(tmp, (u8 __user *)dst, -@@ -177,7 +268,7 @@ int __copy_in_user(void __user *dst, con +@@ -177,7 +268,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size) } case 2: { u16 tmp; @@ -10411,7 +11227,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/uaccess_64.h linux-2.6.38.7/arch/ ret, "w", "w", "=r", 2); if (likely(!ret)) __put_user_asm(tmp, (u16 __user *)dst, -@@ -187,7 +278,7 @@ int __copy_in_user(void __user *dst, con +@@ -187,7 +278,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size) case 4: { u32 tmp; @@ -10420,7 +11236,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/uaccess_64.h linux-2.6.38.7/arch/ ret, "l", "k", "=r", 4); if (likely(!ret)) __put_user_asm(tmp, (u32 __user *)dst, -@@ -196,7 +287,7 @@ int __copy_in_user(void __user *dst, con +@@ -196,7 +287,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size) } case 8: { u64 tmp; @@ -10429,7 +11245,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/uaccess_64.h linux-2.6.38.7/arch/ ret, "q", "", "=r", 8); if (likely(!ret)) __put_user_asm(tmp, (u64 __user *)dst, -@@ -204,8 +295,16 @@ int __copy_in_user(void __user *dst, con +@@ -204,8 +295,16 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size) return ret; } default: @@ -10447,7 +11263,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/uaccess_64.h linux-2.6.38.7/arch/ } } -@@ -222,33 +321,72 @@ __must_check unsigned long __clear_user( +@@ -222,33 +321,72 @@ __must_check unsigned long __clear_user(void __user *mem, unsigned long len); static __must_check __always_inline int __copy_from_user_inatomic(void *dst, const void __user *src, unsigned size) { @@ -10527,230 +11343,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/uaccess_64.h linux-2.6.38.7/arch/ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); #endif /* _ASM_X86_UACCESS_64_H */ -diff -urNp linux-2.6.38.7/arch/x86/include/asm/uaccess.h linux-2.6.38.7/arch/x86/include/asm/uaccess.h ---- linux-2.6.38.7/arch/x86/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/uaccess.h 2011-04-28 19:34:14.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); -+ - /* - * 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) -+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) -+void __set_fs(mm_segment_t x); -+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,12 +217,20 @@ extern int __get_user_bad(void); - asm volatile("call __put_user_" #size : "=a" (__ret_pu) \ - : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") - -- -+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) -+#define __copyuser_seg "gs;" -+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n" -+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n" -+#else -+#define __copyuser_seg -+#define __COPYUSER_SET_ES -+#define __COPYUSER_RESTORE_ES -+#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("1: "__copyuser_seg"movl %%eax,0(%2)\n" \ -+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \ - "3:\n" \ - ".section .fixup,\"ax\"\n" \ - "4: movl %3,%0\n" \ -@@ -200,8 +242,8 @@ extern int __get_user_bad(void); - : "A" (x), "r" (addr), "i" (errret), "0" (err)) - - #define __put_user_asm_ex_u64(x, addr) \ -- asm volatile("1: movl %%eax,0(%1)\n" \ -- "2: movl %%edx,4(%1)\n" \ -+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%1)\n" \ -+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \ - "3:\n" \ - _ASM_EXTABLE(1b, 2b - 1b) \ - _ASM_EXTABLE(2b, 3b - 2b) \ -@@ -374,7 +416,7 @@ 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("1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\ - "2:\n" \ - ".section .fixup,\"ax\"\n" \ - "3: mov %3,%0\n" \ -@@ -382,7 +424,7 @@ do { \ - " jmp 2b\n" \ - ".previous\n" \ - _ASM_EXTABLE(1b, 3b) \ -- : "=r" (err), ltype(x) \ -+ : "=r" (err), ltype (x) \ - : "m" (__m(addr)), "i" (errret), "0" (err)) - - #define __get_user_size_ex(x, ptr, size) \ -@@ -407,7 +449,7 @@ do { \ - } while (0) - - #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \ -- asm volatile("1: mov"itype" %1,%"rtype"0\n" \ -+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\ - "2:\n" \ - _ASM_EXTABLE(1b, 2b - 1b) \ - : ltype(x) : "m" (__m(addr))) -@@ -424,13 +466,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,7 +491,7 @@ 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("1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\ - "2:\n" \ - ".section .fixup,\"ax\"\n" \ - "3: mov %3,%0\n" \ -@@ -446,10 +499,10 @@ struct __large_struct { unsigned long bu - ".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)) - - #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \ -- asm volatile("1: mov"itype" %"rtype"0,%1\n" \ -+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\ - "2:\n" \ - _ASM_EXTABLE(1b, 2b - 1b) \ - : : ltype(x), "m" (__m(addr))) -@@ -488,8 +541,12 @@ struct __large_struct { unsigned long bu - * On error, the variable @x is set to zero. - */ - -+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) -+#define __get_user(x, ptr) get_user((x), (ptr)) -+#else - #define __get_user(x, ptr) \ - __get_user_nocheck((x), (ptr), sizeof(*(ptr))) -+#endif - - /** - * __put_user: - Write a simple value into user space, with less checking. -@@ -511,8 +568,12 @@ struct __large_struct { unsigned long bu - * Returns zero on success, or -EFAULT on error. - */ - -+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) -+#define __put_user(x, ptr) put_user((x), (ptr)) -+#else - #define __put_user(x, ptr) \ - __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr))) -+#endif - - #define __get_user_unaligned __get_user - #define __put_user_unaligned __put_user -@@ -530,7 +591,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 +628,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.38.7/arch/x86/include/asm/vgtod.h linux-2.6.38.7/arch/x86/include/asm/vgtod.h ---- linux-2.6.38.7/arch/x86/include/asm/vgtod.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/vgtod.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/vgtod.h b/arch/x86/include/asm/vgtod.h +index 3d61e20..9507180 100644 +--- a/arch/x86/include/asm/vgtod.h ++++ b/arch/x86/include/asm/vgtod.h @@ -14,6 +14,7 @@ struct vsyscall_gtod_data { int sysctl_enabled; struct timezone sys_tz; @@ -10759,9 +11355,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/vgtod.h linux-2.6.38.7/arch/x86/i cycle_t (*vread)(void); cycle_t cycle_last; cycle_t mask; -diff -urNp linux-2.6.38.7/arch/x86/include/asm/vsyscall.h linux-2.6.38.7/arch/x86/include/asm/vsyscall.h ---- linux-2.6.38.7/arch/x86/include/asm/vsyscall.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/vsyscall.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/include/asm/vsyscall.h b/arch/x86/include/asm/vsyscall.h +index d0983d2..1f7c9e9 100644 +--- a/arch/x86/include/asm/vsyscall.h ++++ b/arch/x86/include/asm/vsyscall.h @@ -15,9 +15,10 @@ enum vsyscall_num { #ifdef __KERNEL__ @@ -10792,10 +11389,11 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/vsyscall.h linux-2.6.38.7/arch/x8 #endif /* __KERNEL__ */ #endif /* _ASM_X86_VSYSCALL_H */ -diff -urNp linux-2.6.38.7/arch/x86/include/asm/xsave.h linux-2.6.38.7/arch/x86/include/asm/xsave.h ---- linux-2.6.38.7/arch/x86/include/asm/xsave.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/include/asm/xsave.h 2011-04-28 19:34:14.000000000 -0400 -@@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav +diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h +index c6ce245..c053b0b 100644 +--- a/arch/x86/include/asm/xsave.h ++++ b/arch/x86/include/asm/xsave.h +@@ -65,6 +65,11 @@ static inline int xsave_user(struct xsave_struct __user *buf) { int err; @@ -10807,7 +11405,7 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/xsave.h linux-2.6.38.7/arch/x86/i /* * Clear the xsave header first, so that reserved fields are * initialized to zero. -@@ -100,6 +105,11 @@ static inline int xrestore_user(struct x +@@ -100,6 +105,11 @@ static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask) u32 lmask = mask; u32 hmask = mask >> 32; @@ -10819,144 +11417,10 @@ diff -urNp linux-2.6.38.7/arch/x86/include/asm/xsave.h linux-2.6.38.7/arch/x86/i __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" "2:\n" ".section .fixup,\"ax\"\n" -diff -urNp linux-2.6.38.7/arch/x86/Kconfig linux-2.6.38.7/arch/x86/Kconfig ---- linux-2.6.38.7/arch/x86/Kconfig 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/Kconfig 2011-04-28 19:34:14.000000000 -0400 -@@ -223,7 +223,7 @@ config X86_TRAMPOLINE - - config X86_32_LAZY_GS - def_bool y -- depends on X86_32 && !CC_STACKPROTECTOR -+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF - - config ARCH_HWEIGHT_CFLAGS - string -@@ -1019,7 +1019,7 @@ choice - - config NOHIGHMEM - bool "off" -- depends on !X86_NUMAQ -+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE) - ---help--- - Linux can use up to 64 Gigabytes of physical memory on x86 systems. - However, the address space of 32-bit x86 processors is only 4 -@@ -1056,7 +1056,7 @@ config NOHIGHMEM - - config HIGHMEM4G - bool "4GB" -- depends on !X86_NUMAQ -+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE) - ---help--- - Select this if you have a 32-bit processor and between 1 and 4 - gigabytes of physical RAM. -@@ -1110,7 +1110,7 @@ config PAGE_OFFSET - 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 -@@ -1454,7 +1454,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). -@@ -1484,6 +1484,7 @@ config SECCOMP - - config CC_STACKPROTECTOR - bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" -+ depends on X86_64 || !PAX_MEMORY_UDEREF - ---help--- - This option turns on the -fstack-protector GCC feature. This - feature puts, at the beginning of functions, a canary value on -@@ -1541,6 +1542,7 @@ config KEXEC_JUMP - config PHYSICAL_START - hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP) - default "0x1000000" -+ range 0x400000 0x40000000 - ---help--- - This gives the physical address where the kernel is loaded. - -@@ -1604,6 +1606,7 @@ config X86_NEED_RELOCS - config PHYSICAL_ALIGN - hex "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 -@@ -1635,9 +1638,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.38.7/arch/x86/Kconfig.cpu linux-2.6.38.7/arch/x86/Kconfig.cpu ---- linux-2.6.38.7/arch/x86/Kconfig.cpu 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/Kconfig.cpu 2011-04-28 19:34:14.000000000 -0400 -@@ -339,7 +339,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_INVD_BUG - def_bool y -@@ -363,7 +363,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 -@@ -409,7 +409,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.38.7/arch/x86/Kconfig.debug linux-2.6.38.7/arch/x86/Kconfig.debug ---- linux-2.6.38.7/arch/x86/Kconfig.debug 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/Kconfig.debug 2011-04-28 19:34:14.000000000 -0400 -@@ -101,7 +101,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 -@@ -119,7 +119,7 @@ config DEBUG_RODATA_TEST - - config DEBUG_SET_MODULE_RONX - bool "Set loadable kernel module data as NX and text as RO" -- depends on MODULES -+ depends on MODULES && BROKEN - ---help--- - This option helps catch unintended modifications to loadable - kernel module's text and read-only data. It also prevents execution -diff -urNp linux-2.6.38.7/arch/x86/kernel/acpi/sleep.c linux-2.6.38.7/arch/x86/kernel/acpi/sleep.c ---- linux-2.6.38.7/arch/x86/kernel/acpi/sleep.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/acpi/sleep.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c +index 68d1537..83b0146 100644 +--- a/arch/x86/kernel/acpi/sleep.c ++++ b/arch/x86/kernel/acpi/sleep.c @@ -18,7 +18,7 @@ #include "realmode/wakeup.h" #include "sleep.h" @@ -10979,9 +11443,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/acpi/sleep.c linux-2.6.38.7/arch/x86/k initial_gs = per_cpu_offset(smp_processor_id()); #endif initial_code = (unsigned long)wakeup_long64; -diff -urNp linux-2.6.38.7/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.38.7/arch/x86/kernel/acpi/wakeup_32.S ---- linux-2.6.38.7/arch/x86/kernel/acpi/wakeup_32.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/acpi/wakeup_32.S 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S +index 13ab720..95d5442 100644 +--- a/arch/x86/kernel/acpi/wakeup_32.S ++++ b/arch/x86/kernel/acpi/wakeup_32.S @@ -30,13 +30,11 @@ wakeup_pmode_return: # and restore the stack ... but you need gdt for this to work movl saved_context_esp, %esp @@ -10998,10 +11463,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.38.7/arch/x bogus_magic: jmp bogus_magic -diff -urNp linux-2.6.38.7/arch/x86/kernel/alternative.c linux-2.6.38.7/arch/x86/kernel/alternative.c ---- linux-2.6.38.7/arch/x86/kernel/alternative.c 2011-04-18 17:27:13.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/alternative.c 2011-04-28 19:34:14.000000000 -0400 -@@ -248,7 +248,7 @@ static void alternatives_smp_lock(const +diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c +index 4db3554..c9ea243 100644 +--- a/arch/x86/kernel/alternative.c ++++ b/arch/x86/kernel/alternative.c +@@ -248,7 +248,7 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end, if (!*poff || ptr < text || ptr >= text_end) continue; /* turn DS segment override prefix into lock prefix */ @@ -11010,7 +11476,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/alternative.c linux-2.6.38.7/arch/x86/ text_poke(ptr, ((unsigned char []){0xf0}), 1); }; mutex_unlock(&text_mutex); -@@ -269,7 +269,7 @@ static void alternatives_smp_unlock(cons +@@ -269,7 +269,7 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end, if (!*poff || ptr < text || ptr >= text_end) continue; /* turn lock prefix into DS segment override prefix */ @@ -11019,7 +11485,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/alternative.c linux-2.6.38.7/arch/x86/ text_poke(ptr, ((unsigned char []){0x3E}), 1); }; mutex_unlock(&text_mutex); -@@ -438,7 +438,7 @@ void __init_or_module apply_paravirt(str +@@ -438,7 +438,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start, BUG_ON(p->len > MAX_PATCH_LEN); /* prep the buffer with the original instructions */ @@ -11028,7 +11494,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/alternative.c linux-2.6.38.7/arch/x86/ used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf, (unsigned long)p->instr, p->len); -@@ -506,7 +506,7 @@ void __init alternative_instructions(voi +@@ -506,7 +506,7 @@ void __init alternative_instructions(void) if (smp_alt_once) free_init_pages("SMP alternatives", (unsigned long)__smp_locks, @@ -11037,7 +11503,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/alternative.c linux-2.6.38.7/arch/x86/ restart_nmi(); } -@@ -523,13 +523,17 @@ void __init alternative_instructions(voi +@@ -523,13 +523,17 @@ void __init alternative_instructions(void) * instructions. And on the local CPU you need to be protected again NMI or MCE * handlers seeing an inconsistent instruction while you patch. */ @@ -11057,7 +11523,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/alternative.c linux-2.6.38.7/arch/x86/ local_irq_restore(flags); /* Could also do a CLFLUSH here to speed up CPU recovery; but that causes hangs on some VIA CPUs. */ -@@ -551,36 +555,22 @@ void *__init_or_module text_poke_early(v +@@ -551,36 +555,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode, */ void *__kprobes text_poke(void *addr, const void *opcode, size_t len) { @@ -11102,7 +11568,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/alternative.c linux-2.6.38.7/arch/x86/ return addr; } -@@ -682,9 +672,9 @@ void __kprobes text_poke_smp_batch(struc +@@ -682,9 +672,9 @@ void __kprobes text_poke_smp_batch(struct text_poke_param *params, int n) #if defined(CONFIG_DYNAMIC_FTRACE) || defined(HAVE_JUMP_LABEL) #ifdef CONFIG_X86_64 @@ -11114,10 +11580,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/alternative.c linux-2.6.38.7/arch/x86/ #endif void __init arch_init_ideal_nop5(void) -diff -urNp linux-2.6.38.7/arch/x86/kernel/amd_iommu.c linux-2.6.38.7/arch/x86/kernel/amd_iommu.c ---- linux-2.6.38.7/arch/x86/kernel/amd_iommu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/amd_iommu.c 2011-04-28 19:34:14.000000000 -0400 -@@ -2286,7 +2286,7 @@ static void prealloc_protection_domains( +diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c +index 57ca777..c96fb4d 100644 +--- a/arch/x86/kernel/amd_iommu.c ++++ b/arch/x86/kernel/amd_iommu.c +@@ -2286,7 +2286,7 @@ static void prealloc_protection_domains(void) } } @@ -11126,10 +11593,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/amd_iommu.c linux-2.6.38.7/arch/x86/ke .alloc_coherent = alloc_coherent, .free_coherent = free_coherent, .map_page = map_page, -diff -urNp linux-2.6.38.7/arch/x86/kernel/apic/apic.c linux-2.6.38.7/arch/x86/kernel/apic/apic.c ---- linux-2.6.38.7/arch/x86/kernel/apic/apic.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/apic/apic.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1819,7 +1819,7 @@ void smp_error_interrupt(struct pt_regs +diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c +index 76b96d7..38e29bd 100644 +--- a/arch/x86/kernel/apic/apic.c ++++ b/arch/x86/kernel/apic/apic.c +@@ -1819,7 +1819,7 @@ void smp_error_interrupt(struct pt_regs *regs) apic_write(APIC_ESR, 0); v1 = apic_read(APIC_ESR); ack_APIC_irq(); @@ -11138,7 +11606,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/apic/apic.c linux-2.6.38.7/arch/x86/ke /* * Here is what the APIC error bits mean: -@@ -2209,6 +2209,8 @@ static int __cpuinit apic_cluster_num(vo +@@ -2209,6 +2209,8 @@ static int __cpuinit apic_cluster_num(void) u16 *bios_cpu_apicid; DECLARE_BITMAP(clustermap, NUM_APIC_CLUSTERS); @@ -11147,12 +11615,13 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/apic/apic.c linux-2.6.38.7/arch/x86/ke bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid); bitmap_zero(clustermap, NUM_APIC_CLUSTERS); -diff -urNp linux-2.6.38.7/arch/x86/kernel/apic/io_apic.c linux-2.6.38.7/arch/x86/kernel/apic/io_apic.c ---- linux-2.6.38.7/arch/x86/kernel/apic/io_apic.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/apic/io_apic.c 2011-04-28 19:57:25.000000000 -0400 -@@ -617,7 +617,7 @@ struct IO_APIC_route_entry **alloc_ioapi +diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c +index e437778..12219e2 100644 +--- a/arch/x86/kernel/apic/io_apic.c ++++ b/arch/x86/kernel/apic/io_apic.c +@@ -617,7 +617,7 @@ struct IO_APIC_route_entry **alloc_ioapic_entries(void) ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, - GFP_KERNEL); + GFP_ATOMIC); if (!ioapic_entries) - return 0; + return NULL; @@ -11168,7 +11637,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/apic/io_apic.c linux-2.6.38.7/arch/x86 } /* -@@ -1044,7 +1044,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, +@@ -1044,7 +1044,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin, } EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector); @@ -11186,7 +11655,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/apic/io_apic.c linux-2.6.38.7/arch/x86 { raw_spin_unlock(&vector_lock); } -@@ -2409,7 +2409,7 @@ static void ack_apic_edge(struct irq_dat +@@ -2409,7 +2409,7 @@ static void ack_apic_edge(struct irq_data *data) ack_APIC_irq(); } @@ -11195,7 +11664,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/apic/io_apic.c linux-2.6.38.7/arch/x86 /* * IO-APIC versions below 0x20 don't support EOI register. -@@ -2517,7 +2517,7 @@ static void ack_apic_level(struct irq_da +@@ -2517,7 +2517,7 @@ static void ack_apic_level(struct irq_data *data) * at the cpu. */ if (!(v & (1 << (i & 0x1f)))) { @@ -11204,9 +11673,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/apic/io_apic.c linux-2.6.38.7/arch/x86 eoi_ioapic_irq(irq, cfg); } -diff -urNp linux-2.6.38.7/arch/x86/kernel/apm_32.c linux-2.6.38.7/arch/x86/kernel/apm_32.c ---- linux-2.6.38.7/arch/x86/kernel/apm_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/apm_32.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c +index 0e4f24c..5846003 100644 +--- a/arch/x86/kernel/apm_32.c ++++ b/arch/x86/kernel/apm_32.c @@ -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. @@ -11239,7 +11709,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/apm_32.c linux-2.6.38.7/arch/x86/kerne put_cpu(); return call->eax & 0xff; -@@ -664,7 +671,10 @@ static long __apm_bios_call_simple(void +@@ -664,7 +671,10 @@ static long __apm_bios_call_simple(void *_call) BUG_ON(cpu != 0); gdt = get_cpu_gdt_table(cpu); save_desc_40 = gdt[0x40 / 8]; @@ -11250,7 +11720,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/apm_32.c linux-2.6.38.7/arch/x86/kerne apm_irq_save(flags); APM_DO_SAVE_SEGS; -@@ -672,7 +682,11 @@ static long __apm_bios_call_simple(void +@@ -672,7 +682,11 @@ static long __apm_bios_call_simple(void *_call) &call->eax); APM_DO_RESTORE_SEGS; apm_irq_restore(flags); @@ -11287,9 +11757,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/apm_32.c linux-2.6.38.7/arch/x86/kerne proc_create("apm", 0, NULL, &apm_file_ops); -diff -urNp linux-2.6.38.7/arch/x86/kernel/asm-offsets_32.c linux-2.6.38.7/arch/x86/kernel/asm-offsets_32.c ---- linux-2.6.38.7/arch/x86/kernel/asm-offsets_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/asm-offsets_32.c 2011-05-16 21:47:08.000000000 -0400 +diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c +index 1a4088d..b602207 100644 +--- a/arch/x86/kernel/asm-offsets_32.c ++++ b/arch/x86/kernel/asm-offsets_32.c @@ -51,7 +51,6 @@ void foo(void) OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id); BLANK(); @@ -11319,9 +11790,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/asm-offsets_32.c linux-2.6.38.7/arch/x #endif #ifdef CONFIG_XEN -diff -urNp linux-2.6.38.7/arch/x86/kernel/asm-offsets_64.c linux-2.6.38.7/arch/x86/kernel/asm-offsets_64.c ---- linux-2.6.38.7/arch/x86/kernel/asm-offsets_64.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/asm-offsets_64.c 2011-05-16 21:47:08.000000000 -0400 +diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c +index 4a6aeed..068406a 100644 +--- a/arch/x86/kernel/asm-offsets_64.c ++++ b/arch/x86/kernel/asm-offsets_64.c @@ -44,6 +44,8 @@ int main(void) ENTRY(addr_limit); ENTRY(preempt_count); @@ -11366,10 +11838,26 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/asm-offsets_64.c linux-2.6.38.7/arch/x #ifdef CONFIG_XEN BLANK(); OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask); -diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/amd.c linux-2.6.38.7/arch/x86/kernel/cpu/amd.c ---- linux-2.6.38.7/arch/x86/kernel/cpu/amd.c 2011-05-22 23:05:18.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/cpu/amd.c 2011-05-22 23:05:54.000000000 -0400 -@@ -624,7 +624,7 @@ static unsigned int __cpuinit amd_size_c +diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile +index 3f0ebe4..0701a65 100644 +--- a/arch/x86/kernel/cpu/Makefile ++++ b/arch/x86/kernel/cpu/Makefile +@@ -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 scattered.o topology.o + obj-y += proc.o capflags.o powerflags.o common.o + obj-y += vmware.o hypervisor.o sched.o mshyperv.o +diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c +index e19776f..83efccf 100644 +--- a/arch/x86/kernel/cpu/amd.c ++++ b/arch/x86/kernel/cpu/amd.c +@@ -630,7 +630,7 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c, unsigned int size) { /* AMD errata T13 (order #21922) */ @@ -11378,10 +11866,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/amd.c linux-2.6.38.7/arch/x86/kern /* Duron Rev A0 */ if (c->x86_model == 3 && c->x86_mask == 0) size = 64; -diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/common.c linux-2.6.38.7/arch/x86/kernel/cpu/common.c ---- linux-2.6.38.7/arch/x86/kernel/cpu/common.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/cpu/common.c 2011-05-11 18:34:57.000000000 -0400 -@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon +diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c +index a9c7d7d..9778d2e 100644 +--- a/arch/x86/kernel/cpu/common.c ++++ b/arch/x86/kernel/cpu/common.c +@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitconst default_cpu = { static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; @@ -11451,7 +11940,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/common.c linux-2.6.38.7/arch/x86/k gdt_descr.size = GDT_SIZE - 1; load_gdt(&gdt_descr); /* Reload the per-cpu base */ -@@ -825,6 +771,10 @@ static void __cpuinit identify_cpu(struc +@@ -824,6 +770,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c) /* Filter out anything that depends on CPUID levels we don't have */ filter_cpuid_features(c, true); @@ -11462,7 +11951,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/common.c linux-2.6.38.7/arch/x86/k /* If the model name is still unset, do table lookup. */ if (!c->x86_model_id[0]) { const char *p; -@@ -1004,6 +954,9 @@ static __init int setup_disablecpuid(cha +@@ -1003,6 +953,9 @@ static __init int setup_disablecpuid(char *arg) } __setup("clearcpuid=", setup_disablecpuid); @@ -11472,7 +11961,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/common.c linux-2.6.38.7/arch/x86/k #ifdef CONFIG_X86_64 struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table }; -@@ -1019,7 +972,7 @@ DEFINE_PER_CPU(struct task_struct *, cur +@@ -1018,7 +971,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned = EXPORT_PER_CPU_SYMBOL(current_task); DEFINE_PER_CPU(unsigned long, kernel_stack) = @@ -11481,7 +11970,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/common.c linux-2.6.38.7/arch/x86/k EXPORT_PER_CPU_SYMBOL(kernel_stack); DEFINE_PER_CPU(char *, irq_stack_ptr) = -@@ -1084,7 +1037,7 @@ struct pt_regs * __cpuinit idle_regs(str +@@ -1083,7 +1036,7 @@ struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs) { memset(regs, 0, sizeof(struct pt_regs)); regs->fs = __KERNEL_PERCPU; @@ -11490,7 +11979,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/common.c linux-2.6.38.7/arch/x86/k return regs; } -@@ -1139,7 +1092,7 @@ void __cpuinit cpu_init(void) +@@ -1138,7 +1091,7 @@ void __cpuinit cpu_init(void) int i; cpu = stack_smp_processor_id(); @@ -11499,7 +11988,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/common.c linux-2.6.38.7/arch/x86/k oist = &per_cpu(orig_ist, cpu); #ifdef CONFIG_NUMA -@@ -1165,7 +1118,7 @@ void __cpuinit cpu_init(void) +@@ -1164,7 +1117,7 @@ void __cpuinit cpu_init(void) switch_to_new_gdt(cpu); loadsegment(fs, 0); @@ -11508,7 +11997,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/common.c linux-2.6.38.7/arch/x86/k memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8); syscall_init(); -@@ -1174,7 +1127,6 @@ void __cpuinit cpu_init(void) +@@ -1173,7 +1126,6 @@ void __cpuinit cpu_init(void) wrmsrl(MSR_KERNEL_GS_BASE, 0); barrier(); @@ -11516,7 +12005,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/common.c linux-2.6.38.7/arch/x86/k if (cpu != 0) enable_x2apic(); -@@ -1228,7 +1180,7 @@ void __cpuinit cpu_init(void) +@@ -1227,7 +1179,7 @@ void __cpuinit cpu_init(void) { int cpu = smp_processor_id(); struct task_struct *curr = current; @@ -11525,10 +12014,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/common.c linux-2.6.38.7/arch/x86/k struct thread_struct *thread = &curr->thread; if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { -diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/intel.c linux-2.6.38.7/arch/x86/kernel/cpu/intel.c ---- linux-2.6.38.7/arch/x86/kernel/cpu/intel.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/cpu/intel.c 2011-04-28 19:34:14.000000000 -0400 -@@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug +diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c +index d16c2c5..0f6acb6 100644 +--- a/arch/x86/kernel/cpu/intel.c ++++ b/arch/x86/kernel/cpu/intel.c +@@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug(void) * Update the IDT descriptor and reload the IDT so that * it uses the read-only mapped virtual address. */ @@ -11537,23 +12027,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/intel.c linux-2.6.38.7/arch/x86/ke load_idt(&idt_descr); } #endif -diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/Makefile linux-2.6.38.7/arch/x86/kernel/cpu/Makefile ---- linux-2.6.38.7/arch/x86/kernel/cpu/Makefile 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/cpu/Makefile 2011-04-28 19:34: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 scattered.o topology.o - obj-y += proc.o capflags.o powerflags.o common.o - obj-y += vmware.o hypervisor.o sched.o mshyperv.o -diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38.7/arch/x86/kernel/cpu/mcheck/mce.c ---- linux-2.6.38.7/arch/x86/kernel/cpu/mcheck/mce.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/cpu/mcheck/mce.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c +index d916183..12ce62c 100644 +--- a/arch/x86/kernel/cpu/mcheck/mce.c ++++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -45,6 +45,7 @@ #include <asm/ipi.h> #include <asm/mce.h> @@ -11584,7 +12061,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38.7/arch/x /* Panic in progress. Enable interrupts and wait for final IPI */ static void wait_for_panic(void) -@@ -270,7 +271,7 @@ static void mce_panic(char *msg, struct +@@ -270,7 +271,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp) /* * Make sure only one CPU runs in machine check panic */ @@ -11593,7 +12070,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38.7/arch/x wait_for_panic(); barrier(); -@@ -278,7 +279,7 @@ static void mce_panic(char *msg, struct +@@ -278,7 +279,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp) console_verbose(); } else { /* Don't log too much for fake panic */ @@ -11611,7 +12088,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38.7/arch/x wait_for_panic(); if (!monarch_timeout) goto out; -@@ -1460,14 +1461,14 @@ void __cpuinit mcheck_cpu_init(struct cp +@@ -1460,14 +1461,14 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c) */ static DEFINE_SPINLOCK(mce_state_lock); @@ -11628,7 +12105,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38.7/arch/x spin_unlock(&mce_state_lock); return -EBUSY; -@@ -1475,7 +1476,7 @@ static int mce_open(struct inode *inode, +@@ -1475,7 +1476,7 @@ static int mce_open(struct inode *inode, struct file *file) if (file->f_flags & O_EXCL) open_exclu = 1; @@ -11637,7 +12114,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38.7/arch/x spin_unlock(&mce_state_lock); -@@ -1486,7 +1487,7 @@ static int mce_release(struct inode *ino +@@ -1486,7 +1487,7 @@ static int mce_release(struct inode *inode, struct file *file) { spin_lock(&mce_state_lock); @@ -11646,7 +12123,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38.7/arch/x open_exclu = 0; spin_unlock(&mce_state_lock); -@@ -1658,8 +1659,7 @@ static long mce_ioctl(struct file *f, un +@@ -1658,8 +1659,7 @@ static long mce_ioctl(struct file *f, unsigned int cmd, unsigned long arg) } } @@ -11665,9 +12142,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38.7/arch/x atomic_set(&mce_executing, 0); atomic_set(&mce_callin, 0); atomic_set(&global_nwo, 0); -diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.38.7/arch/x86/kernel/cpu/mtrr/main.c ---- linux-2.6.38.7/arch/x86/kernel/cpu/mtrr/main.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/cpu/mtrr/main.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c +index 151787e..be026bb 100644 +--- a/arch/x86/kernel/cpu/mtrr/main.c ++++ b/arch/x86/kernel/cpu/mtrr/main.c @@ -61,7 +61,7 @@ static DEFINE_MUTEX(mtrr_mutex); u64 size_or_mask, size_and_mask; static bool mtrr_aps_delayed_init; @@ -11677,9 +12155,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.38.7/arch/x8 const struct mtrr_ops *mtrr_if; -diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.38.7/arch/x86/kernel/cpu/mtrr/mtrr.h ---- linux-2.6.38.7/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h +index df5e41f..d94607c 100644 +--- a/arch/x86/kernel/cpu/mtrr/mtrr.h ++++ b/arch/x86/kernel/cpu/mtrr/mtrr.h @@ -12,19 +12,19 @@ extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; @@ -11708,10 +12187,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.38.7/arch/x8 }; extern int generic_get_free_region(unsigned long base, unsigned long size, -diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/perf_event.c linux-2.6.38.7/arch/x86/kernel/cpu/perf_event.c ---- linux-2.6.38.7/arch/x86/kernel/cpu/perf_event.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/cpu/perf_event.c 2011-05-16 21:47:08.000000000 -0400 -@@ -674,6 +674,8 @@ static int x86_schedule_events(struct cp +diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c +index 9d977a2..4cb7dca 100644 +--- a/arch/x86/kernel/cpu/perf_event.c ++++ b/arch/x86/kernel/cpu/perf_event.c +@@ -674,6 +674,8 @@ static int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign) int i, j, w, wmax, num = 0; struct hw_perf_event *hwc; @@ -11720,7 +12200,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/perf_event.c linux-2.6.38.7/arch/x bitmap_zero(used_mask, X86_PMC_IDX_MAX); for (i = 0; i < n; i++) { -@@ -1781,7 +1783,7 @@ perf_callchain_user(struct perf_callchai +@@ -1781,7 +1783,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs) break; perf_callchain_store(entry, frame.return_address); @@ -11729,10 +12209,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/cpu/perf_event.c linux-2.6.38.7/arch/x } } -diff -urNp linux-2.6.38.7/arch/x86/kernel/crash.c linux-2.6.38.7/arch/x86/kernel/crash.c ---- linux-2.6.38.7/arch/x86/kernel/crash.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/crash.c 2011-04-28 19:34:14.000000000 -0400 -@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, +diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c +index 764c7c2..c5d9c7b 100644 +--- a/arch/x86/kernel/crash.c ++++ b/arch/x86/kernel/crash.c +@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, struct die_args *args) regs = args->regs; #ifdef CONFIG_X86_32 @@ -11741,9 +12222,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/crash.c linux-2.6.38.7/arch/x86/kernel crash_fixup_ss_esp(&fixed_regs, regs); regs = &fixed_regs; } -diff -urNp linux-2.6.38.7/arch/x86/kernel/doublefault_32.c linux-2.6.38.7/arch/x86/kernel/doublefault_32.c ---- linux-2.6.38.7/arch/x86/kernel/doublefault_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/doublefault_32.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c +index 37250fe..bf2ec74 100644 +--- a/arch/x86/kernel/doublefault_32.c ++++ b/arch/x86/kernel/doublefault_32.c @@ -11,7 +11,7 @@ #define DOUBLEFAULT_STACKSIZE (1024) @@ -11762,7 +12244,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/doublefault_32.c linux-2.6.38.7/arch/x printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size); -@@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cach +@@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = { /* 0x2 bit is always set */ .flags = X86_EFLAGS_SF | 0x2, .sp = STACK_START, @@ -11775,130 +12257,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/doublefault_32.c linux-2.6.38.7/arch/x .fs = __KERNEL_PERCPU, .__cr3 = __pa_nodebug(swapper_pg_dir), -diff -urNp linux-2.6.38.7/arch/x86/kernel/dumpstack_32.c linux-2.6.38.7/arch/x86/kernel/dumpstack_32.c ---- linux-2.6.38.7/arch/x86/kernel/dumpstack_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/dumpstack_32.c 2011-04-28 19:34:14.000000000 -0400 -@@ -37,15 +37,12 @@ void dump_trace(struct task_struct *task - - bp = stack_frame(task, regs); - for (;;) { -- struct thread_info *context; -+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1)); -+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph); - -- context = (struct thread_info *) -- ((unsigned long)stack & (~(THREAD_SIZE - 1))); -- bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph); -- -- stack = (unsigned long *)context->previous_esp; -- if (!stack) -+ if (stack_start == task_stack_page(task)) - break; -+ stack = *(unsigned long **)stack_start; - if (ops->stack(data, "IRQ") < 0) - break; - touch_nmi_watchdog(); -@@ -95,21 +92,22 @@ void show_registers(struct pt_regs *regs - * When in-kernel, we also print out the stack and code at the - * time of the fault.. - */ -- if (!user_mode_vm(regs)) { -+ if (!user_mode(regs)) { - unsigned int code_prologue = code_bytes * 43 / 64; - unsigned int code_len = code_bytes; - unsigned char c; - u8 *ip; -+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(smp_processor_id())[(0xffff & regs->cs) >> 3]); - - printk(KERN_EMERG "Stack:\n"); - show_stack_log_lvl(NULL, regs, ®s->sp, KERN_EMERG); - - printk(KERN_EMERG "Code: "); - -- ip = (u8 *)regs->ip - code_prologue; -+ ip = (u8 *)regs->ip - code_prologue + cs_base; - if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) { - /* try starting at IP */ -- ip = (u8 *)regs->ip; -+ ip = (u8 *)regs->ip + cs_base; - code_len = code_len - code_prologue + 1; - } - for (i = 0; i < code_len; i++, ip++) { -@@ -118,7 +116,7 @@ void show_registers(struct pt_regs *regs - printk(" Bad EIP value."); - break; - } -- if (ip == (u8 *)regs->ip) -+ if (ip == (u8 *)regs->ip + cs_base) - printk("<%02x> ", c); - else - printk("%02x ", c); -@@ -131,6 +129,7 @@ int is_valid_bugaddr(unsigned long ip) - { - unsigned short ud2; - -+ ip = ktla_ktva(ip); - if (ip < PAGE_OFFSET) - return 0; - if (probe_kernel_address((unsigned short *)ip, ud2)) -diff -urNp linux-2.6.38.7/arch/x86/kernel/dumpstack_64.c linux-2.6.38.7/arch/x86/kernel/dumpstack_64.c ---- linux-2.6.38.7/arch/x86/kernel/dumpstack_64.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/dumpstack_64.c 2011-04-28 19:34:14.000000000 -0400 -@@ -147,10 +147,10 @@ void dump_trace(struct task_struct *task - unsigned long *irq_stack_end = - (unsigned long *)per_cpu(irq_stack_ptr, cpu); - unsigned used = 0; -- struct thread_info *tinfo; - int graph = 0; - unsigned long dummy; - unsigned long bp; -+ void *stack_start; - - if (!task) - task = current; -@@ -167,10 +167,10 @@ void dump_trace(struct task_struct *task - * current stack address. If the stacks consist of nested - * exceptions - */ -- tinfo = task_thread_info(task); - for (;;) { - char *id; - unsigned long *estack_end; -+ - estack_end = in_exception_stack(cpu, (unsigned long)stack, - &used, &id); - -@@ -178,7 +178,7 @@ void dump_trace(struct task_struct *task - if (ops->stack(data, id) < 0) - break; - -- bp = ops->walk_stack(tinfo, stack, bp, ops, -+ bp = ops->walk_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops, - data, estack_end, &graph); - ops->stack(data, "<EOE>"); - /* -@@ -197,7 +197,7 @@ void dump_trace(struct task_struct *task - if (in_irq_stack(stack, irq_stack, irq_stack_end)) { - if (ops->stack(data, "IRQ") < 0) - break; -- bp = ops->walk_stack(tinfo, stack, bp, -+ bp = ops->walk_stack(task, irq_stack, stack, bp, - ops, data, irq_stack_end, &graph); - /* - * We link to the next stack (which would be -@@ -218,7 +218,8 @@ void dump_trace(struct task_struct *task - /* - * This handles the process stack: - */ -- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph); -+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1)); -+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph); - put_cpu(); - } - EXPORT_SYMBOL(dump_trace); -diff -urNp linux-2.6.38.7/arch/x86/kernel/dumpstack.c linux-2.6.38.7/arch/x86/kernel/dumpstack.c ---- linux-2.6.38.7/arch/x86/kernel/dumpstack.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/dumpstack.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c +index df20723..79d1af9 100644 +--- a/arch/x86/kernel/dumpstack.c ++++ b/arch/x86/kernel/dumpstack.c @@ -2,6 +2,9 @@ * Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs @@ -11918,7 +12280,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/dumpstack.c linux-2.6.38.7/arch/x86/ke reliable ? "" : "? ", (void *) address); } -@@ -35,9 +38,8 @@ void printk_address(unsigned long addres +@@ -35,9 +38,8 @@ void printk_address(unsigned long address, int reliable) static void print_ftrace_graph_addr(unsigned long addr, void *data, const struct stacktrace_ops *ops, @@ -11929,7 +12291,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/dumpstack.c linux-2.6.38.7/arch/x86/ke unsigned long ret_addr; int index = task->curr_ret_stack; -@@ -58,7 +60,7 @@ print_ftrace_graph_addr(unsigned long ad +@@ -58,7 +60,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data, static inline void print_ftrace_graph_addr(unsigned long addr, void *data, const struct stacktrace_ops *ops, @@ -11938,7 +12300,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/dumpstack.c linux-2.6.38.7/arch/x86/ke { } #endif -@@ -69,10 +71,8 @@ print_ftrace_graph_addr(unsigned long ad +@@ -69,10 +71,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data, * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack */ @@ -11950,7 +12312,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/dumpstack.c linux-2.6.38.7/arch/x86/ke if (end) { if (p < end && p >= (end-THREAD_SIZE)) return 1; -@@ -83,14 +83,14 @@ static inline int valid_stack_ptr(struct +@@ -83,14 +83,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo, } unsigned long @@ -11967,7 +12329,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/dumpstack.c linux-2.6.38.7/arch/x86/ke unsigned long addr; addr = *stack; -@@ -102,7 +102,7 @@ print_context_stack(struct thread_info * +@@ -102,7 +102,7 @@ print_context_stack(struct thread_info *tinfo, } else { ops->address(data, addr, 0); } @@ -11976,7 +12338,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/dumpstack.c linux-2.6.38.7/arch/x86/ke } stack++; } -@@ -111,7 +111,7 @@ print_context_stack(struct thread_info * +@@ -111,7 +111,7 @@ print_context_stack(struct thread_info *tinfo, EXPORT_SYMBOL_GPL(print_context_stack); unsigned long @@ -11985,7 +12347,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/dumpstack.c linux-2.6.38.7/arch/x86/ke unsigned long *stack, unsigned long bp, const struct stacktrace_ops *ops, void *data, unsigned long *end, int *graph) -@@ -119,7 +119,7 @@ print_context_stack_bp(struct thread_inf +@@ -119,7 +119,7 @@ print_context_stack_bp(struct thread_info *tinfo, struct stack_frame *frame = (struct stack_frame *)bp; unsigned long *ret_addr = &frame->return_address; @@ -11994,7 +12356,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/dumpstack.c linux-2.6.38.7/arch/x86/ke unsigned long addr = *ret_addr; if (!__kernel_text_address(addr)) -@@ -128,7 +128,7 @@ print_context_stack_bp(struct thread_inf +@@ -128,7 +128,7 @@ print_context_stack_bp(struct thread_info *tinfo, ops->address(data, addr, 1); frame = frame->next_frame; ret_addr = &frame->return_address; @@ -12021,7 +12383,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/dumpstack.c linux-2.6.38.7/arch/x86/ke void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr) { if (regs && kexec_should_crash(current)) -@@ -257,7 +259,10 @@ void __kprobes oops_end(unsigned long fl +@@ -257,7 +259,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr) panic("Fatal exception in interrupt"); if (panic_on_oops) panic("Fatal exception"); @@ -12033,7 +12395,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/dumpstack.c linux-2.6.38.7/arch/x86/ke } int __kprobes __die(const char *str, struct pt_regs *regs, long err) -@@ -284,7 +289,7 @@ int __kprobes __die(const char *str, str +@@ -284,7 +289,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err) show_registers(regs); #ifdef CONFIG_X86_32 @@ -12042,7 +12404,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/dumpstack.c linux-2.6.38.7/arch/x86/ke sp = regs->sp; ss = regs->ss & 0xffff; } else { -@@ -312,7 +317,7 @@ void die(const char *str, struct pt_regs +@@ -312,7 +317,7 @@ void die(const char *str, struct pt_regs *regs, long err) unsigned long flags = oops_begin(); int sig = SIGSEGV; @@ -12051,9 +12413,133 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/dumpstack.c linux-2.6.38.7/arch/x86/ke report_bug(regs->ip, regs); if (__die(str, regs, err)) -diff -urNp linux-2.6.38.7/arch/x86/kernel/early_printk.c linux-2.6.38.7/arch/x86/kernel/early_printk.c ---- linux-2.6.38.7/arch/x86/kernel/early_printk.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/early_printk.c 2011-05-16 21:47:08.000000000 -0400 +diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c +index 74cc1ed..6579cca 100644 +--- a/arch/x86/kernel/dumpstack_32.c ++++ b/arch/x86/kernel/dumpstack_32.c +@@ -37,15 +37,12 @@ void dump_trace(struct task_struct *task, + + bp = stack_frame(task, regs); + for (;;) { +- struct thread_info *context; ++ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1)); ++ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph); + +- context = (struct thread_info *) +- ((unsigned long)stack & (~(THREAD_SIZE - 1))); +- bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph); +- +- stack = (unsigned long *)context->previous_esp; +- if (!stack) ++ if (stack_start == task_stack_page(task)) + break; ++ stack = *(unsigned long **)stack_start; + if (ops->stack(data, "IRQ") < 0) + break; + touch_nmi_watchdog(); +@@ -95,21 +92,22 @@ void show_registers(struct pt_regs *regs) + * When in-kernel, we also print out the stack and code at the + * time of the fault.. + */ +- if (!user_mode_vm(regs)) { ++ if (!user_mode(regs)) { + unsigned int code_prologue = code_bytes * 43 / 64; + unsigned int code_len = code_bytes; + unsigned char c; + u8 *ip; ++ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(smp_processor_id())[(0xffff & regs->cs) >> 3]); + + printk(KERN_EMERG "Stack:\n"); + show_stack_log_lvl(NULL, regs, ®s->sp, KERN_EMERG); + + printk(KERN_EMERG "Code: "); + +- ip = (u8 *)regs->ip - code_prologue; ++ ip = (u8 *)regs->ip - code_prologue + cs_base; + if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) { + /* try starting at IP */ +- ip = (u8 *)regs->ip; ++ ip = (u8 *)regs->ip + cs_base; + code_len = code_len - code_prologue + 1; + } + for (i = 0; i < code_len; i++, ip++) { +@@ -118,7 +116,7 @@ void show_registers(struct pt_regs *regs) + printk(" Bad EIP value."); + break; + } +- if (ip == (u8 *)regs->ip) ++ if (ip == (u8 *)regs->ip + cs_base) + printk("<%02x> ", c); + else + printk("%02x ", c); +@@ -131,6 +129,7 @@ int is_valid_bugaddr(unsigned long ip) + { + unsigned short ud2; + ++ ip = ktla_ktva(ip); + if (ip < PAGE_OFFSET) + return 0; + if (probe_kernel_address((unsigned short *)ip, ud2)) +diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c +index a6b6fcf..a0bceb8 100644 +--- a/arch/x86/kernel/dumpstack_64.c ++++ b/arch/x86/kernel/dumpstack_64.c +@@ -147,10 +147,10 @@ void dump_trace(struct task_struct *task, + unsigned long *irq_stack_end = + (unsigned long *)per_cpu(irq_stack_ptr, cpu); + unsigned used = 0; +- struct thread_info *tinfo; + int graph = 0; + unsigned long dummy; + unsigned long bp; ++ void *stack_start; + + if (!task) + task = current; +@@ -167,10 +167,10 @@ void dump_trace(struct task_struct *task, + * current stack address. If the stacks consist of nested + * exceptions + */ +- tinfo = task_thread_info(task); + for (;;) { + char *id; + unsigned long *estack_end; ++ + estack_end = in_exception_stack(cpu, (unsigned long)stack, + &used, &id); + +@@ -178,7 +178,7 @@ void dump_trace(struct task_struct *task, + if (ops->stack(data, id) < 0) + break; + +- bp = ops->walk_stack(tinfo, stack, bp, ops, ++ bp = ops->walk_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops, + data, estack_end, &graph); + ops->stack(data, "<EOE>"); + /* +@@ -197,7 +197,7 @@ void dump_trace(struct task_struct *task, + if (in_irq_stack(stack, irq_stack, irq_stack_end)) { + if (ops->stack(data, "IRQ") < 0) + break; +- bp = ops->walk_stack(tinfo, stack, bp, ++ bp = ops->walk_stack(task, irq_stack, stack, bp, + ops, data, irq_stack_end, &graph); + /* + * We link to the next stack (which would be +@@ -218,7 +218,8 @@ void dump_trace(struct task_struct *task, + /* + * This handles the process stack: + */ +- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph); ++ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1)); ++ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph); + put_cpu(); + } + EXPORT_SYMBOL(dump_trace); +diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c +index cd28a35..2601699 100644 +--- a/arch/x86/kernel/early_printk.c ++++ b/arch/x86/kernel/early_printk.c @@ -7,6 +7,7 @@ #include <linux/pci_regs.h> #include <linux/pci_ids.h> @@ -12062,7 +12548,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/early_printk.c linux-2.6.38.7/arch/x86 #include <asm/io.h> #include <asm/processor.h> #include <asm/fcntl.h> -@@ -179,6 +180,8 @@ asmlinkage void early_printk(const char +@@ -179,6 +180,8 @@ asmlinkage void early_printk(const char *fmt, ...) int n; va_list ap; @@ -12071,9 +12557,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/early_printk.c linux-2.6.38.7/arch/x86 va_start(ap, fmt); n = vscnprintf(buf, sizeof(buf), fmt, ap); early_console->write(early_console, buf, n); -diff -urNp linux-2.6.38.7/arch/x86/kernel/entry_32.S linux-2.6.38.7/arch/x86/kernel/entry_32.S ---- linux-2.6.38.7/arch/x86/kernel/entry_32.S 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/entry_32.S 2011-05-22 23:03:34.000000000 -0400 +diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S +index 9ca3b0e..47ad5e1 100644 +--- a/arch/x86/kernel/entry_32.S ++++ b/arch/x86/kernel/entry_32.S @@ -183,13 +183,146 @@ /*CFI_REL_OFFSET gs, PT_GS*/ .endm @@ -12556,9 +13043,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/entry_32.S linux-2.6.38.7/arch/x86/ker RESTORE_REGS lss 12+4(%esp), %esp # back to espfix stack CFI_ADJUST_CFA_OFFSET -24 -diff -urNp linux-2.6.38.7/arch/x86/kernel/entry_64.S linux-2.6.38.7/arch/x86/kernel/entry_64.S ---- linux-2.6.38.7/arch/x86/kernel/entry_64.S 2011-04-18 17:27:13.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/entry_64.S 2011-05-22 23:19:17.000000000 -0400 +diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S +index bbd5c80..207310a 100644 +--- a/arch/x86/kernel/entry_64.S ++++ b/arch/x86/kernel/entry_64.S @@ -53,6 +53,7 @@ #include <asm/paravirt.h> #include <asm/ftrace.h> @@ -12932,7 +13420,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/entry_64.S linux-2.6.38.7/arch/x86/ker je retint_kernel /* Interrupt came from user space */ -@@ -845,12 +1117,14 @@ retint_swapgs: /* return to user-space +@@ -845,12 +1117,14 @@ retint_swapgs: /* return to user-space */ * The iretq could re-enable interrupts: */ DISABLE_INTERRUPTS(CLBR_ANY) @@ -13131,10 +13619,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/entry_64.S linux-2.6.38.7/arch/x86/ker RESTORE_ALL 8 jmp irq_return nmi_userspace: -diff -urNp linux-2.6.38.7/arch/x86/kernel/ftrace.c linux-2.6.38.7/arch/x86/kernel/ftrace.c ---- linux-2.6.38.7/arch/x86/kernel/ftrace.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/ftrace.c 2011-04-28 19:57:25.000000000 -0400 -@@ -126,7 +126,7 @@ static void *mod_code_ip; /* holds the +diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c +index 382eb29..a02273e 100644 +--- a/arch/x86/kernel/ftrace.c ++++ b/arch/x86/kernel/ftrace.c +@@ -126,7 +126,7 @@ static void *mod_code_ip; /* holds the IP to write to */ static void *mod_code_newcode; /* holds the text to write to the IP */ static unsigned nmi_wait_count; @@ -13143,7 +13632,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/ftrace.c linux-2.6.38.7/arch/x86/kerne int ftrace_arch_read_dyn_info(char *buf, int size) { -@@ -134,7 +134,7 @@ int ftrace_arch_read_dyn_info(char *buf, +@@ -134,7 +134,7 @@ int ftrace_arch_read_dyn_info(char *buf, int size) r = snprintf(buf, size, "%u %u", nmi_wait_count, @@ -13164,7 +13653,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/ftrace.c linux-2.6.38.7/arch/x86/kerne } /* Must have previous changes seen before executions */ smp_mb(); -@@ -271,6 +273,8 @@ ftrace_modify_code(unsigned long ip, uns +@@ -271,6 +273,8 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code, { unsigned char replaced[MCOUNT_INSN_SIZE]; @@ -13173,7 +13662,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/ftrace.c linux-2.6.38.7/arch/x86/kerne /* * Note: Due to modules and __init, code can * disappear and change, we need to protect against faulting -@@ -327,7 +331,7 @@ int ftrace_update_ftrace_func(ftrace_fun +@@ -327,7 +331,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func) unsigned char old[MCOUNT_INSN_SIZE], *new; int ret; @@ -13182,7 +13671,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/ftrace.c linux-2.6.38.7/arch/x86/kerne new = ftrace_call_replace(ip, (unsigned long)func); ret = ftrace_modify_code(ip, old, new); -@@ -353,6 +357,8 @@ static int ftrace_mod_jmp(unsigned long +@@ -353,6 +357,8 @@ static int ftrace_mod_jmp(unsigned long ip, { unsigned char code[MCOUNT_INSN_SIZE]; @@ -13191,9 +13680,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/ftrace.c linux-2.6.38.7/arch/x86/kerne if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) return -EFAULT; -diff -urNp linux-2.6.38.7/arch/x86/kernel/head32.c linux-2.6.38.7/arch/x86/kernel/head32.c ---- linux-2.6.38.7/arch/x86/kernel/head32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/head32.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c +index 7f138b3..014e4cd 100644 +--- a/arch/x86/kernel/head32.c ++++ b/arch/x86/kernel/head32.c @@ -19,6 +19,7 @@ #include <asm/io_apic.h> #include <asm/bios_ebda.h> @@ -13211,9 +13701,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/head32.c linux-2.6.38.7/arch/x86/kerne #ifdef CONFIG_BLK_DEV_INITRD /* Reserve INITRD */ -diff -urNp linux-2.6.38.7/arch/x86/kernel/head_32.S linux-2.6.38.7/arch/x86/kernel/head_32.S ---- linux-2.6.38.7/arch/x86/kernel/head_32.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/head_32.S 2011-05-11 18:34:57.000000000 -0400 +diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S +index 767d6c4..5237789 100644 +--- a/arch/x86/kernel/head_32.S ++++ b/arch/x86/kernel/head_32.S @@ -25,6 +25,12 @@ /* Physical address */ #define pa(X) ((X) - __PAGE_OFFSET) @@ -13240,7 +13731,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/head_32.S linux-2.6.38.7/arch/x86/kern /* Number of possible pages in the lowmem region */ LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT) -@@ -77,6 +79,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_P +@@ -77,6 +79,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE_asm RESERVE_BRK(pagetables, INIT_MAP_SIZE) /* @@ -13648,9 +14139,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/head_32.S linux-2.6.38.7/arch/x86/kern + /* Be sure this is zeroed to avoid false validations in Xen */ + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 + .endr -diff -urNp linux-2.6.38.7/arch/x86/kernel/head_64.S linux-2.6.38.7/arch/x86/kernel/head_64.S ---- linux-2.6.38.7/arch/x86/kernel/head_64.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/head_64.S 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S +index 239046b..db00965 100644 +--- a/arch/x86/kernel/head_64.S ++++ b/arch/x86/kernel/head_64.S @@ -19,6 +19,7 @@ #include <asm/cache.h> #include <asm/processor-flags.h> @@ -13659,7 +14151,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/head_64.S linux-2.6.38.7/arch/x86/kern #ifdef CONFIG_PARAVIRT #include <asm/asm-offsets.h> -@@ -38,6 +39,10 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET +@@ -38,6 +39,10 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET) L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET) L4_START_KERNEL = pgd_index(__START_KERNEL_map) L3_START_KERNEL = pud_index(__START_KERNEL_map) @@ -13685,12 +14177,9 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/head_64.S linux-2.6.38.7/arch/x86/kern - addq %rbp, level3_kernel_pgt + (510*8)(%rip) - addq %rbp, level3_kernel_pgt + (511*8)(%rip) -+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip) - +- - addq %rbp, level2_fixmap_pgt + (506*8)(%rip) -+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip) -+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8+8)(%rip) - +- - /* Add an Identity mapping if I am above 1G */ - leaq _text(%rip), %rdi - andq $PMD_PAGE_MASK, %rdi @@ -13699,11 +14188,14 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/head_64.S linux-2.6.38.7/arch/x86/kern - shrq $PUD_SHIFT, %rax - andq $(PTRS_PER_PUD - 1), %rax - jz ident_complete -- ++ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip) + - leaq (level2_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %rdx - leaq level3_ident_pgt(%rip), %rbx - movq %rdx, 0(%rbx, %rax, 8) -- ++ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip) ++ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8+8)(%rip) + - movq %rdi, %rax - shrq $PMD_SHIFT, %rax - andq $(PTRS_PER_PMD - 1), %rax @@ -13920,9 +14412,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/head_64.S linux-2.6.38.7/arch/x86/kern __PAGE_ALIGNED_BSS .align PAGE_SIZE -diff -urNp linux-2.6.38.7/arch/x86/kernel/i386_ksyms_32.c linux-2.6.38.7/arch/x86/kernel/i386_ksyms_32.c ---- linux-2.6.38.7/arch/x86/kernel/i386_ksyms_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/i386_ksyms_32.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c +index 9c3bd4a..e1d9b35 100644 +--- a/arch/x86/kernel/i386_ksyms_32.c ++++ b/arch/x86/kernel/i386_ksyms_32.c @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); EXPORT_SYMBOL(cmpxchg8b_emu); #endif @@ -13944,9 +14437,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/i386_ksyms_32.c linux-2.6.38.7/arch/x8 +#ifdef CONFIG_PAX_KERNEXEC +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); +#endif -diff -urNp linux-2.6.38.7/arch/x86/kernel/i8259.c linux-2.6.38.7/arch/x86/kernel/i8259.c ---- linux-2.6.38.7/arch/x86/kernel/i8259.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/i8259.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c +index 20757cb..6e9f53c 100644 +--- a/arch/x86/kernel/i8259.c ++++ b/arch/x86/kernel/i8259.c @@ -210,7 +210,7 @@ spurious_8259A_irq: "spurious 8259A interrupt: IRQ%d.\n", irq); spurious_irq_mask |= irqmask; @@ -13956,10 +14450,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/i8259.c linux-2.6.38.7/arch/x86/kernel /* * Theoretically we do not have to handle this IRQ, * but in Linux this does not cause problems and is -diff -urNp linux-2.6.38.7/arch/x86/kernel/init_task.c linux-2.6.38.7/arch/x86/kernel/init_task.c ---- linux-2.6.38.7/arch/x86/kernel/init_task.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/init_task.c 2011-04-28 19:34:14.000000000 -0400 -@@ -20,8 +20,7 @@ static struct sighand_struct init_sighan +diff --git a/arch/x86/kernel/init_task.c b/arch/x86/kernel/init_task.c +index 43e9ccf..44ccf6f 100644 +--- a/arch/x86/kernel/init_task.c ++++ b/arch/x86/kernel/init_task.c +@@ -20,8 +20,7 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); * way process stacks are handled. This is done by having a special * "init_task" linker map entry.. */ @@ -13977,9 +14472,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/init_task.c linux-2.6.38.7/arch/x86/ke - +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; +EXPORT_SYMBOL(init_tss); -diff -urNp linux-2.6.38.7/arch/x86/kernel/ioport.c linux-2.6.38.7/arch/x86/kernel/ioport.c ---- linux-2.6.38.7/arch/x86/kernel/ioport.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/ioport.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c +index 8eec0ec..ef34e2d 100644 +--- a/arch/x86/kernel/ioport.c ++++ b/arch/x86/kernel/ioport.c @@ -6,6 +6,7 @@ #include <linux/sched.h> #include <linux/kernel.h> @@ -13988,7 +14484,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/ioport.c linux-2.6.38.7/arch/x86/kerne #include <linux/errno.h> #include <linux/types.h> #include <linux/ioport.h> -@@ -41,6 +42,12 @@ asmlinkage long sys_ioperm(unsigned long +@@ -41,6 +42,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on) if ((from + num <= from) || (from + num > IO_BITMAP_BITS)) return -EINVAL; @@ -14001,7 +14497,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/ioport.c linux-2.6.38.7/arch/x86/kerne if (turn_on && !capable(CAP_SYS_RAWIO)) return -EPERM; -@@ -67,7 +74,7 @@ asmlinkage long sys_ioperm(unsigned long +@@ -67,7 +74,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on) * because the ->io_bitmap_max value must match the bitmap * contents: */ @@ -14010,7 +14506,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/ioport.c linux-2.6.38.7/arch/x86/kerne set_bitmap(t->io_bitmap_ptr, from, num, !turn_on); -@@ -112,6 +119,12 @@ long sys_iopl(unsigned int level, struct +@@ -112,6 +119,12 @@ long sys_iopl(unsigned int level, struct pt_regs *regs) return -EINVAL; /* Trying to gain more privileges? */ if (level > old) { @@ -14023,9 +14519,48 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/ioport.c linux-2.6.38.7/arch/x86/kerne if (!capable(CAP_SYS_RAWIO)) return -EPERM; } -diff -urNp linux-2.6.38.7/arch/x86/kernel/irq_32.c linux-2.6.38.7/arch/x86/kernel/irq_32.c ---- linux-2.6.38.7/arch/x86/kernel/irq_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/irq_32.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c +index 387b6a0..35552e5 100644 +--- a/arch/x86/kernel/irq.c ++++ b/arch/x86/kernel/irq.c +@@ -16,7 +16,7 @@ + #include <asm/mce.h> + #include <asm/hw_irq.h> + +-atomic_t irq_err_count; ++atomic_unchecked_t irq_err_count; + + /* Function pointer for generic interrupt vector handling */ + void (*x86_platform_ipi_callback)(void) = NULL; +@@ -115,9 +115,9 @@ static int show_other_interrupts(struct seq_file *p, int prec) + seq_printf(p, "%10u ", per_cpu(mce_poll_count, j)); + seq_printf(p, " Machine check polls\n"); + #endif +- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count)); ++ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count)); + #if defined(CONFIG_X86_IO_APIC) +- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count)); ++ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count)); + #endif + return 0; + } +@@ -210,10 +210,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu) + + u64 arch_irq_stat(void) + { +- u64 sum = atomic_read(&irq_err_count); ++ u64 sum = atomic_read_unchecked(&irq_err_count); + + #ifdef CONFIG_X86_IO_APIC +- sum += atomic_read(&irq_mis_count); ++ sum += atomic_read_unchecked(&irq_mis_count); + #endif + return sum; + } +diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c +index 9974d21..f67f840 100644 +--- a/arch/x86/kernel/irq_32.c ++++ b/arch/x86/kernel/irq_32.c @@ -36,7 +36,7 @@ static int check_stack_overflow(void) __asm__ __volatile__("andl %%esp,%0" : "=r" (sp) : "0" (THREAD_SIZE - 1)); @@ -14035,7 +14570,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/irq_32.c linux-2.6.38.7/arch/x86/kerne } static void print_stack_overflow(void) -@@ -54,8 +54,8 @@ static inline void print_stack_overflow( +@@ -54,8 +54,8 @@ static inline void print_stack_overflow(void) { } * per-CPU IRQ handling contexts (thread information and stack) */ union irq_ctx { @@ -14046,7 +14581,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/irq_32.c linux-2.6.38.7/arch/x86/kerne } __attribute__((aligned(THREAD_SIZE))); static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx); -@@ -75,10 +75,9 @@ static void call_on_stack(void *func, vo +@@ -75,10 +75,9 @@ static void call_on_stack(void *func, void *stack) static inline int execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq) { @@ -14058,7 +14593,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/irq_32.c linux-2.6.38.7/arch/x86/kerne irqctx = __this_cpu_read(hardirq_ctx); /* -@@ -87,21 +86,17 @@ execute_on_irq_stack(int overflow, struc +@@ -87,21 +86,17 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq) * handler) we can't do that and just have to keep using the * current stack (which is the irq stack already after all) */ @@ -14087,7 +14622,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/irq_32.c linux-2.6.38.7/arch/x86/kerne if (unlikely(overflow)) call_on_stack(print_stack_overflow, isp); -@@ -113,6 +108,12 @@ execute_on_irq_stack(int overflow, struc +@@ -113,6 +108,12 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq) : "0" (irq), "1" (desc), "2" (isp), "D" (desc->handle_irq) : "memory", "cc", "ecx"); @@ -14100,7 +14635,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/irq_32.c linux-2.6.38.7/arch/x86/kerne return 1; } -@@ -121,29 +122,11 @@ execute_on_irq_stack(int overflow, struc +@@ -121,29 +122,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq) */ void __cpuinit irq_ctx_init(int cpu) { @@ -14167,47 +14702,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/irq_32.c linux-2.6.38.7/arch/x86/kerne /* * Shouldnt happen, we returned above if in_interrupt(): */ -diff -urNp linux-2.6.38.7/arch/x86/kernel/irq.c linux-2.6.38.7/arch/x86/kernel/irq.c ---- linux-2.6.38.7/arch/x86/kernel/irq.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/irq.c 2011-04-28 19:57:25.000000000 -0400 -@@ -16,7 +16,7 @@ - #include <asm/mce.h> - #include <asm/hw_irq.h> - --atomic_t irq_err_count; -+atomic_unchecked_t irq_err_count; - - /* Function pointer for generic interrupt vector handling */ - void (*x86_platform_ipi_callback)(void) = NULL; -@@ -115,9 +115,9 @@ static int show_other_interrupts(struct - seq_printf(p, "%10u ", per_cpu(mce_poll_count, j)); - seq_printf(p, " Machine check polls\n"); - #endif -- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count)); -+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count)); - #if defined(CONFIG_X86_IO_APIC) -- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count)); -+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count)); - #endif - return 0; - } -@@ -210,10 +210,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu) - - u64 arch_irq_stat(void) - { -- u64 sum = atomic_read(&irq_err_count); -+ u64 sum = atomic_read_unchecked(&irq_err_count); - - #ifdef CONFIG_X86_IO_APIC -- sum += atomic_read(&irq_mis_count); -+ sum += atomic_read_unchecked(&irq_mis_count); - #endif - return sum; - } -diff -urNp linux-2.6.38.7/arch/x86/kernel/kgdb.c linux-2.6.38.7/arch/x86/kernel/kgdb.c ---- linux-2.6.38.7/arch/x86/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/kgdb.c 2011-04-28 19:57:25.000000000 -0400 -@@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem, +diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c +index a413000..9b4e79f 100644 +--- a/arch/x86/kernel/kgdb.c ++++ b/arch/x86/kernel/kgdb.c +@@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs) switch (regno) { #ifdef CONFIG_X86_32 case GDB_SS: @@ -14221,7 +14720,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/kgdb.c linux-2.6.38.7/arch/x86/kernel/ *(unsigned long *)mem = kernel_stack_pointer(regs); break; case GDB_GS: -@@ -473,12 +473,12 @@ int kgdb_arch_handle_exception(int e_vec +@@ -473,12 +473,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code, case 'k': /* clear the trace bit */ linux_regs->flags &= ~X86_EFLAGS_TF; @@ -14236,7 +14735,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/kgdb.c linux-2.6.38.7/arch/x86/kernel/ raw_smp_processor_id()); } -@@ -543,7 +543,7 @@ static int __kgdb_notify(struct die_args +@@ -543,7 +543,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd) break; case DIE_DEBUG: @@ -14245,7 +14744,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/kgdb.c linux-2.6.38.7/arch/x86/kernel/ if (user_mode(regs)) return single_step_cont(regs, args); break; -@@ -719,7 +719,7 @@ void kgdb_arch_set_pc(struct pt_regs *re +@@ -719,7 +719,7 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip) regs->ip = ip; } @@ -14254,10 +14753,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/kgdb.c linux-2.6.38.7/arch/x86/kernel/ /* Breakpoint instruction: */ .gdb_bpt_instr = { 0xcc }, .flags = KGDB_HW_BREAKPOINT, -diff -urNp linux-2.6.38.7/arch/x86/kernel/kprobes.c linux-2.6.38.7/arch/x86/kernel/kprobes.c ---- linux-2.6.38.7/arch/x86/kernel/kprobes.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/kprobes.c 2011-04-28 19:34:14.000000000 -0400 -@@ -115,8 +115,11 @@ static void __kprobes __synthesize_relat +diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c +index d91c477..dc6e873 100644 +--- a/arch/x86/kernel/kprobes.c ++++ b/arch/x86/kernel/kprobes.c +@@ -115,8 +115,11 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op) } __attribute__((packed)) *insn; insn = (struct __arch_relative_insn *)from; @@ -14269,7 +14769,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/kprobes.c linux-2.6.38.7/arch/x86/kern } /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/ -@@ -153,7 +156,7 @@ static int __kprobes can_boost(kprobe_op +@@ -153,7 +156,7 @@ static int __kprobes can_boost(kprobe_opcode_t *opcodes) kprobe_opcode_t opcode; kprobe_opcode_t *orig_opcodes = opcodes; @@ -14278,7 +14778,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/kprobes.c linux-2.6.38.7/arch/x86/kern return 0; /* Page fault may occur on this address. */ retry: -@@ -314,7 +317,9 @@ static int __kprobes __copy_instruction( +@@ -314,7 +317,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover) } } insn_get_length(&insn); @@ -14288,7 +14788,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/kprobes.c linux-2.6.38.7/arch/x86/kern #ifdef CONFIG_X86_64 if (insn_rip_relative(&insn)) { -@@ -338,7 +343,9 @@ static int __kprobes __copy_instruction( +@@ -338,7 +343,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover) (u8 *) dest; BUG_ON((s64) (s32) newdisp != newdisp); /* Sanity check. */ disp = (u8 *) dest + insn_offset_displacement(&insn); @@ -14298,7 +14798,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/kprobes.c linux-2.6.38.7/arch/x86/kern } #endif return insn.length; -@@ -352,12 +359,12 @@ static void __kprobes arch_copy_kprobe(s +@@ -352,12 +359,12 @@ static void __kprobes arch_copy_kprobe(struct kprobe *p) */ __copy_instruction(p->ainsn.insn, p->addr, 0); @@ -14313,7 +14813,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/kprobes.c linux-2.6.38.7/arch/x86/kern } int __kprobes arch_prepare_kprobe(struct kprobe *p) -@@ -474,7 +481,7 @@ static void __kprobes setup_singlestep(s +@@ -474,7 +481,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs, * nor set current_kprobe, because it doesn't use single * stepping. */ @@ -14322,7 +14822,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/kprobes.c linux-2.6.38.7/arch/x86/kern preempt_enable_no_resched(); return; } -@@ -493,7 +500,7 @@ static void __kprobes setup_singlestep(s +@@ -493,7 +500,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs, if (p->opcode == BREAKPOINT_INSTRUCTION) regs->ip = (unsigned long)p->addr; else @@ -14331,7 +14831,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/kprobes.c linux-2.6.38.7/arch/x86/kern } /* -@@ -572,7 +579,7 @@ static int __kprobes kprobe_handler(stru +@@ -572,7 +579,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) setup_singlestep(p, regs, kcb, 0); return 1; } @@ -14340,7 +14840,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/kprobes.c linux-2.6.38.7/arch/x86/kern /* * The breakpoint instruction was removed right * after we hit it. Another cpu has removed -@@ -817,7 +824,7 @@ static void __kprobes resume_execution(s +@@ -817,7 +824,7 @@ static void __kprobes resume_execution(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb) { unsigned long *tos = stack_addr(regs); @@ -14349,7 +14849,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/kprobes.c linux-2.6.38.7/arch/x86/kern unsigned long orig_ip = (unsigned long)p->addr; kprobe_opcode_t *insn = p->ainsn.insn; -@@ -999,7 +1006,7 @@ int __kprobes kprobe_exceptions_notify(s +@@ -999,7 +1006,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self, struct die_args *args = data; int ret = NOTIFY_DONE; @@ -14358,7 +14858,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/kprobes.c linux-2.6.38.7/arch/x86/kern return ret; switch (val) { -@@ -1372,7 +1379,7 @@ int __kprobes arch_prepare_optimized_kpr +@@ -1372,7 +1379,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op) * Verify if the address gap is in 2GB range, because this uses * a relative jump. */ @@ -14367,7 +14867,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/kprobes.c linux-2.6.38.7/arch/x86/kern if (abs(rel) > 0x7fffffff) return -ERANGE; -@@ -1393,11 +1400,11 @@ int __kprobes arch_prepare_optimized_kpr +@@ -1393,11 +1400,11 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op) synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op); /* Set probe function call */ @@ -14381,7 +14881,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/kprobes.c linux-2.6.38.7/arch/x86/kern flush_icache_range((unsigned long) buf, (unsigned long) buf + TMPL_END_IDX + -@@ -1419,7 +1426,7 @@ static void __kprobes setup_optimize_kpr +@@ -1419,7 +1426,7 @@ static void __kprobes setup_optimize_kprobe(struct text_poke_param *tprm, ((long)op->kp.addr + RELATIVEJUMP_SIZE)); /* Backup instructions which will be replaced by jump address */ @@ -14390,10 +14890,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/kprobes.c linux-2.6.38.7/arch/x86/kern RELATIVE_ADDR_SIZE); insn_buf[0] = RELATIVEJUMP_OPCODE; -diff -urNp linux-2.6.38.7/arch/x86/kernel/ldt.c linux-2.6.38.7/arch/x86/kernel/ldt.c ---- linux-2.6.38.7/arch/x86/kernel/ldt.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/ldt.c 2011-04-28 19:34:14.000000000 -0400 -@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i +diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c +index ea69726..604d066 100644 +--- a/arch/x86/kernel/ldt.c ++++ b/arch/x86/kernel/ldt.c +@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload) if (reload) { #ifdef CONFIG_SMP preempt_disable(); @@ -14409,7 +14910,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/ldt.c linux-2.6.38.7/arch/x86/kernel/l #endif } if (oldsize) { -@@ -95,7 +95,7 @@ static inline int copy_ldt(mm_context_t +@@ -95,7 +95,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old) return err; for (i = 0; i < old->size; i++) @@ -14418,7 +14919,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/ldt.c linux-2.6.38.7/arch/x86/kernel/l return 0; } -@@ -116,6 +116,24 @@ int init_new_context(struct task_struct +@@ -116,6 +116,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm) retval = copy_ldt(&mm->context, &old_mm->context); mutex_unlock(&old_mm->context.lock); } @@ -14443,7 +14944,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/ldt.c linux-2.6.38.7/arch/x86/kernel/l return retval; } -@@ -230,6 +248,13 @@ static int write_ldt(void __user *ptr, u +@@ -230,6 +248,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode) } } @@ -14457,9 +14958,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/ldt.c linux-2.6.38.7/arch/x86/kernel/l fill_ldt(&ldt, &ldt_info); if (oldmode) ldt.avl = 0; -diff -urNp linux-2.6.38.7/arch/x86/kernel/machine_kexec_32.c linux-2.6.38.7/arch/x86/kernel/machine_kexec_32.c ---- linux-2.6.38.7/arch/x86/kernel/machine_kexec_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/machine_kexec_32.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c +index a3fa43b..8966f4c 100644 +--- a/arch/x86/kernel/machine_kexec_32.c ++++ b/arch/x86/kernel/machine_kexec_32.c @@ -27,7 +27,7 @@ #include <asm/cacheflush.h> #include <asm/debugreg.h> @@ -14469,7 +14971,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/machine_kexec_32.c linux-2.6.38.7/arch { struct desc_ptr curidt; -@@ -39,7 +39,7 @@ static void set_idt(void *newidt, __u16 +@@ -39,7 +39,7 @@ static void set_idt(void *newidt, __u16 limit) } @@ -14487,10 +14989,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/machine_kexec_32.c linux-2.6.38.7/arch relocate_kernel_ptr = control_page; page_list[PA_CONTROL_PAGE] = __pa(control_page); -diff -urNp linux-2.6.38.7/arch/x86/kernel/microcode_amd.c linux-2.6.38.7/arch/x86/kernel/microcode_amd.c ---- linux-2.6.38.7/arch/x86/kernel/microcode_amd.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/microcode_amd.c 2011-04-28 19:34:14.000000000 -0400 -@@ -317,7 +317,7 @@ static void microcode_fini_cpu_amd(int c +diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c +index 0fe6d1a..8911743 100644 +--- a/arch/x86/kernel/microcode_amd.c ++++ b/arch/x86/kernel/microcode_amd.c +@@ -317,7 +317,7 @@ static void microcode_fini_cpu_amd(int cpu) uci->mc = NULL; } @@ -14499,7 +15002,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/microcode_amd.c linux-2.6.38.7/arch/x8 .request_microcode_user = request_microcode_user, .request_microcode_fw = request_microcode_fw, .collect_cpu_info = collect_cpu_info_amd, -@@ -325,7 +325,7 @@ static struct microcode_ops microcode_am +@@ -325,7 +325,7 @@ static struct microcode_ops microcode_amd_ops = { .microcode_fini_cpu = microcode_fini_cpu_amd, }; @@ -14508,9 +15011,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/microcode_amd.c linux-2.6.38.7/arch/x8 { return µcode_amd_ops; } -diff -urNp linux-2.6.38.7/arch/x86/kernel/microcode_core.c linux-2.6.38.7/arch/x86/kernel/microcode_core.c ---- linux-2.6.38.7/arch/x86/kernel/microcode_core.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/microcode_core.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c +index 1cca374..3e6f80b 100644 +--- a/arch/x86/kernel/microcode_core.c ++++ b/arch/x86/kernel/microcode_core.c @@ -92,7 +92,7 @@ MODULE_LICENSE("GPL"); #define MICROCODE_VERSION "2.00" @@ -14520,10 +15024,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/microcode_core.c linux-2.6.38.7/arch/x /* * Synchronization. -diff -urNp linux-2.6.38.7/arch/x86/kernel/microcode_intel.c linux-2.6.38.7/arch/x86/kernel/microcode_intel.c ---- linux-2.6.38.7/arch/x86/kernel/microcode_intel.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/microcode_intel.c 2011-04-28 19:34:14.000000000 -0400 -@@ -440,13 +440,13 @@ static enum ucode_state request_microcod +diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c +index 1a1b606..2a84662 100644 +--- a/arch/x86/kernel/microcode_intel.c ++++ b/arch/x86/kernel/microcode_intel.c +@@ -440,13 +440,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device) static int get_ucode_user(void *to, const void *from, size_t n) { @@ -14548,7 +15053,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/microcode_intel.c linux-2.6.38.7/arch/ .request_microcode_user = request_microcode_user, .request_microcode_fw = request_microcode_fw, .collect_cpu_info = collect_cpu_info, -@@ -465,7 +465,7 @@ static struct microcode_ops microcode_in +@@ -465,7 +465,7 @@ static struct microcode_ops microcode_intel_ops = { .microcode_fini_cpu = microcode_fini_cpu, }; @@ -14557,9 +15062,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/microcode_intel.c linux-2.6.38.7/arch/ { return µcode_intel_ops; } -diff -urNp linux-2.6.38.7/arch/x86/kernel/module.c linux-2.6.38.7/arch/x86/kernel/module.c ---- linux-2.6.38.7/arch/x86/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/module.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c +index ab23f1a..fe9d241 100644 +--- a/arch/x86/kernel/module.c ++++ b/arch/x86/kernel/module.c @@ -35,21 +35,66 @@ #define DEBUGP(fmt...) #endif @@ -14667,7 +15173,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/module.c linux-2.6.38.7/arch/x86/kerne break; default: printk(KERN_ERR "module %s: Unknown relocation: %u\n", -@@ -145,21 +196,30 @@ int apply_relocate_add(Elf64_Shdr *sechd +@@ -145,21 +196,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs, case R_X86_64_NONE: break; case R_X86_64_64: @@ -14698,10 +15204,24 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/module.c linux-2.6.38.7/arch/x86/kerne #if 0 if ((s64)val != *(s32 *)loc) goto overflow; -diff -urNp linux-2.6.38.7/arch/x86/kernel/paravirt.c linux-2.6.38.7/arch/x86/kernel/paravirt.c ---- linux-2.6.38.7/arch/x86/kernel/paravirt.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/paravirt.c 2011-05-16 21:47:08.000000000 -0400 -@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu +diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c +index 676b8c7..870ba04 100644 +--- a/arch/x86/kernel/paravirt-spinlocks.c ++++ b/arch/x86/kernel/paravirt-spinlocks.c +@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags) + 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 --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c +index 869e1ae..f70d759 100644 +--- a/arch/x86/kernel/paravirt.c ++++ b/arch/x86/kernel/paravirt.c +@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbuf, const void *target, * corresponding structure. */ static void *get_call_destination(u8 type) { @@ -14710,7 +15230,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/paravirt.c linux-2.6.38.7/arch/x86/ker .pv_init_ops = pv_init_ops, .pv_time_ops = pv_time_ops, .pv_cpu_ops = pv_cpu_ops, -@@ -133,6 +133,9 @@ static void *get_call_destination(u8 typ +@@ -133,6 +133,9 @@ static void *get_call_destination(u8 type) .pv_lock_ops = pv_lock_ops, #endif }; @@ -14720,7 +15240,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/paravirt.c linux-2.6.38.7/arch/x86/ker return *((void **)&tmpl + type); } -@@ -145,14 +148,14 @@ unsigned paravirt_patch_default(u8 type, +@@ -145,14 +148,14 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf, if (opfunc == NULL) /* If there's no function, patch it with a ud2a (BUG) */ ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a)); @@ -14738,7 +15258,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/paravirt.c linux-2.6.38.7/arch/x86/ker ret = paravirt_patch_ident_64(insnbuf, len); else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) || -@@ -178,7 +181,7 @@ unsigned paravirt_patch_insns(void *insn +@@ -178,7 +181,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len, if (insn_len > len || start == NULL) insn_len = len; else @@ -14814,22 +15334,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/paravirt.c linux-2.6.38.7/arch/x86/ker }; EXPORT_SYMBOL_GPL(pv_time_ops); -diff -urNp linux-2.6.38.7/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.38.7/arch/x86/kernel/paravirt-spinlocks.c ---- linux-2.6.38.7/arch/x86/kernel/paravirt-spinlocks.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/paravirt-spinlocks.c 2011-04-28 19:34: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.38.7/arch/x86/kernel/pci-calgary_64.c linux-2.6.38.7/arch/x86/kernel/pci-calgary_64.c ---- linux-2.6.38.7/arch/x86/kernel/pci-calgary_64.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/pci-calgary_64.c 2011-04-28 19:34:14.000000000 -0400 -@@ -476,7 +476,7 @@ static void calgary_free_coherent(struct +diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c +index f56a117..3b4e63d 100644 +--- a/arch/x86/kernel/pci-calgary_64.c ++++ b/arch/x86/kernel/pci-calgary_64.c +@@ -476,7 +476,7 @@ static void calgary_free_coherent(struct device *dev, size_t size, free_pages((unsigned long)vaddr, get_order(size)); } @@ -14838,9 +15347,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/pci-calgary_64.c linux-2.6.38.7/arch/x .alloc_coherent = calgary_alloc_coherent, .free_coherent = calgary_free_coherent, .map_sg = calgary_map_sg, -diff -urNp linux-2.6.38.7/arch/x86/kernel/pci-dma.c linux-2.6.38.7/arch/x86/kernel/pci-dma.c ---- linux-2.6.38.7/arch/x86/kernel/pci-dma.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/pci-dma.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c +index 9ea999a..f8d2478 100644 +--- a/arch/x86/kernel/pci-dma.c ++++ b/arch/x86/kernel/pci-dma.c @@ -16,7 +16,7 @@ static int forbid_dac __read_mostly; @@ -14859,10 +15369,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/pci-dma.c linux-2.6.38.7/arch/x86/kern #ifdef CONFIG_PCI if (mask > 0xffffffff && forbid_dac > 0) { -diff -urNp linux-2.6.38.7/arch/x86/kernel/pci-gart_64.c linux-2.6.38.7/arch/x86/kernel/pci-gart_64.c ---- linux-2.6.38.7/arch/x86/kernel/pci-gart_64.c 2011-05-10 22:06:27.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/pci-gart_64.c 2011-05-10 22:06:52.000000000 -0400 -@@ -713,7 +713,7 @@ static __init int init_amd_gatt(struct a +diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c +index 197a46f..51f303d 100644 +--- a/arch/x86/kernel/pci-gart_64.c ++++ b/arch/x86/kernel/pci-gart_64.c +@@ -713,7 +713,7 @@ static __init int init_amd_gatt(struct agp_kern_info *info) return -1; } @@ -14871,9 +15382,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/pci-gart_64.c linux-2.6.38.7/arch/x86/ .map_sg = gart_map_sg, .unmap_sg = gart_unmap_sg, .map_page = gart_map_page, -diff -urNp linux-2.6.38.7/arch/x86/kernel/pci-iommu_table.c linux-2.6.38.7/arch/x86/kernel/pci-iommu_table.c ---- linux-2.6.38.7/arch/x86/kernel/pci-iommu_table.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/pci-iommu_table.c 2011-05-16 21:47:08.000000000 -0400 +diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c +index 55d745e..83ab856 100644 +--- a/arch/x86/kernel/pci-iommu_table.c ++++ b/arch/x86/kernel/pci-iommu_table.c @@ -2,7 +2,7 @@ #include <asm/iommu_table.h> #include <linux/string.h> @@ -14883,7 +15395,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/pci-iommu_table.c linux-2.6.38.7/arch/ #define DEBUG 1 -@@ -53,6 +53,8 @@ void __init check_iommu_entries(struct i +@@ -53,6 +53,8 @@ void __init check_iommu_entries(struct iommu_table_entry *start, char sym_p[KSYM_SYMBOL_LEN]; char sym_q[KSYM_SYMBOL_LEN]; @@ -14892,10 +15404,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/pci-iommu_table.c linux-2.6.38.7/arch/ /* Simple cyclic dependency checker. */ for (p = start; p < finish; p++) { q = find_dependents_of(start, finish, p); -diff -urNp linux-2.6.38.7/arch/x86/kernel/pci-nommu.c linux-2.6.38.7/arch/x86/kernel/pci-nommu.c ---- linux-2.6.38.7/arch/x86/kernel/pci-nommu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/pci-nommu.c 2011-04-28 19:34:14.000000000 -0400 -@@ -95,7 +95,7 @@ static void nommu_sync_sg_for_device(str +diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c +index 3af4af8..7950f48 100644 +--- a/arch/x86/kernel/pci-nommu.c ++++ b/arch/x86/kernel/pci-nommu.c +@@ -95,7 +95,7 @@ static void nommu_sync_sg_for_device(struct device *dev, flush_write_buffers(); } @@ -14904,10 +15417,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/pci-nommu.c linux-2.6.38.7/arch/x86/ke .alloc_coherent = dma_generic_alloc_coherent, .free_coherent = nommu_free_coherent, .map_sg = nommu_map_sg, -diff -urNp linux-2.6.38.7/arch/x86/kernel/pci-swiotlb.c linux-2.6.38.7/arch/x86/kernel/pci-swiotlb.c ---- linux-2.6.38.7/arch/x86/kernel/pci-swiotlb.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/pci-swiotlb.c 2011-04-28 19:34:14.000000000 -0400 -@@ -26,7 +26,7 @@ static void *x86_swiotlb_alloc_coherent( +diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c +index 8f972cb..f1ec69c 100644 +--- a/arch/x86/kernel/pci-swiotlb.c ++++ b/arch/x86/kernel/pci-swiotlb.c +@@ -26,7 +26,7 @@ static void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size, return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); } @@ -14916,10 +15430,149 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/pci-swiotlb.c linux-2.6.38.7/arch/x86/ .mapping_error = swiotlb_dma_mapping_error, .alloc_coherent = x86_swiotlb_alloc_coherent, .free_coherent = swiotlb_free_coherent, -diff -urNp linux-2.6.38.7/arch/x86/kernel/process_32.c linux-2.6.38.7/arch/x86/kernel/process_32.c ---- linux-2.6.38.7/arch/x86/kernel/process_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/process_32.c 2011-05-16 21:47:08.000000000 -0400 -@@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __as +diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c +index ff45541..5bc728d 100644 +--- a/arch/x86/kernel/process.c ++++ b/arch/x86/kernel/process.c +@@ -48,16 +48,33 @@ void free_thread_xstate(struct task_struct *tsk) + + void free_thread_info(struct thread_info *ti) + { +- free_thread_xstate(ti->task); + free_pages((unsigned long)ti, get_order(THREAD_SIZE)); + } + ++static struct kmem_cache *task_struct_cachep; ++ + void arch_task_cache_init(void) + { +- task_xstate_cachep = +- kmem_cache_create("task_xstate", xstate_size, ++ /* create a slab on which task_structs can be allocated */ ++ task_struct_cachep = ++ kmem_cache_create("task_struct", sizeof(struct task_struct), ++ ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL); ++ ++ task_xstate_cachep = ++ kmem_cache_create("task_xstate", xstate_size, + __alignof__(union thread_xstate), +- SLAB_PANIC | SLAB_NOTRACK, NULL); ++ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL); ++} ++ ++struct task_struct *alloc_task_struct(void) ++{ ++ return kmem_cache_alloc(task_struct_cachep, GFP_KERNEL); ++} ++ ++void free_task_struct(struct task_struct *task) ++{ ++ free_thread_xstate(task); ++ kmem_cache_free(task_struct_cachep, task); + } + + /* +@@ -70,7 +87,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); +@@ -106,7 +123,7 @@ void show_regs_common(void) + + printk(KERN_CONT "\n"); + printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s", +- 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); +@@ -123,6 +140,9 @@ void flush_thread(void) + { + struct task_struct *tsk = current; + ++#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF) ++ loadsegment(gs, 0); ++#endif + flush_ptrace_hw_breakpoint(tsk); + memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array)); + /* +@@ -285,10 +305,10 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags) + 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; ++ savesegment(gs, regs.gs); + #else + regs.ss = __KERNEL_DS; + #endif +@@ -404,7 +424,7 @@ void default_idle(void) + EXPORT_SYMBOL(default_idle); + #endif + +-void stop_this_cpu(void *dummy) ++__noreturn void stop_this_cpu(void *dummy) + { + local_irq_disable(); + /* +@@ -668,16 +688,34 @@ static int __init idle_setup(char *str) + } + early_param("idle", idle_setup); + +-unsigned long arch_align_stack(unsigned long sp) ++#ifdef CONFIG_PAX_RANDKSTACK ++asmlinkage void pax_randomize_kstack(void) + { +- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space) +- sp -= get_random_int() % 8192; +- return sp & ~0xf; +-} ++ struct thread_struct *thread = ¤t->thread; ++ unsigned long time; + +-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; +-} ++ if (!randomize_va_space) ++ return; ++ ++ rdtscl(time); ++ ++ /* P4 seems to return a 0 LSB, ignore it */ ++#ifdef CONFIG_MPENTIUM4 ++ time &= 0x3EUL; ++ time <<= 2; ++#elif defined(CONFIG_X86_64) ++ time &= 0xFUL; ++ time <<= 4; ++#else ++ time &= 0x1FUL; ++ time <<= 3; ++#endif ++ ++ thread->sp0 ^= time; ++ load_sp0(init_tss + smp_processor_id(), thread); + ++#ifdef CONFIG_X86_64 ++ percpu_write(kernel_stack, thread->sp0); ++#endif ++} ++#endif +diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c +index 8d12878..aed73f1 100644 +--- a/arch/x86/kernel/process_32.c ++++ b/arch/x86/kernel/process_32.c +@@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __asm__("ret_from_fork"); unsigned long thread_saved_pc(struct task_struct *tsk) { return ((unsigned long *)tsk->thread.sp)[3]; @@ -14927,7 +15580,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/process_32.c linux-2.6.38.7/arch/x86/k } #ifndef CONFIG_SMP -@@ -126,15 +127,14 @@ void __show_regs(struct pt_regs *regs, i +@@ -126,15 +127,14 @@ void __show_regs(struct pt_regs *regs, int all) unsigned long sp; unsigned short ss, gs; @@ -14945,7 +15598,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/process_32.c linux-2.6.38.7/arch/x86/k show_regs_common(); -@@ -196,13 +196,14 @@ int copy_thread(unsigned long clone_flag +@@ -196,13 +196,14 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, struct task_struct *tsk; int err; @@ -14961,7 +15614,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/process_32.c linux-2.6.38.7/arch/x86/k p->thread.ip = (unsigned long) ret_from_fork; -@@ -293,7 +294,7 @@ __switch_to(struct task_struct *prev_p, +@@ -293,7 +294,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) struct thread_struct *prev = &prev_p->thread, *next = &next_p->thread; int cpu = smp_processor_id(); @@ -14970,7 +15623,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/process_32.c linux-2.6.38.7/arch/x86/k bool preload_fpu; /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ -@@ -328,6 +329,10 @@ __switch_to(struct task_struct *prev_p, +@@ -328,6 +329,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) */ lazy_save_gs(prev->gs); @@ -14981,7 +15634,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/process_32.c linux-2.6.38.7/arch/x86/k /* * Load the per-thread Thread-Local Storage descriptor. */ -@@ -363,6 +368,9 @@ __switch_to(struct task_struct *prev_p, +@@ -363,6 +368,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) */ arch_end_context_switch(next_p); @@ -14991,7 +15644,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/process_32.c linux-2.6.38.7/arch/x86/k if (preload_fpu) __math_state_restore(); -@@ -372,8 +380,6 @@ __switch_to(struct task_struct *prev_p, +@@ -372,8 +380,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) if (prev->gs | next->gs) lazy_load_gs(next->gs); @@ -15000,14 +15653,15 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/process_32.c linux-2.6.38.7/arch/x86/k return prev_p; } -@@ -403,4 +409,3 @@ unsigned long get_wchan(struct task_stru +@@ -403,4 +409,3 @@ unsigned long get_wchan(struct task_struct *p) } while (count++ < 16); return 0; } - -diff -urNp linux-2.6.38.7/arch/x86/kernel/process_64.c linux-2.6.38.7/arch/x86/kernel/process_64.c ---- linux-2.6.38.7/arch/x86/kernel/process_64.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/process_64.c 2011-05-16 21:47:08.000000000 -0400 +diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c +index bd387e8..586c7c7 100644 +--- a/arch/x86/kernel/process_64.c ++++ b/arch/x86/kernel/process_64.c @@ -87,7 +87,7 @@ static void __exit_idle(void) void exit_idle(void) { @@ -15017,7 +15671,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/process_64.c linux-2.6.38.7/arch/x86/k return; __exit_idle(); } -@@ -260,8 +260,7 @@ int copy_thread(unsigned long clone_flag +@@ -260,8 +260,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, struct pt_regs *childregs; struct task_struct *me = current; @@ -15027,7 +15681,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/process_64.c linux-2.6.38.7/arch/x86/k *childregs = *regs; childregs->ax = 0; -@@ -273,6 +272,7 @@ int copy_thread(unsigned long clone_flag +@@ -273,6 +272,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, p->thread.sp = (unsigned long) childregs; p->thread.sp0 = (unsigned long) (childregs+1); p->thread.usersp = me->thread.usersp; @@ -15035,7 +15689,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/process_64.c linux-2.6.38.7/arch/x86/k set_tsk_thread_flag(p, TIF_FORK); -@@ -376,7 +376,7 @@ __switch_to(struct task_struct *prev_p, +@@ -376,7 +376,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) struct thread_struct *prev = &prev_p->thread; struct thread_struct *next = &next_p->thread; int cpu = smp_processor_id(); @@ -15044,7 +15698,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/process_64.c linux-2.6.38.7/arch/x86/k unsigned fsindex, gsindex; bool preload_fpu; -@@ -472,10 +472,9 @@ __switch_to(struct task_struct *prev_p, +@@ -472,10 +472,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) prev->usersp = percpu_read(old_rsp); percpu_write(old_rsp, next->usersp); percpu_write(current_task, next_p); @@ -15057,7 +15711,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/process_64.c linux-2.6.38.7/arch/x86/k /* * Now maybe reload the debug registers and handle I/O bitmaps -@@ -529,12 +528,11 @@ unsigned long get_wchan(struct task_stru +@@ -529,12 +528,11 @@ unsigned long get_wchan(struct task_struct *p) if (!p || p == current || p->state == TASK_RUNNING) return 0; stack = (unsigned long)task_stack_page(p); @@ -15072,147 +15726,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/process_64.c linux-2.6.38.7/arch/x86/k return 0; ip = *(u64 *)(fp+8); if (!in_sched_functions(ip)) -diff -urNp linux-2.6.38.7/arch/x86/kernel/process.c linux-2.6.38.7/arch/x86/kernel/process.c ---- linux-2.6.38.7/arch/x86/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/process.c 2011-05-22 23:03:34.000000000 -0400 -@@ -48,16 +48,33 @@ void free_thread_xstate(struct task_stru - - void free_thread_info(struct thread_info *ti) - { -- free_thread_xstate(ti->task); - free_pages((unsigned long)ti, get_order(THREAD_SIZE)); - } - -+static struct kmem_cache *task_struct_cachep; -+ - void arch_task_cache_init(void) - { -- task_xstate_cachep = -- kmem_cache_create("task_xstate", xstate_size, -+ /* create a slab on which task_structs can be allocated */ -+ task_struct_cachep = -+ kmem_cache_create("task_struct", sizeof(struct task_struct), -+ ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL); -+ -+ task_xstate_cachep = -+ kmem_cache_create("task_xstate", xstate_size, - __alignof__(union thread_xstate), -- SLAB_PANIC | SLAB_NOTRACK, NULL); -+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL); -+} -+ -+struct task_struct *alloc_task_struct(void) -+{ -+ return kmem_cache_alloc(task_struct_cachep, GFP_KERNEL); -+} -+ -+void free_task_struct(struct task_struct *task) -+{ -+ free_thread_xstate(task); -+ kmem_cache_free(task_struct_cachep, task); - } - - /* -@@ -70,7 +87,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); -@@ -106,7 +123,7 @@ void show_regs_common(void) - - printk(KERN_CONT "\n"); - printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s", -- 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); -@@ -123,6 +140,9 @@ void flush_thread(void) - { - struct task_struct *tsk = current; - -+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF) -+ loadsegment(gs, 0); -+#endif - flush_ptrace_hw_breakpoint(tsk); - memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array)); - /* -@@ -285,10 +305,10 @@ int kernel_thread(int (*fn)(void *), voi - 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; -+ savesegment(gs, regs.gs); - #else - regs.ss = __KERNEL_DS; - #endif -@@ -404,7 +424,7 @@ void default_idle(void) - EXPORT_SYMBOL(default_idle); - #endif - --void stop_this_cpu(void *dummy) -+__noreturn void stop_this_cpu(void *dummy) - { - local_irq_disable(); - /* -@@ -668,16 +688,34 @@ static int __init idle_setup(char *str) - } - early_param("idle", idle_setup); - --unsigned long arch_align_stack(unsigned long sp) -+#ifdef CONFIG_PAX_RANDKSTACK -+asmlinkage void pax_randomize_kstack(void) - { -- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space) -- sp -= get_random_int() % 8192; -- return sp & ~0xf; --} -+ struct thread_struct *thread = ¤t->thread; -+ unsigned long time; - --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; --} -+ if (!randomize_va_space) -+ return; -+ -+ rdtscl(time); -+ -+ /* P4 seems to return a 0 LSB, ignore it */ -+#ifdef CONFIG_MPENTIUM4 -+ time &= 0x3EUL; -+ time <<= 2; -+#elif defined(CONFIG_X86_64) -+ time &= 0xFUL; -+ time <<= 4; -+#else -+ time &= 0x1FUL; -+ time <<= 3; -+#endif -+ -+ thread->sp0 ^= time; -+ load_sp0(init_tss + smp_processor_id(), thread); - -+#ifdef CONFIG_X86_64 -+ percpu_write(kernel_stack, thread->sp0); -+#endif -+} -+#endif -diff -urNp linux-2.6.38.7/arch/x86/kernel/ptrace.c linux-2.6.38.7/arch/x86/kernel/ptrace.c ---- linux-2.6.38.7/arch/x86/kernel/ptrace.c 2011-05-22 23:05:18.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/ptrace.c 2011-05-22 23:05:54.000000000 -0400 -@@ -821,7 +821,7 @@ long arch_ptrace(struct task_struct *chi +diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c +index f65e5b5..6350c3e 100644 +--- a/arch/x86/kernel/ptrace.c ++++ b/arch/x86/kernel/ptrace.c +@@ -821,7 +821,7 @@ long arch_ptrace(struct task_struct *child, long request, unsigned long addr, unsigned long data) { int ret; @@ -15221,7 +15739,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/ptrace.c linux-2.6.38.7/arch/x86/kerne switch (request) { /* read the word at location addr in the USER area. */ -@@ -906,14 +906,14 @@ long arch_ptrace(struct task_struct *chi +@@ -906,14 +906,14 @@ long arch_ptrace(struct task_struct *child, long request, if ((int) addr < 0) return -EIO; ret = do_get_thread_area(child, addr, @@ -15238,7 +15756,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/ptrace.c linux-2.6.38.7/arch/x86/kerne break; #endif -@@ -1330,7 +1330,7 @@ static void fill_sigtrap_info(struct tas +@@ -1330,7 +1330,7 @@ static void fill_sigtrap_info(struct task_struct *tsk, memset(info, 0, sizeof(*info)); info->si_signo = SIGTRAP; info->si_code = si_code; @@ -15247,7 +15765,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/ptrace.c linux-2.6.38.7/arch/x86/kerne } void user_single_step_siginfo(struct task_struct *tsk, -@@ -1363,7 +1363,7 @@ void send_sigtrap(struct task_struct *ts +@@ -1363,7 +1363,7 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, * We must return the syscall number to actually look up in the table. * This can be -1L to skip running any syscall at all. */ @@ -15256,7 +15774,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/ptrace.c linux-2.6.38.7/arch/x86/kerne { long ret = 0; -@@ -1408,7 +1408,7 @@ asmregparm long syscall_trace_enter(stru +@@ -1408,7 +1408,7 @@ asmregparm long syscall_trace_enter(struct pt_regs *regs) return ret ?: regs->orig_ax; } @@ -15265,10 +15783,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/ptrace.c linux-2.6.38.7/arch/x86/kerne { bool step; -diff -urNp linux-2.6.38.7/arch/x86/kernel/pvclock.c linux-2.6.38.7/arch/x86/kernel/pvclock.c ---- linux-2.6.38.7/arch/x86/kernel/pvclock.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/pvclock.c 2011-05-11 18:35:16.000000000 -0400 -@@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvc +diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c +index 42eb330..139955c 100644 +--- a/arch/x86/kernel/pvclock.c ++++ b/arch/x86/kernel/pvclock.c +@@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src) return pv_tsc_khz; } @@ -15282,7 +15801,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/pvclock.c linux-2.6.38.7/arch/x86/kern } cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src) -@@ -121,11 +121,11 @@ cycle_t pvclock_clocksource_read(struct +@@ -121,11 +121,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src) * updating at the same time, and one of them could be slightly behind, * making the assumption that last_value always go forward fail to hold. */ @@ -15296,9 +15815,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/pvclock.c linux-2.6.38.7/arch/x86/kern } while (unlikely(last != ret)); return ret; -diff -urNp linux-2.6.38.7/arch/x86/kernel/reboot.c linux-2.6.38.7/arch/x86/kernel/reboot.c ---- linux-2.6.38.7/arch/x86/kernel/reboot.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/reboot.c 2011-05-22 23:03:34.000000000 -0400 +diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c +index 715037c..0bdb632 100644 +--- a/arch/x86/kernel/reboot.c ++++ b/arch/x86/kernel/reboot.c @@ -34,7 +34,7 @@ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); @@ -15326,7 +15846,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/reboot.c linux-2.6.38.7/arch/x86/kerne }; static const struct desc_ptr -@@ -363,7 +363,7 @@ static const unsigned char jump_to_bios +@@ -363,7 +363,7 @@ static const unsigned char jump_to_bios [] = * specified by the code and length parameters. * We assume that length will aways be less that 100! */ @@ -15335,7 +15855,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/reboot.c linux-2.6.38.7/arch/x86/kerne { local_irq_disable(); -@@ -390,16 +390,15 @@ void machine_real_restart(const unsigned +@@ -390,16 +390,15 @@ void machine_real_restart(const unsigned char *code, int length) boot)". This seems like a fairly standard thing that gets set by REBOOT.COM programs, and the previous reset routine did this too. */ @@ -15355,7 +15875,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/reboot.c linux-2.6.38.7/arch/x86/kerne /* Set up the IDT for real mode. */ load_idt(&real_mode_idt); -@@ -427,6 +426,7 @@ void machine_real_restart(const unsigned +@@ -427,6 +426,7 @@ void machine_real_restart(const unsigned char *code, int length) __asm__ __volatile__ ("ljmp $0x0008,%0" : : "i" ((void *)(0x1000 - sizeof (real_mode_switch) - 100))); @@ -15363,7 +15883,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/reboot.c linux-2.6.38.7/arch/x86/kerne } #ifdef CONFIG_APM_MODULE EXPORT_SYMBOL(machine_real_restart); -@@ -547,7 +547,7 @@ void __attribute__((weak)) mach_reboot_f +@@ -547,7 +547,7 @@ void __attribute__((weak)) mach_reboot_fixups(void) { } @@ -15388,7 +15908,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/reboot.c linux-2.6.38.7/arch/x86/kerne { printk("machine restart\n"); -@@ -677,7 +677,7 @@ static void native_machine_restart(char +@@ -677,7 +677,7 @@ static void native_machine_restart(char *__unused) __machine_emergency_restart(0); } @@ -15406,7 +15926,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/reboot.c linux-2.6.38.7/arch/x86/kerne { if (pm_power_off) { if (!reboot_force) -@@ -697,6 +697,7 @@ static void native_machine_power_off(voi +@@ -697,6 +697,7 @@ static void native_machine_power_off(void) } /* a fallback in case there is no PM info available */ tboot_shutdown(TB_SHUTDOWN_HALT); @@ -15414,9 +15934,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/reboot.c linux-2.6.38.7/arch/x86/kerne } struct machine_ops machine_ops = { -diff -urNp linux-2.6.38.7/arch/x86/kernel/setup.c linux-2.6.38.7/arch/x86/kernel/setup.c ---- linux-2.6.38.7/arch/x86/kernel/setup.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/setup.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c +index d3cfe26..aeb75b1 100644 +--- a/arch/x86/kernel/setup.c ++++ b/arch/x86/kernel/setup.c @@ -654,7 +654,7 @@ static void __init trim_bios_range(void) * area (640->1Mb) as ram even though it is not. * take them out. @@ -15446,9 +15967,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/setup.c linux-2.6.38.7/arch/x86/kernel data_resource.end = virt_to_phys(_edata)-1; bss_resource.start = virt_to_phys(&__bss_start); bss_resource.end = virt_to_phys(&__bss_stop)-1; -diff -urNp linux-2.6.38.7/arch/x86/kernel/setup_percpu.c linux-2.6.38.7/arch/x86/kernel/setup_percpu.c ---- linux-2.6.38.7/arch/x86/kernel/setup_percpu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/setup_percpu.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c +index 002b796..14c9f6d 100644 +--- a/arch/x86/kernel/setup_percpu.c ++++ b/arch/x86/kernel/setup_percpu.c @@ -21,19 +21,17 @@ #include <asm/cpu.h> #include <asm/stackprotector.h> @@ -15473,7 +15995,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/setup_percpu.c linux-2.6.38.7/arch/x86 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET, }; EXPORT_SYMBOL(__per_cpu_offset); -@@ -155,10 +153,10 @@ static inline void setup_percpu_segment( +@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu) { #ifdef CONFIG_X86_32 struct desc_struct gdt; @@ -15512,10 +16034,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/setup_percpu.c linux-2.6.38.7/arch/x86 /* * Up to this point, the boot CPU has been using .init.data * area. Reload any changed state for the boot CPU. -diff -urNp linux-2.6.38.7/arch/x86/kernel/signal.c linux-2.6.38.7/arch/x86/kernel/signal.c ---- linux-2.6.38.7/arch/x86/kernel/signal.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/signal.c 2011-05-22 23:03:34.000000000 -0400 -@@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsi +diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c +index 4fd173c..66cc537 100644 +--- a/arch/x86/kernel/signal.c ++++ b/arch/x86/kernel/signal.c +@@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsigned long sp) * Align the stack pointer according to the i386 ABI, * i.e. so that on function entry ((sp + 4) & 15) == 0. */ @@ -15524,7 +16047,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/signal.c linux-2.6.38.7/arch/x86/kerne #else /* !CONFIG_X86_32 */ sp = round_down(sp, 16) - 8; #endif -@@ -249,11 +249,11 @@ get_sigframe(struct k_sigaction *ka, str +@@ -249,11 +249,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size, * Return an always-bogus address instead so we will die with SIGSEGV. */ if (onsigstack && !likely(on_sig_stack(sp))) @@ -15538,7 +16061,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/signal.c linux-2.6.38.7/arch/x86/kerne return (void __user *)sp; } -@@ -308,9 +308,9 @@ __setup_frame(int sig, struct k_sigactio +@@ -308,9 +308,9 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set, } if (current->mm->context.vdso) @@ -15550,7 +16073,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/signal.c linux-2.6.38.7/arch/x86/kerne if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; -@@ -324,7 +324,7 @@ __setup_frame(int sig, struct k_sigactio +@@ -324,7 +324,7 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set, * reasons and because gdb uses it as a signature to notice * signal handler stack frames. */ @@ -15559,7 +16082,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/signal.c linux-2.6.38.7/arch/x86/kerne if (err) return -EFAULT; -@@ -378,7 +378,10 @@ static int __setup_rt_frame(int sig, str +@@ -378,7 +378,10 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); /* Set up to return from userspace. */ @@ -15571,7 +16094,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/signal.c linux-2.6.38.7/arch/x86/kerne if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; put_user_ex(restorer, &frame->pretcode); -@@ -390,7 +393,7 @@ static int __setup_rt_frame(int sig, str +@@ -390,7 +393,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, * reasons and because gdb uses it as a signature to notice * signal handler stack frames. */ @@ -15580,7 +16103,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/signal.c linux-2.6.38.7/arch/x86/kerne } put_user_catch(err); if (err) -@@ -773,6 +776,8 @@ static void do_signal(struct pt_regs *re +@@ -773,6 +776,8 @@ static void do_signal(struct pt_regs *regs) int signr; sigset_t *oldset; @@ -15589,7 +16112,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/signal.c linux-2.6.38.7/arch/x86/kerne /* * We want the common case to go fast, which is why we may in certain * cases get here from kernel mode. Just return without doing anything -@@ -780,7 +785,7 @@ static void do_signal(struct pt_regs *re +@@ -780,7 +785,7 @@ static void do_signal(struct pt_regs *regs) * X86_32: vm86 regs switched out by assembly code before reaching * here, so testing against kernel CS suffices. */ @@ -15598,10 +16121,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/signal.c linux-2.6.38.7/arch/x86/kerne return; if (current_thread_info()->status & TS_RESTORE_SIGMASK) -diff -urNp linux-2.6.38.7/arch/x86/kernel/smpboot.c linux-2.6.38.7/arch/x86/kernel/smpboot.c ---- linux-2.6.38.7/arch/x86/kernel/smpboot.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/smpboot.c 2011-05-11 18:34:57.000000000 -0400 -@@ -773,17 +773,20 @@ static int __cpuinit do_boot_cpu(int api +diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c +index 08776a9..ada4917 100644 +--- a/arch/x86/kernel/smpboot.c ++++ b/arch/x86/kernel/smpboot.c +@@ -773,17 +773,20 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu) set_idle_for_cpu(cpu, c_idle.idle); do_rest: per_cpu(current_task, cpu) = c_idle.idle; @@ -15625,7 +16149,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/smpboot.c linux-2.6.38.7/arch/x86/kern initial_code = (unsigned long)start_secondary; stack_start = c_idle.idle->thread.sp; -@@ -923,6 +926,12 @@ int __cpuinit native_cpu_up(unsigned int +@@ -923,6 +926,12 @@ int __cpuinit native_cpu_up(unsigned int cpu) per_cpu(cpu_state, cpu) = CPU_UP_PREPARE; @@ -15638,10 +16162,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/smpboot.c linux-2.6.38.7/arch/x86/kern err = do_boot_cpu(apicid, cpu); if (err) { pr_debug("do_boot_cpu failed %d\n", err); -diff -urNp linux-2.6.38.7/arch/x86/kernel/step.c linux-2.6.38.7/arch/x86/kernel/step.c ---- linux-2.6.38.7/arch/x86/kernel/step.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/step.c 2011-04-28 19:34:14.000000000 -0400 -@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc +diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c +index 58de45e..4cd6b77 100644 +--- a/arch/x86/kernel/step.c ++++ b/arch/x86/kernel/step.c +@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re struct desc_struct *desc; unsigned long base; @@ -15654,7 +16179,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/step.c linux-2.6.38.7/arch/x86/kernel/ addr = -1L; /* bogus selector, access would fault */ else { desc = child->mm->context.ldt + seg; -@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struc +@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re addr += base; } mutex_unlock(&child->mm->context.lock); @@ -15664,7 +16189,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/step.c linux-2.6.38.7/arch/x86/kernel/ return addr; } -@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct t +@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs) unsigned char opcode[15]; unsigned long addr = convert_ip_to_linear(child, regs); @@ -15674,7 +16199,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/step.c linux-2.6.38.7/arch/x86/kernel/ copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0); for (i = 0; i < copied; i++) { switch (opcode[i]) { -@@ -74,7 +78,7 @@ static int is_setting_trap_flag(struct t +@@ -74,7 +78,7 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs) #ifdef CONFIG_X86_64 case 0x40 ... 0x4f: @@ -15683,17 +16208,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/step.c linux-2.6.38.7/arch/x86/kernel/ /* 32-bit mode: register increment */ return 0; /* 64-bit mode: REX prefix */ -diff -urNp linux-2.6.38.7/arch/x86/kernel/syscall_table_32.S linux-2.6.38.7/arch/x86/kernel/syscall_table_32.S ---- linux-2.6.38.7/arch/x86/kernel/syscall_table_32.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/syscall_table_32.S 2011-04-28 19:34: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.38.7/arch/x86/kernel/sys_i386_32.c linux-2.6.38.7/arch/x86/kernel/sys_i386_32.c ---- linux-2.6.38.7/arch/x86/kernel/sys_i386_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/sys_i386_32.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c +index 0b0cb5f..db6b9ed 100644 +--- a/arch/x86/kernel/sys_i386_32.c ++++ b/arch/x86/kernel/sys_i386_32.c @@ -24,17 +24,224 @@ #include <asm/syscalls.h> @@ -15706,12 +16224,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/sys_i386_32.c linux-2.6.38.7/arch/x86/ - const char *const argv[], - const char *const envp[]) +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags) - { -- long __res; -- asm volatile ("int $0x80" -- : "=a" (__res) -- : "0" (__NR_execve), "b" (filename), "c" (argv), "d" (envp) : "memory"); -- return __res; ++{ + unsigned long pax_task_size = TASK_SIZE; + +#ifdef CONFIG_PAX_SEGMEXEC @@ -15819,7 +16332,12 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/sys_i386_32.c linux-2.6.38.7/arch/x86/ +arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, + const unsigned long len, const unsigned long pgoff, + const unsigned long flags) -+{ + { +- long __res; +- asm volatile ("int $0x80" +- : "=a" (__res) +- : "0" (__NR_execve), "b" (filename), "c" (argv), "d" (envp) : "memory"); +- return __res; + struct vm_area_struct *vma; + struct mm_struct *mm = current->mm; + unsigned long base = mm->mmap_base, addr = addr0, pax_task_size = TASK_SIZE; @@ -15931,9 +16449,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/sys_i386_32.c linux-2.6.38.7/arch/x86/ + + return addr; } -diff -urNp linux-2.6.38.7/arch/x86/kernel/sys_x86_64.c linux-2.6.38.7/arch/x86/kernel/sys_x86_64.c ---- linux-2.6.38.7/arch/x86/kernel/sys_x86_64.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/sys_x86_64.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c +index ff14a50..35626c3 100644 +--- a/arch/x86/kernel/sys_x86_64.c ++++ b/arch/x86/kernel/sys_x86_64.c @@ -32,8 +32,8 @@ out: return error; } @@ -15945,7 +16464,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/sys_x86_64.c linux-2.6.38.7/arch/x86/k { if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT)) { unsigned long new_begin; -@@ -52,7 +52,7 @@ static void find_start_end(unsigned long +@@ -52,7 +52,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin, *begin = new_begin; } } else { @@ -15954,7 +16473,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/sys_x86_64.c linux-2.6.38.7/arch/x86/k *end = TASK_SIZE; } } -@@ -69,16 +69,19 @@ arch_get_unmapped_area(struct file *filp +@@ -69,16 +69,19 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, if (flags & MAP_FIXED) return addr; @@ -15986,7 +16505,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/sys_x86_64.c linux-2.6.38.7/arch/x86/k /* * Remember the place where we stopped the search: */ -@@ -128,7 +131,7 @@ arch_get_unmapped_area_topdown(struct fi +@@ -128,7 +131,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, { struct vm_area_struct *vma; struct mm_struct *mm = current->mm; @@ -15995,7 +16514,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/sys_x86_64.c linux-2.6.38.7/arch/x86/k /* requested length too big for entire address space */ if (len > TASK_SIZE) -@@ -141,13 +144,18 @@ arch_get_unmapped_area_topdown(struct fi +@@ -141,13 +144,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT)) goto bottomup; @@ -16018,7 +16537,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/sys_x86_64.c linux-2.6.38.7/arch/x86/k } /* check if free_area_cache is useful for us */ -@@ -162,7 +170,7 @@ arch_get_unmapped_area_topdown(struct fi +@@ -162,7 +170,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, /* make sure it can fit in the remaining address space */ if (addr > len) { vma = find_vma(mm, addr-len); @@ -16027,7 +16546,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/sys_x86_64.c linux-2.6.38.7/arch/x86/k /* remember the address as a hint for next time */ return mm->free_area_cache = addr-len; } -@@ -179,7 +187,7 @@ arch_get_unmapped_area_topdown(struct fi +@@ -179,7 +187,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, * return with success: */ vma = find_vma(mm, addr); @@ -16036,7 +16555,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/sys_x86_64.c linux-2.6.38.7/arch/x86/k /* remember the address as a hint for next time */ return mm->free_area_cache = addr; -@@ -188,8 +196,8 @@ arch_get_unmapped_area_topdown(struct fi +@@ -188,8 +196,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, mm->cached_hole_size = vma->vm_start - addr; /* try just below the current vma->vm_start */ @@ -16071,9 +16590,19 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/sys_x86_64.c linux-2.6.38.7/arch/x86/k mm->cached_hole_size = ~0UL; return addr; -diff -urNp linux-2.6.38.7/arch/x86/kernel/tboot.c linux-2.6.38.7/arch/x86/kernel/tboot.c ---- linux-2.6.38.7/arch/x86/kernel/tboot.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/tboot.c 2011-05-22 23:03:34.000000000 -0400 +diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S +index b35786d..c2c6928 100644 +--- a/arch/x86/kernel/syscall_table_32.S ++++ b/arch/x86/kernel/syscall_table_32.S +@@ -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 --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c +index 998e972..e6e307d 100644 +--- a/arch/x86/kernel/tboot.c ++++ b/arch/x86/kernel/tboot.c @@ -218,7 +218,7 @@ static int tboot_setup_sleep(void) void tboot_shutdown(u32 shutdown_type) @@ -16092,7 +16621,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/tboot.c linux-2.6.38.7/arch/x86/kernel shutdown(); /* should not reach here */ -@@ -297,7 +297,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1 +@@ -297,7 +297,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control) tboot_shutdown(acpi_shutdown_map[sleep_state]); } @@ -16101,7 +16630,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/tboot.c linux-2.6.38.7/arch/x86/kernel static int tboot_wait_for_aps(int num_aps) { -@@ -321,9 +321,9 @@ static int __cpuinit tboot_cpu_callback( +@@ -321,9 +321,9 @@ static int __cpuinit tboot_cpu_callback(struct notifier_block *nfb, { switch (action) { case CPU_DYING: @@ -16122,9 +16651,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/tboot.c linux-2.6.38.7/arch/x86/kernel register_hotcpu_notifier(&tboot_cpu_notifier); return 0; } -diff -urNp linux-2.6.38.7/arch/x86/kernel/time.c linux-2.6.38.7/arch/x86/kernel/time.c ---- linux-2.6.38.7/arch/x86/kernel/time.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/time.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c +index 25a28a2..e917271 100644 +--- a/arch/x86/kernel/time.c ++++ b/arch/x86/kernel/time.c @@ -22,17 +22,13 @@ #include <asm/hpet.h> #include <asm/time.h> @@ -16145,7 +16675,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/time.c linux-2.6.38.7/arch/x86/kernel/ #else unsigned long *sp = (unsigned long *)kernel_stack_pointer(regs); -@@ -41,11 +37,17 @@ unsigned long profile_pc(struct pt_regs +@@ -41,11 +37,17 @@ unsigned long profile_pc(struct pt_regs *regs) * or above a saved flags. Eflags has bits 22-31 zero, * kernel addresses don't. */ @@ -16163,10 +16693,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/time.c linux-2.6.38.7/arch/x86/kernel/ } return pc; } -diff -urNp linux-2.6.38.7/arch/x86/kernel/tls.c linux-2.6.38.7/arch/x86/kernel/tls.c ---- linux-2.6.38.7/arch/x86/kernel/tls.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/tls.c 2011-04-28 19:34:14.000000000 -0400 -@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc +diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c +index 6bb7b85..dd853e1 100644 +--- a/arch/x86/kernel/tls.c ++++ b/arch/x86/kernel/tls.c +@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struct *p, int idx, if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) return -EINVAL; @@ -16178,9 +16709,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/tls.c linux-2.6.38.7/arch/x86/kernel/t set_tls_desc(p, idx, &info, 1); return 0; -diff -urNp linux-2.6.38.7/arch/x86/kernel/trampoline_32.S linux-2.6.38.7/arch/x86/kernel/trampoline_32.S ---- linux-2.6.38.7/arch/x86/kernel/trampoline_32.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/trampoline_32.S 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/trampoline_32.S b/arch/x86/kernel/trampoline_32.S +index 8508237..229b664 100644 +--- a/arch/x86/kernel/trampoline_32.S ++++ b/arch/x86/kernel/trampoline_32.S @@ -32,6 +32,12 @@ #include <asm/segment.h> #include <asm/page_types.h> @@ -16203,9 +16735,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/trampoline_32.S linux-2.6.38.7/arch/x8 # These need to be in the same 64K segment as the above; # hence we don't use the boot_gdt_descr defined in head.S -diff -urNp linux-2.6.38.7/arch/x86/kernel/trampoline_64.S linux-2.6.38.7/arch/x86/kernel/trampoline_64.S ---- linux-2.6.38.7/arch/x86/kernel/trampoline_64.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/trampoline_64.S 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/trampoline_64.S b/arch/x86/kernel/trampoline_64.S +index 075d130..ba8aa49 100644 +--- a/arch/x86/kernel/trampoline_64.S ++++ b/arch/x86/kernel/trampoline_64.S @@ -91,7 +91,7 @@ startup_32: movl $__KERNEL_DS, %eax # Initialize the %ds segment register movl %eax, %ds @@ -16224,9 +16757,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/trampoline_64.S linux-2.6.38.7/arch/x8 .long tgdt - r_base .short 0 .quad 0x00cf9b000000ffff # __KERNEL32_CS -diff -urNp linux-2.6.38.7/arch/x86/kernel/traps.c linux-2.6.38.7/arch/x86/kernel/traps.c ---- linux-2.6.38.7/arch/x86/kernel/traps.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/traps.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c +index b9b6716..4d3ff8a 100644 +--- a/arch/x86/kernel/traps.c ++++ b/arch/x86/kernel/traps.c @@ -70,12 +70,6 @@ asmlinkage int system_call(void); /* Do we ignore FPU interrupts ? */ @@ -16240,7 +16774,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/traps.c linux-2.6.38.7/arch/x86/kernel #endif DECLARE_BITMAP(used_vectors, NR_VECTORS); -@@ -117,13 +111,13 @@ static inline void preempt_conditional_c +@@ -117,13 +111,13 @@ static inline void preempt_conditional_cli(struct pt_regs *regs) } static void __kprobes @@ -16256,7 +16790,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/traps.c linux-2.6.38.7/arch/x86/kernel /* * traps 0, 1, 3, 4, and 5 should be forwarded to vm86. * On nmi (interrupt 2), do_trap should not be called. -@@ -134,7 +128,7 @@ do_trap(int trapnr, int signr, char *str +@@ -134,7 +128,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs, } #endif @@ -16295,7 +16829,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/traps.c linux-2.6.38.7/arch/x86/kernel return; #ifdef CONFIG_X86_32 -@@ -264,14 +270,30 @@ do_general_protection(struct pt_regs *re +@@ -264,14 +270,30 @@ do_general_protection(struct pt_regs *regs, long error_code) conditional_sti(regs); #ifdef CONFIG_X86_32 @@ -16342,7 +16876,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/traps.c linux-2.6.38.7/arch/x86/kernel die("general protection fault", regs, error_code); } -@@ -569,7 +598,7 @@ dotraplinkage void __kprobes do_debug(st +@@ -569,7 +598,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code) /* It's safe to allow irq's after DR6 has been saved */ preempt_conditional_sti(regs); @@ -16351,7 +16885,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/traps.c linux-2.6.38.7/arch/x86/kernel handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code, 1); preempt_conditional_cli(regs); -@@ -583,7 +612,7 @@ dotraplinkage void __kprobes do_debug(st +@@ -583,7 +612,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code) * We already checked v86 mode above, so we can check for kernel mode * by just checking the CPL of CS. */ @@ -16360,7 +16894,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/traps.c linux-2.6.38.7/arch/x86/kernel tsk->thread.debugreg6 &= ~DR_STEP; set_tsk_thread_flag(tsk, TIF_SINGLESTEP); regs->flags &= ~X86_EFLAGS_TF; -@@ -612,7 +641,7 @@ void math_error(struct pt_regs *regs, in +@@ -612,7 +641,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr) return; conditional_sti(regs); @@ -16369,7 +16903,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/traps.c linux-2.6.38.7/arch/x86/kernel { if (!fixup_exception(regs)) { task->thread.error_code = error_code; -@@ -723,7 +752,7 @@ asmlinkage void __attribute__((weak)) sm +@@ -723,7 +752,7 @@ asmlinkage void __attribute__((weak)) smp_threshold_interrupt(void) void __math_state_restore(void) { struct thread_info *thread = current_thread_info(); @@ -16388,9 +16922,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/traps.c linux-2.6.38.7/arch/x86/kernel if (!tsk_used_math(tsk)) { local_irq_enable(); -diff -urNp linux-2.6.38.7/arch/x86/kernel/vm86_32.c linux-2.6.38.7/arch/x86/kernel/vm86_32.c ---- linux-2.6.38.7/arch/x86/kernel/vm86_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/vm86_32.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c +index 863f875..4307295 100644 +--- a/arch/x86/kernel/vm86_32.c ++++ b/arch/x86/kernel/vm86_32.c @@ -41,6 +41,7 @@ #include <linux/ptrace.h> #include <linux/audit.h> @@ -16399,7 +16934,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/vm86_32.c linux-2.6.38.7/arch/x86/kern #include <asm/uaccess.h> #include <asm/io.h> -@@ -148,7 +149,7 @@ struct pt_regs *save_v86_state(struct ke +@@ -148,7 +149,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs) do_exit(SIGSEGV); } @@ -16408,7 +16943,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/vm86_32.c linux-2.6.38.7/arch/x86/kern current->thread.sp0 = current->thread.saved_sp0; current->thread.sysenter_cs = __KERNEL_CS; load_sp0(tss, ¤t->thread); -@@ -208,6 +209,13 @@ int sys_vm86old(struct vm86_struct __use +@@ -208,6 +209,13 @@ int sys_vm86old(struct vm86_struct __user *v86, struct pt_regs *regs) struct task_struct *tsk; int tmp, ret = -EPERM; @@ -16422,7 +16957,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/vm86_32.c linux-2.6.38.7/arch/x86/kern tsk = current; if (tsk->thread.saved_sp0) goto out; -@@ -238,6 +246,14 @@ int sys_vm86(unsigned long cmd, unsigned +@@ -238,6 +246,14 @@ int sys_vm86(unsigned long cmd, unsigned long arg, struct pt_regs *regs) int tmp, ret; struct vm86plus_struct __user *v86; @@ -16437,7 +16972,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/vm86_32.c linux-2.6.38.7/arch/x86/kern tsk = current; switch (cmd) { case VM86_REQUEST_IRQ: -@@ -324,7 +340,7 @@ static void do_sys_vm86(struct kernel_vm +@@ -324,7 +340,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk tsk->thread.saved_fs = info->regs32->fs; tsk->thread.saved_gs = get_user_gs(info->regs32); @@ -16446,7 +16981,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/vm86_32.c linux-2.6.38.7/arch/x86/kern tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0; if (cpu_has_sep) tsk->thread.sysenter_cs = 0; -@@ -529,7 +545,7 @@ static void do_int(struct kernel_vm86_re +@@ -529,7 +545,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i, goto cannot_handle; if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored)) goto cannot_handle; @@ -16455,9 +16990,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/vm86_32.c linux-2.6.38.7/arch/x86/kern if (get_user(segoffs, intr_ptr)) goto cannot_handle; if ((segoffs >> 16) == BIOSSEG) -diff -urNp linux-2.6.38.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.38.7/arch/x86/kernel/vmlinux.lds.S ---- linux-2.6.38.7/arch/x86/kernel/vmlinux.lds.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/vmlinux.lds.S 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S +index bf47007..adffe60 100644 +--- a/arch/x86/kernel/vmlinux.lds.S ++++ b/arch/x86/kernel/vmlinux.lds.S @@ -26,6 +26,13 @@ #include <asm/page_types.h> #include <asm/cache.h> @@ -16472,7 +17008,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.38.7/arch/x86/ #undef i386 /* in case the preprocessor is a 32bit one */ -@@ -34,11 +41,9 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONF +@@ -34,11 +41,9 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT) #ifdef CONFIG_X86_32 OUTPUT_ARCH(i386) ENTRY(phys_startup_32) @@ -16548,7 +17084,8 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.38.7/arch/x86/ - NOTES :text :note + . += __KERNEL_TEXT_OFFSET; -+ + +- EXCEPTION_TABLE(16) :text = 0x9090 +#ifdef CONFIG_X86_32 + . = ALIGN(PAGE_SIZE); + .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) { @@ -16568,8 +17105,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.38.7/arch/x86/ + /* End of text section */ + _etext = . - __KERNEL_TEXT_OFFSET; + } - -- EXCEPTION_TABLE(16) :text = 0x9090 ++ +#ifdef CONFIG_X86_32 + . = ALIGN(PAGE_SIZE); + .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) { @@ -16754,10 +17290,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.38.7/arch/x86/ "kernel image bigger than KERNEL_IMAGE_SIZE"); #ifdef CONFIG_SMP -diff -urNp linux-2.6.38.7/arch/x86/kernel/vsyscall_64.c linux-2.6.38.7/arch/x86/kernel/vsyscall_64.c ---- linux-2.6.38.7/arch/x86/kernel/vsyscall_64.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/vsyscall_64.c 2011-04-28 19:34:14.000000000 -0400 -@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa +diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c +index dcbb28c..57d748e 100644 +--- a/arch/x86/kernel/vsyscall_64.c ++++ b/arch/x86/kernel/vsyscall_64.c +@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wall_time, struct timespec *wtm, write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); /* copy vsyscall data */ @@ -16765,7 +17302,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/vsyscall_64.c linux-2.6.38.7/arch/x86/ vsyscall_gtod_data.clock.vread = clock->vread; vsyscall_gtod_data.clock.cycle_last = clock->cycle_last; vsyscall_gtod_data.clock.mask = clock->mask; -@@ -208,7 +209,7 @@ vgetcpu(unsigned *cpu, unsigned *node, s +@@ -208,7 +209,7 @@ vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache) We do this here because otherwise user space would do it on its own in a likely inferior way (no access to jiffies). If you don't like it pass NULL. */ @@ -16774,9 +17311,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/vsyscall_64.c linux-2.6.38.7/arch/x86/ p = tcache->blob[1]; } else if (__vgetcpu_mode == VGETCPU_RDTSCP) { /* Load per CPU data from RDTSCP */ -diff -urNp linux-2.6.38.7/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.38.7/arch/x86/kernel/x8664_ksyms_64.c ---- linux-2.6.38.7/arch/x86/kernel/x8664_ksyms_64.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/x8664_ksyms_64.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c +index 1b950d1..ca83b2a 100644 +--- a/arch/x86/kernel/x8664_ksyms_64.c ++++ b/arch/x86/kernel/x8664_ksyms_64.c @@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8); EXPORT_SYMBOL(copy_user_generic_string); EXPORT_SYMBOL(copy_user_generic_unrolled); @@ -16786,10 +17324,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.38.7/arch/x EXPORT_SYMBOL(copy_page); EXPORT_SYMBOL(clear_page); -diff -urNp linux-2.6.38.7/arch/x86/kernel/xsave.c linux-2.6.38.7/arch/x86/kernel/xsave.c ---- linux-2.6.38.7/arch/x86/kernel/xsave.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kernel/xsave.c 2011-04-28 19:34:14.000000000 -0400 -@@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_ +diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c +index 5471285..7aa08a9 100644 +--- a/arch/x86/kernel/xsave.c ++++ b/arch/x86/kernel/xsave.c +@@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf, fx_sw_user->xstate_size > fx_sw_user->extended_size) return -EINVAL; @@ -16807,7 +17346,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/xsave.c linux-2.6.38.7/arch/x86/kernel } /* -@@ -299,7 +299,7 @@ int restore_i387_xstate(void __user *buf +@@ -299,7 +299,7 @@ int restore_i387_xstate(void __user *buf) if (use_xsave()) err = restore_user_xstate(buf); else @@ -16816,9 +17355,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kernel/xsave.c linux-2.6.38.7/arch/x86/kernel buf); if (unlikely(err)) { /* -diff -urNp linux-2.6.38.7/arch/x86/kvm/emulate.c linux-2.6.38.7/arch/x86/kvm/emulate.c ---- linux-2.6.38.7/arch/x86/kvm/emulate.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kvm/emulate.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c +index caf9667..e198c6d 100644 +--- a/arch/x86/kvm/emulate.c ++++ b/arch/x86/kvm/emulate.c @@ -88,7 +88,7 @@ #define Src2ImmByte (2<<29) #define Src2One (3<<29) @@ -16853,9 +17393,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/emulate.c linux-2.6.38.7/arch/x86/kvm/emu switch ((_dst).bytes) { \ case 1: \ ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \ -diff -urNp linux-2.6.38.7/arch/x86/kvm/lapic.c linux-2.6.38.7/arch/x86/kvm/lapic.c ---- linux-2.6.38.7/arch/x86/kvm/lapic.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kvm/lapic.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c +index 93cf9d0..67dfa54 100644 +--- a/arch/x86/kvm/lapic.c ++++ b/arch/x86/kvm/lapic.c @@ -53,7 +53,7 @@ #define APIC_BUS_CYCLE_NS 1 @@ -16865,10 +17406,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/lapic.c linux-2.6.38.7/arch/x86/kvm/lapic #define APIC_LVT_NUM 6 /* 14 is the version for Xeon and Pentium 8.4.8*/ -diff -urNp linux-2.6.38.7/arch/x86/kvm/mmu.c linux-2.6.38.7/arch/x86/kvm/mmu.c ---- linux-2.6.38.7/arch/x86/kvm/mmu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kvm/mmu.c 2011-04-28 19:57:25.000000000 -0400 -@@ -3271,7 +3271,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu * +diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c +index f02b8ed..a533bb6 100644 +--- a/arch/x86/kvm/mmu.c ++++ b/arch/x86/kvm/mmu.c +@@ -3271,7 +3271,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa, pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes); @@ -16877,7 +17419,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/mmu.c linux-2.6.38.7/arch/x86/kvm/mmu.c /* * Assume that the pte write on a page table of the same type -@@ -3305,7 +3305,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu * +@@ -3305,7 +3305,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa, mmu_guess_page_from_pte_write(vcpu, gpa, gentry); spin_lock(&vcpu->kvm->mmu_lock); @@ -16886,10 +17428,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/mmu.c linux-2.6.38.7/arch/x86/kvm/mmu.c gentry = 0; kvm_mmu_access_page(vcpu, gfn); kvm_mmu_free_some_pages(vcpu); -diff -urNp linux-2.6.38.7/arch/x86/kvm/paging_tmpl.h linux-2.6.38.7/arch/x86/kvm/paging_tmpl.h ---- linux-2.6.38.7/arch/x86/kvm/paging_tmpl.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kvm/paging_tmpl.h 2011-05-16 21:47:08.000000000 -0400 -@@ -554,6 +554,8 @@ static int FNAME(page_fault)(struct kvm_ +diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h +index 6bccc24..f0c6ca0 100644 +--- a/arch/x86/kvm/paging_tmpl.h ++++ b/arch/x86/kvm/paging_tmpl.h +@@ -554,6 +554,8 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code, unsigned long mmu_seq; bool map_writable; @@ -16898,7 +17441,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/paging_tmpl.h linux-2.6.38.7/arch/x86/kvm pgprintk("%s: addr %lx err %x\n", __func__, addr, error_code); r = mmu_topup_memory_caches(vcpu); -@@ -674,7 +676,7 @@ static void FNAME(invlpg)(struct kvm_vcp +@@ -674,7 +676,7 @@ static void FNAME(invlpg)(struct kvm_vcpu *vcpu, gva_t gva) if (need_flush) kvm_flush_remote_tlbs(vcpu->kvm); @@ -16907,10 +17450,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/paging_tmpl.h linux-2.6.38.7/arch/x86/kvm spin_unlock(&vcpu->kvm->mmu_lock); -diff -urNp linux-2.6.38.7/arch/x86/kvm/svm.c linux-2.6.38.7/arch/x86/kvm/svm.c ---- linux-2.6.38.7/arch/x86/kvm/svm.c 2011-05-10 22:06:29.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kvm/svm.c 2011-05-10 22:08:57.000000000 -0400 -@@ -3276,7 +3276,11 @@ static void reload_tss(struct kvm_vcpu * +diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c +index d8a15a1..d55a6f0 100644 +--- a/arch/x86/kvm/svm.c ++++ b/arch/x86/kvm/svm.c +@@ -3276,7 +3276,11 @@ static void reload_tss(struct kvm_vcpu *vcpu) int cpu = raw_smp_processor_id(); struct svm_cpu_data *sd = per_cpu(svm_data, cpu); @@ -16922,7 +17466,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/svm.c linux-2.6.38.7/arch/x86/kvm/svm.c load_TR_desc(); } -@@ -3651,6 +3655,10 @@ static void svm_vcpu_run(struct kvm_vcpu +@@ -3651,6 +3655,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu) loadsegment(fs, svm->host.fs); #endif @@ -16933,7 +17477,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/svm.c linux-2.6.38.7/arch/x86/kvm/svm.c reload_tss(vcpu); local_irq_disable(); -@@ -3858,7 +3866,7 @@ static void svm_fpu_deactivate(struct kv +@@ -3858,7 +3866,7 @@ static void svm_fpu_deactivate(struct kvm_vcpu *vcpu) update_cr0_intercept(svm); } @@ -16942,9 +17486,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/svm.c linux-2.6.38.7/arch/x86/kvm/svm.c .cpu_has_kvm_support = has_svm, .disabled_by_bios = is_disabled, .hardware_setup = svm_hardware_setup, -diff -urNp linux-2.6.38.7/arch/x86/kvm/vmx.c linux-2.6.38.7/arch/x86/kvm/vmx.c ---- linux-2.6.38.7/arch/x86/kvm/vmx.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kvm/vmx.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c +index bf89ec2..b81c54d 100644 +--- a/arch/x86/kvm/vmx.c ++++ b/arch/x86/kvm/vmx.c @@ -725,7 +725,11 @@ static void reload_tss(void) struct desc_struct *descs; @@ -16971,7 +17516,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/vmx.c linux-2.6.38.7/arch/x86/kvm/vmx.c if (enable_ept && !cpu_has_vmx_ept_2m_page()) kvm_disable_largepages(); -@@ -2640,7 +2647,7 @@ static int vmx_vcpu_setup(struct vcpu_vm +@@ -2640,7 +2647,7 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx) vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */ asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return)); @@ -16980,7 +17525,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/vmx.c linux-2.6.38.7/arch/x86/kvm/vmx.c vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0); vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0); vmcs_write64(VM_EXIT_MSR_LOAD_ADDR, __pa(vmx->msr_autoload.host)); -@@ -4031,6 +4038,12 @@ static void vmx_vcpu_run(struct kvm_vcpu +@@ -4031,6 +4038,12 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu) "jmp .Lkvm_vmx_return \n\t" ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t" ".Lkvm_vmx_return: " @@ -16993,7 +17538,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/vmx.c linux-2.6.38.7/arch/x86/kvm/vmx.c /* Save guest registers, load host registers, keep flags */ "xchg %0, (%%"R"sp) \n\t" "mov %%"R"ax, %c[rax](%0) \n\t" -@@ -4077,6 +4090,11 @@ static void vmx_vcpu_run(struct kvm_vcpu +@@ -4077,6 +4090,11 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu) [r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])), #endif [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)) @@ -17005,7 +17550,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/vmx.c linux-2.6.38.7/arch/x86/kvm/vmx.c : "cc", "memory" , R"ax", R"bx", R"di", R"si" #ifdef CONFIG_X86_64 -@@ -4091,7 +4109,16 @@ static void vmx_vcpu_run(struct kvm_vcpu +@@ -4091,7 +4109,16 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu) vmx->idt_vectoring_info = vmcs_read32(IDT_VECTORING_INFO_FIELD); @@ -17023,7 +17568,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/vmx.c linux-2.6.38.7/arch/x86/kvm/vmx.c vmx->launched = 1; vmx->exit_reason = vmcs_read32(VM_EXIT_REASON); -@@ -4326,7 +4353,7 @@ static void vmx_set_supported_cpuid(u32 +@@ -4326,7 +4353,7 @@ static void vmx_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry) { } @@ -17032,10 +17577,11 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/vmx.c linux-2.6.38.7/arch/x86/kvm/vmx.c .cpu_has_kvm_support = cpu_has_kvm_support, .disabled_by_bios = vmx_disabled_by_bios, .hardware_setup = hardware_setup, -diff -urNp linux-2.6.38.7/arch/x86/kvm/x86.c linux-2.6.38.7/arch/x86/kvm/x86.c ---- linux-2.6.38.7/arch/x86/kvm/x86.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/kvm/x86.c 2011-04-28 19:34:14.000000000 -0400 -@@ -93,7 +93,7 @@ static void update_cr8_intercept(struct +diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c +index bcc0efc..dccc222 100644 +--- a/arch/x86/kvm/x86.c ++++ b/arch/x86/kvm/x86.c +@@ -93,7 +93,7 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu); static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, struct kvm_cpuid_entry2 __user *entries); @@ -17044,7 +17590,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/x86.c linux-2.6.38.7/arch/x86/kvm/x86.c EXPORT_SYMBOL_GPL(kvm_x86_ops); int ignore_msrs = 0; -@@ -2023,6 +2023,8 @@ long kvm_arch_dev_ioctl(struct file *fil +@@ -2023,6 +2023,8 @@ long kvm_arch_dev_ioctl(struct file *filp, if (n < msr_list.nmsrs) goto out; r = -EFAULT; @@ -17053,7 +17599,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/x86.c linux-2.6.38.7/arch/x86/kvm/x86.c if (copy_to_user(user_msr_list->indices, &msrs_to_save, num_msrs_to_save * sizeof(u32))) goto out; -@@ -2190,15 +2192,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(str +@@ -2190,15 +2192,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, struct kvm_cpuid_entry2 __user *entries) { @@ -17077,7 +17623,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/x86.c linux-2.6.38.7/arch/x86/kvm/x86.c vcpu->arch.cpuid_nent = cpuid->nent; kvm_apic_set_version(vcpu); kvm_x86_ops->cpuid_update(vcpu); -@@ -2213,15 +2220,19 @@ static int kvm_vcpu_ioctl_get_cpuid2(str +@@ -2213,15 +2220,19 @@ static int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, struct kvm_cpuid_entry2 __user *entries) { @@ -17100,7 +17646,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/x86.c linux-2.6.38.7/arch/x86/kvm/x86.c return 0; out: -@@ -2499,7 +2510,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru +@@ -2499,7 +2510,7 @@ static int kvm_vcpu_ioctl_set_lapic(struct kvm_vcpu *vcpu, static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, struct kvm_interrupt *irq) { @@ -17109,7 +17655,7 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/x86.c linux-2.6.38.7/arch/x86/kvm/x86.c return -EINVAL; if (irqchip_in_kernel(vcpu->kvm)) return -ENXIO; -@@ -4687,10 +4698,10 @@ void kvm_after_handle_nmi(struct kvm_vcp +@@ -4687,10 +4698,10 @@ void kvm_after_handle_nmi(struct kvm_vcpu *vcpu) } EXPORT_SYMBOL_GPL(kvm_after_handle_nmi); @@ -17122,9 +17668,10 @@ diff -urNp linux-2.6.38.7/arch/x86/kvm/x86.c linux-2.6.38.7/arch/x86/kvm/x86.c if (kvm_x86_ops) { printk(KERN_ERR "kvm: already loaded the other module\n"); -diff -urNp linux-2.6.38.7/arch/x86/lib/atomic64_32.c linux-2.6.38.7/arch/x86/lib/atomic64_32.c ---- linux-2.6.38.7/arch/x86/lib/atomic64_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/lib/atomic64_32.c 2011-05-02 19:07:09.000000000 -0400 +diff --git a/arch/x86/lib/atomic64_32.c b/arch/x86/lib/atomic64_32.c +index 540179e..e9ff0ea 100644 +--- a/arch/x86/lib/atomic64_32.c ++++ b/arch/x86/lib/atomic64_32.c @@ -8,18 +8,30 @@ long long atomic64_read_cx8(long long, const atomic64_t *v); @@ -17203,9 +17750,10 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/atomic64_32.c linux-2.6.38.7/arch/x86/lib long long atomic64_dec_if_positive_386(atomic64_t *v); EXPORT_SYMBOL(atomic64_dec_if_positive_386); int atomic64_inc_not_zero_386(atomic64_t *v); -diff -urNp linux-2.6.38.7/arch/x86/lib/atomic64_386_32.S linux-2.6.38.7/arch/x86/lib/atomic64_386_32.S ---- linux-2.6.38.7/arch/x86/lib/atomic64_386_32.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/lib/atomic64_386_32.S 2011-05-02 19:07:09.000000000 -0400 +diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S +index 2cda60a..da60166 100644 +--- a/arch/x86/lib/atomic64_386_32.S ++++ b/arch/x86/lib/atomic64_386_32.S @@ -50,6 +50,10 @@ BEGIN(read) movl (v), %eax movl 4(v), %edx @@ -17461,9 +18009,10 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/atomic64_386_32.S linux-2.6.38.7/arch/x86 js 1f movl %eax, (v) movl %edx, 4(v) -diff -urNp linux-2.6.38.7/arch/x86/lib/atomic64_cx8_32.S linux-2.6.38.7/arch/x86/lib/atomic64_cx8_32.S ---- linux-2.6.38.7/arch/x86/lib/atomic64_cx8_32.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/lib/atomic64_cx8_32.S 2011-05-02 19:07:09.000000000 -0400 +diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S +index 71e080d..2ffa968 100644 +--- a/arch/x86/lib/atomic64_cx8_32.S ++++ b/arch/x86/lib/atomic64_cx8_32.S @@ -41,6 +41,14 @@ ENTRY(atomic64_read_cx8) CFI_ENDPROC ENDPROC(atomic64_read_cx8) @@ -17642,9 +18191,10 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/atomic64_cx8_32.S linux-2.6.38.7/arch/x86 LOCK_PREFIX cmpxchg8b (%esi) jne 1b -diff -urNp linux-2.6.38.7/arch/x86/lib/checksum_32.S linux-2.6.38.7/arch/x86/lib/checksum_32.S ---- linux-2.6.38.7/arch/x86/lib/checksum_32.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/lib/checksum_32.S 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S +index adbccd0..98f96c8 100644 +--- a/arch/x86/lib/checksum_32.S ++++ b/arch/x86/lib/checksum_32.S @@ -28,7 +28,8 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> @@ -17655,7 +18205,7 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/checksum_32.S linux-2.6.38.7/arch/x86/lib /* * computes a partial checksum, e.g. for TCP/UDP fragments */ -@@ -304,9 +305,28 @@ unsigned int csum_partial_copy_generic ( +@@ -304,9 +305,28 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst, #define ARGBASE 16 #define FP 12 @@ -17905,9 +18455,10 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/checksum_32.S linux-2.6.38.7/arch/x86/lib #undef ROUND #undef ROUND1 -diff -urNp linux-2.6.38.7/arch/x86/lib/clear_page_64.S linux-2.6.38.7/arch/x86/lib/clear_page_64.S ---- linux-2.6.38.7/arch/x86/lib/clear_page_64.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/lib/clear_page_64.S 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S +index aa4326b..a5e068e 100644 +--- a/arch/x86/lib/clear_page_64.S ++++ b/arch/x86/lib/clear_page_64.S @@ -43,7 +43,7 @@ ENDPROC(clear_page) #include <asm/cpufeature.h> @@ -17917,9 +18468,10 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/clear_page_64.S linux-2.6.38.7/arch/x86/l 1: .byte 0xeb /* jmp <disp8> */ .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.38.7/arch/x86/lib/copy_page_64.S linux-2.6.38.7/arch/x86/lib/copy_page_64.S ---- linux-2.6.38.7/arch/x86/lib/copy_page_64.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/lib/copy_page_64.S 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S +index 6fec2d1..81e727c 100644 +--- a/arch/x86/lib/copy_page_64.S ++++ b/arch/x86/lib/copy_page_64.S @@ -104,7 +104,7 @@ ENDPROC(copy_page) #include <asm/cpufeature.h> @@ -17929,9 +18481,10 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/copy_page_64.S linux-2.6.38.7/arch/x86/li 1: .byte 0xeb /* jmp <disp8> */ .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.38.7/arch/x86/lib/copy_user_64.S linux-2.6.38.7/arch/x86/lib/copy_user_64.S ---- linux-2.6.38.7/arch/x86/lib/copy_user_64.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/lib/copy_user_64.S 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S +index cfd3ca4..e4c03d3 100644 +--- a/arch/x86/lib/copy_user_64.S ++++ b/arch/x86/lib/copy_user_64.S @@ -15,13 +15,14 @@ #include <asm/asm-offsets.h> #include <asm/thread_info.h> @@ -17960,7 +18513,7 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/copy_user_64.S linux-2.6.38.7/arch/x86/li - addq %rdx,%rcx - jc bad_to_user - cmpq TI_addr_limit(%rax),%rcx -- jae bad_to_user +- ja bad_to_user - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string - CFI_ENDPROC -ENDPROC(_copy_to_user) @@ -17973,7 +18526,7 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/copy_user_64.S linux-2.6.38.7/arch/x86/li - addq %rdx,%rcx - jc bad_from_user - cmpq TI_addr_limit(%rax),%rcx -- jae bad_from_user +- ja bad_from_user - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string - CFI_ENDPROC -ENDPROC(_copy_from_user) @@ -17988,9 +18541,10 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/copy_user_64.S linux-2.6.38.7/arch/x86/li movl %edx,%ecx xorl %eax,%eax rep -diff -urNp linux-2.6.38.7/arch/x86/lib/copy_user_nocache_64.S linux-2.6.38.7/arch/x86/lib/copy_user_nocache_64.S ---- linux-2.6.38.7/arch/x86/lib/copy_user_nocache_64.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/lib/copy_user_nocache_64.S 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S +index cb0c112..39e53b9 100644 +--- a/arch/x86/lib/copy_user_nocache_64.S ++++ b/arch/x86/lib/copy_user_nocache_64.S @@ -14,6 +14,7 @@ #include <asm/current.h> #include <asm/asm-offsets.h> @@ -18015,10 +18569,11 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/copy_user_nocache_64.S linux-2.6.38.7/arc cmpl $8,%edx jb 20f /* less then 8 bytes, go to byte copy loop */ ALIGN_DESTINATION -diff -urNp linux-2.6.38.7/arch/x86/lib/csum-wrappers_64.c linux-2.6.38.7/arch/x86/lib/csum-wrappers_64.c ---- linux-2.6.38.7/arch/x86/lib/csum-wrappers_64.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/lib/csum-wrappers_64.c 2011-04-28 19:57:25.000000000 -0400 -@@ -52,6 +52,12 @@ csum_partial_copy_from_user(const void _ +diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c +index 459b58a..9bc8be7 100644 +--- a/arch/x86/lib/csum-wrappers_64.c ++++ b/arch/x86/lib/csum-wrappers_64.c +@@ -52,6 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst, len -= 2; } } @@ -18031,7 +18586,7 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/csum-wrappers_64.c linux-2.6.38.7/arch/x8 isum = csum_partial_copy_generic((__force const void *)src, dst, len, isum, errp, NULL); if (unlikely(*errp)) -@@ -105,6 +111,12 @@ csum_partial_copy_to_user(const void *sr +@@ -105,6 +111,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst, } *errp = 0; @@ -18044,9 +18599,10 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/csum-wrappers_64.c linux-2.6.38.7/arch/x8 return csum_partial_copy_generic(src, (void __force *)dst, len, isum, NULL, errp); } -diff -urNp linux-2.6.38.7/arch/x86/lib/getuser.S linux-2.6.38.7/arch/x86/lib/getuser.S ---- linux-2.6.38.7/arch/x86/lib/getuser.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/lib/getuser.S 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S +index 51f1504..1486a2c 100644 +--- a/arch/x86/lib/getuser.S ++++ b/arch/x86/lib/getuser.S @@ -33,14 +33,35 @@ #include <asm/asm-offsets.h> #include <asm/thread_info.h> @@ -18152,9 +18708,10 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/getuser.S linux-2.6.38.7/arch/x86/lib/get 4: movq -7(%_ASM_AX),%_ASM_DX xor %eax,%eax ret -diff -urNp linux-2.6.38.7/arch/x86/lib/insn.c linux-2.6.38.7/arch/x86/lib/insn.c ---- linux-2.6.38.7/arch/x86/lib/insn.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/lib/insn.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c +index 9f33b98..dfc7678 100644 +--- a/arch/x86/lib/insn.c ++++ b/arch/x86/lib/insn.c @@ -21,6 +21,11 @@ #include <linux/string.h> #include <asm/inat.h> @@ -18178,10 +18735,11 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/insn.c linux-2.6.38.7/arch/x86/lib/insn.c insn->x86_64 = x86_64 ? 1 : 0; insn->opnd_bytes = 4; if (x86_64) -diff -urNp linux-2.6.38.7/arch/x86/lib/mmx_32.c linux-2.6.38.7/arch/x86/lib/mmx_32.c ---- linux-2.6.38.7/arch/x86/lib/mmx_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/lib/mmx_32.c 2011-04-28 19:34:14.000000000 -0400 -@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * +diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c +index c9f2d9b..e7fd2c0 100644 +--- a/arch/x86/lib/mmx_32.c ++++ b/arch/x86/lib/mmx_32.c +@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len) { void *p; int i; @@ -18189,7 +18747,7 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/mmx_32.c linux-2.6.38.7/arch/x86/lib/mmx_ if (unlikely(in_interrupt())) return __memcpy(to, from, len); -@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void * +@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len) kernel_fpu_begin(); __asm__ __volatile__ ( @@ -18296,7 +18854,7 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/mmx_32.c linux-2.6.38.7/arch/x86/lib/mmx_ kernel_fpu_begin(); -@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, voi +@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from) * but that is for later. -AV */ __asm__ __volatile__( @@ -18496,9 +19054,10 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/mmx_32.c linux-2.6.38.7/arch/x86/lib/mmx_ from += 64; to += 64; -diff -urNp linux-2.6.38.7/arch/x86/lib/putuser.S linux-2.6.38.7/arch/x86/lib/putuser.S ---- linux-2.6.38.7/arch/x86/lib/putuser.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/lib/putuser.S 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S +index 36b0d15..2b76fbd 100644 +--- a/arch/x86/lib/putuser.S ++++ b/arch/x86/lib/putuser.S @@ -15,7 +15,8 @@ #include <asm/thread_info.h> #include <asm/errno.h> @@ -18636,9 +19195,10 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/putuser.S linux-2.6.38.7/arch/x86/lib/put #endif xor %eax,%eax EXIT -diff -urNp linux-2.6.38.7/arch/x86/lib/usercopy_32.c linux-2.6.38.7/arch/x86/lib/usercopy_32.c ---- linux-2.6.38.7/arch/x86/lib/usercopy_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/lib/usercopy_32.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c +index e218d5d..35679b4 100644 +--- a/arch/x86/lib/usercopy_32.c ++++ b/arch/x86/lib/usercopy_32.c @@ -43,7 +43,7 @@ do { \ __asm__ __volatile__( \ " testl %1,%1\n" \ @@ -18661,7 +19221,7 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/usercopy_32.c linux-2.6.38.7/arch/x86/lib ".section .fixup,\"ax\"\n" \ "3: lea 0(%2,%0,4),%0\n" \ " jmp 2b\n" \ -@@ -200,6 +202,7 @@ long strnlen_user(const char __user *s, +@@ -200,6 +202,7 @@ long strnlen_user(const char __user *s, long n) might_fault(); __asm__ __volatile__( @@ -18669,7 +19229,7 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/usercopy_32.c linux-2.6.38.7/arch/x86/lib " testl %0, %0\n" " jz 3f\n" " andl %0,%%ecx\n" -@@ -208,6 +211,7 @@ long strnlen_user(const char __user *s, +@@ -208,6 +211,7 @@ long strnlen_user(const char __user *s, long n) " subl %%ecx,%0\n" " addl %0,%%eax\n" "1:\n" @@ -18686,7 +19246,7 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/usercopy_32.c linux-2.6.38.7/arch/x86/lib { int d0, d1; __asm__ __volatile__( -@@ -239,36 +243,36 @@ __copy_user_intel(void __user *to, const +@@ -239,36 +243,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size) " .align 2,0x90\n" "3: movl 0(%4), %%eax\n" "4: movl 4(%4), %%edx\n" @@ -18739,7 +19299,7 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/usercopy_32.c linux-2.6.38.7/arch/x86/lib " addl $-64, %0\n" " addl $64, %4\n" " addl $64, %3\n" -@@ -278,10 +282,119 @@ __copy_user_intel(void __user *to, const +@@ -278,10 +282,119 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size) " shrl $2, %0\n" " andl $3, %%eax\n" " cld\n" @@ -18859,7 +19419,7 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/usercopy_32.c linux-2.6.38.7/arch/x86/lib ".section .fixup,\"ax\"\n" "101: lea 0(%%eax,%0,4),%0\n" " jmp 100b\n" -@@ -339,41 +452,41 @@ __copy_user_zeroing_intel(void *to, cons +@@ -339,41 +452,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size) int d0, d1; __asm__ __volatile__( " .align 2,0x90\n" @@ -18919,7 +19479,7 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/usercopy_32.c linux-2.6.38.7/arch/x86/lib " movl %%eax, 56(%3)\n" " movl %%edx, 60(%3)\n" " addl $-64, %0\n" -@@ -385,9 +498,9 @@ __copy_user_zeroing_intel(void *to, cons +@@ -385,9 +498,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size) " shrl $2, %0\n" " andl $3, %%eax\n" " cld\n" @@ -18931,7 +19491,7 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/usercopy_32.c linux-2.6.38.7/arch/x86/lib "8:\n" ".section .fixup,\"ax\"\n" "9: lea 0(%%eax,%0,4),%0\n" -@@ -440,41 +553,41 @@ static unsigned long __copy_user_zeroing +@@ -440,41 +553,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to, __asm__ __volatile__( " .align 2,0x90\n" @@ -18991,7 +19551,7 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/usercopy_32.c linux-2.6.38.7/arch/x86/lib " movnti %%eax, 56(%3)\n" " movnti %%edx, 60(%3)\n" " addl $-64, %0\n" -@@ -487,9 +600,9 @@ static unsigned long __copy_user_zeroing +@@ -487,9 +600,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to, " shrl $2, %0\n" " andl $3, %%eax\n" " cld\n" @@ -19003,7 +19563,7 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/usercopy_32.c linux-2.6.38.7/arch/x86/lib "8:\n" ".section .fixup,\"ax\"\n" "9: lea 0(%%eax,%0,4),%0\n" -@@ -537,41 +650,41 @@ static unsigned long __copy_user_intel_n +@@ -537,41 +650,41 @@ static unsigned long __copy_user_intel_nocache(void *to, __asm__ __volatile__( " .align 2,0x90\n" @@ -19063,7 +19623,7 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/usercopy_32.c linux-2.6.38.7/arch/x86/lib " movnti %%eax, 56(%3)\n" " movnti %%edx, 60(%3)\n" " addl $-64, %0\n" -@@ -584,9 +697,9 @@ static unsigned long __copy_user_intel_n +@@ -584,9 +697,9 @@ static unsigned long __copy_user_intel_nocache(void *to, " shrl $2, %0\n" " andl $3, %%eax\n" " cld\n" @@ -19075,7 +19635,7 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/usercopy_32.c linux-2.6.38.7/arch/x86/lib "8:\n" ".section .fixup,\"ax\"\n" "9: lea 0(%%eax,%0,4),%0\n" -@@ -629,32 +742,36 @@ static unsigned long __copy_user_intel_n +@@ -629,32 +742,36 @@ static unsigned long __copy_user_intel_nocache(void *to, */ unsigned long __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size); @@ -19147,7 +19707,7 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/usercopy_32.c linux-2.6.38.7/arch/x86/lib return n; } EXPORT_SYMBOL(__copy_to_user_ll); -@@ -797,10 +914,9 @@ unsigned long __copy_from_user_ll_nozero +@@ -797,10 +914,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from, unsigned long n) { if (movsl_is_ok(to, from, n)) @@ -19160,7 +19720,7 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/usercopy_32.c linux-2.6.38.7/arch/x86/lib return n; } EXPORT_SYMBOL(__copy_from_user_ll_nozero); -@@ -827,65 +943,50 @@ unsigned long __copy_from_user_ll_nocach +@@ -827,65 +943,50 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr if (n > 64 && cpu_has_xmm2) n = __copy_user_intel_nocache(to, from, n); else @@ -19259,9 +19819,10 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/usercopy_32.c linux-2.6.38.7/arch/x86/lib +} +EXPORT_SYMBOL(set_fs); +#endif -diff -urNp linux-2.6.38.7/arch/x86/lib/usercopy_64.c linux-2.6.38.7/arch/x86/lib/usercopy_64.c ---- linux-2.6.38.7/arch/x86/lib/usercopy_64.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/lib/usercopy_64.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c +index b7c2849..8cab7a5 100644 +--- a/arch/x86/lib/usercopy_64.c ++++ b/arch/x86/lib/usercopy_64.c @@ -42,6 +42,12 @@ long __strncpy_from_user(char *dst, const char __user *src, long count) { @@ -19275,7 +19836,7 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/usercopy_64.c linux-2.6.38.7/arch/x86/lib __do_strncpy_from_user(dst, src, count, res); return res; } -@@ -65,6 +71,12 @@ unsigned long __clear_user(void __user * +@@ -65,6 +71,12 @@ unsigned long __clear_user(void __user *addr, unsigned long size) { long __d0; might_fault(); @@ -19310,25 +19871,10 @@ diff -urNp linux-2.6.38.7/arch/x86/lib/usercopy_64.c linux-2.6.38.7/arch/x86/lib } EXPORT_SYMBOL(copy_in_user); -diff -urNp linux-2.6.38.7/arch/x86/Makefile linux-2.6.38.7/arch/x86/Makefile ---- linux-2.6.38.7/arch/x86/Makefile 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/Makefile 2011-04-28 19:34:14.000000000 -0400 -@@ -195,3 +195,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.38.7/arch/x86/mm/extable.c linux-2.6.38.7/arch/x86/mm/extable.c ---- linux-2.6.38.7/arch/x86/mm/extable.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/extable.c 2011-04-28 19:34:14.000000000 -0400 +diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c +index d0474ad..360f761 100644 +--- a/arch/x86/mm/extable.c ++++ b/arch/x86/mm/extable.c @@ -1,14 +1,71 @@ #include <linux/module.h> #include <linux/spinlock.h> @@ -19402,9 +19948,10 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/extable.c linux-2.6.38.7/arch/x86/mm/extab extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; extern u32 pnp_bios_is_utter_crap; pnp_bios_is_utter_crap = 1; -diff -urNp linux-2.6.38.7/arch/x86/mm/fault.c linux-2.6.38.7/arch/x86/mm/fault.c ---- linux-2.6.38.7/arch/x86/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/fault.c 2011-05-22 23:31:40.000000000 -0400 +diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c +index 20e3f87..e200bb7 100644 +--- a/arch/x86/mm/fault.c ++++ b/arch/x86/mm/fault.c @@ -12,10 +12,18 @@ #include <linux/mmiotrace.h> /* kmmio_handler, ... */ #include <linux/perf_event.h> /* perf_sw_event */ @@ -19424,7 +19971,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/fault.c linux-2.6.38.7/arch/x86/mm/fault.c /* * Page fault error code bits: -@@ -53,7 +61,7 @@ static inline int __kprobes notify_page_ +@@ -53,7 +61,7 @@ static inline int __kprobes notify_page_fault(struct pt_regs *regs) int ret = 0; /* kprobe_running() needs smp_processor_id() */ @@ -19433,7 +19980,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/fault.c linux-2.6.38.7/arch/x86/mm/fault.c preempt_disable(); if (kprobe_running() && kprobe_fault_handler(regs, 14)) ret = 1; -@@ -114,7 +122,10 @@ check_prefetch_opcode(struct pt_regs *re +@@ -114,7 +122,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr, return !instr_lo || (instr_lo>>1) == 1; case 0x00: /* Prefetch instruction is 0x0F0D or 0x0F18 */ @@ -19445,7 +19992,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/fault.c linux-2.6.38.7/arch/x86/mm/fault.c return 0; *prefetch = (instr_lo == 0xF) && -@@ -148,7 +159,10 @@ is_prefetch(struct pt_regs *regs, unsign +@@ -148,7 +159,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr) while (instr < max_instr) { unsigned char opcode; @@ -19457,7 +20004,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/fault.c linux-2.6.38.7/arch/x86/mm/fault.c break; instr++; -@@ -179,6 +193,30 @@ force_sig_info_fault(int si_signo, int s +@@ -179,6 +193,30 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address, force_sig_info(si_signo, &info, tsk); } @@ -19526,7 +20073,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/fault.c linux-2.6.38.7/arch/x86/mm/fault.c if (!ret) break; -@@ -275,6 +330,11 @@ static noinline __kprobes int vmalloc_fa +@@ -275,6 +330,11 @@ static noinline __kprobes int vmalloc_fault(unsigned long address) * an interrupt in the middle of a task switch.. */ pgd_paddr = read_cr3(); @@ -19538,7 +20085,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/fault.c linux-2.6.38.7/arch/x86/mm/fault.c pmd_k = vmalloc_sync_one(__va(pgd_paddr), address); if (!pmd_k) return -1; -@@ -370,7 +430,14 @@ static noinline __kprobes int vmalloc_fa +@@ -370,7 +430,14 @@ static noinline __kprobes int vmalloc_fault(unsigned long address) * happen within a race in page table update. In the later * case just flush: */ @@ -19553,7 +20100,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/fault.c linux-2.6.38.7/arch/x86/mm/fault.c pgd_ref = pgd_offset_k(address); if (pgd_none(*pgd_ref)) return -1; -@@ -532,7 +599,7 @@ static int is_errata93(struct pt_regs *r +@@ -532,7 +599,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address) static int is_errata100(struct pt_regs *regs, unsigned long address) { #ifdef CONFIG_X86_64 @@ -19562,7 +20109,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/fault.c linux-2.6.38.7/arch/x86/mm/fault.c return 1; #endif return 0; -@@ -559,7 +626,7 @@ static int is_f00f_bug(struct pt_regs *r +@@ -559,7 +626,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address) } static const char nx_warning[] = KERN_CRIT @@ -19571,7 +20118,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/fault.c linux-2.6.38.7/arch/x86/mm/fault.c static void show_fault_oops(struct pt_regs *regs, unsigned long error_code, -@@ -568,15 +635,26 @@ show_fault_oops(struct pt_regs *regs, un +@@ -568,14 +635,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code, if (!oops_may_print()) return; @@ -19584,8 +20131,8 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/fault.c linux-2.6.38.7/arch/x86/mm/fault.c if (pte && pte_present(*pte) && !pte_exec(*pte)) - printk(nx_warning, current_uid()); + printk(nx_warning, current_uid(), current->comm, task_pid_nr(current)); - } - ++ } ++ +#ifdef CONFIG_PAX_KERNEXEC + if (init_mm.start_code <= address && address < init_mm.end_code) { + if (current->signal->curr_ip) @@ -19594,13 +20141,12 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/fault.c linux-2.6.38.7/arch/x86/mm/fault.c + else + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", + current->comm, task_pid_nr(current), current_uid(), current_euid()); -+ } + } +#endif -+ + printk(KERN_ALERT "BUG: unable to handle kernel "); if (address < PAGE_SIZE) - printk(KERN_CONT "NULL pointer dereference"); -@@ -701,6 +779,68 @@ __bad_area_nosemaphore(struct pt_regs *r +@@ -701,6 +779,68 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code, unsigned long address, int si_code) { struct task_struct *tsk = current; @@ -19669,7 +20215,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/fault.c linux-2.6.38.7/arch/x86/mm/fault.c /* User mode accesses just cause a SIGSEGV */ if (error_code & PF_USER) { -@@ -855,6 +995,99 @@ static int spurious_fault_check(unsigned +@@ -855,6 +995,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte) return 1; } @@ -19779,7 +20325,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/fault.c linux-2.6.38.7/arch/x86/mm/fault.c if (error_code & PF_WRITE) { /* write, present and write, not present: */ if (unlikely(!(vma->vm_flags & VM_WRITE))) -@@ -960,19 +1196,33 @@ do_page_fault(struct pt_regs *regs, unsi +@@ -960,19 +1196,33 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code) { struct vm_area_struct *vma; struct task_struct *tsk; @@ -19817,7 +20363,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/fault.c linux-2.6.38.7/arch/x86/mm/fault.c /* * Detect and handle instructions that would cause a page fault for * both a tracked kernel page and a userspace page. -@@ -1032,7 +1282,7 @@ do_page_fault(struct pt_regs *regs, unsi +@@ -1032,7 +1282,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code) * User-mode registers count as a user access even for any * potential system fault or CPU buglet: */ @@ -20074,10 +20620,11 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/fault.c linux-2.6.38.7/arch/x86/mm/fault.c + + return ret ? -EFAULT : 0; +} -diff -urNp linux-2.6.38.7/arch/x86/mm/gup.c linux-2.6.38.7/arch/x86/mm/gup.c ---- linux-2.6.38.7/arch/x86/mm/gup.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/gup.c 2011-04-28 19:34:14.000000000 -0400 -@@ -263,7 +263,7 @@ int __get_user_pages_fast(unsigned long +diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c +index dbe34b9..127d310 100644 +--- a/arch/x86/mm/gup.c ++++ b/arch/x86/mm/gup.c +@@ -263,7 +263,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write, addr = start; len = (unsigned long) nr_pages << PAGE_SHIFT; end = start + len; @@ -20086,10 +20633,11 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/gup.c linux-2.6.38.7/arch/x86/mm/gup.c (void __user *)start, len))) return 0; -diff -urNp linux-2.6.38.7/arch/x86/mm/highmem_32.c linux-2.6.38.7/arch/x86/mm/highmem_32.c ---- linux-2.6.38.7/arch/x86/mm/highmem_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/highmem_32.c 2011-04-28 19:34:15.000000000 -0400 -@@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page +diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c +index b499626..6fd1882 100644 +--- a/arch/x86/mm/highmem_32.c ++++ b/arch/x86/mm/highmem_32.c +@@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot) idx = type + KM_TYPE_NR*smp_processor_id(); vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); BUG_ON(!pte_none(*(kmap_pte-idx))); @@ -20100,10 +20648,11 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/highmem_32.c linux-2.6.38.7/arch/x86/mm/hi return (void *)vaddr; } -diff -urNp linux-2.6.38.7/arch/x86/mm/hugetlbpage.c linux-2.6.38.7/arch/x86/mm/hugetlbpage.c ---- linux-2.6.38.7/arch/x86/mm/hugetlbpage.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/hugetlbpage.c 2011-04-28 19:34:15.000000000 -0400 -@@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe +diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c +index 069ce7c..9f18667 100644 +--- a/arch/x86/mm/hugetlbpage.c ++++ b/arch/x86/mm/hugetlbpage.c +@@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file, struct hstate *h = hstate_file(file); struct mm_struct *mm = current->mm; struct vm_area_struct *vma; @@ -20163,7 +20712,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/hugetlbpage.c linux-2.6.38.7/arch/x86/mm/h } static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file, -@@ -308,10 +316,9 @@ static unsigned long hugetlb_get_unmappe +@@ -308,10 +316,9 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file, { struct hstate *h = hstate_file(file); struct mm_struct *mm = current->mm; @@ -20176,7 +20725,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/hugetlbpage.c linux-2.6.38.7/arch/x86/mm/h /* don't allow allocations above current base */ if (mm->free_area_cache > base) -@@ -321,64 +328,63 @@ static unsigned long hugetlb_get_unmappe +@@ -321,64 +328,63 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file, largest_hole = 0; mm->free_area_cache = base; } @@ -20279,7 +20828,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/hugetlbpage.c linux-2.6.38.7/arch/x86/mm/h mm->free_area_cache = base; mm->cached_hole_size = ~0UL; -@@ -399,10 +406,19 @@ hugetlb_get_unmapped_area(struct file *f +@@ -399,10 +406,19 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, struct hstate *h = hstate_file(file); struct mm_struct *mm = current->mm; struct vm_area_struct *vma; @@ -20300,7 +20849,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/hugetlbpage.c linux-2.6.38.7/arch/x86/mm/h return -ENOMEM; if (flags & MAP_FIXED) { -@@ -414,8 +430,7 @@ hugetlb_get_unmapped_area(struct file *f +@@ -414,8 +430,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, if (addr) { addr = ALIGN(addr, huge_page_size(h)); vma = find_vma(mm, addr); @@ -20310,9 +20859,132 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/hugetlbpage.c linux-2.6.38.7/arch/x86/mm/h return addr; } if (mm->get_unmapped_area == arch_get_unmapped_area) -diff -urNp linux-2.6.38.7/arch/x86/mm/init_32.c linux-2.6.38.7/arch/x86/mm/init_32.c ---- linux-2.6.38.7/arch/x86/mm/init_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/init_32.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c +index 947f42a..48384fb 100644 +--- a/arch/x86/mm/init.c ++++ b/arch/x86/mm/init.c +@@ -72,11 +72,7 @@ static void __init find_early_table_space(unsigned long end, int use_pse, + * cause a hotspot and fill up ZONE_DMA. The page tables + * need roughly 0.5KB per GB. + */ +-#ifdef CONFIG_X86_32 +- start = 0x7000; +-#else +- start = 0x8000; +-#endif ++ start = 0x100000; + base = memblock_find_in_range(start, max_pfn_mapped<<PAGE_SHIFT, + tables, PAGE_SIZE); + if (base == MEMBLOCK_ERROR) +@@ -323,7 +319,16 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, + */ + int devmem_is_allowed(unsigned long pagenr) + { +- if (pagenr <= 256) ++#ifndef CONFIG_GRKERNSEC_KMEM ++ if (!pagenr) ++ return 1; ++#ifdef CONFIG_VM86 ++ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT)) ++ return 1; ++#endif ++#endif ++ ++ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT)) + return 1; + if (iomem_is_exclusive(pagenr << PAGE_SHIFT)) + return 0; +@@ -383,6 +388,86 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end) + + 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)); ++ } ++#endif ++ ++ flush_tlb_all(); ++#endif ++ + free_init_pages("unused kernel memory", + (unsigned long)(&__init_begin), + (unsigned long)(&__init_end)); +diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c +index c821074..2dbd8d3 100644 +--- a/arch/x86/mm/init_32.c ++++ b/arch/x86/mm/init_32.c @@ -74,36 +74,6 @@ static __init void *alloc_low_page(void) } @@ -20350,7 +21022,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/init_32.c linux-2.6.38.7/arch/x86/mm/init_ * Create a page table and place a pointer to it in a middle page * directory entry: */ -@@ -123,13 +93,28 @@ static pte_t * __init one_page_table_ini +@@ -123,13 +93,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd) page_table = (pte_t *)alloc_low_page(); paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT); @@ -20379,7 +21051,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/init_32.c linux-2.6.38.7/arch/x86/mm/init_ pmd_t * __init populate_extra_pmd(unsigned long vaddr) { int pgd_idx = pgd_index(vaddr); -@@ -203,6 +188,7 @@ page_table_range_init(unsigned long star +@@ -203,6 +188,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base) int pgd_idx, pmd_idx; unsigned long vaddr; pgd_t *pgd; @@ -20387,7 +21059,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/init_32.c linux-2.6.38.7/arch/x86/mm/init_ pmd_t *pmd; pte_t *pte = NULL; -@@ -212,8 +198,13 @@ page_table_range_init(unsigned long star +@@ -212,8 +198,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base) pgd = pgd_base + pgd_idx; for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) { @@ -20403,7 +21075,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/init_32.c linux-2.6.38.7/arch/x86/mm/init_ for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end); pmd++, pmd_idx++) { pte = page_table_kmap_check(one_page_table_init(pmd), -@@ -225,11 +216,20 @@ page_table_range_init(unsigned long star +@@ -225,11 +216,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base) } } @@ -20428,7 +21100,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/init_32.c linux-2.6.38.7/arch/x86/mm/init_ } /* -@@ -246,9 +246,10 @@ kernel_physical_mapping_init(unsigned lo +@@ -246,9 +246,10 @@ kernel_physical_mapping_init(unsigned long start, unsigned long last_map_addr = end; unsigned long start_pfn, end_pfn; pgd_t *pgd_base = swapper_pg_dir; @@ -20503,7 +21175,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/init_32.c linux-2.6.38.7/arch/x86/mm/init_ prot = PAGE_KERNEL_EXEC; pages_4k++; -@@ -472,7 +473,7 @@ void __init native_pagetable_setup_start +@@ -472,7 +473,7 @@ void __init native_pagetable_setup_start(pgd_t *base) pud = pud_offset(pgd, va); pmd = pmd_offset(pud, va); @@ -20512,7 +21184,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/init_32.c linux-2.6.38.7/arch/x86/mm/init_ break; pte = pte_offset_kernel(pmd, va); -@@ -524,12 +525,10 @@ void __init early_ioremap_page_table_ran +@@ -524,12 +525,10 @@ void __init early_ioremap_page_table_range_init(void) static void __init pagetable_init(void) { @@ -20587,10 +21259,11 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/init_32.c linux-2.6.38.7/arch/x86/mm/init_ set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); printk(KERN_INFO "Write protecting the kernel text: %luk\n", size >> 10); -diff -urNp linux-2.6.38.7/arch/x86/mm/init_64.c linux-2.6.38.7/arch/x86/mm/init_64.c ---- linux-2.6.38.7/arch/x86/mm/init_64.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/init_64.c 2011-04-28 19:34:15.000000000 -0400 -@@ -72,7 +72,7 @@ early_param("gbpages", parse_direct_gbpa +diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c +index c14a542..6467fb5 100644 +--- a/arch/x86/mm/init_64.c ++++ b/arch/x86/mm/init_64.c +@@ -72,7 +72,7 @@ early_param("gbpages", parse_direct_gbpages_on); * around without checking the pgd every time. */ @@ -20599,7 +21272,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/init_64.c linux-2.6.38.7/arch/x86/mm/init_ EXPORT_SYMBOL_GPL(__supported_pte_mask); int force_personality32; -@@ -105,12 +105,22 @@ void sync_global_pgds(unsigned long star +@@ -105,12 +105,22 @@ void sync_global_pgds(unsigned long start, unsigned long end) for (address = start; address <= end; address += PGDIR_SIZE) { const pgd_t *pgd_ref = pgd_offset_k(address); @@ -20622,7 +21295,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/init_64.c linux-2.6.38.7/arch/x86/mm/init_ list_for_each_entry(page, &pgd_list, lru) { pgd_t *pgd; spinlock_t *pgt_lock; -@@ -119,6 +129,7 @@ void sync_global_pgds(unsigned long star +@@ -119,6 +129,7 @@ void sync_global_pgds(unsigned long start, unsigned long end) /* the pgt_lock only for Xen */ pgt_lock = &pgd_page_get_mm(page)->page_table_lock; spin_lock(pgt_lock); @@ -20630,7 +21303,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/init_64.c linux-2.6.38.7/arch/x86/mm/init_ if (pgd_none(*pgd)) set_pgd(pgd, *pgd_ref); -@@ -126,7 +137,10 @@ void sync_global_pgds(unsigned long star +@@ -126,7 +137,10 @@ void sync_global_pgds(unsigned long start, unsigned long end) BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref)); @@ -20641,7 +21314,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/init_64.c linux-2.6.38.7/arch/x86/mm/init_ } spin_unlock(&pgd_lock); } -@@ -200,7 +214,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, +@@ -200,7 +214,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte) pmd = fill_pmd(pud, vaddr); pte = fill_pte(pmd, vaddr); @@ -20651,7 +21324,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/init_64.c linux-2.6.38.7/arch/x86/mm/init_ /* * It's enough to flush this one mapping. -@@ -259,14 +275,12 @@ static void __init __init_extra_mapping( +@@ -259,14 +275,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size, pgd = pgd_offset_k((unsigned long)__va(phys)); if (pgd_none(*pgd)) { pud = (pud_t *) spp_getpage(); @@ -20692,7 +21365,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/init_64.c linux-2.6.38.7/arch/x86/mm/init_ }; struct vm_area_struct *get_gate_vma(struct task_struct *tsk) -@@ -901,7 +921,7 @@ int in_gate_area_no_task(unsigned long a +@@ -901,7 +921,7 @@ int in_gate_area_no_task(unsigned long addr) const char *arch_vma_name(struct vm_area_struct *vma) { @@ -20701,131 +21374,11 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/init_64.c linux-2.6.38.7/arch/x86/mm/init_ return "[vdso]"; if (vma == &gate_vma) return "[vsyscall]"; -diff -urNp linux-2.6.38.7/arch/x86/mm/init.c linux-2.6.38.7/arch/x86/mm/init.c ---- linux-2.6.38.7/arch/x86/mm/init.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/init.c 2011-04-28 19:34:15.000000000 -0400 -@@ -72,11 +72,7 @@ static void __init find_early_table_spac - * cause a hotspot and fill up ZONE_DMA. The page tables - * need roughly 0.5KB per GB. - */ --#ifdef CONFIG_X86_32 -- start = 0x7000; --#else -- start = 0x8000; --#endif -+ start = 0x100000; - base = memblock_find_in_range(start, max_pfn_mapped<<PAGE_SHIFT, - tables, PAGE_SIZE); - if (base == MEMBLOCK_ERROR) -@@ -323,7 +319,16 @@ unsigned long __init_refok init_memory_m - */ - int devmem_is_allowed(unsigned long pagenr) - { -- if (pagenr <= 256) -+#ifndef CONFIG_GRKERNSEC_KMEM -+ if (!pagenr) -+ return 1; -+#ifdef CONFIG_VM86 -+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT)) -+ return 1; -+#endif -+#endif -+ -+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT)) - return 1; - if (iomem_is_exclusive(pagenr << PAGE_SHIFT)) - return 0; -@@ -383,6 +388,86 @@ void free_init_pages(char *what, unsigne - - 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)); -+ } -+#endif -+ -+ flush_tlb_all(); -+#endif -+ - free_init_pages("unused kernel memory", - (unsigned long)(&__init_begin), - (unsigned long)(&__init_end)); -diff -urNp linux-2.6.38.7/arch/x86/mm/iomap_32.c linux-2.6.38.7/arch/x86/mm/iomap_32.c ---- linux-2.6.38.7/arch/x86/mm/iomap_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/iomap_32.c 2011-04-28 19:34:15.000000000 -0400 -@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long +diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c +index 7b179b4..6bd1777 100644 +--- a/arch/x86/mm/iomap_32.c ++++ b/arch/x86/mm/iomap_32.c +@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot) type = kmap_atomic_idx_push(); idx = type + KM_TYPE_NR * smp_processor_id(); vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); @@ -20837,10 +21390,11 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/iomap_32.c linux-2.6.38.7/arch/x86/mm/ioma arch_flush_lazy_mmu_mode(); return (void *)vaddr; -diff -urNp linux-2.6.38.7/arch/x86/mm/ioremap.c linux-2.6.38.7/arch/x86/mm/ioremap.c ---- linux-2.6.38.7/arch/x86/mm/ioremap.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/ioremap.c 2011-04-28 19:34:15.000000000 -0400 -@@ -104,7 +104,7 @@ static void __iomem *__ioremap_caller(re +diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c +index 0369843..9258b48 100644 +--- a/arch/x86/mm/ioremap.c ++++ b/arch/x86/mm/ioremap.c +@@ -104,7 +104,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr, for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) { int is_ram = page_is_ram(pfn); @@ -20849,7 +21403,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/ioremap.c linux-2.6.38.7/arch/x86/mm/iorem return NULL; WARN_ON_ONCE(is_ram); } -@@ -344,7 +344,7 @@ static int __init early_ioremap_debug_se +@@ -344,7 +344,7 @@ static int __init early_ioremap_debug_setup(char *str) early_param("early_ioremap_debug", early_ioremap_debug_setup); static __initdata int after_paging_init; @@ -20868,10 +21422,11 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/ioremap.c linux-2.6.38.7/arch/x86/mm/iorem /* * The boot-ioremap range spans multiple pmds, for which -diff -urNp linux-2.6.38.7/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.38.7/arch/x86/mm/kmemcheck/kmemcheck.c ---- linux-2.6.38.7/arch/x86/mm/kmemcheck/kmemcheck.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/kmemcheck/kmemcheck.c 2011-04-28 19:34:15.000000000 -0400 -@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg +diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c +index d87dd6d..bf3fa66 100644 +--- a/arch/x86/mm/kmemcheck/kmemcheck.c ++++ b/arch/x86/mm/kmemcheck/kmemcheck.c +@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address, * memory (e.g. tracked pages)? For now, we need this to avoid * invoking kmemcheck for PnP BIOS calls. */ @@ -20883,10 +21438,11 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.38.7/arch/ return false; pte = kmemcheck_pte_lookup(address); -diff -urNp linux-2.6.38.7/arch/x86/mm/mmap.c linux-2.6.38.7/arch/x86/mm/mmap.c ---- linux-2.6.38.7/arch/x86/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/mmap.c 2011-04-28 19:34:15.000000000 -0400 -@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size +diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c +index 1dab519..60a7e5f 100644 +--- a/arch/x86/mm/mmap.c ++++ b/arch/x86/mm/mmap.c +@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size(void) * Leave an at least ~128 MB hole with possible stack randomization. */ #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size()) @@ -20941,7 +21497,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/mmap.c linux-2.6.38.7/arch/x86/mm/mmap.c return TASK_UNMAPPED_BASE + mmap_rnd(); } -@@ -125,11 +138,23 @@ static unsigned long mmap_legacy_base(vo +@@ -125,11 +138,23 @@ static unsigned long mmap_legacy_base(void) void arch_pick_mmap_layout(struct mm_struct *mm) { if (mmap_is_legacy()) { @@ -20967,10 +21523,11 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/mmap.c linux-2.6.38.7/arch/x86/mm/mmap.c mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.38.7/arch/x86/mm/mmio-mod.c linux-2.6.38.7/arch/x86/mm/mmio-mod.c ---- linux-2.6.38.7/arch/x86/mm/mmio-mod.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/mmio-mod.c 2011-04-28 19:57:25.000000000 -0400 -@@ -235,7 +235,7 @@ static void post(struct kmmio_probe *p, +diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c +index 3adff7d..aec0370 100644 +--- a/arch/x86/mm/mmio-mod.c ++++ b/arch/x86/mm/mmio-mod.c +@@ -235,7 +235,7 @@ static void post(struct kmmio_probe *p, unsigned long condition, static void ioremap_trace_core(resource_size_t offset, unsigned long size, void __iomem *addr) { @@ -20979,7 +21536,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/mmio-mod.c linux-2.6.38.7/arch/x86/mm/mmio struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL); /* These are page-unaligned. */ struct mmiotrace_map map = { -@@ -259,7 +259,7 @@ static void ioremap_trace_core(resource_ +@@ -259,7 +259,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size, .private = trace }, .phys = offset, @@ -20988,10 +21545,11 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/mmio-mod.c linux-2.6.38.7/arch/x86/mm/mmio }; map.map_id = trace->id; -diff -urNp linux-2.6.38.7/arch/x86/mm/numa_32.c linux-2.6.38.7/arch/x86/mm/numa_32.c ---- linux-2.6.38.7/arch/x86/mm/numa_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/numa_32.c 2011-04-28 19:34:15.000000000 -0400 -@@ -99,7 +99,6 @@ unsigned long node_memmap_size_bytes(int +diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c +index 84a3e4c..d3147e0 100644 +--- a/arch/x86/mm/numa_32.c ++++ b/arch/x86/mm/numa_32.c +@@ -99,7 +99,6 @@ unsigned long node_memmap_size_bytes(int nid, unsigned long start_pfn, } #endif @@ -20999,10 +21557,24 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/numa_32.c linux-2.6.38.7/arch/x86/mm/numa_ extern unsigned long highend_pfn, highstart_pfn; #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) -diff -urNp linux-2.6.38.7/arch/x86/mm/pageattr.c linux-2.6.38.7/arch/x86/mm/pageattr.c ---- linux-2.6.38.7/arch/x86/mm/pageattr.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/pageattr.c 2011-04-28 19:34:15.000000000 -0400 -@@ -261,7 +261,7 @@ static inline pgprot_t static_protection +diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c +index e1d1069..2251ff3 100644 +--- a/arch/x86/mm/pageattr-test.c ++++ b/arch/x86/mm/pageattr-test.c +@@ -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 --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c +index 90825f2..56a75fd 100644 +--- a/arch/x86/mm/pageattr.c ++++ b/arch/x86/mm/pageattr.c +@@ -261,7 +261,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address, */ #ifdef CONFIG_PCI_BIOS if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT)) @@ -21011,7 +21583,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/pageattr.c linux-2.6.38.7/arch/x86/mm/page #endif /* -@@ -269,9 +269,10 @@ static inline pgprot_t static_protection +@@ -269,9 +269,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address, * Does not cover __inittext since that is gone later on. On * 64bit we do not enforce !NX on the low mapping */ @@ -21024,7 +21596,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/pageattr.c linux-2.6.38.7/arch/x86/mm/page /* * The .rodata section needs to be read-only. Using the pfn * catches all aliases. -@@ -279,6 +280,7 @@ static inline pgprot_t static_protection +@@ -279,6 +280,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address, if (within(pfn, __pa((unsigned long)__start_rodata) >> PAGE_SHIFT, __pa((unsigned long)__end_rodata) >> PAGE_SHIFT)) pgprot_val(forbidden) |= _PAGE_RW; @@ -21032,7 +21604,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/pageattr.c linux-2.6.38.7/arch/x86/mm/page #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA) /* -@@ -317,6 +319,13 @@ static inline pgprot_t static_protection +@@ -317,6 +319,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address, } #endif @@ -21086,21 +21658,10 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/pageattr.c linux-2.6.38.7/arch/x86/mm/page } static int -diff -urNp linux-2.6.38.7/arch/x86/mm/pageattr-test.c linux-2.6.38.7/arch/x86/mm/pageattr-test.c ---- linux-2.6.38.7/arch/x86/mm/pageattr-test.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/pageattr-test.c 2011-04-28 19:34:15.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.38.7/arch/x86/mm/pat.c linux-2.6.38.7/arch/x86/mm/pat.c ---- linux-2.6.38.7/arch/x86/mm/pat.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/pat.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c +index f6ff57b..481690f 100644 +--- a/arch/x86/mm/pat.c ++++ b/arch/x86/mm/pat.c @@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end) if (!entry) { @@ -21110,7 +21671,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/pat.c linux-2.6.38.7/arch/x86/mm/pat.c return -EINVAL; } -@@ -492,8 +492,8 @@ static inline int range_is_allowed(unsig +@@ -492,8 +492,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size) while (cursor < to) { if (!devmem_is_allowed(pfn)) { printk(KERN_INFO @@ -21121,7 +21682,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/pat.c linux-2.6.38.7/arch/x86/mm/pat.c return 0; } cursor += PAGE_SIZE; -@@ -557,7 +557,7 @@ int kernel_map_sync_memtype(u64 base, un +@@ -557,7 +557,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags) printk(KERN_INFO "%s:%d ioremap_change_attr failed %s " "for %Lx-%Lx\n", @@ -21130,7 +21691,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/pat.c linux-2.6.38.7/arch/x86/mm/pat.c cattr_name(flags), base, (unsigned long long)(base + size)); return -EINVAL; -@@ -593,7 +593,7 @@ static int reserve_pfn_range(u64 paddr, +@@ -593,7 +593,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot, if (want_flags != flags) { printk(KERN_WARNING "%s:%d map pfn RAM range req %s for %Lx-%Lx, got %s\n", @@ -21139,7 +21700,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/pat.c linux-2.6.38.7/arch/x86/mm/pat.c cattr_name(want_flags), (unsigned long long)paddr, (unsigned long long)(paddr + size), -@@ -615,7 +615,7 @@ static int reserve_pfn_range(u64 paddr, +@@ -615,7 +615,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot, free_memtype(paddr, paddr + size); printk(KERN_ERR "%s:%d map pfn expected mapping type %s" " for %Lx-%Lx, got %s\n", @@ -21148,27 +21709,11 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/pat.c linux-2.6.38.7/arch/x86/mm/pat.c cattr_name(want_flags), (unsigned long long)paddr, (unsigned long long)(paddr + size), -diff -urNp linux-2.6.38.7/arch/x86/mm/pgtable_32.c linux-2.6.38.7/arch/x86/mm/pgtable_32.c ---- linux-2.6.38.7/arch/x86/mm/pgtable_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/pgtable_32.c 2011-04-28 19:34:15.000000000 -0400 -@@ -48,10 +48,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.38.7/arch/x86/mm/pgtable.c linux-2.6.38.7/arch/x86/mm/pgtable.c ---- linux-2.6.38.7/arch/x86/mm/pgtable.c 2011-04-18 17:27:13.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/pgtable.c 2011-05-11 18:34:57.000000000 -0400 -@@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *p +diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c +index 8573b83..6372501 100644 +--- a/arch/x86/mm/pgtable.c ++++ b/arch/x86/mm/pgtable.c +@@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *pgd) list_del(&page->lru); } @@ -21194,7 +21739,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/pgtable.c linux-2.6.38.7/arch/x86/mm/pgtab +#else + *dst++ = *src++; +#endif - ++ +} +#endif + @@ -21215,7 +21760,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/pgtable.c linux-2.6.38.7/arch/x86/mm/pgtab +#define pyd_offset(mm ,address) pud_offset((mm), (address)) +#define PYD_SIZE PUD_SIZE +#endif -+ + +#ifdef CONFIG_PAX_PER_CPU_PGD +static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {} +static inline void pgd_dtor(pgd_t *pgd) {} @@ -21249,7 +21794,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/pgtable.c linux-2.6.38.7/arch/x86/mm/pgtab void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd) { -@@ -170,36 +213,38 @@ void pud_populate(struct mm_struct *mm, +@@ -170,36 +213,38 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd) */ flush_tlb_mm(mm); } @@ -21299,7 +21844,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/pgtable.c linux-2.6.38.7/arch/x86/mm/pgtab return -ENOMEM; } -@@ -212,51 +257,55 @@ static int preallocate_pmds(pmd_t *pmds[ +@@ -212,51 +257,55 @@ static int preallocate_pmds(pmd_t *pmds[]) * preallocate which never got a corresponding vma will need to be * freed manually. */ @@ -21413,9 +21958,28 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/pgtable.c linux-2.6.38.7/arch/x86/mm/pgtab pgd_dtor(pgd); paravirt_pgd_free(mm, pgd); free_page((unsigned long)pgd); -diff -urNp linux-2.6.38.7/arch/x86/mm/setup_nx.c linux-2.6.38.7/arch/x86/mm/setup_nx.c ---- linux-2.6.38.7/arch/x86/mm/setup_nx.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/setup_nx.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c +index cac7184..09a39fa 100644 +--- a/arch/x86/mm/pgtable_32.c ++++ b/arch/x86/mm/pgtable_32.c +@@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval) + 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 --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c +index 410531d..0f16030 100644 +--- a/arch/x86/mm/setup_nx.c ++++ b/arch/x86/mm/setup_nx.c @@ -5,8 +5,10 @@ #include <asm/pgtable.h> #include <asm/proto.h> @@ -21427,7 +21991,7 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/setup_nx.c linux-2.6.38.7/arch/x86/mm/setu /* * noexec = on|off * -@@ -28,12 +30,17 @@ 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); @@ -21445,9 +22009,10 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/setup_nx.c linux-2.6.38.7/arch/x86/mm/setu __supported_pte_mask &= ~_PAGE_NX; } -diff -urNp linux-2.6.38.7/arch/x86/mm/tlb.c linux-2.6.38.7/arch/x86/mm/tlb.c ---- linux-2.6.38.7/arch/x86/mm/tlb.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/mm/tlb.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c +index 6acc724..f0896b7 100644 +--- a/arch/x86/mm/tlb.c ++++ b/arch/x86/mm/tlb.c @@ -65,7 +65,11 @@ void leave_mm(int cpu) BUG(); cpumask_clear_cpu(cpu, @@ -21460,10 +22025,11 @@ diff -urNp linux-2.6.38.7/arch/x86/mm/tlb.c linux-2.6.38.7/arch/x86/mm/tlb.c } EXPORT_SYMBOL_GPL(leave_mm); -diff -urNp linux-2.6.38.7/arch/x86/oprofile/backtrace.c linux-2.6.38.7/arch/x86/oprofile/backtrace.c ---- linux-2.6.38.7/arch/x86/oprofile/backtrace.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/oprofile/backtrace.c 2011-04-28 19:34:15.000000000 -0400 -@@ -57,7 +57,7 @@ dump_user_backtrace_32(struct stack_fram +diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c +index 72cbec1..08f3b7b 100644 +--- a/arch/x86/oprofile/backtrace.c ++++ b/arch/x86/oprofile/backtrace.c +@@ -57,7 +57,7 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head) struct stack_frame_ia32 *fp; /* Also check accessibility of one struct frame_head beyond */ @@ -21472,7 +22038,7 @@ diff -urNp linux-2.6.38.7/arch/x86/oprofile/backtrace.c linux-2.6.38.7/arch/x86/ return NULL; if (__copy_from_user_inatomic(bufhead, head, sizeof(bufhead))) return NULL; -@@ -123,7 +123,7 @@ x86_backtrace(struct pt_regs * const reg +@@ -123,7 +123,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth) { struct stack_frame *head = (struct stack_frame *)frame_pointer(regs); @@ -21481,10 +22047,11 @@ diff -urNp linux-2.6.38.7/arch/x86/oprofile/backtrace.c linux-2.6.38.7/arch/x86/ unsigned long stack = kernel_stack_pointer(regs); if (depth) dump_trace(NULL, regs, (unsigned long *)stack, -diff -urNp linux-2.6.38.7/arch/x86/oprofile/op_model_p4.c linux-2.6.38.7/arch/x86/oprofile/op_model_p4.c ---- linux-2.6.38.7/arch/x86/oprofile/op_model_p4.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/oprofile/op_model_p4.c 2011-04-28 19:34:15.000000000 -0400 -@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo +diff --git a/arch/x86/oprofile/op_model_p4.c b/arch/x86/oprofile/op_model_p4.c +index 9fadec0..98ab130 100644 +--- a/arch/x86/oprofile/op_model_p4.c ++++ b/arch/x86/oprofile/op_model_p4.c +@@ -50,7 +50,7 @@ static inline void setup_num_counters(void) #endif } @@ -21493,10 +22060,11 @@ diff -urNp linux-2.6.38.7/arch/x86/oprofile/op_model_p4.c linux-2.6.38.7/arch/x8 { #ifdef CONFIG_SMP return smp_num_siblings == 2 ? 2 : 1; -diff -urNp linux-2.6.38.7/arch/x86/pci/ce4100.c linux-2.6.38.7/arch/x86/pci/ce4100.c ---- linux-2.6.38.7/arch/x86/pci/ce4100.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/pci/ce4100.c 2011-04-28 19:34:15.000000000 -0400 -@@ -302,7 +302,7 @@ static int ce4100_conf_write(unsigned in +diff --git a/arch/x86/pci/ce4100.c b/arch/x86/pci/ce4100.c +index 9260b3e..6734ed5 100644 +--- a/arch/x86/pci/ce4100.c ++++ b/arch/x86/pci/ce4100.c +@@ -302,7 +302,7 @@ static int ce4100_conf_write(unsigned int seg, unsigned int bus, return pci_direct_conf1.write(seg, bus, devfn, reg, len, value); } @@ -21505,9 +22073,10 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/ce4100.c linux-2.6.38.7/arch/x86/pci/ce41 .read = ce4100_conf_read, .write = ce4100_conf_write, }; -diff -urNp linux-2.6.38.7/arch/x86/pci/common.c linux-2.6.38.7/arch/x86/pci/common.c ---- linux-2.6.38.7/arch/x86/pci/common.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/pci/common.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c +index 5fe7502..b7c993f 100644 +--- a/arch/x86/pci/common.c ++++ b/arch/x86/pci/common.c @@ -33,8 +33,8 @@ int noioapicreroute = 1; int pcibios_last_bus = -1; unsigned long pirq_table_addr; @@ -21519,10 +22088,11 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/common.c linux-2.6.38.7/arch/x86/pci/comm int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn, int reg, int len, u32 *val) -diff -urNp linux-2.6.38.7/arch/x86/pci/direct.c linux-2.6.38.7/arch/x86/pci/direct.c ---- linux-2.6.38.7/arch/x86/pci/direct.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/pci/direct.c 2011-04-28 19:34:15.000000000 -0400 -@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int +diff --git a/arch/x86/pci/direct.c b/arch/x86/pci/direct.c +index bd33620..f841b78 100644 +--- a/arch/x86/pci/direct.c ++++ b/arch/x86/pci/direct.c +@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int seg, unsigned int bus, #undef PCI_CONF1_ADDRESS @@ -21531,7 +22101,7 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/direct.c linux-2.6.38.7/arch/x86/pci/dire .read = pci_conf1_read, .write = pci_conf1_write, }; -@@ -173,7 +173,7 @@ static int pci_conf2_write(unsigned int +@@ -173,7 +173,7 @@ static int pci_conf2_write(unsigned int seg, unsigned int bus, #undef PCI_CONF2_ADDRESS @@ -21549,10 +22119,11 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/direct.c linux-2.6.38.7/arch/x86/pci/dire { u32 x = 0; int year, devfn; -diff -urNp linux-2.6.38.7/arch/x86/pci/fixup.c linux-2.6.38.7/arch/x86/pci/fixup.c ---- linux-2.6.38.7/arch/x86/pci/fixup.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/pci/fixup.c 2011-04-28 19:34:15.000000000 -0400 -@@ -435,7 +435,7 @@ static const struct dmi_system_id __devi +diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c +index 6dd8955..b30b640 100644 +--- a/arch/x86/pci/fixup.c ++++ b/arch/x86/pci/fixup.c +@@ -435,7 +435,7 @@ static const struct dmi_system_id __devinitconst toshiba_ohci1394_dmi_table[] = DMI_MATCH(DMI_PRODUCT_VERSION, "PSA40U"), }, }, @@ -21561,10 +22132,11 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/fixup.c linux-2.6.38.7/arch/x86/pci/fixup }; static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) -diff -urNp linux-2.6.38.7/arch/x86/pci/mmconfig_32.c linux-2.6.38.7/arch/x86/pci/mmconfig_32.c ---- linux-2.6.38.7/arch/x86/pci/mmconfig_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/pci/mmconfig_32.c 2011-04-28 19:34:15.000000000 -0400 -@@ -117,7 +117,7 @@ static int pci_mmcfg_write(unsigned int +diff --git a/arch/x86/pci/mmconfig_32.c b/arch/x86/pci/mmconfig_32.c +index a3d9c54..5372e86 100644 +--- a/arch/x86/pci/mmconfig_32.c ++++ b/arch/x86/pci/mmconfig_32.c +@@ -117,7 +117,7 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus, return 0; } @@ -21573,10 +22145,11 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/mmconfig_32.c linux-2.6.38.7/arch/x86/pci .read = pci_mmcfg_read, .write = pci_mmcfg_write, }; -diff -urNp linux-2.6.38.7/arch/x86/pci/mmconfig_64.c linux-2.6.38.7/arch/x86/pci/mmconfig_64.c ---- linux-2.6.38.7/arch/x86/pci/mmconfig_64.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/pci/mmconfig_64.c 2011-04-28 19:34:15.000000000 -0400 -@@ -81,7 +81,7 @@ static int pci_mmcfg_write(unsigned int +diff --git a/arch/x86/pci/mmconfig_64.c b/arch/x86/pci/mmconfig_64.c +index e783841..915a493 100644 +--- a/arch/x86/pci/mmconfig_64.c ++++ b/arch/x86/pci/mmconfig_64.c +@@ -81,7 +81,7 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus, return 0; } @@ -21585,10 +22158,11 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/mmconfig_64.c linux-2.6.38.7/arch/x86/pci .read = pci_mmcfg_read, .write = pci_mmcfg_write, }; -diff -urNp linux-2.6.38.7/arch/x86/pci/numaq_32.c linux-2.6.38.7/arch/x86/pci/numaq_32.c ---- linux-2.6.38.7/arch/x86/pci/numaq_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/pci/numaq_32.c 2011-04-28 19:34:15.000000000 -0400 -@@ -108,7 +108,7 @@ static int pci_conf1_mq_write(unsigned i +diff --git a/arch/x86/pci/numaq_32.c b/arch/x86/pci/numaq_32.c +index 5c9e245..d743b10 100644 +--- a/arch/x86/pci/numaq_32.c ++++ b/arch/x86/pci/numaq_32.c +@@ -108,7 +108,7 @@ static int pci_conf1_mq_write(unsigned int seg, unsigned int bus, #undef PCI_CONF1_MQ_ADDRESS @@ -21597,10 +22171,11 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/numaq_32.c linux-2.6.38.7/arch/x86/pci/nu .read = pci_conf1_mq_read, .write = pci_conf1_mq_write }; -diff -urNp linux-2.6.38.7/arch/x86/pci/olpc.c linux-2.6.38.7/arch/x86/pci/olpc.c ---- linux-2.6.38.7/arch/x86/pci/olpc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/pci/olpc.c 2011-04-28 19:34:15.000000000 -0400 -@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s +diff --git a/arch/x86/pci/olpc.c b/arch/x86/pci/olpc.c +index 13700ec..0a03b7c 100644 +--- a/arch/x86/pci/olpc.c ++++ b/arch/x86/pci/olpc.c +@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int seg, unsigned int bus, return 0; } @@ -21609,9 +22184,10 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/olpc.c linux-2.6.38.7/arch/x86/pci/olpc.c .read = pci_olpc_read, .write = pci_olpc_write, }; -diff -urNp linux-2.6.38.7/arch/x86/pci/pcbios.c linux-2.6.38.7/arch/x86/pci/pcbios.c ---- linux-2.6.38.7/arch/x86/pci/pcbios.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/pci/pcbios.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c +index a5f7d0d..64c1f42 100644 +--- a/arch/x86/pci/pcbios.c ++++ b/arch/x86/pci/pcbios.c @@ -79,50 +79,93 @@ union bios32 { static struct { unsigned long address; @@ -21747,7 +22323,7 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/pcbios.c linux-2.6.38.7/arch/x86/pci/pcbi : "memory"); local_irq_restore(flags); -@@ -188,7 +234,10 @@ static int pci_bios_read(unsigned int se +@@ -188,7 +234,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus, switch (len) { case 1: @@ -21759,7 +22335,7 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/pcbios.c linux-2.6.38.7/arch/x86/pci/pcbi "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" -@@ -197,7 +246,8 @@ static int pci_bios_read(unsigned int se +@@ -197,7 +246,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus, : "1" (PCIBIOS_READ_CONFIG_BYTE), "b" (bx), "D" ((long)reg), @@ -21769,7 +22345,7 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/pcbios.c linux-2.6.38.7/arch/x86/pci/pcbi /* * Zero-extend the result beyond 8 bits, do not trust the * BIOS having done it: -@@ -205,7 +255,10 @@ static int pci_bios_read(unsigned int se +@@ -205,7 +255,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus, *value &= 0xff; break; case 2: @@ -21781,7 +22357,7 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/pcbios.c linux-2.6.38.7/arch/x86/pci/pcbi "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" -@@ -214,7 +267,8 @@ static int pci_bios_read(unsigned int se +@@ -214,7 +267,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus, : "1" (PCIBIOS_READ_CONFIG_WORD), "b" (bx), "D" ((long)reg), @@ -21791,7 +22367,7 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/pcbios.c linux-2.6.38.7/arch/x86/pci/pcbi /* * Zero-extend the result beyond 16 bits, do not trust the * BIOS having done it: -@@ -222,7 +276,10 @@ static int pci_bios_read(unsigned int se +@@ -222,7 +276,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus, *value &= 0xffff; break; case 4: @@ -21803,7 +22379,7 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/pcbios.c linux-2.6.38.7/arch/x86/pci/pcbi "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" -@@ -231,7 +288,8 @@ static int pci_bios_read(unsigned int se +@@ -231,7 +288,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus, : "1" (PCIBIOS_READ_CONFIG_DWORD), "b" (bx), "D" ((long)reg), @@ -21813,7 +22389,7 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/pcbios.c linux-2.6.38.7/arch/x86/pci/pcbi break; } -@@ -254,7 +312,10 @@ static int pci_bios_write(unsigned int s +@@ -254,7 +312,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus, switch (len) { case 1: @@ -21825,7 +22401,7 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/pcbios.c linux-2.6.38.7/arch/x86/pci/pcbi "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" -@@ -263,10 +324,14 @@ static int pci_bios_write(unsigned int s +@@ -263,10 +324,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus, "c" (value), "b" (bx), "D" ((long)reg), @@ -21842,7 +22418,7 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/pcbios.c linux-2.6.38.7/arch/x86/pci/pcbi "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" -@@ -275,10 +340,14 @@ static int pci_bios_write(unsigned int s +@@ -275,10 +340,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus, "c" (value), "b" (bx), "D" ((long)reg), @@ -21859,7 +22435,7 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/pcbios.c linux-2.6.38.7/arch/x86/pci/pcbi "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" -@@ -287,7 +356,8 @@ static int pci_bios_write(unsigned int s +@@ -287,7 +356,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus, "c" (value), "b" (bx), "D" ((long)reg), @@ -21869,7 +22445,7 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/pcbios.c linux-2.6.38.7/arch/x86/pci/pcbi break; } -@@ -301,7 +371,7 @@ static int pci_bios_write(unsigned int s +@@ -301,7 +371,7 @@ static int pci_bios_write(unsigned int seg, unsigned int bus, * Function table for BIOS32 access */ @@ -21878,7 +22454,7 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/pcbios.c linux-2.6.38.7/arch/x86/pci/pcbi .read = pci_bios_read, .write = pci_bios_write }; -@@ -310,7 +380,7 @@ static struct pci_raw_ops pci_bios_acces +@@ -310,7 +380,7 @@ static struct pci_raw_ops pci_bios_access = { * Try to find PCI BIOS. */ @@ -21887,7 +22463,7 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/pcbios.c linux-2.6.38.7/arch/x86/pci/pcbi { union bios32 *check; unsigned char sum; -@@ -392,10 +462,13 @@ struct irq_routing_table * pcibios_get_i +@@ -392,10 +462,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void) DBG("PCI: Fetching IRQ routing table... "); __asm__("push %%es\n\t" @@ -21902,7 +22478,7 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/pcbios.c linux-2.6.38.7/arch/x86/pci/pcbi "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" -@@ -406,7 +479,8 @@ struct irq_routing_table * pcibios_get_i +@@ -406,7 +479,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void) "1" (0), "D" ((long) &opt), "S" (&pci_indirect), @@ -21912,7 +22488,7 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/pcbios.c linux-2.6.38.7/arch/x86/pci/pcbi : "memory"); DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map); if (ret & 0xff00) -@@ -430,7 +504,10 @@ int pcibios_set_irq_routing(struct pci_d +@@ -430,7 +504,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq) { int ret; @@ -21924,7 +22500,7 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/pcbios.c linux-2.6.38.7/arch/x86/pci/pcbi "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" -@@ -438,7 +515,8 @@ int pcibios_set_irq_routing(struct pci_d +@@ -438,7 +515,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq) : "0" (PCIBIOS_SET_PCI_HW_INT), "b" ((dev->bus->number << 8) | dev->devfn), "c" ((irq << 8) | (pin + 10)), @@ -21934,9 +22510,10 @@ diff -urNp linux-2.6.38.7/arch/x86/pci/pcbios.c linux-2.6.38.7/arch/x86/pci/pcbi return !(ret & 0xff00); } EXPORT_SYMBOL(pcibios_set_irq_routing); -diff -urNp linux-2.6.38.7/arch/x86/platform/efi/efi_32.c linux-2.6.38.7/arch/x86/platform/efi/efi_32.c ---- linux-2.6.38.7/arch/x86/platform/efi/efi_32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/platform/efi/efi_32.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c +index 5cab48e..ccd7831 100644 +--- a/arch/x86/platform/efi/efi_32.c ++++ b/arch/x86/platform/efi/efi_32.c @@ -38,70 +38,37 @@ */ @@ -22017,9 +22594,10 @@ diff -urNp linux-2.6.38.7/arch/x86/platform/efi/efi_32.c linux-2.6.38.7/arch/x86 /* * After the lock is released, the original page table is restored. -diff -urNp linux-2.6.38.7/arch/x86/platform/efi/efi_stub_32.S linux-2.6.38.7/arch/x86/platform/efi/efi_stub_32.S ---- linux-2.6.38.7/arch/x86/platform/efi/efi_stub_32.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/platform/efi/efi_stub_32.S 2011-04-28 19:34:15.000000000 -0400 +diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S +index fbe66e6..1f61a01 100644 +--- a/arch/x86/platform/efi/efi_stub_32.S ++++ b/arch/x86/platform/efi/efi_stub_32.S @@ -6,6 +6,7 @@ */ @@ -22118,10 +22696,11 @@ diff -urNp linux-2.6.38.7/arch/x86/platform/efi/efi_stub_32.S linux-2.6.38.7/arc saved_return_addr: .long 0 efi_rt_function_ptr: -diff -urNp linux-2.6.38.7/arch/x86/platform/uv/tlb_uv.c linux-2.6.38.7/arch/x86/platform/uv/tlb_uv.c ---- linux-2.6.38.7/arch/x86/platform/uv/tlb_uv.c 2011-05-22 23:05:18.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/platform/uv/tlb_uv.c 2011-05-22 23:05:54.000000000 -0400 -@@ -341,6 +341,8 @@ static void uv_reset_with_ipi(struct bau +diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c +index 3796f99..ec032db 100644 +--- a/arch/x86/platform/uv/tlb_uv.c ++++ b/arch/x86/platform/uv/tlb_uv.c +@@ -341,6 +341,8 @@ static void uv_reset_with_ipi(struct bau_target_uvhubmask *distribution, cpumask_t mask; struct reset_args reset_args; @@ -22130,9 +22709,10 @@ diff -urNp linux-2.6.38.7/arch/x86/platform/uv/tlb_uv.c linux-2.6.38.7/arch/x86/ reset_args.sender = sender; cpus_clear(mask); -diff -urNp linux-2.6.38.7/arch/x86/power/cpu.c linux-2.6.38.7/arch/x86/power/cpu.c ---- linux-2.6.38.7/arch/x86/power/cpu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/power/cpu.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c +index 87bb35e..eff2da8 100644 +--- a/arch/x86/power/cpu.c ++++ b/arch/x86/power/cpu.c @@ -130,7 +130,7 @@ static void do_fpu_end(void) static void fix_processor_context(void) { @@ -22152,9 +22732,10 @@ diff -urNp linux-2.6.38.7/arch/x86/power/cpu.c linux-2.6.38.7/arch/x86/power/cpu syscall_init(); /* This sets MSR_*STAR and related */ #endif -diff -urNp linux-2.6.38.7/arch/x86/vdso/Makefile linux-2.6.38.7/arch/x86/vdso/Makefile ---- linux-2.6.38.7/arch/x86/vdso/Makefile 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/vdso/Makefile 2011-04-28 19:34:15.000000000 -0400 +diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile +index b6552b1..eda463a 100644 +--- a/arch/x86/vdso/Makefile ++++ b/arch/x86/vdso/Makefile @@ -123,7 +123,7 @@ quiet_cmd_vdso = VDSO $@ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \ sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' @@ -22164,9 +22745,10 @@ diff -urNp linux-2.6.38.7/arch/x86/vdso/Makefile linux-2.6.38.7/arch/x86/vdso/Ma GCOV_PROFILE := n # -diff -urNp linux-2.6.38.7/arch/x86/vdso/vclock_gettime.c linux-2.6.38.7/arch/x86/vdso/vclock_gettime.c ---- linux-2.6.38.7/arch/x86/vdso/vclock_gettime.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/vdso/vclock_gettime.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c +index ee55754..0013b2e 100644 +--- a/arch/x86/vdso/vclock_gettime.c ++++ b/arch/x86/vdso/vclock_gettime.c @@ -22,24 +22,48 @@ #include <asm/hpet.h> #include <asm/unistd.h> @@ -22220,7 +22802,7 @@ diff -urNp linux-2.6.38.7/arch/x86/vdso/vclock_gettime.c linux-2.6.38.7/arch/x86 return (v * gtod->clock.mult) >> gtod->clock.shift; } -@@ -113,7 +137,9 @@ notrace static noinline int do_monotonic +@@ -113,7 +137,9 @@ notrace static noinline int do_monotonic_coarse(struct timespec *ts) notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts) { @@ -22231,7 +22813,7 @@ diff -urNp linux-2.6.38.7/arch/x86/vdso/vclock_gettime.c linux-2.6.38.7/arch/x86 switch (clock) { case CLOCK_REALTIME: if (likely(gtod->clock.vread)) -@@ -133,10 +159,20 @@ notrace int __vdso_clock_gettime(clockid +@@ -133,10 +159,20 @@ notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts) int clock_gettime(clockid_t, struct timespec *) __attribute__((weak, alias("__vdso_clock_gettime"))); @@ -22254,7 +22836,7 @@ diff -urNp linux-2.6.38.7/arch/x86/vdso/vclock_gettime.c linux-2.6.38.7/arch/x86 if (likely(tv != NULL)) { BUILD_BUG_ON(offsetof(struct timeval, tv_usec) != offsetof(struct timespec, tv_nsec) || -@@ -151,9 +187,7 @@ notrace int __vdso_gettimeofday(struct t +@@ -151,9 +187,7 @@ notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz) } return 0; } @@ -22265,9 +22847,24 @@ diff -urNp linux-2.6.38.7/arch/x86/vdso/vclock_gettime.c linux-2.6.38.7/arch/x86 } int gettimeofday(struct timeval *, struct timezone *) __attribute__((weak, alias("__vdso_gettimeofday"))); -diff -urNp linux-2.6.38.7/arch/x86/vdso/vdso32-setup.c linux-2.6.38.7/arch/x86/vdso/vdso32-setup.c ---- linux-2.6.38.7/arch/x86/vdso/vdso32-setup.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/vdso/vdso32-setup.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/arch/x86/vdso/vdso.lds.S b/arch/x86/vdso/vdso.lds.S +index 4e5dd3b..00ba15e 100644 +--- a/arch/x86/vdso/vdso.lds.S ++++ b/arch/x86/vdso/vdso.lds.S +@@ -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 --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c +index 36df991..1baa5ce 100644 +--- a/arch/x86/vdso/vdso32-setup.c ++++ b/arch/x86/vdso/vdso32-setup.c @@ -25,6 +25,7 @@ #include <asm/tlbflush.h> #include <asm/vdso.h> @@ -22276,7 +22873,7 @@ diff -urNp linux-2.6.38.7/arch/x86/vdso/vdso32-setup.c linux-2.6.38.7/arch/x86/v enum { VDSO_DISABLED = 0, -@@ -226,7 +227,7 @@ static inline void map_compat_vdso(int m +@@ -226,7 +227,7 @@ static inline void map_compat_vdso(int map) void enable_sep_cpu(void) { int cpu = get_cpu(); @@ -22294,7 +22891,7 @@ diff -urNp linux-2.6.38.7/arch/x86/vdso/vdso32-setup.c linux-2.6.38.7/arch/x86/v /* * Make sure the vDSO gets into every core dump. * Dumping its contents makes post-mortem fully interpretable later -@@ -331,14 +332,14 @@ int arch_setup_additional_pages(struct l +@@ -331,14 +332,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) if (compat) addr = VDSO_HIGH_BASE; else { @@ -22311,7 +22908,7 @@ diff -urNp linux-2.6.38.7/arch/x86/vdso/vdso32-setup.c linux-2.6.38.7/arch/x86/v if (compat_uses_vma || !compat) { /* -@@ -361,11 +362,11 @@ int arch_setup_additional_pages(struct l +@@ -361,11 +362,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) } current_thread_info()->sysenter_return = @@ -22341,7 +22938,7 @@ diff -urNp linux-2.6.38.7/arch/x86/vdso/vdso32-setup.c linux-2.6.38.7/arch/x86/v return NULL; } -@@ -422,7 +429,7 @@ struct vm_area_struct *get_gate_vma(stru +@@ -422,7 +429,7 @@ struct vm_area_struct *get_gate_vma(struct task_struct *tsk) struct mm_struct *mm = tsk->mm; /* Check to see if this task was created in compat vdso mode */ @@ -22350,22 +22947,10 @@ diff -urNp linux-2.6.38.7/arch/x86/vdso/vdso32-setup.c linux-2.6.38.7/arch/x86/v return &gate_vma; return NULL; } -diff -urNp linux-2.6.38.7/arch/x86/vdso/vdso.lds.S linux-2.6.38.7/arch/x86/vdso/vdso.lds.S ---- linux-2.6.38.7/arch/x86/vdso/vdso.lds.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/vdso/vdso.lds.S 2011-04-28 19:34:15.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.38.7/arch/x86/vdso/vextern.h linux-2.6.38.7/arch/x86/vdso/vextern.h ---- linux-2.6.38.7/arch/x86/vdso/vextern.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/vdso/vextern.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/arch/x86/vdso/vextern.h b/arch/x86/vdso/vextern.h +index 1683ba2..48d07f3 100644 +--- a/arch/x86/vdso/vextern.h ++++ b/arch/x86/vdso/vextern.h @@ -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. */ @@ -22373,9 +22958,10 @@ diff -urNp linux-2.6.38.7/arch/x86/vdso/vextern.h linux-2.6.38.7/arch/x86/vdso/v -VEXTERN(jiffies) VEXTERN(vgetcpu_mode) VEXTERN(vsyscall_gtod_data) -diff -urNp linux-2.6.38.7/arch/x86/vdso/vma.c linux-2.6.38.7/arch/x86/vdso/vma.c ---- linux-2.6.38.7/arch/x86/vdso/vma.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/vdso/vma.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c +index 4b5d26f..82030d8 100644 +--- a/arch/x86/vdso/vma.c ++++ b/arch/x86/vdso/vma.c @@ -58,7 +58,7 @@ static int __init init_vdso_vars(void) if (!vbase) goto oom; @@ -22385,7 +22971,7 @@ diff -urNp linux-2.6.38.7/arch/x86/vdso/vma.c linux-2.6.38.7/arch/x86/vdso/vma.c printk("VDSO: I'm broken; not ELF\n"); vdso_enabled = 0; } -@@ -118,7 +118,7 @@ int arch_setup_additional_pages(struct l +@@ -118,7 +118,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) goto up_fail; } @@ -22394,7 +22980,7 @@ diff -urNp linux-2.6.38.7/arch/x86/vdso/vma.c linux-2.6.38.7/arch/x86/vdso/vma.c ret = install_special_mapping(mm, addr, vdso_size, VM_READ|VM_EXEC| -@@ -126,7 +126,7 @@ int arch_setup_additional_pages(struct l +@@ -126,7 +126,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) VM_ALWAYSDUMP, vdso_pages); if (ret) { @@ -22414,9 +23000,10 @@ diff -urNp linux-2.6.38.7/arch/x86/vdso/vma.c linux-2.6.38.7/arch/x86/vdso/vma.c - return 0; -} -__setup("vdso=", vdso_setup); -diff -urNp linux-2.6.38.7/arch/x86/xen/enlighten.c linux-2.6.38.7/arch/x86/xen/enlighten.c ---- linux-2.6.38.7/arch/x86/xen/enlighten.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/xen/enlighten.c 2011-05-22 23:03:34.000000000 -0400 +diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c +index 50542ef..102889d 100644 +--- a/arch/x86/xen/enlighten.c ++++ b/arch/x86/xen/enlighten.c @@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); struct shared_info xen_dummy_shared_info; @@ -22426,7 +23013,7 @@ diff -urNp linux-2.6.38.7/arch/x86/xen/enlighten.c linux-2.6.38.7/arch/x86/xen/e RESERVE_BRK(shared_info_page_brk, PAGE_SIZE); __read_mostly int xen_have_vector_callback; EXPORT_SYMBOL_GPL(xen_have_vector_callback); -@@ -1017,7 +1015,7 @@ static const struct pv_apic_ops xen_apic +@@ -1017,7 +1015,7 @@ static const struct pv_apic_ops xen_apic_ops __initdata = { #endif }; @@ -22456,7 +23043,7 @@ diff -urNp linux-2.6.38.7/arch/x86/xen/enlighten.c linux-2.6.38.7/arch/x86/xen/e { xen_reboot(SHUTDOWN_poweroff); } -@@ -1134,7 +1132,17 @@ asmlinkage void __init xen_start_kernel( +@@ -1134,7 +1132,17 @@ asmlinkage void __init xen_start_kernel(void) __userpte_alloc_gfp &= ~__GFP_HIGHMEM; /* Work out if we support NX */ @@ -22475,7 +23062,7 @@ diff -urNp linux-2.6.38.7/arch/x86/xen/enlighten.c linux-2.6.38.7/arch/x86/xen/e xen_setup_features(); -@@ -1165,13 +1173,6 @@ asmlinkage void __init xen_start_kernel( +@@ -1165,13 +1173,6 @@ asmlinkage void __init xen_start_kernel(void) machine_ops = xen_machine_ops; @@ -22489,10 +23076,11 @@ diff -urNp linux-2.6.38.7/arch/x86/xen/enlighten.c linux-2.6.38.7/arch/x86/xen/e xen_smp_init(); #ifdef CONFIG_ACPI_NUMA -diff -urNp linux-2.6.38.7/arch/x86/xen/mmu.c linux-2.6.38.7/arch/x86/xen/mmu.c ---- linux-2.6.38.7/arch/x86/xen/mmu.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/xen/mmu.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1721,6 +1721,8 @@ __init pgd_t *xen_setup_kernel_pagetable +diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c +index d835bc2..2cff98e 100644 +--- a/arch/x86/xen/mmu.c ++++ b/arch/x86/xen/mmu.c +@@ -1721,6 +1721,8 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, convert_pfn_mfn(init_level4_pgt); convert_pfn_mfn(level3_ident_pgt); convert_pfn_mfn(level3_kernel_pgt); @@ -22501,7 +23089,7 @@ diff -urNp linux-2.6.38.7/arch/x86/xen/mmu.c linux-2.6.38.7/arch/x86/xen/mmu.c l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd); l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud); -@@ -1739,7 +1741,10 @@ __init pgd_t *xen_setup_kernel_pagetable +@@ -1739,7 +1741,10 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, set_page_prot(init_level4_pgt, PAGE_KERNEL_RO); set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO); set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO); @@ -22512,9 +23100,10 @@ diff -urNp linux-2.6.38.7/arch/x86/xen/mmu.c linux-2.6.38.7/arch/x86/xen/mmu.c set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); -diff -urNp linux-2.6.38.7/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.38.7/arch/x86/xen/pci-swiotlb-xen.c ---- linux-2.6.38.7/arch/x86/xen/pci-swiotlb-xen.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/xen/pci-swiotlb-xen.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/arch/x86/xen/pci-swiotlb-xen.c b/arch/x86/xen/pci-swiotlb-xen.c +index bfd0632..c10462a 100644 +--- a/arch/x86/xen/pci-swiotlb-xen.c ++++ b/arch/x86/xen/pci-swiotlb-xen.c @@ -10,7 +10,7 @@ int xen_swiotlb __read_mostly; @@ -22524,10 +23113,11 @@ diff -urNp linux-2.6.38.7/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.38.7/arch/x86 .mapping_error = xen_swiotlb_dma_mapping_error, .alloc_coherent = xen_swiotlb_alloc_coherent, .free_coherent = xen_swiotlb_free_coherent, -diff -urNp linux-2.6.38.7/arch/x86/xen/smp.c linux-2.6.38.7/arch/x86/xen/smp.c ---- linux-2.6.38.7/arch/x86/xen/smp.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/xen/smp.c 2011-05-11 18:34:57.000000000 -0400 -@@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_ +diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c +index 72a4c79..94cc180 100644 +--- a/arch/x86/xen/smp.c ++++ b/arch/x86/xen/smp.c +@@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_cpu(void) { BUG_ON(smp_processor_id() != 0); native_smp_prepare_boot_cpu(); @@ -22539,7 +23129,7 @@ diff -urNp linux-2.6.38.7/arch/x86/xen/smp.c linux-2.6.38.7/arch/x86/xen/smp.c xen_filter_cpu_maps(); xen_setup_vcpu_info_placement(); } -@@ -259,12 +254,12 @@ cpu_initialize_context(unsigned int cpu, +@@ -259,12 +254,12 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) gdt = get_cpu_gdt_table(cpu); ctxt->flags = VGCF_IN_KERNEL; @@ -22555,7 +23145,7 @@ diff -urNp linux-2.6.38.7/arch/x86/xen/smp.c linux-2.6.38.7/arch/x86/xen/smp.c #else ctxt->gs_base_kernel = per_cpu_offset(cpu); #endif -@@ -315,13 +310,12 @@ static int __cpuinit xen_cpu_up(unsigned +@@ -315,13 +310,12 @@ static int __cpuinit xen_cpu_up(unsigned int cpu) int rc; per_cpu(current_task, cpu) = idle; @@ -22571,9 +23161,10 @@ diff -urNp linux-2.6.38.7/arch/x86/xen/smp.c linux-2.6.38.7/arch/x86/xen/smp.c #endif xen_setup_runstate_info(cpu); xen_setup_timer(cpu); -diff -urNp linux-2.6.38.7/arch/x86/xen/xen-asm_32.S linux-2.6.38.7/arch/x86/xen/xen-asm_32.S ---- linux-2.6.38.7/arch/x86/xen/xen-asm_32.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/xen/xen-asm_32.S 2011-04-28 19:34:15.000000000 -0400 +diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S +index 22a2093..594dbcc 100644 +--- a/arch/x86/xen/xen-asm_32.S ++++ b/arch/x86/xen/xen-asm_32.S @@ -83,14 +83,14 @@ ENTRY(xen_iret) ESP_OFFSET=4 # bytes pushed onto stack @@ -22595,9 +23186,10 @@ diff -urNp linux-2.6.38.7/arch/x86/xen/xen-asm_32.S linux-2.6.38.7/arch/x86/xen/ #else movl xen_vcpu, %eax #endif -diff -urNp linux-2.6.38.7/arch/x86/xen/xen-head.S linux-2.6.38.7/arch/x86/xen/xen-head.S ---- linux-2.6.38.7/arch/x86/xen/xen-head.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/xen/xen-head.S 2011-04-28 19:34:15.000000000 -0400 +diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S +index 1a5ff24..a187d40 100644 +--- a/arch/x86/xen/xen-head.S ++++ b/arch/x86/xen/xen-head.S @@ -19,6 +19,17 @@ ENTRY(startup_xen) #ifdef CONFIG_X86_32 mov %esi,xen_start_info @@ -22616,9 +23208,10 @@ diff -urNp linux-2.6.38.7/arch/x86/xen/xen-head.S linux-2.6.38.7/arch/x86/xen/xe #else mov %rsi,xen_start_info mov $init_thread_union+THREAD_SIZE,%rsp -diff -urNp linux-2.6.38.7/arch/x86/xen/xen-ops.h linux-2.6.38.7/arch/x86/xen/xen-ops.h ---- linux-2.6.38.7/arch/x86/xen/xen-ops.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/arch/x86/xen/xen-ops.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h +index 9d41bf9..f08f7a9 100644 +--- a/arch/x86/xen/xen-ops.h ++++ b/arch/x86/xen/xen-ops.h @@ -10,8 +10,6 @@ extern const char xen_hypervisor_callback[]; extern const char xen_failsafe_callback[]; @@ -22628,10 +23221,11 @@ diff -urNp linux-2.6.38.7/arch/x86/xen/xen-ops.h linux-2.6.38.7/arch/x86/xen/xen struct trap_info; void xen_copy_trap_info(struct trap_info *traps); -diff -urNp linux-2.6.38.7/block/blk-iopoll.c linux-2.6.38.7/block/blk-iopoll.c ---- linux-2.6.38.7/block/blk-iopoll.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/block/blk-iopoll.c 2011-04-28 19:34:15.000000000 -0400 -@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo +diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c +index 58916af..9cb880b 100644 +--- a/block/blk-iopoll.c ++++ b/block/blk-iopoll.c +@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll) } EXPORT_SYMBOL(blk_iopoll_complete); @@ -22640,10 +23234,11 @@ diff -urNp linux-2.6.38.7/block/blk-iopoll.c linux-2.6.38.7/block/blk-iopoll.c { struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); int rearm = 0, budget = blk_iopoll_budget; -diff -urNp linux-2.6.38.7/block/blk-map.c linux-2.6.38.7/block/blk-map.c ---- linux-2.6.38.7/block/blk-map.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/block/blk-map.c 2011-04-28 19:34:15.000000000 -0400 -@@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue +diff --git a/block/blk-map.c b/block/blk-map.c +index e663ac2..f3cbc33 100644 +--- a/block/blk-map.c ++++ b/block/blk-map.c +@@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf, if (!len || !kbuf) return -EINVAL; @@ -22652,10 +23247,11 @@ diff -urNp linux-2.6.38.7/block/blk-map.c linux-2.6.38.7/block/blk-map.c if (do_copy) bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); else -diff -urNp linux-2.6.38.7/block/blk-softirq.c linux-2.6.38.7/block/blk-softirq.c ---- linux-2.6.38.7/block/blk-softirq.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/block/blk-softirq.c 2011-04-28 19:34:15.000000000 -0400 -@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, +diff --git a/block/blk-softirq.c b/block/blk-softirq.c +index ee9c216..58d410a 100644 +--- a/block/blk-softirq.c ++++ b/block/blk-softirq.c +@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done); * Softirq action handler - move entries to local list and loop over them * while passing them to the queue registered handler. */ @@ -22664,10 +23260,11 @@ diff -urNp linux-2.6.38.7/block/blk-softirq.c linux-2.6.38.7/block/blk-softirq.c { struct list_head *cpu_list, local_list; -diff -urNp linux-2.6.38.7/block/bsg.c linux-2.6.38.7/block/bsg.c ---- linux-2.6.38.7/block/bsg.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/block/bsg.c 2011-04-28 19:34:15.000000000 -0400 -@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct r +diff --git a/block/bsg.c b/block/bsg.c +index 0c8b64a..688c154 100644 +--- a/block/bsg.c ++++ b/block/bsg.c +@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq, struct sg_io_v4 *hdr, struct bsg_device *bd, fmode_t has_write_perm) { @@ -22694,9 +23291,10 @@ diff -urNp linux-2.6.38.7/block/bsg.c linux-2.6.38.7/block/bsg.c if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) { if (blk_verify_command(rq->cmd, has_write_perm)) return -EPERM; -diff -urNp linux-2.6.38.7/block/scsi_ioctl.c linux-2.6.38.7/block/scsi_ioctl.c ---- linux-2.6.38.7/block/scsi_ioctl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/block/scsi_ioctl.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c +index 4f4230b..0feae9a 100644 +--- a/block/scsi_ioctl.c ++++ b/block/scsi_ioctl.c @@ -222,8 +222,20 @@ EXPORT_SYMBOL(blk_verify_command); static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq, struct sg_io_hdr *hdr, fmode_t mode) @@ -22719,7 +23317,7 @@ diff -urNp linux-2.6.38.7/block/scsi_ioctl.c linux-2.6.38.7/block/scsi_ioctl.c if (blk_verify_command(rq->cmd, mode & FMODE_WRITE)) return -EPERM; -@@ -432,6 +444,8 @@ int sg_scsi_ioctl(struct request_queue * +@@ -432,6 +444,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, int err; unsigned int in_len, out_len, bytes, opcode, cmdlen; char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE]; @@ -22728,7 +23326,7 @@ diff -urNp linux-2.6.38.7/block/scsi_ioctl.c linux-2.6.38.7/block/scsi_ioctl.c if (!sic) return -EINVAL; -@@ -465,9 +479,18 @@ int sg_scsi_ioctl(struct request_queue * +@@ -465,9 +479,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, */ err = -EFAULT; rq->cmd_len = cmdlen; @@ -22748,10 +23346,11 @@ diff -urNp linux-2.6.38.7/block/scsi_ioctl.c linux-2.6.38.7/block/scsi_ioctl.c if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len)) goto error; -diff -urNp linux-2.6.38.7/crypto/serpent.c linux-2.6.38.7/crypto/serpent.c ---- linux-2.6.38.7/crypto/serpent.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/crypto/serpent.c 2011-05-16 21:47:08.000000000 -0400 -@@ -224,6 +224,8 @@ static int serpent_setkey(struct crypto_ +diff --git a/crypto/serpent.c b/crypto/serpent.c +index b651a55..a9ddd79b 100644 +--- a/crypto/serpent.c ++++ b/crypto/serpent.c +@@ -224,6 +224,8 @@ static int serpent_setkey(struct crypto_tfm *tfm, const u8 *key, u32 r0,r1,r2,r3,r4; int i; @@ -22760,182 +23359,10 @@ diff -urNp linux-2.6.38.7/crypto/serpent.c linux-2.6.38.7/crypto/serpent.c /* Copy key, add padding */ for (i = 0; i < keylen; ++i) -diff -urNp linux-2.6.38.7/Documentation/dontdiff linux-2.6.38.7/Documentation/dontdiff ---- linux-2.6.38.7/Documentation/dontdiff 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/Documentation/dontdiff 2011-05-18 20:23:44.000000000 -0400 -@@ -1,13 +1,16 @@ - *.a - *.aux - *.bin -+*.cis - *.cpio - *.csp -+*.dbg - *.dsp - *.dvi - *.elf - *.eps - *.fw -+*.gcno - *.gen.S - *.gif - *.grep -@@ -38,8 +41,10 @@ - *.tab.h - *.tex - *.ver -+*.vim - *.xml - *_MODULES -+*_reg_safe.h - *_vga16.c - *~ - *.9 -@@ -49,11 +54,16 @@ - 53c700_d.h - CVS - ChangeSet -+GPATH -+GRTAGS -+GSYMS -+GTAGS - Image - Kerntypes - Module.markers - Module.symvers - PENDING -+PERF* - SCCS - System.map* - TAGS -@@ -80,8 +90,11 @@ btfixupprep - build - bvmlinux - bzImage* -+capability_names.h - capflags.c - classlist.h* -+clut_vga16.c -+common-cmds.h - comp*.log - compile.h* - conf -@@ -106,16 +119,19 @@ fore200e_mkfirm - fore200e_pca_fw.c* - gconf - gen-devlist -+gen-kdb_cmds.c - gen_crc32table - gen_init_cpio - 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 - int16.c -@@ -125,7 +141,6 @@ int32.c - int4.c - int8.c - kallsyms --kconfig - keywords.c - ksym.c* - ksym.h* -@@ -149,7 +164,9 @@ mkboot - mkbugboot - mkcpustr - mkdep -+mkpiggy - mkprep -+mkregtable - mktables - mktree - modpost -@@ -165,6 +182,7 @@ parse.h - patches* - pca200e.bin - pca200e_ecd.bin2 -+perf-archive - piggy.gz - piggyback - piggy.S -@@ -180,7 +198,9 @@ r600_reg_safe.h - raid6altivec*.c - raid6int*.c - raid6tables.c -+regdb.c - relocs -+rlim_names.h - rn50_reg_safe.h - rs600_reg_safe.h - rv515_reg_safe.h -@@ -189,6 +209,7 @@ setup - setup.bin - setup.elf - sImage -+slabinfo - sm_tbl* - split-include - syscalltab.h -@@ -213,13 +234,17 @@ 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 -diff -urNp linux-2.6.38.7/Documentation/filesystems/sysfs.txt linux-2.6.38.7/Documentation/filesystems/sysfs.txt ---- linux-2.6.38.7/Documentation/filesystems/sysfs.txt 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/Documentation/filesystems/sysfs.txt 2011-04-28 19:34:15.000000000 -0400 -@@ -123,8 +123,8 @@ set of sysfs operations for forwarding r - show and store methods of the attribute owners. - - struct sysfs_ops { -- ssize_t (*show)(struct kobject *, struct attribute *, char *); -- ssize_t (*store)(struct kobject *, struct attribute *, const char *, size_t); -+ ssize_t (* const show)(struct kobject *, struct attribute *, char *); -+ ssize_t (* const store)(struct kobject *, struct attribute *, const char *, size_t); - }; - - [ Subsystems should have already defined a struct kobj_type as a -diff -urNp linux-2.6.38.7/Documentation/kernel-parameters.txt linux-2.6.38.7/Documentation/kernel-parameters.txt ---- linux-2.6.38.7/Documentation/kernel-parameters.txt 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/Documentation/kernel-parameters.txt 2011-04-28 19:34:15.000000000 -0400 -@@ -1853,6 +1853,13 @@ bytes respectively. Such letter suffixes - the specified number of seconds. This is to be used if - your oopses keep scrolling off the screen. - -+ pax_nouderef [X86] 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 or the frequent -+ page table updates on X86-64. -+ -+ pax_softmode= 0/1 to disable/enable PaX softmode on boot already. -+ - pcbit= [HW,ISDN] - - pcd. [PARIDE] -diff -urNp linux-2.6.38.7/drivers/acpi/apei/cper.c linux-2.6.38.7/drivers/acpi/apei/cper.c ---- linux-2.6.38.7/drivers/acpi/apei/cper.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/acpi/apei/cper.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c +index 31464a0..03b986c 100644 +--- a/drivers/acpi/apei/cper.c ++++ b/drivers/acpi/apei/cper.c @@ -37,12 +37,12 @@ */ u64 cper_next_record_id(void) @@ -22953,9 +23380,10 @@ diff -urNp linux-2.6.38.7/drivers/acpi/apei/cper.c linux-2.6.38.7/drivers/acpi/a } EXPORT_SYMBOL_GPL(cper_next_record_id); -diff -urNp linux-2.6.38.7/drivers/acpi/battery.c linux-2.6.38.7/drivers/acpi/battery.c ---- linux-2.6.38.7/drivers/acpi/battery.c 2011-05-10 22:06:27.000000000 -0400 -+++ linux-2.6.38.7/drivers/acpi/battery.c 2011-05-10 22:06:52.000000000 -0400 +diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c +index fcc13ac..47969fb 100644 +--- a/drivers/acpi/battery.c ++++ b/drivers/acpi/battery.c @@ -864,7 +864,7 @@ DECLARE_FILE_FUNCTIONS(alarm); } @@ -22965,9 +23393,10 @@ diff -urNp linux-2.6.38.7/drivers/acpi/battery.c linux-2.6.38.7/drivers/acpi/bat mode_t mode; const char *name; } acpi_battery_file[] = { -diff -urNp linux-2.6.38.7/drivers/acpi/dock.c linux-2.6.38.7/drivers/acpi/dock.c ---- linux-2.6.38.7/drivers/acpi/dock.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/acpi/dock.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c +index 1864ad3..19a6113 100644 +--- a/drivers/acpi/dock.c ++++ b/drivers/acpi/dock.c @@ -77,7 +77,7 @@ struct dock_dependent_device { struct list_head list; struct list_head hotplug_list; @@ -22977,7 +23406,7 @@ diff -urNp linux-2.6.38.7/drivers/acpi/dock.c linux-2.6.38.7/drivers/acpi/dock.c void *context; }; -@@ -589,7 +589,7 @@ EXPORT_SYMBOL_GPL(unregister_dock_notifi +@@ -589,7 +589,7 @@ EXPORT_SYMBOL_GPL(unregister_dock_notifier); * the dock driver after _DCK is executed. */ int @@ -22986,10 +23415,11 @@ diff -urNp linux-2.6.38.7/drivers/acpi/dock.c linux-2.6.38.7/drivers/acpi/dock.c void *context) { struct dock_dependent_device *dd; -diff -urNp linux-2.6.38.7/drivers/acpi/ec_sys.c linux-2.6.38.7/drivers/acpi/ec_sys.c ---- linux-2.6.38.7/drivers/acpi/ec_sys.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/acpi/ec_sys.c 2011-04-28 19:34:15.000000000 -0400 -@@ -96,7 +96,7 @@ static ssize_t acpi_ec_write_io(struct f +diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c +index 411620e..cf71966 100644 +--- a/drivers/acpi/ec_sys.c ++++ b/drivers/acpi/ec_sys.c +@@ -96,7 +96,7 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf, return count; } @@ -22998,10 +23428,11 @@ diff -urNp linux-2.6.38.7/drivers/acpi/ec_sys.c linux-2.6.38.7/drivers/acpi/ec_s .owner = THIS_MODULE, .open = acpi_ec_open_io, .read = acpi_ec_read_io, -diff -urNp linux-2.6.38.7/drivers/acpi/power_meter.c linux-2.6.38.7/drivers/acpi/power_meter.c ---- linux-2.6.38.7/drivers/acpi/power_meter.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/acpi/power_meter.c 2011-04-28 19:34:15.000000000 -0400 -@@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d +diff --git a/drivers/acpi/power_meter.c b/drivers/acpi/power_meter.c +index 66f6729..2d6de0a 100644 +--- a/drivers/acpi/power_meter.c ++++ b/drivers/acpi/power_meter.c +@@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *dev, struct device_attribute *devattr, return res; temp /= 1000; @@ -23010,35 +23441,36 @@ diff -urNp linux-2.6.38.7/drivers/acpi/power_meter.c linux-2.6.38.7/drivers/acpi mutex_lock(&resource->lock); resource->trip[attr->index - 7] = temp; -diff -urNp linux-2.6.38.7/drivers/acpi/proc.c linux-2.6.38.7/drivers/acpi/proc.c ---- linux-2.6.38.7/drivers/acpi/proc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/acpi/proc.c 2011-04-28 19:34:15.000000000 -0400 -@@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct f +diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c +index f5f9869..da87aeb 100644 +--- a/drivers/acpi/proc.c ++++ b/drivers/acpi/proc.c +@@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct file *file, size_t count, loff_t * ppos) { struct list_head *node, *next; - char strbuf[5]; - char str[5] = ""; - unsigned int len = count; -- ++ char strbuf[5] = {0}; + - if (len > 4) - len = 4; - if (len < 0) -- return -EFAULT; -+ char strbuf[5] = {0}; - -- if (copy_from_user(strbuf, buffer, len)) + if (count > 4) + count = 4; + if (copy_from_user(strbuf, buffer, count)) return -EFAULT; +- +- if (copy_from_user(strbuf, buffer, len)) +- return -EFAULT; - strbuf[len] = '\0'; - sscanf(strbuf, "%s", str); + strbuf[count] = '\0'; mutex_lock(&acpi_device_lock); list_for_each_safe(node, next, &acpi_wakeup_device_list) { -@@ -363,7 +357,7 @@ acpi_system_write_wakeup_device(struct f +@@ -363,7 +357,7 @@ acpi_system_write_wakeup_device(struct file *file, if (!dev->wakeup.flags.valid) continue; @@ -23047,10 +23479,11 @@ diff -urNp linux-2.6.38.7/drivers/acpi/proc.c linux-2.6.38.7/drivers/acpi/proc.c if (device_can_wakeup(&dev->dev)) { bool enable = !device_may_wakeup(&dev->dev); device_set_wakeup_enable(&dev->dev, enable); -diff -urNp linux-2.6.38.7/drivers/acpi/processor_driver.c linux-2.6.38.7/drivers/acpi/processor_driver.c ---- linux-2.6.38.7/drivers/acpi/processor_driver.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/acpi/processor_driver.c 2011-04-28 19:34:15.000000000 -0400 -@@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add( +diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c +index 360a74e..575aa5a 100644 +--- a/drivers/acpi/processor_driver.c ++++ b/drivers/acpi/processor_driver.c +@@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device) return 0; #endif @@ -23059,10 +23492,11 @@ diff -urNp linux-2.6.38.7/drivers/acpi/processor_driver.c linux-2.6.38.7/drivers /* * Buggy BIOS check -diff -urNp linux-2.6.38.7/drivers/acpi/processor_idle.c linux-2.6.38.7/drivers/acpi/processor_idle.c ---- linux-2.6.38.7/drivers/acpi/processor_idle.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/acpi/processor_idle.c 2011-04-28 19:34:15.000000000 -0400 -@@ -121,7 +121,7 @@ static struct dmi_system_id __cpuinitdat +diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c +index d615b7d..8607961 100644 +--- a/drivers/acpi/processor_idle.c ++++ b/drivers/acpi/processor_idle.c +@@ -121,7 +121,7 @@ static struct dmi_system_id __cpuinitdata processor_power_dmi_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, (void *)1}, @@ -23071,10 +23505,11 @@ diff -urNp linux-2.6.38.7/drivers/acpi/processor_idle.c linux-2.6.38.7/drivers/a }; -diff -urNp linux-2.6.38.7/drivers/ata/acard-ahci.c linux-2.6.38.7/drivers/ata/acard-ahci.c ---- linux-2.6.38.7/drivers/ata/acard-ahci.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/acard-ahci.c 2011-04-28 19:34:15.000000000 -0400 -@@ -87,7 +87,7 @@ static struct scsi_host_template acard_a +diff --git a/drivers/ata/acard-ahci.c b/drivers/ata/acard-ahci.c +index 339c210..ed4f197 100644 +--- a/drivers/ata/acard-ahci.c ++++ b/drivers/ata/acard-ahci.c +@@ -87,7 +87,7 @@ static struct scsi_host_template acard_ahci_sht = { AHCI_SHT("acard-ahci"), }; @@ -23083,10 +23518,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/acard-ahci.c linux-2.6.38.7/drivers/ata/ac .inherits = &ahci_ops, .qc_prep = acard_ahci_qc_prep, .qc_fill_rtf = acard_ahci_qc_fill_rtf, -diff -urNp linux-2.6.38.7/drivers/ata/ahci.c linux-2.6.38.7/drivers/ata/ahci.c ---- linux-2.6.38.7/drivers/ata/ahci.c 2011-05-10 22:06:27.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/ahci.c 2011-05-10 22:06:52.000000000 -0400 -@@ -94,17 +94,17 @@ static struct scsi_host_template ahci_sh +diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c +index 54c096b..93f8ec5 100644 +--- a/drivers/ata/ahci.c ++++ b/drivers/ata/ahci.c +@@ -94,17 +94,17 @@ static struct scsi_host_template ahci_sht = { AHCI_SHT("ahci"), }; @@ -23107,10 +23543,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/ahci.c linux-2.6.38.7/drivers/ata/ahci.c .inherits = &ahci_ops, .softreset = ahci_sb600_softreset, .pmp_softreset = ahci_sb600_softreset, -diff -urNp linux-2.6.38.7/drivers/ata/ahci.h linux-2.6.38.7/drivers/ata/ahci.h ---- linux-2.6.38.7/drivers/ata/ahci.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/ahci.h 2011-04-28 19:34:15.000000000 -0400 -@@ -309,7 +309,7 @@ extern struct device_attribute *ahci_sde +diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h +index 3e606c3..91a5d12 100644 +--- a/drivers/ata/ahci.h ++++ b/drivers/ata/ahci.h +@@ -309,7 +309,7 @@ extern struct device_attribute *ahci_sdev_attrs[]; .shost_attrs = ahci_shost_attrs, \ .sdev_attrs = ahci_sdev_attrs @@ -23119,10 +23556,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/ahci.h linux-2.6.38.7/drivers/ata/ahci.h void ahci_fill_cmd_slot(struct ahci_port_priv *pp, unsigned int tag, u32 opts); -diff -urNp linux-2.6.38.7/drivers/ata/ata_generic.c linux-2.6.38.7/drivers/ata/ata_generic.c ---- linux-2.6.38.7/drivers/ata/ata_generic.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/ata_generic.c 2011-04-28 19:34:15.000000000 -0400 -@@ -101,7 +101,7 @@ static struct scsi_host_template generic +diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c +index 6981f76..a874967 100644 +--- a/drivers/ata/ata_generic.c ++++ b/drivers/ata/ata_generic.c +@@ -101,7 +101,7 @@ static struct scsi_host_template generic_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -23131,10 +23569,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/ata_generic.c linux-2.6.38.7/drivers/ata/a .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, .set_mode = generic_set_mode, -diff -urNp linux-2.6.38.7/drivers/ata/ata_piix.c linux-2.6.38.7/drivers/ata/ata_piix.c ---- linux-2.6.38.7/drivers/ata/ata_piix.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/ata_piix.c 2011-04-28 19:34:15.000000000 -0400 -@@ -327,12 +327,12 @@ static struct scsi_host_template piix_sh +diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c +index 6cb14ca..b370962 100644 +--- a/drivers/ata/ata_piix.c ++++ b/drivers/ata/ata_piix.c +@@ -327,12 +327,12 @@ static struct scsi_host_template piix_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -23149,7 +23588,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/ata_piix.c linux-2.6.38.7/drivers/ata/ata_ .inherits = &piix_sata_ops, .cable_detect = ata_cable_40wire, .set_piomode = piix_set_piomode, -@@ -340,12 +340,12 @@ static struct ata_port_operations piix_p +@@ -340,12 +340,12 @@ static struct ata_port_operations piix_pata_ops = { .prereset = piix_pata_prereset, }; @@ -23164,7 +23603,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/ata_piix.c linux-2.6.38.7/drivers/ata/ata_ .inherits = &piix_pata_ops, .cable_detect = ich_pata_cable_detect, .set_dmamode = ich_set_dmamode, -@@ -361,7 +361,7 @@ static struct scsi_host_template piix_si +@@ -361,7 +361,7 @@ static struct scsi_host_template piix_sidpr_sht = { .shost_attrs = piix_sidpr_shost_attrs, }; @@ -23173,10 +23612,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/ata_piix.c linux-2.6.38.7/drivers/ata/ata_ .inherits = &piix_sata_ops, .hardreset = sata_std_hardreset, .scr_read = piix_sidpr_scr_read, -diff -urNp linux-2.6.38.7/drivers/ata/libahci.c linux-2.6.38.7/drivers/ata/libahci.c ---- linux-2.6.38.7/drivers/ata/libahci.c 2011-05-10 22:06:27.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/libahci.c 2011-05-10 22:06:52.000000000 -0400 -@@ -137,7 +137,7 @@ struct device_attribute *ahci_sdev_attrs +diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c +index 8498eb5..dacd080 100644 +--- a/drivers/ata/libahci.c ++++ b/drivers/ata/libahci.c +@@ -137,7 +137,7 @@ struct device_attribute *ahci_sdev_attrs[] = { }; EXPORT_SYMBOL_GPL(ahci_sdev_attrs); @@ -23185,10 +23625,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/libahci.c linux-2.6.38.7/drivers/ata/libah .inherits = &sata_pmp_port_ops, .qc_defer = ahci_pmp_qc_defer, -diff -urNp linux-2.6.38.7/drivers/ata/libata-acpi.c linux-2.6.38.7/drivers/ata/libata-acpi.c ---- linux-2.6.38.7/drivers/ata/libata-acpi.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/libata-acpi.c 2011-04-28 19:34:15.000000000 -0400 -@@ -218,12 +218,12 @@ static void ata_acpi_dev_uevent(acpi_han +diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c +index 8b5ea39..a409970 100644 +--- a/drivers/ata/libata-acpi.c ++++ b/drivers/ata/libata-acpi.c +@@ -218,12 +218,12 @@ static void ata_acpi_dev_uevent(acpi_handle handle, u32 event, void *data) ata_acpi_uevent(dev->link->ap, dev, event); } @@ -23203,10 +23644,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/libata-acpi.c linux-2.6.38.7/drivers/ata/l .handler = ata_acpi_ap_notify_dock, .uevent = ata_acpi_ap_uevent, }; -diff -urNp linux-2.6.38.7/drivers/ata/libata-core.c linux-2.6.38.7/drivers/ata/libata-core.c ---- linux-2.6.38.7/drivers/ata/libata-core.c 2011-05-10 22:06:27.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/libata-core.c 2011-05-10 22:06:52.000000000 -0400 -@@ -4746,7 +4746,7 @@ void ata_qc_free(struct ata_queued_cmd * +diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c +index 4ccce0f..e9b3ccc 100644 +--- a/drivers/ata/libata-core.c ++++ b/drivers/ata/libata-core.c +@@ -4746,7 +4746,7 @@ void ata_qc_free(struct ata_queued_cmd *qc) struct ata_port *ap; unsigned int tag; @@ -23215,7 +23657,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/libata-core.c linux-2.6.38.7/drivers/ata/l ap = qc->ap; qc->flags = 0; -@@ -4762,7 +4762,7 @@ void __ata_qc_complete(struct ata_queued +@@ -4762,7 +4762,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc) struct ata_port *ap; struct ata_link *link; @@ -23224,7 +23666,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/libata-core.c linux-2.6.38.7/drivers/ata/l WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE)); ap = qc->ap; link = qc->dev->link; -@@ -5755,7 +5755,7 @@ static void ata_host_stop(struct device +@@ -5755,7 +5755,7 @@ static void ata_host_stop(struct device *gendev, void *res) * LOCKING: * None. */ @@ -23233,7 +23675,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/libata-core.c linux-2.6.38.7/drivers/ata/l { static DEFINE_SPINLOCK(lock); const struct ata_port_operations *cur; -@@ -5767,6 +5767,7 @@ static void ata_finalize_port_ops(struct +@@ -5767,6 +5767,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops) return; spin_lock(&lock); @@ -23241,7 +23683,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/libata-core.c linux-2.6.38.7/drivers/ata/l for (cur = ops->inherits; cur; cur = cur->inherits) { void **inherit = (void **)cur; -@@ -5780,8 +5781,9 @@ static void ata_finalize_port_ops(struct +@@ -5780,8 +5781,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops) if (IS_ERR(*pp)) *pp = NULL; @@ -23252,7 +23694,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/libata-core.c linux-2.6.38.7/drivers/ata/l spin_unlock(&lock); } -@@ -5878,7 +5880,7 @@ int ata_host_start(struct ata_host *host +@@ -5878,7 +5880,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, @@ -23261,7 +23703,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/libata-core.c linux-2.6.38.7/drivers/ata/l { spin_lock_init(&host->lock); mutex_init(&host->eh_mutex); -@@ -6584,7 +6586,7 @@ static void ata_dummy_error_handler(stru +@@ -6584,7 +6586,7 @@ static void ata_dummy_error_handler(struct ata_port *ap) /* truly dummy */ } @@ -23270,9 +23712,10 @@ diff -urNp linux-2.6.38.7/drivers/ata/libata-core.c linux-2.6.38.7/drivers/ata/l .qc_prep = ata_noop_qc_prep, .qc_issue = ata_dummy_qc_issue, .error_handler = ata_dummy_error_handler, -diff -urNp linux-2.6.38.7/drivers/ata/libata-eh.c linux-2.6.38.7/drivers/ata/libata-eh.c ---- linux-2.6.38.7/drivers/ata/libata-eh.c 2011-05-22 23:05:18.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/libata-eh.c 2011-05-17 19:31:43.000000000 -0400 +diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c +index 09329a1..11da8d7 100644 +--- a/drivers/ata/libata-eh.c ++++ b/drivers/ata/libata-eh.c @@ -2478,6 +2478,8 @@ void ata_eh_report(struct ata_port *ap) { struct ata_link *link; @@ -23282,7 +23725,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/libata-eh.c linux-2.6.38.7/drivers/ata/lib ata_for_each_link(link, ap, HOST_FIRST) ata_eh_link_report(link); } -@@ -3882,7 +3884,7 @@ void ata_do_eh(struct ata_port *ap, ata_ +@@ -3882,7 +3884,7 @@ void ata_do_eh(struct ata_port *ap, ata_prereset_fn_t prereset, */ void ata_std_error_handler(struct ata_port *ap) { @@ -23291,10 +23734,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/libata-eh.c linux-2.6.38.7/drivers/ata/lib ata_reset_fn_t hardreset = ops->hardreset; /* ignore built-in hardreset if SCR access is not available */ -diff -urNp linux-2.6.38.7/drivers/ata/libata-pmp.c linux-2.6.38.7/drivers/ata/libata-pmp.c ---- linux-2.6.38.7/drivers/ata/libata-pmp.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/libata-pmp.c 2011-04-28 19:34:15.000000000 -0400 -@@ -912,7 +912,7 @@ static int sata_pmp_handle_link_fail(str +diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c +index 3120596..95227f9 100644 +--- a/drivers/ata/libata-pmp.c ++++ b/drivers/ata/libata-pmp.c +@@ -912,7 +912,7 @@ static int sata_pmp_handle_link_fail(struct ata_link *link, int *link_tries) */ static int sata_pmp_eh_recover(struct ata_port *ap) { @@ -23303,10 +23747,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/libata-pmp.c linux-2.6.38.7/drivers/ata/li int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; struct ata_link *pmp_link = &ap->link; struct ata_device *pmp_dev = pmp_link->device; -diff -urNp linux-2.6.38.7/drivers/ata/pata_acpi.c linux-2.6.38.7/drivers/ata/pata_acpi.c ---- linux-2.6.38.7/drivers/ata/pata_acpi.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_acpi.c 2011-04-28 19:34:15.000000000 -0400 -@@ -216,7 +216,7 @@ static struct scsi_host_template pacpi_s +diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c +index c8d4703..e9e7d35 100644 +--- a/drivers/ata/pata_acpi.c ++++ b/drivers/ata/pata_acpi.c +@@ -216,7 +216,7 @@ static struct scsi_host_template pacpi_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -23315,10 +23760,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_acpi.c linux-2.6.38.7/drivers/ata/pat .inherits = &ata_bmdma_port_ops, .qc_issue = pacpi_qc_issue, .cable_detect = pacpi_cable_detect, -diff -urNp linux-2.6.38.7/drivers/ata/pata_ali.c linux-2.6.38.7/drivers/ata/pata_ali.c ---- linux-2.6.38.7/drivers/ata/pata_ali.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_ali.c 2011-04-28 19:34:15.000000000 -0400 -@@ -363,7 +363,7 @@ static struct scsi_host_template ali_sht +diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c +index 794ec6e..77b1883 100644 +--- a/drivers/ata/pata_ali.c ++++ b/drivers/ata/pata_ali.c +@@ -363,7 +363,7 @@ static struct scsi_host_template ali_sht = { * Port operations for PIO only ALi */ @@ -23327,7 +23773,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_ali.c linux-2.6.38.7/drivers/ata/pata .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = ali_set_piomode, -@@ -380,7 +380,7 @@ static const struct ata_port_operations +@@ -380,7 +380,7 @@ static const struct ata_port_operations ali_dma_base_ops = { * Port operations for DMA capable ALi without cable * detect */ @@ -23336,7 +23782,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_ali.c linux-2.6.38.7/drivers/ata/pata .inherits = &ali_dma_base_ops, .cable_detect = ata_cable_40wire, .mode_filter = ali_20_filter, -@@ -391,7 +391,7 @@ static struct ata_port_operations ali_20 +@@ -391,7 +391,7 @@ static struct ata_port_operations ali_20_port_ops = { /* * Port operations for DMA capable ALi with cable detect */ @@ -23345,7 +23791,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_ali.c linux-2.6.38.7/drivers/ata/pata .inherits = &ali_dma_base_ops, .check_atapi_dma = ali_check_atapi_dma, .cable_detect = ali_c2_cable_detect, -@@ -402,7 +402,7 @@ static struct ata_port_operations ali_c2 +@@ -402,7 +402,7 @@ static struct ata_port_operations ali_c2_port_ops = { /* * Port operations for DMA capable ALi with cable detect */ @@ -23354,7 +23800,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_ali.c linux-2.6.38.7/drivers/ata/pata .inherits = &ali_dma_base_ops, .check_atapi_dma = ali_check_atapi_dma, .cable_detect = ali_c2_cable_detect, -@@ -412,7 +412,7 @@ static struct ata_port_operations ali_c4 +@@ -412,7 +412,7 @@ static struct ata_port_operations ali_c4_port_ops = { /* * Port operations for DMA capable ALi with cable detect and LBA48 */ @@ -23363,10 +23809,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_ali.c linux-2.6.38.7/drivers/ata/pata .inherits = &ali_dma_base_ops, .check_atapi_dma = ali_check_atapi_dma, .dev_config = ali_warn_atapi_dma, -diff -urNp linux-2.6.38.7/drivers/ata/pata_amd.c linux-2.6.38.7/drivers/ata/pata_amd.c ---- linux-2.6.38.7/drivers/ata/pata_amd.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_amd.c 2011-04-28 19:34:15.000000000 -0400 -@@ -397,28 +397,28 @@ static const struct ata_port_operations +diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c +index 620a07c..06d4e17 100644 +--- a/drivers/ata/pata_amd.c ++++ b/drivers/ata/pata_amd.c +@@ -397,28 +397,28 @@ static const struct ata_port_operations amd_base_port_ops = { .prereset = amd_pre_reset, }; @@ -23399,7 +23846,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_amd.c linux-2.6.38.7/drivers/ata/pata .inherits = &amd_base_port_ops, .cable_detect = amd_cable_detect, .set_piomode = amd133_set_piomode, -@@ -433,13 +433,13 @@ static const struct ata_port_operations +@@ -433,13 +433,13 @@ static const struct ata_port_operations nv_base_port_ops = { .host_stop = nv_host_stop, }; @@ -23415,10 +23862,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_amd.c linux-2.6.38.7/drivers/ata/pata .inherits = &nv_base_port_ops, .set_piomode = nv133_set_piomode, .set_dmamode = nv133_set_dmamode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_artop.c linux-2.6.38.7/drivers/ata/pata_artop.c ---- linux-2.6.38.7/drivers/ata/pata_artop.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_artop.c 2011-04-28 19:34:15.000000000 -0400 -@@ -312,7 +312,7 @@ static struct scsi_host_template artop_s +diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c +index 2215632..6a02a6f 100644 +--- a/drivers/ata/pata_artop.c ++++ b/drivers/ata/pata_artop.c +@@ -312,7 +312,7 @@ static struct scsi_host_template artop_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -23427,7 +23875,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_artop.c linux-2.6.38.7/drivers/ata/pa .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = artop6210_set_piomode, -@@ -321,7 +321,7 @@ static struct ata_port_operations artop6 +@@ -321,7 +321,7 @@ static struct ata_port_operations artop6210_ops = { .qc_defer = artop6210_qc_defer, }; @@ -23436,10 +23884,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_artop.c linux-2.6.38.7/drivers/ata/pa .inherits = &ata_bmdma_port_ops, .cable_detect = artop6260_cable_detect, .set_piomode = artop6260_set_piomode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_at32.c linux-2.6.38.7/drivers/ata/pata_at32.c ---- linux-2.6.38.7/drivers/ata/pata_at32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_at32.c 2011-04-28 19:34:15.000000000 -0400 -@@ -173,7 +173,7 @@ static struct scsi_host_template at32_sh +diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c +index 66ce6a5..2e36304 100644 +--- a/drivers/ata/pata_at32.c ++++ b/drivers/ata/pata_at32.c +@@ -173,7 +173,7 @@ static struct scsi_host_template at32_sht = { ATA_PIO_SHT(DRV_NAME), }; @@ -23448,10 +23897,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_at32.c linux-2.6.38.7/drivers/ata/pat .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = pata_at32_set_piomode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_at91.c linux-2.6.38.7/drivers/ata/pata_at91.c ---- linux-2.6.38.7/drivers/ata/pata_at91.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_at91.c 2011-04-28 19:34:15.000000000 -0400 -@@ -196,7 +196,7 @@ static struct scsi_host_template pata_at +diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c +index 0da0dcc..04d7d77 100644 +--- a/drivers/ata/pata_at91.c ++++ b/drivers/ata/pata_at91.c +@@ -196,7 +196,7 @@ static struct scsi_host_template pata_at91_sht = { ATA_PIO_SHT(DRV_NAME), }; @@ -23460,10 +23910,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_at91.c linux-2.6.38.7/drivers/ata/pat .inherits = &ata_sff_port_ops, .sff_data_xfer = pata_at91_data_xfer_noirq, -diff -urNp linux-2.6.38.7/drivers/ata/pata_atiixp.c linux-2.6.38.7/drivers/ata/pata_atiixp.c ---- linux-2.6.38.7/drivers/ata/pata_atiixp.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_atiixp.c 2011-04-28 19:34:15.000000000 -0400 -@@ -214,7 +214,7 @@ static struct scsi_host_template atiixp_ +diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c +index 4375561..cfe4ef5 100644 +--- a/drivers/ata/pata_atiixp.c ++++ b/drivers/ata/pata_atiixp.c +@@ -214,7 +214,7 @@ static struct scsi_host_template atiixp_sht = { .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -23472,10 +23923,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_atiixp.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .qc_prep = ata_bmdma_dumb_qc_prep, -diff -urNp linux-2.6.38.7/drivers/ata/pata_atp867x.c linux-2.6.38.7/drivers/ata/pata_atp867x.c ---- linux-2.6.38.7/drivers/ata/pata_atp867x.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_atp867x.c 2011-04-28 19:34:15.000000000 -0400 -@@ -275,7 +275,7 @@ static struct scsi_host_template atp867x +diff --git a/drivers/ata/pata_atp867x.c b/drivers/ata/pata_atp867x.c +index 9529593..5fcc356 100644 +--- a/drivers/ata/pata_atp867x.c ++++ b/drivers/ata/pata_atp867x.c +@@ -275,7 +275,7 @@ static struct scsi_host_template atp867x_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -23484,10 +23936,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_atp867x.c linux-2.6.38.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .cable_detect = atp867x_cable_detect, .set_piomode = atp867x_set_piomode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_bf54x.c linux-2.6.38.7/drivers/ata/pata_bf54x.c ---- linux-2.6.38.7/drivers/ata/pata_bf54x.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_bf54x.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1420,7 +1420,7 @@ static struct scsi_host_template bfin_sh +diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c +index 7aed5c7..7d8c660 100644 +--- a/drivers/ata/pata_bf54x.c ++++ b/drivers/ata/pata_bf54x.c +@@ -1420,7 +1420,7 @@ static struct scsi_host_template bfin_sht = { .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -23496,10 +23949,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_bf54x.c linux-2.6.38.7/drivers/ata/pa .inherits = &ata_bmdma_port_ops, .set_piomode = bfin_set_piomode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_cmd640.c linux-2.6.38.7/drivers/ata/pata_cmd640.c ---- linux-2.6.38.7/drivers/ata/pata_cmd640.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_cmd640.c 2011-04-28 19:34:15.000000000 -0400 -@@ -176,7 +176,7 @@ static struct scsi_host_template cmd640_ +diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c +index 549d28d..bc2bb40 100644 +--- a/drivers/ata/pata_cmd640.c ++++ b/drivers/ata/pata_cmd640.c +@@ -176,7 +176,7 @@ static struct scsi_host_template cmd640_sht = { ATA_PIO_SHT(DRV_NAME), }; @@ -23508,10 +23962,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_cmd640.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_sff_port_ops, /* In theory xfer_noirq is not needed once we kill the prefetcher */ .sff_data_xfer = ata_sff_data_xfer_noirq, -diff -urNp linux-2.6.38.7/drivers/ata/pata_cmd64x.c linux-2.6.38.7/drivers/ata/pata_cmd64x.c ---- linux-2.6.38.7/drivers/ata/pata_cmd64x.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_cmd64x.c 2011-04-28 19:34:15.000000000 -0400 -@@ -268,18 +268,18 @@ static const struct ata_port_operations +diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c +index 635a759..02aa9e4 100644 +--- a/drivers/ata/pata_cmd64x.c ++++ b/drivers/ata/pata_cmd64x.c +@@ -271,18 +271,18 @@ static const struct ata_port_operations cmd64x_base_ops = { .set_dmamode = cmd64x_set_dmamode, }; @@ -23533,10 +23988,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_cmd64x.c linux-2.6.38.7/drivers/ata/p .inherits = &cmd64x_base_ops, .bmdma_stop = cmd648_bmdma_stop, .cable_detect = cmd648_cable_detect, -diff -urNp linux-2.6.38.7/drivers/ata/pata_cs5520.c linux-2.6.38.7/drivers/ata/pata_cs5520.c ---- linux-2.6.38.7/drivers/ata/pata_cs5520.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_cs5520.c 2011-04-28 19:34:15.000000000 -0400 -@@ -108,7 +108,7 @@ static struct scsi_host_template cs5520_ +diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c +index 030952f..2984d7a 100644 +--- a/drivers/ata/pata_cs5520.c ++++ b/drivers/ata/pata_cs5520.c +@@ -108,7 +108,7 @@ static struct scsi_host_template cs5520_sht = { .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -23545,10 +24001,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_cs5520.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .qc_prep = ata_bmdma_dumb_qc_prep, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.38.7/drivers/ata/pata_cs5530.c linux-2.6.38.7/drivers/ata/pata_cs5530.c ---- linux-2.6.38.7/drivers/ata/pata_cs5530.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_cs5530.c 2011-04-28 19:34:15.000000000 -0400 -@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ +diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c +index f792330..d4a893a 100644 +--- a/drivers/ata/pata_cs5530.c ++++ b/drivers/ata/pata_cs5530.c +@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_sht = { .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -23557,10 +24014,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_cs5530.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .qc_prep = ata_bmdma_dumb_qc_prep, -diff -urNp linux-2.6.38.7/drivers/ata/pata_cs5535.c linux-2.6.38.7/drivers/ata/pata_cs5535.c ---- linux-2.6.38.7/drivers/ata/pata_cs5535.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_cs5535.c 2011-04-28 19:34:15.000000000 -0400 -@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ +diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c +index 03a9318..003dadf 100644 +--- a/drivers/ata/pata_cs5535.c ++++ b/drivers/ata/pata_cs5535.c +@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -23569,10 +24027,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_cs5535.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .cable_detect = cs5535_cable_detect, .set_piomode = cs5535_set_piomode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_cs5536.c linux-2.6.38.7/drivers/ata/pata_cs5536.c ---- linux-2.6.38.7/drivers/ata/pata_cs5536.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_cs5536.c 2011-04-28 19:34:15.000000000 -0400 -@@ -233,7 +233,7 @@ static struct scsi_host_template cs5536_ +diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c +index 628c8fa..a6f1164 100644 +--- a/drivers/ata/pata_cs5536.c ++++ b/drivers/ata/pata_cs5536.c +@@ -233,7 +233,7 @@ static struct scsi_host_template cs5536_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -23581,10 +24040,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_cs5536.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_bmdma32_port_ops, .cable_detect = cs5536_cable_detect, .set_piomode = cs5536_set_piomode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_cypress.c linux-2.6.38.7/drivers/ata/pata_cypress.c ---- linux-2.6.38.7/drivers/ata/pata_cypress.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_cypress.c 2011-04-28 19:34:15.000000000 -0400 -@@ -115,7 +115,7 @@ static struct scsi_host_template cy82c69 +diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c +index 6d915b0..5f95c77 100644 +--- a/drivers/ata/pata_cypress.c ++++ b/drivers/ata/pata_cypress.c +@@ -115,7 +115,7 @@ static struct scsi_host_template cy82c693_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -23593,10 +24053,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_cypress.c linux-2.6.38.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = cy82c693_set_piomode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_efar.c linux-2.6.38.7/drivers/ata/pata_efar.c ---- linux-2.6.38.7/drivers/ata/pata_efar.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_efar.c 2011-04-28 19:34:15.000000000 -0400 -@@ -238,7 +238,7 @@ static struct scsi_host_template efar_sh +diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c +index a088347..505e510 100644 +--- a/drivers/ata/pata_efar.c ++++ b/drivers/ata/pata_efar.c +@@ -238,7 +238,7 @@ static struct scsi_host_template efar_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -23605,10 +24066,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_efar.c linux-2.6.38.7/drivers/ata/pat .inherits = &ata_bmdma_port_ops, .cable_detect = efar_cable_detect, .set_piomode = efar_set_piomode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_hpt366.c linux-2.6.38.7/drivers/ata/pata_hpt366.c ---- linux-2.6.38.7/drivers/ata/pata_hpt366.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_hpt366.c 2011-04-28 19:34:15.000000000 -0400 -@@ -275,7 +275,7 @@ static struct scsi_host_template hpt36x_ +diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c +index 538ec38..a3c6d66 100644 +--- a/drivers/ata/pata_hpt366.c ++++ b/drivers/ata/pata_hpt366.c +@@ -275,7 +275,7 @@ static struct scsi_host_template hpt36x_sht = { * Configuration for HPT366/68 */ @@ -23617,10 +24079,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_hpt366.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .cable_detect = hpt36x_cable_detect, .mode_filter = hpt366_filter, -diff -urNp linux-2.6.38.7/drivers/ata/pata_hpt37x.c linux-2.6.38.7/drivers/ata/pata_hpt37x.c ---- linux-2.6.38.7/drivers/ata/pata_hpt37x.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_hpt37x.c 2011-04-28 19:34:15.000000000 -0400 -@@ -587,7 +587,7 @@ static struct scsi_host_template hpt37x_ +diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c +index 4c5b518..5fae9d5 100644 +--- a/drivers/ata/pata_hpt37x.c ++++ b/drivers/ata/pata_hpt37x.c +@@ -587,7 +587,7 @@ static struct scsi_host_template hpt37x_sht = { * Configuration for HPT370 */ @@ -23629,7 +24092,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_hpt37x.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .bmdma_stop = hpt370_bmdma_stop, -@@ -603,7 +603,7 @@ static struct ata_port_operations hpt370 +@@ -603,7 +603,7 @@ static struct ata_port_operations hpt370_port_ops = { * Configuration for HPT370A. Close to 370 but less filters */ @@ -23638,7 +24101,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_hpt37x.c linux-2.6.38.7/drivers/ata/p .inherits = &hpt370_port_ops, .mode_filter = hpt370a_filter, }; -@@ -613,7 +613,7 @@ static struct ata_port_operations hpt370 +@@ -613,7 +613,7 @@ static struct ata_port_operations hpt370a_port_ops = { * mode setting functionality. */ @@ -23647,7 +24110,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_hpt37x.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .bmdma_stop = hpt37x_bmdma_stop, -@@ -629,7 +629,7 @@ static struct ata_port_operations hpt302 +@@ -629,7 +629,7 @@ static struct ata_port_operations hpt302_port_ops = { * but we have a mode filter. */ @@ -23656,7 +24119,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_hpt37x.c linux-2.6.38.7/drivers/ata/p .inherits = &hpt302_port_ops, .mode_filter = hpt372_filter, }; -@@ -639,7 +639,7 @@ static struct ata_port_operations hpt372 +@@ -639,7 +639,7 @@ static struct ata_port_operations hpt372_port_ops = { * but we have a different cable detection procedure for function 1. */ @@ -23665,10 +24128,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_hpt37x.c linux-2.6.38.7/drivers/ata/p .inherits = &hpt372_port_ops, .cable_detect = hpt374_fn1_cable_detect, }; -diff -urNp linux-2.6.38.7/drivers/ata/pata_hpt3x2n.c linux-2.6.38.7/drivers/ata/pata_hpt3x2n.c ---- linux-2.6.38.7/drivers/ata/pata_hpt3x2n.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_hpt3x2n.c 2011-04-28 19:34:15.000000000 -0400 -@@ -348,7 +348,7 @@ static struct scsi_host_template hpt3x2n +diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c +index eca68ca..5dcd3a4 100644 +--- a/drivers/ata/pata_hpt3x2n.c ++++ b/drivers/ata/pata_hpt3x2n.c +@@ -348,7 +348,7 @@ static struct scsi_host_template hpt3x2n_sht = { * Configuration for HPT302N/371N. */ @@ -23677,7 +24141,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_hpt3x2n.c linux-2.6.38.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .bmdma_stop = hpt3x2n_bmdma_stop, -@@ -366,7 +366,7 @@ static struct ata_port_operations hpt3xx +@@ -366,7 +366,7 @@ static struct ata_port_operations hpt3xxn_port_ops = { * Configuration for HPT372N. Same as 302N/371N but we have a mode filter. */ @@ -23686,10 +24150,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_hpt3x2n.c linux-2.6.38.7/drivers/ata/ .inherits = &hpt3xxn_port_ops, .mode_filter = &hpt372n_filter, }; -diff -urNp linux-2.6.38.7/drivers/ata/pata_hpt3x3.c linux-2.6.38.7/drivers/ata/pata_hpt3x3.c ---- linux-2.6.38.7/drivers/ata/pata_hpt3x3.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_hpt3x3.c 2011-04-28 19:34:15.000000000 -0400 -@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ +diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c +index b63d5e2..d8f14d6 100644 +--- a/drivers/ata/pata_hpt3x3.c ++++ b/drivers/ata/pata_hpt3x3.c +@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -23698,10 +24163,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_hpt3x3.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = hpt3x3_set_piomode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_icside.c linux-2.6.38.7/drivers/ata/pata_icside.c ---- linux-2.6.38.7/drivers/ata/pata_icside.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_icside.c 2011-04-28 19:34:15.000000000 -0400 -@@ -320,7 +320,7 @@ static void pata_icside_postreset(struct +diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c +index 9f2889f..aeb00ba 100644 +--- a/drivers/ata/pata_icside.c ++++ b/drivers/ata/pata_icside.c +@@ -320,7 +320,7 @@ static void pata_icside_postreset(struct ata_link *link, unsigned int *classes) } } @@ -23710,10 +24176,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_icside.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, /* no need to build any PRD tables for DMA */ .qc_prep = ata_noop_qc_prep, -diff -urNp linux-2.6.38.7/drivers/ata/pata_isapnp.c linux-2.6.38.7/drivers/ata/pata_isapnp.c ---- linux-2.6.38.7/drivers/ata/pata_isapnp.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_isapnp.c 2011-04-28 19:34:15.000000000 -0400 -@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ +diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c +index 4bceb88..457dfb6 100644 +--- a/drivers/ata/pata_isapnp.c ++++ b/drivers/ata/pata_isapnp.c +@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_sht = { ATA_PIO_SHT(DRV_NAME), }; @@ -23728,10 +24195,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_isapnp.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, /* No altstatus so we don't want to use the lost interrupt poll */ -diff -urNp linux-2.6.38.7/drivers/ata/pata_it8213.c linux-2.6.38.7/drivers/ata/pata_it8213.c ---- linux-2.6.38.7/drivers/ata/pata_it8213.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_it8213.c 2011-04-28 19:34:15.000000000 -0400 -@@ -233,7 +233,7 @@ static struct scsi_host_template it8213_ +diff --git a/drivers/ata/pata_it8213.c b/drivers/ata/pata_it8213.c +index 4d142a2..9c78bee 100644 +--- a/drivers/ata/pata_it8213.c ++++ b/drivers/ata/pata_it8213.c +@@ -233,7 +233,7 @@ static struct scsi_host_template it8213_sht = { }; @@ -23740,10 +24208,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_it8213.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .cable_detect = it8213_cable_detect, .set_piomode = it8213_set_piomode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_it821x.c linux-2.6.38.7/drivers/ata/pata_it821x.c ---- linux-2.6.38.7/drivers/ata/pata_it821x.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_it821x.c 2011-04-28 19:34:15.000000000 -0400 -@@ -801,7 +801,7 @@ static struct scsi_host_template it821x_ +diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c +index aa0e0c5..90bdcf7 100644 +--- a/drivers/ata/pata_it821x.c ++++ b/drivers/ata/pata_it821x.c +@@ -801,7 +801,7 @@ static struct scsi_host_template it821x_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -23752,7 +24221,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_it821x.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .check_atapi_dma= it821x_check_atapi_dma, -@@ -815,7 +815,7 @@ static struct ata_port_operations it821x +@@ -815,7 +815,7 @@ static struct ata_port_operations it821x_smart_port_ops = { .port_start = it821x_port_start, }; @@ -23761,7 +24230,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_it821x.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .check_atapi_dma= it821x_check_atapi_dma, -@@ -831,7 +831,7 @@ static struct ata_port_operations it821x +@@ -831,7 +831,7 @@ static struct ata_port_operations it821x_passthru_port_ops = { .port_start = it821x_port_start, }; @@ -23770,10 +24239,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_it821x.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .check_atapi_dma= it821x_check_atapi_dma, -diff -urNp linux-2.6.38.7/drivers/ata/pata_ixp4xx_cf.c linux-2.6.38.7/drivers/ata/pata_ixp4xx_cf.c ---- linux-2.6.38.7/drivers/ata/pata_ixp4xx_cf.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_ixp4xx_cf.c 2011-04-28 19:34:15.000000000 -0400 -@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ +diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c +index ba54b08..4b952b7 100644 +--- a/drivers/ata/pata_ixp4xx_cf.c ++++ b/drivers/ata/pata_ixp4xx_cf.c +@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_sht = { ATA_PIO_SHT(DRV_NAME), }; @@ -23782,10 +24252,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_ixp4xx_cf.c linux-2.6.38.7/drivers/at .inherits = &ata_sff_port_ops, .sff_data_xfer = ixp4xx_mmio_data_xfer, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.38.7/drivers/ata/pata_jmicron.c linux-2.6.38.7/drivers/ata/pata_jmicron.c ---- linux-2.6.38.7/drivers/ata/pata_jmicron.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_jmicron.c 2011-04-28 19:34:15.000000000 -0400 -@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron +diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c +index cb3babb..6770bd8 100644 +--- a/drivers/ata/pata_jmicron.c ++++ b/drivers/ata/pata_jmicron.c +@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -23794,9 +24265,10 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_jmicron.c linux-2.6.38.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .prereset = jmicron_pre_reset, }; -diff -urNp linux-2.6.38.7/drivers/ata/pata_legacy.c linux-2.6.38.7/drivers/ata/pata_legacy.c ---- linux-2.6.38.7/drivers/ata/pata_legacy.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_legacy.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c +index 6bd9425..418bf11 100644 +--- a/drivers/ata/pata_legacy.c ++++ b/drivers/ata/pata_legacy.c @@ -116,7 +116,7 @@ struct legacy_probe { struct legacy_controller { @@ -23806,7 +24278,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_legacy.c linux-2.6.38.7/drivers/ata/p unsigned int pio_mask; unsigned int flags; unsigned int pflags; -@@ -239,12 +239,12 @@ static const struct ata_port_operations +@@ -239,12 +239,12 @@ static const struct ata_port_operations legacy_base_port_ops = { * pio_mask as well. */ @@ -23821,7 +24293,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_legacy.c linux-2.6.38.7/drivers/ata/p .inherits = &legacy_base_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, .set_mode = legacy_set_mode, -@@ -340,7 +340,7 @@ static unsigned int pdc_data_xfer_vlb(st +@@ -340,7 +340,7 @@ static unsigned int pdc_data_xfer_vlb(struct ata_device *dev, return buflen; } @@ -23830,7 +24302,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_legacy.c linux-2.6.38.7/drivers/ata/p .inherits = &legacy_base_port_ops, .set_piomode = pdc20230_set_piomode, .sff_data_xfer = pdc_data_xfer_vlb, -@@ -373,7 +373,7 @@ static void ht6560a_set_piomode(struct a +@@ -373,7 +373,7 @@ static void ht6560a_set_piomode(struct ata_port *ap, struct ata_device *adev) ioread8(ap->ioaddr.status_addr); } @@ -23839,7 +24311,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_legacy.c linux-2.6.38.7/drivers/ata/p .inherits = &legacy_base_port_ops, .set_piomode = ht6560a_set_piomode, }; -@@ -416,7 +416,7 @@ static void ht6560b_set_piomode(struct a +@@ -416,7 +416,7 @@ static void ht6560b_set_piomode(struct ata_port *ap, struct ata_device *adev) ioread8(ap->ioaddr.status_addr); } @@ -23848,7 +24320,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_legacy.c linux-2.6.38.7/drivers/ata/p .inherits = &legacy_base_port_ops, .set_piomode = ht6560b_set_piomode, }; -@@ -515,7 +515,7 @@ static void opti82c611a_set_piomode(stru +@@ -515,7 +515,7 @@ static void opti82c611a_set_piomode(struct ata_port *ap, } @@ -23857,7 +24329,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_legacy.c linux-2.6.38.7/drivers/ata/p .inherits = &legacy_base_port_ops, .set_piomode = opti82c611a_set_piomode, }; -@@ -625,7 +625,7 @@ static unsigned int opti82c46x_qc_issue( +@@ -625,7 +625,7 @@ static unsigned int opti82c46x_qc_issue(struct ata_queued_cmd *qc) return ata_sff_qc_issue(qc); } @@ -23866,7 +24338,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_legacy.c linux-2.6.38.7/drivers/ata/p .inherits = &legacy_base_port_ops, .set_piomode = opti82c46x_set_piomode, .qc_issue = opti82c46x_qc_issue, -@@ -787,20 +787,20 @@ static int qdi_port(struct platform_devi +@@ -787,20 +787,20 @@ static int qdi_port(struct platform_device *dev, return 0; } @@ -23890,7 +24362,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_legacy.c linux-2.6.38.7/drivers/ata/p .inherits = &legacy_base_port_ops, .set_piomode = qdi6580dp_set_piomode, .qc_issue = qdi_qc_issue, -@@ -872,7 +872,7 @@ static int winbond_port(struct platform_ +@@ -872,7 +872,7 @@ static int winbond_port(struct platform_device *dev, return 0; } @@ -23899,7 +24371,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_legacy.c linux-2.6.38.7/drivers/ata/p .inherits = &legacy_base_port_ops, .set_piomode = winbond_set_piomode, .sff_data_xfer = vlb32_data_xfer, -@@ -995,7 +995,7 @@ static __init int legacy_init_one(struct +@@ -995,7 +995,7 @@ static __init int legacy_init_one(struct legacy_probe *probe) int pio_modes = controller->pio_mask; unsigned long io = probe->port; u32 mask = (1 << probe->slot); @@ -23908,10 +24380,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_legacy.c linux-2.6.38.7/drivers/ata/p struct legacy_data *ld = &legacy_data[probe->slot]; struct ata_host *host = NULL; struct ata_port *ap; -diff -urNp linux-2.6.38.7/drivers/ata/pata_macio.c linux-2.6.38.7/drivers/ata/pata_macio.c ---- linux-2.6.38.7/drivers/ata/pata_macio.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_macio.c 2011-04-28 19:34:15.000000000 -0400 -@@ -918,9 +918,8 @@ static struct scsi_host_template pata_ma +diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c +index 75b49d0..9fa605b 100644 +--- a/drivers/ata/pata_macio.c ++++ b/drivers/ata/pata_macio.c +@@ -918,9 +918,8 @@ static struct scsi_host_template pata_macio_sht = { .slave_configure = pata_macio_slave_config, }; @@ -23922,10 +24395,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_macio.c linux-2.6.38.7/drivers/ata/pa .freeze = pata_macio_freeze, .set_piomode = pata_macio_set_timings, .set_dmamode = pata_macio_set_timings, -diff -urNp linux-2.6.38.7/drivers/ata/pata_marvell.c linux-2.6.38.7/drivers/ata/pata_marvell.c ---- linux-2.6.38.7/drivers/ata/pata_marvell.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_marvell.c 2011-04-28 19:34:15.000000000 -0400 -@@ -100,7 +100,7 @@ static struct scsi_host_template marvell +diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c +index dd38083..b73db04 100644 +--- a/drivers/ata/pata_marvell.c ++++ b/drivers/ata/pata_marvell.c +@@ -100,7 +100,7 @@ static struct scsi_host_template marvell_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -23934,10 +24408,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_marvell.c linux-2.6.38.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .cable_detect = marvell_cable_detect, .prereset = marvell_pre_reset, -diff -urNp linux-2.6.38.7/drivers/ata/pata_mpc52xx.c linux-2.6.38.7/drivers/ata/pata_mpc52xx.c ---- linux-2.6.38.7/drivers/ata/pata_mpc52xx.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_mpc52xx.c 2011-04-28 19:34:15.000000000 -0400 -@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx +diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c +index d7d8026..caf4a3c 100644 +--- a/drivers/ata/pata_mpc52xx.c ++++ b/drivers/ata/pata_mpc52xx.c +@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx_ata_sht = { ATA_PIO_SHT(DRV_NAME), }; @@ -23946,10 +24421,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_mpc52xx.c linux-2.6.38.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .sff_dev_select = mpc52xx_ata_dev_select, .set_piomode = mpc52xx_ata_set_piomode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_mpiix.c linux-2.6.38.7/drivers/ata/pata_mpiix.c ---- linux-2.6.38.7/drivers/ata/pata_mpiix.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_mpiix.c 2011-04-28 19:34:15.000000000 -0400 -@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s +diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c +index b21f002..0a27e7f 100644 +--- a/drivers/ata/pata_mpiix.c ++++ b/drivers/ata/pata_mpiix.c +@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_sht = { ATA_PIO_SHT(DRV_NAME), }; @@ -23958,10 +24434,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_mpiix.c linux-2.6.38.7/drivers/ata/pa .inherits = &ata_sff_port_ops, .qc_issue = mpiix_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.38.7/drivers/ata/pata_netcell.c linux-2.6.38.7/drivers/ata/pata_netcell.c ---- linux-2.6.38.7/drivers/ata/pata_netcell.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_netcell.c 2011-04-28 19:34:15.000000000 -0400 -@@ -34,7 +34,7 @@ static struct scsi_host_template netcell +diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c +index 3eb921c..c167317 100644 +--- a/drivers/ata/pata_netcell.c ++++ b/drivers/ata/pata_netcell.c +@@ -34,7 +34,7 @@ static struct scsi_host_template netcell_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -23970,10 +24447,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_netcell.c linux-2.6.38.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_80wire, .read_id = netcell_read_id, -diff -urNp linux-2.6.38.7/drivers/ata/pata_ninja32.c linux-2.6.38.7/drivers/ata/pata_ninja32.c ---- linux-2.6.38.7/drivers/ata/pata_ninja32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_ninja32.c 2011-04-28 19:34:15.000000000 -0400 -@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 +diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c +index cc50bd0..123fe21 100644 +--- a/drivers/ata/pata_ninja32.c ++++ b/drivers/ata/pata_ninja32.c +@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -23982,10 +24460,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_ninja32.c linux-2.6.38.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .sff_dev_select = ninja32_dev_select, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.38.7/drivers/ata/pata_ns87410.c linux-2.6.38.7/drivers/ata/pata_ns87410.c ---- linux-2.6.38.7/drivers/ata/pata_ns87410.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_ns87410.c 2011-04-28 19:34:15.000000000 -0400 -@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 +diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c +index 2110863..6144b43 100644 +--- a/drivers/ata/pata_ns87410.c ++++ b/drivers/ata/pata_ns87410.c +@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410_sht = { ATA_PIO_SHT(DRV_NAME), }; @@ -23994,10 +24473,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_ns87410.c linux-2.6.38.7/drivers/ata/ .inherits = &ata_sff_port_ops, .qc_issue = ns87410_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.38.7/drivers/ata/pata_ns87415.c linux-2.6.38.7/drivers/ata/pata_ns87415.c ---- linux-2.6.38.7/drivers/ata/pata_ns87415.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_ns87415.c 2011-04-28 19:34:15.000000000 -0400 -@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at +diff --git a/drivers/ata/pata_ns87415.c b/drivers/ata/pata_ns87415.c +index 605f198..f5fee2f 100644 +--- a/drivers/ata/pata_ns87415.c ++++ b/drivers/ata/pata_ns87415.c +@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct ata_port *ap) } #endif /* 87560 SuperIO Support */ @@ -24006,7 +24486,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_ns87415.c linux-2.6.38.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .check_atapi_dma = ns87415_check_atapi_dma, -@@ -313,7 +313,7 @@ static struct ata_port_operations ns8741 +@@ -313,7 +313,7 @@ static struct ata_port_operations ns87415_pata_ops = { }; #if defined(CONFIG_SUPERIO) @@ -24015,10 +24495,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_ns87415.c linux-2.6.38.7/drivers/ata/ .inherits = &ns87415_pata_ops, .sff_tf_read = ns87560_tf_read, .sff_check_status = ns87560_check_status, -diff -urNp linux-2.6.38.7/drivers/ata/pata_octeon_cf.c linux-2.6.38.7/drivers/ata/pata_octeon_cf.c ---- linux-2.6.38.7/drivers/ata/pata_octeon_cf.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_octeon_cf.c 2011-04-28 19:34:15.000000000 -0400 -@@ -780,7 +780,7 @@ static unsigned int octeon_cf_qc_issue(s +diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c +index fa1b95a..d9d8389 100644 +--- a/drivers/ata/pata_octeon_cf.c ++++ b/drivers/ata/pata_octeon_cf.c +@@ -780,7 +780,7 @@ static unsigned int octeon_cf_qc_issue(struct ata_queued_cmd *qc) return 0; } @@ -24027,10 +24508,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_octeon_cf.c linux-2.6.38.7/drivers/at .inherits = &ata_sff_port_ops, .check_atapi_dma = octeon_cf_check_atapi_dma, .qc_prep = ata_noop_qc_prep, -diff -urNp linux-2.6.38.7/drivers/ata/pata_oldpiix.c linux-2.6.38.7/drivers/ata/pata_oldpiix.c ---- linux-2.6.38.7/drivers/ata/pata_oldpiix.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_oldpiix.c 2011-04-28 19:34:15.000000000 -0400 -@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix +diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c +index b811c16..e23051e 100644 +--- a/drivers/ata/pata_oldpiix.c ++++ b/drivers/ata/pata_oldpiix.c +@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -24039,10 +24521,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_oldpiix.c linux-2.6.38.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .qc_issue = oldpiix_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.38.7/drivers/ata/pata_opti.c linux-2.6.38.7/drivers/ata/pata_opti.c ---- linux-2.6.38.7/drivers/ata/pata_opti.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_opti.c 2011-04-28 19:34:15.000000000 -0400 -@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh +diff --git a/drivers/ata/pata_opti.c b/drivers/ata/pata_opti.c +index 00c5a02..b486a97 100644 +--- a/drivers/ata/pata_opti.c ++++ b/drivers/ata/pata_opti.c +@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sht = { ATA_PIO_SHT(DRV_NAME), }; @@ -24051,10 +24534,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_opti.c linux-2.6.38.7/drivers/ata/pat .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = opti_set_piomode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_optidma.c linux-2.6.38.7/drivers/ata/pata_optidma.c ---- linux-2.6.38.7/drivers/ata/pata_optidma.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_optidma.c 2011-04-28 19:34:15.000000000 -0400 -@@ -337,7 +337,7 @@ static struct scsi_host_template optidma +diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c +index 0852cd0..62f6a68 100644 +--- a/drivers/ata/pata_optidma.c ++++ b/drivers/ata/pata_optidma.c +@@ -337,7 +337,7 @@ static struct scsi_host_template optidma_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -24063,7 +24547,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_optidma.c linux-2.6.38.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = optidma_set_pio_mode, -@@ -346,7 +346,7 @@ static struct ata_port_operations optidm +@@ -346,7 +346,7 @@ static struct ata_port_operations optidma_port_ops = { .prereset = optidma_pre_reset, }; @@ -24072,10 +24556,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_optidma.c linux-2.6.38.7/drivers/ata/ .inherits = &optidma_port_ops, .set_piomode = optiplus_set_pio_mode, .set_dmamode = optiplus_set_dma_mode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_palmld.c linux-2.6.38.7/drivers/ata/pata_palmld.c ---- linux-2.6.38.7/drivers/ata/pata_palmld.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_palmld.c 2011-04-28 19:34:15.000000000 -0400 -@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ +diff --git a/drivers/ata/pata_palmld.c b/drivers/ata/pata_palmld.c +index 11fb4cc..1a14022 100644 +--- a/drivers/ata/pata_palmld.c ++++ b/drivers/ata/pata_palmld.c +@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_sht = { ATA_PIO_SHT(DRV_NAME), }; @@ -24084,10 +24569,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_palmld.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.38.7/drivers/ata/pata_pcmcia.c linux-2.6.38.7/drivers/ata/pata_pcmcia.c ---- linux-2.6.38.7/drivers/ata/pata_pcmcia.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_pcmcia.c 2011-04-28 19:34:15.000000000 -0400 -@@ -151,14 +151,14 @@ static struct scsi_host_template pcmcia_ +diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c +index 8062921..ef15855 100644 +--- a/drivers/ata/pata_pcmcia.c ++++ b/drivers/ata/pata_pcmcia.c +@@ -151,14 +151,14 @@ static struct scsi_host_template pcmcia_sht = { ATA_PIO_SHT(DRV_NAME), }; @@ -24104,7 +24590,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_pcmcia.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_data_xfer_8bit, .cable_detect = ata_cable_40wire, -@@ -205,7 +205,7 @@ static int pcmcia_init_one(struct pcmcia +@@ -205,7 +205,7 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) unsigned long io_base, ctl_base; void __iomem *io_addr, *ctl_addr; int n_ports = 1; @@ -24113,10 +24599,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_pcmcia.c linux-2.6.38.7/drivers/ata/p /* Set up attributes in order to probe card and get resources */ pdev->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO | -diff -urNp linux-2.6.38.7/drivers/ata/pata_pdc2027x.c linux-2.6.38.7/drivers/ata/pata_pdc2027x.c ---- linux-2.6.38.7/drivers/ata/pata_pdc2027x.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_pdc2027x.c 2011-04-28 19:34:15.000000000 -0400 -@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 +diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c +index b183511..c3ee285 100644 +--- a/drivers/ata/pata_pdc2027x.c ++++ b/drivers/ata/pata_pdc2027x.c +@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027x_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -24133,10 +24620,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_pdc2027x.c linux-2.6.38.7/drivers/ata .inherits = &pdc2027x_pata100_ops, .mode_filter = pdc2027x_mode_filter, .set_piomode = pdc2027x_set_piomode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_pdc202xx_old.c linux-2.6.38.7/drivers/ata/pata_pdc202xx_old.c ---- linux-2.6.38.7/drivers/ata/pata_pdc202xx_old.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_pdc202xx_old.c 2011-04-28 19:34:15.000000000 -0400 -@@ -295,7 +295,7 @@ static struct scsi_host_template pdc202x +diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c +index c2ed586..b3e73aa 100644 +--- a/drivers/ata/pata_pdc202xx_old.c ++++ b/drivers/ata/pata_pdc202xx_old.c +@@ -295,7 +295,7 @@ static struct scsi_host_template pdc202xx_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -24145,7 +24633,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_pdc202xx_old.c linux-2.6.38.7/drivers .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, -@@ -306,7 +306,7 @@ static struct ata_port_operations pdc202 +@@ -306,7 +306,7 @@ static struct ata_port_operations pdc2024x_port_ops = { .sff_irq_check = pdc202xx_irq_check, }; @@ -24154,10 +24642,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_pdc202xx_old.c linux-2.6.38.7/drivers .inherits = &pdc2024x_port_ops, .check_atapi_dma = pdc2026x_check_atapi_dma, -diff -urNp linux-2.6.38.7/drivers/ata/pata_piccolo.c linux-2.6.38.7/drivers/ata/pata_piccolo.c ---- linux-2.6.38.7/drivers/ata/pata_piccolo.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_piccolo.c 2011-04-28 19:34:15.000000000 -0400 -@@ -67,7 +67,7 @@ static struct scsi_host_template tosh_sh +diff --git a/drivers/ata/pata_piccolo.c b/drivers/ata/pata_piccolo.c +index cb01bf9..3eb315d 100644 +--- a/drivers/ata/pata_piccolo.c ++++ b/drivers/ata/pata_piccolo.c +@@ -67,7 +67,7 @@ static struct scsi_host_template tosh_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -24166,10 +24655,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_piccolo.c linux-2.6.38.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, .set_piomode = tosh_set_piomode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_platform.c linux-2.6.38.7/drivers/ata/pata_platform.c ---- linux-2.6.38.7/drivers/ata/pata_platform.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_platform.c 2011-04-28 19:34:15.000000000 -0400 -@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl +diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c +index 50400fa..8af063f 100644 +--- a/drivers/ata/pata_platform.c ++++ b/drivers/ata/pata_platform.c +@@ -48,7 +48,7 @@ static struct scsi_host_template pata_platform_sht = { ATA_PIO_SHT(DRV_NAME), }; @@ -24178,10 +24668,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_platform.c linux-2.6.38.7/drivers/ata .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, .cable_detect = ata_cable_unknown, -diff -urNp linux-2.6.38.7/drivers/ata/pata_pxa.c linux-2.6.38.7/drivers/ata/pata_pxa.c ---- linux-2.6.38.7/drivers/ata/pata_pxa.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_pxa.c 2011-04-28 19:34:15.000000000 -0400 -@@ -198,7 +198,7 @@ static struct scsi_host_template pxa_ata +diff --git a/drivers/ata/pata_pxa.c b/drivers/ata/pata_pxa.c +index 1898c6e..78af048 100644 +--- a/drivers/ata/pata_pxa.c ++++ b/drivers/ata/pata_pxa.c +@@ -198,7 +198,7 @@ static struct scsi_host_template pxa_ata_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -24190,10 +24681,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_pxa.c linux-2.6.38.7/drivers/ata/pata .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.38.7/drivers/ata/pata_qdi.c linux-2.6.38.7/drivers/ata/pata_qdi.c ---- linux-2.6.38.7/drivers/ata/pata_qdi.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_qdi.c 2011-04-28 19:34:15.000000000 -0400 -@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht +diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c +index 45879dc..165a9f9 100644 +--- a/drivers/ata/pata_qdi.c ++++ b/drivers/ata/pata_qdi.c +@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht = { ATA_PIO_SHT(DRV_NAME), }; @@ -24202,7 +24694,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_qdi.c linux-2.6.38.7/drivers/ata/pata .inherits = &ata_sff_port_ops, .qc_issue = qdi_qc_issue, .sff_data_xfer = qdi_data_xfer, -@@ -165,7 +165,7 @@ static struct ata_port_operations qdi650 +@@ -165,7 +165,7 @@ static struct ata_port_operations qdi6500_port_ops = { .set_piomode = qdi6500_set_piomode, }; @@ -24211,10 +24703,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_qdi.c linux-2.6.38.7/drivers/ata/pata .inherits = &qdi6500_port_ops, .set_piomode = qdi6580_set_piomode, }; -diff -urNp linux-2.6.38.7/drivers/ata/pata_radisys.c linux-2.6.38.7/drivers/ata/pata_radisys.c ---- linux-2.6.38.7/drivers/ata/pata_radisys.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_radisys.c 2011-04-28 19:34:15.000000000 -0400 -@@ -187,7 +187,7 @@ static struct scsi_host_template radisys +diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c +index 8574b31..53789fe 100644 +--- a/drivers/ata/pata_radisys.c ++++ b/drivers/ata/pata_radisys.c +@@ -187,7 +187,7 @@ static struct scsi_host_template radisys_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -24223,10 +24716,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_radisys.c linux-2.6.38.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .qc_issue = radisys_qc_issue, .cable_detect = ata_cable_unknown, -diff -urNp linux-2.6.38.7/drivers/ata/pata_rb532_cf.c linux-2.6.38.7/drivers/ata/pata_rb532_cf.c ---- linux-2.6.38.7/drivers/ata/pata_rb532_cf.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_rb532_cf.c 2011-04-28 19:34:15.000000000 -0400 -@@ -69,7 +69,7 @@ static irqreturn_t rb532_pata_irq_handle +diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c +index 0ffd631..7c6c78d 100644 +--- a/drivers/ata/pata_rb532_cf.c ++++ b/drivers/ata/pata_rb532_cf.c +@@ -69,7 +69,7 @@ static irqreturn_t rb532_pata_irq_handler(int irq, void *dev_instance) return IRQ_HANDLED; } @@ -24235,10 +24729,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_rb532_cf.c linux-2.6.38.7/drivers/ata .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer32, }; -diff -urNp linux-2.6.38.7/drivers/ata/pata_rdc.c linux-2.6.38.7/drivers/ata/pata_rdc.c ---- linux-2.6.38.7/drivers/ata/pata_rdc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_rdc.c 2011-04-28 19:34:15.000000000 -0400 -@@ -273,7 +273,7 @@ static void rdc_set_dmamode(struct ata_p +diff --git a/drivers/ata/pata_rdc.c b/drivers/ata/pata_rdc.c +index 5fbe9b1..1d0cdc0 100644 +--- a/drivers/ata/pata_rdc.c ++++ b/drivers/ata/pata_rdc.c +@@ -273,7 +273,7 @@ static void rdc_set_dmamode(struct ata_port *ap, struct ata_device *adev) pci_write_config_byte(dev, 0x48, udma_enable); } @@ -24247,10 +24742,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_rdc.c linux-2.6.38.7/drivers/ata/pata .inherits = &ata_bmdma32_port_ops, .cable_detect = rdc_pata_cable_detect, .set_piomode = rdc_set_piomode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_rz1000.c linux-2.6.38.7/drivers/ata/pata_rz1000.c ---- linux-2.6.38.7/drivers/ata/pata_rz1000.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_rz1000.c 2011-04-28 19:34:15.000000000 -0400 -@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ +diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c +index 4a454a8..b95ac1a 100644 +--- a/drivers/ata/pata_rz1000.c ++++ b/drivers/ata/pata_rz1000.c +@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_sht = { ATA_PIO_SHT(DRV_NAME), }; @@ -24259,10 +24755,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_rz1000.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_mode = rz1000_set_mode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_samsung_cf.c linux-2.6.38.7/drivers/ata/pata_samsung_cf.c ---- linux-2.6.38.7/drivers/ata/pata_samsung_cf.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_samsung_cf.c 2011-04-28 19:34:15.000000000 -0400 -@@ -399,7 +399,7 @@ static struct scsi_host_template pata_s3 +diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c +index 8a51d67..7356fad 100644 +--- a/drivers/ata/pata_samsung_cf.c ++++ b/drivers/ata/pata_samsung_cf.c +@@ -399,7 +399,7 @@ static struct scsi_host_template pata_s3c_sht = { ATA_PIO_SHT(DRV_NAME), }; @@ -24271,7 +24768,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_samsung_cf.c linux-2.6.38.7/drivers/a .inherits = &ata_sff_port_ops, .sff_check_status = pata_s3c_check_status, .sff_check_altstatus = pata_s3c_check_altstatus, -@@ -413,7 +413,7 @@ static struct ata_port_operations pata_s +@@ -413,7 +413,7 @@ static struct ata_port_operations pata_s3c_port_ops = { .set_piomode = pata_s3c_set_piomode, }; @@ -24280,10 +24777,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_samsung_cf.c linux-2.6.38.7/drivers/a .inherits = &ata_sff_port_ops, .set_piomode = pata_s3c_set_piomode, }; -diff -urNp linux-2.6.38.7/drivers/ata/pata_sc1200.c linux-2.6.38.7/drivers/ata/pata_sc1200.c ---- linux-2.6.38.7/drivers/ata/pata_sc1200.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_sc1200.c 2011-04-28 19:34:15.000000000 -0400 -@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ +diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c +index e2c1825..9b54b46 100644 +--- a/drivers/ata/pata_sc1200.c ++++ b/drivers/ata/pata_sc1200.c +@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_sht = { .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -24292,10 +24790,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_sc1200.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .qc_prep = ata_bmdma_dumb_qc_prep, .qc_issue = sc1200_qc_issue, -diff -urNp linux-2.6.38.7/drivers/ata/pata_scc.c linux-2.6.38.7/drivers/ata/pata_scc.c ---- linux-2.6.38.7/drivers/ata/pata_scc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_scc.c 2011-04-28 19:34:15.000000000 -0400 -@@ -926,7 +926,7 @@ static struct scsi_host_template scc_sht +diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c +index 093715c..aebe2ee 100644 +--- a/drivers/ata/pata_scc.c ++++ b/drivers/ata/pata_scc.c +@@ -926,7 +926,7 @@ static struct scsi_host_template scc_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -24304,10 +24803,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_scc.c linux-2.6.38.7/drivers/ata/pata .inherits = &ata_bmdma_port_ops, .set_piomode = scc_set_piomode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_sch.c linux-2.6.38.7/drivers/ata/pata_sch.c ---- linux-2.6.38.7/drivers/ata/pata_sch.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_sch.c 2011-04-28 19:34:15.000000000 -0400 -@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht +diff --git a/drivers/ata/pata_sch.c b/drivers/ata/pata_sch.c +index e97b32f..464f5a5 100644 +--- a/drivers/ata/pata_sch.c ++++ b/drivers/ata/pata_sch.c +@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -24316,10 +24816,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_sch.c linux-2.6.38.7/drivers/ata/pata .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, .set_piomode = sch_set_piomode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_serverworks.c linux-2.6.38.7/drivers/ata/pata_serverworks.c ---- linux-2.6.38.7/drivers/ata/pata_serverworks.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_serverworks.c 2011-04-28 19:34:15.000000000 -0400 -@@ -300,7 +300,7 @@ static struct scsi_host_template serverw +diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c +index 86dd714..ac4a72d 100644 +--- a/drivers/ata/pata_serverworks.c ++++ b/drivers/ata/pata_serverworks.c +@@ -300,7 +300,7 @@ static struct scsi_host_template serverworks_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -24328,7 +24829,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_serverworks.c linux-2.6.38.7/drivers/ .inherits = &ata_bmdma_port_ops, .cable_detect = serverworks_cable_detect, .mode_filter = serverworks_osb4_filter, -@@ -308,7 +308,7 @@ static struct ata_port_operations server +@@ -308,7 +308,7 @@ static struct ata_port_operations serverworks_osb4_port_ops = { .set_dmamode = serverworks_set_dmamode, }; @@ -24337,10 +24838,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_serverworks.c linux-2.6.38.7/drivers/ .inherits = &serverworks_osb4_port_ops, .mode_filter = serverworks_csb_filter, }; -diff -urNp linux-2.6.38.7/drivers/ata/pata_sil680.c linux-2.6.38.7/drivers/ata/pata_sil680.c ---- linux-2.6.38.7/drivers/ata/pata_sil680.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_sil680.c 2011-04-28 19:34:15.000000000 -0400 -@@ -225,8 +225,7 @@ static struct scsi_host_template sil680_ +diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c +index 00eefbd..cb5ad26 100644 +--- a/drivers/ata/pata_sil680.c ++++ b/drivers/ata/pata_sil680.c +@@ -225,8 +225,7 @@ static struct scsi_host_template sil680_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -24350,10 +24852,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_sil680.c linux-2.6.38.7/drivers/ata/p .inherits = &ata_bmdma32_port_ops, .sff_exec_command = sil680_sff_exec_command, .sff_irq_check = sil680_sff_irq_check, -diff -urNp linux-2.6.38.7/drivers/ata/pata_sis.c linux-2.6.38.7/drivers/ata/pata_sis.c ---- linux-2.6.38.7/drivers/ata/pata_sis.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_sis.c 2011-04-28 19:34:15.000000000 -0400 -@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht +diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c +index 60cea13..048e50e 100644 +--- a/drivers/ata/pata_sis.c ++++ b/drivers/ata/pata_sis.c +@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -24408,10 +24911,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_sis.c linux-2.6.38.7/drivers/ata/pata .inherits = &sis_base_ops, .set_piomode = sis_old_set_piomode, .set_dmamode = sis_old_set_dmamode, -diff -urNp linux-2.6.38.7/drivers/ata/pata_sl82c105.c linux-2.6.38.7/drivers/ata/pata_sl82c105.c ---- linux-2.6.38.7/drivers/ata/pata_sl82c105.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_sl82c105.c 2011-04-28 19:34:15.000000000 -0400 -@@ -241,7 +241,7 @@ static struct scsi_host_template sl82c10 +diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c +index 7f5d020..258d918 100644 +--- a/drivers/ata/pata_sl82c105.c ++++ b/drivers/ata/pata_sl82c105.c +@@ -241,7 +241,7 @@ static struct scsi_host_template sl82c105_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -24420,10 +24924,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_sl82c105.c linux-2.6.38.7/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_defer = sl82c105_qc_defer, .bmdma_start = sl82c105_bmdma_start, -diff -urNp linux-2.6.38.7/drivers/ata/pata_triflex.c linux-2.6.38.7/drivers/ata/pata_triflex.c ---- linux-2.6.38.7/drivers/ata/pata_triflex.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_triflex.c 2011-04-28 19:34:15.000000000 -0400 -@@ -178,7 +178,7 @@ static struct scsi_host_template triflex +diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c +index 0d1f89e..581bdb1 100644 +--- a/drivers/ata/pata_triflex.c ++++ b/drivers/ata/pata_triflex.c +@@ -178,7 +178,7 @@ static struct scsi_host_template triflex_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -24432,10 +24937,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_triflex.c linux-2.6.38.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .bmdma_start = triflex_bmdma_start, .bmdma_stop = triflex_bmdma_stop, -diff -urNp linux-2.6.38.7/drivers/ata/pata_via.c linux-2.6.38.7/drivers/ata/pata_via.c ---- linux-2.6.38.7/drivers/ata/pata_via.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pata_via.c 2011-04-28 19:34:15.000000000 -0400 -@@ -441,7 +441,7 @@ static struct scsi_host_template via_sht +diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c +index ac8d7d9..9d02ee8 100644 +--- a/drivers/ata/pata_via.c ++++ b/drivers/ata/pata_via.c +@@ -441,7 +441,7 @@ static struct scsi_host_template via_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -24444,7 +24950,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_via.c linux-2.6.38.7/drivers/ata/pata .inherits = &ata_bmdma_port_ops, .cable_detect = via_cable_detect, .set_piomode = via_set_piomode, -@@ -452,7 +452,7 @@ static struct ata_port_operations via_po +@@ -452,7 +452,7 @@ static struct ata_port_operations via_port_ops = { .mode_filter = via_mode_filter, }; @@ -24453,10 +24959,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pata_via.c linux-2.6.38.7/drivers/ata/pata .inherits = &via_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, }; -diff -urNp linux-2.6.38.7/drivers/ata/pdc_adma.c linux-2.6.38.7/drivers/ata/pdc_adma.c ---- linux-2.6.38.7/drivers/ata/pdc_adma.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/pdc_adma.c 2011-04-28 19:34:15.000000000 -0400 -@@ -146,7 +146,7 @@ static struct scsi_host_template adma_at +diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c +index adbe042..c13c7b7 100644 +--- a/drivers/ata/pdc_adma.c ++++ b/drivers/ata/pdc_adma.c +@@ -146,7 +146,7 @@ static struct scsi_host_template adma_ata_sht = { .dma_boundary = ADMA_DMA_BOUNDARY, }; @@ -24465,10 +24972,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/pdc_adma.c linux-2.6.38.7/drivers/ata/pdc_ .inherits = &ata_sff_port_ops, .lost_interrupt = ATA_OP_NULL, -diff -urNp linux-2.6.38.7/drivers/ata/sata_dwc_460ex.c linux-2.6.38.7/drivers/ata/sata_dwc_460ex.c ---- linux-2.6.38.7/drivers/ata/sata_dwc_460ex.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/sata_dwc_460ex.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1560,7 +1560,7 @@ static struct scsi_host_template sata_dw +diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c +index 6cf57c5..41b1c88 100644 +--- a/drivers/ata/sata_dwc_460ex.c ++++ b/drivers/ata/sata_dwc_460ex.c +@@ -1560,7 +1560,7 @@ static struct scsi_host_template sata_dwc_sht = { .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -24477,10 +24985,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/sata_dwc_460ex.c linux-2.6.38.7/drivers/at .inherits = &ata_sff_port_ops, .error_handler = sata_dwc_error_handler, -diff -urNp linux-2.6.38.7/drivers/ata/sata_fsl.c linux-2.6.38.7/drivers/ata/sata_fsl.c ---- linux-2.6.38.7/drivers/ata/sata_fsl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/sata_fsl.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs +diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c +index b0214d0..dd6c277 100644 +--- a/drivers/ata/sata_fsl.c ++++ b/drivers/ata/sata_fsl.c +@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fsl_sht = { .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -24489,10 +24998,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/sata_fsl.c linux-2.6.38.7/drivers/ata/sata .inherits = &sata_pmp_port_ops, .qc_defer = ata_std_qc_defer, -diff -urNp linux-2.6.38.7/drivers/ata/sata_inic162x.c linux-2.6.38.7/drivers/ata/sata_inic162x.c ---- linux-2.6.38.7/drivers/ata/sata_inic162x.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/sata_inic162x.c 2011-04-28 19:34:15.000000000 -0400 -@@ -705,7 +705,7 @@ static int inic_port_start(struct ata_po +diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c +index 83a4447..6652c51 100644 +--- a/drivers/ata/sata_inic162x.c ++++ b/drivers/ata/sata_inic162x.c +@@ -705,7 +705,7 @@ static int inic_port_start(struct ata_port *ap) return 0; } @@ -24501,10 +25011,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/sata_inic162x.c linux-2.6.38.7/drivers/ata .inherits = &sata_port_ops, .check_atapi_dma = inic_check_atapi_dma, -diff -urNp linux-2.6.38.7/drivers/ata/sata_mv.c linux-2.6.38.7/drivers/ata/sata_mv.c ---- linux-2.6.38.7/drivers/ata/sata_mv.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/sata_mv.c 2011-04-28 19:34:15.000000000 -0400 -@@ -663,7 +663,7 @@ static struct scsi_host_template mv6_sht +diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c +index bf74a36..c76f715 100644 +--- a/drivers/ata/sata_mv.c ++++ b/drivers/ata/sata_mv.c +@@ -663,7 +663,7 @@ static struct scsi_host_template mv6_sht = { .dma_boundary = MV_DMA_BOUNDARY, }; @@ -24513,7 +25024,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/sata_mv.c linux-2.6.38.7/drivers/ata/sata_ .inherits = &ata_sff_port_ops, .lost_interrupt = ATA_OP_NULL, -@@ -683,7 +683,7 @@ static struct ata_port_operations mv5_op +@@ -683,7 +683,7 @@ static struct ata_port_operations mv5_ops = { .port_stop = mv_port_stop, }; @@ -24522,7 +25033,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/sata_mv.c linux-2.6.38.7/drivers/ata/sata_ .inherits = &ata_bmdma_port_ops, .lost_interrupt = ATA_OP_NULL, -@@ -717,7 +717,7 @@ static struct ata_port_operations mv6_op +@@ -717,7 +717,7 @@ static struct ata_port_operations mv6_ops = { .port_stop = mv_port_stop, }; @@ -24531,10 +25042,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/sata_mv.c linux-2.6.38.7/drivers/ata/sata_ .inherits = &mv6_ops, .dev_config = ATA_OP_NULL, .qc_prep = mv_qc_prep_iie, -diff -urNp linux-2.6.38.7/drivers/ata/sata_nv.c linux-2.6.38.7/drivers/ata/sata_nv.c ---- linux-2.6.38.7/drivers/ata/sata_nv.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/sata_nv.c 2011-04-28 19:34:15.000000000 -0400 -@@ -465,7 +465,7 @@ static struct scsi_host_template nv_swnc +diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c +index 7254e25..4ca53ea 100644 +--- a/drivers/ata/sata_nv.c ++++ b/drivers/ata/sata_nv.c +@@ -465,7 +465,7 @@ static struct scsi_host_template nv_swncq_sht = { * cases. Define nv_hardreset() which only kicks in for post-boot * probing and use it for all variants. */ @@ -24543,7 +25055,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/sata_nv.c linux-2.6.38.7/drivers/ata/sata_ .inherits = &ata_bmdma_port_ops, .lost_interrupt = ATA_OP_NULL, .scr_read = nv_scr_read, -@@ -473,20 +473,20 @@ static struct ata_port_operations nv_gen +@@ -473,20 +473,20 @@ static struct ata_port_operations nv_generic_ops = { .hardreset = nv_hardreset, }; @@ -24567,7 +25079,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/sata_nv.c linux-2.6.38.7/drivers/ata/sata_ .inherits = &nv_ck804_ops, .check_atapi_dma = nv_adma_check_atapi_dma, -@@ -510,7 +510,7 @@ static struct ata_port_operations nv_adm +@@ -510,7 +510,7 @@ static struct ata_port_operations nv_adma_ops = { .host_stop = nv_adma_host_stop, }; @@ -24576,10 +25088,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/sata_nv.c linux-2.6.38.7/drivers/ata/sata_ .inherits = &nv_generic_ops, .qc_defer = ata_std_qc_defer, -diff -urNp linux-2.6.38.7/drivers/ata/sata_promise.c linux-2.6.38.7/drivers/ata/sata_promise.c ---- linux-2.6.38.7/drivers/ata/sata_promise.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/sata_promise.c 2011-04-28 19:34:15.000000000 -0400 -@@ -196,7 +196,7 @@ static const struct ata_port_operations +diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c +index f03ad48..4b0fc9e 100644 +--- a/drivers/ata/sata_promise.c ++++ b/drivers/ata/sata_promise.c +@@ -196,7 +196,7 @@ static const struct ata_port_operations pdc_common_ops = { .error_handler = pdc_error_handler, }; @@ -24588,7 +25101,7 @@ diff -urNp linux-2.6.38.7/drivers/ata/sata_promise.c linux-2.6.38.7/drivers/ata/ .inherits = &pdc_common_ops, .cable_detect = pdc_sata_cable_detect, .freeze = pdc_sata_freeze, -@@ -209,14 +209,14 @@ static struct ata_port_operations pdc_sa +@@ -209,14 +209,14 @@ static struct ata_port_operations pdc_sata_ops = { /* First-generation chips need a more restrictive ->check_atapi_dma op, and ->freeze/thaw that ignore the hotplug controls. */ @@ -24605,10 +25118,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/sata_promise.c linux-2.6.38.7/drivers/ata/ .inherits = &pdc_common_ops, .cable_detect = pdc_pata_cable_detect, .freeze = pdc_freeze, -diff -urNp linux-2.6.38.7/drivers/ata/sata_qstor.c linux-2.6.38.7/drivers/ata/sata_qstor.c ---- linux-2.6.38.7/drivers/ata/sata_qstor.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/sata_qstor.c 2011-04-28 19:34:15.000000000 -0400 -@@ -131,7 +131,7 @@ static struct scsi_host_template qs_ata_ +diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c +index daeebf1..64fdbb8 100644 +--- a/drivers/ata/sata_qstor.c ++++ b/drivers/ata/sata_qstor.c +@@ -131,7 +131,7 @@ static struct scsi_host_template qs_ata_sht = { .dma_boundary = QS_DMA_BOUNDARY, }; @@ -24617,22 +25131,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/sata_qstor.c linux-2.6.38.7/drivers/ata/sa .inherits = &ata_sff_port_ops, .check_atapi_dma = qs_check_atapi_dma, -diff -urNp linux-2.6.38.7/drivers/ata/sata_sil24.c linux-2.6.38.7/drivers/ata/sata_sil24.c ---- linux-2.6.38.7/drivers/ata/sata_sil24.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/sata_sil24.c 2011-04-28 19:34:15.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.38.7/drivers/ata/sata_sil.c linux-2.6.38.7/drivers/ata/sata_sil.c ---- linux-2.6.38.7/drivers/ata/sata_sil.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/sata_sil.c 2011-04-28 19:34:15.000000000 -0400 -@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht +diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c +index 3a4f842..24382d6 100644 +--- a/drivers/ata/sata_sil.c ++++ b/drivers/ata/sata_sil.c +@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht = { .sg_tablesize = ATA_MAX_PRD }; @@ -24641,10 +25144,24 @@ diff -urNp linux-2.6.38.7/drivers/ata/sata_sil.c linux-2.6.38.7/drivers/ata/sata .inherits = &ata_bmdma32_port_ops, .dev_config = sil_dev_config, .set_mode = sil_set_mode, -diff -urNp linux-2.6.38.7/drivers/ata/sata_sis.c linux-2.6.38.7/drivers/ata/sata_sis.c ---- linux-2.6.38.7/drivers/ata/sata_sis.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/sata_sis.c 2011-04-28 19:34:15.000000000 -0400 -@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht +diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c +index af41c6f..ef0b71d 100644 +--- a/drivers/ata/sata_sil24.c ++++ b/drivers/ata/sata_sil24.c +@@ -389,7 +389,7 @@ static struct scsi_host_template sil24_sht = { + .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 --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c +index 2bfe3ae..c80f777 100644 +--- a/drivers/ata/sata_sis.c ++++ b/drivers/ata/sata_sis.c +@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -24653,10 +25170,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/sata_sis.c linux-2.6.38.7/drivers/ata/sata .inherits = &ata_bmdma_port_ops, .scr_read = sis_scr_read, .scr_write = sis_scr_write, -diff -urNp linux-2.6.38.7/drivers/ata/sata_svw.c linux-2.6.38.7/drivers/ata/sata_svw.c ---- linux-2.6.38.7/drivers/ata/sata_svw.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/sata_svw.c 2011-04-28 19:34:15.000000000 -0400 -@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata +diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c +index 7d9db4a..0954357 100644 +--- a/drivers/ata/sata_svw.c ++++ b/drivers/ata/sata_svw.c +@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata_sht = { }; @@ -24665,10 +25183,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/sata_svw.c linux-2.6.38.7/drivers/ata/sata .inherits = &ata_bmdma_port_ops, .sff_tf_load = k2_sata_tf_load, .sff_tf_read = k2_sata_tf_read, -diff -urNp linux-2.6.38.7/drivers/ata/sata_sx4.c linux-2.6.38.7/drivers/ata/sata_sx4.c ---- linux-2.6.38.7/drivers/ata/sata_sx4.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/sata_sx4.c 2011-04-28 19:34:15.000000000 -0400 -@@ -249,7 +249,7 @@ static struct scsi_host_template pdc_sat +diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c +index bedd518..feb4028 100644 +--- a/drivers/ata/sata_sx4.c ++++ b/drivers/ata/sata_sx4.c +@@ -249,7 +249,7 @@ static struct scsi_host_template pdc_sata_sht = { }; /* TODO: inherit from base port_ops after converting to new EH */ @@ -24677,10 +25196,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/sata_sx4.c linux-2.6.38.7/drivers/ata/sata .inherits = &ata_sff_port_ops, .check_atapi_dma = pdc_check_atapi_dma, -diff -urNp linux-2.6.38.7/drivers/ata/sata_uli.c linux-2.6.38.7/drivers/ata/sata_uli.c ---- linux-2.6.38.7/drivers/ata/sata_uli.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/sata_uli.c 2011-04-28 19:34:15.000000000 -0400 -@@ -80,7 +80,7 @@ static struct scsi_host_template uli_sht +diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c +index b8578c3..41e5c92 100644 +--- a/drivers/ata/sata_uli.c ++++ b/drivers/ata/sata_uli.c +@@ -80,7 +80,7 @@ static struct scsi_host_template uli_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -24689,10 +25209,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/sata_uli.c linux-2.6.38.7/drivers/ata/sata .inherits = &ata_bmdma_port_ops, .scr_read = uli_scr_read, .scr_write = uli_scr_write, -diff -urNp linux-2.6.38.7/drivers/ata/sata_via.c linux-2.6.38.7/drivers/ata/sata_via.c ---- linux-2.6.38.7/drivers/ata/sata_via.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/sata_via.c 2011-04-28 19:34:15.000000000 -0400 -@@ -115,32 +115,32 @@ static struct scsi_host_template svia_sh +diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c +index 8b677bb..d13c445 100644 +--- a/drivers/ata/sata_via.c ++++ b/drivers/ata/sata_via.c +@@ -115,32 +115,32 @@ static struct scsi_host_template svia_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -24730,10 +25251,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/sata_via.c linux-2.6.38.7/drivers/ata/sata .inherits = &svia_base_ops, .hardreset = sata_std_hardreset, .scr_read = vt8251_scr_read, -diff -urNp linux-2.6.38.7/drivers/ata/sata_vsc.c linux-2.6.38.7/drivers/ata/sata_vsc.c ---- linux-2.6.38.7/drivers/ata/sata_vsc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ata/sata_vsc.c 2011-04-28 19:34:15.000000000 -0400 -@@ -300,7 +300,7 @@ static struct scsi_host_template vsc_sat +diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c +index e079cf2..feb97bdb 100644 +--- a/drivers/ata/sata_vsc.c ++++ b/drivers/ata/sata_vsc.c +@@ -300,7 +300,7 @@ static struct scsi_host_template vsc_sata_sht = { }; @@ -24742,10 +25264,11 @@ diff -urNp linux-2.6.38.7/drivers/ata/sata_vsc.c linux-2.6.38.7/drivers/ata/sata .inherits = &ata_bmdma_port_ops, /* The IRQ handling is not quite standard SFF behaviour so we cannot use the default lost interrupt handler */ -diff -urNp linux-2.6.38.7/drivers/atm/adummy.c linux-2.6.38.7/drivers/atm/adummy.c ---- linux-2.6.38.7/drivers/atm/adummy.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/atm/adummy.c 2011-04-28 19:34:15.000000000 -0400 -@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct +diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c +index f9b983a..887b9d8 100644 +--- a/drivers/atm/adummy.c ++++ b/drivers/atm/adummy.c +@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb) vcc->pop(vcc, skb); else dev_kfree_skb_any(skb); @@ -24754,10 +25277,11 @@ diff -urNp linux-2.6.38.7/drivers/atm/adummy.c linux-2.6.38.7/drivers/atm/adummy return 0; } -diff -urNp linux-2.6.38.7/drivers/atm/ambassador.c linux-2.6.38.7/drivers/atm/ambassador.c ---- linux-2.6.38.7/drivers/atm/ambassador.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/atm/ambassador.c 2011-04-28 19:34:15.000000000 -0400 -@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, +diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c +index 9f47e86..5539f36 100644 +--- a/drivers/atm/ambassador.c ++++ b/drivers/atm/ambassador.c +@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) { PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); // VC layer stats @@ -24766,7 +25290,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/ambassador.c linux-2.6.38.7/drivers/atm/am // free the descriptor kfree (tx_descr); -@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, +@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) { dump_skb ("<<<", vc, skb); // VC layer stats @@ -24775,7 +25299,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/ambassador.c linux-2.6.38.7/drivers/atm/am __net_timestamp(skb); // end of our responsability atm_vcc->push (atm_vcc, skb); -@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, +@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) { } else { PRINTK (KERN_INFO, "dropped over-size frame"); // should we count this? @@ -24784,7 +25308,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/ambassador.c linux-2.6.38.7/drivers/atm/am } } else { -@@ -1342,7 +1342,7 @@ static int amb_send (struct atm_vcc * at +@@ -1342,7 +1342,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) { } if (check_area (skb->data, skb->len)) { @@ -24793,10 +25317,11 @@ diff -urNp linux-2.6.38.7/drivers/atm/ambassador.c linux-2.6.38.7/drivers/atm/am return -ENOMEM; // ? } -diff -urNp linux-2.6.38.7/drivers/atm/atmtcp.c linux-2.6.38.7/drivers/atm/atmtcp.c ---- linux-2.6.38.7/drivers/atm/atmtcp.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/atm/atmtcp.c 2011-04-28 19:34:15.000000000 -0400 -@@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc +diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c +index 0b06250..9a7e2d8 100644 +--- a/drivers/atm/atmtcp.c ++++ b/drivers/atm/atmtcp.c +@@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb) if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); if (dev_data) return 0; @@ -24805,7 +25330,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/atmtcp.c linux-2.6.38.7/drivers/atm/atmtcp return -ENOLINK; } size = skb->len+sizeof(struct atmtcp_hdr); -@@ -215,7 +215,7 @@ static int atmtcp_v_send(struct atm_vcc +@@ -215,7 +215,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb) if (!new_skb) { if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); @@ -24814,7 +25339,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/atmtcp.c linux-2.6.38.7/drivers/atm/atmtcp return -ENOBUFS; } hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr)); -@@ -226,8 +226,8 @@ static int atmtcp_v_send(struct atm_vcc +@@ -226,8 +226,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb) if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); out_vcc->push(out_vcc,new_skb); @@ -24825,7 +25350,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/atmtcp.c linux-2.6.38.7/drivers/atm/atmtcp return 0; } -@@ -301,7 +301,7 @@ static int atmtcp_c_send(struct atm_vcc +@@ -301,7 +301,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb) out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci)); read_unlock(&vcc_sklist_lock); if (!out_vcc) { @@ -24834,7 +25359,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/atmtcp.c linux-2.6.38.7/drivers/atm/atmtcp goto done; } skb_pull(skb,sizeof(struct atmtcp_hdr)); -@@ -313,8 +313,8 @@ static int atmtcp_c_send(struct atm_vcc +@@ -313,8 +313,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb) __net_timestamp(new_skb); skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len); out_vcc->push(out_vcc,new_skb); @@ -24845,9 +25370,10 @@ diff -urNp linux-2.6.38.7/drivers/atm/atmtcp.c linux-2.6.38.7/drivers/atm/atmtcp done: if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); -diff -urNp linux-2.6.38.7/drivers/atm/eni.c linux-2.6.38.7/drivers/atm/eni.c ---- linux-2.6.38.7/drivers/atm/eni.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/atm/eni.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c +index c495fae..96ed96d 100644 +--- a/drivers/atm/eni.c ++++ b/drivers/atm/eni.c @@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc) DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", vcc->dev->number); @@ -24884,7 +25410,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/eni.c linux-2.6.38.7/drivers/atm/eni.c } wake_up(&eni_dev->rx_wait); } -@@ -1228,7 +1228,7 @@ static void dequeue_tx(struct atm_dev *d +@@ -1228,7 +1228,7 @@ static void dequeue_tx(struct atm_dev *dev) PCI_DMA_TODEVICE); if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb_irq(skb); @@ -24893,10 +25419,11 @@ diff -urNp linux-2.6.38.7/drivers/atm/eni.c linux-2.6.38.7/drivers/atm/eni.c wake_up(&eni_dev->tx_wait); dma_complete++; } -diff -urNp linux-2.6.38.7/drivers/atm/firestream.c linux-2.6.38.7/drivers/atm/firestream.c ---- linux-2.6.38.7/drivers/atm/firestream.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/atm/firestream.c 2011-04-28 19:34:15.000000000 -0400 -@@ -749,7 +749,7 @@ static void process_txdone_queue (struct +diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c +index 7d912ba..a2c6f7d 100644 +--- a/drivers/atm/firestream.c ++++ b/drivers/atm/firestream.c +@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q) } } @@ -24905,7 +25432,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/firestream.c linux-2.6.38.7/drivers/atm/fi fs_dprintk (FS_DEBUG_TXMEM, "i"); fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb); -@@ -816,7 +816,7 @@ static void process_incoming (struct fs_ +@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q) #endif skb_put (skb, qe->p1 & 0xffff); ATM_SKB(skb)->vcc = atm_vcc; @@ -24914,7 +25441,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/firestream.c linux-2.6.38.7/drivers/atm/fi __net_timestamp(skb); fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb); atm_vcc->push (atm_vcc, skb); -@@ -837,12 +837,12 @@ static void process_incoming (struct fs_ +@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q) kfree (pe); } if (atm_vcc) @@ -24929,10 +25456,11 @@ diff -urNp linux-2.6.38.7/drivers/atm/firestream.c linux-2.6.38.7/drivers/atm/fi break; default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", -diff -urNp linux-2.6.38.7/drivers/atm/fore200e.c linux-2.6.38.7/drivers/atm/fore200e.c ---- linux-2.6.38.7/drivers/atm/fore200e.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/atm/fore200e.c 2011-04-28 19:34:15.000000000 -0400 -@@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200 +diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c +index 44f7785..c1a5a5f 100644 +--- a/drivers/atm/fore200e.c ++++ b/drivers/atm/fore200e.c +@@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200e) #endif /* check error condition */ if (*entry->status & STATUS_ERROR) @@ -24944,7 +25472,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/fore200e.c linux-2.6.38.7/drivers/atm/fore } } -@@ -1084,7 +1084,7 @@ fore200e_push_rpd(struct fore200e* fore2 +@@ -1084,7 +1084,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp if (skb == NULL) { DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len); @@ -24953,7 +25481,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/fore200e.c linux-2.6.38.7/drivers/atm/fore return -ENOMEM; } -@@ -1127,14 +1127,14 @@ fore200e_push_rpd(struct fore200e* fore2 +@@ -1127,14 +1127,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp dev_kfree_skb_any(skb); @@ -24970,7 +25498,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/fore200e.c linux-2.6.38.7/drivers/atm/fore ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0); -@@ -1212,7 +1212,7 @@ fore200e_rx_irq(struct fore200e* fore200 +@@ -1212,7 +1212,7 @@ fore200e_rx_irq(struct fore200e* fore200e) DPRINTK(2, "damaged PDU on %d.%d.%d\n", fore200e->atm_dev->number, entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci); @@ -24979,7 +25507,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/fore200e.c linux-2.6.38.7/drivers/atm/fore } } -@@ -1657,7 +1657,7 @@ fore200e_send(struct atm_vcc *vcc, struc +@@ -1657,7 +1657,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb) goto retry_here; } @@ -24988,10 +25516,11 @@ diff -urNp linux-2.6.38.7/drivers/atm/fore200e.c linux-2.6.38.7/drivers/atm/fore fore200e->tx_sat++; DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", -diff -urNp linux-2.6.38.7/drivers/atm/he.c linux-2.6.38.7/drivers/atm/he.c ---- linux-2.6.38.7/drivers/atm/he.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/atm/he.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i +diff --git a/drivers/atm/he.c b/drivers/atm/he.c +index 6cf59bf..32c0bce 100644 +--- a/drivers/atm/he.c ++++ b/drivers/atm/he.c +@@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, int group) if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { hprintk("HBUF_ERR! (cid 0x%x)\n", cid); @@ -25000,7 +25529,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/he.c linux-2.6.38.7/drivers/atm/he.c goto return_host_buffers; } -@@ -1736,7 +1736,7 @@ he_service_rbrq(struct he_dev *he_dev, i +@@ -1736,7 +1736,7 @@ he_service_rbrq(struct he_dev *he_dev, int group) RBRQ_LEN_ERR(he_dev->rbrq_head) ? "LEN_ERR" : "", vcc->vpi, vcc->vci); @@ -25009,7 +25538,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/he.c linux-2.6.38.7/drivers/atm/he.c goto return_host_buffers; } -@@ -1788,7 +1788,7 @@ he_service_rbrq(struct he_dev *he_dev, i +@@ -1788,7 +1788,7 @@ he_service_rbrq(struct he_dev *he_dev, int group) vcc->push(vcc, skb); spin_lock(&he_dev->global_lock); @@ -25018,7 +25547,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/he.c linux-2.6.38.7/drivers/atm/he.c return_host_buffers: ++pdus_assembled; -@@ -2114,7 +2114,7 @@ __enqueue_tpd(struct he_dev *he_dev, str +@@ -2114,7 +2114,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid) tpd->vcc->pop(tpd->vcc, tpd->skb); else dev_kfree_skb_any(tpd->skb); @@ -25027,7 +25556,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/he.c linux-2.6.38.7/drivers/atm/he.c } pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status)); return; -@@ -2526,7 +2526,7 @@ he_send(struct atm_vcc *vcc, struct sk_b +@@ -2526,7 +2526,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb) vcc->pop(vcc, skb); else dev_kfree_skb_any(skb); @@ -25036,7 +25565,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/he.c linux-2.6.38.7/drivers/atm/he.c return -EINVAL; } -@@ -2537,7 +2537,7 @@ he_send(struct atm_vcc *vcc, struct sk_b +@@ -2537,7 +2537,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb) vcc->pop(vcc, skb); else dev_kfree_skb_any(skb); @@ -25045,7 +25574,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/he.c linux-2.6.38.7/drivers/atm/he.c return -EINVAL; } #endif -@@ -2549,7 +2549,7 @@ he_send(struct atm_vcc *vcc, struct sk_b +@@ -2549,7 +2549,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb) vcc->pop(vcc, skb); else dev_kfree_skb_any(skb); @@ -25054,7 +25583,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/he.c linux-2.6.38.7/drivers/atm/he.c spin_unlock_irqrestore(&he_dev->global_lock, flags); return -ENOMEM; } -@@ -2591,7 +2591,7 @@ he_send(struct atm_vcc *vcc, struct sk_b +@@ -2591,7 +2591,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb) vcc->pop(vcc, skb); else dev_kfree_skb_any(skb); @@ -25063,7 +25592,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/he.c linux-2.6.38.7/drivers/atm/he.c spin_unlock_irqrestore(&he_dev->global_lock, flags); return -ENOMEM; } -@@ -2622,7 +2622,7 @@ he_send(struct atm_vcc *vcc, struct sk_b +@@ -2622,7 +2622,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb) __enqueue_tpd(he_dev, tpd, cid); spin_unlock_irqrestore(&he_dev->global_lock, flags); @@ -25072,10 +25601,11 @@ diff -urNp linux-2.6.38.7/drivers/atm/he.c linux-2.6.38.7/drivers/atm/he.c return 0; } -diff -urNp linux-2.6.38.7/drivers/atm/horizon.c linux-2.6.38.7/drivers/atm/horizon.c ---- linux-2.6.38.7/drivers/atm/horizon.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/atm/horizon.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, +diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c +index 24761e1..f7c5a40 100644 +--- a/drivers/atm/horizon.c ++++ b/drivers/atm/horizon.c +@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, int irq) { { struct atm_vcc * vcc = ATM_SKB(skb)->vcc; // VC layer stats @@ -25084,7 +25614,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/horizon.c linux-2.6.38.7/drivers/atm/horiz __net_timestamp(skb); // end of our responsability vcc->push (vcc, skb); -@@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const +@@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) { dev->tx_iovec = NULL; // VC layer stats @@ -25093,10 +25623,11 @@ diff -urNp linux-2.6.38.7/drivers/atm/horizon.c linux-2.6.38.7/drivers/atm/horiz // free the skb hrz_kfree_skb (skb); -diff -urNp linux-2.6.38.7/drivers/atm/idt77252.c linux-2.6.38.7/drivers/atm/idt77252.c ---- linux-2.6.38.7/drivers/atm/idt77252.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/atm/idt77252.c 2011-04-28 19:34:15.000000000 -0400 -@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str +diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c +index bfb7fee..8608631 100644 +--- a/drivers/atm/idt77252.c ++++ b/drivers/atm/idt77252.c +@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc) else dev_kfree_skb(skb); @@ -25105,7 +25636,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/idt77252.c linux-2.6.38.7/drivers/atm/idt7 } atomic_dec(&scq->used); -@@ -1074,13 +1074,13 @@ dequeue_rx(struct idt77252_dev *card, st +@@ -1074,13 +1074,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe) if ((sb = dev_alloc_skb(64)) == NULL) { printk("%s: Can't allocate buffers for aal0.\n", card->name); @@ -25121,7 +25652,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/idt77252.c linux-2.6.38.7/drivers/atm/idt7 dev_kfree_skb(sb); break; } -@@ -1097,7 +1097,7 @@ dequeue_rx(struct idt77252_dev *card, st +@@ -1097,7 +1097,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe) ATM_SKB(sb)->vcc = vcc; __net_timestamp(sb); vcc->push(vcc, sb); @@ -25130,7 +25661,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/idt77252.c linux-2.6.38.7/drivers/atm/idt7 cell += ATM_CELL_PAYLOAD; } -@@ -1134,13 +1134,13 @@ dequeue_rx(struct idt77252_dev *card, st +@@ -1134,13 +1134,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe) "(CDC: %08x)\n", card->name, len, rpp->len, readl(SAR_REG_CDC)); recycle_rx_pool_skb(card, rpp); @@ -25146,7 +25677,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/idt77252.c linux-2.6.38.7/drivers/atm/idt7 return; } if (skb_queue_len(&rpp->queue) > 1) { -@@ -1151,7 +1151,7 @@ dequeue_rx(struct idt77252_dev *card, st +@@ -1151,7 +1151,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe) RXPRINTK("%s: Can't alloc RX skb.\n", card->name); recycle_rx_pool_skb(card, rpp); @@ -25155,7 +25686,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/idt77252.c linux-2.6.38.7/drivers/atm/idt7 return; } if (!atm_charge(vcc, skb->truesize)) { -@@ -1170,7 +1170,7 @@ dequeue_rx(struct idt77252_dev *card, st +@@ -1170,7 +1170,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe) __net_timestamp(skb); vcc->push(vcc, skb); @@ -25164,7 +25695,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/idt77252.c linux-2.6.38.7/drivers/atm/idt7 return; } -@@ -1192,7 +1192,7 @@ dequeue_rx(struct idt77252_dev *card, st +@@ -1192,7 +1192,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe) __net_timestamp(skb); vcc->push(vcc, skb); @@ -25173,7 +25704,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/idt77252.c linux-2.6.38.7/drivers/atm/idt7 if (skb->truesize > SAR_FB_SIZE_3) add_rx_skb(card, 3, SAR_FB_SIZE_3, 1); -@@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *car +@@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *card) if (vcc->qos.aal != ATM_AAL0) { RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n", card->name, vpi, vci); @@ -25190,7 +25721,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/idt77252.c linux-2.6.38.7/drivers/atm/idt7 goto drop; } -@@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *car +@@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *card) ATM_SKB(sb)->vcc = vcc; __net_timestamp(sb); vcc->push(vcc, sb); @@ -25199,7 +25730,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/idt77252.c linux-2.6.38.7/drivers/atm/idt7 drop: skb_pull(queue, 64); -@@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, s +@@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam) if (vc == NULL) { printk("%s: NULL connection in send().\n", card->name); @@ -25215,7 +25746,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/idt77252.c linux-2.6.38.7/drivers/atm/idt7 dev_kfree_skb(skb); return -EINVAL; } -@@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, s +@@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam) break; default: printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal); @@ -25232,7 +25763,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/idt77252.c linux-2.6.38.7/drivers/atm/idt7 dev_kfree_skb(skb); return -EINVAL; } -@@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, s +@@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam) err = queue_skb(card, vc, skb, oam); if (err) { @@ -25241,7 +25772,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/idt77252.c linux-2.6.38.7/drivers/atm/idt7 dev_kfree_skb(skb); return err; } -@@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, v +@@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags) skb = dev_alloc_skb(64); if (!skb) { printk("%s: Out of memory in send_oam().\n", card->name); @@ -25250,10 +25781,11 @@ diff -urNp linux-2.6.38.7/drivers/atm/idt77252.c linux-2.6.38.7/drivers/atm/idt7 return -ENOMEM; } atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); -diff -urNp linux-2.6.38.7/drivers/atm/iphase.c linux-2.6.38.7/drivers/atm/iphase.c ---- linux-2.6.38.7/drivers/atm/iphase.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/atm/iphase.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1124,7 +1124,7 @@ static int rx_pkt(struct atm_dev *dev) +diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c +index d80d51b..762a8d4 100644 +--- a/drivers/atm/iphase.c ++++ b/drivers/atm/iphase.c +@@ -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)) { @@ -25262,7 +25794,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/iphase.c linux-2.6.38.7/drivers/atm/iphase IF_ERR(printk("IA: bad packet, dropping it");) if (status & RX_CER) { IF_ERR(printk(" cause: packet CRC error\n");) -@@ -1147,7 +1147,7 @@ static int rx_pkt(struct atm_dev *dev) +@@ -1147,7 +1147,7 @@ static int rx_pkt(struct atm_dev *dev) len = dma_addr - buf_addr; if (len > iadev->rx_buf_sz) { printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz); @@ -25271,7 +25803,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/iphase.c linux-2.6.38.7/drivers/atm/iphase goto out_free_desc; } -@@ -1297,7 +1297,7 @@ static void rx_dle_intr(struct atm_dev * +@@ -1297,7 +1297,7 @@ static void rx_dle_intr(struct atm_dev *dev) ia_vcc = INPH_IA_VCC(vcc); if (ia_vcc == NULL) { @@ -25280,7 +25812,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/iphase.c linux-2.6.38.7/drivers/atm/iphase dev_kfree_skb_any(skb); atm_return(vcc, atm_guess_pdu2truesize(len)); goto INCR_DLE; -@@ -1309,7 +1309,7 @@ static void rx_dle_intr(struct atm_dev * +@@ -1309,7 +1309,7 @@ static void rx_dle_intr(struct atm_dev *dev) if ((length > iadev->rx_buf_sz) || (length > (skb->len - sizeof(struct cpcs_trailer)))) { @@ -25289,7 +25821,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/iphase.c linux-2.6.38.7/drivers/atm/iphase IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)", length, skb->len);) dev_kfree_skb_any(skb); -@@ -1325,7 +1325,7 @@ static void rx_dle_intr(struct atm_dev * +@@ -1325,7 +1325,7 @@ static void rx_dle_intr(struct atm_dev *dev) IF_RX(printk("rx_dle_intr: skb push");) vcc->push(vcc,skb); @@ -25298,7 +25830,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/iphase.c linux-2.6.38.7/drivers/atm/iphase iadev->rx_pkt_cnt++; } INCR_DLE: -@@ -2807,15 +2807,15 @@ static int ia_ioctl(struct atm_dev *dev, +@@ -2807,15 +2807,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg) { struct k_sonet_stats *stats; stats = &PRIV(_ia_dev[board])->sonet_stats; @@ -25323,7 +25855,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/iphase.c linux-2.6.38.7/drivers/atm/iphase } ia_cmds.status = 0; break; -@@ -2920,7 +2920,7 @@ static int ia_pkt_tx (struct atm_vcc *vc +@@ -2920,7 +2920,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) { if ((desc == 0) || (desc > iadev->num_tx_desc)) { IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);) @@ -25332,7 +25864,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/iphase.c linux-2.6.38.7/drivers/atm/iphase if (vcc->pop) vcc->pop(vcc, skb); else -@@ -3025,14 +3025,14 @@ static int ia_pkt_tx (struct atm_vcc *vc +@@ -3025,14 +3025,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) { ATM_DESC(skb) = vcc->vci; skb_queue_tail(&iadev->tx_dma_q, skb); @@ -25349,10 +25881,11 @@ diff -urNp linux-2.6.38.7/drivers/atm/iphase.c linux-2.6.38.7/drivers/atm/iphase if (iavcc->vc_desc_cnt > 10) { vcc->tx_quota = vcc->tx_quota * 3 / 4; printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); -diff -urNp linux-2.6.38.7/drivers/atm/lanai.c linux-2.6.38.7/drivers/atm/lanai.c ---- linux-2.6.38.7/drivers/atm/lanai.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/atm/lanai.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct l +diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c +index 52880c8..9151062 100644 +--- a/drivers/atm/lanai.c ++++ b/drivers/atm/lanai.c +@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai, vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); lanai_endtx(lanai, lvcc); lanai_free_skb(lvcc->tx.atmvcc, skb); @@ -25361,7 +25894,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/lanai.c linux-2.6.38.7/drivers/atm/lanai.c } /* Try to fill the buffer - don't call unless there is backlog */ -@@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc +@@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr) ATM_SKB(skb)->vcc = lvcc->rx.atmvcc; __net_timestamp(skb); lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb); @@ -25370,7 +25903,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/lanai.c linux-2.6.38.7/drivers/atm/lanai.c out: lvcc->rx.buf.ptr = end; cardvcc_write(lvcc, endptr, vcc_rxreadptr); -@@ -1668,7 +1668,7 @@ static int handle_service(struct lanai_d +@@ -1668,7 +1668,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s) DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 " "vcc %d\n", lanai->number, (unsigned int) s, vci); lanai->stats.service_rxnotaal5++; @@ -25379,7 +25912,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/lanai.c linux-2.6.38.7/drivers/atm/lanai.c return 0; } if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) { -@@ -1680,7 +1680,7 @@ static int handle_service(struct lanai_d +@@ -1680,7 +1680,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s) int bytes; read_unlock(&vcc_sklist_lock); DPRINTK("got trashed rx pdu on vci %d\n", vci); @@ -25388,7 +25921,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/lanai.c linux-2.6.38.7/drivers/atm/lanai.c lvcc->stats.x.aal5.service_trash++; bytes = (SERVICE_GET_END(s) * 16) - (((unsigned long) lvcc->rx.buf.ptr) - -@@ -1692,7 +1692,7 @@ static int handle_service(struct lanai_d +@@ -1692,7 +1692,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s) } if (s & SERVICE_STREAM) { read_unlock(&vcc_sklist_lock); @@ -25397,7 +25930,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/lanai.c linux-2.6.38.7/drivers/atm/lanai.c lvcc->stats.x.aal5.service_stream++; printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream " "PDU on VCI %d!\n", lanai->number, vci); -@@ -1700,7 +1700,7 @@ static int handle_service(struct lanai_d +@@ -1700,7 +1700,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s) return 0; } DPRINTK("got rx crc error on vci %d\n", vci); @@ -25406,10 +25939,11 @@ diff -urNp linux-2.6.38.7/drivers/atm/lanai.c linux-2.6.38.7/drivers/atm/lanai.c lvcc->stats.x.aal5.service_rxcrc++; lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); -diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicstar.c ---- linux-2.6.38.7/drivers/atm/nicstar.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/atm/nicstar.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, +diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c +index 6b313ee..3891287 100644 +--- a/drivers/atm/nicstar.c ++++ b/drivers/atm/nicstar.c +@@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb) if ((vc = (vc_map *) vcc->dev_data) == NULL) { printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n", card->index); @@ -25418,7 +25952,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicst dev_kfree_skb_any(skb); return -EINVAL; } -@@ -1662,7 +1662,7 @@ static int ns_send(struct atm_vcc *vcc, +@@ -1662,7 +1662,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb) if (!vc->tx) { printk("nicstar%d: Trying to transmit on a non-tx VC.\n", card->index); @@ -25427,7 +25961,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicst dev_kfree_skb_any(skb); return -EINVAL; } -@@ -1670,14 +1670,14 @@ static int ns_send(struct atm_vcc *vcc, +@@ -1670,14 +1670,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb) if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) { printk("nicstar%d: Only AAL0 and AAL5 are supported.\n", card->index); @@ -25444,7 +25978,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicst dev_kfree_skb_any(skb); return -EINVAL; } -@@ -1725,11 +1725,11 @@ static int ns_send(struct atm_vcc *vcc, +@@ -1725,11 +1725,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb) } if (push_scqe(card, vc, scq, &scqe, skb) != 0) { @@ -25458,7 +25992,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicst return 0; } -@@ -2046,14 +2046,14 @@ static void dequeue_rx(ns_dev * card, ns +@@ -2046,14 +2046,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) printk ("nicstar%d: Can't allocate buffers for aal0.\n", card->index); @@ -25475,7 +26009,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicst dev_kfree_skb_any(sb); break; } -@@ -2068,7 +2068,7 @@ static void dequeue_rx(ns_dev * card, ns +@@ -2068,7 +2068,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) ATM_SKB(sb)->vcc = vcc; __net_timestamp(sb); vcc->push(vcc, sb); @@ -25484,7 +26018,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicst cell += ATM_CELL_PAYLOAD; } -@@ -2085,7 +2085,7 @@ static void dequeue_rx(ns_dev * card, ns +@@ -2085,7 +2085,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) if (iovb == NULL) { printk("nicstar%d: Out of iovec buffers.\n", card->index); @@ -25493,7 +26027,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicst recycle_rx_buf(card, skb); return; } -@@ -2109,7 +2109,7 @@ static void dequeue_rx(ns_dev * card, ns +@@ -2109,7 +2109,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) small or large buffer itself. */ } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) { printk("nicstar%d: received too big AAL5 SDU.\n", card->index); @@ -25502,7 +26036,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicst recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data, NS_MAX_IOVECS); NS_PRV_IOVCNT(iovb) = 0; -@@ -2129,7 +2129,7 @@ static void dequeue_rx(ns_dev * card, ns +@@ -2129,7 +2129,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) ("nicstar%d: Expected a small buffer, and this is not one.\n", card->index); which_list(card, skb); @@ -25511,7 +26045,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicst recycle_rx_buf(card, skb); vc->rx_iov = NULL; recycle_iov_buf(card, iovb); -@@ -2142,7 +2142,7 @@ static void dequeue_rx(ns_dev * card, ns +@@ -2142,7 +2142,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) ("nicstar%d: Expected a large buffer, and this is not one.\n", card->index); which_list(card, skb); @@ -25520,7 +26054,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicst recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data, NS_PRV_IOVCNT(iovb)); vc->rx_iov = NULL; -@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns +@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) printk(" - PDU size mismatch.\n"); else printk(".\n"); @@ -25529,7 +26063,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicst recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data, NS_PRV_IOVCNT(iovb)); vc->rx_iov = NULL; -@@ -2179,7 +2179,7 @@ static void dequeue_rx(ns_dev * card, ns +@@ -2179,7 +2179,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) /* skb points to a small buffer */ if (!atm_charge(vcc, skb->truesize)) { push_rxbufs(card, skb); @@ -25538,7 +26072,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicst } else { skb_put(skb, len); dequeue_sm_buf(card, skb); -@@ -2189,7 +2189,7 @@ static void dequeue_rx(ns_dev * card, ns +@@ -2189,7 +2189,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) ATM_SKB(skb)->vcc = vcc; __net_timestamp(skb); vcc->push(vcc, skb); @@ -25547,7 +26081,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicst } } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */ struct sk_buff *sb; -@@ -2200,7 +2200,7 @@ static void dequeue_rx(ns_dev * card, ns +@@ -2200,7 +2200,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) if (len <= NS_SMBUFSIZE) { if (!atm_charge(vcc, sb->truesize)) { push_rxbufs(card, sb); @@ -25556,7 +26090,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicst } else { skb_put(sb, len); dequeue_sm_buf(card, sb); -@@ -2210,7 +2210,7 @@ static void dequeue_rx(ns_dev * card, ns +@@ -2210,7 +2210,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) ATM_SKB(sb)->vcc = vcc; __net_timestamp(sb); vcc->push(vcc, sb); @@ -25565,7 +26099,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicst } push_rxbufs(card, skb); -@@ -2219,7 +2219,7 @@ static void dequeue_rx(ns_dev * card, ns +@@ -2219,7 +2219,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) if (!atm_charge(vcc, skb->truesize)) { push_rxbufs(card, skb); @@ -25574,7 +26108,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicst } else { dequeue_lg_buf(card, skb); #ifdef NS_USE_DESTRUCTORS -@@ -2232,7 +2232,7 @@ static void dequeue_rx(ns_dev * card, ns +@@ -2232,7 +2232,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) ATM_SKB(skb)->vcc = vcc; __net_timestamp(skb); vcc->push(vcc, skb); @@ -25583,7 +26117,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicst } push_rxbufs(card, sb); -@@ -2253,7 +2253,7 @@ static void dequeue_rx(ns_dev * card, ns +@@ -2253,7 +2253,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) printk ("nicstar%d: Out of huge buffers.\n", card->index); @@ -25592,7 +26126,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicst recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data, -@@ -2304,7 +2304,7 @@ static void dequeue_rx(ns_dev * card, ns +@@ -2304,7 +2304,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) card->hbpool.count++; } else dev_kfree_skb_any(hb); @@ -25601,7 +26135,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicst } else { /* Copy the small buffer to the huge buffer */ sb = (struct sk_buff *)iov->iov_base; -@@ -2341,7 +2341,7 @@ static void dequeue_rx(ns_dev * card, ns +@@ -2341,7 +2341,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) #endif /* NS_USE_DESTRUCTORS */ __net_timestamp(hb); vcc->push(vcc, hb); @@ -25610,9 +26144,10 @@ diff -urNp linux-2.6.38.7/drivers/atm/nicstar.c linux-2.6.38.7/drivers/atm/nicst } } -diff -urNp linux-2.6.38.7/drivers/atm/solos-pci.c linux-2.6.38.7/drivers/atm/solos-pci.c ---- linux-2.6.38.7/drivers/atm/solos-pci.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/drivers/atm/solos-pci.c 2011-05-16 21:47:08.000000000 -0400 +diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c +index b836e11..6dad74c 100644 +--- a/drivers/atm/solos-pci.c ++++ b/drivers/atm/solos-pci.c @@ -715,7 +715,7 @@ void solos_bh(unsigned long card_arg) } atm_charge(vcc, skb->truesize); @@ -25622,7 +26157,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/solos-pci.c linux-2.6.38.7/drivers/atm/sol break; case PKT_STATUS: -@@ -900,6 +900,8 @@ static int print_buffer(struct sk_buff * +@@ -900,6 +900,8 @@ static int print_buffer(struct sk_buff *buf) char msg[500]; char item[10]; @@ -25631,7 +26166,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/solos-pci.c linux-2.6.38.7/drivers/atm/sol len = buf->len; for (i = 0; i < len; i++){ if(i % 8 == 0) -@@ -1009,7 +1011,7 @@ static uint32_t fpga_tx(struct solos_car +@@ -1009,7 +1011,7 @@ static uint32_t fpga_tx(struct solos_card *card) vcc = SKB_CB(oldskb)->vcc; if (vcc) { @@ -25640,9 +26175,10 @@ diff -urNp linux-2.6.38.7/drivers/atm/solos-pci.c linux-2.6.38.7/drivers/atm/sol solos_pop(vcc, oldskb); } else dev_kfree_skb_irq(oldskb); -diff -urNp linux-2.6.38.7/drivers/atm/suni.c linux-2.6.38.7/drivers/atm/suni.c ---- linux-2.6.38.7/drivers/atm/suni.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/atm/suni.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c +index 41c56ea..83df600 100644 +--- a/drivers/atm/suni.c ++++ b/drivers/atm/suni.c @@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock); @@ -25654,10 +26190,11 @@ diff -urNp linux-2.6.38.7/drivers/atm/suni.c linux-2.6.38.7/drivers/atm/suni.c static void suni_hz(unsigned long from_timer) -diff -urNp linux-2.6.38.7/drivers/atm/uPD98402.c linux-2.6.38.7/drivers/atm/uPD98402.c ---- linux-2.6.38.7/drivers/atm/uPD98402.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/atm/uPD98402.c 2011-04-28 19:34:15.000000000 -0400 -@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d +diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c +index c45ae05..ed6f0c4 100644 +--- a/drivers/atm/uPD98402.c ++++ b/drivers/atm/uPD98402.c +@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze struct sonet_stats tmp; int error = 0; @@ -25666,7 +26203,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/uPD98402.c linux-2.6.38.7/drivers/atm/uPD9 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp); if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp)); if (zero && !error) { -@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev +@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg) #define ADD_LIMITED(s,v) \ @@ -25679,7 +26216,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/uPD98402.c linux-2.6.38.7/drivers/atm/uPD9 static void stat_event(struct atm_dev *dev) -@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev +@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev) if (reason & uPD98402_INT_PFM) stat_event(dev); if (reason & uPD98402_INT_PCO) { (void) GET(PCOCR); /* clear interrupt cause */ @@ -25688,7 +26225,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/uPD98402.c linux-2.6.38.7/drivers/atm/uPD9 &PRIV(dev)->sonet_stats.uncorr_hcs); } if ((reason & uPD98402_INT_RFO) && -@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev +@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev) PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO | uPD98402_INT_LOS),PIMR); /* enable them */ (void) fetch_stats(dev,NULL,1); /* clear kernel counters */ @@ -25701,10 +26238,11 @@ diff -urNp linux-2.6.38.7/drivers/atm/uPD98402.c linux-2.6.38.7/drivers/atm/uPD9 return 0; } -diff -urNp linux-2.6.38.7/drivers/atm/zatm.c linux-2.6.38.7/drivers/atm/zatm.c ---- linux-2.6.38.7/drivers/atm/zatm.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/atm/zatm.c 2011-04-28 19:34:15.000000000 -0400 -@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy +diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c +index 6249179..b062f45 100644 +--- a/drivers/atm/zatm.c ++++ b/drivers/atm/zatm.c +@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]); } if (!size) { dev_kfree_skb_irq(skb); @@ -25713,7 +26251,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/zatm.c linux-2.6.38.7/drivers/atm/zatm.c continue; } if (!atm_charge(vcc,skb->truesize)) { -@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy +@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]); skb->len = size; ATM_SKB(skb)->vcc = vcc; vcc->push(vcc,skb); @@ -25722,7 +26260,7 @@ diff -urNp linux-2.6.38.7/drivers/atm/zatm.c linux-2.6.38.7/drivers/atm/zatm.c } zout(pos & 0xffff,MTA(mbx)); #if 0 /* probably a stupid idea */ -@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD +@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP | skb_queue_head(&zatm_vcc->backlog,skb); break; } @@ -25731,9 +26269,10 @@ diff -urNp linux-2.6.38.7/drivers/atm/zatm.c linux-2.6.38.7/drivers/atm/zatm.c wake_up(&zatm_vcc->tx_wait); } -diff -urNp linux-2.6.38.7/drivers/base/power/wakeup.c linux-2.6.38.7/drivers/base/power/wakeup.c ---- linux-2.6.38.7/drivers/base/power/wakeup.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/base/power/wakeup.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c +index 8ec406d..f46eb8d 100644 +--- a/drivers/base/power/wakeup.c ++++ b/drivers/base/power/wakeup.c @@ -25,7 +25,7 @@ bool events_check_enabled; @@ -25743,7 +26282,7 @@ diff -urNp linux-2.6.38.7/drivers/base/power/wakeup.c linux-2.6.38.7/drivers/bas /* A preserved old value of event_count. */ static unsigned int saved_count; /* The counter of wakeup events being processed. */ -@@ -399,7 +399,7 @@ static void wakeup_source_deactivate(str +@@ -399,7 +399,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws) * pm_save_wakeup_count() don't see the old value of event_count and * events_in_progress equal to zero at the same time. */ @@ -25761,7 +26300,7 @@ diff -urNp linux-2.6.38.7/drivers/base/power/wakeup.c linux-2.6.38.7/drivers/bas || atomic_read(&events_in_progress); events_check_enabled = !ret; } -@@ -590,7 +590,7 @@ bool pm_get_wakeup_count(unsigned int *c +@@ -590,7 +590,7 @@ bool pm_get_wakeup_count(unsigned int *count) } ret = !atomic_read(&events_in_progress); @@ -25770,7 +26309,7 @@ diff -urNp linux-2.6.38.7/drivers/base/power/wakeup.c linux-2.6.38.7/drivers/bas return ret; } -@@ -608,7 +608,7 @@ bool pm_save_wakeup_count(unsigned int c +@@ -608,7 +608,7 @@ bool pm_save_wakeup_count(unsigned int count) bool ret = false; spin_lock_irq(&events_lock); @@ -25779,10 +26318,24 @@ diff -urNp linux-2.6.38.7/drivers/base/power/wakeup.c linux-2.6.38.7/drivers/bas && !atomic_read(&events_in_progress)) { saved_count = count; events_check_enabled = true; -diff -urNp linux-2.6.38.7/drivers/block/cciss.c linux-2.6.38.7/drivers/block/cciss.c ---- linux-2.6.38.7/drivers/block/cciss.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/block/cciss.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1112,6 +1112,8 @@ static int cciss_ioctl32_passthru(struct +diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c +index 1f286ab..ec4ec0e 100644 +--- a/drivers/block/DAC960.c ++++ b/drivers/block/DAC960.c +@@ -1979,6 +1979,8 @@ static bool DAC960_V1_ReadDeviceConfiguration(DAC960_Controller_T + unsigned long flags; + int Channel, TargetID; + ++ pax_track_stack(); ++ + if (!init_dma_loaf(Controller->PCIDevice, &local_dma, + DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) + + sizeof(DAC960_SCSI_Inquiry_T) + +diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c +index 9279272..a827aac 100644 +--- a/drivers/block/cciss.c ++++ b/drivers/block/cciss.c +@@ -1112,6 +1112,8 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode, int err; u32 cp; @@ -25791,10 +26344,11 @@ diff -urNp linux-2.6.38.7/drivers/block/cciss.c linux-2.6.38.7/drivers/block/cci err = 0; err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info, -diff -urNp linux-2.6.38.7/drivers/block/cpqarray.c linux-2.6.38.7/drivers/block/cpqarray.c ---- linux-2.6.38.7/drivers/block/cpqarray.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/block/cpqarray.c 2011-05-16 21:47:08.000000000 -0400 -@@ -911,6 +911,8 @@ static void do_ida_request(struct reques +diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c +index 946dad4..4bdc9e0 100644 +--- a/drivers/block/cpqarray.c ++++ b/drivers/block/cpqarray.c +@@ -911,6 +911,8 @@ static void do_ida_request(struct request_queue *q) struct scatterlist tmp_sg[SG_MAX]; int i, dir, seg; @@ -25803,21 +26357,10 @@ diff -urNp linux-2.6.38.7/drivers/block/cpqarray.c linux-2.6.38.7/drivers/block/ if (blk_queue_plugged(q)) goto startio; -diff -urNp linux-2.6.38.7/drivers/block/DAC960.c linux-2.6.38.7/drivers/block/DAC960.c ---- linux-2.6.38.7/drivers/block/DAC960.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/block/DAC960.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1979,6 +1979,8 @@ static bool DAC960_V1_ReadDeviceConfigur - unsigned long flags; - int Channel, TargetID; - -+ pax_track_stack(); -+ - if (!init_dma_loaf(Controller->PCIDevice, &local_dma, - DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) + - sizeof(DAC960_SCSI_Inquiry_T) + -diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_int.h linux-2.6.38.7/drivers/block/drbd/drbd_int.h ---- linux-2.6.38.7/drivers/block/drbd/drbd_int.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/block/drbd/drbd_int.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h +index 3803a03..b10983a 100644 +--- a/drivers/block/drbd/drbd_int.h ++++ b/drivers/block/drbd/drbd_int.h @@ -742,7 +742,7 @@ struct drbd_request; struct drbd_epoch { struct list_head list; @@ -25836,10 +26379,11 @@ diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_int.h linux-2.6.38.7/drivers/b unsigned int peer_seq; spinlock_t peer_seq_lock; unsigned int minor; -diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_main.c linux-2.6.38.7/drivers/block/drbd/drbd_main.c ---- linux-2.6.38.7/drivers/block/drbd/drbd_main.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/block/drbd/drbd_main.c 2011-04-28 19:57:25.000000000 -0400 -@@ -2217,7 +2217,7 @@ static int _drbd_send_ack(struct drbd_co +diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c +index 29cd0dc..73a73b1 100644 +--- a/drivers/block/drbd/drbd_main.c ++++ b/drivers/block/drbd/drbd_main.c +@@ -2217,7 +2217,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packets cmd, p.sector = sector; p.block_id = block_id; p.blksize = blksize; @@ -25848,7 +26392,7 @@ diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_main.c linux-2.6.38.7/drivers/ if (!mdev->meta.socket || mdev->state.conn < C_CONNECTED) return FALSE; -@@ -2517,7 +2517,7 @@ int drbd_send_dblock(struct drbd_conf *m +@@ -2517,7 +2517,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req) p.sector = cpu_to_be64(req->sector); p.block_id = (unsigned long)req; p.seq_num = cpu_to_be32(req->seq_num = @@ -25857,7 +26401,7 @@ diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_main.c linux-2.6.38.7/drivers/ dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw); -@@ -2795,7 +2795,7 @@ void drbd_init_set_defaults(struct drbd_ +@@ -2795,7 +2795,7 @@ void drbd_init_set_defaults(struct drbd_conf *mdev) atomic_set(&mdev->unacked_cnt, 0); atomic_set(&mdev->local_cnt, 0); atomic_set(&mdev->net_cnt, 0); @@ -25866,7 +26410,7 @@ diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_main.c linux-2.6.38.7/drivers/ atomic_set(&mdev->pp_in_use, 0); atomic_set(&mdev->pp_in_use_by_net, 0); atomic_set(&mdev->rs_sect_in, 0); -@@ -2866,8 +2866,8 @@ void drbd_mdev_cleanup(struct drbd_conf +@@ -2866,8 +2866,8 @@ void drbd_mdev_cleanup(struct drbd_conf *mdev) mdev->receiver.t_state); /* no need to lock it, I'm the only thread alive */ @@ -25877,10 +26421,11 @@ diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_main.c linux-2.6.38.7/drivers/ mdev->al_writ_cnt = mdev->bm_writ_cnt = mdev->read_cnt = -diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_nl.c linux-2.6.38.7/drivers/block/drbd/drbd_nl.c ---- linux-2.6.38.7/drivers/block/drbd/drbd_nl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/block/drbd/drbd_nl.c 2011-04-28 19:57:25.000000000 -0400 -@@ -2238,7 +2238,7 @@ static void drbd_connector_callback(stru +diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c +index 8cbfaa6..6b1c645 100644 +--- a/drivers/block/drbd/drbd_nl.c ++++ b/drivers/block/drbd/drbd_nl.c +@@ -2238,7 +2238,7 @@ static void drbd_connector_callback(struct cn_msg *req, struct netlink_skb_parms module_put(THIS_MODULE); } @@ -25889,7 +26434,7 @@ diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_nl.c linux-2.6.38.7/drivers/bl static unsigned short * __tl_add_blob(unsigned short *tl, enum drbd_tags tag, const void *data, -@@ -2309,7 +2309,7 @@ void drbd_bcast_state(struct drbd_conf * +@@ -2309,7 +2309,7 @@ void drbd_bcast_state(struct drbd_conf *mdev, union drbd_state state) cn_reply->id.idx = CN_IDX_DRBD; cn_reply->id.val = CN_VAL_DRBD; @@ -25898,7 +26443,7 @@ diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_nl.c linux-2.6.38.7/drivers/bl cn_reply->ack = 0; /* not used here. */ cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + (int)((char *)tl - (char *)reply->tag_list); -@@ -2341,7 +2341,7 @@ void drbd_bcast_ev_helper(struct drbd_co +@@ -2341,7 +2341,7 @@ void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name) cn_reply->id.idx = CN_IDX_DRBD; cn_reply->id.val = CN_VAL_DRBD; @@ -25907,7 +26452,7 @@ diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_nl.c linux-2.6.38.7/drivers/bl cn_reply->ack = 0; /* not used here. */ cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + (int)((char *)tl - (char *)reply->tag_list); -@@ -2416,7 +2416,7 @@ void drbd_bcast_ee(struct drbd_conf *mde +@@ -2416,7 +2416,7 @@ void drbd_bcast_ee(struct drbd_conf *mdev, cn_reply->id.idx = CN_IDX_DRBD; cn_reply->id.val = CN_VAL_DRBD; @@ -25916,7 +26461,7 @@ diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_nl.c linux-2.6.38.7/drivers/bl cn_reply->ack = 0; // not used here. cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + (int)((char*)tl - (char*)reply->tag_list); -@@ -2455,7 +2455,7 @@ void drbd_bcast_sync_progress(struct drb +@@ -2455,7 +2455,7 @@ void drbd_bcast_sync_progress(struct drbd_conf *mdev) cn_reply->id.idx = CN_IDX_DRBD; cn_reply->id.val = CN_VAL_DRBD; @@ -25925,9 +26470,10 @@ diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_nl.c linux-2.6.38.7/drivers/bl cn_reply->ack = 0; /* not used here. */ cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + (int)((char *)tl - (char *)reply->tag_list); -diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_receiver.c linux-2.6.38.7/drivers/block/drbd/drbd_receiver.c ---- linux-2.6.38.7/drivers/block/drbd/drbd_receiver.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/block/drbd/drbd_receiver.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c +index 24487d4..0ef9f70 100644 +--- a/drivers/block/drbd/drbd_receiver.c ++++ b/drivers/block/drbd/drbd_receiver.c @@ -907,7 +907,7 @@ retry: sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10; sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT; @@ -25937,7 +26483,7 @@ diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_receiver.c linux-2.6.38.7/driv mdev->peer_seq = 0; drbd_thread_start(&mdev->asender); -@@ -1001,7 +1001,7 @@ static enum finish_epoch drbd_may_finish +@@ -1001,7 +1001,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev, do { next_epoch = NULL; @@ -25946,7 +26492,7 @@ diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_receiver.c linux-2.6.38.7/driv switch (ev & ~EV_CLEANUP) { case EV_PUT: -@@ -1036,7 +1036,7 @@ static enum finish_epoch drbd_may_finish +@@ -1036,7 +1036,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev, rv = FE_DESTROYED; } else { epoch->flags = 0; @@ -25955,7 +26501,7 @@ diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_receiver.c linux-2.6.38.7/driv /* atomic_set(&epoch->active, 0); is already zero */ if (rv == FE_STILL_LIVE) rv = FE_RECYCLED; -@@ -1197,14 +1197,14 @@ static int receive_Barrier(struct drbd_c +@@ -1197,14 +1197,14 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign drbd_wait_ee_list_empty(mdev, &mdev->active_ee); drbd_flush(mdev); @@ -25972,7 +26518,7 @@ diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_receiver.c linux-2.6.38.7/driv D_ASSERT(atomic_read(&epoch->active) == 0); D_ASSERT(epoch->flags == 0); -@@ -1216,11 +1216,11 @@ static int receive_Barrier(struct drbd_c +@@ -1216,11 +1216,11 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign } epoch->flags = 0; @@ -25986,7 +26532,7 @@ diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_receiver.c linux-2.6.38.7/driv list_add(&epoch->list, &mdev->current_epoch->list); mdev->current_epoch = epoch; mdev->epochs++; -@@ -1663,7 +1663,7 @@ static int receive_Data(struct drbd_conf +@@ -1663,7 +1663,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned spin_unlock(&mdev->peer_seq_lock); drbd_send_ack_dp(mdev, P_NEG_ACK, p, data_size); @@ -25995,7 +26541,7 @@ diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_receiver.c linux-2.6.38.7/driv return drbd_drain_block(mdev, data_size); } -@@ -1683,7 +1683,7 @@ static int receive_Data(struct drbd_conf +@@ -1683,7 +1683,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned spin_lock(&mdev->epoch_lock); e->epoch = mdev->current_epoch; @@ -26004,7 +26550,7 @@ diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_receiver.c linux-2.6.38.7/driv atomic_inc(&e->epoch->active); spin_unlock(&mdev->epoch_lock); -@@ -1866,7 +1866,7 @@ static int receive_Data(struct drbd_conf +@@ -1866,7 +1866,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned out_interrupted: /* yes, the epoch_size now is imbalanced. * but we drop the connection anyways, so we don't have a chance to @@ -26013,7 +26559,7 @@ diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_receiver.c linux-2.6.38.7/driv put_ldev(mdev); drbd_free_ee(mdev, e); return FALSE; -@@ -3821,7 +3821,7 @@ static void drbd_disconnect(struct drbd_ +@@ -3821,7 +3821,7 @@ static void drbd_disconnect(struct drbd_conf *mdev) D_ASSERT(list_empty(&mdev->done_ee)); /* ok, no more ee's on the fly, it is safe to reset the epoch_size */ @@ -26022,10 +26568,11 @@ diff -urNp linux-2.6.38.7/drivers/block/drbd/drbd_receiver.c linux-2.6.38.7/driv D_ASSERT(list_empty(&mdev->current_epoch->list)); } -diff -urNp linux-2.6.38.7/drivers/block/nbd.c linux-2.6.38.7/drivers/block/nbd.c ---- linux-2.6.38.7/drivers/block/nbd.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/block/nbd.c 2011-05-16 21:47:08.000000000 -0400 -@@ -157,6 +157,8 @@ static int sock_xmit(struct nbd_device * +diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c +index e6fc716..e8f59e5 100644 +--- a/drivers/block/nbd.c ++++ b/drivers/block/nbd.c +@@ -157,6 +157,8 @@ static int sock_xmit(struct nbd_device *lo, int send, void *buf, int size, struct kvec iov; sigset_t blocked, oldset; @@ -26034,7 +26581,7 @@ diff -urNp linux-2.6.38.7/drivers/block/nbd.c linux-2.6.38.7/drivers/block/nbd.c if (unlikely(!sock)) { printk(KERN_ERR "%s: Attempted %s on closed socket in sock_xmit\n", lo->disk->disk_name, (send ? "send" : "recv")); -@@ -571,6 +573,8 @@ static void do_nbd_request(struct reques +@@ -571,6 +573,8 @@ static void do_nbd_request(struct request_queue *q) static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo, unsigned int cmd, unsigned long arg) { @@ -26043,10 +26590,33 @@ diff -urNp linux-2.6.38.7/drivers/block/nbd.c linux-2.6.38.7/drivers/block/nbd.c switch (cmd) { case NBD_DISCONNECT: { struct request sreq; -diff -urNp linux-2.6.38.7/drivers/char/agp/frontend.c linux-2.6.38.7/drivers/char/agp/frontend.c ---- linux-2.6.38.7/drivers/char/agp/frontend.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/char/agp/frontend.c 2011-04-28 19:34:15.000000000 -0400 -@@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct ag +diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig +index b7980a83..fda31bb 100644 +--- a/drivers/char/Kconfig ++++ b/drivers/char/Kconfig +@@ -90,7 +90,8 @@ config VT_HW_CONSOLE_BINDING + + config DEVKMEM + bool "/dev/kmem virtual device support" +- default y ++ default n ++ depends on !GRKERNSEC_KMEM + help + Say Y here if you want to support the /dev/kmem device. The + /dev/kmem device is rarely used, but can be used for certain +@@ -1132,6 +1133,7 @@ config DEVPORT + bool + depends on !M68K + depends on ISA || PCI ++ depends on !GRKERNSEC_KMEM + default y + + source "drivers/s390/char/Kconfig" +diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c +index 2e04433..22afc64 100644 +--- a/drivers/char/agp/frontend.c ++++ b/drivers/char/agp/frontend.c +@@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg) if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) return -EFAULT; @@ -26055,9 +26625,10 @@ diff -urNp linux-2.6.38.7/drivers/char/agp/frontend.c linux-2.6.38.7/drivers/cha return -EFAULT; client = agp_find_client_by_pid(reserve.pid); -diff -urNp linux-2.6.38.7/drivers/char/briq_panel.c linux-2.6.38.7/drivers/char/briq_panel.c ---- linux-2.6.38.7/drivers/char/briq_panel.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/char/briq_panel.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c +index 095ab90..afad0a4 100644 +--- a/drivers/char/briq_panel.c ++++ b/drivers/char/briq_panel.c @@ -9,6 +9,7 @@ #include <linux/types.h> #include <linux/errno.h> @@ -26074,7 +26645,7 @@ diff -urNp linux-2.6.38.7/drivers/char/briq_panel.c linux-2.6.38.7/drivers/char/ static void update_vfd(void) { -@@ -140,12 +142,15 @@ static ssize_t briq_panel_write(struct f +@@ -140,12 +142,15 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_ if (!vfd_is_open) return -EBUSY; @@ -26091,7 +26662,7 @@ diff -urNp linux-2.6.38.7/drivers/char/briq_panel.c linux-2.6.38.7/drivers/char/ if (esc) { set_led(c); esc = 0; -@@ -175,6 +180,7 @@ static ssize_t briq_panel_write(struct f +@@ -175,6 +180,7 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_ buf++; } update_vfd(); @@ -26099,10 +26670,11 @@ diff -urNp linux-2.6.38.7/drivers/char/briq_panel.c linux-2.6.38.7/drivers/char/ return len; } -diff -urNp linux-2.6.38.7/drivers/char/genrtc.c linux-2.6.38.7/drivers/char/genrtc.c ---- linux-2.6.38.7/drivers/char/genrtc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/char/genrtc.c 2011-04-28 19:34:15.000000000 -0400 -@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *fi +diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c +index f773a9d..65cd683 100644 +--- a/drivers/char/genrtc.c ++++ b/drivers/char/genrtc.c +@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file, switch (cmd) { case RTC_PLL_GET: @@ -26110,10 +26682,11 @@ diff -urNp linux-2.6.38.7/drivers/char/genrtc.c linux-2.6.38.7/drivers/char/genr if (get_rtc_pll(&pll)) return -EINVAL; else -diff -urNp linux-2.6.38.7/drivers/char/hpet.c linux-2.6.38.7/drivers/char/hpet.c ---- linux-2.6.38.7/drivers/char/hpet.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/char/hpet.c 2011-04-28 19:34:15.000000000 -0400 -@@ -553,7 +553,7 @@ static inline unsigned long hpet_time_di +diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c +index 7066e80..2f854be 100644 +--- a/drivers/char/hpet.c ++++ b/drivers/char/hpet.c +@@ -553,7 +553,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets, } static int @@ -26122,9 +26695,10 @@ diff -urNp linux-2.6.38.7/drivers/char/hpet.c linux-2.6.38.7/drivers/char/hpet.c struct hpet_info *info) { struct hpet_timer __iomem *timer; -diff -urNp linux-2.6.38.7/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.38.7/drivers/char/ipmi/ipmi_msghandler.c ---- linux-2.6.38.7/drivers/char/ipmi/ipmi_msghandler.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/char/ipmi/ipmi_msghandler.c 2011-05-16 21:47:08.000000000 -0400 +diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c +index 38223e9..8841897 100644 +--- a/drivers/char/ipmi/ipmi_msghandler.c ++++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -414,7 +414,7 @@ struct ipmi_smi { struct proc_dir_entry *proc_dir; char proc_dir_name[10]; @@ -26146,7 +26720,7 @@ diff -urNp linux-2.6.38.7/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.38.7/dri static int is_lan_addr(struct ipmi_addr *addr) { -@@ -2844,7 +2844,7 @@ int ipmi_register_smi(struct ipmi_smi_ha +@@ -2844,7 +2844,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers, INIT_LIST_HEAD(&intf->cmd_rcvrs); init_waitqueue_head(&intf->waitq); for (i = 0; i < IPMI_NUM_STATS; i++) @@ -26164,9 +26738,10 @@ diff -urNp linux-2.6.38.7/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.38.7/dri si = (struct ipmi_system_interface_addr *) &addr; si->addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE; si->channel = IPMI_BMC_CHANNEL; -diff -urNp linux-2.6.38.7/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.38.7/drivers/char/ipmi/ipmi_si_intf.c ---- linux-2.6.38.7/drivers/char/ipmi/ipmi_si_intf.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/char/ipmi/ipmi_si_intf.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c +index 62787e3..861f9d3 100644 +--- a/drivers/char/ipmi/ipmi_si_intf.c ++++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -285,7 +285,7 @@ struct smi_info { unsigned char slave_addr; @@ -26188,7 +26763,7 @@ diff -urNp linux-2.6.38.7/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.38.7/driver #define SI_MAX_PARMS 4 -@@ -3202,7 +3202,7 @@ static int try_smi_init(struct smi_info +@@ -3202,7 +3202,7 @@ static int try_smi_init(struct smi_info *new_smi) atomic_set(&new_smi->req_events, 0); new_smi->run_to_completion = 0; for (i = 0; i < SI_NUM_STATS; i++) @@ -26197,10 +26772,11 @@ diff -urNp linux-2.6.38.7/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.38.7/driver new_smi->interrupt_disabled = 1; atomic_set(&new_smi->stop_operation, 0); -diff -urNp linux-2.6.38.7/drivers/char/istallion.c linux-2.6.38.7/drivers/char/istallion.c ---- linux-2.6.38.7/drivers/char/istallion.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/char/istallion.c 2011-05-16 21:47:08.000000000 -0400 -@@ -186,7 +186,6 @@ static struct ktermios stli_deftermios +diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c +index 7c6de4c..e19e6ac 100644 +--- a/drivers/char/istallion.c ++++ b/drivers/char/istallion.c +@@ -186,7 +186,6 @@ static struct ktermios stli_deftermios = { * re-used for each stats call. */ static comstats_t stli_comstats; @@ -26208,7 +26784,7 @@ diff -urNp linux-2.6.38.7/drivers/char/istallion.c linux-2.6.38.7/drivers/char/i static struct asystats stli_cdkstats; /*****************************************************************************/ -@@ -4005,6 +4004,7 @@ static int stli_getbrdstats(combrd_t __u +@@ -4005,6 +4004,7 @@ static int stli_getbrdstats(combrd_t __user *bp) { struct stlibrd *brdp; unsigned int i; @@ -26216,7 +26792,7 @@ diff -urNp linux-2.6.38.7/drivers/char/istallion.c linux-2.6.38.7/drivers/char/i if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t))) return -EFAULT; -@@ -4226,6 +4226,8 @@ static int stli_getportstruct(struct stl +@@ -4226,6 +4226,8 @@ static int stli_getportstruct(struct stliport __user *arg) struct stliport stli_dummyport; struct stliport *portp; @@ -26225,7 +26801,7 @@ diff -urNp linux-2.6.38.7/drivers/char/istallion.c linux-2.6.38.7/drivers/char/i if (copy_from_user(&stli_dummyport, arg, sizeof(struct stliport))) return -EFAULT; portp = stli_getport(stli_dummyport.brdnr, stli_dummyport.panelnr, -@@ -4248,6 +4250,8 @@ static int stli_getbrdstruct(struct stli +@@ -4248,6 +4250,8 @@ static int stli_getbrdstruct(struct stlibrd __user *arg) struct stlibrd stli_dummybrd; struct stlibrd *brdp; @@ -26234,30 +26810,10 @@ diff -urNp linux-2.6.38.7/drivers/char/istallion.c linux-2.6.38.7/drivers/char/i if (copy_from_user(&stli_dummybrd, arg, sizeof(struct stlibrd))) return -EFAULT; if (stli_dummybrd.brdnr >= STL_MAXBRDS) -diff -urNp linux-2.6.38.7/drivers/char/Kconfig linux-2.6.38.7/drivers/char/Kconfig ---- linux-2.6.38.7/drivers/char/Kconfig 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/char/Kconfig 2011-04-28 19:34:15.000000000 -0400 -@@ -90,7 +90,8 @@ config VT_HW_CONSOLE_BINDING - - config DEVKMEM - bool "/dev/kmem virtual device support" -- default y -+ default n -+ depends on !GRKERNSEC_KMEM - help - Say Y here if you want to support the /dev/kmem device. The - /dev/kmem device is rarely used, but can be used for certain -@@ -1132,6 +1133,7 @@ config DEVPORT - bool - depends on !M68K - depends on ISA || PCI -+ depends on !GRKERNSEC_KMEM - default y - - source "drivers/s390/char/Kconfig" -diff -urNp linux-2.6.38.7/drivers/char/mem.c linux-2.6.38.7/drivers/char/mem.c ---- linux-2.6.38.7/drivers/char/mem.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/char/mem.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/char/mem.c b/drivers/char/mem.c +index 1256454..490ed2f 100644 +--- a/drivers/char/mem.c ++++ b/drivers/char/mem.c @@ -18,6 +18,7 @@ #include <linux/raw.h> #include <linux/tty.h> @@ -26277,7 +26833,7 @@ diff -urNp linux-2.6.38.7/drivers/char/mem.c linux-2.6.38.7/drivers/char/mem.c static inline unsigned long size_inside_page(unsigned long start, unsigned long size) { -@@ -68,9 +73,13 @@ static inline int range_is_allowed(unsig +@@ -68,9 +73,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size) while (cursor < to) { if (!devmem_is_allowed(pfn)) { @@ -26291,7 +26847,7 @@ diff -urNp linux-2.6.38.7/drivers/char/mem.c linux-2.6.38.7/drivers/char/mem.c return 0; } cursor += PAGE_SIZE; -@@ -78,6 +87,11 @@ static inline int range_is_allowed(unsig +@@ -78,6 +87,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size) } return 1; } @@ -26303,7 +26859,7 @@ diff -urNp linux-2.6.38.7/drivers/char/mem.c linux-2.6.38.7/drivers/char/mem.c #else static inline int range_is_allowed(unsigned long pfn, unsigned long size) { -@@ -120,6 +134,7 @@ static ssize_t read_mem(struct file *fil +@@ -120,6 +134,7 @@ static ssize_t read_mem(struct file *file, char __user *buf, while (count > 0) { unsigned long remaining; @@ -26311,7 +26867,7 @@ diff -urNp linux-2.6.38.7/drivers/char/mem.c linux-2.6.38.7/drivers/char/mem.c sz = size_inside_page(p, count); -@@ -135,7 +150,23 @@ static ssize_t read_mem(struct file *fil +@@ -135,7 +150,23 @@ static ssize_t read_mem(struct file *file, char __user *buf, if (!ptr) return -EFAULT; @@ -26336,7 +26892,7 @@ diff -urNp linux-2.6.38.7/drivers/char/mem.c linux-2.6.38.7/drivers/char/mem.c unxlate_dev_mem_ptr(p, ptr); if (remaining) return -EFAULT; -@@ -398,9 +429,8 @@ static ssize_t read_kmem(struct file *fi +@@ -398,9 +429,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf, size_t count, loff_t *ppos) { unsigned long p = *ppos; @@ -26347,7 +26903,7 @@ diff -urNp linux-2.6.38.7/drivers/char/mem.c linux-2.6.38.7/drivers/char/mem.c read = 0; if (p < (unsigned long) high_memory) { -@@ -422,6 +452,8 @@ static ssize_t read_kmem(struct file *fi +@@ -422,6 +452,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf, } #endif while (low_count > 0) { @@ -26356,7 +26912,7 @@ diff -urNp linux-2.6.38.7/drivers/char/mem.c linux-2.6.38.7/drivers/char/mem.c sz = size_inside_page(p, low_count); /* -@@ -431,7 +463,22 @@ static ssize_t read_kmem(struct file *fi +@@ -431,7 +463,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf, */ kbuf = xlate_dev_kmem_ptr((char *)p); @@ -26390,10 +26946,11 @@ diff -urNp linux-2.6.38.7/drivers/char/mem.c linux-2.6.38.7/drivers/char/mem.c }; static int memory_open(struct inode *inode, struct file *filp) -diff -urNp linux-2.6.38.7/drivers/char/nvram.c linux-2.6.38.7/drivers/char/nvram.c ---- linux-2.6.38.7/drivers/char/nvram.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/char/nvram.c 2011-04-28 19:34:15.000000000 -0400 -@@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f +diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c +index 166f1e7..c579d46 100644 +--- a/drivers/char/nvram.c ++++ b/drivers/char/nvram.c +@@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf, spin_unlock_irq(&rtc_lock); @@ -26402,9 +26959,10 @@ diff -urNp linux-2.6.38.7/drivers/char/nvram.c linux-2.6.38.7/drivers/char/nvram return -EFAULT; *ppos = i; -diff -urNp linux-2.6.38.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.7/drivers/char/pcmcia/ipwireless/tty.c ---- linux-2.6.38.7/drivers/char/pcmcia/ipwireless/tty.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/char/pcmcia/ipwireless/tty.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/char/pcmcia/ipwireless/tty.c +index f5eb28b..490c9e0 100644 +--- a/drivers/char/pcmcia/ipwireless/tty.c ++++ b/drivers/char/pcmcia/ipwireless/tty.c @@ -29,6 +29,7 @@ #include <linux/tty_driver.h> #include <linux/tty_flip.h> @@ -26422,7 +26980,7 @@ diff -urNp linux-2.6.38.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.7/dr unsigned int control_lines; struct mutex ipw_tty_mutex; int tx_bytes_queued; -@@ -127,10 +128,10 @@ static int ipw_open(struct tty_struct *l +@@ -127,10 +128,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp) mutex_unlock(&tty->ipw_tty_mutex); return -ENODEV; } @@ -26435,7 +26993,7 @@ diff -urNp linux-2.6.38.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.7/dr tty->linux_tty = linux_tty; linux_tty->driver_data = tty; -@@ -146,9 +147,7 @@ static int ipw_open(struct tty_struct *l +@@ -146,9 +147,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp) static void do_ipw_close(struct ipw_tty *tty) { @@ -26446,7 +27004,7 @@ diff -urNp linux-2.6.38.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.7/dr struct tty_struct *linux_tty = tty->linux_tty; if (linux_tty != NULL) { -@@ -169,7 +168,7 @@ static void ipw_hangup(struct tty_struct +@@ -169,7 +168,7 @@ static void ipw_hangup(struct tty_struct *linux_tty) return; mutex_lock(&tty->ipw_tty_mutex); @@ -26455,7 +27013,7 @@ diff -urNp linux-2.6.38.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.7/dr mutex_unlock(&tty->ipw_tty_mutex); return; } -@@ -198,7 +197,7 @@ void ipwireless_tty_received(struct ipw_ +@@ -198,7 +197,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data, return; } @@ -26464,7 +27022,7 @@ diff -urNp linux-2.6.38.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.7/dr mutex_unlock(&tty->ipw_tty_mutex); return; } -@@ -240,7 +239,7 @@ static int ipw_write(struct tty_struct * +@@ -240,7 +239,7 @@ static int ipw_write(struct tty_struct *linux_tty, return -ENODEV; mutex_lock(&tty->ipw_tty_mutex); @@ -26473,7 +27031,7 @@ diff -urNp linux-2.6.38.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.7/dr mutex_unlock(&tty->ipw_tty_mutex); return -EINVAL; } -@@ -280,7 +279,7 @@ static int ipw_write_room(struct tty_str +@@ -280,7 +279,7 @@ static int ipw_write_room(struct tty_struct *linux_tty) if (!tty) return -ENODEV; @@ -26482,7 +27040,7 @@ diff -urNp linux-2.6.38.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.7/dr return -EINVAL; room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued; -@@ -322,7 +321,7 @@ static int ipw_chars_in_buffer(struct tt +@@ -322,7 +321,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty) if (!tty) return 0; @@ -26491,7 +27049,7 @@ diff -urNp linux-2.6.38.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.7/dr return 0; return tty->tx_bytes_queued; -@@ -403,7 +402,7 @@ static int ipw_tiocmget(struct tty_struc +@@ -403,7 +402,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty, struct file *file) if (!tty) return -ENODEV; @@ -26500,7 +27058,7 @@ diff -urNp linux-2.6.38.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.7/dr return -EINVAL; return get_control_lines(tty); -@@ -419,7 +418,7 @@ ipw_tiocmset(struct tty_struct *linux_tt +@@ -419,7 +418,7 @@ ipw_tiocmset(struct tty_struct *linux_tty, struct file *file, if (!tty) return -ENODEV; @@ -26509,7 +27067,7 @@ diff -urNp linux-2.6.38.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.7/dr return -EINVAL; return set_control_lines(tty, set, clear); -@@ -433,7 +432,7 @@ static int ipw_ioctl(struct tty_struct * +@@ -433,7 +432,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty, struct file *file, if (!tty) return -ENODEV; @@ -26518,7 +27076,7 @@ diff -urNp linux-2.6.38.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.7/dr return -EINVAL; /* FIXME: Exactly how is the tty object locked here .. */ -@@ -582,7 +581,7 @@ void ipwireless_tty_free(struct ipw_tty +@@ -582,7 +581,7 @@ void ipwireless_tty_free(struct ipw_tty *tty) against a parallel ioctl etc */ mutex_lock(&ttyj->ipw_tty_mutex); } @@ -26527,9 +27085,10 @@ diff -urNp linux-2.6.38.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.7/dr do_ipw_close(ttyj); ipwireless_disassociate_network_ttys(network, ttyj->channel_idx); -diff -urNp linux-2.6.38.7/drivers/char/random.c linux-2.6.38.7/drivers/char/random.c ---- linux-2.6.38.7/drivers/char/random.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/char/random.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/char/random.c b/drivers/char/random.c +index 72a4fcb..b0c09f2 100644 +--- a/drivers/char/random.c ++++ b/drivers/char/random.c @@ -254,8 +254,13 @@ /* * Configuration information @@ -26562,7 +27121,7 @@ diff -urNp linux-2.6.38.7/drivers/char/random.c linux-2.6.38.7/drivers/char/rand #if 0 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */ { 2048, 1638, 1231, 819, 411, 1 }, -@@ -902,7 +914,7 @@ static ssize_t extract_entropy_user(stru +@@ -902,7 +914,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf, extract_buf(r, tmp); i = min_t(int, nbytes, EXTRACT_SIZE); @@ -26580,10 +27139,11 @@ diff -urNp linux-2.6.38.7/drivers/char/random.c linux-2.6.38.7/drivers/char/rand static int max_write_thresh = INPUT_POOL_WORDS * 32; static char sysctl_bootid[16]; -diff -urNp linux-2.6.38.7/drivers/char/rocket.c linux-2.6.38.7/drivers/char/rocket.c ---- linux-2.6.38.7/drivers/char/rocket.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/char/rocket.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1277,6 +1277,8 @@ static int get_ports(struct r_port *info +diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c +index 3e4e73a..a45a6ba 100644 +--- a/drivers/char/rocket.c ++++ b/drivers/char/rocket.c +@@ -1277,6 +1277,8 @@ static int get_ports(struct r_port *info, struct rocket_ports __user *retports) struct rocket_ports tmp; int board; @@ -26592,9 +27152,10 @@ diff -urNp linux-2.6.38.7/drivers/char/rocket.c linux-2.6.38.7/drivers/char/rock if (!retports) return -EFAULT; memset(&tmp, 0, sizeof (tmp)); -diff -urNp linux-2.6.38.7/drivers/char/sonypi.c linux-2.6.38.7/drivers/char/sonypi.c ---- linux-2.6.38.7/drivers/char/sonypi.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/char/sonypi.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c +index 79e36c8..dbfcc65 100644 +--- a/drivers/char/sonypi.c ++++ b/drivers/char/sonypi.c @@ -55,6 +55,7 @@ #include <asm/uaccess.h> #include <asm/io.h> @@ -26612,7 +27173,7 @@ diff -urNp linux-2.6.38.7/drivers/char/sonypi.c linux-2.6.38.7/drivers/char/sony int model; struct input_dev *input_jog_dev; struct input_dev *input_key_dev; -@@ -898,7 +899,7 @@ static int sonypi_misc_fasync(int fd, st +@@ -898,7 +899,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on) static int sonypi_misc_release(struct inode *inode, struct file *file) { mutex_lock(&sonypi_device.lock); @@ -26621,7 +27182,7 @@ diff -urNp linux-2.6.38.7/drivers/char/sonypi.c linux-2.6.38.7/drivers/char/sony mutex_unlock(&sonypi_device.lock); return 0; } -@@ -907,9 +908,9 @@ static int sonypi_misc_open(struct inode +@@ -907,9 +908,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file) { mutex_lock(&sonypi_device.lock); /* Flush input queue on first open */ @@ -26633,10 +27194,11 @@ diff -urNp linux-2.6.38.7/drivers/char/sonypi.c linux-2.6.38.7/drivers/char/sony mutex_unlock(&sonypi_device.lock); return 0; -diff -urNp linux-2.6.38.7/drivers/char/stallion.c linux-2.6.38.7/drivers/char/stallion.c ---- linux-2.6.38.7/drivers/char/stallion.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/char/stallion.c 2011-05-16 21:47:08.000000000 -0400 -@@ -2407,6 +2407,8 @@ static int stl_getportstruct(struct stlp +diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c +index 461a5a0..e4cf4dc 100644 +--- a/drivers/char/stallion.c ++++ b/drivers/char/stallion.c +@@ -2407,6 +2407,8 @@ static int stl_getportstruct(struct stlport __user *arg) struct stlport stl_dummyport; struct stlport *portp; @@ -26645,10 +27207,33 @@ diff -urNp linux-2.6.38.7/drivers/char/stallion.c linux-2.6.38.7/drivers/char/st if (copy_from_user(&stl_dummyport, arg, sizeof(struct stlport))) return -EFAULT; portp = stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr, -diff -urNp linux-2.6.38.7/drivers/char/tpm/tpm_bios.c linux-2.6.38.7/drivers/char/tpm/tpm_bios.c ---- linux-2.6.38.7/drivers/char/tpm/tpm_bios.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/char/tpm/tpm_bios.c 2011-04-28 19:34:15.000000000 -0400 -@@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start +diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c +index 7beb0e2..c2ec85b 100644 +--- a/drivers/char/tpm/tpm.c ++++ b/drivers/char/tpm/tpm.c +@@ -411,7 +411,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf, + chip->vendor.req_complete_val) + goto out_recv; + +- if ((status == chip->vendor.req_canceled)) { ++ if (status == chip->vendor.req_canceled) { + dev_err(chip->dev, "Operation Canceled\n"); + rc = -ECANCELED; + goto out; +@@ -844,6 +844,8 @@ ssize_t tpm_show_pubek(struct device *dev, struct device_attribute *attr, + + struct tpm_chip *chip = dev_get_drvdata(dev); + ++ pax_track_stack(); ++ + tpm_cmd.header.in = tpm_readpubek_header; + err = transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE, + "attempting to read the PUBEK"); +diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c +index 0636520..b29fde6 100644 +--- a/drivers/char/tpm/tpm_bios.c ++++ b/drivers/char/tpm/tpm_bios.c +@@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos) event = addr; if ((event->event_type == 0 && event->event_size == 0) || @@ -26657,7 +27242,7 @@ diff -urNp linux-2.6.38.7/drivers/char/tpm/tpm_bios.c linux-2.6.38.7/drivers/cha return NULL; return addr; -@@ -198,7 +198,7 @@ static void *tpm_bios_measurements_next( +@@ -198,7 +198,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v, return NULL; if ((event->event_type == 0 && event->event_size == 0) || @@ -26666,7 +27251,7 @@ diff -urNp linux-2.6.38.7/drivers/char/tpm/tpm_bios.c linux-2.6.38.7/drivers/cha return NULL; (*pos)++; -@@ -291,7 +291,8 @@ static int tpm_binary_bios_measurements_ +@@ -291,7 +291,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v) int i; for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++) @@ -26676,7 +27261,7 @@ diff -urNp linux-2.6.38.7/drivers/char/tpm/tpm_bios.c linux-2.6.38.7/drivers/cha return 0; } -@@ -410,6 +411,11 @@ static int read_log(struct tpm_bios_log +@@ -410,6 +411,11 @@ static int read_log(struct tpm_bios_log *log) log->bios_event_log_end = log->bios_event_log + len; virt = acpi_os_map_memory(start, len); @@ -26688,31 +27273,11 @@ diff -urNp linux-2.6.38.7/drivers/char/tpm/tpm_bios.c linux-2.6.38.7/drivers/cha memcpy(log->bios_event_log, virt, len); -diff -urNp linux-2.6.38.7/drivers/char/tpm/tpm.c linux-2.6.38.7/drivers/char/tpm/tpm.c ---- linux-2.6.38.7/drivers/char/tpm/tpm.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/drivers/char/tpm/tpm.c 2011-05-16 21:47:08.000000000 -0400 -@@ -411,7 +411,7 @@ static ssize_t tpm_transmit(struct tpm_c - chip->vendor.req_complete_val) - goto out_recv; - -- if ((status == chip->vendor.req_canceled)) { -+ if (status == chip->vendor.req_canceled) { - dev_err(chip->dev, "Operation Canceled\n"); - rc = -ECANCELED; - goto out; -@@ -844,6 +844,8 @@ ssize_t tpm_show_pubek(struct device *de - - struct tpm_chip *chip = dev_get_drvdata(dev); - -+ pax_track_stack(); -+ - tpm_cmd.header.in = tpm_readpubek_header; - err = transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE, - "attempting to read the PUBEK"); -diff -urNp linux-2.6.38.7/drivers/cpuidle/sysfs.c linux-2.6.38.7/drivers/cpuidle/sysfs.c ---- linux-2.6.38.7/drivers/cpuidle/sysfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/cpuidle/sysfs.c 2011-04-28 19:34:15.000000000 -0400 -@@ -300,7 +300,7 @@ static struct kobj_type ktype_state_cpui +diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c +index 0310ffa..be7917ec 100644 +--- a/drivers/cpuidle/sysfs.c ++++ b/drivers/cpuidle/sysfs.c +@@ -300,7 +300,7 @@ static struct kobj_type ktype_state_cpuidle = { .release = cpuidle_state_sysfs_release, }; @@ -26721,10 +27286,11 @@ diff -urNp linux-2.6.38.7/drivers/cpuidle/sysfs.c linux-2.6.38.7/drivers/cpuidle { kobject_put(&device->kobjs[i]->kobj); wait_for_completion(&device->kobjs[i]->kobj_unregister); -diff -urNp linux-2.6.38.7/drivers/crypto/hifn_795x.c linux-2.6.38.7/drivers/crypto/hifn_795x.c ---- linux-2.6.38.7/drivers/crypto/hifn_795x.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/crypto/hifn_795x.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device +diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c +index a84250a..68c725e 100644 +--- a/drivers/crypto/hifn_795x.c ++++ b/drivers/crypto/hifn_795x.c +@@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device *dev, int encdec, u8 snum) 0xCA, 0x34, 0x2B, 0x2E}; struct scatterlist sg; @@ -26733,10 +27299,11 @@ diff -urNp linux-2.6.38.7/drivers/crypto/hifn_795x.c linux-2.6.38.7/drivers/cryp memset(src, 0, sizeof(src)); memset(ctx.key, 0, sizeof(ctx.key)); -diff -urNp linux-2.6.38.7/drivers/crypto/padlock-aes.c linux-2.6.38.7/drivers/crypto/padlock-aes.c ---- linux-2.6.38.7/drivers/crypto/padlock-aes.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/crypto/padlock-aes.c 2011-05-16 21:47:08.000000000 -0400 -@@ -109,6 +109,8 @@ static int aes_set_key(struct crypto_tfm +diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c +index db33d30..7823369 100644 +--- a/drivers/crypto/padlock-aes.c ++++ b/drivers/crypto/padlock-aes.c +@@ -109,6 +109,8 @@ static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key, struct crypto_aes_ctx gen_aes; int cpu; @@ -26745,10 +27312,11 @@ diff -urNp linux-2.6.38.7/drivers/crypto/padlock-aes.c linux-2.6.38.7/drivers/cr if (key_len % 8) { *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN; return -EINVAL; -diff -urNp linux-2.6.38.7/drivers/edac/edac_mc_sysfs.c linux-2.6.38.7/drivers/edac/edac_mc_sysfs.c ---- linux-2.6.38.7/drivers/edac/edac_mc_sysfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/edac/edac_mc_sysfs.c 2011-04-28 19:34:15.000000000 -0400 -@@ -761,7 +761,7 @@ static void edac_inst_grp_release(struct +diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c +index 39d97cf..4861b39 100644 +--- a/drivers/edac/edac_mc_sysfs.c ++++ b/drivers/edac/edac_mc_sysfs.c +@@ -761,7 +761,7 @@ static void edac_inst_grp_release(struct kobject *kobj) } /* Intermediate show/store table */ @@ -26757,10 +27325,11 @@ diff -urNp linux-2.6.38.7/drivers/edac/edac_mc_sysfs.c linux-2.6.38.7/drivers/ed .show = inst_grp_show, .store = inst_grp_store }; -diff -urNp linux-2.6.38.7/drivers/edac/edac_pci_sysfs.c linux-2.6.38.7/drivers/edac/edac_pci_sysfs.c ---- linux-2.6.38.7/drivers/edac/edac_pci_sysfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/edac/edac_pci_sysfs.c 2011-04-28 19:57:25.000000000 -0400 -@@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log +diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c +index 023b01c..1289a23 100644 +--- a/drivers/edac/edac_pci_sysfs.c ++++ b/drivers/edac/edac_pci_sysfs.c +@@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */ static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */ static int edac_pci_poll_msec = 1000; /* one second workq period */ @@ -26771,7 +27340,7 @@ diff -urNp linux-2.6.38.7/drivers/edac/edac_pci_sysfs.c linux-2.6.38.7/drivers/e static struct kobject *edac_pci_top_main_kobj; static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0); -@@ -582,7 +582,7 @@ static void edac_pci_dev_parity_test(str +@@ -582,7 +582,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev) edac_printk(KERN_CRIT, EDAC_PCI, "Signaled System Error on %s\n", pci_name(dev)); @@ -26780,7 +27349,7 @@ diff -urNp linux-2.6.38.7/drivers/edac/edac_pci_sysfs.c linux-2.6.38.7/drivers/e } if (status & (PCI_STATUS_PARITY)) { -@@ -590,7 +590,7 @@ static void edac_pci_dev_parity_test(str +@@ -590,7 +590,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev) "Master Data Parity Error on %s\n", pci_name(dev)); @@ -26789,7 +27358,7 @@ diff -urNp linux-2.6.38.7/drivers/edac/edac_pci_sysfs.c linux-2.6.38.7/drivers/e } if (status & (PCI_STATUS_DETECTED_PARITY)) { -@@ -598,7 +598,7 @@ static void edac_pci_dev_parity_test(str +@@ -598,7 +598,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev) "Detected Parity Error on %s\n", pci_name(dev)); @@ -26798,7 +27367,7 @@ diff -urNp linux-2.6.38.7/drivers/edac/edac_pci_sysfs.c linux-2.6.38.7/drivers/e } } -@@ -619,7 +619,7 @@ static void edac_pci_dev_parity_test(str +@@ -619,7 +619,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev) edac_printk(KERN_CRIT, EDAC_PCI, "Bridge " "Signaled System Error on %s\n", pci_name(dev)); @@ -26807,7 +27376,7 @@ diff -urNp linux-2.6.38.7/drivers/edac/edac_pci_sysfs.c linux-2.6.38.7/drivers/e } if (status & (PCI_STATUS_PARITY)) { -@@ -627,7 +627,7 @@ static void edac_pci_dev_parity_test(str +@@ -627,7 +627,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev) "Master Data Parity Error on " "%s\n", pci_name(dev)); @@ -26816,7 +27385,7 @@ diff -urNp linux-2.6.38.7/drivers/edac/edac_pci_sysfs.c linux-2.6.38.7/drivers/e } if (status & (PCI_STATUS_DETECTED_PARITY)) { -@@ -635,7 +635,7 @@ static void edac_pci_dev_parity_test(str +@@ -635,7 +635,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev) "Detected Parity Error on %s\n", pci_name(dev)); @@ -26843,10 +27412,11 @@ diff -urNp linux-2.6.38.7/drivers/edac/edac_pci_sysfs.c linux-2.6.38.7/drivers/e panic("EDAC: PCI Parity Error"); } } -diff -urNp linux-2.6.38.7/drivers/firewire/core-cdev.c linux-2.6.38.7/drivers/firewire/core-cdev.c ---- linux-2.6.38.7/drivers/firewire/core-cdev.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/firewire/core-cdev.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1329,8 +1329,7 @@ static int init_iso_resource(struct clie +diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c +index 48ae712..1a1058a 100644 +--- a/drivers/firewire/core-cdev.c ++++ b/drivers/firewire/core-cdev.c +@@ -1329,8 +1329,7 @@ static int init_iso_resource(struct client *client, int ret; if ((request->channels == 0 && request->bandwidth == 0) || @@ -26856,9 +27426,10 @@ diff -urNp linux-2.6.38.7/drivers/firewire/core-cdev.c linux-2.6.38.7/drivers/fi return -EINVAL; r = kmalloc(sizeof(*r), GFP_KERNEL); -diff -urNp linux-2.6.38.7/drivers/firewire/core-transaction.c linux-2.6.38.7/drivers/firewire/core-transaction.c ---- linux-2.6.38.7/drivers/firewire/core-transaction.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/firewire/core-transaction.c 2011-05-16 21:47:08.000000000 -0400 +diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c +index d00f8ce..b5ec272 100644 +--- a/drivers/firewire/core-transaction.c ++++ b/drivers/firewire/core-transaction.c @@ -36,6 +36,7 @@ #include <linux/string.h> #include <linux/timer.h> @@ -26867,7 +27438,7 @@ diff -urNp linux-2.6.38.7/drivers/firewire/core-transaction.c linux-2.6.38.7/dri #include <asm/byteorder.h> -@@ -420,6 +421,8 @@ int fw_run_transaction(struct fw_card *c +@@ -420,6 +421,8 @@ int fw_run_transaction(struct fw_card *card, int tcode, int destination_id, struct transaction_callback_data d; struct fw_transaction t; @@ -26876,9 +27447,10 @@ diff -urNp linux-2.6.38.7/drivers/firewire/core-transaction.c linux-2.6.38.7/dri init_timer_on_stack(&t.split_timeout_timer); init_completion(&d.done); d.payload = payload; -diff -urNp linux-2.6.38.7/drivers/firmware/dmi_scan.c linux-2.6.38.7/drivers/firmware/dmi_scan.c ---- linux-2.6.38.7/drivers/firmware/dmi_scan.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/firmware/dmi_scan.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c +index bcb1126..c1fce76 100644 +--- a/drivers/firmware/dmi_scan.c ++++ b/drivers/firmware/dmi_scan.c @@ -449,11 +449,6 @@ void __init dmi_scan_machine(void) } } @@ -26891,9 +27463,10 @@ diff -urNp linux-2.6.38.7/drivers/firmware/dmi_scan.c linux-2.6.38.7/drivers/fir p = dmi_ioremap(0xF0000, 0x10000); if (p == NULL) goto error; -diff -urNp linux-2.6.38.7/drivers/gpio/vr41xx_giu.c linux-2.6.38.7/drivers/gpio/vr41xx_giu.c ---- linux-2.6.38.7/drivers/gpio/vr41xx_giu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpio/vr41xx_giu.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/gpio/vr41xx_giu.c b/drivers/gpio/vr41xx_giu.c +index cffa3bd..9523309 100644 +--- a/drivers/gpio/vr41xx_giu.c ++++ b/drivers/gpio/vr41xx_giu.c @@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq) printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n", maskl, pendl, maskh, pendh); @@ -26903,10 +27476,11 @@ diff -urNp linux-2.6.38.7/drivers/gpio/vr41xx_giu.c linux-2.6.38.7/drivers/gpio/ return -EINVAL; } -diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.38.7/drivers/gpu/drm/drm_crtc_helper.c ---- linux-2.6.38.7/drivers/gpu/drm/drm_crtc_helper.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/drm_crtc_helper.c 2011-05-16 21:47:08.000000000 -0400 -@@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d +diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c +index 9236965..f9ea6cd 100644 +--- a/drivers/gpu/drm/drm_crtc_helper.c ++++ b/drivers/gpu/drm/drm_crtc_helper.c +@@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder, struct drm_crtc *tmp; int crtc_mask = 1; @@ -26915,7 +27489,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.38.7/drive dev = crtc->dev; -@@ -343,6 +343,8 @@ bool drm_crtc_helper_set_mode(struct drm +@@ -343,6 +343,8 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, struct drm_encoder *encoder; bool ret = true; @@ -26924,9 +27498,10 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.38.7/drive crtc->enabled = drm_helper_crtc_in_use(crtc); if (!crtc->enabled) return true; -diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_drv.c linux-2.6.38.7/drivers/gpu/drm/drm_drv.c ---- linux-2.6.38.7/drivers/gpu/drm/drm_drv.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/drm_drv.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c +index 271835a..362df6a 100644 +--- a/drivers/gpu/drm/drm_drv.c ++++ b/drivers/gpu/drm/drm_drv.c @@ -425,7 +425,7 @@ long drm_ioctl(struct file *filp, dev = file_priv->minor->dev; @@ -26936,10 +27511,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_drv.c linux-2.6.38.7/drivers/gpu/d ++file_priv->ioctl_count; DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", -diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_fops.c linux-2.6.38.7/drivers/gpu/drm/drm_fops.c ---- linux-2.6.38.7/drivers/gpu/drm/drm_fops.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/drm_fops.c 2011-04-28 19:34:15.000000000 -0400 -@@ -70,7 +70,7 @@ static int drm_setup(struct drm_device * +diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c +index 2ec7d48..be14bb1 100644 +--- a/drivers/gpu/drm/drm_fops.c ++++ b/drivers/gpu/drm/drm_fops.c +@@ -70,7 +70,7 @@ static int drm_setup(struct drm_device * dev) } for (i = 0; i < ARRAY_SIZE(dev->counts); i++) @@ -26948,7 +27524,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_fops.c linux-2.6.38.7/drivers/gpu/ dev->sigdata.lock = NULL; -@@ -134,8 +134,8 @@ int drm_open(struct inode *inode, struct +@@ -134,8 +134,8 @@ int drm_open(struct inode *inode, struct file *filp) retcode = drm_open_helper(inode, filp, dev); if (!retcode) { @@ -26959,7 +27535,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_fops.c linux-2.6.38.7/drivers/gpu/ retcode = drm_setup(dev); } if (!retcode) { -@@ -472,7 +472,7 @@ int drm_release(struct inode *inode, str +@@ -472,7 +472,7 @@ int drm_release(struct inode *inode, struct file *filp) mutex_lock(&drm_global_mutex); @@ -26968,7 +27544,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_fops.c linux-2.6.38.7/drivers/gpu/ if (dev->driver->preclose) dev->driver->preclose(dev, file_priv); -@@ -484,7 +484,7 @@ int drm_release(struct inode *inode, str +@@ -484,7 +484,7 @@ int drm_release(struct inode *inode, struct file *filp) DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n", task_pid_nr(current), (long)old_encode_dev(file_priv->minor->device), @@ -26977,7 +27553,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_fops.c linux-2.6.38.7/drivers/gpu/ /* if the master has gone away we can't do anything with the lock */ if (file_priv->minor->master) -@@ -565,8 +565,8 @@ int drm_release(struct inode *inode, str +@@ -565,8 +565,8 @@ int drm_release(struct inode *inode, struct file *filp) * End inline drm_release */ @@ -26988,9 +27564,10 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_fops.c linux-2.6.38.7/drivers/gpu/ if (atomic_read(&dev->ioctl_count)) { DRM_ERROR("Device busy: %d\n", atomic_read(&dev->ioctl_count)); -diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_global.c linux-2.6.38.7/drivers/gpu/drm/drm_global.c ---- linux-2.6.38.7/drivers/gpu/drm/drm_global.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/drm_global.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c +index c87dc96..326055d 100644 +--- a/drivers/gpu/drm/drm_global.c ++++ b/drivers/gpu/drm/drm_global.c @@ -36,7 +36,7 @@ struct drm_global_item { struct mutex mutex; @@ -27018,7 +27595,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_global.c linux-2.6.38.7/drivers/gp } } -@@ -70,7 +70,7 @@ int drm_global_item_ref(struct drm_globa +@@ -70,7 +70,7 @@ int drm_global_item_ref(struct drm_global_reference *ref) void *object; mutex_lock(&item->mutex); @@ -27027,7 +27604,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_global.c linux-2.6.38.7/drivers/gp item->object = kzalloc(ref->size, GFP_KERNEL); if (unlikely(item->object == NULL)) { ret = -ENOMEM; -@@ -83,7 +83,7 @@ int drm_global_item_ref(struct drm_globa +@@ -83,7 +83,7 @@ int drm_global_item_ref(struct drm_global_reference *ref) goto out_err; } @@ -27036,7 +27613,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_global.c linux-2.6.38.7/drivers/gp ref->object = item->object; object = item->object; mutex_unlock(&item->mutex); -@@ -100,9 +100,9 @@ void drm_global_item_unref(struct drm_gl +@@ -100,9 +100,9 @@ void drm_global_item_unref(struct drm_global_reference *ref) struct drm_global_item *item = &glob[ref->global_type]; mutex_lock(&item->mutex); @@ -27048,10 +27625,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_global.c linux-2.6.38.7/drivers/gp ref->release(ref); item->object = NULL; } -diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_info.c linux-2.6.38.7/drivers/gpu/drm/drm_info.c ---- linux-2.6.38.7/drivers/gpu/drm/drm_info.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/drm_info.c 2011-04-28 19:34:15.000000000 -0400 -@@ -86,10 +86,14 @@ int drm_vm_info(struct seq_file *m, void +diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c +index be9a9c0..8a9bc65 100644 +--- a/drivers/gpu/drm/drm_info.c ++++ b/drivers/gpu/drm/drm_info.c +@@ -86,10 +86,14 @@ int drm_vm_info(struct seq_file *m, void *data) struct drm_local_map *map; struct drm_map_list *r_list; @@ -27070,7 +27648,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_info.c linux-2.6.38.7/drivers/gpu/ const char *type; int i; -@@ -100,7 +104,7 @@ int drm_vm_info(struct seq_file *m, void +@@ -100,7 +104,7 @@ int drm_vm_info(struct seq_file *m, void *data) map = r_list->map; if (!map) continue; @@ -27079,7 +27657,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_info.c linux-2.6.38.7/drivers/gpu/ type = "??"; else type = types[map->type]; -@@ -301,7 +305,11 @@ int drm_vma_info(struct seq_file *m, voi +@@ -301,7 +305,11 @@ int drm_vma_info(struct seq_file *m, void *data) vma->vm_flags & VM_MAYSHARE ? 's' : 'p', vma->vm_flags & VM_LOCKED ? 'l' : '-', vma->vm_flags & VM_IO ? 'i' : '-', @@ -27091,10 +27669,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_info.c linux-2.6.38.7/drivers/gpu/ #if defined(__i386__) pgprot = pgprot_val(vma->vm_page_prot); -diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_ioctl.c linux-2.6.38.7/drivers/gpu/drm/drm_ioctl.c ---- linux-2.6.38.7/drivers/gpu/drm/drm_ioctl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/drm_ioctl.c 2011-04-28 19:34:15.000000000 -0400 -@@ -353,7 +353,7 @@ int drm_getstats(struct drm_device *dev, +diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c +index 47db4df..74c7209 100644 +--- a/drivers/gpu/drm/drm_ioctl.c ++++ b/drivers/gpu/drm/drm_ioctl.c +@@ -353,7 +353,7 @@ int drm_getstats(struct drm_device *dev, void *data, stats->data[i].value = (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); else @@ -27103,10 +27682,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_ioctl.c linux-2.6.38.7/drivers/gpu stats->data[i].type = dev->types[i]; } -diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_lock.c linux-2.6.38.7/drivers/gpu/drm/drm_lock.c ---- linux-2.6.38.7/drivers/gpu/drm/drm_lock.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/drm_lock.c 2011-04-28 19:34:15.000000000 -0400 -@@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, voi +diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c +index 632ae24..244cf4a 100644 +--- a/drivers/gpu/drm/drm_lock.c ++++ b/drivers/gpu/drm/drm_lock.c +@@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv) if (drm_lock_take(&master->lock, lock->context)) { master->lock.file_priv = file_priv; master->lock.lock_time = jiffies; @@ -27115,7 +27695,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_lock.c linux-2.6.38.7/drivers/gpu/ break; /* Got lock */ } -@@ -160,7 +160,7 @@ int drm_unlock(struct drm_device *dev, v +@@ -160,7 +160,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv) return -EINVAL; } @@ -27124,10 +27704,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/drm_lock.c linux-2.6.38.7/drivers/gpu/ if (drm_lock_free(&master->lock, lock->context)) { /* FIXME: Should really bail out here. */ -diff -urNp linux-2.6.38.7/drivers/gpu/drm/i810/i810_dma.c linux-2.6.38.7/drivers/gpu/drm/i810/i810_dma.c ---- linux-2.6.38.7/drivers/gpu/drm/i810/i810_dma.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/i810/i810_dma.c 2011-04-28 19:34:15.000000000 -0400 -@@ -953,8 +953,8 @@ static int i810_dma_vertex(struct drm_de +diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c +index ff33e53..8c5c165 100644 +--- a/drivers/gpu/drm/i810/i810_dma.c ++++ b/drivers/gpu/drm/i810/i810_dma.c +@@ -953,8 +953,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data, dma->buflist[vertex->idx], vertex->discard, vertex->used); @@ -27138,7 +27719,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i810/i810_dma.c linux-2.6.38.7/drivers sarea_priv->last_enqueue = dev_priv->counter - 1; sarea_priv->last_dispatch = (int)hw_status[5]; -@@ -1114,8 +1114,8 @@ static int i810_dma_mc(struct drm_device +@@ -1114,8 +1114,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data, i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used, mc->last_render); @@ -27149,9 +27730,10 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i810/i810_dma.c linux-2.6.38.7/drivers sarea_priv->last_enqueue = dev_priv->counter - 1; sarea_priv->last_dispatch = (int)hw_status[5]; -diff -urNp linux-2.6.38.7/drivers/gpu/drm/i810/i810_drv.h linux-2.6.38.7/drivers/gpu/drm/i810/i810_drv.h ---- linux-2.6.38.7/drivers/gpu/drm/i810/i810_drv.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/i810/i810_drv.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h +index c9339f4..f5e1b9d 100644 +--- a/drivers/gpu/drm/i810/i810_drv.h ++++ b/drivers/gpu/drm/i810/i810_drv.h @@ -108,8 +108,8 @@ typedef struct drm_i810_private { int page_flipping; @@ -27163,9 +27745,10 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i810/i810_drv.h linux-2.6.38.7/drivers int front_offset; } drm_i810_private_t; -diff -urNp linux-2.6.38.7/drivers/gpu/drm/i830/i830_drv.h linux-2.6.38.7/drivers/gpu/drm/i830/i830_drv.h ---- linux-2.6.38.7/drivers/gpu/drm/i830/i830_drv.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/i830/i830_drv.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/gpu/drm/i830/i830_drv.h b/drivers/gpu/drm/i830/i830_drv.h +index 0df1c72..9142c9c 100644 +--- a/drivers/gpu/drm/i830/i830_drv.h ++++ b/drivers/gpu/drm/i830/i830_drv.h @@ -115,8 +115,8 @@ typedef struct drm_i830_private { int page_flipping; @@ -27177,10 +27760,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i830/i830_drv.h linux-2.6.38.7/drivers int use_mi_batchbuffer_start; -diff -urNp linux-2.6.38.7/drivers/gpu/drm/i830/i830_irq.c linux-2.6.38.7/drivers/gpu/drm/i830/i830_irq.c ---- linux-2.6.38.7/drivers/gpu/drm/i830/i830_irq.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/i830/i830_irq.c 2011-04-28 19:57:25.000000000 -0400 -@@ -47,7 +47,7 @@ irqreturn_t i830_driver_irq_handler(DRM_ +diff --git a/drivers/gpu/drm/i830/i830_irq.c b/drivers/gpu/drm/i830/i830_irq.c +index d1a6b95..cb934a2 100644 +--- a/drivers/gpu/drm/i830/i830_irq.c ++++ b/drivers/gpu/drm/i830/i830_irq.c +@@ -47,7 +47,7 @@ irqreturn_t i830_driver_irq_handler(DRM_IRQ_ARGS) I830_WRITE16(I830REG_INT_IDENTITY_R, temp); @@ -27189,7 +27773,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i830/i830_irq.c linux-2.6.38.7/drivers wake_up_interruptible(&dev_priv->irq_queue); return IRQ_HANDLED; -@@ -60,14 +60,14 @@ static int i830_emit_irq(struct drm_devi +@@ -60,14 +60,14 @@ static int i830_emit_irq(struct drm_device *dev) DRM_DEBUG("%s\n", __func__); @@ -27206,7 +27790,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i830/i830_irq.c linux-2.6.38.7/drivers } static int i830_wait_irq(struct drm_device *dev, int irq_nr) -@@ -79,7 +79,7 @@ static int i830_wait_irq(struct drm_devi +@@ -79,7 +79,7 @@ static int i830_wait_irq(struct drm_device *dev, int irq_nr) DRM_DEBUG("%s\n", __func__); @@ -27215,7 +27799,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i830/i830_irq.c linux-2.6.38.7/drivers return 0; dev_priv->sarea_priv->perf_boxes |= I830_BOX_WAIT; -@@ -88,7 +88,7 @@ static int i830_wait_irq(struct drm_devi +@@ -88,7 +88,7 @@ static int i830_wait_irq(struct drm_device *dev, int irq_nr) for (;;) { __set_current_state(TASK_INTERRUPTIBLE); @@ -27224,7 +27808,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i830/i830_irq.c linux-2.6.38.7/drivers break; if ((signed)(end - jiffies) <= 0) { DRM_ERROR("timeout iir %x imr %x ier %x hwstam %x\n", -@@ -163,8 +163,8 @@ void i830_driver_irq_preinstall(struct d +@@ -163,8 +163,8 @@ void i830_driver_irq_preinstall(struct drm_device *dev) I830_WRITE16(I830REG_HWSTAM, 0xffff); I830_WRITE16(I830REG_INT_MASK_R, 0x0); I830_WRITE16(I830REG_INT_ENABLE_R, 0x0); @@ -27235,33 +27819,10 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i830/i830_irq.c linux-2.6.38.7/drivers init_waitqueue_head(&dev_priv->irq_queue); } -diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.38.7/drivers/gpu/drm/i915/dvo_ch7017.c ---- linux-2.6.38.7/drivers/gpu/drm/i915/dvo_ch7017.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/i915/dvo_ch7017.c 2011-04-28 19:34:15.000000000 -0400 -@@ -390,7 +390,7 @@ static void ch7017_destroy(struct intel_ - } - } - --struct intel_dvo_dev_ops ch7017_ops = { -+const struct intel_dvo_dev_ops ch7017_ops = { - .init = ch7017_init, - .detect = ch7017_detect, - .mode_valid = ch7017_mode_valid, -diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.38.7/drivers/gpu/drm/i915/dvo_ch7xxx.c ---- linux-2.6.38.7/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-04-28 19:34:15.000000000 -0400 -@@ -320,7 +320,7 @@ static void ch7xxx_destroy(struct intel_ - } - } - --struct intel_dvo_dev_ops ch7xxx_ops = { -+const struct intel_dvo_dev_ops ch7xxx_ops = { - .init = ch7xxx_init, - .detect = ch7xxx_detect, - .mode_valid = ch7xxx_mode_valid, -diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/dvo.h linux-2.6.38.7/drivers/gpu/drm/i915/dvo.h ---- linux-2.6.38.7/drivers/gpu/drm/i915/dvo.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/i915/dvo.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/gpu/drm/i915/dvo.h b/drivers/gpu/drm/i915/dvo.h +index 8c2ad01..bfc522e 100644 +--- a/drivers/gpu/drm/i915/dvo.h ++++ b/drivers/gpu/drm/i915/dvo.h @@ -122,23 +122,23 @@ struct intel_dvo_dev_ops { * * \return singly-linked list of modes or NULL if no modes found. @@ -27294,10 +27855,37 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/dvo.h linux-2.6.38.7/drivers/gpu/ +extern const struct intel_dvo_dev_ops ch7017_ops; #endif /* _INTEL_DVO_H */ -diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.38.7/drivers/gpu/drm/i915/dvo_ivch.c ---- linux-2.6.38.7/drivers/gpu/drm/i915/dvo_ivch.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/i915/dvo_ivch.c 2011-04-28 19:34:15.000000000 -0400 -@@ -410,7 +410,7 @@ static void ivch_destroy(struct intel_dv +diff --git a/drivers/gpu/drm/i915/dvo_ch7017.c b/drivers/gpu/drm/i915/dvo_ch7017.c +index d3e8c54..0905775 100644 +--- a/drivers/gpu/drm/i915/dvo_ch7017.c ++++ b/drivers/gpu/drm/i915/dvo_ch7017.c +@@ -390,7 +390,7 @@ static void ch7017_destroy(struct intel_dvo_device *dvo) + } + } + +-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 --git a/drivers/gpu/drm/i915/dvo_ch7xxx.c b/drivers/gpu/drm/i915/dvo_ch7xxx.c +index 7eaa94e..60c311a1 100644 +--- a/drivers/gpu/drm/i915/dvo_ch7xxx.c ++++ b/drivers/gpu/drm/i915/dvo_ch7xxx.c +@@ -320,7 +320,7 @@ static void ch7xxx_destroy(struct intel_dvo_device *dvo) + } + } + +-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 --git a/drivers/gpu/drm/i915/dvo_ivch.c b/drivers/gpu/drm/i915/dvo_ivch.c +index a12ed94..2609937 100644 +--- a/drivers/gpu/drm/i915/dvo_ivch.c ++++ b/drivers/gpu/drm/i915/dvo_ivch.c +@@ -410,7 +410,7 @@ static void ivch_destroy(struct intel_dvo_device *dvo) } } @@ -27306,10 +27894,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.38.7/drivers .init = ivch_init, .dpms = ivch_dpms, .mode_valid = ivch_mode_valid, -diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.38.7/drivers/gpu/drm/i915/dvo_sil164.c ---- linux-2.6.38.7/drivers/gpu/drm/i915/dvo_sil164.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/i915/dvo_sil164.c 2011-04-28 19:34:15.000000000 -0400 -@@ -252,7 +252,7 @@ static void sil164_destroy(struct intel_ +diff --git a/drivers/gpu/drm/i915/dvo_sil164.c b/drivers/gpu/drm/i915/dvo_sil164.c +index e4b4091..3362aa7 100644 +--- a/drivers/gpu/drm/i915/dvo_sil164.c ++++ b/drivers/gpu/drm/i915/dvo_sil164.c +@@ -252,7 +252,7 @@ static void sil164_destroy(struct intel_dvo_device *dvo) } } @@ -27318,10 +27907,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.38.7/drive .init = sil164_init, .detect = sil164_detect, .mode_valid = sil164_mode_valid, -diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.38.7/drivers/gpu/drm/i915/dvo_tfp410.c ---- linux-2.6.38.7/drivers/gpu/drm/i915/dvo_tfp410.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/i915/dvo_tfp410.c 2011-04-28 19:34:15.000000000 -0400 -@@ -293,7 +293,7 @@ static void tfp410_destroy(struct intel_ +diff --git a/drivers/gpu/drm/i915/dvo_tfp410.c b/drivers/gpu/drm/i915/dvo_tfp410.c +index 8ab2855..dea1e14 100644 +--- a/drivers/gpu/drm/i915/dvo_tfp410.c ++++ b/drivers/gpu/drm/i915/dvo_tfp410.c +@@ -293,7 +293,7 @@ static void tfp410_destroy(struct intel_dvo_device *dvo) } } @@ -27330,10 +27920,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.38.7/drive .init = tfp410_init, .detect = tfp410_detect, .mode_valid = tfp410_mode_valid, -diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.38.7/drivers/gpu/drm/i915/i915_debugfs.c ---- linux-2.6.38.7/drivers/gpu/drm/i915/i915_debugfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/i915/i915_debugfs.c 2011-04-28 19:57:25.000000000 -0400 -@@ -496,7 +496,7 @@ static int i915_interrupt_info(struct se +diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c +index 4ff9b6c..7470581 100644 +--- a/drivers/gpu/drm/i915/i915_debugfs.c ++++ b/drivers/gpu/drm/i915/i915_debugfs.c +@@ -496,7 +496,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) I915_READ(GTIMR)); } seq_printf(m, "Interrupts received: %d\n", @@ -27342,10 +27933,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.38.7/dri for (i = 0; i < I915_NUM_RINGS; i++) { if (IS_GEN6(dev)) { seq_printf(m, "Graphics Interrupt mask (%s): %08x\n", -diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/i915_dma.c linux-2.6.38.7/drivers/gpu/drm/i915/i915_dma.c ---- linux-2.6.38.7/drivers/gpu/drm/i915/i915_dma.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/i915/i915_dma.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1159,7 +1159,7 @@ static bool i915_switcheroo_can_switch(s +diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c +index e33d9be..a886ceb 100644 +--- a/drivers/gpu/drm/i915/i915_dma.c ++++ b/drivers/gpu/drm/i915/i915_dma.c +@@ -1159,7 +1159,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev) bool can_switch; spin_lock(&dev->count_lock); @@ -27354,10 +27946,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/i915_dma.c linux-2.6.38.7/drivers spin_unlock(&dev->count_lock); return can_switch; } -diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/i915_drv.c linux-2.6.38.7/drivers/gpu/drm/i915/i915_drv.c ---- linux-2.6.38.7/drivers/gpu/drm/i915/i915_drv.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/i915/i915_drv.c 2011-04-28 19:34:15.000000000 -0400 -@@ -673,7 +673,7 @@ static const struct dev_pm_ops i915_pm_o +diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c +index 22ec066..fda258a 100644 +--- a/drivers/gpu/drm/i915/i915_drv.c ++++ b/drivers/gpu/drm/i915/i915_drv.c +@@ -673,7 +673,7 @@ static const struct dev_pm_ops i915_pm_ops = { .restore = i915_pm_resume, }; @@ -27366,9 +27959,10 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/i915_drv.c linux-2.6.38.7/drivers .fault = i915_gem_fault, .open = drm_gem_vm_open, .close = drm_gem_vm_close, -diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/i915_drv.h linux-2.6.38.7/drivers/gpu/drm/i915/i915_drv.h ---- linux-2.6.38.7/drivers/gpu/drm/i915/i915_drv.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/i915/i915_drv.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h +index 456f404..24fd152 100644 +--- a/drivers/gpu/drm/i915/i915_drv.h ++++ b/drivers/gpu/drm/i915/i915_drv.h @@ -288,7 +288,7 @@ typedef struct drm_i915_private { int current_page; int page_flipping; @@ -27387,7 +27981,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/i915_drv.h linux-2.6.38.7/drivers }; #define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base) -@@ -1229,7 +1229,7 @@ extern int intel_setup_gmbus(struct drm_ +@@ -1229,7 +1229,7 @@ extern int intel_setup_gmbus(struct drm_device *dev); extern void intel_teardown_gmbus(struct drm_device *dev); extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed); extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit); @@ -27396,10 +27990,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/i915_drv.h linux-2.6.38.7/drivers { return container_of(adapter, struct intel_gmbus, adapter)->force_bit; } -diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-2.6.38.7/drivers/gpu/drm/i915/i915_gem_execbuffer.c ---- linux-2.6.38.7/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-04-28 19:57:25.000000000 -0400 -@@ -904,7 +904,7 @@ i915_gem_execbuffer_wait_for_flips(struc +diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c +index ded73a6..8a6d555 100644 +--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c ++++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c +@@ -904,7 +904,7 @@ i915_gem_execbuffer_wait_for_flips(struct intel_ring_buffer *ring, flips = 0; list_for_each_entry(obj, objects, exec_list) { if (obj->base.write_domain) @@ -27408,10 +28003,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-2.6.3 } if (flips) { int plane, flip_mask, ret; -diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/i915_irq.c linux-2.6.38.7/drivers/gpu/drm/i915/i915_irq.c ---- linux-2.6.38.7/drivers/gpu/drm/i915/i915_irq.c 2011-04-18 17:27:13.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/i915/i915_irq.c 2011-04-28 19:57:25.000000000 -0400 -@@ -1106,7 +1106,7 @@ irqreturn_t i915_driver_irq_handler(DRM_ +diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c +index 2347bc1..3edcc24 100644 +--- a/drivers/gpu/drm/i915/i915_irq.c ++++ b/drivers/gpu/drm/i915/i915_irq.c +@@ -1106,7 +1106,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS) int irq_received; int ret = IRQ_NONE; @@ -27420,7 +28016,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/i915_irq.c linux-2.6.38.7/drivers if (HAS_PCH_SPLIT(dev)) return ironlake_irq_handler(dev); -@@ -1684,7 +1684,7 @@ void i915_driver_irq_preinstall(struct d +@@ -1684,7 +1684,7 @@ void i915_driver_irq_preinstall(struct drm_device * dev) { drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; @@ -27429,10 +28025,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/i915_irq.c linux-2.6.38.7/drivers INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func); INIT_WORK(&dev_priv->error_work, i915_error_work_func); -diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/intel_display.c linux-2.6.38.7/drivers/gpu/drm/i915/intel_display.c ---- linux-2.6.38.7/drivers/gpu/drm/i915/intel_display.c 2011-05-22 23:05:18.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/i915/intel_display.c 2011-05-22 23:06:03.000000000 -0400 -@@ -1631,7 +1631,7 @@ intel_pipe_set_base(struct drm_crtc *crt +diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c +index 841558b..805c5df 100644 +--- a/drivers/gpu/drm/i915/intel_display.c ++++ b/drivers/gpu/drm/i915/intel_display.c +@@ -1631,7 +1631,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, wait_event(dev_priv->pending_flip_queue, atomic_read(&dev_priv->mm.wedged) || @@ -27441,7 +28038,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/intel_display.c linux-2.6.38.7/dr /* Big Hammer, we also need to ensure that any pending * MI_WAIT_FOR_EVENT inside a user batch buffer on the -@@ -2042,7 +2042,7 @@ static void intel_crtc_wait_for_pending_ +@@ -2042,7 +2042,7 @@ static void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc) obj = to_intel_framebuffer(crtc->fb)->obj; dev_priv = crtc->dev->dev_private; wait_event(dev_priv->pending_flip_queue, @@ -27450,7 +28047,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/intel_display.c linux-2.6.38.7/dr } static bool intel_crtc_driving_pch(struct drm_crtc *crtc) -@@ -5428,7 +5428,7 @@ static void do_intel_finish_page_flip(st +@@ -5428,7 +5428,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev, atomic_clear_mask(1 << intel_crtc->plane, &obj->pending_flip.counter); @@ -27459,7 +28056,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/intel_display.c linux-2.6.38.7/dr wake_up(&dev_priv->pending_flip_queue); schedule_work(&work->work); -@@ -5557,7 +5557,7 @@ static int intel_crtc_page_flip(struct d +@@ -5557,7 +5557,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, /* Block clients from rendering to the new back buffer until * the flip occurs and the object is no longer visible. */ @@ -27468,9 +28065,10 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/i915/intel_display.c linux-2.6.38.7/dr switch (INTEL_INFO(dev)->gen) { case 2: -diff -urNp linux-2.6.38.7/drivers/gpu/drm/mga/mga_drv.h linux-2.6.38.7/drivers/gpu/drm/mga/mga_drv.h ---- linux-2.6.38.7/drivers/gpu/drm/mga/mga_drv.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/mga/mga_drv.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h +index 1084fa4..ca2833d 100644 +--- a/drivers/gpu/drm/mga/mga_drv.h ++++ b/drivers/gpu/drm/mga/mga_drv.h @@ -120,9 +120,9 @@ typedef struct drm_mga_private { u32 clear_cmd; u32 maccess; @@ -27483,10 +28081,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/mga/mga_drv.h linux-2.6.38.7/drivers/g u32 next_fence_to_post; unsigned int fb_cpp; -diff -urNp linux-2.6.38.7/drivers/gpu/drm/mga/mga_irq.c linux-2.6.38.7/drivers/gpu/drm/mga/mga_irq.c ---- linux-2.6.38.7/drivers/gpu/drm/mga/mga_irq.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/mga/mga_irq.c 2011-04-28 19:57:25.000000000 -0400 -@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de +diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c +index 2581202..f230a8d9 100644 +--- a/drivers/gpu/drm/mga/mga_irq.c ++++ b/drivers/gpu/drm/mga/mga_irq.c +@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc) if (crtc != 0) return 0; @@ -27495,7 +28094,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/mga/mga_irq.c linux-2.6.38.7/drivers/g } -@@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_I +@@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS) /* VBLANK interrupt */ if (status & MGA_VLINEPEN) { MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR); @@ -27504,7 +28103,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/mga/mga_irq.c linux-2.6.38.7/drivers/g drm_handle_vblank(dev, 0); handled = 1; } -@@ -79,7 +79,7 @@ irqreturn_t mga_driver_irq_handler(DRM_I +@@ -79,7 +79,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS) if ((prim_start & ~0x03) != (prim_end & ~0x03)) MGA_WRITE(MGA_PRIMEND, prim_end); @@ -27513,7 +28112,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/mga/mga_irq.c linux-2.6.38.7/drivers/g DRM_WAKEUP(&dev_priv->fence_queue); handled = 1; } -@@ -130,7 +130,7 @@ int mga_driver_fence_wait(struct drm_dev +@@ -130,7 +130,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence) * using fences. */ DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ, @@ -27522,9 +28121,10 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/mga/mga_irq.c linux-2.6.38.7/drivers/g - *sequence) <= (1 << 23))); *sequence = cur_fence; -diff -urNp linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_drv.h linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_drv.h ---- linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h +index 982d70b..9df4be6 100644 +--- a/drivers/gpu/drm/nouveau/nouveau_drv.h ++++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -226,7 +226,7 @@ struct nouveau_channel { struct list_head pending; uint32_t sequence; @@ -27543,10 +28143,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_drv.h linux-2.6.38.7/d } ttm; struct { -diff -urNp linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_fence.c linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_fence.c ---- linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-04-28 19:57:25.000000000 -0400 -@@ -83,7 +83,7 @@ nouveau_fence_update(struct nouveau_chan +diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c +index 221b846..798ec9d 100644 +--- a/drivers/gpu/drm/nouveau/nouveau_fence.c ++++ b/drivers/gpu/drm/nouveau/nouveau_fence.c +@@ -83,7 +83,7 @@ nouveau_fence_update(struct nouveau_channel *chan) if (USE_REFCNT(dev)) sequence = nvchan_rd32(chan, 0x48); else @@ -27555,7 +28156,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_fence.c linux-2.6.38.7 if (chan->fence.sequence_ack == sequence) goto out; -@@ -490,7 +490,7 @@ nouveau_fence_channel_init(struct nouvea +@@ -490,7 +490,7 @@ nouveau_fence_channel_init(struct nouveau_channel *chan) INIT_LIST_HEAD(&chan->fence.pending); spin_lock_init(&chan->fence.lock); @@ -27564,10 +28165,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_fence.c linux-2.6.38.7 return 0; } -diff -urNp linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_gem.c linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_gem.c ---- linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-04-28 19:57:25.000000000 -0400 -@@ -241,7 +241,7 @@ validate_init(struct nouveau_channel *ch +diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c +index 506c508..018277db 100644 +--- a/drivers/gpu/drm/nouveau/nouveau_gem.c ++++ b/drivers/gpu/drm/nouveau/nouveau_gem.c +@@ -241,7 +241,7 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv, int trycnt = 0; int ret, i; @@ -27576,10 +28178,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_gem.c linux-2.6.38.7/d retry: if (++trycnt > 100000) { NV_ERROR(dev, "%s failed and gave up.\n", __func__); -diff -urNp linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_state.c ---- linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_state.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_state.c 2011-04-28 19:34:15.000000000 -0400 -@@ -621,7 +621,7 @@ static bool nouveau_switcheroo_can_switc +diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c +index a54fc43..1c0c8dd 100644 +--- a/drivers/gpu/drm/nouveau/nouveau_state.c ++++ b/drivers/gpu/drm/nouveau/nouveau_state.c +@@ -621,7 +621,7 @@ static bool nouveau_switcheroo_can_switch(struct pci_dev *pdev) bool can_switch; spin_lock(&dev->count_lock); @@ -27588,9 +28191,10 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.38.7 spin_unlock(&dev->count_lock); return can_switch; } -diff -urNp linux-2.6.38.7/drivers/gpu/drm/nouveau/nv04_graph.c linux-2.6.38.7/drivers/gpu/drm/nouveau/nv04_graph.c ---- linux-2.6.38.7/drivers/gpu/drm/nouveau/nv04_graph.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/nouveau/nv04_graph.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c +index af75015..35c1de5 100644 +--- a/drivers/gpu/drm/nouveau/nv04_graph.c ++++ b/drivers/gpu/drm/nouveau/nv04_graph.c @@ -552,7 +552,7 @@ static int nv04_graph_mthd_set_ref(struct nouveau_channel *chan, u32 class, u32 mthd, u32 data) @@ -27600,10 +28204,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/nouveau/nv04_graph.c linux-2.6.38.7/dr return 0; } -diff -urNp linux-2.6.38.7/drivers/gpu/drm/r128/r128_cce.c linux-2.6.38.7/drivers/gpu/drm/r128/r128_cce.c ---- linux-2.6.38.7/drivers/gpu/drm/r128/r128_cce.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/r128/r128_cce.c 2011-04-28 19:57:25.000000000 -0400 -@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d +diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c +index 570e190..084a31a 100644 +--- a/drivers/gpu/drm/r128/r128_cce.c ++++ b/drivers/gpu/drm/r128/r128_cce.c +@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init) /* GH: Simple idle check. */ @@ -27612,9 +28217,10 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/r128/r128_cce.c linux-2.6.38.7/drivers /* We don't support anything other than bus-mastering ring mode, * but the ring can be in either AGP or PCI space for the ring -diff -urNp linux-2.6.38.7/drivers/gpu/drm/r128/r128_drv.h linux-2.6.38.7/drivers/gpu/drm/r128/r128_drv.h ---- linux-2.6.38.7/drivers/gpu/drm/r128/r128_drv.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/r128/r128_drv.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h +index 930c71b..499aded 100644 +--- a/drivers/gpu/drm/r128/r128_drv.h ++++ b/drivers/gpu/drm/r128/r128_drv.h @@ -90,14 +90,14 @@ typedef struct drm_r128_private { int is_pci; unsigned long cce_buffers_offset; @@ -27632,10 +28238,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/r128/r128_drv.h linux-2.6.38.7/drivers u32 color_fmt; unsigned int front_offset; -diff -urNp linux-2.6.38.7/drivers/gpu/drm/r128/r128_irq.c linux-2.6.38.7/drivers/gpu/drm/r128/r128_irq.c ---- linux-2.6.38.7/drivers/gpu/drm/r128/r128_irq.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/r128/r128_irq.c 2011-04-28 19:57:25.000000000 -0400 -@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d +diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c +index 429d5a0..7e899ed 100644 +--- a/drivers/gpu/drm/r128/r128_irq.c ++++ b/drivers/gpu/drm/r128/r128_irq.c +@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc) if (crtc != 0) return 0; @@ -27644,7 +28251,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/r128/r128_irq.c linux-2.6.38.7/drivers } irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS) -@@ -56,7 +56,7 @@ irqreturn_t r128_driver_irq_handler(DRM_ +@@ -56,7 +56,7 @@ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS) /* VBLANK interrupt */ if (status & R128_CRTC_VBLANK_INT) { R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK); @@ -27653,10 +28260,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/r128/r128_irq.c linux-2.6.38.7/drivers drm_handle_vblank(dev, 0); return IRQ_HANDLED; } -diff -urNp linux-2.6.38.7/drivers/gpu/drm/r128/r128_state.c linux-2.6.38.7/drivers/gpu/drm/r128/r128_state.c ---- linux-2.6.38.7/drivers/gpu/drm/r128/r128_state.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/r128/r128_state.c 2011-04-28 19:57:25.000000000 -0400 -@@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_priv +diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c +index a9e33ce..09edd4b 100644 +--- a/drivers/gpu/drm/r128/r128_state.c ++++ b/drivers/gpu/drm/r128/r128_state.c +@@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv, static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv) { @@ -27669,10 +28277,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/r128/r128_state.c linux-2.6.38.7/drive } #endif -diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/atom.c linux-2.6.38.7/drivers/gpu/drm/radeon/atom.c ---- linux-2.6.38.7/drivers/gpu/drm/radeon/atom.c 2011-05-10 22:06:27.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/radeon/atom.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1245,6 +1245,8 @@ struct atom_context *atom_parse(struct c +diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c +index 7bd7456..9086484 100644 +--- a/drivers/gpu/drm/radeon/atom.c ++++ b/drivers/gpu/drm/radeon/atom.c +@@ -1245,6 +1245,8 @@ struct atom_context *atom_parse(struct card_info *card, void *bios) char name[512]; int i; @@ -27681,10 +28290,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/atom.c linux-2.6.38.7/drivers/g ctx->card = card; ctx->bios = bios; -diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.38.7/drivers/gpu/drm/radeon/mkregtable.c ---- linux-2.6.38.7/drivers/gpu/drm/radeon/mkregtable.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/radeon/mkregtable.c 2011-04-28 19:34:15.000000000 -0400 -@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, +diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c +index 5a82b6b..9e69c73 100644 +--- a/drivers/gpu/drm/radeon/mkregtable.c ++++ b/drivers/gpu/drm/radeon/mkregtable.c +@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, const char *filename) regex_t mask_rex; regmatch_t match[4]; char buf[1024]; @@ -27701,10 +28311,24 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.38.7/dri if (regcomp (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { -diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_atombios.c ---- linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_atombios.c 2011-05-22 23:05:18.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_atombios.c 2011-05-22 23:06:03.000000000 -0400 -@@ -545,6 +545,8 @@ bool radeon_get_atom_connector_info_from +diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h +index 6b34294..c5fe0e4 100644 +--- a/drivers/gpu/drm/radeon/radeon.h ++++ b/drivers/gpu/drm/radeon/radeon.h +@@ -189,7 +189,7 @@ extern int sumo_get_temp(struct radeon_device *rdev); + */ + struct radeon_fence_driver { + uint32_t scratch_reg; +- atomic_t seq; ++ atomic_unchecked_t seq; + uint32_t last_seq; + unsigned long last_jiffies; + unsigned long last_timeout; +diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c +index ad11a05..73756de 100644 +--- a/drivers/gpu/drm/radeon/radeon_atombios.c ++++ b/drivers/gpu/drm/radeon/radeon_atombios.c +@@ -545,6 +545,8 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev) struct radeon_gpio_rec gpio; struct radeon_hpd hpd; @@ -27713,10 +28337,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.38. if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset)) return false; -diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_device.c ---- linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_device.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_device.c 2011-04-28 19:34:15.000000000 -0400 -@@ -673,7 +673,7 @@ static bool radeon_switcheroo_can_switch +diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c +index 4954e2d..533bd73 100644 +--- a/drivers/gpu/drm/radeon/radeon_device.c ++++ b/drivers/gpu/drm/radeon/radeon_device.c +@@ -673,7 +673,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev) bool can_switch; spin_lock(&dev->count_lock); @@ -27725,10 +28350,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.38.7/ spin_unlock(&dev->count_lock); return can_switch; } -diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_display.c ---- linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_display.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_display.c 2011-05-16 21:47:08.000000000 -0400 -@@ -934,6 +934,8 @@ void radeon_compute_pll_legacy(struct ra +diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c +index 3e7e7f9..2496a60 100644 +--- a/drivers/gpu/drm/radeon/radeon_display.c ++++ b/drivers/gpu/drm/radeon/radeon_display.c +@@ -934,6 +934,8 @@ void radeon_compute_pll_legacy(struct radeon_pll *pll, uint32_t post_div; u32 pll_out_min, pll_out_max; @@ -27737,9 +28363,10 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.38.7 DRM_DEBUG_KMS("PLL freq %llu %u %u\n", freq, pll->min_ref_div, pll->max_ref_div); freq = freq * 1000; -diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_drv.h ---- linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_drv.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_drv.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h +index 5cba46b..2b5ece3 100644 +--- a/drivers/gpu/drm/radeon/radeon_drv.h ++++ b/drivers/gpu/drm/radeon/radeon_drv.h @@ -255,7 +255,7 @@ typedef struct drm_radeon_private { /* SW interrupt */ @@ -27749,10 +28376,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.38.7/dri int vblank_crtc; uint32_t irq_enable_reg; uint32_t r500_disp_irq_reg; -diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_fence.c ---- linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_fence.c 2011-04-22 19:20:59.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_fence.c 2011-04-28 19:57:25.000000000 -0400 -@@ -49,7 +49,7 @@ int radeon_fence_emit(struct radeon_devi +diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c +index 2b0ee62..f1bbb30 100644 +--- a/drivers/gpu/drm/radeon/radeon_fence.c ++++ b/drivers/gpu/drm/radeon/radeon_fence.c +@@ -49,7 +49,7 @@ int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence) write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags); return 0; } @@ -27761,7 +28389,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.38.7/d if (!rdev->cp.ready) { /* FIXME: cp is not running assume everythings is done right * away -@@ -354,7 +354,7 @@ int radeon_fence_driver_init(struct rade +@@ -354,7 +354,7 @@ int radeon_fence_driver_init(struct radeon_device *rdev) return r; } WREG32(rdev->fence_drv.scratch_reg, 0); @@ -27770,22 +28398,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.38.7/d INIT_LIST_HEAD(&rdev->fence_drv.created); INIT_LIST_HEAD(&rdev->fence_drv.emited); INIT_LIST_HEAD(&rdev->fence_drv.signaled); -diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon.h linux-2.6.38.7/drivers/gpu/drm/radeon/radeon.h ---- linux-2.6.38.7/drivers/gpu/drm/radeon/radeon.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/radeon/radeon.h 2011-04-28 19:57:25.000000000 -0400 -@@ -189,7 +189,7 @@ extern int sumo_get_temp(struct radeon_d - */ - struct radeon_fence_driver { - uint32_t scratch_reg; -- atomic_t seq; -+ atomic_unchecked_t seq; - uint32_t last_seq; - unsigned long last_jiffies; - unsigned long last_timeout; -diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_ioc32.c ---- linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-04-28 19:34:15.000000000 -0400 -@@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(str +diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c +index 48b7cea..342236f 100644 +--- a/drivers/gpu/drm/radeon/radeon_ioc32.c ++++ b/drivers/gpu/drm/radeon/radeon_ioc32.c +@@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd, request = compat_alloc_user_space(sizeof(*request)); if (!access_ok(VERIFY_WRITE, request, sizeof(*request)) || __put_user(req32.param, &request->param) @@ -27794,10 +28411,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.38.7/d &request->value)) return -EFAULT; -diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_irq.c ---- linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_irq.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_irq.c 2011-04-28 19:57:25.000000000 -0400 -@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de +diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c +index 465746b..cb2b055 100644 +--- a/drivers/gpu/drm/radeon/radeon_irq.c ++++ b/drivers/gpu/drm/radeon/radeon_irq.c +@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_device * dev) unsigned int ret; RING_LOCALS; @@ -27808,7 +28426,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.38.7/dri BEGIN_RING(4); OUT_RING_REG(RADEON_LAST_SWI_REG, ret); -@@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct +@@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev) drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private; @@ -27817,10 +28435,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.38.7/dri DRM_INIT_WAITQUEUE(&dev_priv->swi_queue); dev->max_vblank_count = 0x001fffff; -diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_state.c ---- linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_state.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_state.c 2011-04-28 19:34:15.000000000 -0400 -@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_de +diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c +index 4ae5a3d..07a5da3 100644 +--- a/drivers/gpu/drm/radeon/radeon_state.c ++++ b/drivers/gpu/drm/radeon/radeon_state.c +@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file * if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS) sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS; @@ -27829,7 +28448,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.38.7/d sarea_priv->nbox * sizeof(depth_boxes[0]))) return -EFAULT; -@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm +@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil { drm_radeon_private_t *dev_priv = dev->dev_private; drm_radeon_getparam_t *param = data; @@ -27838,10 +28457,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.38.7/d DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); -diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_ttm.c ---- linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_ttm.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_ttm.c 2011-04-28 19:34:15.000000000 -0400 -@@ -603,8 +603,9 @@ void radeon_ttm_set_active_vram_size(str +diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c +index 8389b4c..3c551cd 100644 +--- a/drivers/gpu/drm/radeon/radeon_ttm.c ++++ b/drivers/gpu/drm/radeon/radeon_ttm.c +@@ -603,8 +603,9 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size) man->size = size >> PAGE_SHIFT; } @@ -27853,7 +28473,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.38.7/dri static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) { -@@ -612,17 +613,22 @@ static int radeon_ttm_fault(struct vm_ar +@@ -612,17 +613,22 @@ static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) struct radeon_device *rdev; int r; @@ -27880,7 +28500,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.38.7/dri int radeon_mmap(struct file *filp, struct vm_area_struct *vma) { struct drm_file *file_priv; -@@ -635,18 +641,11 @@ int radeon_mmap(struct file *filp, struc +@@ -635,18 +641,11 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma) file_priv = filp->private_data; rdev = file_priv->minor->dev->dev_private; @@ -27901,10 +28521,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.38.7/dri vma->vm_ops = &radeon_ttm_vm_ops; return 0; } -diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/rs690.c linux-2.6.38.7/drivers/gpu/drm/radeon/rs690.c ---- linux-2.6.38.7/drivers/gpu/drm/radeon/rs690.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/radeon/rs690.c 2011-04-28 19:34:15.000000000 -0400 -@@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct +diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c +index 66c949b..914a36a 100644 +--- a/drivers/gpu/drm/radeon/rs690.c ++++ b/drivers/gpu/drm/radeon/rs690.c +@@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct radeon_device *rdev, if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full && rdev->pm.sideport_bandwidth.full) rdev->pm.max_bandwidth = rdev->pm.sideport_bandwidth; @@ -27917,10 +28538,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/radeon/rs690.c linux-2.6.38.7/drivers/ } else { if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full && rdev->pm.k8_bandwidth.full) -diff -urNp linux-2.6.38.7/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.38.7/drivers/gpu/drm/ttm/ttm_bo_vm.c ---- linux-2.6.38.7/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-04-28 19:34:15.000000000 -0400 -@@ -69,11 +69,11 @@ static struct ttm_buffer_object *ttm_bo_ +diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c +index 221b924..3bc5ff4 100644 +--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c ++++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c +@@ -69,11 +69,11 @@ static struct ttm_buffer_object *ttm_bo_vm_lookup_rb(struct ttm_bo_device *bdev, return best_bo; } @@ -27934,7 +28556,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.38.7/drivers unsigned long page_offset; unsigned long page_last; unsigned long pfn; -@@ -83,8 +83,12 @@ static int ttm_bo_vm_fault(struct vm_are +@@ -83,8 +83,12 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) int i; unsigned long address = (unsigned long)vmf->virtual_address; int retval = VM_FAULT_NOPAGE; @@ -27977,10 +28599,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.38.7/drivers static const struct vm_operations_struct ttm_bo_vm_ops = { .fault = ttm_bo_vm_fault, -diff -urNp linux-2.6.38.7/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-2.6.38.7/drivers/gpu/drm/ttm/ttm_page_alloc.c ---- linux-2.6.38.7/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-04-28 19:57:25.000000000 -0400 -@@ -396,9 +396,9 @@ static int ttm_pool_get_num_unused_pages +diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c +index b1e02ff..c7c28da 100644 +--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c ++++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c +@@ -396,9 +396,9 @@ static int ttm_pool_get_num_unused_pages(void) */ static int ttm_pool_mm_shrink(struct shrinker *shrink, int shrink_pages, gfp_t gfp_mask) { @@ -27992,9 +28615,10 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-2.6.38.7/dr struct ttm_page_pool *pool; pool_offset = pool_offset % NUM_POOLS; -diff -urNp linux-2.6.38.7/drivers/gpu/drm/via/via_drv.h linux-2.6.38.7/drivers/gpu/drm/via/via_drv.h ---- linux-2.6.38.7/drivers/gpu/drm/via/via_drv.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/via/via_drv.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h +index 9cf87d9..2000b7d 100644 +--- a/drivers/gpu/drm/via/via_drv.h ++++ b/drivers/gpu/drm/via/via_drv.h @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer { typedef uint32_t maskarray_t[5]; @@ -28013,10 +28637,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/via/via_drv.h linux-2.6.38.7/drivers/g drm_via_state_t hc_state; char pci_buf[VIA_PCI_BUF_SIZE]; const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE]; -diff -urNp linux-2.6.38.7/drivers/gpu/drm/via/via_irq.c linux-2.6.38.7/drivers/gpu/drm/via/via_irq.c ---- linux-2.6.38.7/drivers/gpu/drm/via/via_irq.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/via/via_irq.c 2011-04-28 19:57:25.000000000 -0400 -@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de +diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c +index d391f48..10c8ca3 100644 +--- a/drivers/gpu/drm/via/via_irq.c ++++ b/drivers/gpu/drm/via/via_irq.c +@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc) if (crtc != 0) return 0; @@ -28025,7 +28650,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/via/via_irq.c linux-2.6.38.7/drivers/g } irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS) -@@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_I +@@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS) status = VIA_READ(VIA_REG_INTERRUPT); if (status & VIA_IRQ_VBLANK_PENDING) { @@ -28036,7 +28661,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/via/via_irq.c linux-2.6.38.7/drivers/g do_gettimeofday(&cur_vblank); if (dev_priv->last_vblank_valid) { dev_priv->usec_per_vblank = -@@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_I +@@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS) dev_priv->last_vblank = cur_vblank; dev_priv->last_vblank_valid = 1; } @@ -28045,7 +28670,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/via/via_irq.c linux-2.6.38.7/drivers/g DRM_DEBUG("US per vblank is: %u\n", dev_priv->usec_per_vblank); } -@@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(DRM_I +@@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS) for (i = 0; i < dev_priv->num_irqs; ++i) { if (status & cur_irq->pending_mask) { @@ -28054,7 +28679,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/via/via_irq.c linux-2.6.38.7/drivers/g DRM_WAKEUP(&cur_irq->irq_queue); handled = 1; if (dev_priv->irq_map[drm_via_irq_dma0_td] == i) -@@ -243,11 +243,11 @@ via_driver_irq_wait(struct drm_device *d +@@ -243,11 +243,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ, ((VIA_READ(masks[irq][2]) & masks[irq][3]) == masks[irq][4])); @@ -28068,7 +28693,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/via/via_irq.c linux-2.6.38.7/drivers/g *sequence) <= (1 << 23))); } *sequence = cur_irq_sequence; -@@ -285,7 +285,7 @@ void via_driver_irq_preinstall(struct dr +@@ -285,7 +285,7 @@ void via_driver_irq_preinstall(struct drm_device *dev) } for (i = 0; i < dev_priv->num_irqs; ++i) { @@ -28077,7 +28702,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/via/via_irq.c linux-2.6.38.7/drivers/g cur_irq->enable_mask = dev_priv->irq_masks[i][0]; cur_irq->pending_mask = dev_priv->irq_masks[i][1]; DRM_INIT_WAITQUEUE(&cur_irq->irq_queue); -@@ -367,7 +367,7 @@ int via_wait_irq(struct drm_device *dev, +@@ -367,7 +367,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv) switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) { case VIA_IRQ_RELATIVE: irqwait->request.sequence += @@ -28086,9 +28711,10 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/via/via_irq.c linux-2.6.38.7/drivers/g irqwait->request.type &= ~_DRM_VBLANK_RELATIVE; case VIA_IRQ_ABSOLUTE: break; -diff -urNp linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h ---- linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +index 10fc01f..b4e9822 100644 +--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h ++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h @@ -240,7 +240,7 @@ struct vmw_private { * Fencing and IRQs. */ @@ -28098,10 +28724,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-2.6.38.7/dri wait_queue_head_t fence_queue; wait_queue_head_t fifo_queue; atomic_t fence_queue_waiters; -diff -urNp linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c ---- linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-04-28 19:57:25.000000000 -0400 -@@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev +diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c +index 61eacc1..ee38ce8 100644 +--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c ++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c +@@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv, while (!vmw_lag_lt(queue, us)) { spin_lock(&queue->lock); if (list_empty(&queue->head)) @@ -28110,10 +28737,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-2.6.38.7/d else { fence = list_first_entry(&queue->head, struct vmw_fence, head); -diff -urNp linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c ---- linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-04-28 19:57:25.000000000 -0400 -@@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *de +diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +index 635c0ff..f12fa3d 100644 +--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c ++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +@@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo) (unsigned int) min, (unsigned int) fifo->capabilities); @@ -28122,7 +28750,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6.38.7/dr iowrite32(dev_priv->last_read_sequence, fifo_mem + SVGA_FIFO_FENCE); vmw_fence_queue_init(&fifo->fence_queue); return vmw_fifo_send_fence(dev_priv, &dummy); -@@ -476,7 +476,7 @@ int vmw_fifo_send_fence(struct vmw_priva +@@ -476,7 +476,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *sequence) fm = vmw_fifo_reserve(dev_priv, bytes); if (unlikely(fm == NULL)) { @@ -28131,7 +28759,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6.38.7/dr ret = -ENOMEM; (void)vmw_fallback_wait(dev_priv, false, true, *sequence, false, 3*HZ); -@@ -484,7 +484,7 @@ int vmw_fifo_send_fence(struct vmw_priva +@@ -484,7 +484,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *sequence) } do { @@ -28140,7 +28768,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6.38.7/dr } while (*sequence == 0); if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) { -@@ -534,7 +534,7 @@ static int vmw_fifo_vm_fault(struct vm_a +@@ -534,7 +534,7 @@ static int vmw_fifo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) return VM_FAULT_SIGBUS; } @@ -28149,10 +28777,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6.38.7/dr .fault = vmw_fifo_vm_fault, .open = NULL, .close = NULL -diff -urNp linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c ---- linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-04-28 19:57:25.000000000 -0400 -@@ -100,7 +100,7 @@ bool vmw_fence_signaled(struct vmw_priva +diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c +index e92298a..f68f2d6 100644 +--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c ++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c +@@ -100,7 +100,7 @@ bool vmw_fence_signaled(struct vmw_private *dev_priv, * emitted. Then the fence is stale and signaled. */ @@ -28161,7 +28790,7 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-2.6.38.7/dri > VMW_FENCE_WRAP); return ret; -@@ -131,7 +131,7 @@ int vmw_fallback_wait(struct vmw_private +@@ -131,7 +131,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv, if (fifo_idle) down_read(&fifo_state->rwsem); @@ -28170,10 +28799,11 @@ diff -urNp linux-2.6.38.7/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-2.6.38.7/dri ret = 0; for (;;) { -diff -urNp linux-2.6.38.7/drivers/hid/hid-core.c linux-2.6.38.7/drivers/hid/hid-core.c ---- linux-2.6.38.7/drivers/hid/hid-core.c 2011-04-18 17:27:14.000000000 -0400 -+++ linux-2.6.38.7/drivers/hid/hid-core.c 2011-04-28 19:57:25.000000000 -0400 -@@ -1846,7 +1846,7 @@ static bool hid_ignore(struct hid_device +diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c +index 9477b2a..41aa080 100644 +--- a/drivers/hid/hid-core.c ++++ b/drivers/hid/hid-core.c +@@ -1846,7 +1846,7 @@ static bool hid_ignore(struct hid_device *hdev) int hid_add_device(struct hid_device *hdev) { @@ -28182,7 +28812,7 @@ diff -urNp linux-2.6.38.7/drivers/hid/hid-core.c linux-2.6.38.7/drivers/hid/hid- int ret; if (WARN_ON(hdev->status & HID_STAT_ADDED)) -@@ -1861,7 +1861,7 @@ int hid_add_device(struct hid_device *hd +@@ -1861,7 +1861,7 @@ int hid_add_device(struct hid_device *hdev) /* XXX hack, any other cleaner solution after the driver core * is converted to allow more than 20 bytes as the device name? */ dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus, @@ -28191,10 +28821,11 @@ diff -urNp linux-2.6.38.7/drivers/hid/hid-core.c linux-2.6.38.7/drivers/hid/hid- hid_debug_register(hdev, dev_name(&hdev->dev)); ret = device_add(&hdev->dev); -diff -urNp linux-2.6.38.7/drivers/hid/usbhid/hiddev.c linux-2.6.38.7/drivers/hid/usbhid/hiddev.c ---- linux-2.6.38.7/drivers/hid/usbhid/hiddev.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/hid/usbhid/hiddev.c 2011-04-28 19:34:15.000000000 -0400 -@@ -613,7 +613,7 @@ static long hiddev_ioctl(struct file *fi +diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c +index af0a7c1..969143a 100644 +--- a/drivers/hid/usbhid/hiddev.c ++++ b/drivers/hid/usbhid/hiddev.c +@@ -613,7 +613,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) break; case HIDIOCAPPLICATION: @@ -28203,10 +28834,11 @@ diff -urNp linux-2.6.38.7/drivers/hid/usbhid/hiddev.c linux-2.6.38.7/drivers/hid break; for (i = 0; i < hid->maxcollection; i++) -diff -urNp linux-2.6.38.7/drivers/hwmon/lis3lv02d.c linux-2.6.38.7/drivers/hwmon/lis3lv02d.c ---- linux-2.6.38.7/drivers/hwmon/lis3lv02d.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/hwmon/lis3lv02d.c 2011-04-28 19:57:25.000000000 -0400 -@@ -436,7 +436,7 @@ static irqreturn_t lis302dl_interrupt(in +diff --git a/drivers/hwmon/lis3lv02d.c b/drivers/hwmon/lis3lv02d.c +index d805e8e..1c78d9a 100644 +--- a/drivers/hwmon/lis3lv02d.c ++++ b/drivers/hwmon/lis3lv02d.c +@@ -436,7 +436,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *dummy) * the lid is closed. This leads to interrupts as soon as a little move * is done. */ @@ -28215,7 +28847,7 @@ diff -urNp linux-2.6.38.7/drivers/hwmon/lis3lv02d.c linux-2.6.38.7/drivers/hwmon wake_up_interruptible(&lis3_dev.misc_wait); kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN); -@@ -519,7 +519,7 @@ static int lis3lv02d_misc_open(struct in +@@ -519,7 +519,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file) if (lis3_dev.pm_dev) pm_runtime_get_sync(lis3_dev.pm_dev); @@ -28224,7 +28856,7 @@ diff -urNp linux-2.6.38.7/drivers/hwmon/lis3lv02d.c linux-2.6.38.7/drivers/hwmon return 0; } -@@ -546,7 +546,7 @@ static ssize_t lis3lv02d_misc_read(struc +@@ -546,7 +546,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf, add_wait_queue(&lis3_dev.misc_wait, &wait); while (true) { set_current_state(TASK_INTERRUPTIBLE); @@ -28242,9 +28874,10 @@ diff -urNp linux-2.6.38.7/drivers/hwmon/lis3lv02d.c linux-2.6.38.7/drivers/hwmon return POLLIN | POLLRDNORM; return 0; } -diff -urNp linux-2.6.38.7/drivers/hwmon/lis3lv02d.h linux-2.6.38.7/drivers/hwmon/lis3lv02d.h ---- linux-2.6.38.7/drivers/hwmon/lis3lv02d.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/hwmon/lis3lv02d.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/hwmon/lis3lv02d.h b/drivers/hwmon/lis3lv02d.h +index a193958..4d7ecd2 100644 +--- a/drivers/hwmon/lis3lv02d.h ++++ b/drivers/hwmon/lis3lv02d.h @@ -265,7 +265,7 @@ struct lis3lv02d { struct input_polled_dev *idev; /* input device */ struct platform_device *pdev; /* platform device */ @@ -28254,9 +28887,10 @@ diff -urNp linux-2.6.38.7/drivers/hwmon/lis3lv02d.h linux-2.6.38.7/drivers/hwmon union axis_conversion ac; /* hw -> logical axis */ int mapped_btns[3]; -diff -urNp linux-2.6.38.7/drivers/hwmon/sht15.c linux-2.6.38.7/drivers/hwmon/sht15.c ---- linux-2.6.38.7/drivers/hwmon/sht15.c 2011-04-18 17:27:14.000000000 -0400 -+++ linux-2.6.38.7/drivers/hwmon/sht15.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c +index 38a41d2..ef64d3b 100644 +--- a/drivers/hwmon/sht15.c ++++ b/drivers/hwmon/sht15.c @@ -113,7 +113,7 @@ struct sht15_data { int supply_uV; int supply_uV_valid; @@ -28266,7 +28900,7 @@ diff -urNp linux-2.6.38.7/drivers/hwmon/sht15.c linux-2.6.38.7/drivers/hwmon/sht }; /** -@@ -246,13 +246,13 @@ static inline int sht15_update_single_va +@@ -246,13 +246,13 @@ static inline int sht15_update_single_val(struct sht15_data *data, return ret; gpio_direction_input(data->pdata->gpio_data); @@ -28282,7 +28916,7 @@ diff -urNp linux-2.6.38.7/drivers/hwmon/sht15.c linux-2.6.38.7/drivers/hwmon/sht schedule_work(&data->read_work); } ret = wait_event_timeout(data->wait_queue, -@@ -399,7 +399,7 @@ static irqreturn_t sht15_interrupt_fired +@@ -399,7 +399,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d) struct sht15_data *data = d; /* First disable the interrupt */ disable_irq_nosync(irq); @@ -28291,7 +28925,7 @@ diff -urNp linux-2.6.38.7/drivers/hwmon/sht15.c linux-2.6.38.7/drivers/hwmon/sht /* Then schedule a reading work struct */ if (data->flag != SHT15_READING_NOTHING) schedule_work(&data->read_work); -@@ -450,11 +450,11 @@ static void sht15_bh_read_data(struct wo +@@ -450,11 +450,11 @@ static void sht15_bh_read_data(struct work_struct *work_s) here as could have gone low in meantime so verify it hasn't! */ @@ -28305,10 +28939,11 @@ diff -urNp linux-2.6.38.7/drivers/hwmon/sht15.c linux-2.6.38.7/drivers/hwmon/sht return; } /* Read the data back from the device */ -diff -urNp linux-2.6.38.7/drivers/hwmon/w83791d.c linux-2.6.38.7/drivers/hwmon/w83791d.c ---- linux-2.6.38.7/drivers/hwmon/w83791d.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/hwmon/w83791d.c 2011-04-28 19:34:15.000000000 -0400 -@@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_cli +diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c +index 400a88b..2392c35 100644 +--- a/drivers/hwmon/w83791d.c ++++ b/drivers/hwmon/w83791d.c +@@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_client *client, struct i2c_board_info *info); static int w83791d_remove(struct i2c_client *client); @@ -28319,10 +28954,11 @@ diff -urNp linux-2.6.38.7/drivers/hwmon/w83791d.c linux-2.6.38.7/drivers/hwmon/w static struct w83791d_data *w83791d_update_device(struct device *dev); #ifdef DEBUG -diff -urNp linux-2.6.38.7/drivers/ide/ide-cd.c linux-2.6.38.7/drivers/ide/ide-cd.c ---- linux-2.6.38.7/drivers/ide/ide-cd.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ide/ide-cd.c 2011-04-28 19:34:15.000000000 -0400 -@@ -776,7 +776,7 @@ static void cdrom_do_block_pc(ide_drive_ +diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c +index 413e4ef..d992603 100644 +--- a/drivers/ide/ide-cd.c ++++ b/drivers/ide/ide-cd.c +@@ -776,7 +776,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq) alignment = queue_dma_alignment(q) | q->dma_pad_mask; if ((unsigned long)buf & alignment || blk_rq_bytes(rq) & q->dma_pad_mask @@ -28331,10 +28967,11 @@ diff -urNp linux-2.6.38.7/drivers/ide/ide-cd.c linux-2.6.38.7/drivers/ide/ide-cd drive->dma = 0; } } -diff -urNp linux-2.6.38.7/drivers/ide/ide-floppy.c linux-2.6.38.7/drivers/ide/ide-floppy.c ---- linux-2.6.38.7/drivers/ide/ide-floppy.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ide/ide-floppy.c 2011-05-16 21:47:08.000000000 -0400 -@@ -379,6 +379,8 @@ static int ide_floppy_get_capacity(ide_d +diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c +index 5406b6e..ad866b7 100644 +--- a/drivers/ide/ide-floppy.c ++++ b/drivers/ide/ide-floppy.c +@@ -379,6 +379,8 @@ static int ide_floppy_get_capacity(ide_drive_t *drive) u8 pc_buf[256], header_len, desc_cnt; int i, rc = 1, blocks, length; @@ -28343,10 +28980,11 @@ diff -urNp linux-2.6.38.7/drivers/ide/ide-floppy.c linux-2.6.38.7/drivers/ide/id ide_debug_log(IDE_DBG_FUNC, "enter"); drive->bios_cyl = 0; -diff -urNp linux-2.6.38.7/drivers/ide/setup-pci.c linux-2.6.38.7/drivers/ide/setup-pci.c ---- linux-2.6.38.7/drivers/ide/setup-pci.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/ide/setup-pci.c 2011-05-16 21:47:08.000000000 -0400 -@@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev +diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c +index ab3db61..afed580 100644 +--- a/drivers/ide/setup-pci.c ++++ b/drivers/ide/setup-pci.c +@@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev1, struct pci_dev *dev2, int ret, i, n_ports = dev2 ? 4 : 2; struct ide_hw hw[4], *hws[] = { NULL, NULL, NULL, NULL }; @@ -28355,10 +28993,11 @@ diff -urNp linux-2.6.38.7/drivers/ide/setup-pci.c linux-2.6.38.7/drivers/ide/set for (i = 0; i < n_ports / 2; i++) { ret = ide_setup_pci_controller(pdev[i], d, !i); if (ret < 0) -diff -urNp linux-2.6.38.7/drivers/infiniband/core/cm.c linux-2.6.38.7/drivers/infiniband/core/cm.c ---- linux-2.6.38.7/drivers/infiniband/core/cm.c 2011-04-18 17:27:14.000000000 -0400 -+++ linux-2.6.38.7/drivers/infiniband/core/cm.c 2011-04-28 19:34:15.000000000 -0400 -@@ -113,7 +113,7 @@ static char const counter_group_names[CM +diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c +index 1d9616b..828c022 100644 +--- a/drivers/infiniband/core/cm.c ++++ b/drivers/infiniband/core/cm.c +@@ -113,7 +113,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS] struct cm_counter_group { struct kobject obj; @@ -28367,7 +29006,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/cm.c linux-2.6.38.7/drivers/in }; struct cm_counter_attribute { -@@ -1387,7 +1387,7 @@ static void cm_dup_req_handler(struct cm +@@ -1387,7 +1387,7 @@ static void cm_dup_req_handler(struct cm_work *work, struct ib_mad_send_buf *msg = NULL; int ret; @@ -28376,7 +29015,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/cm.c linux-2.6.38.7/drivers/in counter[CM_REQ_COUNTER]); /* Quick state check to discard duplicate REQs. */ -@@ -1765,7 +1765,7 @@ static void cm_dup_rep_handler(struct cm +@@ -1765,7 +1765,7 @@ static void cm_dup_rep_handler(struct cm_work *work) if (!cm_id_priv) return; @@ -28385,7 +29024,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/cm.c linux-2.6.38.7/drivers/in counter[CM_REP_COUNTER]); ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg); if (ret) -@@ -1932,7 +1932,7 @@ static int cm_rtu_handler(struct cm_work +@@ -1932,7 +1932,7 @@ static int cm_rtu_handler(struct cm_work *work) if (cm_id_priv->id.state != IB_CM_REP_SENT && cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) { spin_unlock_irq(&cm_id_priv->lock); @@ -28394,7 +29033,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/cm.c linux-2.6.38.7/drivers/in counter[CM_RTU_COUNTER]); goto out; } -@@ -2111,7 +2111,7 @@ static int cm_dreq_handler(struct cm_wor +@@ -2111,7 +2111,7 @@ static int cm_dreq_handler(struct cm_work *work) cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id, dreq_msg->local_comm_id); if (!cm_id_priv) { @@ -28403,7 +29042,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/cm.c linux-2.6.38.7/drivers/in counter[CM_DREQ_COUNTER]); cm_issue_drep(work->port, work->mad_recv_wc); return -EINVAL; -@@ -2132,7 +2132,7 @@ static int cm_dreq_handler(struct cm_wor +@@ -2132,7 +2132,7 @@ static int cm_dreq_handler(struct cm_work *work) case IB_CM_MRA_REP_RCVD: break; case IB_CM_TIMEWAIT: @@ -28412,7 +29051,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/cm.c linux-2.6.38.7/drivers/in counter[CM_DREQ_COUNTER]); if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg)) goto unlock; -@@ -2146,7 +2146,7 @@ static int cm_dreq_handler(struct cm_wor +@@ -2146,7 +2146,7 @@ static int cm_dreq_handler(struct cm_work *work) cm_free_msg(msg); goto deref; case IB_CM_DREQ_RCVD: @@ -28421,7 +29060,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/cm.c linux-2.6.38.7/drivers/in counter[CM_DREQ_COUNTER]); goto unlock; default: -@@ -2504,7 +2504,7 @@ static int cm_mra_handler(struct cm_work +@@ -2504,7 +2504,7 @@ static int cm_mra_handler(struct cm_work *work) ib_modify_mad(cm_id_priv->av.port->mad_agent, cm_id_priv->msg, timeout)) { if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD) @@ -28430,7 +29069,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/cm.c linux-2.6.38.7/drivers/in counter_group[CM_RECV_DUPLICATES]. counter[CM_MRA_COUNTER]); goto out; -@@ -2513,7 +2513,7 @@ static int cm_mra_handler(struct cm_work +@@ -2513,7 +2513,7 @@ static int cm_mra_handler(struct cm_work *work) break; case IB_CM_MRA_REQ_RCVD: case IB_CM_MRA_REP_RCVD: @@ -28439,7 +29078,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/cm.c linux-2.6.38.7/drivers/in counter[CM_MRA_COUNTER]); /* fall through */ default: -@@ -2675,7 +2675,7 @@ static int cm_lap_handler(struct cm_work +@@ -2675,7 +2675,7 @@ static int cm_lap_handler(struct cm_work *work) case IB_CM_LAP_IDLE: break; case IB_CM_MRA_LAP_SENT: @@ -28448,7 +29087,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/cm.c linux-2.6.38.7/drivers/in counter[CM_LAP_COUNTER]); if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg)) goto unlock; -@@ -2691,7 +2691,7 @@ static int cm_lap_handler(struct cm_work +@@ -2691,7 +2691,7 @@ static int cm_lap_handler(struct cm_work *work) cm_free_msg(msg); goto deref; case IB_CM_LAP_RCVD: @@ -28457,7 +29096,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/cm.c linux-2.6.38.7/drivers/in counter[CM_LAP_COUNTER]); goto unlock; default: -@@ -2975,7 +2975,7 @@ static int cm_sidr_req_handler(struct cm +@@ -2975,7 +2975,7 @@ static int cm_sidr_req_handler(struct cm_work *work) cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv); if (cur_cm_id_priv) { spin_unlock_irq(&cm.lock); @@ -28466,7 +29105,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/cm.c linux-2.6.38.7/drivers/in counter[CM_SIDR_REQ_COUNTER]); goto out; /* Duplicate message. */ } -@@ -3187,10 +3187,10 @@ static void cm_send_handler(struct ib_ma +@@ -3187,10 +3187,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent, if (!msg->context[0] && (attr_index != CM_REJ_COUNTER)) msg->retries = 1; @@ -28479,7 +29118,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/cm.c linux-2.6.38.7/drivers/in &port->counter_group[CM_XMIT_RETRIES]. counter[attr_index]); -@@ -3400,7 +3400,7 @@ static void cm_recv_handler(struct ib_ma +@@ -3400,7 +3400,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent, } attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id); @@ -28488,7 +29127,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/cm.c linux-2.6.38.7/drivers/in counter[attr_id - CM_ATTR_ID_OFFSET]); work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths, -@@ -3598,7 +3598,7 @@ static ssize_t cm_show_counter(struct ko +@@ -3598,7 +3598,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr, cm_attr = container_of(attr, struct cm_counter_attribute, attr); return sprintf(buf, "%ld\n", @@ -28497,9 +29136,10 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/cm.c linux-2.6.38.7/drivers/in } static const struct sysfs_ops cm_counter_ops = { -diff -urNp linux-2.6.38.7/drivers/infiniband/core/fmr_pool.c linux-2.6.38.7/drivers/infiniband/core/fmr_pool.c ---- linux-2.6.38.7/drivers/infiniband/core/fmr_pool.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/infiniband/core/fmr_pool.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c +index 4507043..14ad522 100644 +--- a/drivers/infiniband/core/fmr_pool.c ++++ b/drivers/infiniband/core/fmr_pool.c @@ -97,8 +97,8 @@ struct ib_fmr_pool { struct task_struct *thread; @@ -28511,7 +29151,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/fmr_pool.c linux-2.6.38.7/driv wait_queue_head_t force_wait; }; -@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *p +@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr) struct ib_fmr_pool *pool = pool_ptr; do { @@ -28524,7 +29164,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/fmr_pool.c linux-2.6.38.7/driv wake_up_interruptible(&pool->force_wait); if (pool->flush_function) -@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *p +@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr) } set_current_state(TASK_INTERRUPTIBLE); @@ -28533,7 +29173,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/fmr_pool.c linux-2.6.38.7/driv !kthread_should_stop()) schedule(); __set_current_state(TASK_RUNNING); -@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(s +@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd, pool->dirty_watermark = params->dirty_watermark; pool->dirty_len = 0; spin_lock_init(&pool->pool_lock); @@ -28544,7 +29184,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/fmr_pool.c linux-2.6.38.7/driv init_waitqueue_head(&pool->force_wait); pool->thread = kthread_run(ib_fmr_cleanup_thread, -@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool +@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool) } spin_unlock_irq(&pool->pool_lock); @@ -28558,7 +29198,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/fmr_pool.c linux-2.6.38.7/driv return -EINTR; return 0; -@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr +@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr) } else { list_add_tail(&fmr->list, &pool->dirty_list); if (++pool->dirty_len >= pool->dirty_watermark) { @@ -28567,10 +29207,11 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/core/fmr_pool.c linux-2.6.38.7/driv wake_up_process(pool->thread); } } -diff -urNp linux-2.6.38.7/drivers/infiniband/hw/cxgb4/mem.c linux-2.6.38.7/drivers/infiniband/hw/cxgb4/mem.c ---- linux-2.6.38.7/drivers/infiniband/hw/cxgb4/mem.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/infiniband/hw/cxgb4/mem.c 2011-04-28 19:57:25.000000000 -0400 -@@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_r +diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c +index 273ffe4..a997eaa 100644 +--- a/drivers/infiniband/hw/cxgb4/mem.c ++++ b/drivers/infiniband/hw/cxgb4/mem.c +@@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry, int err; struct fw_ri_tpte tpt; u32 stag_idx; @@ -28579,7 +29220,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/cxgb4/mem.c linux-2.6.38.7/drive if (c4iw_fatal_error(rdev)) return -EIO; -@@ -135,7 +135,7 @@ static int write_tpt_entry(struct c4iw_r +@@ -135,7 +135,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry, &rdev->resource.tpt_fifo_lock); if (!stag_idx) return -ENOMEM; @@ -28588,10 +29229,11 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/cxgb4/mem.c linux-2.6.38.7/drive } PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n", __func__, stag_state, type, pdid, stag_idx); -diff -urNp linux-2.6.38.7/drivers/infiniband/hw/ipath/ipath_fs.c linux-2.6.38.7/drivers/infiniband/hw/ipath/ipath_fs.c ---- linux-2.6.38.7/drivers/infiniband/hw/ipath/ipath_fs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/infiniband/hw/ipath/ipath_fs.c 2011-05-16 21:47:08.000000000 -0400 -@@ -113,6 +113,8 @@ static ssize_t atomic_counters_read(stru +diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c +index 31ae1b1..2f5b038 100644 +--- a/drivers/infiniband/hw/ipath/ipath_fs.c ++++ b/drivers/infiniband/hw/ipath/ipath_fs.c +@@ -113,6 +113,8 @@ static ssize_t atomic_counters_read(struct file *file, char __user *buf, struct infinipath_counters counters; struct ipath_devdata *dd; @@ -28600,10 +29242,11 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/ipath/ipath_fs.c linux-2.6.38.7/ dd = file->f_path.dentry->d_inode->i_private; dd->ipath_f_read_counters(dd, &counters); -diff -urNp linux-2.6.38.7/drivers/infiniband/hw/ipath/ipath_rc.c linux-2.6.38.7/drivers/infiniband/hw/ipath/ipath_rc.c ---- linux-2.6.38.7/drivers/infiniband/hw/ipath/ipath_rc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/infiniband/hw/ipath/ipath_rc.c 2011-05-11 18:35:16.000000000 -0400 -@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *de +diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c +index 79b3dbc..96e5fcc 100644 +--- a/drivers/infiniband/hw/ipath/ipath_rc.c ++++ b/drivers/infiniband/hw/ipath/ipath_rc.c +@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, struct ib_atomic_eth *ateth; struct ipath_ack_entry *e; u64 vaddr; @@ -28612,7 +29255,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/ipath/ipath_rc.c linux-2.6.38.7/ u64 sdata; u32 rkey; u8 next; -@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *de +@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, IB_ACCESS_REMOTE_ATOMIC))) goto nack_acc_unlck; /* Perform atomic OP and save result. */ @@ -28626,10 +29269,11 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/ipath/ipath_rc.c linux-2.6.38.7/ (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr, be64_to_cpu(ateth->compare_data), sdata); -diff -urNp linux-2.6.38.7/drivers/infiniband/hw/ipath/ipath_ruc.c linux-2.6.38.7/drivers/infiniband/hw/ipath/ipath_ruc.c ---- linux-2.6.38.7/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-05-11 18:35:16.000000000 -0400 -@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ip +diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c +index 1f95bba..9530f87 100644 +--- a/drivers/infiniband/hw/ipath/ipath_ruc.c ++++ b/drivers/infiniband/hw/ipath/ipath_ruc.c +@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp) unsigned long flags; struct ib_wc wc; u64 sdata; @@ -28652,10 +29296,11 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/ipath/ipath_ruc.c linux-2.6.38.7 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr, sdata, wqe->wr.wr.atomic.swap); goto send_comp; -diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes.c linux-2.6.38.7/drivers/infiniband/hw/nes/nes.c ---- linux-2.6.38.7/drivers/infiniband/hw/nes/nes.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/infiniband/hw/nes/nes.c 2011-04-28 19:57:25.000000000 -0400 -@@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi +diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c +index 3b4ec32..2050fb1 100644 +--- a/drivers/infiniband/hw/nes/nes.c ++++ b/drivers/infiniband/hw/nes/nes.c +@@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes"); LIST_HEAD(nes_adapter_list); static LIST_HEAD(nes_dev_list); @@ -28664,7 +29309,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes.c linux-2.6.38.7/drivers static unsigned int ee_flsh_adapter; static unsigned int sysfs_nonidx_addr; -@@ -274,7 +274,7 @@ static void nes_cqp_rem_ref_callback(str +@@ -274,7 +274,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r struct nes_qp *nesqp = cqp_request->cqp_callback_pointer; struct nes_adapter *nesadapter = nesdev->nesadapter; @@ -28673,9 +29318,65 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes.c linux-2.6.38.7/drivers /* Free the control structures */ -diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c ---- linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h +index 6fe7987..68637b5 100644 +--- a/drivers/infiniband/hw/nes/nes.h ++++ b/drivers/infiniband/hw/nes/nes.h +@@ -175,17 +175,17 @@ extern unsigned int nes_debug_level; + extern unsigned int wqm_quanta; + extern struct list_head nes_adapter_list; + +-extern atomic_t cm_connects; +-extern atomic_t cm_accepts; +-extern atomic_t cm_disconnects; +-extern atomic_t cm_closes; +-extern atomic_t cm_connecteds; +-extern atomic_t cm_connect_reqs; +-extern atomic_t cm_rejects; +-extern atomic_t mod_qp_timouts; +-extern atomic_t qps_created; +-extern atomic_t qps_destroyed; +-extern atomic_t sw_qps_destroyed; ++extern atomic_unchecked_t cm_connects; ++extern atomic_unchecked_t cm_accepts; ++extern atomic_unchecked_t cm_disconnects; ++extern atomic_unchecked_t cm_closes; ++extern atomic_unchecked_t cm_connecteds; ++extern atomic_unchecked_t cm_connect_reqs; ++extern atomic_unchecked_t cm_rejects; ++extern atomic_unchecked_t mod_qp_timouts; ++extern atomic_unchecked_t qps_created; ++extern atomic_unchecked_t qps_destroyed; ++extern atomic_unchecked_t sw_qps_destroyed; + extern u32 mh_detected; + extern u32 mh_pauses_sent; + extern u32 cm_packets_sent; +@@ -194,14 +194,14 @@ extern u32 cm_packets_created; + extern u32 cm_packets_received; + extern u32 cm_packets_dropped; + extern u32 cm_packets_retrans; +-extern atomic_t cm_listens_created; +-extern atomic_t cm_listens_destroyed; ++extern atomic_unchecked_t cm_listens_created; ++extern atomic_unchecked_t cm_listens_destroyed; + extern u32 cm_backlog_drops; +-extern atomic_t cm_loopbacks; +-extern atomic_t cm_nodes_created; +-extern atomic_t cm_nodes_destroyed; +-extern atomic_t cm_accel_dropped_pkts; +-extern atomic_t cm_resets_recvd; ++extern atomic_unchecked_t cm_loopbacks; ++extern atomic_unchecked_t cm_nodes_created; ++extern atomic_unchecked_t cm_nodes_destroyed; ++extern atomic_unchecked_t cm_accel_dropped_pkts; ++extern atomic_unchecked_t cm_resets_recvd; + + extern u32 int_mod_timer_init; + extern u32 int_mod_cq_depth_256; +diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c +index 009ec81..6e65648 100644 +--- a/drivers/infiniband/hw/nes/nes_cm.c ++++ b/drivers/infiniband/hw/nes/nes_cm.c @@ -68,14 +68,14 @@ u32 cm_packets_dropped; u32 cm_packets_retrans; u32 cm_packets_created; @@ -28719,7 +29420,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.7/driv /** -@@ -1045,7 +1045,7 @@ static int mini_cm_dec_refcnt_listen(str +@@ -1045,7 +1045,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core, kfree(listener); listener = NULL; ret = 0; @@ -28728,7 +29429,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.7/driv } else { spin_unlock_irqrestore(&cm_core->listen_list_lock, flags); } -@@ -1242,7 +1242,7 @@ static struct nes_cm_node *make_cm_node( +@@ -1242,7 +1242,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core, cm_node->rem_mac); add_hte_node(cm_core, cm_node); @@ -28737,7 +29438,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.7/driv return cm_node; } -@@ -1300,7 +1300,7 @@ static int rem_ref_cm_node(struct nes_cm +@@ -1300,7 +1300,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core, } atomic_dec(&cm_core->node_cnt); @@ -28746,7 +29447,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.7/driv nesqp = cm_node->nesqp; if (nesqp) { nesqp->cm_node = NULL; -@@ -1367,7 +1367,7 @@ static int process_options(struct nes_cm +@@ -1367,7 +1367,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc, static void drop_packet(struct sk_buff *skb) { @@ -28755,7 +29456,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.7/driv dev_kfree_skb_any(skb); } -@@ -1430,7 +1430,7 @@ static void handle_rst_pkt(struct nes_cm +@@ -1430,7 +1430,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb, { int reset = 0; /* whether to send reset in case of err.. */ @@ -28764,7 +29465,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.7/driv nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u." " refcnt=%d\n", cm_node, cm_node->state, atomic_read(&cm_node->ref_count)); -@@ -2059,7 +2059,7 @@ static struct nes_cm_node *mini_cm_conne +@@ -2059,7 +2059,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core, rem_ref_cm_node(cm_node->cm_core, cm_node); return NULL; } @@ -28773,7 +29474,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.7/driv loopbackremotenode->loopbackpartner = cm_node; loopbackremotenode->tcp_cntxt.rcv_wscale = NES_CM_DEFAULT_RCV_WND_SCALE; -@@ -2334,7 +2334,7 @@ static int mini_cm_recv_pkt(struct nes_c +@@ -2334,7 +2334,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core, add_ref_cm_node(cm_node); } else if (cm_node->state == NES_CM_STATE_TSA) { rem_ref_cm_node(cm_core, cm_node); @@ -28782,7 +29483,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.7/driv dev_kfree_skb_any(skb); break; } -@@ -2640,7 +2640,7 @@ static int nes_cm_disconn_true(struct ne +@@ -2640,7 +2640,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp) if ((cm_id) && (cm_id->event_handler)) { if (issue_disconn) { @@ -28791,7 +29492,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.7/driv cm_event.event = IW_CM_EVENT_DISCONNECT; cm_event.status = disconn_status; cm_event.local_addr = cm_id->local_addr; -@@ -2662,7 +2662,7 @@ static int nes_cm_disconn_true(struct ne +@@ -2662,7 +2662,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp) } if (issue_close) { @@ -28800,7 +29501,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.7/driv nes_disconnect(nesqp, 1); cm_id->provider_data = nesqp; -@@ -2793,7 +2793,7 @@ int nes_accept(struct iw_cm_id *cm_id, s +@@ -2793,7 +2793,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n", nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener); @@ -28809,7 +29510,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.7/driv nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n", netdev_refcnt_read(nesvnic->netdev)); -@@ -3003,7 +3003,7 @@ int nes_reject(struct iw_cm_id *cm_id, c +@@ -3003,7 +3003,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len) struct nes_cm_core *cm_core; @@ -28818,7 +29519,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.7/driv cm_node = (struct nes_cm_node *) cm_id->provider_data; loopback = cm_node->loopbackpartner; cm_core = cm_node->cm_core; -@@ -3069,7 +3069,7 @@ int nes_connect(struct iw_cm_id *cm_id, +@@ -3069,7 +3069,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) ntohl(cm_id->local_addr.sin_addr.s_addr), ntohs(cm_id->local_addr.sin_port)); @@ -28827,7 +29528,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.7/driv nesqp->active_conn = 1; /* cache the cm_id in the qp */ -@@ -3175,7 +3175,7 @@ int nes_create_listen(struct iw_cm_id *c +@@ -3175,7 +3175,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog) g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node); return err; } @@ -28836,7 +29537,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.7/driv } cm_id->add_ref(cm_id); -@@ -3280,7 +3280,7 @@ static void cm_event_connected(struct ne +@@ -3280,7 +3280,7 @@ static void cm_event_connected(struct nes_cm_event *event) if (nesqp->destroyed) { return; } @@ -28845,7 +29546,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.7/driv nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on" " local port 0x%04X. jiffies = %lu.\n", nesqp->hwqp.qp_id, -@@ -3495,7 +3495,7 @@ static void cm_event_reset(struct nes_cm +@@ -3495,7 +3495,7 @@ static void cm_event_reset(struct nes_cm_event *event) cm_id->add_ref(cm_id); ret = cm_id->event_handler(cm_id, &cm_event); @@ -28854,7 +29555,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.7/driv cm_event.event = IW_CM_EVENT_CLOSE; cm_event.status = IW_CM_EVENT_STATUS_OK; cm_event.provider_data = cm_id->provider_data; -@@ -3531,7 +3531,7 @@ static void cm_event_mpa_req(struct nes_ +@@ -3531,7 +3531,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event) return; cm_id = cm_node->cm_id; @@ -28863,7 +29564,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.7/driv nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n", cm_node, cm_id, jiffies); -@@ -3569,7 +3569,7 @@ static void cm_event_mpa_reject(struct n +@@ -3569,7 +3569,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event) return; cm_id = cm_node->cm_id; @@ -28872,64 +29573,11 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.7/driv nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n", cm_node, cm_id, jiffies); -diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes.h linux-2.6.38.7/drivers/infiniband/hw/nes/nes.h ---- linux-2.6.38.7/drivers/infiniband/hw/nes/nes.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/infiniband/hw/nes/nes.h 2011-04-28 19:57:25.000000000 -0400 -@@ -175,17 +175,17 @@ extern unsigned int nes_debug_level; - extern unsigned int wqm_quanta; - extern struct list_head nes_adapter_list; - --extern atomic_t cm_connects; --extern atomic_t cm_accepts; --extern atomic_t cm_disconnects; --extern atomic_t cm_closes; --extern atomic_t cm_connecteds; --extern atomic_t cm_connect_reqs; --extern atomic_t cm_rejects; --extern atomic_t mod_qp_timouts; --extern atomic_t qps_created; --extern atomic_t qps_destroyed; --extern atomic_t sw_qps_destroyed; -+extern atomic_unchecked_t cm_connects; -+extern atomic_unchecked_t cm_accepts; -+extern atomic_unchecked_t cm_disconnects; -+extern atomic_unchecked_t cm_closes; -+extern atomic_unchecked_t cm_connecteds; -+extern atomic_unchecked_t cm_connect_reqs; -+extern atomic_unchecked_t cm_rejects; -+extern atomic_unchecked_t mod_qp_timouts; -+extern atomic_unchecked_t qps_created; -+extern atomic_unchecked_t qps_destroyed; -+extern atomic_unchecked_t sw_qps_destroyed; - extern u32 mh_detected; - extern u32 mh_pauses_sent; - extern u32 cm_packets_sent; -@@ -194,14 +194,14 @@ extern u32 cm_packets_created; - extern u32 cm_packets_received; - extern u32 cm_packets_dropped; - extern u32 cm_packets_retrans; --extern atomic_t cm_listens_created; --extern atomic_t cm_listens_destroyed; -+extern atomic_unchecked_t cm_listens_created; -+extern atomic_unchecked_t cm_listens_destroyed; - extern u32 cm_backlog_drops; --extern atomic_t cm_loopbacks; --extern atomic_t cm_nodes_created; --extern atomic_t cm_nodes_destroyed; --extern atomic_t cm_accel_dropped_pkts; --extern atomic_t cm_resets_recvd; -+extern atomic_unchecked_t cm_loopbacks; -+extern atomic_unchecked_t cm_nodes_created; -+extern atomic_unchecked_t cm_nodes_destroyed; -+extern atomic_unchecked_t cm_accel_dropped_pkts; -+extern atomic_unchecked_t cm_resets_recvd; - - extern u32 int_mod_timer_init; - extern u32 int_mod_cq_depth_256; -diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.38.7/drivers/infiniband/hw/nes/nes_nic.c ---- linux-2.6.38.7/drivers/infiniband/hw/nes/nes_nic.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/infiniband/hw/nes/nes_nic.c 2011-04-28 19:57:25.000000000 -0400 -@@ -1302,31 +1302,31 @@ static void nes_netdev_get_ethtool_stats +diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c +index 2c9c193..4bebd0f 100644 +--- a/drivers/infiniband/hw/nes/nes_nic.c ++++ b/drivers/infiniband/hw/nes/nes_nic.c +@@ -1302,31 +1302,31 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev, target_stat_values[++index] = mh_detected; target_stat_values[++index] = mh_pauses_sent; target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits; @@ -28979,9 +29627,10 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.38.7/dri target_stat_values[++index] = nesadapter->free_4kpbl; target_stat_values[++index] = nesadapter->free_256pbl; target_stat_values[++index] = int_mod_timer_init; -diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.38.7/drivers/infiniband/hw/nes/nes_verbs.c ---- linux-2.6.38.7/drivers/infiniband/hw/nes/nes_verbs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/infiniband/hw/nes/nes_verbs.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c +index 26d8018..cffad93 100644 +--- a/drivers/infiniband/hw/nes/nes_verbs.c ++++ b/drivers/infiniband/hw/nes/nes_verbs.c @@ -46,9 +46,9 @@ #include <rdma/ib_umem.h> @@ -28995,7 +29644,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.38.7/d static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev); -@@ -1141,7 +1141,7 @@ static struct ib_qp *nes_create_qp(struc +@@ -1141,7 +1141,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd, if (init_attr->create_flags) return ERR_PTR(-EINVAL); @@ -29004,7 +29653,7 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.38.7/d switch (init_attr->qp_type) { case IB_QPT_RC: if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) { -@@ -1470,7 +1470,7 @@ static int nes_destroy_qp(struct ib_qp * +@@ -1470,7 +1470,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp) struct iw_cm_event cm_event; int ret; @@ -29013,9 +29662,10 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.38.7/d nesqp->destroyed = 1; /* Blow away the connection if it exists. */ -diff -urNp linux-2.6.38.7/drivers/infiniband/hw/qib/qib.h linux-2.6.38.7/drivers/infiniband/hw/qib/qib.h ---- linux-2.6.38.7/drivers/infiniband/hw/qib/qib.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/infiniband/hw/qib/qib.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h +index 73225ee..949a406 100644 +--- a/drivers/infiniband/hw/qib/qib.h ++++ b/drivers/infiniband/hw/qib/qib.h @@ -51,6 +51,7 @@ #include <linux/completion.h> #include <linux/kref.h> @@ -29024,9 +29674,10 @@ diff -urNp linux-2.6.38.7/drivers/infiniband/hw/qib/qib.h linux-2.6.38.7/drivers #include "qib_common.h" #include "qib_verbs.h" -diff -urNp linux-2.6.38.7/drivers/input/gameport/gameport.c linux-2.6.38.7/drivers/input/gameport/gameport.c ---- linux-2.6.38.7/drivers/input/gameport/gameport.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/input/gameport/gameport.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c +index 5b8f59d..7f36886 100644 +--- a/drivers/input/gameport/gameport.c ++++ b/drivers/input/gameport/gameport.c @@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys); */ static void gameport_init_port(struct gameport *gameport) @@ -29044,10 +29695,11 @@ diff -urNp linux-2.6.38.7/drivers/input/gameport/gameport.c linux-2.6.38.7/drive gameport->dev.bus = &gameport_bus; gameport->dev.release = gameport_release_port; if (gameport->parent) -diff -urNp linux-2.6.38.7/drivers/input/input.c linux-2.6.38.7/drivers/input/input.c ---- linux-2.6.38.7/drivers/input/input.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/input/input.c 2011-04-28 19:57:25.000000000 -0400 -@@ -1820,7 +1820,7 @@ static void input_cleanse_bitmasks(struc +diff --git a/drivers/input/input.c b/drivers/input/input.c +index 11905b6..0892a58 100644 +--- a/drivers/input/input.c ++++ b/drivers/input/input.c +@@ -1820,7 +1820,7 @@ static void input_cleanse_bitmasks(struct input_dev *dev) */ int input_register_device(struct input_dev *dev) { @@ -29056,7 +29708,7 @@ diff -urNp linux-2.6.38.7/drivers/input/input.c linux-2.6.38.7/drivers/input/inp struct input_handler *handler; const char *path; int error; -@@ -1853,7 +1853,7 @@ int input_register_device(struct input_d +@@ -1853,7 +1853,7 @@ int input_register_device(struct input_dev *dev) dev->setkeycode_new = input_default_setkeycode; dev_set_name(&dev->dev, "input%ld", @@ -29065,9 +29717,10 @@ diff -urNp linux-2.6.38.7/drivers/input/input.c linux-2.6.38.7/drivers/input/inp error = device_add(&dev->dev); if (error) -diff -urNp linux-2.6.38.7/drivers/input/joystick/sidewinder.c linux-2.6.38.7/drivers/input/joystick/sidewinder.c ---- linux-2.6.38.7/drivers/input/joystick/sidewinder.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/input/joystick/sidewinder.c 2011-05-18 20:23:44.000000000 -0400 +diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c +index b8d8611..15f8d2c 100644 +--- a/drivers/input/joystick/sidewinder.c ++++ b/drivers/input/joystick/sidewinder.c @@ -30,6 +30,7 @@ #include <linux/kernel.h> #include <linux/module.h> @@ -29085,10 +29738,11 @@ diff -urNp linux-2.6.38.7/drivers/input/joystick/sidewinder.c linux-2.6.38.7/dri i = sw_read_packet(sw->gameport, buf, sw->length, 0); if (sw->type == SW_ID_3DP && sw->length == 66 && i != 66) { /* Broken packet, try to fix */ -diff -urNp linux-2.6.38.7/drivers/input/joystick/xpad.c linux-2.6.38.7/drivers/input/joystick/xpad.c ---- linux-2.6.38.7/drivers/input/joystick/xpad.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/input/joystick/xpad.c 2011-04-28 19:57:25.000000000 -0400 -@@ -689,7 +689,7 @@ static void xpad_led_set(struct led_clas +diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c +index 56abf3d..d8dd85d 100644 +--- a/drivers/input/joystick/xpad.c ++++ b/drivers/input/joystick/xpad.c +@@ -689,7 +689,7 @@ static void xpad_led_set(struct led_classdev *led_cdev, static int xpad_led_probe(struct usb_xpad *xpad) { @@ -29097,7 +29751,7 @@ diff -urNp linux-2.6.38.7/drivers/input/joystick/xpad.c linux-2.6.38.7/drivers/i long led_no; struct xpad_led *led; struct led_classdev *led_cdev; -@@ -702,7 +702,7 @@ static int xpad_led_probe(struct usb_xpa +@@ -702,7 +702,7 @@ static int xpad_led_probe(struct usb_xpad *xpad) if (!led) return -ENOMEM; @@ -29106,10 +29760,11 @@ diff -urNp linux-2.6.38.7/drivers/input/joystick/xpad.c linux-2.6.38.7/drivers/i snprintf(led->name, sizeof(led->name), "xpad%ld", led_no); led->xpad = xpad; -diff -urNp linux-2.6.38.7/drivers/input/mousedev.c linux-2.6.38.7/drivers/input/mousedev.c ---- linux-2.6.38.7/drivers/input/mousedev.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/input/mousedev.c 2011-04-28 19:34:15.000000000 -0400 -@@ -764,7 +764,7 @@ static ssize_t mousedev_read(struct file +diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c +index 7630273..3b86407 100644 +--- a/drivers/input/mousedev.c ++++ b/drivers/input/mousedev.c +@@ -764,7 +764,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer, spin_unlock_irq(&client->packet_lock); @@ -29118,10 +29773,11 @@ diff -urNp linux-2.6.38.7/drivers/input/mousedev.c linux-2.6.38.7/drivers/input/ return -EFAULT; return count; -diff -urNp linux-2.6.38.7/drivers/input/serio/serio.c linux-2.6.38.7/drivers/input/serio/serio.c ---- linux-2.6.38.7/drivers/input/serio/serio.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/input/serio/serio.c 2011-04-28 19:57:25.000000000 -0400 -@@ -497,7 +497,7 @@ static void serio_release_port(struct de +diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c +index ba70058..571d25d 100644 +--- a/drivers/input/serio/serio.c ++++ b/drivers/input/serio/serio.c +@@ -497,7 +497,7 @@ static void serio_release_port(struct device *dev) */ static void serio_init_port(struct serio *serio) { @@ -29130,7 +29786,7 @@ diff -urNp linux-2.6.38.7/drivers/input/serio/serio.c linux-2.6.38.7/drivers/inp __module_get(THIS_MODULE); -@@ -508,7 +508,7 @@ static void serio_init_port(struct serio +@@ -508,7 +508,7 @@ static void serio_init_port(struct serio *serio) mutex_init(&serio->drv_mutex); device_initialize(&serio->dev); dev_set_name(&serio->dev, "serio%ld", @@ -29139,9 +29795,10 @@ diff -urNp linux-2.6.38.7/drivers/input/serio/serio.c linux-2.6.38.7/drivers/inp serio->dev.bus = &serio_bus; serio->dev.release = serio_release_port; serio->dev.groups = serio_device_attr_groups; -diff -urNp linux-2.6.38.7/drivers/isdn/capi/capi.c linux-2.6.38.7/drivers/isdn/capi/capi.c ---- linux-2.6.38.7/drivers/isdn/capi/capi.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/isdn/capi/capi.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c +index f80a7c4..ae8f642 100644 +--- a/drivers/isdn/capi/capi.c ++++ b/drivers/isdn/capi/capi.c @@ -89,8 +89,8 @@ struct capiminor { struct capi20_appl *ap; @@ -29153,7 +29810,7 @@ diff -urNp linux-2.6.38.7/drivers/isdn/capi/capi.c linux-2.6.38.7/drivers/isdn/c struct tty_port port; int ttyinstop; -@@ -414,7 +414,7 @@ gen_data_b3_resp_for(struct capiminor *m +@@ -414,7 +414,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb) capimsg_setu16(s, 2, mp->ap->applid); capimsg_setu8 (s, 4, CAPI_DATA_B3); capimsg_setu8 (s, 5, CAPI_RESP); @@ -29162,7 +29819,7 @@ diff -urNp linux-2.6.38.7/drivers/isdn/capi/capi.c linux-2.6.38.7/drivers/isdn/c capimsg_setu32(s, 8, mp->ncci); capimsg_setu16(s, 12, datahandle); } -@@ -547,14 +547,14 @@ static void handle_minor_send(struct cap +@@ -547,14 +547,14 @@ static void handle_minor_send(struct capiminor *mp) mp->outbytes -= len; spin_unlock_bh(&mp->outlock); @@ -29179,10 +29836,11 @@ diff -urNp linux-2.6.38.7/drivers/isdn/capi/capi.c linux-2.6.38.7/drivers/isdn/c capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */ capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */ capimsg_setu16(skb->data, 16, len); /* Data length */ -diff -urNp linux-2.6.38.7/drivers/isdn/gigaset/common.c linux-2.6.38.7/drivers/isdn/gigaset/common.c ---- linux-2.6.38.7/drivers/isdn/gigaset/common.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/isdn/gigaset/common.c 2011-04-28 19:34:15.000000000 -0400 -@@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct +diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c +index db621db..825ea1a 100644 +--- a/drivers/isdn/gigaset/common.c ++++ b/drivers/isdn/gigaset/common.c +@@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels, cs->commands_pending = 0; cs->cur_at_seq = 0; cs->gotfwver = -1; @@ -29191,9 +29849,10 @@ diff -urNp linux-2.6.38.7/drivers/isdn/gigaset/common.c linux-2.6.38.7/drivers/i cs->dev = NULL; cs->tty = NULL; cs->tty_dev = NULL; -diff -urNp linux-2.6.38.7/drivers/isdn/gigaset/gigaset.h linux-2.6.38.7/drivers/isdn/gigaset/gigaset.h ---- linux-2.6.38.7/drivers/isdn/gigaset/gigaset.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/isdn/gigaset/gigaset.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h +index 6dd3607..b66e23e 100644 +--- a/drivers/isdn/gigaset/gigaset.h ++++ b/drivers/isdn/gigaset/gigaset.h @@ -35,6 +35,7 @@ #include <linux/tty_driver.h> #include <linux/list.h> @@ -29211,10 +29870,11 @@ diff -urNp linux-2.6.38.7/drivers/isdn/gigaset/gigaset.h linux-2.6.38.7/drivers/ struct tty_struct *tty; struct tasklet_struct if_wake_tasklet; unsigned control_state; -diff -urNp linux-2.6.38.7/drivers/isdn/gigaset/interface.c linux-2.6.38.7/drivers/isdn/gigaset/interface.c ---- linux-2.6.38.7/drivers/isdn/gigaset/interface.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/isdn/gigaset/interface.c 2011-04-28 19:34:15.000000000 -0400 -@@ -160,9 +160,7 @@ static int if_open(struct tty_struct *tt +diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c +index bb710d16..e09da98 100644 +--- a/drivers/isdn/gigaset/interface.c ++++ b/drivers/isdn/gigaset/interface.c +@@ -160,9 +160,7 @@ static int if_open(struct tty_struct *tty, struct file *filp) return -ERESTARTSYS; tty->driver_data = cs; @@ -29225,7 +29885,7 @@ diff -urNp linux-2.6.38.7/drivers/isdn/gigaset/interface.c linux-2.6.38.7/driver spin_lock_irqsave(&cs->lock, flags); cs->tty = tty; spin_unlock_irqrestore(&cs->lock, flags); -@@ -190,10 +188,10 @@ static void if_close(struct tty_struct * +@@ -190,10 +188,10 @@ static void if_close(struct tty_struct *tty, struct file *filp) if (!cs->connected) gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */ @@ -29238,7 +29898,7 @@ diff -urNp linux-2.6.38.7/drivers/isdn/gigaset/interface.c linux-2.6.38.7/driver spin_lock_irqsave(&cs->lock, flags); cs->tty = NULL; spin_unlock_irqrestore(&cs->lock, flags); -@@ -228,7 +226,7 @@ static int if_ioctl(struct tty_struct *t +@@ -228,7 +226,7 @@ static int if_ioctl(struct tty_struct *tty, struct file *file, if (!cs->connected) { gig_dbg(DEBUG_IF, "not connected"); retval = -ENODEV; @@ -29247,7 +29907,7 @@ diff -urNp linux-2.6.38.7/drivers/isdn/gigaset/interface.c linux-2.6.38.7/driver dev_warn(cs->dev, "%s: device not opened\n", __func__); else { retval = 0; -@@ -358,7 +356,7 @@ static int if_write(struct tty_struct *t +@@ -358,7 +356,7 @@ static int if_write(struct tty_struct *tty, const unsigned char *buf, int count) retval = -ENODEV; goto done; } @@ -29256,7 +29916,7 @@ diff -urNp linux-2.6.38.7/drivers/isdn/gigaset/interface.c linux-2.6.38.7/driver dev_warn(cs->dev, "%s: device not opened\n", __func__); retval = -ENODEV; goto done; -@@ -411,7 +409,7 @@ static int if_write_room(struct tty_stru +@@ -411,7 +409,7 @@ static int if_write_room(struct tty_struct *tty) if (!cs->connected) { gig_dbg(DEBUG_IF, "not connected"); retval = -ENODEV; @@ -29265,7 +29925,7 @@ diff -urNp linux-2.6.38.7/drivers/isdn/gigaset/interface.c linux-2.6.38.7/driver dev_warn(cs->dev, "%s: device not opened\n", __func__); else if (cs->mstate != MS_LOCKED) { dev_warn(cs->dev, "can't write to unlocked device\n"); -@@ -441,7 +439,7 @@ static int if_chars_in_buffer(struct tty +@@ -441,7 +439,7 @@ static int if_chars_in_buffer(struct tty_struct *tty) if (!cs->connected) gig_dbg(DEBUG_IF, "not connected"); @@ -29274,7 +29934,7 @@ diff -urNp linux-2.6.38.7/drivers/isdn/gigaset/interface.c linux-2.6.38.7/driver dev_warn(cs->dev, "%s: device not opened\n", __func__); else if (cs->mstate != MS_LOCKED) dev_warn(cs->dev, "can't write to unlocked device\n"); -@@ -469,7 +467,7 @@ static void if_throttle(struct tty_struc +@@ -469,7 +467,7 @@ static void if_throttle(struct tty_struct *tty) if (!cs->connected) gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */ @@ -29283,7 +29943,7 @@ diff -urNp linux-2.6.38.7/drivers/isdn/gigaset/interface.c linux-2.6.38.7/driver dev_warn(cs->dev, "%s: device not opened\n", __func__); else gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__); -@@ -493,7 +491,7 @@ static void if_unthrottle(struct tty_str +@@ -493,7 +491,7 @@ static void if_unthrottle(struct tty_struct *tty) if (!cs->connected) gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */ @@ -29292,7 +29952,7 @@ diff -urNp linux-2.6.38.7/drivers/isdn/gigaset/interface.c linux-2.6.38.7/driver dev_warn(cs->dev, "%s: device not opened\n", __func__); else gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__); -@@ -524,7 +522,7 @@ static void if_set_termios(struct tty_st +@@ -524,7 +522,7 @@ static void if_set_termios(struct tty_struct *tty, struct ktermios *old) goto out; } @@ -29301,10 +29961,11 @@ diff -urNp linux-2.6.38.7/drivers/isdn/gigaset/interface.c linux-2.6.38.7/driver dev_warn(cs->dev, "%s: device not opened\n", __func__); goto out; } -diff -urNp linux-2.6.38.7/drivers/isdn/hardware/avm/b1.c linux-2.6.38.7/drivers/isdn/hardware/avm/b1.c ---- linux-2.6.38.7/drivers/isdn/hardware/avm/b1.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/isdn/hardware/avm/b1.c 2011-04-28 19:34:15.000000000 -0400 -@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo +diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c +index 2a57da59..e7a12ed 100644 +--- a/drivers/isdn/hardware/avm/b1.c ++++ b/drivers/isdn/hardware/avm/b1.c +@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart * t4file) } if (left) { if (t4file->user) { @@ -29313,7 +29974,7 @@ diff -urNp linux-2.6.38.7/drivers/isdn/hardware/avm/b1.c linux-2.6.38.7/drivers/ return -EFAULT; } else { memcpy(buf, dp, left); -@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capilo +@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart * config) } if (left) { if (config->user) { @@ -29322,10 +29983,11 @@ diff -urNp linux-2.6.38.7/drivers/isdn/hardware/avm/b1.c linux-2.6.38.7/drivers/ return -EFAULT; } else { memcpy(buf, dp, left); -diff -urNp linux-2.6.38.7/drivers/isdn/hardware/eicon/capidtmf.c linux-2.6.38.7/drivers/isdn/hardware/eicon/capidtmf.c ---- linux-2.6.38.7/drivers/isdn/hardware/eicon/capidtmf.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/isdn/hardware/eicon/capidtmf.c 2011-05-16 21:47:08.000000000 -0400 -@@ -498,6 +498,7 @@ void capidtmf_recv_block (t_capidtmf_sta +diff --git a/drivers/isdn/hardware/eicon/capidtmf.c b/drivers/isdn/hardware/eicon/capidtmf.c +index f130724..c373c68 100644 +--- a/drivers/isdn/hardware/eicon/capidtmf.c ++++ b/drivers/isdn/hardware/eicon/capidtmf.c +@@ -498,6 +498,7 @@ void capidtmf_recv_block (t_capidtmf_state *p_state, byte *buffer, word leng byte goertzel_result_buffer[CAPIDTMF_RECV_TOTAL_FREQUENCY_COUNT]; short windowed_sample_buffer[CAPIDTMF_RECV_WINDOWED_SAMPLES]; @@ -29333,9 +29995,10 @@ diff -urNp linux-2.6.38.7/drivers/isdn/hardware/eicon/capidtmf.c linux-2.6.38.7/ if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE) { -diff -urNp linux-2.6.38.7/drivers/isdn/hardware/eicon/capifunc.c linux-2.6.38.7/drivers/isdn/hardware/eicon/capifunc.c ---- linux-2.6.38.7/drivers/isdn/hardware/eicon/capifunc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/isdn/hardware/eicon/capifunc.c 2011-05-16 21:47:08.000000000 -0400 +diff --git a/drivers/isdn/hardware/eicon/capifunc.c b/drivers/isdn/hardware/eicon/capifunc.c +index 4d425c6..a9be6c4 100644 +--- a/drivers/isdn/hardware/eicon/capifunc.c ++++ b/drivers/isdn/hardware/eicon/capifunc.c @@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void) IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -29345,10 +30008,11 @@ diff -urNp linux-2.6.38.7/drivers/isdn/hardware/eicon/capifunc.c linux-2.6.38.7/ DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-2.6.38.7/drivers/isdn/hardware/eicon/diddfunc.c linux-2.6.38.7/drivers/isdn/hardware/eicon/diddfunc.c ---- linux-2.6.38.7/drivers/isdn/hardware/eicon/diddfunc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/isdn/hardware/eicon/diddfunc.c 2011-05-16 21:47:08.000000000 -0400 -@@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_di +diff --git a/drivers/isdn/hardware/eicon/diddfunc.c b/drivers/isdn/hardware/eicon/diddfunc.c +index 3029234..ef0d9e2 100644 +--- a/drivers/isdn/hardware/eicon/diddfunc.c ++++ b/drivers/isdn/hardware/eicon/diddfunc.c +@@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_didd(void) IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -29357,10 +30021,11 @@ diff -urNp linux-2.6.38.7/drivers/isdn/hardware/eicon/diddfunc.c linux-2.6.38.7/ DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-2.6.38.7/drivers/isdn/hardware/eicon/divasfunc.c linux-2.6.38.7/drivers/isdn/hardware/eicon/divasfunc.c ---- linux-2.6.38.7/drivers/isdn/hardware/eicon/divasfunc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/isdn/hardware/eicon/divasfunc.c 2011-05-16 21:47:08.000000000 -0400 -@@ -161,6 +161,8 @@ static int DIVA_INIT_FUNCTION connect_di +diff --git a/drivers/isdn/hardware/eicon/divasfunc.c b/drivers/isdn/hardware/eicon/divasfunc.c +index d36a4c0..11e7d1a 100644 +--- a/drivers/isdn/hardware/eicon/divasfunc.c ++++ b/drivers/isdn/hardware/eicon/divasfunc.c +@@ -161,6 +161,8 @@ static int DIVA_INIT_FUNCTION connect_didd(void) IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -29369,10 +30034,11 @@ diff -urNp linux-2.6.38.7/drivers/isdn/hardware/eicon/divasfunc.c linux-2.6.38.7 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-2.6.38.7/drivers/isdn/hardware/eicon/idifunc.c linux-2.6.38.7/drivers/isdn/hardware/eicon/idifunc.c ---- linux-2.6.38.7/drivers/isdn/hardware/eicon/idifunc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/isdn/hardware/eicon/idifunc.c 2011-05-16 21:47:08.000000000 -0400 -@@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_di +diff --git a/drivers/isdn/hardware/eicon/idifunc.c b/drivers/isdn/hardware/eicon/idifunc.c +index db87d51..7d09acf 100644 +--- a/drivers/isdn/hardware/eicon/idifunc.c ++++ b/drivers/isdn/hardware/eicon/idifunc.c +@@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_didd(void) IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -29381,9 +30047,10 @@ diff -urNp linux-2.6.38.7/drivers/isdn/hardware/eicon/idifunc.c linux-2.6.38.7/d DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-2.6.38.7/drivers/isdn/hardware/eicon/message.c linux-2.6.38.7/drivers/isdn/hardware/eicon/message.c ---- linux-2.6.38.7/drivers/isdn/hardware/eicon/message.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/isdn/hardware/eicon/message.c 2011-05-16 21:47:08.000000000 -0400 +diff --git a/drivers/isdn/hardware/eicon/message.c b/drivers/isdn/hardware/eicon/message.c +index 341ef17..843598e 100644 +--- a/drivers/isdn/hardware/eicon/message.c ++++ b/drivers/isdn/hardware/eicon/message.c @@ -4889,6 +4889,8 @@ static void sig_ind(PLCI *plci) dword d; word w; @@ -29393,7 +30060,7 @@ diff -urNp linux-2.6.38.7/drivers/isdn/hardware/eicon/message.c linux-2.6.38.7/d a = plci->adapter; Id = ((word)plci->Id<<8)|a->Id; PUT_WORD(&SS_Ind[4],0x0000); -@@ -7484,6 +7486,8 @@ static word add_b1(PLCI *plci, API_PARSE +@@ -7484,6 +7486,8 @@ static word add_b1(PLCI *plci, API_PARSE *bp, word b_channel_info, word j, n, w; dword d; @@ -29402,7 +30069,7 @@ diff -urNp linux-2.6.38.7/drivers/isdn/hardware/eicon/message.c linux-2.6.38.7/d for(i=0;i<8;i++) bp_parms[i].length = 0; for(i=0;i<2;i++) global_config[i].length = 0; -@@ -7958,6 +7962,8 @@ static word add_b23(PLCI *plci, API_PARS +@@ -7958,6 +7962,8 @@ static word add_b23(PLCI *plci, API_PARSE *bp) const byte llc3[] = {4,3,2,2,6,6,0}; const byte header[] = {0,2,3,3,0,0,0}; @@ -29411,7 +30078,7 @@ diff -urNp linux-2.6.38.7/drivers/isdn/hardware/eicon/message.c linux-2.6.38.7/d for(i=0;i<8;i++) bp_parms[i].length = 0; for(i=0;i<6;i++) b2_config_parms[i].length = 0; for(i=0;i<5;i++) b3_config_parms[i].length = 0; -@@ -14760,6 +14766,8 @@ static void group_optimization(DIVA_CAPI +@@ -14760,6 +14766,8 @@ static void group_optimization(DIVA_CAPI_ADAPTER * a, PLCI * plci) word appl_number_group_type[MAX_APPL]; PLCI *auxplci; @@ -29420,10 +30087,11 @@ diff -urNp linux-2.6.38.7/drivers/isdn/hardware/eicon/message.c linux-2.6.38.7/d set_group_ind_mask (plci); /* all APPLs within this inc. call are allowed to dial in */ if(!a->group_optimization_enabled) -diff -urNp linux-2.6.38.7/drivers/isdn/hardware/eicon/mntfunc.c linux-2.6.38.7/drivers/isdn/hardware/eicon/mntfunc.c ---- linux-2.6.38.7/drivers/isdn/hardware/eicon/mntfunc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/isdn/hardware/eicon/mntfunc.c 2011-05-16 21:47:08.000000000 -0400 -@@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_di +diff --git a/drivers/isdn/hardware/eicon/mntfunc.c b/drivers/isdn/hardware/eicon/mntfunc.c +index a564b75..f3cf8b5 100644 +--- a/drivers/isdn/hardware/eicon/mntfunc.c ++++ b/drivers/isdn/hardware/eicon/mntfunc.c +@@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_didd(void) IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -29432,10 +30100,11 @@ diff -urNp linux-2.6.38.7/drivers/isdn/hardware/eicon/mntfunc.c linux-2.6.38.7/d DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-2.6.38.7/drivers/isdn/i4l/isdn_common.c linux-2.6.38.7/drivers/isdn/i4l/isdn_common.c ---- linux-2.6.38.7/drivers/isdn/i4l/isdn_common.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/isdn/i4l/isdn_common.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1292,6 +1292,8 @@ isdn_ioctl(struct file *file, uint cmd, +diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c +index 15632bd..ff8b1c2 100644 +--- a/drivers/isdn/i4l/isdn_common.c ++++ b/drivers/isdn/i4l/isdn_common.c +@@ -1292,6 +1292,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) } iocpar; void __user *argp = (void __user *)arg; @@ -29444,10 +30113,11 @@ diff -urNp linux-2.6.38.7/drivers/isdn/i4l/isdn_common.c linux-2.6.38.7/drivers/ #define name iocpar.name #define bname iocpar.bname #define iocts iocpar.iocts -diff -urNp linux-2.6.38.7/drivers/isdn/icn/icn.c linux-2.6.38.7/drivers/isdn/icn/icn.c ---- linux-2.6.38.7/drivers/isdn/icn/icn.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/isdn/icn/icn.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len +diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c +index 1f355bb..43f1fea 100644 +--- a/drivers/isdn/icn/icn.c ++++ b/drivers/isdn/icn/icn.c +@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len, int user, icn_card * card) if (count > len) count = len; if (user) { @@ -29456,9 +30126,10 @@ diff -urNp linux-2.6.38.7/drivers/isdn/icn/icn.c linux-2.6.38.7/drivers/isdn/icn return -EFAULT; } else memcpy(msg, buf, count); -diff -urNp linux-2.6.38.7/drivers/lguest/core.c linux-2.6.38.7/drivers/lguest/core.c ---- linux-2.6.38.7/drivers/lguest/core.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/lguest/core.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c +index efa2024..2e18d14 100644 +--- a/drivers/lguest/core.c ++++ b/drivers/lguest/core.c @@ -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. @@ -29486,9 +30157,10 @@ diff -urNp linux-2.6.38.7/drivers/lguest/core.c linux-2.6.38.7/drivers/lguest/co end_switcher_text - start_switcher_text); printk(KERN_INFO "lguest: mapped switcher at %p\n", -diff -urNp linux-2.6.38.7/drivers/lguest/x86/core.c linux-2.6.38.7/drivers/lguest/x86/core.c ---- linux-2.6.38.7/drivers/lguest/x86/core.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/lguest/x86/core.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c +index 9f1659c..5352032 100644 +--- a/drivers/lguest/x86/core.c ++++ b/drivers/lguest/x86/core.c @@ -59,7 +59,7 @@ static struct { /* Offset from where switcher.S was compiled to where we've copied it */ static unsigned long switcher_offset(void) @@ -29498,7 +30170,7 @@ diff -urNp linux-2.6.38.7/drivers/lguest/x86/core.c linux-2.6.38.7/drivers/lgues } /* This cpu's struct lguest_pages. */ -@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg +@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages) * These copies are pretty cheap, so we do them unconditionally: */ /* Save the current Host top-level page directory. */ @@ -29530,9 +30202,10 @@ diff -urNp linux-2.6.38.7/drivers/lguest/x86/core.c linux-2.6.38.7/drivers/lgues lguest_entry.segment = LGUEST_CS; /* -diff -urNp linux-2.6.38.7/drivers/lguest/x86/switcher_32.S linux-2.6.38.7/drivers/lguest/x86/switcher_32.S ---- linux-2.6.38.7/drivers/lguest/x86/switcher_32.S 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/lguest/x86/switcher_32.S 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S +index 40634b0..4f5855e 100644 +--- a/drivers/lguest/x86/switcher_32.S ++++ b/drivers/lguest/x86/switcher_32.S @@ -87,6 +87,7 @@ #include <asm/page.h> #include <asm/segment.h> @@ -29591,67 +30264,11 @@ diff -urNp linux-2.6.38.7/drivers/lguest/x86/switcher_32.S linux-2.6.38.7/driver // Every interrupt can come to us here // But we must truly tell each apart. -diff -urNp linux-2.6.38.7/drivers/md/dm.c linux-2.6.38.7/drivers/md/dm.c ---- linux-2.6.38.7/drivers/md/dm.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/md/dm.c 2011-04-28 19:57:25.000000000 -0400 -@@ -162,9 +162,9 @@ struct mapped_device { - /* - * Event handling. - */ -- atomic_t event_nr; -+ atomic_unchecked_t event_nr; - wait_queue_head_t eventq; -- atomic_t uevent_seq; -+ atomic_unchecked_t uevent_seq; - struct list_head uevent_list; - spinlock_t uevent_lock; /* Protect access to uevent_list */ - -@@ -1855,8 +1855,8 @@ static struct mapped_device *alloc_dev(i - rwlock_init(&md->map_lock); - atomic_set(&md->holders, 1); - atomic_set(&md->open_count, 0); -- atomic_set(&md->event_nr, 0); -- atomic_set(&md->uevent_seq, 0); -+ atomic_set_unchecked(&md->event_nr, 0); -+ atomic_set_unchecked(&md->uevent_seq, 0); - INIT_LIST_HEAD(&md->uevent_list); - spin_lock_init(&md->uevent_lock); - -@@ -1990,7 +1990,7 @@ static void event_callback(void *context - - dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj); - -- atomic_inc(&md->event_nr); -+ atomic_inc_unchecked(&md->event_nr); - wake_up(&md->eventq); - } - -@@ -2569,18 +2569,18 @@ int dm_kobject_uevent(struct mapped_devi - - uint32_t dm_next_uevent_seq(struct mapped_device *md) - { -- return atomic_add_return(1, &md->uevent_seq); -+ return atomic_add_return_unchecked(1, &md->uevent_seq); - } - - uint32_t dm_get_event_nr(struct mapped_device *md) - { -- return atomic_read(&md->event_nr); -+ return atomic_read_unchecked(&md->event_nr); - } - - int dm_wait_event(struct mapped_device *md, int event_nr) - { - return wait_event_interruptible(md->eventq, -- (event_nr != atomic_read(&md->event_nr))); -+ (event_nr != atomic_read_unchecked(&md->event_nr))); - } - - void dm_uevent_add(struct mapped_device *md, struct list_head *elist) -diff -urNp linux-2.6.38.7/drivers/md/dm-ioctl.c linux-2.6.38.7/drivers/md/dm-ioctl.c ---- linux-2.6.38.7/drivers/md/dm-ioctl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/md/dm-ioctl.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1541,7 +1541,7 @@ static int validate_params(uint cmd, str +diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c +index 6d12775..38ed27d 100644 +--- a/drivers/md/dm-ioctl.c ++++ b/drivers/md/dm-ioctl.c +@@ -1541,7 +1541,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param) cmd == DM_LIST_VERSIONS_CMD) return 0; @@ -29660,9 +30277,10 @@ diff -urNp linux-2.6.38.7/drivers/md/dm-ioctl.c linux-2.6.38.7/drivers/md/dm-ioc if (!*param->name) { DMWARN("name not supplied when creating device"); return -EINVAL; -diff -urNp linux-2.6.38.7/drivers/md/dm-raid1.c linux-2.6.38.7/drivers/md/dm-raid1.c ---- linux-2.6.38.7/drivers/md/dm-raid1.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/md/dm-raid1.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c +index dee3267..74bd5fb 100644 +--- a/drivers/md/dm-raid1.c ++++ b/drivers/md/dm-raid1.c @@ -42,7 +42,7 @@ enum dm_raid1_error { struct mirror { @@ -29672,7 +30290,7 @@ diff -urNp linux-2.6.38.7/drivers/md/dm-raid1.c linux-2.6.38.7/drivers/md/dm-rai unsigned long error_type; struct dm_dev *dev; sector_t offset; -@@ -187,7 +187,7 @@ static struct mirror *get_valid_mirror(s +@@ -187,7 +187,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms) struct mirror *m; for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++) @@ -29681,7 +30299,7 @@ diff -urNp linux-2.6.38.7/drivers/md/dm-raid1.c linux-2.6.38.7/drivers/md/dm-rai return m; return NULL; -@@ -219,7 +219,7 @@ static void fail_mirror(struct mirror *m +@@ -219,7 +219,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type) * simple way to tell if a device has encountered * errors. */ @@ -29690,7 +30308,7 @@ diff -urNp linux-2.6.38.7/drivers/md/dm-raid1.c linux-2.6.38.7/drivers/md/dm-rai if (test_and_set_bit(error_type, &m->error_type)) return; -@@ -410,7 +410,7 @@ static struct mirror *choose_mirror(stru +@@ -410,7 +410,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector) struct mirror *m = get_default_mirror(ms); do { @@ -29708,7 +30326,7 @@ diff -urNp linux-2.6.38.7/drivers/md/dm-raid1.c linux-2.6.38.7/drivers/md/dm-rai } static int mirror_available(struct mirror_set *ms, struct bio *bio) -@@ -561,7 +561,7 @@ static void do_reads(struct mirror_set * +@@ -561,7 +561,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads) */ if (likely(region_in_sync(ms, region, 1))) m = choose_mirror(ms, bio->bi_sector); @@ -29717,7 +30335,7 @@ diff -urNp linux-2.6.38.7/drivers/md/dm-raid1.c linux-2.6.38.7/drivers/md/dm-rai m = NULL; if (likely(m)) -@@ -941,7 +941,7 @@ static int get_mirror(struct mirror_set +@@ -941,7 +941,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti, } ms->mirror[mirror].ms = ms; @@ -29726,7 +30344,7 @@ diff -urNp linux-2.6.38.7/drivers/md/dm-raid1.c linux-2.6.38.7/drivers/md/dm-rai ms->mirror[mirror].error_type = 0; ms->mirror[mirror].offset = offset; -@@ -1349,7 +1349,7 @@ static void mirror_resume(struct dm_targ +@@ -1349,7 +1349,7 @@ static void mirror_resume(struct dm_target *ti) */ static char device_status_char(struct mirror *m) { @@ -29735,9 +30353,10 @@ diff -urNp linux-2.6.38.7/drivers/md/dm-raid1.c linux-2.6.38.7/drivers/md/dm-rai return 'A'; return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' : -diff -urNp linux-2.6.38.7/drivers/md/dm-stripe.c linux-2.6.38.7/drivers/md/dm-stripe.c ---- linux-2.6.38.7/drivers/md/dm-stripe.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/md/dm-stripe.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c +index dddfa14..6080ffd 100644 +--- a/drivers/md/dm-stripe.c ++++ b/drivers/md/dm-stripe.c @@ -20,7 +20,7 @@ struct stripe { struct dm_dev *dev; sector_t physical_start; @@ -29747,7 +30366,7 @@ diff -urNp linux-2.6.38.7/drivers/md/dm-stripe.c linux-2.6.38.7/drivers/md/dm-st }; struct stripe_c { -@@ -192,7 +192,7 @@ static int stripe_ctr(struct dm_target * +@@ -192,7 +192,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv) kfree(sc); return r; } @@ -29756,7 +30375,7 @@ diff -urNp linux-2.6.38.7/drivers/md/dm-stripe.c linux-2.6.38.7/drivers/md/dm-st } ti->private = sc; -@@ -314,7 +314,7 @@ static int stripe_status(struct dm_targe +@@ -314,7 +314,7 @@ static int stripe_status(struct dm_target *ti, DMEMIT("%d ", sc->stripes); for (i = 0; i < sc->stripes; i++) { DMEMIT("%s ", sc->stripe[i].dev->name); @@ -29765,7 +30384,7 @@ diff -urNp linux-2.6.38.7/drivers/md/dm-stripe.c linux-2.6.38.7/drivers/md/dm-st 'D' : 'A'; } buffer[i] = '\0'; -@@ -361,8 +361,8 @@ static int stripe_end_io(struct dm_targe +@@ -361,8 +361,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, */ for (i = 0; i < sc->stripes; i++) if (!strcmp(sc->stripe[i].dev->name, major_minor)) { @@ -29776,10 +30395,11 @@ diff -urNp linux-2.6.38.7/drivers/md/dm-stripe.c linux-2.6.38.7/drivers/md/dm-st DM_IO_ERROR_THRESHOLD) schedule_work(&sc->trigger_event); } -diff -urNp linux-2.6.38.7/drivers/md/dm-table.c linux-2.6.38.7/drivers/md/dm-table.c ---- linux-2.6.38.7/drivers/md/dm-table.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/md/dm-table.c 2011-04-28 19:34:15.000000000 -0400 -@@ -372,7 +372,7 @@ static int device_area_is_invalid(struct +diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c +index abd23aa..36c7c0f 100644 +--- a/drivers/md/dm-table.c ++++ b/drivers/md/dm-table.c +@@ -389,7 +389,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev, if (!dev_size) return 0; @@ -29788,9 +30408,68 @@ diff -urNp linux-2.6.38.7/drivers/md/dm-table.c linux-2.6.38.7/drivers/md/dm-tab DMWARN("%s: %s too small for target: " "start=%llu, len=%llu, dev_size=%llu", dm_device_name(ti->table->md), bdevname(bdev, b), -diff -urNp linux-2.6.38.7/drivers/md/md.c linux-2.6.38.7/drivers/md/md.c ---- linux-2.6.38.7/drivers/md/md.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/md/md.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/md/dm.c b/drivers/md/dm.c +index eaa3af0..8c9a4d7 100644 +--- a/drivers/md/dm.c ++++ b/drivers/md/dm.c +@@ -162,9 +162,9 @@ struct mapped_device { + /* + * Event handling. + */ +- atomic_t event_nr; ++ atomic_unchecked_t event_nr; + wait_queue_head_t eventq; +- atomic_t uevent_seq; ++ atomic_unchecked_t uevent_seq; + struct list_head uevent_list; + spinlock_t uevent_lock; /* Protect access to uevent_list */ + +@@ -1855,8 +1855,8 @@ static struct mapped_device *alloc_dev(int minor) + rwlock_init(&md->map_lock); + atomic_set(&md->holders, 1); + atomic_set(&md->open_count, 0); +- atomic_set(&md->event_nr, 0); +- atomic_set(&md->uevent_seq, 0); ++ atomic_set_unchecked(&md->event_nr, 0); ++ atomic_set_unchecked(&md->uevent_seq, 0); + INIT_LIST_HEAD(&md->uevent_list); + spin_lock_init(&md->uevent_lock); + +@@ -1990,7 +1990,7 @@ static void event_callback(void *context) + + dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj); + +- atomic_inc(&md->event_nr); ++ atomic_inc_unchecked(&md->event_nr); + wake_up(&md->eventq); + } + +@@ -2569,18 +2569,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action, + + uint32_t dm_next_uevent_seq(struct mapped_device *md) + { +- return atomic_add_return(1, &md->uevent_seq); ++ return atomic_add_return_unchecked(1, &md->uevent_seq); + } + + uint32_t dm_get_event_nr(struct mapped_device *md) + { +- return atomic_read(&md->event_nr); ++ return atomic_read_unchecked(&md->event_nr); + } + + int dm_wait_event(struct mapped_device *md, int event_nr) + { + return wait_event_interruptible(md->eventq, +- (event_nr != atomic_read(&md->event_nr))); ++ (event_nr != atomic_read_unchecked(&md->event_nr))); + } + + void dm_uevent_add(struct mapped_device *md, struct list_head *elist) +diff --git a/drivers/md/md.c b/drivers/md/md.c +index 3683a07..720bbe6 100644 +--- a/drivers/md/md.c ++++ b/drivers/md/md.c @@ -226,10 +226,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev); * start build, activate spare */ @@ -29813,7 +30492,7 @@ diff -urNp linux-2.6.38.7/drivers/md/md.c linux-2.6.38.7/drivers/md/md.c wake_up(&md_event_waiters); } -@@ -1443,7 +1443,7 @@ static int super_1_load(mdk_rdev_t *rdev +@@ -1443,7 +1443,7 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version) rdev->preferred_minor = 0xffff; rdev->data_offset = le64_to_cpu(sb->data_offset); @@ -29822,7 +30501,7 @@ diff -urNp linux-2.6.38.7/drivers/md/md.c linux-2.6.38.7/drivers/md/md.c rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256; bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1; -@@ -1621,7 +1621,7 @@ static void super_1_sync(mddev_t *mddev, +@@ -1621,7 +1621,7 @@ static void super_1_sync(mddev_t *mddev, mdk_rdev_t *rdev) else sb->resync_offset = cpu_to_le64(0); @@ -29831,7 +30510,7 @@ diff -urNp linux-2.6.38.7/drivers/md/md.c linux-2.6.38.7/drivers/md/md.c sb->raid_disks = cpu_to_le32(mddev->raid_disks); sb->size = cpu_to_le64(mddev->dev_sectors); -@@ -2403,7 +2403,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_sho +@@ -2403,7 +2403,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store); static ssize_t errors_show(mdk_rdev_t *rdev, char *page) { @@ -29840,7 +30519,7 @@ diff -urNp linux-2.6.38.7/drivers/md/md.c linux-2.6.38.7/drivers/md/md.c } static ssize_t -@@ -2412,7 +2412,7 @@ errors_store(mdk_rdev_t *rdev, const cha +@@ -2412,7 +2412,7 @@ errors_store(mdk_rdev_t *rdev, const char *buf, size_t len) char *e; unsigned long n = simple_strtoul(buf, &e, 10); if (*buf && (*e == 0 || *e == '\n')) { @@ -29860,7 +30539,7 @@ diff -urNp linux-2.6.38.7/drivers/md/md.c linux-2.6.38.7/drivers/md/md.c INIT_LIST_HEAD(&rdev->same_set); init_waitqueue_head(&rdev->blocked_wait); -@@ -6373,7 +6373,7 @@ static int md_seq_show(struct seq_file * +@@ -6378,7 +6378,7 @@ static int md_seq_show(struct seq_file *seq, void *v) spin_unlock(&pers_lock); seq_printf(seq, "\n"); @@ -29869,7 +30548,7 @@ diff -urNp linux-2.6.38.7/drivers/md/md.c linux-2.6.38.7/drivers/md/md.c return 0; } if (v == (void*)2) { -@@ -6462,7 +6462,7 @@ static int md_seq_show(struct seq_file * +@@ -6467,7 +6467,7 @@ static int md_seq_show(struct seq_file *seq, void *v) chunk_kb ? "KB" : "B"); if (bitmap->file) { seq_printf(seq, ", file: "); @@ -29878,7 +30557,7 @@ diff -urNp linux-2.6.38.7/drivers/md/md.c linux-2.6.38.7/drivers/md/md.c } seq_printf(seq, "\n"); -@@ -6496,7 +6496,7 @@ static int md_seq_open(struct inode *ino +@@ -6501,7 +6501,7 @@ static int md_seq_open(struct inode *inode, struct file *file) else { struct seq_file *p = file->private_data; p->private = mi; @@ -29887,7 +30566,7 @@ diff -urNp linux-2.6.38.7/drivers/md/md.c linux-2.6.38.7/drivers/md/md.c } return error; } -@@ -6512,7 +6512,7 @@ static unsigned int mdstat_poll(struct f +@@ -6517,7 +6517,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait) /* always allow read */ mask = POLLIN | POLLRDNORM; @@ -29896,7 +30575,7 @@ diff -urNp linux-2.6.38.7/drivers/md/md.c linux-2.6.38.7/drivers/md/md.c mask |= POLLERR | POLLPRI; return mask; } -@@ -6556,7 +6556,7 @@ static int is_mddev_idle(mddev_t *mddev, +@@ -6561,7 +6561,7 @@ static int is_mddev_idle(mddev_t *mddev, int init) 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]) - @@ -29905,9 +30584,10 @@ diff -urNp linux-2.6.38.7/drivers/md/md.c linux-2.6.38.7/drivers/md/md.c /* sync IO will cause sync_io to increase before the disk_stats * as sync_io is counted when a request starts, and * disk_stats is counted when it completes. -diff -urNp linux-2.6.38.7/drivers/md/md.h linux-2.6.38.7/drivers/md/md.h ---- linux-2.6.38.7/drivers/md/md.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/md/md.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/md/md.h b/drivers/md/md.h +index 12215d4..4c2d3d3 100644 +--- a/drivers/md/md.h ++++ b/drivers/md/md.h @@ -117,13 +117,13 @@ struct mdk_rdev_s * only maintained for arrays that * support hot removal @@ -29924,7 +30604,7 @@ diff -urNp linux-2.6.38.7/drivers/md/md.h linux-2.6.38.7/drivers/md/md.h * for reporting to userspace and storing * in superblock. */ -@@ -360,7 +360,7 @@ static inline void rdev_dec_pending(mdk_ +@@ -360,7 +360,7 @@ static inline void rdev_dec_pending(mdk_rdev_t *rdev, mddev_t *mddev) static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) { @@ -29933,10 +30613,33 @@ diff -urNp linux-2.6.38.7/drivers/md/md.h linux-2.6.38.7/drivers/md/md.h } struct mdk_personality -diff -urNp linux-2.6.38.7/drivers/md/raid10.c linux-2.6.38.7/drivers/md/raid10.c ---- linux-2.6.38.7/drivers/md/raid10.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/md/raid10.c 2011-04-28 19:57:25.000000000 -0400 -@@ -1258,7 +1258,7 @@ static void end_sync_read(struct bio *bi +diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c +index 06cd712..c0627a2 100644 +--- a/drivers/md/raid1.c ++++ b/drivers/md/raid1.c +@@ -1392,7 +1392,7 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio) + if (r1_bio->bios[d]->bi_end_io != end_sync_read) + continue; + rdev = conf->mirrors[d].rdev; +- atomic_add(s, &rdev->corrected_errors); ++ atomic_add_unchecked(s, &rdev->corrected_errors); + if (sync_page_io(rdev, + sect, + s<<9, +@@ -1538,7 +1538,7 @@ static void fix_read_error(conf_t *conf, int read_disk, + /* Well, this device is dead */ + md_error(mddev, rdev); + else { +- atomic_add(s, &rdev->corrected_errors); ++ atomic_add_unchecked(s, &rdev->corrected_errors); + printk(KERN_INFO + "md/raid1:%s: read error corrected " + "(%d sectors at %llu on %s)\n", +diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c +index 747d061..407fe38c 100644 +--- a/drivers/md/raid10.c ++++ b/drivers/md/raid10.c +@@ -1258,7 +1258,7 @@ static void end_sync_read(struct bio *bio, int error) if (test_bit(BIO_UPTODATE, &bio->bi_flags)) set_bit(R10BIO_Uptodate, &r10_bio->state); else { @@ -29945,7 +30648,7 @@ diff -urNp linux-2.6.38.7/drivers/md/raid10.c linux-2.6.38.7/drivers/md/raid10.c &conf->mirrors[d].rdev->corrected_errors); if (!test_bit(MD_RECOVERY_SYNC, &conf->mddev->recovery)) md_error(r10_bio->mddev, -@@ -1466,7 +1466,7 @@ static void check_decay_read_errors(mdde +@@ -1466,7 +1466,7 @@ static void check_decay_read_errors(mddev_t *mddev, mdk_rdev_t *rdev) { struct timespec cur_time_mon; unsigned long hours_since_last; @@ -29954,7 +30657,7 @@ diff -urNp linux-2.6.38.7/drivers/md/raid10.c linux-2.6.38.7/drivers/md/raid10.c ktime_get_ts(&cur_time_mon); -@@ -1488,9 +1488,9 @@ static void check_decay_read_errors(mdde +@@ -1488,9 +1488,9 @@ static void check_decay_read_errors(mddev_t *mddev, mdk_rdev_t *rdev) * overflowing the shift of read_errors by hours_since_last. */ if (hours_since_last >= 8 * sizeof(read_errors)) @@ -29966,7 +30669,7 @@ diff -urNp linux-2.6.38.7/drivers/md/raid10.c linux-2.6.38.7/drivers/md/raid10.c } /* -@@ -1525,8 +1525,8 @@ static void fix_read_error(conf_t *conf, +@@ -1525,8 +1525,8 @@ static void fix_read_error(conf_t *conf, mddev_t *mddev, r10bio_t *r10_bio) } check_decay_read_errors(mddev, rdev); @@ -29977,7 +30680,7 @@ diff -urNp linux-2.6.38.7/drivers/md/raid10.c linux-2.6.38.7/drivers/md/raid10.c if (cur_read_error_count > max_read_errors) { rcu_read_unlock(); printk(KERN_NOTICE -@@ -1599,7 +1599,7 @@ static void fix_read_error(conf_t *conf, +@@ -1599,7 +1599,7 @@ static void fix_read_error(conf_t *conf, mddev_t *mddev, r10bio_t *r10_bio) test_bit(In_sync, &rdev->flags)) { atomic_inc(&rdev->nr_pending); rcu_read_unlock(); @@ -29986,31 +30689,11 @@ diff -urNp linux-2.6.38.7/drivers/md/raid10.c linux-2.6.38.7/drivers/md/raid10.c if (sync_page_io(rdev, r10_bio->devs[sl].addr + sect, -diff -urNp linux-2.6.38.7/drivers/md/raid1.c linux-2.6.38.7/drivers/md/raid1.c ---- linux-2.6.38.7/drivers/md/raid1.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/md/raid1.c 2011-04-28 19:57:25.000000000 -0400 -@@ -1392,7 +1392,7 @@ static void sync_request_write(mddev_t * - if (r1_bio->bios[d]->bi_end_io != end_sync_read) - continue; - rdev = conf->mirrors[d].rdev; -- atomic_add(s, &rdev->corrected_errors); -+ atomic_add_unchecked(s, &rdev->corrected_errors); - if (sync_page_io(rdev, - sect, - s<<9, -@@ -1538,7 +1538,7 @@ static void fix_read_error(conf_t *conf, - /* Well, this device is dead */ - md_error(mddev, rdev); - else { -- atomic_add(s, &rdev->corrected_errors); -+ atomic_add_unchecked(s, &rdev->corrected_errors); - printk(KERN_INFO - "md/raid1:%s: read error corrected " - "(%d sectors at %llu on %s)\n", -diff -urNp linux-2.6.38.7/drivers/md/raid5.c linux-2.6.38.7/drivers/md/raid5.c ---- linux-2.6.38.7/drivers/md/raid5.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/md/raid5.c 2011-05-16 21:47:08.000000000 -0400 -@@ -555,7 +555,7 @@ static void ops_run_io(struct stripe_hea +diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c +index 78536fd..32b7220 100644 +--- a/drivers/md/raid5.c ++++ b/drivers/md/raid5.c +@@ -555,7 +555,7 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s) bi->bi_next = NULL; if (rw == WRITE && test_bit(R5_ReWrite, &sh->dev[i].flags)) @@ -30019,7 +30702,7 @@ diff -urNp linux-2.6.38.7/drivers/md/raid5.c linux-2.6.38.7/drivers/md/raid5.c &rdev->corrected_errors); generic_make_request(bi); } else { -@@ -1602,15 +1602,15 @@ static void raid5_end_read_request(struc +@@ -1602,15 +1602,15 @@ static void raid5_end_read_request(struct bio * bi, int error) clear_bit(R5_ReadError, &sh->dev[i].flags); clear_bit(R5_ReWrite, &sh->dev[i].flags); } @@ -30038,7 +30721,7 @@ diff -urNp linux-2.6.38.7/drivers/md/raid5.c linux-2.6.38.7/drivers/md/raid5.c if (conf->mddev->degraded >= conf->max_degraded) printk_rl(KERN_WARNING "md/raid:%s: read error not correctable " -@@ -1628,7 +1628,7 @@ static void raid5_end_read_request(struc +@@ -1628,7 +1628,7 @@ static void raid5_end_read_request(struct bio * bi, int error) (unsigned long long)(sh->sector + rdev->data_offset), bdn); @@ -30047,7 +30730,7 @@ diff -urNp linux-2.6.38.7/drivers/md/raid5.c linux-2.6.38.7/drivers/md/raid5.c > conf->max_nr_stripes) printk(KERN_WARNING "md/raid:%s: Too many read errors, failing device %s.\n", -@@ -1953,6 +1953,7 @@ static sector_t compute_blocknr(struct s +@@ -1953,6 +1953,7 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i, int previous) sector_t r_sector; struct stripe_head sh2; @@ -30055,10 +30738,11 @@ diff -urNp linux-2.6.38.7/drivers/md/raid5.c linux-2.6.38.7/drivers/md/raid5.c chunk_offset = sector_div(new_sector, sectors_per_chunk); stripe = new_sector; -diff -urNp linux-2.6.38.7/drivers/media/common/saa7146_hlp.c linux-2.6.38.7/drivers/media/common/saa7146_hlp.c ---- linux-2.6.38.7/drivers/media/common/saa7146_hlp.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/common/saa7146_hlp.c 2011-05-16 21:47:08.000000000 -0400 -@@ -353,6 +353,8 @@ static void calculate_clipping_registers +diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146_hlp.c +index 1d1d8d2..6c6837a 100644 +--- a/drivers/media/common/saa7146_hlp.c ++++ b/drivers/media/common/saa7146_hlp.c +@@ -353,6 +353,8 @@ static void calculate_clipping_registers_rect(struct saa7146_dev *dev, struct sa int x[32], y[32], w[32], h[32]; @@ -30067,10 +30751,11 @@ diff -urNp linux-2.6.38.7/drivers/media/common/saa7146_hlp.c linux-2.6.38.7/driv /* clear out memory */ memset(&line_list[0], 0x00, sizeof(u32)*32); memset(&pixel_list[0], 0x00, sizeof(u32)*32); -diff -urNp linux-2.6.38.7/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-2.6.38.7/drivers/media/dvb/dvb-core/dvb_ca_en50221.c ---- linux-2.6.38.7/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-05-16 21:47:08.000000000 -0400 -@@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(stru +diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c +index 7ea517b..252fe54 100644 +--- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c ++++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c +@@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(struct dvb_ca_private *ca, int slot, u8 * eb u8 buf[HOST_LINK_BUF_SIZE]; int i; @@ -30079,7 +30764,7 @@ diff -urNp linux-2.6.38.7/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-2.6. dprintk("%s\n", __func__); /* check if we have space for a link buf in the rx_buffer */ -@@ -1285,6 +1287,8 @@ static ssize_t dvb_ca_en50221_io_write(s +@@ -1285,6 +1287,8 @@ static ssize_t dvb_ca_en50221_io_write(struct file *file, unsigned long timeout; int written; @@ -30088,10 +30773,11 @@ diff -urNp linux-2.6.38.7/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-2.6. dprintk("%s\n", __func__); /* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */ -diff -urNp linux-2.6.38.7/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.38.7/drivers/media/dvb/dvb-core/dvbdev.c ---- linux-2.6.38.7/drivers/media/dvb/dvb-core/dvbdev.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/dvb/dvb-core/dvbdev.c 2011-04-28 19:34:15.000000000 -0400 -@@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapt +diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c +index f732877..25c4bf2 100644 +--- a/drivers/media/dvb/dvb-core/dvbdev.c ++++ b/drivers/media/dvb/dvb-core/dvbdev.c +@@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, const struct dvb_device *template, void *priv, int type) { struct dvb_device *dvbdev; @@ -30100,10 +30786,11 @@ diff -urNp linux-2.6.38.7/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.38.7/dri struct device *clsdev; int minor; int id; -diff -urNp linux-2.6.38.7/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2.6.38.7/drivers/media/dvb/dvb-usb/dib0700_core.c ---- linux-2.6.38.7/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-05-16 21:47:08.000000000 -0400 -@@ -366,6 +366,8 @@ int dib0700_download_firmware(struct usb +diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c +index 98ffb40..75809c7 100644 +--- a/drivers/media/dvb/dvb-usb/dib0700_core.c ++++ b/drivers/media/dvb/dvb-usb/dib0700_core.c +@@ -366,6 +366,8 @@ int dib0700_download_firmware(struct usb_device *udev, const struct firmware *fw u8 buf[260]; @@ -30112,10 +30799,11 @@ diff -urNp linux-2.6.38.7/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2.6.38. while ((ret = dvb_usb_get_hexline(fw, &hx, &pos)) > 0) { deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n", hx.addr, hx.len, hx.chk); -diff -urNp linux-2.6.38.7/drivers/media/dvb/dvb-usb/lmedm04.c linux-2.6.38.7/drivers/media/dvb/dvb-usb/lmedm04.c ---- linux-2.6.38.7/drivers/media/dvb/dvb-usb/lmedm04.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/dvb/dvb-usb/lmedm04.c 2011-05-16 21:47:08.000000000 -0400 -@@ -611,6 +611,7 @@ static int lme2510_download_firmware(str +diff --git a/drivers/media/dvb/dvb-usb/lmedm04.c b/drivers/media/dvb/dvb-usb/lmedm04.c +index 46ccd01..1dbaf3a 100644 +--- a/drivers/media/dvb/dvb-usb/lmedm04.c ++++ b/drivers/media/dvb/dvb-usb/lmedm04.c +@@ -611,6 +611,7 @@ static int lme2510_download_firmware(struct usb_device *dev, packet_size = 0x31; len_in = 1; @@ -30123,7 +30811,7 @@ diff -urNp linux-2.6.38.7/drivers/media/dvb/dvb-usb/lmedm04.c linux-2.6.38.7/dri info("FRM Starting Firmware Download"); -@@ -666,6 +667,8 @@ static void lme_coldreset(struct usb_dev +@@ -666,6 +667,8 @@ static void lme_coldreset(struct usb_device *dev) int ret = 0, len_in; u8 data[512] = {0}; @@ -30132,10 +30820,11 @@ diff -urNp linux-2.6.38.7/drivers/media/dvb/dvb-usb/lmedm04.c linux-2.6.38.7/dri data[0] = 0x0a; len_in = 1; info("FRM Firmware Cold Reset"); -diff -urNp linux-2.6.38.7/drivers/media/dvb/frontends/mb86a16.c linux-2.6.38.7/drivers/media/dvb/frontends/mb86a16.c ---- linux-2.6.38.7/drivers/media/dvb/frontends/mb86a16.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/dvb/frontends/mb86a16.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1060,6 +1060,8 @@ static int mb86a16_set_fe(struct mb86a16 +diff --git a/drivers/media/dvb/frontends/mb86a16.c b/drivers/media/dvb/frontends/mb86a16.c +index 33b6323..121531a 100644 +--- a/drivers/media/dvb/frontends/mb86a16.c ++++ b/drivers/media/dvb/frontends/mb86a16.c +@@ -1060,6 +1060,8 @@ static int mb86a16_set_fe(struct mb86a16_state *state) int ret = -1; int sync; @@ -30144,10 +30833,11 @@ diff -urNp linux-2.6.38.7/drivers/media/dvb/frontends/mb86a16.c linux-2.6.38.7/d dprintk(verbose, MB86A16_INFO, 1, "freq=%d Mhz, symbrt=%d Ksps", state->frequency, state->srate); fcp = 3000; -diff -urNp linux-2.6.38.7/drivers/media/dvb/frontends/or51211.c linux-2.6.38.7/drivers/media/dvb/frontends/or51211.c ---- linux-2.6.38.7/drivers/media/dvb/frontends/or51211.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/dvb/frontends/or51211.c 2011-05-16 21:47:08.000000000 -0400 -@@ -113,6 +113,8 @@ static int or51211_load_firmware (struct +diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb/frontends/or51211.c +index c709ce6..b3fe620 100644 +--- a/drivers/media/dvb/frontends/or51211.c ++++ b/drivers/media/dvb/frontends/or51211.c +@@ -113,6 +113,8 @@ static int or51211_load_firmware (struct dvb_frontend* fe, u8 tudata[585]; int i; @@ -30156,10 +30846,11 @@ diff -urNp linux-2.6.38.7/drivers/media/dvb/frontends/or51211.c linux-2.6.38.7/d dprintk("Firmware is %zd bytes\n",fw->size); /* Get eprom data */ -diff -urNp linux-2.6.38.7/drivers/media/radio/radio-cadet.c linux-2.6.38.7/drivers/media/radio/radio-cadet.c ---- linux-2.6.38.7/drivers/media/radio/radio-cadet.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/radio/radio-cadet.c 2011-04-28 19:34:15.000000000 -0400 -@@ -349,7 +349,7 @@ static ssize_t cadet_read(struct file *f +diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c +index bc9ad08..c35ffa7 100644 +--- a/drivers/media/radio/radio-cadet.c ++++ b/drivers/media/radio/radio-cadet.c +@@ -349,7 +349,7 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo readbuf[i++] = dev->rdsbuf[dev->rdsout++]; mutex_unlock(&dev->lock); @@ -30168,9 +30859,10 @@ diff -urNp linux-2.6.38.7/drivers/media/radio/radio-cadet.c linux-2.6.38.7/drive return -EFAULT; return i; } -diff -urNp linux-2.6.38.7/drivers/media/rc/ir-lirc-codec.c linux-2.6.38.7/drivers/media/rc/ir-lirc-codec.c ---- linux-2.6.38.7/drivers/media/rc/ir-lirc-codec.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/rc/ir-lirc-codec.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c +index 1c5cc65..ebe94dd 100644 +--- a/drivers/media/rc/ir-lirc-codec.c ++++ b/drivers/media/rc/ir-lirc-codec.c @@ -277,7 +277,7 @@ static void ir_lirc_close(void *data) return; } @@ -30180,9 +30872,10 @@ diff -urNp linux-2.6.38.7/drivers/media/rc/ir-lirc-codec.c linux-2.6.38.7/driver .owner = THIS_MODULE, .write = ir_lirc_transmit_ir, .unlocked_ioctl = ir_lirc_ioctl, -diff -urNp linux-2.6.38.7/drivers/media/rc/lirc_dev.c linux-2.6.38.7/drivers/media/rc/lirc_dev.c ---- linux-2.6.38.7/drivers/media/rc/lirc_dev.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/rc/lirc_dev.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c +index fd237ab..6421d53 100644 +--- a/drivers/media/rc/lirc_dev.c ++++ b/drivers/media/rc/lirc_dev.c @@ -151,7 +151,7 @@ static int lirc_thread(void *irctl) } @@ -30192,9 +30885,10 @@ diff -urNp linux-2.6.38.7/drivers/media/rc/lirc_dev.c linux-2.6.38.7/drivers/med .owner = THIS_MODULE, .read = lirc_dev_fop_read, .write = lirc_dev_fop_write, -diff -urNp linux-2.6.38.7/drivers/media/rc/rc-main.c linux-2.6.38.7/drivers/media/rc/rc-main.c ---- linux-2.6.38.7/drivers/media/rc/rc-main.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/rc/rc-main.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c +index 5b4422e..7a64f92 100644 +--- a/drivers/media/rc/rc-main.c ++++ b/drivers/media/rc/rc-main.c @@ -994,7 +994,7 @@ EXPORT_SYMBOL_GPL(rc_free_device); int rc_register_device(struct rc_dev *dev) @@ -30204,7 +30898,7 @@ diff -urNp linux-2.6.38.7/drivers/media/rc/rc-main.c linux-2.6.38.7/drivers/medi struct rc_map *rc_map; const char *path; int rc; -@@ -1017,7 +1017,7 @@ int rc_register_device(struct rc_dev *de +@@ -1017,7 +1017,7 @@ int rc_register_device(struct rc_dev *dev) if (dev->close) dev->input_dev->close = ir_close; @@ -30213,10 +30907,11 @@ diff -urNp linux-2.6.38.7/drivers/media/rc/rc-main.c linux-2.6.38.7/drivers/medi dev_set_name(&dev->dev, "rc%ld", dev->devno); dev_set_drvdata(&dev->dev, dev); rc = device_add(&dev->dev); -diff -urNp linux-2.6.38.7/drivers/media/video/cx18/cx18-driver.c linux-2.6.38.7/drivers/media/video/cx18/cx18-driver.c ---- linux-2.6.38.7/drivers/media/video/cx18/cx18-driver.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/video/cx18/cx18-driver.c 2011-05-16 21:47:08.000000000 -0400 -@@ -60,7 +60,7 @@ static struct pci_device_id cx18_pci_tbl +diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c +index b1c3cbd..cc224e8 100644 +--- a/drivers/media/video/cx18/cx18-driver.c ++++ b/drivers/media/video/cx18/cx18-driver.c +@@ -60,7 +60,7 @@ static struct pci_device_id cx18_pci_tbl[] __devinitdata = { MODULE_DEVICE_TABLE(pci, cx18_pci_tbl); @@ -30225,7 +30920,7 @@ diff -urNp linux-2.6.38.7/drivers/media/video/cx18/cx18-driver.c linux-2.6.38.7/ /* Parameter declarations */ static int cardtype[CX18_MAX_CARDS]; -@@ -326,6 +326,8 @@ void cx18_read_eeprom(struct cx18 *cx, s +@@ -326,6 +326,8 @@ void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv) struct i2c_client c; u8 eedata[256]; @@ -30234,7 +30929,7 @@ diff -urNp linux-2.6.38.7/drivers/media/video/cx18/cx18-driver.c linux-2.6.38.7/ memset(&c, 0, sizeof(c)); strlcpy(c.name, "cx18 tveeprom tmp", sizeof(c.name)); c.adapter = &cx->i2c_adap[0]; -@@ -884,7 +886,7 @@ static int __devinit cx18_probe(struct p +@@ -884,7 +886,7 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev, struct cx18 *cx; /* FIXME - module parameter arrays constrain max instances */ @@ -30243,10 +30938,11 @@ diff -urNp linux-2.6.38.7/drivers/media/video/cx18/cx18-driver.c linux-2.6.38.7/ if (i >= CX18_MAX_CARDS) { printk(KERN_ERR "cx18: cannot manage card %d, driver has a " "limit of 0 - %d\n", i, CX18_MAX_CARDS - 1); -diff -urNp linux-2.6.38.7/drivers/media/video/cx23885/cx23885-input.c linux-2.6.38.7/drivers/media/video/cx23885/cx23885-input.c ---- linux-2.6.38.7/drivers/media/video/cx23885/cx23885-input.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/video/cx23885/cx23885-input.c 2011-05-16 21:47:08.000000000 -0400 -@@ -53,6 +53,8 @@ static void cx23885_input_process_measur +diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c +index 199b996..d7d6620 100644 +--- a/drivers/media/video/cx23885/cx23885-input.c ++++ b/drivers/media/video/cx23885/cx23885-input.c +@@ -53,6 +53,8 @@ static void cx23885_input_process_measurements(struct cx23885_dev *dev, bool handle = false; struct ir_raw_event ir_core_event[64]; @@ -30255,10 +30951,11 @@ diff -urNp linux-2.6.38.7/drivers/media/video/cx23885/cx23885-input.c linux-2.6. do { num = 0; v4l2_subdev_call(dev->sd_ir, ir, rx_read, (u8 *) ir_core_event, -diff -urNp linux-2.6.38.7/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.38.7/drivers/media/video/ivtv/ivtv-driver.c ---- linux-2.6.38.7/drivers/media/video/ivtv/ivtv-driver.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/video/ivtv/ivtv-driver.c 2011-04-28 19:57:25.000000000 -0400 -@@ -80,7 +80,7 @@ static struct pci_device_id ivtv_pci_tbl +diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c +index 3994642..31dff6d 100644 +--- a/drivers/media/video/ivtv/ivtv-driver.c ++++ b/drivers/media/video/ivtv/ivtv-driver.c +@@ -80,7 +80,7 @@ static struct pci_device_id ivtv_pci_tbl[] __devinitdata = { MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl); /* ivtv instance counter */ @@ -30267,10 +30964,11 @@ diff -urNp linux-2.6.38.7/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.38.7/ /* Parameter declarations */ static int cardtype[IVTV_MAX_CARDS]; -diff -urNp linux-2.6.38.7/drivers/media/video/omap24xxcam.c linux-2.6.38.7/drivers/media/video/omap24xxcam.c ---- linux-2.6.38.7/drivers/media/video/omap24xxcam.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/video/omap24xxcam.c 2011-04-28 19:57:25.000000000 -0400 -@@ -402,7 +402,7 @@ static void omap24xxcam_vbq_complete(str +diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c +index 0175527..90467b9 100644 +--- a/drivers/media/video/omap24xxcam.c ++++ b/drivers/media/video/omap24xxcam.c +@@ -402,7 +402,7 @@ static void omap24xxcam_vbq_complete(struct omap24xxcam_sgdma *sgdma, spin_unlock_irqrestore(&cam->core_enable_disable_lock, flags); do_gettimeofday(&vb->ts); @@ -30279,9 +30977,10 @@ diff -urNp linux-2.6.38.7/drivers/media/video/omap24xxcam.c linux-2.6.38.7/drive if (csr & csr_error) { vb->state = VIDEOBUF_ERROR; if (!atomic_read(&fh->cam->in_reset)) { -diff -urNp linux-2.6.38.7/drivers/media/video/omap24xxcam.h linux-2.6.38.7/drivers/media/video/omap24xxcam.h ---- linux-2.6.38.7/drivers/media/video/omap24xxcam.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/video/omap24xxcam.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/media/video/omap24xxcam.h b/drivers/media/video/omap24xxcam.h +index 2ce67f5..cf26a5b 100644 +--- a/drivers/media/video/omap24xxcam.h ++++ b/drivers/media/video/omap24xxcam.h @@ -533,7 +533,7 @@ struct omap24xxcam_fh { spinlock_t vbq_lock; /* spinlock for the videobuf queue */ struct videobuf_queue vbq; @@ -30291,10 +30990,11 @@ diff -urNp linux-2.6.38.7/drivers/media/video/omap24xxcam.h linux-2.6.38.7/drive /* accessing cam here doesn't need serialisation: it's constant */ struct omap24xxcam_device *cam; }; -diff -urNp linux-2.6.38.7/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-2.6.38.7/drivers/media/video/pvrusb2/pvrusb2-eeprom.c ---- linux-2.6.38.7/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-05-16 21:47:08.000000000 -0400 -@@ -120,6 +120,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw +diff --git a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c +index aeed1c2..8402a00 100644 +--- a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c ++++ b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c +@@ -120,6 +120,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw *hdw) u8 *eeprom; struct tveeprom tvdata; @@ -30303,10 +31003,11 @@ diff -urNp linux-2.6.38.7/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-2.6 memset(&tvdata,0,sizeof(tvdata)); eeprom = pvr2_eeprom_fetch(hdw); -diff -urNp linux-2.6.38.7/drivers/media/video/saa7134/saa6752hs.c linux-2.6.38.7/drivers/media/video/saa7134/saa6752hs.c ---- linux-2.6.38.7/drivers/media/video/saa7134/saa6752hs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/video/saa7134/saa6752hs.c 2011-05-16 21:47:08.000000000 -0400 -@@ -682,6 +682,8 @@ static int saa6752hs_init(struct v4l2_su +diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c +index f9f29cc..5a2e330 100644 +--- a/drivers/media/video/saa7134/saa6752hs.c ++++ b/drivers/media/video/saa7134/saa6752hs.c +@@ -682,6 +682,8 @@ static int saa6752hs_init(struct v4l2_subdev *sd, u32 leading_null_bytes) unsigned char localPAT[256]; unsigned char localPMT[256]; @@ -30315,10 +31016,11 @@ diff -urNp linux-2.6.38.7/drivers/media/video/saa7134/saa6752hs.c linux-2.6.38.7 /* Set video format - must be done first as it resets other settings */ set_reg8(client, 0x41, h->video_format); -diff -urNp linux-2.6.38.7/drivers/media/video/saa7164/saa7164-cmd.c linux-2.6.38.7/drivers/media/video/saa7164/saa7164-cmd.c ---- linux-2.6.38.7/drivers/media/video/saa7164/saa7164-cmd.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/video/saa7164/saa7164-cmd.c 2011-05-16 21:47:08.000000000 -0400 -@@ -88,6 +88,8 @@ int saa7164_irq_dequeue(struct saa7164_d +diff --git a/drivers/media/video/saa7164/saa7164-cmd.c b/drivers/media/video/saa7164/saa7164-cmd.c +index a97ae17..8815f43 100644 +--- a/drivers/media/video/saa7164/saa7164-cmd.c ++++ b/drivers/media/video/saa7164/saa7164-cmd.c +@@ -88,6 +88,8 @@ int saa7164_irq_dequeue(struct saa7164_dev *dev) u8 tmp[512]; dprintk(DBGLVL_CMD, "%s()\n", __func__); @@ -30327,7 +31029,7 @@ diff -urNp linux-2.6.38.7/drivers/media/video/saa7164/saa7164-cmd.c linux-2.6.38 /* While any outstand message on the bus exists... */ do { -@@ -141,6 +143,8 @@ int saa7164_cmd_dequeue(struct saa7164_d +@@ -141,6 +143,8 @@ int saa7164_cmd_dequeue(struct saa7164_dev *dev) u8 tmp[512]; dprintk(DBGLVL_CMD, "%s()\n", __func__); @@ -30336,10 +31038,11 @@ diff -urNp linux-2.6.38.7/drivers/media/video/saa7164/saa7164-cmd.c linux-2.6.38 while (loop) { struct tmComResInfo tRsp = { 0, 0, 0, 0, 0, 0 }; -diff -urNp linux-2.6.38.7/drivers/media/video/usbvision/usbvision-core.c linux-2.6.38.7/drivers/media/video/usbvision/usbvision-core.c ---- linux-2.6.38.7/drivers/media/video/usbvision/usbvision-core.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/video/usbvision/usbvision-core.c 2011-05-16 21:47:08.000000000 -0400 -@@ -799,6 +799,8 @@ static enum parse_state usbvision_parse_ +diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c +index c8feb0d..1162a10 100644 +--- a/drivers/media/video/usbvision/usbvision-core.c ++++ b/drivers/media/video/usbvision/usbvision-core.c +@@ -799,6 +799,8 @@ static enum parse_state usbvision_parse_compress(struct usb_usbvision *usbvision unsigned char rv, gv, bv; static unsigned char *Y, *U, *V; @@ -30348,10 +31051,11 @@ diff -urNp linux-2.6.38.7/drivers/media/video/usbvision/usbvision-core.c linux-2 frame = usbvision->cur_frame; image_size = frame->frmwidth * frame->frmheight; if ((frame->v4l2_format.format == V4L2_PIX_FMT_YUV422P) || -diff -urNp linux-2.6.38.7/drivers/media/video/v4l2-device.c linux-2.6.38.7/drivers/media/video/v4l2-device.c ---- linux-2.6.38.7/drivers/media/video/v4l2-device.c 2011-05-22 23:05:18.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/video/v4l2-device.c 2011-05-22 23:06:03.000000000 -0400 -@@ -55,9 +55,9 @@ int v4l2_device_register(struct device * +diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c +index 3504fc6..92a24fb 100644 +--- a/drivers/media/video/v4l2-device.c ++++ b/drivers/media/video/v4l2-device.c +@@ -55,9 +55,9 @@ int v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev) EXPORT_SYMBOL_GPL(v4l2_device_register); int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename, @@ -30363,9 +31067,10 @@ diff -urNp linux-2.6.38.7/drivers/media/video/v4l2-device.c linux-2.6.38.7/drive int len = strlen(basename); if (basename[len - 1] >= '0' && basename[len - 1] <= '9') -diff -urNp linux-2.6.38.7/drivers/media/video/videobuf-dma-sg.c linux-2.6.38.7/drivers/media/video/videobuf-dma-sg.c ---- linux-2.6.38.7/drivers/media/video/videobuf-dma-sg.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/media/video/videobuf-dma-sg.c 2011-05-16 21:47:08.000000000 -0400 +diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c +index ddb8f4b..35fce12 100644 +--- a/drivers/media/video/videobuf-dma-sg.c ++++ b/drivers/media/video/videobuf-dma-sg.c @@ -606,6 +606,8 @@ void *videobuf_sg_alloc(size_t size) { struct videobuf_queue q; @@ -30375,10 +31080,11 @@ diff -urNp linux-2.6.38.7/drivers/media/video/videobuf-dma-sg.c linux-2.6.38.7/d /* Required to make generic handler to call __videobuf_alloc */ q.int_ops = &sg_ops; -diff -urNp linux-2.6.38.7/drivers/message/fusion/mptbase.c linux-2.6.38.7/drivers/message/fusion/mptbase.c ---- linux-2.6.38.7/drivers/message/fusion/mptbase.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/message/fusion/mptbase.c 2011-04-28 19:34:15.000000000 -0400 -@@ -6683,8 +6683,13 @@ static int mpt_iocinfo_proc_show(struct +diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c +index 3358c0a..687cbdf 100644 +--- a/drivers/message/fusion/mptbase.c ++++ b/drivers/message/fusion/mptbase.c +@@ -6683,8 +6683,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v) seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth); seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize); @@ -30392,10 +31098,11 @@ diff -urNp linux-2.6.38.7/drivers/message/fusion/mptbase.c linux-2.6.38.7/driver /* * Rounding UP to nearest 4-kB boundary here... */ -diff -urNp linux-2.6.38.7/drivers/message/fusion/mptsas.c linux-2.6.38.7/drivers/message/fusion/mptsas.c ---- linux-2.6.38.7/drivers/message/fusion/mptsas.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/message/fusion/mptsas.c 2011-04-28 19:34:15.000000000 -0400 -@@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin +diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c +index 8aefb18..ebdb8da 100644 +--- a/drivers/message/fusion/mptsas.c ++++ b/drivers/message/fusion/mptsas.c +@@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached) return 0; } @@ -30419,7 +31126,7 @@ diff -urNp linux-2.6.38.7/drivers/message/fusion/mptsas.c linux-2.6.38.7/drivers /* no mutex */ static void mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details) -@@ -477,23 +494,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *p +@@ -477,23 +494,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info) return NULL; } @@ -30443,9 +31150,10 @@ diff -urNp linux-2.6.38.7/drivers/message/fusion/mptsas.c linux-2.6.38.7/drivers static inline struct sas_port * mptsas_get_port(struct mptsas_phyinfo *phy_info) { -diff -urNp linux-2.6.38.7/drivers/message/fusion/mptscsih.c linux-2.6.38.7/drivers/message/fusion/mptscsih.c ---- linux-2.6.38.7/drivers/message/fusion/mptscsih.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/message/fusion/mptscsih.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c +index 0d9b82a..d1918d0 100644 +--- a/drivers/message/fusion/mptscsih.c ++++ b/drivers/message/fusion/mptscsih.c @@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost) h = shost_priv(SChost); @@ -30471,10 +31179,11 @@ diff -urNp linux-2.6.38.7/drivers/message/fusion/mptscsih.c linux-2.6.38.7/drive return h->info_kbuf; } -diff -urNp linux-2.6.38.7/drivers/message/i2o/i2o_config.c linux-2.6.38.7/drivers/message/i2o/i2o_config.c ---- linux-2.6.38.7/drivers/message/i2o/i2o_config.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/message/i2o/i2o_config.c 2011-05-16 21:47:08.000000000 -0400 -@@ -781,6 +781,8 @@ static int i2o_cfg_passthru(unsigned lon +diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c +index 7d3cc57..b8dfb35 100644 +--- a/drivers/message/i2o/i2o_config.c ++++ b/drivers/message/i2o/i2o_config.c +@@ -781,6 +781,8 @@ static int i2o_cfg_passthru(unsigned long arg) struct i2o_message *msg; unsigned int iop; @@ -30483,9 +31192,10 @@ diff -urNp linux-2.6.38.7/drivers/message/i2o/i2o_config.c linux-2.6.38.7/driver if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg)) return -EFAULT; -diff -urNp linux-2.6.38.7/drivers/message/i2o/i2o_proc.c linux-2.6.38.7/drivers/message/i2o/i2o_proc.c ---- linux-2.6.38.7/drivers/message/i2o/i2o_proc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/message/i2o/i2o_proc.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c +index 07dbeaf..5533142 100644 +--- a/drivers/message/i2o/i2o_proc.c ++++ b/drivers/message/i2o/i2o_proc.c @@ -255,13 +255,6 @@ static char *scsi_devices[] = { "Array Controller Device" }; @@ -30500,7 +31210,7 @@ diff -urNp linux-2.6.38.7/drivers/message/i2o/i2o_proc.c linux-2.6.38.7/drivers/ static int i2o_report_query_status(struct seq_file *seq, int block_status, char *group) { -@@ -838,8 +831,7 @@ static int i2o_seq_show_ddm_table(struct +@@ -838,8 +831,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v) seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id); seq_printf(seq, "%-#8x", ddm_table.module_id); @@ -30510,7 +31220,7 @@ diff -urNp linux-2.6.38.7/drivers/message/i2o/i2o_proc.c linux-2.6.38.7/drivers/ seq_printf(seq, "%9d ", ddm_table.data_size); seq_printf(seq, "%8d", ddm_table.code_size); -@@ -940,8 +932,8 @@ static int i2o_seq_show_drivers_stored(s +@@ -940,8 +932,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v) seq_printf(seq, "%-#7x", dst->i2o_vendor_id); seq_printf(seq, "%-#8x", dst->module_id); @@ -30521,7 +31231,7 @@ diff -urNp linux-2.6.38.7/drivers/message/i2o/i2o_proc.c linux-2.6.38.7/drivers/ seq_printf(seq, "%8d ", dst->module_size); seq_printf(seq, "%8d ", dst->mpb_size); seq_printf(seq, "0x%04x", dst->module_flags); -@@ -1272,14 +1264,10 @@ static int i2o_seq_show_dev_identity(str +@@ -1272,14 +1264,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v) seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0])); seq_printf(seq, "Owner TID : %0#5x\n", work16[2]); seq_printf(seq, "Parent TID : %0#5x\n", work16[3]); @@ -30540,7 +31250,7 @@ diff -urNp linux-2.6.38.7/drivers/message/i2o/i2o_proc.c linux-2.6.38.7/drivers/ seq_printf(seq, "Serial number : "); print_serial_number(seq, (u8 *) (work32 + 16), -@@ -1324,10 +1312,8 @@ static int i2o_seq_show_ddm_identity(str +@@ -1324,10 +1312,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v) } seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid); @@ -30553,7 +31263,7 @@ diff -urNp linux-2.6.38.7/drivers/message/i2o/i2o_proc.c linux-2.6.38.7/drivers/ seq_printf(seq, "Serial number : "); print_serial_number(seq, result.serial_number, sizeof(result) - 36); -@@ -1358,14 +1344,10 @@ static int i2o_seq_show_uinfo(struct seq +@@ -1358,14 +1344,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v) return 0; } @@ -30572,10 +31282,11 @@ diff -urNp linux-2.6.38.7/drivers/message/i2o/i2o_proc.c linux-2.6.38.7/drivers/ return 0; } -diff -urNp linux-2.6.38.7/drivers/message/i2o/iop.c linux-2.6.38.7/drivers/message/i2o/iop.c ---- linux-2.6.38.7/drivers/message/i2o/iop.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/message/i2o/iop.c 2011-04-28 19:57:25.000000000 -0400 -@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro +diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c +index 090d2a3..5f24ef8 100644 +--- a/drivers/message/i2o/iop.c ++++ b/drivers/message/i2o/iop.c +@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr) spin_lock_irqsave(&c->context_list_lock, flags); @@ -30589,7 +31300,7 @@ diff -urNp linux-2.6.38.7/drivers/message/i2o/iop.c linux-2.6.38.7/drivers/messa list_add(&entry->list, &c->context_list); -@@ -1077,7 +1077,7 @@ struct i2o_controller *i2o_iop_alloc(voi +@@ -1077,7 +1077,7 @@ struct i2o_controller *i2o_iop_alloc(void) #if BITS_PER_LONG == 64 spin_lock_init(&c->context_list_lock); @@ -30598,9 +31309,10 @@ diff -urNp linux-2.6.38.7/drivers/message/i2o/iop.c linux-2.6.38.7/drivers/messa INIT_LIST_HEAD(&c->context_list); #endif -diff -urNp linux-2.6.38.7/drivers/mfd/janz-cmodio.c linux-2.6.38.7/drivers/mfd/janz-cmodio.c ---- linux-2.6.38.7/drivers/mfd/janz-cmodio.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/mfd/janz-cmodio.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c +index 36a166b..b044e14 100644 +--- a/drivers/mfd/janz-cmodio.c ++++ b/drivers/mfd/janz-cmodio.c @@ -13,6 +13,7 @@ #include <linux/kernel.h> @@ -30609,10 +31321,11 @@ diff -urNp linux-2.6.38.7/drivers/mfd/janz-cmodio.c linux-2.6.38.7/drivers/mfd/j #include <linux/init.h> #include <linux/pci.h> #include <linux/interrupt.h> -diff -urNp linux-2.6.38.7/drivers/mfd/wm8350-i2c.c linux-2.6.38.7/drivers/mfd/wm8350-i2c.c ---- linux-2.6.38.7/drivers/mfd/wm8350-i2c.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/mfd/wm8350-i2c.c 2011-05-16 21:47:08.000000000 -0400 -@@ -44,6 +44,8 @@ static int wm8350_i2c_write_device(struc +diff --git a/drivers/mfd/wm8350-i2c.c b/drivers/mfd/wm8350-i2c.c +index 5fe5de1..af64f53 100644 +--- a/drivers/mfd/wm8350-i2c.c ++++ b/drivers/mfd/wm8350-i2c.c +@@ -44,6 +44,8 @@ static int wm8350_i2c_write_device(struct wm8350 *wm8350, char reg, u8 msg[(WM8350_MAX_REGISTER << 1) + 1]; int ret; @@ -30621,9 +31334,10 @@ diff -urNp linux-2.6.38.7/drivers/mfd/wm8350-i2c.c linux-2.6.38.7/drivers/mfd/wm if (bytes > ((WM8350_MAX_REGISTER << 1) + 1)) return -EINVAL; -diff -urNp linux-2.6.38.7/drivers/misc/kgdbts.c linux-2.6.38.7/drivers/misc/kgdbts.c ---- linux-2.6.38.7/drivers/misc/kgdbts.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/misc/kgdbts.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c +index 59c118c..fb7c59a 100644 +--- a/drivers/misc/kgdbts.c ++++ b/drivers/misc/kgdbts.c @@ -118,7 +118,7 @@ } while (0) #define MAX_CONFIG_LEN 40 @@ -30633,7 +31347,7 @@ diff -urNp linux-2.6.38.7/drivers/misc/kgdbts.c linux-2.6.38.7/drivers/misc/kgdb static char get_buf[BUFMAX]; static int get_buf_cnt; static char put_buf[BUFMAX]; -@@ -1103,7 +1103,7 @@ static void kgdbts_post_exp_handler(void +@@ -1103,7 +1103,7 @@ static void kgdbts_post_exp_handler(void) module_put(THIS_MODULE); } @@ -30642,10 +31356,11 @@ diff -urNp linux-2.6.38.7/drivers/misc/kgdbts.c linux-2.6.38.7/drivers/misc/kgdb .name = "kgdbts", .read_char = kgdbts_get_char, .write_char = kgdbts_put_char, -diff -urNp linux-2.6.38.7/drivers/misc/sgi-gru/gruhandles.c linux-2.6.38.7/drivers/misc/sgi-gru/gruhandles.c ---- linux-2.6.38.7/drivers/misc/sgi-gru/gruhandles.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/misc/sgi-gru/gruhandles.c 2011-04-28 19:34:15.000000000 -0400 -@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op +diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c +index 2f30bad..c4c13d0 100644 +--- a/drivers/misc/sgi-gru/gruhandles.c ++++ b/drivers/misc/sgi-gru/gruhandles.c +@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks) unsigned long nsec; nsec = CLKS2NSEC(clks); @@ -30656,9 +31371,10 @@ diff -urNp linux-2.6.38.7/drivers/misc/sgi-gru/gruhandles.c linux-2.6.38.7/drive if (mcs_op_statistics[op].max < nsec) mcs_op_statistics[op].max = nsec; } -diff -urNp linux-2.6.38.7/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.38.7/drivers/misc/sgi-gru/gruprocfs.c ---- linux-2.6.38.7/drivers/misc/sgi-gru/gruprocfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/misc/sgi-gru/gruprocfs.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c +index 7768b87..f8aac38 100644 +--- a/drivers/misc/sgi-gru/gruprocfs.c ++++ b/drivers/misc/sgi-gru/gruprocfs.c @@ -32,9 +32,9 @@ #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) @@ -30671,7 +31387,7 @@ diff -urNp linux-2.6.38.7/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.38.7/driver seq_printf(s, "%16lu %s\n", val, id); } -@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct se +@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p) seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks"); for (op = 0; op < mcsop_last; op++) { @@ -30682,9 +31398,10 @@ diff -urNp linux-2.6.38.7/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.38.7/driver max = mcs_op_statistics[op].max; seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, count ? total / count : 0, max); -diff -urNp linux-2.6.38.7/drivers/misc/sgi-gru/grutables.h linux-2.6.38.7/drivers/misc/sgi-gru/grutables.h ---- linux-2.6.38.7/drivers/misc/sgi-gru/grutables.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/misc/sgi-gru/grutables.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h +index 7a8b906..8f7d44e 100644 +--- a/drivers/misc/sgi-gru/grutables.h ++++ b/drivers/misc/sgi-gru/grutables.h @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids; * GRU statistics. */ @@ -30844,7 +31561,7 @@ diff -urNp linux-2.6.38.7/drivers/misc/sgi-gru/grutables.h linux-2.6.38.7/driver }; -@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start +@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync, tghop_invalidate, mcsop_last}; struct mcs_op_statistic { @@ -30855,7 +31572,7 @@ diff -urNp linux-2.6.38.7/drivers/misc/sgi-gru/grutables.h linux-2.6.38.7/driver unsigned long max; }; -@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_st +@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last]; #define STAT(id) do { \ if (gru_options & OPT_STATS) \ @@ -30864,10 +31581,11 @@ diff -urNp linux-2.6.38.7/drivers/misc/sgi-gru/grutables.h linux-2.6.38.7/driver } while (0) #ifdef CONFIG_SGI_GRU_DEBUG -diff -urNp linux-2.6.38.7/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.38.7/drivers/mtd/chips/cfi_cmdset_0001.c ---- linux-2.6.38.7/drivers/mtd/chips/cfi_cmdset_0001.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/mtd/chips/cfi_cmdset_0001.c 2011-05-16 21:47:08.000000000 -0400 -@@ -757,6 +757,8 @@ static int chip_ready (struct map_info * +diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c +index 4aaa88f..5825a7d 100644 +--- a/drivers/mtd/chips/cfi_cmdset_0001.c ++++ b/drivers/mtd/chips/cfi_cmdset_0001.c +@@ -757,6 +757,8 @@ static int chip_ready (struct map_info *map, struct flchip *chip, unsigned long struct cfi_pri_intelext *cfip = cfi->cmdset_priv; unsigned long timeo = jiffies + HZ; @@ -30876,7 +31594,7 @@ diff -urNp linux-2.6.38.7/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.38.7/dri /* Prevent setting state FL_SYNCING for chip in suspended state. */ if (mode == FL_SYNCING && chip->oldstate != FL_READY) goto sleep; -@@ -1657,6 +1659,8 @@ static int __xipram do_write_buffer(stru +@@ -1657,6 +1659,8 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, unsigned long initial_adr; int initial_len = len; @@ -30885,7 +31603,7 @@ diff -urNp linux-2.6.38.7/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.38.7/dri wbufsize = cfi_interleave(cfi) << cfi->cfiq->MaxBufWriteSize; adr += chip->start; initial_adr = adr; -@@ -1875,6 +1879,8 @@ static int __xipram do_erase_oneblock(st +@@ -1875,6 +1879,8 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip, int retries = 3; int ret; @@ -30894,10 +31612,11 @@ diff -urNp linux-2.6.38.7/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.38.7/dri adr += chip->start; retry: -diff -urNp linux-2.6.38.7/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.38.7/drivers/mtd/chips/cfi_cmdset_0020.c ---- linux-2.6.38.7/drivers/mtd/chips/cfi_cmdset_0020.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/mtd/chips/cfi_cmdset_0020.c 2011-05-16 21:47:08.000000000 -0400 -@@ -255,6 +255,8 @@ static inline int do_read_onechip(struct +diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c +index c04b765..99ed9cd 100644 +--- a/drivers/mtd/chips/cfi_cmdset_0020.c ++++ b/drivers/mtd/chips/cfi_cmdset_0020.c +@@ -255,6 +255,8 @@ static inline int do_read_onechip(struct map_info *map, struct flchip *chip, lof unsigned long cmd_addr; struct cfi_private *cfi = map->fldrv_priv; @@ -30906,7 +31625,7 @@ diff -urNp linux-2.6.38.7/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.38.7/dri adr += chip->start; /* Ensure cmd read/writes are aligned. */ -@@ -428,6 +430,8 @@ static inline int do_write_buffer(struct +@@ -428,6 +430,8 @@ static inline int do_write_buffer(struct map_info *map, struct flchip *chip, DECLARE_WAITQUEUE(wait, current); int wbufsize, z; @@ -30915,7 +31634,7 @@ diff -urNp linux-2.6.38.7/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.38.7/dri /* M58LW064A requires bus alignment for buffer wriets -- saw */ if (adr & (map_bankwidth(map)-1)) return -EINVAL; -@@ -742,6 +746,8 @@ static inline int do_erase_oneblock(stru +@@ -742,6 +746,8 @@ static inline int do_erase_oneblock(struct map_info *map, struct flchip *chip, u DECLARE_WAITQUEUE(wait, current); int ret = 0; @@ -30924,7 +31643,7 @@ diff -urNp linux-2.6.38.7/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.38.7/dri adr += chip->start; /* Let's determine this according to the interleave only once */ -@@ -1047,6 +1053,8 @@ static inline int do_lock_oneblock(struc +@@ -1047,6 +1053,8 @@ static inline int do_lock_oneblock(struct map_info *map, struct flchip *chip, un unsigned long timeo = jiffies + HZ; DECLARE_WAITQUEUE(wait, current); @@ -30933,7 +31652,7 @@ diff -urNp linux-2.6.38.7/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.38.7/dri adr += chip->start; /* Let's determine this according to the interleave only once */ -@@ -1196,6 +1204,8 @@ static inline int do_unlock_oneblock(str +@@ -1196,6 +1204,8 @@ static inline int do_unlock_oneblock(struct map_info *map, struct flchip *chip, unsigned long timeo = jiffies + HZ; DECLARE_WAITQUEUE(wait, current); @@ -30942,10 +31661,11 @@ diff -urNp linux-2.6.38.7/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.38.7/dri adr += chip->start; /* Let's determine this according to the interleave only once */ -diff -urNp linux-2.6.38.7/drivers/mtd/devices/doc2000.c linux-2.6.38.7/drivers/mtd/devices/doc2000.c ---- linux-2.6.38.7/drivers/mtd/devices/doc2000.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/mtd/devices/doc2000.c 2011-04-28 19:34:15.000000000 -0400 -@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt +diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c +index 5bf5f46..c5de373 100644 +--- a/drivers/mtd/devices/doc2000.c ++++ b/drivers/mtd/devices/doc2000.c +@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len, /* The ECC will not be calculated correctly if less than 512 is written */ /* DBB- @@ -30954,10 +31674,11 @@ diff -urNp linux-2.6.38.7/drivers/mtd/devices/doc2000.c linux-2.6.38.7/drivers/m printk(KERN_WARNING "ECC needs a full sector write (adr: %lx size %lx)\n", (long) to, (long) len); -diff -urNp linux-2.6.38.7/drivers/mtd/devices/doc2001.c linux-2.6.38.7/drivers/mtd/devices/doc2001.c ---- linux-2.6.38.7/drivers/mtd/devices/doc2001.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/mtd/devices/doc2001.c 2011-04-28 19:34:15.000000000 -0400 -@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt +diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c +index 0990f78..bb4e8a4 100644 +--- a/drivers/mtd/devices/doc2001.c ++++ b/drivers/mtd/devices/doc2001.c +@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mtd, loff_t from, size_t len, struct Nand *mychip = &this->chips[from >> (this->chipshift)]; /* Don't allow read past end of device */ @@ -30966,10 +31687,11 @@ diff -urNp linux-2.6.38.7/drivers/mtd/devices/doc2001.c linux-2.6.38.7/drivers/m return -EINVAL; /* Don't allow a single read to cross a 512-byte block boundary */ -diff -urNp linux-2.6.38.7/drivers/mtd/ftl.c linux-2.6.38.7/drivers/mtd/ftl.c ---- linux-2.6.38.7/drivers/mtd/ftl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/mtd/ftl.c 2011-05-16 21:47:08.000000000 -0400 -@@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t * +diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c +index 037b399..225a71d 100644 +--- a/drivers/mtd/ftl.c ++++ b/drivers/mtd/ftl.c +@@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t *part, uint16_t srcunit, loff_t offset; uint16_t srcunitswap = cpu_to_le16(srcunit); @@ -30978,10 +31700,11 @@ diff -urNp linux-2.6.38.7/drivers/mtd/ftl.c linux-2.6.38.7/drivers/mtd/ftl.c eun = &part->EUNInfo[srcunit]; xfer = &part->XferInfo[xferunit]; DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n", -diff -urNp linux-2.6.38.7/drivers/mtd/inftlcore.c linux-2.6.38.7/drivers/mtd/inftlcore.c ---- linux-2.6.38.7/drivers/mtd/inftlcore.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/mtd/inftlcore.c 2011-05-16 21:47:08.000000000 -0400 -@@ -259,6 +259,8 @@ static u16 INFTL_foldchain(struct INFTLr +diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c +index d7592e6..31c505c 100644 +--- a/drivers/mtd/inftlcore.c ++++ b/drivers/mtd/inftlcore.c +@@ -259,6 +259,8 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned struct inftl_oob oob; size_t retlen; @@ -30990,10 +31713,11 @@ diff -urNp linux-2.6.38.7/drivers/mtd/inftlcore.c linux-2.6.38.7/drivers/mtd/inf DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d," "pending=%d)\n", inftl, thisVUC, pendingblock); -diff -urNp linux-2.6.38.7/drivers/mtd/inftlmount.c linux-2.6.38.7/drivers/mtd/inftlmount.c ---- linux-2.6.38.7/drivers/mtd/inftlmount.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/mtd/inftlmount.c 2011-05-16 21:47:08.000000000 -0400 -@@ -53,6 +53,8 @@ static int find_boot_record(struct INFTL +diff --git a/drivers/mtd/inftlmount.c b/drivers/mtd/inftlmount.c +index 104052e..6232be5 100644 +--- a/drivers/mtd/inftlmount.c ++++ b/drivers/mtd/inftlmount.c +@@ -53,6 +53,8 @@ static int find_boot_record(struct INFTLrecord *inftl) struct INFTLPartition *ip; size_t retlen; @@ -31002,10 +31726,11 @@ diff -urNp linux-2.6.38.7/drivers/mtd/inftlmount.c linux-2.6.38.7/drivers/mtd/in DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=%p)\n", inftl); /* -diff -urNp linux-2.6.38.7/drivers/mtd/lpddr/qinfo_probe.c linux-2.6.38.7/drivers/mtd/lpddr/qinfo_probe.c ---- linux-2.6.38.7/drivers/mtd/lpddr/qinfo_probe.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/mtd/lpddr/qinfo_probe.c 2011-05-16 21:47:08.000000000 -0400 -@@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map +diff --git a/drivers/mtd/lpddr/qinfo_probe.c b/drivers/mtd/lpddr/qinfo_probe.c +index dbfe17b..c7b0918 100644 +--- a/drivers/mtd/lpddr/qinfo_probe.c ++++ b/drivers/mtd/lpddr/qinfo_probe.c +@@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map_info *map, struct lpddr_private *lpddr) { map_word pfow_val[4]; @@ -31014,10 +31739,11 @@ diff -urNp linux-2.6.38.7/drivers/mtd/lpddr/qinfo_probe.c linux-2.6.38.7/drivers /* Check identification string */ pfow_val[0] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_P); pfow_val[1] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_F); -diff -urNp linux-2.6.38.7/drivers/mtd/mtdchar.c linux-2.6.38.7/drivers/mtd/mtdchar.c ---- linux-2.6.38.7/drivers/mtd/mtdchar.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/mtd/mtdchar.c 2011-05-16 21:47:08.000000000 -0400 -@@ -560,6 +560,8 @@ static int mtd_ioctl(struct file *file, +diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c +index 145b3d0d..24b16dc 100644 +--- a/drivers/mtd/mtdchar.c ++++ b/drivers/mtd/mtdchar.c +@@ -560,6 +560,8 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg) u_long size; struct mtd_info_user info; @@ -31026,9 +31752,10 @@ diff -urNp linux-2.6.38.7/drivers/mtd/mtdchar.c linux-2.6.38.7/drivers/mtd/mtdch DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n"); size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT; -diff -urNp linux-2.6.38.7/drivers/mtd/nand/denali.c linux-2.6.38.7/drivers/mtd/nand/denali.c ---- linux-2.6.38.7/drivers/mtd/nand/denali.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/mtd/nand/denali.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c +index 8c8d3c8..fcbff64 100644 +--- a/drivers/mtd/nand/denali.c ++++ b/drivers/mtd/nand/denali.c @@ -25,6 +25,7 @@ #include <linux/pci.h> #include <linux/mtd/mtd.h> @@ -31037,10 +31764,11 @@ diff -urNp linux-2.6.38.7/drivers/mtd/nand/denali.c linux-2.6.38.7/drivers/mtd/n #include "denali.h" -diff -urNp linux-2.6.38.7/drivers/mtd/nftlcore.c linux-2.6.38.7/drivers/mtd/nftlcore.c ---- linux-2.6.38.7/drivers/mtd/nftlcore.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/mtd/nftlcore.c 2011-05-16 21:47:08.000000000 -0400 -@@ -264,6 +264,8 @@ static u16 NFTL_foldchain (struct NFTLre +diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c +index b155666..611b801 100644 +--- a/drivers/mtd/nftlcore.c ++++ b/drivers/mtd/nftlcore.c +@@ -264,6 +264,8 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p int inplace = 1; size_t retlen; @@ -31049,9 +31777,10 @@ diff -urNp linux-2.6.38.7/drivers/mtd/nftlcore.c linux-2.6.38.7/drivers/mtd/nftl memset(BlockMap, 0xff, sizeof(BlockMap)); memset(BlockFreeFound, 0, sizeof(BlockFreeFound)); -diff -urNp linux-2.6.38.7/drivers/mtd/nftlmount.c linux-2.6.38.7/drivers/mtd/nftlmount.c ---- linux-2.6.38.7/drivers/mtd/nftlmount.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/mtd/nftlmount.c 2011-05-18 20:23:44.000000000 -0400 +diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c +index e3cd1ff..0ea79a3 100644 +--- a/drivers/mtd/nftlmount.c ++++ b/drivers/mtd/nftlmount.c @@ -24,6 +24,7 @@ #include <asm/errno.h> #include <linux/delay.h> @@ -31060,7 +31789,7 @@ diff -urNp linux-2.6.38.7/drivers/mtd/nftlmount.c linux-2.6.38.7/drivers/mtd/nft #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/nftl.h> -@@ -45,6 +46,8 @@ static int find_boot_record(struct NFTLr +@@ -45,6 +46,8 @@ static int find_boot_record(struct NFTLrecord *nftl) struct mtd_info *mtd = nftl->mbd.mtd; unsigned int i; @@ -31069,9 +31798,10 @@ diff -urNp linux-2.6.38.7/drivers/mtd/nftlmount.c linux-2.6.38.7/drivers/mtd/nft /* Assume logical EraseSize == physical erasesize for starting the scan. We'll sort it out later if we find a MediaHeader which says otherwise */ /* Actually, we won't. The new DiskOnChip driver has already scanned -diff -urNp linux-2.6.38.7/drivers/mtd/ubi/build.c linux-2.6.38.7/drivers/mtd/ubi/build.c ---- linux-2.6.38.7/drivers/mtd/ubi/build.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/mtd/ubi/build.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c +index 5ebe280..e7af207 100644 +--- a/drivers/mtd/ubi/build.c ++++ b/drivers/mtd/ubi/build.c @@ -1285,7 +1285,7 @@ module_exit(ubi_exit); static int __init bytes_str_to_int(const char *str) { @@ -31081,7 +31811,7 @@ diff -urNp linux-2.6.38.7/drivers/mtd/ubi/build.c linux-2.6.38.7/drivers/mtd/ubi result = simple_strtoul(str, &endp, 0); if (str == endp || result >= INT_MAX) { -@@ -1296,11 +1296,11 @@ static int __init bytes_str_to_int(const +@@ -1296,11 +1296,11 @@ static int __init bytes_str_to_int(const char *str) switch (*endp) { case 'G': @@ -31096,7 +31826,7 @@ diff -urNp linux-2.6.38.7/drivers/mtd/ubi/build.c linux-2.6.38.7/drivers/mtd/ubi if (endp[1] == 'i' && endp[2] == 'B') endp += 2; case '\0': -@@ -1311,7 +1311,13 @@ static int __init bytes_str_to_int(const +@@ -1311,7 +1311,13 @@ static int __init bytes_str_to_int(const char *str) return -EINVAL; } @@ -31111,9 +31841,10 @@ diff -urNp linux-2.6.38.7/drivers/mtd/ubi/build.c linux-2.6.38.7/drivers/mtd/ubi } /** -diff -urNp linux-2.6.38.7/drivers/net/bnx2.c linux-2.6.38.7/drivers/net/bnx2.c ---- linux-2.6.38.7/drivers/net/bnx2.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/bnx2.c 2011-05-16 21:47:08.000000000 -0400 +diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c +index 0ba59d5..fbf134e 100644 +--- a/drivers/net/bnx2.c ++++ b/drivers/net/bnx2.c @@ -5826,6 +5826,8 @@ bnx2_test_nvram(struct bnx2 *bp) int rc = 0; u32 magic, csum; @@ -31123,10 +31854,11 @@ diff -urNp linux-2.6.38.7/drivers/net/bnx2.c linux-2.6.38.7/drivers/net/bnx2.c if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0) goto test_nvram_done; -diff -urNp linux-2.6.38.7/drivers/net/bnx2x/bnx2x_ethtool.c linux-2.6.38.7/drivers/net/bnx2x/bnx2x_ethtool.c ---- linux-2.6.38.7/drivers/net/bnx2x/bnx2x_ethtool.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/bnx2x/bnx2x_ethtool.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1788,6 +1788,8 @@ static int bnx2x_test_nvram(struct bnx2x +diff --git a/drivers/net/bnx2x/bnx2x_ethtool.c b/drivers/net/bnx2x/bnx2x_ethtool.c +index 7e92f9d..afe234b 100644 +--- a/drivers/net/bnx2x/bnx2x_ethtool.c ++++ b/drivers/net/bnx2x/bnx2x_ethtool.c +@@ -1788,6 +1788,8 @@ static int bnx2x_test_nvram(struct bnx2x *bp) int i, rc; u32 magic, crc; @@ -31135,10 +31867,11 @@ diff -urNp linux-2.6.38.7/drivers/net/bnx2x/bnx2x_ethtool.c linux-2.6.38.7/drive if (BP_NOMCP(bp)) return 0; -diff -urNp linux-2.6.38.7/drivers/net/cxgb4/cxgb4_main.c linux-2.6.38.7/drivers/net/cxgb4/cxgb4_main.c ---- linux-2.6.38.7/drivers/net/cxgb4/cxgb4_main.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/cxgb4/cxgb4_main.c 2011-05-16 21:47:08.000000000 -0400 -@@ -3429,6 +3429,8 @@ static int __devinit enable_msix(struct +diff --git a/drivers/net/cxgb4/cxgb4_main.c b/drivers/net/cxgb4/cxgb4_main.c +index ec35d45..b83aede 100644 +--- a/drivers/net/cxgb4/cxgb4_main.c ++++ b/drivers/net/cxgb4/cxgb4_main.c +@@ -3429,6 +3429,8 @@ static int __devinit enable_msix(struct adapter *adap) unsigned int nchan = adap->params.nports; struct msix_entry entries[MAX_INGQ + 1]; @@ -31147,10 +31880,11 @@ diff -urNp linux-2.6.38.7/drivers/net/cxgb4/cxgb4_main.c linux-2.6.38.7/drivers/ for (i = 0; i < ARRAY_SIZE(entries); ++i) entries[i].entry = i; -diff -urNp linux-2.6.38.7/drivers/net/cxgb4/t4_hw.c linux-2.6.38.7/drivers/net/cxgb4/t4_hw.c ---- linux-2.6.38.7/drivers/net/cxgb4/t4_hw.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/cxgb4/t4_hw.c 2011-05-16 21:47:08.000000000 -0400 -@@ -362,6 +362,8 @@ static int get_vpd_params(struct adapter +diff --git a/drivers/net/cxgb4/t4_hw.c b/drivers/net/cxgb4/t4_hw.c +index b9fd8a6..e1ec7cd 100644 +--- a/drivers/net/cxgb4/t4_hw.c ++++ b/drivers/net/cxgb4/t4_hw.c +@@ -362,6 +362,8 @@ static int get_vpd_params(struct adapter *adapter, struct vpd_params *p) u8 vpd[VPD_LEN], csum; unsigned int vpdr_len, kw_offset, id_len; @@ -31159,10 +31893,11 @@ diff -urNp linux-2.6.38.7/drivers/net/cxgb4/t4_hw.c linux-2.6.38.7/drivers/net/c ret = pci_read_vpd(adapter->pdev, VPD_BASE, sizeof(vpd), vpd); if (ret < 0) return ret; -diff -urNp linux-2.6.38.7/drivers/net/e1000e/82571.c linux-2.6.38.7/drivers/net/e1000e/82571.c ---- linux-2.6.38.7/drivers/net/e1000e/82571.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/e1000e/82571.c 2011-04-28 19:34:15.000000000 -0400 -@@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(s +diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c +index 89a6903..014abb1 100644 +--- a/drivers/net/e1000e/82571.c ++++ b/drivers/net/e1000e/82571.c +@@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter) { struct e1000_hw *hw = &adapter->hw; struct e1000_mac_info *mac = &hw->mac; @@ -31171,7 +31906,7 @@ diff -urNp linux-2.6.38.7/drivers/net/e1000e/82571.c linux-2.6.38.7/drivers/net/ u32 swsm = 0; u32 swsm2 = 0; bool force_clear_smbi = false; -@@ -1930,7 +1930,7 @@ static void e1000_clear_hw_cntrs_82571(s +@@ -1930,7 +1930,7 @@ static void e1000_clear_hw_cntrs_82571(struct e1000_hw *hw) er32(ICRXDMTC); } @@ -31180,7 +31915,7 @@ diff -urNp linux-2.6.38.7/drivers/net/e1000e/82571.c linux-2.6.38.7/drivers/net/ /* .check_mng_mode: mac type dependent */ /* .check_for_link: media type dependent */ .id_led_init = e1000e_id_led_init, -@@ -1952,7 +1952,7 @@ static struct e1000_mac_operations e8257 +@@ -1952,7 +1952,7 @@ static struct e1000_mac_operations e82571_mac_ops = { .read_mac_addr = e1000_read_mac_addr_82571, }; @@ -31189,7 +31924,7 @@ diff -urNp linux-2.6.38.7/drivers/net/e1000e/82571.c linux-2.6.38.7/drivers/net/ .acquire = e1000_get_hw_semaphore_82571, .check_polarity = e1000_check_polarity_igp, .check_reset_block = e1000e_check_reset_block_generic, -@@ -1970,7 +1970,7 @@ static struct e1000_phy_operations e82_p +@@ -1970,7 +1970,7 @@ static struct e1000_phy_operations e82_phy_ops_igp = { .cfg_on_link_up = NULL, }; @@ -31198,7 +31933,7 @@ diff -urNp linux-2.6.38.7/drivers/net/e1000e/82571.c linux-2.6.38.7/drivers/net/ .acquire = e1000_get_hw_semaphore_82571, .check_polarity = e1000_check_polarity_m88, .check_reset_block = e1000e_check_reset_block_generic, -@@ -1988,7 +1988,7 @@ static struct e1000_phy_operations e82_p +@@ -1988,7 +1988,7 @@ static struct e1000_phy_operations e82_phy_ops_m88 = { .cfg_on_link_up = NULL, }; @@ -31207,7 +31942,7 @@ diff -urNp linux-2.6.38.7/drivers/net/e1000e/82571.c linux-2.6.38.7/drivers/net/ .acquire = e1000_get_hw_semaphore_82571, .check_polarity = e1000_check_polarity_m88, .check_reset_block = e1000e_check_reset_block_generic, -@@ -2006,7 +2006,7 @@ static struct e1000_phy_operations e82_p +@@ -2006,7 +2006,7 @@ static struct e1000_phy_operations e82_phy_ops_bm = { .cfg_on_link_up = NULL, }; @@ -31216,9 +31951,10 @@ diff -urNp linux-2.6.38.7/drivers/net/e1000e/82571.c linux-2.6.38.7/drivers/net/ .acquire = e1000_acquire_nvm_82571, .read = e1000e_read_nvm_eerd, .release = e1000_release_nvm_82571, -diff -urNp linux-2.6.38.7/drivers/net/e1000e/e1000.h linux-2.6.38.7/drivers/net/e1000e/e1000.h ---- linux-2.6.38.7/drivers/net/e1000e/e1000.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/e1000e/e1000.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h +index e610e13..5d2a574 100644 +--- a/drivers/net/e1000e/e1000.h ++++ b/drivers/net/e1000e/e1000.h @@ -408,9 +408,9 @@ struct e1000_info { u32 pba; u32 max_hw_frame_size; @@ -31232,10 +31968,11 @@ diff -urNp linux-2.6.38.7/drivers/net/e1000e/e1000.h linux-2.6.38.7/drivers/net/ }; /* hardware capability, feature, and workaround flags */ -diff -urNp linux-2.6.38.7/drivers/net/e1000e/es2lan.c linux-2.6.38.7/drivers/net/e1000e/es2lan.c ---- linux-2.6.38.7/drivers/net/e1000e/es2lan.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/e1000e/es2lan.c 2011-04-28 19:34:15.000000000 -0400 -@@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es +diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c +index 2fefa82..a2ba867 100644 +--- a/drivers/net/e1000e/es2lan.c ++++ b/drivers/net/e1000e/es2lan.c +@@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter) { struct e1000_hw *hw = &adapter->hw; struct e1000_mac_info *mac = &hw->mac; @@ -31244,7 +31981,7 @@ diff -urNp linux-2.6.38.7/drivers/net/e1000e/es2lan.c linux-2.6.38.7/drivers/net /* Set media type */ switch (adapter->pdev->device) { -@@ -1431,7 +1431,7 @@ static void e1000_clear_hw_cntrs_80003es +@@ -1431,7 +1431,7 @@ static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw) er32(ICRXDMTC); } @@ -31253,7 +31990,7 @@ diff -urNp linux-2.6.38.7/drivers/net/e1000e/es2lan.c linux-2.6.38.7/drivers/net .read_mac_addr = e1000_read_mac_addr_80003es2lan, .id_led_init = e1000e_id_led_init, .check_mng_mode = e1000e_check_mng_mode_generic, -@@ -1453,7 +1453,7 @@ static struct e1000_mac_operations es2_m +@@ -1453,7 +1453,7 @@ static struct e1000_mac_operations es2_mac_ops = { .setup_led = e1000e_setup_led_generic, }; @@ -31262,7 +31999,7 @@ diff -urNp linux-2.6.38.7/drivers/net/e1000e/es2lan.c linux-2.6.38.7/drivers/net .acquire = e1000_acquire_phy_80003es2lan, .check_polarity = e1000_check_polarity_m88, .check_reset_block = e1000e_check_reset_block_generic, -@@ -1471,7 +1471,7 @@ static struct e1000_phy_operations es2_p +@@ -1471,7 +1471,7 @@ static struct e1000_phy_operations es2_phy_ops = { .cfg_on_link_up = e1000_cfg_on_link_up_80003es2lan, }; @@ -31271,9 +32008,10 @@ diff -urNp linux-2.6.38.7/drivers/net/e1000e/es2lan.c linux-2.6.38.7/drivers/net .acquire = e1000_acquire_nvm_80003es2lan, .read = e1000e_read_nvm_eerd, .release = e1000_release_nvm_80003es2lan, -diff -urNp linux-2.6.38.7/drivers/net/e1000e/hw.h linux-2.6.38.7/drivers/net/e1000e/hw.h ---- linux-2.6.38.7/drivers/net/e1000e/hw.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/e1000e/hw.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h +index bc0860a..efaa65c 100644 +--- a/drivers/net/e1000e/hw.h ++++ b/drivers/net/e1000e/hw.h @@ -801,16 +801,17 @@ struct e1000_phy_operations { /* Function pointers for the NVM. */ @@ -31315,10 +32053,11 @@ diff -urNp linux-2.6.38.7/drivers/net/e1000e/hw.h linux-2.6.38.7/drivers/net/e10 struct e1000_nvm_operations ops; enum e1000_nvm_type type; -diff -urNp linux-2.6.38.7/drivers/net/e1000e/ich8lan.c linux-2.6.38.7/drivers/net/e1000e/ich8lan.c ---- linux-2.6.38.7/drivers/net/e1000e/ich8lan.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/e1000e/ich8lan.c 2011-04-28 19:34:15.000000000 -0400 -@@ -3840,7 +3840,7 @@ static void e1000_clear_hw_cntrs_ich8lan +diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c +index fb46974..5eb0897 100644 +--- a/drivers/net/e1000e/ich8lan.c ++++ b/drivers/net/e1000e/ich8lan.c +@@ -3840,7 +3840,7 @@ static void e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw) } } @@ -31327,7 +32066,7 @@ diff -urNp linux-2.6.38.7/drivers/net/e1000e/ich8lan.c linux-2.6.38.7/drivers/ne .id_led_init = e1000e_id_led_init, /* check_mng_mode dependent on mac type */ .check_for_link = e1000_check_for_copper_link_ich8lan, -@@ -3859,7 +3859,7 @@ static struct e1000_mac_operations ich8_ +@@ -3859,7 +3859,7 @@ static struct e1000_mac_operations ich8_mac_ops = { /* id_led_init dependent on mac type */ }; @@ -31336,7 +32075,7 @@ diff -urNp linux-2.6.38.7/drivers/net/e1000e/ich8lan.c linux-2.6.38.7/drivers/ne .acquire = e1000_acquire_swflag_ich8lan, .check_reset_block = e1000_check_reset_block_ich8lan, .commit = NULL, -@@ -3873,7 +3873,7 @@ static struct e1000_phy_operations ich8_ +@@ -3873,7 +3873,7 @@ static struct e1000_phy_operations ich8_phy_ops = { .write_reg = e1000e_write_phy_reg_igp, }; @@ -31345,10 +32084,11 @@ diff -urNp linux-2.6.38.7/drivers/net/e1000e/ich8lan.c linux-2.6.38.7/drivers/ne .acquire = e1000_acquire_nvm_ich8lan, .read = e1000_read_nvm_ich8lan, .release = e1000_release_nvm_ich8lan, -diff -urNp linux-2.6.38.7/drivers/net/hamradio/6pack.c linux-2.6.38.7/drivers/net/hamradio/6pack.c ---- linux-2.6.38.7/drivers/net/hamradio/6pack.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/hamradio/6pack.c 2011-05-16 21:47:08.000000000 -0400 -@@ -463,6 +463,8 @@ static void sixpack_receive_buf(struct t +diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c +index 3e5d0b6..f8608d4 100644 +--- a/drivers/net/hamradio/6pack.c ++++ b/drivers/net/hamradio/6pack.c +@@ -463,6 +463,8 @@ static void sixpack_receive_buf(struct tty_struct *tty, unsigned char buf[512]; int count1; @@ -31357,9 +32097,10 @@ diff -urNp linux-2.6.38.7/drivers/net/hamradio/6pack.c linux-2.6.38.7/drivers/ne if (!count) return; -diff -urNp linux-2.6.38.7/drivers/net/igb/e1000_82575.c linux-2.6.38.7/drivers/net/igb/e1000_82575.c ---- linux-2.6.38.7/drivers/net/igb/e1000_82575.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/igb/e1000_82575.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c +index 0a2368f..761ae4e 100644 +--- a/drivers/net/igb/e1000_82575.c ++++ b/drivers/net/igb/e1000_82575.c @@ -1747,7 +1747,7 @@ u16 igb_rxpbs_adjust_82580(u32 data) return ret_val; } @@ -31369,7 +32110,7 @@ diff -urNp linux-2.6.38.7/drivers/net/igb/e1000_82575.c linux-2.6.38.7/drivers/n .init_hw = igb_init_hw_82575, .check_for_link = igb_check_for_link_82575, .rar_set = igb_rar_set, -@@ -1755,13 +1755,13 @@ static struct e1000_mac_operations e1000 +@@ -1755,13 +1755,13 @@ static struct e1000_mac_operations e1000_mac_ops_82575 = { .get_speed_and_duplex = igb_get_speed_and_duplex_copper, }; @@ -31385,9 +32126,10 @@ diff -urNp linux-2.6.38.7/drivers/net/igb/e1000_82575.c linux-2.6.38.7/drivers/n .acquire = igb_acquire_nvm_82575, .read = igb_read_nvm_eerd, .release = igb_release_nvm_82575, -diff -urNp linux-2.6.38.7/drivers/net/igb/e1000_hw.h linux-2.6.38.7/drivers/net/igb/e1000_hw.h ---- linux-2.6.38.7/drivers/net/igb/e1000_hw.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/igb/e1000_hw.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h +index e2638af..5e535e5 100644 +--- a/drivers/net/igb/e1000_hw.h ++++ b/drivers/net/igb/e1000_hw.h @@ -327,22 +327,23 @@ struct e1000_phy_operations { }; @@ -31435,9 +32177,10 @@ diff -urNp linux-2.6.38.7/drivers/net/igb/e1000_hw.h linux-2.6.38.7/drivers/net/ struct e1000_nvm_operations ops; enum e1000_nvm_type type; -diff -urNp linux-2.6.38.7/drivers/net/igbvf/vf.h linux-2.6.38.7/drivers/net/igbvf/vf.h ---- linux-2.6.38.7/drivers/net/igbvf/vf.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/igbvf/vf.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/net/igbvf/vf.h b/drivers/net/igbvf/vf.h +index d7ed58f..be1ea32 100644 +--- a/drivers/net/igbvf/vf.h ++++ b/drivers/net/igbvf/vf.h @@ -191,6 +191,7 @@ struct e1000_mac_operations { }; @@ -31446,10 +32189,11 @@ diff -urNp linux-2.6.38.7/drivers/net/igbvf/vf.h linux-2.6.38.7/drivers/net/igbv struct e1000_mac_operations ops; u8 addr[6]; u8 perm_addr[6]; -diff -urNp linux-2.6.38.7/drivers/net/ixgb/ixgb_main.c linux-2.6.38.7/drivers/net/ixgb/ixgb_main.c ---- linux-2.6.38.7/drivers/net/ixgb/ixgb_main.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/ixgb/ixgb_main.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1072,6 +1072,8 @@ ixgb_set_multi(struct net_device *netdev +diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c +index 5639ccc..837c059 100644 +--- a/drivers/net/ixgb/ixgb_main.c ++++ b/drivers/net/ixgb/ixgb_main.c +@@ -1072,6 +1072,8 @@ ixgb_set_multi(struct net_device *netdev) u32 rctl; int i; @@ -31458,9 +32202,10 @@ diff -urNp linux-2.6.38.7/drivers/net/ixgb/ixgb_main.c linux-2.6.38.7/drivers/ne /* Check for Promiscuous and All Multicast modes */ rctl = IXGB_READ_REG(hw, RCTL); -diff -urNp linux-2.6.38.7/drivers/net/ixgb/ixgb_param.c linux-2.6.38.7/drivers/net/ixgb/ixgb_param.c ---- linux-2.6.38.7/drivers/net/ixgb/ixgb_param.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/ixgb/ixgb_param.c 2011-05-16 21:47:08.000000000 -0400 +diff --git a/drivers/net/ixgb/ixgb_param.c b/drivers/net/ixgb/ixgb_param.c +index dd7fbeb..44b9bbf 100644 +--- a/drivers/net/ixgb/ixgb_param.c ++++ b/drivers/net/ixgb/ixgb_param.c @@ -261,6 +261,9 @@ void __devinit ixgb_check_options(struct ixgb_adapter *adapter) { @@ -31471,10 +32216,11 @@ diff -urNp linux-2.6.38.7/drivers/net/ixgb/ixgb_param.c linux-2.6.38.7/drivers/n if (bd >= IXGB_MAX_NIC) { pr_notice("Warning: no configuration for board #%i\n", bd); pr_notice("Using defaults for all values\n"); -diff -urNp linux-2.6.38.7/drivers/net/ksz884x.c linux-2.6.38.7/drivers/net/ksz884x.c ---- linux-2.6.38.7/drivers/net/ksz884x.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/ksz884x.c 2011-05-16 21:47:08.000000000 -0400 -@@ -6536,6 +6536,8 @@ static void netdev_get_ethtool_stats(str +diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c +index 540a8dc..a24ce6e 100644 +--- a/drivers/net/ksz884x.c ++++ b/drivers/net/ksz884x.c +@@ -6536,6 +6536,8 @@ static void netdev_get_ethtool_stats(struct net_device *dev, int rc; u64 counter[TOTAL_PORT_COUNTER_NUM]; @@ -31483,9 +32229,10 @@ diff -urNp linux-2.6.38.7/drivers/net/ksz884x.c linux-2.6.38.7/drivers/net/ksz88 mutex_lock(&hw_priv->lock); n = SWITCH_PORT_NUM; for (i = 0, p = port->first_port; i < port->mib_port_cnt; i++, p++) { -diff -urNp linux-2.6.38.7/drivers/net/mlx4/main.c linux-2.6.38.7/drivers/net/mlx4/main.c ---- linux-2.6.38.7/drivers/net/mlx4/main.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/mlx4/main.c 2011-05-18 20:23:44.000000000 -0400 +diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c +index 2765a3c..972e466 100644 +--- a/drivers/net/mlx4/main.c ++++ b/drivers/net/mlx4/main.c @@ -39,6 +39,7 @@ #include <linux/pci.h> #include <linux/dma-mapping.h> @@ -31494,7 +32241,7 @@ diff -urNp linux-2.6.38.7/drivers/net/mlx4/main.c linux-2.6.38.7/drivers/net/mlx #include <linux/mlx4/device.h> #include <linux/mlx4/doorbell.h> -@@ -737,6 +738,8 @@ static int mlx4_init_hca(struct mlx4_dev +@@ -737,6 +738,8 @@ static int mlx4_init_hca(struct mlx4_dev *dev) u64 icm_size; int err; @@ -31503,10 +32250,11 @@ diff -urNp linux-2.6.38.7/drivers/net/mlx4/main.c linux-2.6.38.7/drivers/net/mlx err = mlx4_QUERY_FW(dev); if (err) { if (err == -EACCES) -diff -urNp linux-2.6.38.7/drivers/net/niu.c linux-2.6.38.7/drivers/net/niu.c ---- linux-2.6.38.7/drivers/net/niu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/niu.c 2011-05-16 21:47:08.000000000 -0400 -@@ -9067,6 +9067,8 @@ static void __devinit niu_try_msix(struc +diff --git a/drivers/net/niu.c b/drivers/net/niu.c +index 9fb59d3..b38b68b 100644 +--- a/drivers/net/niu.c ++++ b/drivers/net/niu.c +@@ -9067,6 +9067,8 @@ static void __devinit niu_try_msix(struct niu *np, u8 *ldg_num_map) int i, num_irqs, err; u8 first_ldg; @@ -31515,9 +32263,10 @@ diff -urNp linux-2.6.38.7/drivers/net/niu.c linux-2.6.38.7/drivers/net/niu.c first_ldg = (NIU_NUM_LDG / parent->num_ports) * np->port; for (i = 0; i < (NIU_NUM_LDG / parent->num_ports); i++) ldg_num_map[i] = first_ldg + i; -diff -urNp linux-2.6.38.7/drivers/net/pcnet32.c linux-2.6.38.7/drivers/net/pcnet32.c ---- linux-2.6.38.7/drivers/net/pcnet32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/pcnet32.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c +index aee3bb0..f466d90 100644 +--- a/drivers/net/pcnet32.c ++++ b/drivers/net/pcnet32.c @@ -82,7 +82,7 @@ static int cards_found; /* * VLB I/O addresses @@ -31527,10 +32276,11 @@ diff -urNp linux-2.6.38.7/drivers/net/pcnet32.c linux-2.6.38.7/drivers/net/pcnet { 0x300, 0x320, 0x340, 0x360, 0 }; static int pcnet32_debug; -diff -urNp linux-2.6.38.7/drivers/net/ppp_generic.c linux-2.6.38.7/drivers/net/ppp_generic.c ---- linux-2.6.38.7/drivers/net/ppp_generic.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/ppp_generic.c 2011-04-28 19:34:15.000000000 -0400 -@@ -986,7 +986,6 @@ ppp_net_ioctl(struct net_device *dev, st +diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c +index c7a6c44..6652313 100644 +--- a/drivers/net/ppp_generic.c ++++ b/drivers/net/ppp_generic.c +@@ -986,7 +986,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data; struct ppp_stats stats; struct ppp_comp_stats cstats; @@ -31538,7 +32288,7 @@ diff -urNp linux-2.6.38.7/drivers/net/ppp_generic.c linux-2.6.38.7/drivers/net/p switch (cmd) { case SIOCGPPPSTATS: -@@ -1008,8 +1007,7 @@ ppp_net_ioctl(struct net_device *dev, st +@@ -1008,8 +1007,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) break; case SIOCGPPPVER: @@ -31548,9 +32298,10 @@ diff -urNp linux-2.6.38.7/drivers/net/ppp_generic.c linux-2.6.38.7/drivers/net/p break; err = 0; break; -diff -urNp linux-2.6.38.7/drivers/net/tg3.c linux-2.6.38.7/drivers/net/tg3.c ---- linux-2.6.38.7/drivers/net/tg3.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/tg3.c 2011-05-11 18:35:16.000000000 -0400 +diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c +index 06c0e503..5ead531 100644 +--- a/drivers/net/tg3.c ++++ b/drivers/net/tg3.c @@ -13003,7 +13003,7 @@ done: static struct pci_dev * __devinit tg3_find_peer(struct tg3 *); @@ -31560,9 +32311,10 @@ diff -urNp linux-2.6.38.7/drivers/net/tg3.c linux-2.6.38.7/drivers/net/tg3.c { dev->vlan_features |= flags; } -diff -urNp linux-2.6.38.7/drivers/net/tg3.h linux-2.6.38.7/drivers/net/tg3.h ---- linux-2.6.38.7/drivers/net/tg3.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/tg3.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h +index f528243..3a68bba 100644 +--- a/drivers/net/tg3.h ++++ b/drivers/net/tg3.h @@ -131,6 +131,7 @@ #define CHIPREV_ID_5750_A0 0x4000 #define CHIPREV_ID_5750_A1 0x4001 @@ -31571,10 +32323,11 @@ diff -urNp linux-2.6.38.7/drivers/net/tg3.h linux-2.6.38.7/drivers/net/tg3.h #define CHIPREV_ID_5750_C2 0x4202 #define CHIPREV_ID_5752_A0_HW 0x5000 #define CHIPREV_ID_5752_A0 0x6000 -diff -urNp linux-2.6.38.7/drivers/net/tulip/de2104x.c linux-2.6.38.7/drivers/net/tulip/de2104x.c ---- linux-2.6.38.7/drivers/net/tulip/de2104x.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/tulip/de2104x.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1817,6 +1817,8 @@ static void __devinit de21041_get_srom_i +diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c +index b13c6b0..6a3f6d1 100644 +--- a/drivers/net/tulip/de2104x.c ++++ b/drivers/net/tulip/de2104x.c +@@ -1817,6 +1817,8 @@ static void __devinit de21041_get_srom_info (struct de_private *de) struct de_srom_info_leaf *il; void *bufp; @@ -31583,10 +32336,11 @@ diff -urNp linux-2.6.38.7/drivers/net/tulip/de2104x.c linux-2.6.38.7/drivers/net /* download entire eeprom */ for (i = 0; i < DE_EEPROM_WORDS; i++) ((__le16 *)ee_data)[i] = -diff -urNp linux-2.6.38.7/drivers/net/tulip/de4x5.c linux-2.6.38.7/drivers/net/tulip/de4x5.c ---- linux-2.6.38.7/drivers/net/tulip/de4x5.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/tulip/de4x5.c 2011-04-28 19:34:15.000000000 -0400 -@@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, stru +diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c +index 4dbd493..0cbae09 100644 +--- a/drivers/net/tulip/de4x5.c ++++ b/drivers/net/tulip/de4x5.c +@@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) for (i=0; i<ETH_ALEN; i++) { tmp.addr[i] = dev->dev_addr[i]; } @@ -31595,7 +32349,7 @@ diff -urNp linux-2.6.38.7/drivers/net/tulip/de4x5.c linux-2.6.38.7/drivers/net/t break; case DE4X5_SET_HWADDR: /* Set the hardware address */ -@@ -5441,7 +5441,7 @@ de4x5_ioctl(struct net_device *dev, stru +@@ -5441,7 +5441,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) spin_lock_irqsave(&lp->lock, flags); memcpy(&statbuf, &lp->pktStats, ioc->len); spin_unlock_irqrestore(&lp->lock, flags); @@ -31604,9 +32358,10 @@ diff -urNp linux-2.6.38.7/drivers/net/tulip/de4x5.c linux-2.6.38.7/drivers/net/t return -EFAULT; break; } -diff -urNp linux-2.6.38.7/drivers/net/usb/hso.c linux-2.6.38.7/drivers/net/usb/hso.c ---- linux-2.6.38.7/drivers/net/usb/hso.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/usb/hso.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c +index 6d83812..a7e7c1a 100644 +--- a/drivers/net/usb/hso.c ++++ b/drivers/net/usb/hso.c @@ -71,7 +71,7 @@ #include <asm/byteorder.h> #include <linux/serial_core.h> @@ -31625,7 +32380,7 @@ diff -urNp linux-2.6.38.7/drivers/net/usb/hso.c linux-2.6.38.7/drivers/net/usb/h spinlock_t serial_lock; int (*write_data) (struct hso_serial *serial); -@@ -1190,7 +1190,7 @@ static void put_rxbuf_data_and_resubmit_ +@@ -1190,7 +1190,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial) struct urb *urb; urb = serial->rx_urb[0]; @@ -31634,7 +32389,7 @@ diff -urNp linux-2.6.38.7/drivers/net/usb/hso.c linux-2.6.38.7/drivers/net/usb/h count = put_rxbuf_data(urb, serial); if (count == -1) return; -@@ -1226,7 +1226,7 @@ static void hso_std_serial_read_bulk_cal +@@ -1226,7 +1226,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb) DUMP1(urb->transfer_buffer, urb->actual_length); /* Anyone listening? */ @@ -31643,7 +32398,7 @@ diff -urNp linux-2.6.38.7/drivers/net/usb/hso.c linux-2.6.38.7/drivers/net/usb/h return; if (status == 0) { -@@ -1311,8 +1311,7 @@ static int hso_serial_open(struct tty_st +@@ -1311,8 +1311,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp) spin_unlock_irq(&serial->serial_lock); /* check for port already opened, if not set the termios */ @@ -31653,7 +32408,7 @@ diff -urNp linux-2.6.38.7/drivers/net/usb/hso.c linux-2.6.38.7/drivers/net/usb/h serial->rx_state = RX_IDLE; /* Force default termio settings */ _hso_serial_set_termios(tty, NULL); -@@ -1324,7 +1323,7 @@ static int hso_serial_open(struct tty_st +@@ -1324,7 +1323,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp) result = hso_start_serial_device(serial->parent, GFP_KERNEL); if (result) { hso_stop_serial_device(serial->parent); @@ -31662,7 +32417,7 @@ diff -urNp linux-2.6.38.7/drivers/net/usb/hso.c linux-2.6.38.7/drivers/net/usb/h kref_put(&serial->parent->ref, hso_serial_ref_free); } } else { -@@ -1361,10 +1360,10 @@ static void hso_serial_close(struct tty_ +@@ -1361,10 +1360,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp) /* reset the rts and dtr */ /* do the actual close */ @@ -31676,7 +32431,7 @@ diff -urNp linux-2.6.38.7/drivers/net/usb/hso.c linux-2.6.38.7/drivers/net/usb/h spin_lock_irq(&serial->serial_lock); if (serial->tty == tty) { serial->tty->driver_data = NULL; -@@ -1446,7 +1445,7 @@ static void hso_serial_set_termios(struc +@@ -1446,7 +1445,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old) /* the actual setup */ spin_lock_irqsave(&serial->serial_lock, flags); @@ -31685,7 +32440,7 @@ diff -urNp linux-2.6.38.7/drivers/net/usb/hso.c linux-2.6.38.7/drivers/net/usb/h _hso_serial_set_termios(tty, old); else tty->termios = old; -@@ -1905,7 +1904,7 @@ static void intr_callback(struct urb *ur +@@ -1905,7 +1904,7 @@ static void intr_callback(struct urb *urb) D1("Pending read interrupt on port %d\n", i); spin_lock(&serial->serial_lock); if (serial->rx_state == RX_IDLE && @@ -31694,7 +32449,7 @@ diff -urNp linux-2.6.38.7/drivers/net/usb/hso.c linux-2.6.38.7/drivers/net/usb/h /* Setup and send a ctrl req read on * port i */ if (!serial->rx_urb_filled[0]) { -@@ -3097,7 +3096,7 @@ static int hso_resume(struct usb_interfa +@@ -3097,7 +3096,7 @@ static int hso_resume(struct usb_interface *iface) /* Start all serial ports */ for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) { if (serial_table[i] && (serial_table[i]->interface == iface)) { @@ -31703,10 +32458,11 @@ diff -urNp linux-2.6.38.7/drivers/net/usb/hso.c linux-2.6.38.7/drivers/net/usb/h result = hso_start_serial_device(serial_table[i], GFP_NOIO); hso_kick_transmit(dev2ser(serial_table[i])); -diff -urNp linux-2.6.38.7/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-2.6.38.7/drivers/net/vmxnet3/vmxnet3_ethtool.c ---- linux-2.6.38.7/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-05-22 23:05:19.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-05-22 23:06:03.000000000 -0400 -@@ -631,8 +631,7 @@ vmxnet3_set_rss_indir(struct net_device +diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c +index 9764672..20eff26 100644 +--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c ++++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c +@@ -631,8 +631,7 @@ vmxnet3_set_rss_indir(struct net_device *netdev, * Return with error code if any of the queue indices * is out of range */ @@ -31716,10 +32472,11 @@ diff -urNp linux-2.6.38.7/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-2.6.38.7/d return -EINVAL; } -diff -urNp linux-2.6.38.7/drivers/net/vxge/vxge-main.c linux-2.6.38.7/drivers/net/vxge/vxge-main.c ---- linux-2.6.38.7/drivers/net/vxge/vxge-main.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/vxge/vxge-main.c 2011-05-16 21:47:08.000000000 -0400 -@@ -97,6 +97,8 @@ static inline void VXGE_COMPLETE_VPATH_T +diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c +index c81a651..5c4dafb 100644 +--- a/drivers/net/vxge/vxge-main.c ++++ b/drivers/net/vxge/vxge-main.c +@@ -97,6 +97,8 @@ static inline void VXGE_COMPLETE_VPATH_TX(struct vxge_fifo *fifo) struct sk_buff *completed[NR_SKB_COMPLETED]; int more; @@ -31728,7 +32485,7 @@ diff -urNp linux-2.6.38.7/drivers/net/vxge/vxge-main.c linux-2.6.38.7/drivers/ne do { more = 0; skb_ptr = completed; -@@ -1889,6 +1891,8 @@ static enum vxge_hw_status vxge_rth_conf +@@ -1889,6 +1891,8 @@ static enum vxge_hw_status vxge_rth_configure(struct vxgedev *vdev) u8 mtable[256] = {0}; /* CPU to vpath mapping */ int index; @@ -31737,10 +32494,11 @@ diff -urNp linux-2.6.38.7/drivers/net/vxge/vxge-main.c linux-2.6.38.7/drivers/ne /* * Filling * - itable with bucket numbers -diff -urNp linux-2.6.38.7/drivers/net/wan/cycx_x25.c linux-2.6.38.7/drivers/net/wan/cycx_x25.c ---- linux-2.6.38.7/drivers/net/wan/cycx_x25.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/wan/cycx_x25.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1018,6 +1018,8 @@ static void hex_dump(char *msg, unsigned +diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c +index cf9e15f..9789469 100644 +--- a/drivers/net/wan/cycx_x25.c ++++ b/drivers/net/wan/cycx_x25.c +@@ -1018,6 +1018,8 @@ static void hex_dump(char *msg, unsigned char *p, int len) unsigned char hex[1024], * phex = hex; @@ -31749,10 +32507,11 @@ diff -urNp linux-2.6.38.7/drivers/net/wan/cycx_x25.c linux-2.6.38.7/drivers/net/ if (len >= (sizeof(hex) / 2)) len = (sizeof(hex) / 2) - 1; -diff -urNp linux-2.6.38.7/drivers/net/wimax/i2400m/usb-fw.c linux-2.6.38.7/drivers/net/wimax/i2400m/usb-fw.c ---- linux-2.6.38.7/drivers/net/wimax/i2400m/usb-fw.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/wimax/i2400m/usb-fw.c 2011-05-16 21:47:08.000000000 -0400 -@@ -287,6 +287,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(stru +diff --git a/drivers/net/wimax/i2400m/usb-fw.c b/drivers/net/wimax/i2400m/usb-fw.c +index b58ec56..cecbabb 100644 +--- a/drivers/net/wimax/i2400m/usb-fw.c ++++ b/drivers/net/wimax/i2400m/usb-fw.c +@@ -287,6 +287,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(struct i2400m *i2400m, int do_autopm = 1; DECLARE_COMPLETION_ONSTACK(notif_completion); @@ -31761,10 +32520,11 @@ diff -urNp linux-2.6.38.7/drivers/net/wimax/i2400m/usb-fw.c linux-2.6.38.7/drive d_fnstart(8, dev, "(i2400m %p ack %p size %zu)\n", i2400m, ack, ack_size); BUG_ON(_ack == i2400m->bm_ack_buf); -diff -urNp linux-2.6.38.7/drivers/net/wireless/airo.c linux-2.6.38.7/drivers/net/wireless/airo.c ---- linux-2.6.38.7/drivers/net/wireless/airo.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/wireless/airo.c 2011-05-16 21:47:08.000000000 -0400 -@@ -3001,6 +3001,8 @@ static void airo_process_scan_results (s +diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c +index 57a79b0..3261730 100644 +--- a/drivers/net/wireless/airo.c ++++ b/drivers/net/wireless/airo.c +@@ -3001,6 +3001,8 @@ static void airo_process_scan_results (struct airo_info *ai) { BSSListElement * loop_net; BSSListElement * tmp_net; @@ -31773,7 +32533,7 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/airo.c linux-2.6.38.7/drivers/net /* Blow away current list of scan results */ list_for_each_entry_safe (loop_net, tmp_net, &ai->network_list, list) { list_move_tail (&loop_net->list, &ai->network_free_list); -@@ -3792,6 +3794,8 @@ static u16 setup_card(struct airo_info * +@@ -3792,6 +3794,8 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock) WepKeyRid wkr; int rc; @@ -31782,7 +32542,7 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/airo.c linux-2.6.38.7/drivers/net memset( &mySsid, 0, sizeof( mySsid ) ); kfree (ai->flash); ai->flash = NULL; -@@ -4760,6 +4764,8 @@ static int proc_stats_rid_open( struct i +@@ -4760,6 +4764,8 @@ static int proc_stats_rid_open( struct inode *inode, __le32 *vals = stats.vals; int len; @@ -31791,7 +32551,7 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/airo.c linux-2.6.38.7/drivers/net if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL) return -ENOMEM; data = file->private_data; -@@ -5483,6 +5489,8 @@ static int proc_BSSList_open( struct ino +@@ -5483,6 +5489,8 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) { /* If doLoseSync is not 1, we won't do a Lose Sync */ int doLoseSync = -1; @@ -31800,7 +32560,7 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/airo.c linux-2.6.38.7/drivers/net if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL) return -ENOMEM; data = file->private_data; -@@ -7190,6 +7198,8 @@ static int airo_get_aplist(struct net_de +@@ -7190,6 +7198,8 @@ static int airo_get_aplist(struct net_device *dev, int i; int loseSync = capable(CAP_NET_ADMIN) ? 1: -1; @@ -31809,7 +32569,7 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/airo.c linux-2.6.38.7/drivers/net qual = kmalloc(IW_MAX_AP * sizeof(*qual), GFP_KERNEL); if (!qual) return -ENOMEM; -@@ -7750,6 +7760,8 @@ static void airo_read_wireless_stats(str +@@ -7750,6 +7760,8 @@ static void airo_read_wireless_stats(struct airo_info *local) CapabilityRid cap_rid; __le32 *vals = stats_rid.vals; @@ -31818,10 +32578,11 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/airo.c linux-2.6.38.7/drivers/net /* Get stats out of the card */ clear_bit(JOB_WSTATS, &local->jobs); if (local->power.event) { -diff -urNp linux-2.6.38.7/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.38.7/drivers/net/wireless/ath/ath5k/debug.c ---- linux-2.6.38.7/drivers/net/wireless/ath/ath5k/debug.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/wireless/ath/ath5k/debug.c 2011-05-16 21:47:08.000000000 -0400 -@@ -204,6 +204,8 @@ static ssize_t read_file_beacon(struct f +diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c +index d2f84d7..215dfb4 100644 +--- a/drivers/net/wireless/ath/ath5k/debug.c ++++ b/drivers/net/wireless/ath/ath5k/debug.c +@@ -204,6 +204,8 @@ static ssize_t read_file_beacon(struct file *file, char __user *user_buf, unsigned int v; u64 tsf; @@ -31830,7 +32591,7 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.38.7/ v = ath5k_hw_reg_read(sc->ah, AR5K_BEACON); len += snprintf(buf+len, sizeof(buf)-len, "%-24s0x%08x\tintval: %d\tTIM: 0x%x\n", -@@ -325,6 +327,8 @@ static ssize_t read_file_debug(struct fi +@@ -325,6 +327,8 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf, unsigned int len = 0; unsigned int i; @@ -31839,7 +32600,7 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.38.7/ len += snprintf(buf+len, sizeof(buf)-len, "DEBUG LEVEL: 0x%08x\n\n", sc->debug.level); -@@ -386,6 +390,8 @@ static ssize_t read_file_antenna(struct +@@ -386,6 +390,8 @@ static ssize_t read_file_antenna(struct file *file, char __user *user_buf, unsigned int i; unsigned int v; @@ -31848,7 +32609,7 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.38.7/ len += snprintf(buf+len, sizeof(buf)-len, "antenna mode\t%d\n", sc->ah->ah_ant_mode); len += snprintf(buf+len, sizeof(buf)-len, "default antenna\t%d\n", -@@ -496,6 +502,8 @@ static ssize_t read_file_misc(struct fil +@@ -496,6 +502,8 @@ static ssize_t read_file_misc(struct file *file, char __user *user_buf, unsigned int len = 0; u32 filt = ath5k_hw_get_rx_filter(sc->ah); @@ -31857,7 +32618,7 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.38.7/ len += snprintf(buf+len, sizeof(buf)-len, "bssid-mask: %pM\n", sc->bssidmask); len += snprintf(buf+len, sizeof(buf)-len, "filter-flags: 0x%x ", -@@ -552,6 +560,8 @@ static ssize_t read_file_frameerrors(str +@@ -552,6 +560,8 @@ static ssize_t read_file_frameerrors(struct file *file, char __user *user_buf, unsigned int len = 0; int i; @@ -31866,7 +32627,7 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.38.7/ len += snprintf(buf+len, sizeof(buf)-len, "RX\n---------------------\n"); len += snprintf(buf+len, sizeof(buf)-len, "CRC\t%u\t(%u%%)\n", -@@ -669,6 +679,8 @@ static ssize_t read_file_ani(struct file +@@ -669,6 +679,8 @@ static ssize_t read_file_ani(struct file *file, char __user *user_buf, char buf[700]; unsigned int len = 0; @@ -31875,7 +32636,7 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.38.7/ len += snprintf(buf+len, sizeof(buf)-len, "HW has PHY error counters:\t%s\n", sc->ah->ah_capabilities.cap_has_phyerr_counters ? -@@ -829,6 +841,8 @@ static ssize_t read_file_queue(struct fi +@@ -829,6 +841,8 @@ static ssize_t read_file_queue(struct file *file, char __user *user_buf, struct ath5k_buf *bf, *bf0; int i, n; @@ -31884,10 +32645,11 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.38.7/ len += snprintf(buf+len, sizeof(buf)-len, "available txbuffers: %d\n", sc->txbuf_len); -diff -urNp linux-2.6.38.7/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-2.6.38.7/drivers/net/wireless/ath/ath9k/ar9003_calib.c ---- linux-2.6.38.7/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-05-16 21:47:08.000000000 -0400 -@@ -734,6 +734,8 @@ static void ar9003_hw_tx_iq_cal(struct a +diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c +index 4a4cd88..caf592b 100644 +--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c ++++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c +@@ -734,6 +734,8 @@ static void ar9003_hw_tx_iq_cal(struct ath_hw *ah) s32 i, j, ip, im, nmeasurement; u8 nchains = get_streams(common->tx_chainmask); @@ -31896,7 +32658,7 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-2. for (ip = 0; ip < MPASS; ip++) { REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_1, AR_PHY_TX_IQCAQL_CONTROL_1_IQCORR_I_Q_COFF_DELPT, -@@ -856,6 +858,8 @@ static void ar9003_hw_tx_iq_cal_post_pro +@@ -856,6 +858,8 @@ static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah) int i, ip, im, j; int nmeasurement; @@ -31905,10 +32667,11 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-2. for (i = 0; i < AR9300_MAX_CHAINS; i++) { if (ah->txchainmask & (1 << i)) num_chains++; -diff -urNp linux-2.6.38.7/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-2.6.38.7/drivers/net/wireless/ath/ath9k/ar9003_paprd.c ---- linux-2.6.38.7/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-05-16 21:47:08.000000000 -0400 -@@ -356,6 +356,8 @@ static bool create_pa_curve(u32 *data_L, +diff --git a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c +index 356d2fd7..cdb795f 100644 +--- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c ++++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c +@@ -356,6 +356,8 @@ static bool create_pa_curve(u32 *data_L, u32 *data_U, u32 *pa_table, u16 *gain) int theta_low_bin = 0; int i; @@ -31917,10 +32680,11 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-2. /* disregard any bin that contains <= 16 samples */ thresh_accum_cnt = 16; scale_factor = 5; -diff -urNp linux-2.6.38.7/drivers/net/wireless/ath/ath9k/debug.c linux-2.6.38.7/drivers/net/wireless/ath/ath9k/debug.c ---- linux-2.6.38.7/drivers/net/wireless/ath/ath9k/debug.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/wireless/ath/ath9k/debug.c 2011-05-16 21:47:08.000000000 -0400 -@@ -321,6 +321,8 @@ static ssize_t read_file_interrupt(struc +diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c +index 3586c43..5d72a11 100644 +--- a/drivers/net/wireless/ath/ath9k/debug.c ++++ b/drivers/net/wireless/ath/ath9k/debug.c +@@ -321,6 +321,8 @@ static ssize_t read_file_interrupt(struct file *file, char __user *user_buf, char buf[512]; unsigned int len = 0; @@ -31929,7 +32693,7 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/ath/ath9k/debug.c linux-2.6.38.7/ if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) { len += snprintf(buf + len, sizeof(buf) - len, "%8s: %10u\n", "RXLP", sc->debug.stats.istats.rxlp); -@@ -410,6 +412,8 @@ static ssize_t read_file_wiphy(struct fi +@@ -410,6 +412,8 @@ static ssize_t read_file_wiphy(struct file *file, char __user *user_buf, u8 addr[ETH_ALEN]; u32 tmp; @@ -31938,10 +32702,11 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/ath/ath9k/debug.c linux-2.6.38.7/ len += snprintf(buf + len, sizeof(buf) - len, "primary: %s (%s chan=%d ht=%d)\n", wiphy_name(sc->pri_wiphy->hw->wiphy), -diff -urNp linux-2.6.38.7/drivers/net/wireless/ath/ath9k/htc_drv_main.c linux-2.6.38.7/drivers/net/wireless/ath/ath9k/htc_drv_main.c ---- linux-2.6.38.7/drivers/net/wireless/ath/ath9k/htc_drv_main.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/wireless/ath/ath9k/htc_drv_main.c 2011-05-16 21:47:08.000000000 -0400 -@@ -620,6 +620,8 @@ static ssize_t read_file_tgt_stats(struc +diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c +index 6bb5995..dca3c90 100644 +--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c ++++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c +@@ -620,6 +620,8 @@ static ssize_t read_file_tgt_stats(struct file *file, char __user *user_buf, unsigned int len = 0; int ret = 0; @@ -31950,7 +32715,7 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/ath/ath9k/htc_drv_main.c linux-2. memset(&cmd_rsp, 0, sizeof(cmd_rsp)); WMI_CMD(WMI_TGT_STATS_CMDID); -@@ -665,6 +667,8 @@ static ssize_t read_file_xmit(struct fil +@@ -665,6 +667,8 @@ static ssize_t read_file_xmit(struct file *file, char __user *user_buf, char buf[512]; unsigned int len = 0; @@ -31959,7 +32724,7 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/ath/ath9k/htc_drv_main.c linux-2. len += snprintf(buf + len, sizeof(buf) - len, "%20s : %10u\n", "Buffers queued", priv->debug.tx_stats.buf_queued); -@@ -714,6 +718,8 @@ static ssize_t read_file_recv(struct fil +@@ -714,6 +718,8 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf, char buf[512]; unsigned int len = 0; @@ -31968,9 +32733,10 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/ath/ath9k/htc_drv_main.c linux-2. len += snprintf(buf + len, sizeof(buf) - len, "%20s : %10u\n", "SKBs allocated", priv->debug.rx_stats.skb_allocated); -diff -urNp linux-2.6.38.7/drivers/net/wireless/b43/debugfs.c linux-2.6.38.7/drivers/net/wireless/b43/debugfs.c ---- linux-2.6.38.7/drivers/net/wireless/b43/debugfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/wireless/b43/debugfs.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c +index 59f59fa..7ccbe5e 100644 +--- a/drivers/net/wireless/b43/debugfs.c ++++ b/drivers/net/wireless/b43/debugfs.c @@ -43,7 +43,7 @@ static struct dentry *rootdir; struct b43_debugfs_fops { ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); @@ -31980,9 +32746,10 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/b43/debugfs.c linux-2.6.38.7/driv /* Offset of struct b43_dfs_file in struct b43_dfsentry */ size_t file_struct_offset; }; -diff -urNp linux-2.6.38.7/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.38.7/drivers/net/wireless/b43legacy/debugfs.c ---- linux-2.6.38.7/drivers/net/wireless/b43legacy/debugfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/wireless/b43legacy/debugfs.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/net/wireless/b43legacy/debugfs.c b/drivers/net/wireless/b43legacy/debugfs.c +index f232618..266b676 100644 +--- a/drivers/net/wireless/b43legacy/debugfs.c ++++ b/drivers/net/wireless/b43legacy/debugfs.c @@ -44,7 +44,7 @@ static struct dentry *rootdir; struct b43legacy_debugfs_fops { ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); @@ -31992,10 +32759,11 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.38. /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ size_t file_struct_offset; /* Take wl->irq_lock before calling read/write? */ -diff -urNp linux-2.6.38.7/drivers/net/wireless/ipw2x00/ipw2100.c linux-2.6.38.7/drivers/net/wireless/ipw2x00/ipw2100.c ---- linux-2.6.38.7/drivers/net/wireless/ipw2x00/ipw2100.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/wireless/ipw2x00/ipw2100.c 2011-05-16 21:47:08.000000000 -0400 -@@ -2101,6 +2101,8 @@ static int ipw2100_set_essid(struct ipw2 +diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c +index 61915f3..a848ae8 100644 +--- a/drivers/net/wireless/ipw2x00/ipw2100.c ++++ b/drivers/net/wireless/ipw2x00/ipw2100.c +@@ -2101,6 +2101,8 @@ static int ipw2100_set_essid(struct ipw2100_priv *priv, char *essid, int err; DECLARE_SSID_BUF(ssid); @@ -32004,7 +32772,7 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/ipw2x00/ipw2100.c linux-2.6.38.7/ IPW_DEBUG_HC("SSID: '%s'\n", print_ssid(ssid, essid, ssid_len)); if (ssid_len) -@@ -5455,6 +5457,8 @@ static int ipw2100_set_key(struct ipw210 +@@ -5455,6 +5457,8 @@ static int ipw2100_set_key(struct ipw2100_priv *priv, struct ipw2100_wep_key *wep_key = (void *)cmd.host_command_parameters; int err; @@ -32013,10 +32781,11 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/ipw2x00/ipw2100.c linux-2.6.38.7/ IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n", idx, keylen, len); -diff -urNp linux-2.6.38.7/drivers/net/wireless/ipw2x00/libipw_rx.c linux-2.6.38.7/drivers/net/wireless/ipw2x00/libipw_rx.c ---- linux-2.6.38.7/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1565,6 +1565,8 @@ static void libipw_process_probe_respons +diff --git a/drivers/net/wireless/ipw2x00/libipw_rx.c b/drivers/net/wireless/ipw2x00/libipw_rx.c +index 0de1b18..d56ceac 100644 +--- a/drivers/net/wireless/ipw2x00/libipw_rx.c ++++ b/drivers/net/wireless/ipw2x00/libipw_rx.c +@@ -1565,6 +1565,8 @@ static void libipw_process_probe_response(struct libipw_device unsigned long flags; DECLARE_SSID_BUF(ssid); @@ -32025,10 +32794,11 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/ipw2x00/libipw_rx.c linux-2.6.38. LIBIPW_DEBUG_SCAN("'%s' (%pM" "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n", print_ssid(ssid, info_element->data, info_element->len), -diff -urNp linux-2.6.38.7/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-2.6.38.7/drivers/net/wireless/iwlwifi/iwl-agn-rs.c ---- linux-2.6.38.7/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-05-16 21:47:08.000000000 -0400 -@@ -883,6 +883,8 @@ static void rs_tx_status(void *priv_r, s +diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +index 75fcd30..70eb079 100644 +--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c ++++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +@@ -883,6 +883,8 @@ static void rs_tx_status(void *priv_r, struct ieee80211_supported_band *sband, struct iwl_station_priv *sta_priv = (void *)sta->drv_priv; struct iwl_rxon_context *ctx = sta_priv->common.ctx; @@ -32037,7 +32807,7 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-2.6.38 IWL_DEBUG_RATE_LIMIT(priv, "get frame ack response, update rate scale window\n"); /* Treat uninitialized rate scaling data same as non-existing. */ -@@ -2892,6 +2894,8 @@ static void rs_fill_link_cmd(struct iwl_ +@@ -2892,6 +2894,8 @@ static void rs_fill_link_cmd(struct iwl_priv *priv, u8 valid_tx_ant = 0; struct iwl_link_quality_cmd *lq_cmd = &lq_sta->lq; @@ -32046,10 +32816,26 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-2.6.38 /* Override starting rate (index 0) if needed for debug purposes */ rs_dbgfs_set_mcs(lq_sta, &new_rate, index); -diff -urNp linux-2.6.38.7/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-2.6.38.7/drivers/net/wireless/iwlwifi/iwl-debugfs.c ---- linux-2.6.38.7/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-05-16 21:47:08.000000000 -0400 -@@ -518,6 +518,8 @@ static ssize_t iwl_dbgfs_status_read(str +diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h +index ebdea3b..9ec3ff3 100644 +--- a/drivers/net/wireless/iwlwifi/iwl-debug.h ++++ b/drivers/net/wireless/iwlwifi/iwl-debug.h +@@ -68,8 +68,8 @@ do { \ + } while (0) + + #else +-#define IWL_DEBUG(__priv, level, fmt, args...) +-#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) ++#define IWL_DEBUG(__priv, level, fmt, args...) do {} while (0) ++#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) do {} while (0) + static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, + const void *p, u32 len) + {} +diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c +index 6fe80b5..7fee03e3 100644 +--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c ++++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c +@@ -518,6 +518,8 @@ static ssize_t iwl_dbgfs_status_read(struct file *file, int pos = 0; const size_t bufsz = sizeof(buf); @@ -32058,7 +32844,7 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-2.6.3 pos += scnprintf(buf + pos, bufsz - pos, "STATUS_HCMD_ACTIVE:\t %d\n", test_bit(STATUS_HCMD_ACTIVE, &priv->status)); pos += scnprintf(buf + pos, bufsz - pos, "STATUS_INT_ENABLED:\t %d\n", -@@ -650,6 +652,8 @@ static ssize_t iwl_dbgfs_qos_read(struct +@@ -650,6 +652,8 @@ static ssize_t iwl_dbgfs_qos_read(struct file *file, char __user *user_buf, char buf[256 * NUM_IWL_RXON_CTX]; const size_t bufsz = sizeof(buf); @@ -32067,24 +32853,11 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-2.6.3 for_each_context(priv, ctx) { pos += scnprintf(buf + pos, bufsz - pos, "context %d:\n", ctx->ctxid); -diff -urNp linux-2.6.38.7/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.38.7/drivers/net/wireless/iwlwifi/iwl-debug.h ---- linux-2.6.38.7/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-04-28 19:34:15.000000000 -0400 -@@ -68,8 +68,8 @@ do { - } while (0) - - #else --#define IWL_DEBUG(__priv, level, fmt, args...) --#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) -+#define IWL_DEBUG(__priv, level, fmt, args...) do {} while (0) -+#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) do {} while (0) - static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, - const void *p, u32 len) - {} -diff -urNp linux-2.6.38.7/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-2.6.38.7/drivers/net/wireless/iwmc3200wifi/debugfs.c ---- linux-2.6.38.7/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-05-16 21:47:08.000000000 -0400 -@@ -327,6 +327,8 @@ static ssize_t iwm_debugfs_fw_err_read(s +diff --git a/drivers/net/wireless/iwmc3200wifi/debugfs.c b/drivers/net/wireless/iwmc3200wifi/debugfs.c +index 0a0cc96..fd49ad8 100644 +--- a/drivers/net/wireless/iwmc3200wifi/debugfs.c ++++ b/drivers/net/wireless/iwmc3200wifi/debugfs.c +@@ -327,6 +327,8 @@ static ssize_t iwm_debugfs_fw_err_read(struct file *filp, int buf_len = 512; size_t len = 0; @@ -32093,9 +32866,10 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-2.6. if (*ppos != 0) return 0; if (count < sizeof(buf)) -diff -urNp linux-2.6.38.7/drivers/net/wireless/libertas/debugfs.c linux-2.6.38.7/drivers/net/wireless/libertas/debugfs.c ---- linux-2.6.38.7/drivers/net/wireless/libertas/debugfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/wireless/libertas/debugfs.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c +index fbf3b033..064bc9a 100644 +--- a/drivers/net/wireless/libertas/debugfs.c ++++ b/drivers/net/wireless/libertas/debugfs.c @@ -702,7 +702,7 @@ out_unlock: struct lbs_debugfs_files { const char *name; @@ -32105,10 +32879,11 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/libertas/debugfs.c linux-2.6.38.7 }; static const struct lbs_debugfs_files debugfs_files[] = { -diff -urNp linux-2.6.38.7/drivers/net/wireless/rndis_wlan.c linux-2.6.38.7/drivers/net/wireless/rndis_wlan.c ---- linux-2.6.38.7/drivers/net/wireless/rndis_wlan.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/wireless/rndis_wlan.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbn +diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c +index 518542b..2a7bd29 100644 +--- a/drivers/net/wireless/rndis_wlan.c ++++ b/drivers/net/wireless/rndis_wlan.c +@@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold) netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold); @@ -32117,10 +32892,11 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/rndis_wlan.c linux-2.6.38.7/drive rts_threshold = 2347; tmp = cpu_to_le32(rts_threshold); -diff -urNp linux-2.6.38.7/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c linux-2.6.38.7/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c ---- linux-2.6.38.7/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1277,6 +1277,8 @@ static bool _rtl92c_phy_sw_chnl_step_by_ +diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c +index 4504411..f0d94bf 100644 +--- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c ++++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c +@@ -1277,6 +1277,8 @@ static bool _rtl92c_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw, u8 rfpath; u8 num_total_rfpath = rtlphy->num_total_rfpath; @@ -32129,10 +32905,11 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c linux-2.6 precommoncmdcnt = 0; _rtl92c_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++, MAX_PRECMD_CNT, -diff -urNp linux-2.6.38.7/drivers/net/wireless/wl12xx/spi.c linux-2.6.38.7/drivers/net/wireless/wl12xx/spi.c ---- linux-2.6.38.7/drivers/net/wireless/wl12xx/spi.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/net/wireless/wl12xx/spi.c 2011-05-16 21:47:08.000000000 -0400 -@@ -279,6 +279,8 @@ static void wl1271_spi_raw_write(struct +diff --git a/drivers/net/wireless/wl12xx/spi.c b/drivers/net/wireless/wl12xx/spi.c +index 7145ea5..de31450 100644 +--- a/drivers/net/wireless/wl12xx/spi.c ++++ b/drivers/net/wireless/wl12xx/spi.c +@@ -279,6 +279,8 @@ static void wl1271_spi_raw_write(struct wl1271 *wl, int addr, void *buf, u32 chunk_len; int i; @@ -32141,10 +32918,11 @@ diff -urNp linux-2.6.38.7/drivers/net/wireless/wl12xx/spi.c linux-2.6.38.7/drive WARN_ON(len > WL1271_AGGR_BUFFER_SIZE); spi_message_init(&m); -diff -urNp linux-2.6.38.7/drivers/oprofile/buffer_sync.c linux-2.6.38.7/drivers/oprofile/buffer_sync.c ---- linux-2.6.38.7/drivers/oprofile/buffer_sync.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/oprofile/buffer_sync.c 2011-04-28 19:34:15.000000000 -0400 -@@ -342,7 +342,7 @@ static void add_data(struct op_entry *en +diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c +index a3984f4..0ccba79 100644 +--- a/drivers/oprofile/buffer_sync.c ++++ b/drivers/oprofile/buffer_sync.c +@@ -342,7 +342,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm) if (cookie == NO_COOKIE) offset = pc; if (cookie == INVALID_COOKIE) { @@ -32153,7 +32931,7 @@ diff -urNp linux-2.6.38.7/drivers/oprofile/buffer_sync.c linux-2.6.38.7/drivers/ offset = pc; } if (cookie != last_cookie) { -@@ -386,14 +386,14 @@ add_sample(struct mm_struct *mm, struct +@@ -386,14 +386,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel) /* add userspace sample */ if (!mm) { @@ -32179,10 +32957,11 @@ diff -urNp linux-2.6.38.7/drivers/oprofile/buffer_sync.c linux-2.6.38.7/drivers/ } } release_mm(mm); -diff -urNp linux-2.6.38.7/drivers/oprofile/event_buffer.c linux-2.6.38.7/drivers/oprofile/event_buffer.c ---- linux-2.6.38.7/drivers/oprofile/event_buffer.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/oprofile/event_buffer.c 2011-04-28 19:34:15.000000000 -0400 -@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value +diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c +index dd87e86..bc0148c 100644 +--- a/drivers/oprofile/event_buffer.c ++++ b/drivers/oprofile/event_buffer.c +@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value) } if (buffer_pos == buffer_size) { @@ -32191,10 +32970,11 @@ diff -urNp linux-2.6.38.7/drivers/oprofile/event_buffer.c linux-2.6.38.7/drivers return; } -diff -urNp linux-2.6.38.7/drivers/oprofile/oprof.c linux-2.6.38.7/drivers/oprofile/oprof.c ---- linux-2.6.38.7/drivers/oprofile/oprof.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/oprofile/oprof.c 2011-04-28 19:34:15.000000000 -0400 -@@ -110,7 +110,7 @@ static void switch_worker(struct work_st +diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c +index f9bda64..3034df4 100644 +--- a/drivers/oprofile/oprof.c ++++ b/drivers/oprofile/oprof.c +@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work) if (oprofile_ops.switch_events()) return; @@ -32203,21 +32983,10 @@ diff -urNp linux-2.6.38.7/drivers/oprofile/oprof.c linux-2.6.38.7/drivers/oprofi start_switch_worker(); } -diff -urNp linux-2.6.38.7/drivers/oprofile/oprofilefs.c linux-2.6.38.7/drivers/oprofile/oprofilefs.c ---- linux-2.6.38.7/drivers/oprofile/oprofilefs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/oprofile/oprofilefs.c 2011-04-28 19:34:15.000000000 -0400 -@@ -186,7 +186,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) - { - return __oprofilefs_create_file(sb, root, name, - &atomic_ro_fops, 0444, val); -diff -urNp linux-2.6.38.7/drivers/oprofile/oprofile_stats.c linux-2.6.38.7/drivers/oprofile/oprofile_stats.c ---- linux-2.6.38.7/drivers/oprofile/oprofile_stats.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/oprofile/oprofile_stats.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c +index 917d28e..d62d981 100644 +--- a/drivers/oprofile/oprofile_stats.c ++++ b/drivers/oprofile/oprofile_stats.c @@ -30,11 +30,11 @@ void oprofile_reset_stats(void) cpu_buf->sample_invalid_eip = 0; } @@ -32235,9 +33004,10 @@ diff -urNp linux-2.6.38.7/drivers/oprofile/oprofile_stats.c linux-2.6.38.7/drive } -diff -urNp linux-2.6.38.7/drivers/oprofile/oprofile_stats.h linux-2.6.38.7/drivers/oprofile/oprofile_stats.h ---- linux-2.6.38.7/drivers/oprofile/oprofile_stats.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/oprofile/oprofile_stats.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h +index 0b54e46..a37c527 100644 +--- a/drivers/oprofile/oprofile_stats.h ++++ b/drivers/oprofile/oprofile_stats.h @@ -13,11 +13,11 @@ #include <asm/atomic.h> @@ -32255,10 +33025,24 @@ diff -urNp linux-2.6.38.7/drivers/oprofile/oprofile_stats.h linux-2.6.38.7/drive }; extern struct oprofile_stat_struct oprofile_stats; -diff -urNp linux-2.6.38.7/drivers/parport/procfs.c linux-2.6.38.7/drivers/parport/procfs.c ---- linux-2.6.38.7/drivers/parport/procfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/parport/procfs.c 2011-04-28 19:34:15.000000000 -0400 -@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t +diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c +index e9ff6f7..28e259a 100644 +--- a/drivers/oprofile/oprofilefs.c ++++ b/drivers/oprofile/oprofilefs.c +@@ -186,7 +186,7 @@ static const struct file_operations atomic_ro_fops = { + + + 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) + { + return __oprofilefs_create_file(sb, root, name, + &atomic_ro_fops, 0444, val); +diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c +index 3f56bc0..707d642 100644 +--- a/drivers/parport/procfs.c ++++ b/drivers/parport/procfs.c +@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write, *ppos += len; @@ -32267,7 +33051,7 @@ diff -urNp linux-2.6.38.7/drivers/parport/procfs.c linux-2.6.38.7/drivers/parpor } #ifdef CONFIG_PARPORT_1284 -@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table +@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write, *ppos += len; @@ -32276,10 +33060,11 @@ diff -urNp linux-2.6.38.7/drivers/parport/procfs.c linux-2.6.38.7/drivers/parpor } #endif /* IEEE1284.3 support. */ -diff -urNp linux-2.6.38.7/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.38.7/drivers/pci/hotplug/acpiphp_glue.c ---- linux-2.6.38.7/drivers/pci/hotplug/acpiphp_glue.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.7/drivers/pci/hotplug/acpiphp_glue.c 2011-04-28 19:34:15.000000000 -0400 -@@ -110,7 +110,7 @@ static int post_dock_fixups(struct notif +diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c +index e610cfe..b5e20c3 100644 +--- a/drivers/pci/hotplug/acpiphp_glue.c ++++ b/drivers/pci/hotplug/acpiphp_glue.c +@@ -110,7 +110,7 @@ static int post_dock_fixups(struct notifier_block *nb, unsigned long val, } @@ -32288,10 +33073,11 @@ diff -urNp linux-2.6.38.7/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.38.7/driv .handler = handle_hotplug_event_func, }; -diff -urNp linux-2.6.38.7/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.38.7/drivers/pci/hotplug/cpqphp_nvram.c ---- linux-2.6.38.7/drivers/pci/hotplug/cpqphp_nvram.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/pci/hotplug/cpqphp_nvram.c 2011-04-28 19:34:15.000000000 -0400 -@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ +diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c +index 76ba8a1..20ca857 100644 +--- a/drivers/pci/hotplug/cpqphp_nvram.c ++++ b/drivers/pci/hotplug/cpqphp_nvram.c +@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start) void compaq_nvram_init (void __iomem *rom_start) { @@ -32305,10 +33091,11 @@ diff -urNp linux-2.6.38.7/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.38.7/driv dbg("int15 entry = %p\n", compaq_int15_entry_point); /* initialize our int15 lock */ -diff -urNp linux-2.6.38.7/drivers/pci/intel-iommu.c linux-2.6.38.7/drivers/pci/intel-iommu.c ---- linux-2.6.38.7/drivers/pci/intel-iommu.c 2011-05-10 22:06:27.000000000 -0400 -+++ linux-2.6.38.7/drivers/pci/intel-iommu.c 2011-05-10 22:06:56.000000000 -0400 -@@ -2934,7 +2934,7 @@ static int intel_mapping_error(struct de +diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c +index 5dc5d3e..cd81354 100644 +--- a/drivers/pci/intel-iommu.c ++++ b/drivers/pci/intel-iommu.c +@@ -2934,7 +2934,7 @@ static int intel_mapping_error(struct device *dev, dma_addr_t dma_addr) return !dma_addr; } @@ -32317,9 +33104,10 @@ diff -urNp linux-2.6.38.7/drivers/pci/intel-iommu.c linux-2.6.38.7/drivers/pci/i .alloc_coherent = intel_alloc_coherent, .free_coherent = intel_free_coherent, .map_sg = intel_map_sg, -diff -urNp linux-2.6.38.7/drivers/pci/pcie/aspm.c linux-2.6.38.7/drivers/pci/pcie/aspm.c ---- linux-2.6.38.7/drivers/pci/pcie/aspm.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/drivers/pci/pcie/aspm.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c +index bbdb4fd..2fd322a 100644 +--- a/drivers/pci/pcie/aspm.c ++++ b/drivers/pci/pcie/aspm.c @@ -27,9 +27,9 @@ #define MODULE_PARAM_PREFIX "pcie_aspm." @@ -32333,10 +33121,11 @@ diff -urNp linux-2.6.38.7/drivers/pci/pcie/aspm.c linux-2.6.38.7/drivers/pci/pci #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW) #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1) -diff -urNp linux-2.6.38.7/drivers/pci/probe.c linux-2.6.38.7/drivers/pci/probe.c ---- linux-2.6.38.7/drivers/pci/probe.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/pci/probe.c 2011-04-28 19:34:15.000000000 -0400 -@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( +diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c +index c84900d..67aa999 100644 +--- a/drivers/pci/probe.c ++++ b/drivers/pci/probe.c +@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(struct device *dev, return ret; } @@ -32353,7 +33142,7 @@ diff -urNp linux-2.6.38.7/drivers/pci/probe.c linux-2.6.38.7/drivers/pci/probe.c struct device_attribute *attr, char *buf) { -@@ -165,7 +165,7 @@ int __pci_read_base(struct pci_dev *dev, +@@ -165,7 +165,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, u32 l, sz, mask; u16 orig_cmd; @@ -32362,10 +33151,11 @@ diff -urNp linux-2.6.38.7/drivers/pci/probe.c linux-2.6.38.7/drivers/pci/probe.c if (!dev->mmio_always_on) { pci_read_config_word(dev, PCI_COMMAND, &orig_cmd); -diff -urNp linux-2.6.38.7/drivers/pci/proc.c linux-2.6.38.7/drivers/pci/proc.c ---- linux-2.6.38.7/drivers/pci/proc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/pci/proc.c 2011-04-28 19:34:15.000000000 -0400 -@@ -476,7 +476,16 @@ static const struct file_operations proc +diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c +index 27911b5..5b6db88 100644 +--- a/drivers/pci/proc.c ++++ b/drivers/pci/proc.c +@@ -476,7 +476,16 @@ static const struct file_operations proc_bus_pci_dev_operations = { static int __init pci_proc_init(void) { struct pci_dev *dev = NULL; @@ -32382,10 +33172,11 @@ diff -urNp linux-2.6.38.7/drivers/pci/proc.c linux-2.6.38.7/drivers/pci/proc.c proc_create("devices", 0, proc_bus_pci_dir, &proc_bus_pci_dev_operations); proc_initialized = 1; -diff -urNp linux-2.6.38.7/drivers/pci/xen-pcifront.c linux-2.6.38.7/drivers/pci/xen-pcifront.c ---- linux-2.6.38.7/drivers/pci/xen-pcifront.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/pci/xen-pcifront.c 2011-05-16 21:47:08.000000000 -0400 -@@ -187,6 +187,8 @@ static int pcifront_bus_read(struct pci_ +diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c +index 3a5a6fc..bd02f47 100644 +--- a/drivers/pci/xen-pcifront.c ++++ b/drivers/pci/xen-pcifront.c +@@ -187,6 +187,8 @@ static int pcifront_bus_read(struct pci_bus *bus, unsigned int devfn, struct pcifront_sd *sd = bus->sysdata; struct pcifront_device *pdev = pcifront_get_pdev(sd); @@ -32394,7 +33185,7 @@ diff -urNp linux-2.6.38.7/drivers/pci/xen-pcifront.c linux-2.6.38.7/drivers/pci/ if (verbose_request) dev_info(&pdev->xdev->dev, "read dev=%04x:%02x:%02x.%01x - offset %x size %d\n", -@@ -226,6 +228,8 @@ static int pcifront_bus_write(struct pci +@@ -226,6 +228,8 @@ static int pcifront_bus_write(struct pci_bus *bus, unsigned int devfn, struct pcifront_sd *sd = bus->sysdata; struct pcifront_device *pdev = pcifront_get_pdev(sd); @@ -32403,7 +33194,7 @@ diff -urNp linux-2.6.38.7/drivers/pci/xen-pcifront.c linux-2.6.38.7/drivers/pci/ if (verbose_request) dev_info(&pdev->xdev->dev, "write dev=%04x:%02x:%02x.%01x - " -@@ -258,6 +262,8 @@ static int pci_frontend_enable_msix(stru +@@ -258,6 +262,8 @@ static int pci_frontend_enable_msix(struct pci_dev *dev, struct pcifront_device *pdev = pcifront_get_pdev(sd); struct msi_desc *entry; @@ -32412,7 +33203,7 @@ diff -urNp linux-2.6.38.7/drivers/pci/xen-pcifront.c linux-2.6.38.7/drivers/pci/ if (nvec > SH_INFO_MAX_VEC) { dev_err(&dev->dev, "too much vector for pci frontend: %x." " Increase SH_INFO_MAX_VEC.\n", nvec); -@@ -303,6 +309,8 @@ static void pci_frontend_disable_msix(st +@@ -303,6 +309,8 @@ static void pci_frontend_disable_msix(struct pci_dev *dev) struct pcifront_sd *sd = dev->bus->sysdata; struct pcifront_device *pdev = pcifront_get_pdev(sd); @@ -32421,7 +33212,7 @@ diff -urNp linux-2.6.38.7/drivers/pci/xen-pcifront.c linux-2.6.38.7/drivers/pci/ err = do_pci_op(pdev, &op); /* What should do for error ? */ -@@ -322,6 +330,8 @@ static int pci_frontend_enable_msi(struc +@@ -322,6 +330,8 @@ static int pci_frontend_enable_msi(struct pci_dev *dev, int **vector) struct pcifront_sd *sd = dev->bus->sysdata; struct pcifront_device *pdev = pcifront_get_pdev(sd); @@ -32430,9 +33221,10 @@ diff -urNp linux-2.6.38.7/drivers/pci/xen-pcifront.c linux-2.6.38.7/drivers/pci/ err = do_pci_op(pdev, &op); if (likely(!err)) { *(*vector) = op.value; -diff -urNp linux-2.6.38.7/drivers/platform/x86/asus-laptop.c linux-2.6.38.7/drivers/platform/x86/asus-laptop.c ---- linux-2.6.38.7/drivers/platform/x86/asus-laptop.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/platform/x86/asus-laptop.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c +index f3aa6a7..74233d2 100644 +--- a/drivers/platform/x86/asus-laptop.c ++++ b/drivers/platform/x86/asus-laptop.c @@ -243,7 +243,6 @@ struct asus_laptop { struct asus_led gled; struct asus_led kled; @@ -32441,9 +33233,10 @@ diff -urNp linux-2.6.38.7/drivers/platform/x86/asus-laptop.c linux-2.6.38.7/driv int wireless_status; bool have_rsts; int lcd_state; -diff -urNp linux-2.6.38.7/drivers/pnp/pnpbios/bioscalls.c linux-2.6.38.7/drivers/pnp/pnpbios/bioscalls.c ---- linux-2.6.38.7/drivers/pnp/pnpbios/bioscalls.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/pnp/pnpbios/bioscalls.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c +index 8591f6a..a0f2b81 100644 +--- a/drivers/pnp/pnpbios/bioscalls.c ++++ b/drivers/pnp/pnpbios/bioscalls.c @@ -59,7 +59,7 @@ do { \ set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ } while(0) @@ -32453,7 +33246,7 @@ diff -urNp linux-2.6.38.7/drivers/pnp/pnpbios/bioscalls.c linux-2.6.38.7/drivers (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1); /* -@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func +@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3, cpu = get_cpu(); save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8]; @@ -32464,7 +33257,7 @@ diff -urNp linux-2.6.38.7/drivers/pnp/pnpbios/bioscalls.c linux-2.6.38.7/drivers /* On some boxes IRQ's during PnP BIOS calls are deadly. */ spin_lock_irqsave(&pnp_bios_lock, flags); -@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func +@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3, :"memory"); spin_unlock_irqrestore(&pnp_bios_lock, flags); @@ -32475,7 +33268,7 @@ diff -urNp linux-2.6.38.7/drivers/pnp/pnpbios/bioscalls.c linux-2.6.38.7/drivers put_cpu(); /* If we get here and this is set then the PnP BIOS faulted on us. */ -@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 n +@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base) return status; } @@ -32484,7 +33277,7 @@ diff -urNp linux-2.6.38.7/drivers/pnp/pnpbios/bioscalls.c linux-2.6.38.7/drivers { int i; -@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_i +@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header) pnp_bios_callpoint.offset = header->fields.pm16offset; pnp_bios_callpoint.segment = PNP_CS16; @@ -32493,17 +33286,18 @@ diff -urNp linux-2.6.38.7/drivers/pnp/pnpbios/bioscalls.c linux-2.6.38.7/drivers for_each_possible_cpu(i) { struct desc_struct *gdt = get_cpu_gdt_table(i); if (!gdt) -@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_i +@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header) set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS], (unsigned long)__va(header->fields.pm16dseg)); } + + pax_close_kernel(); } -diff -urNp linux-2.6.38.7/drivers/pnp/resource.c linux-2.6.38.7/drivers/pnp/resource.c ---- linux-2.6.38.7/drivers/pnp/resource.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/pnp/resource.c 2011-04-28 19:34:15.000000000 -0400 -@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s +diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c +index a925e6b..112b90f 100644 +--- a/drivers/pnp/resource.c ++++ b/drivers/pnp/resource.c +@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res) return 1; /* check if the resource is valid */ @@ -32512,7 +33306,7 @@ diff -urNp linux-2.6.38.7/drivers/pnp/resource.c linux-2.6.38.7/drivers/pnp/reso return 0; /* check if the resource is reserved */ -@@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, s +@@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res) return 1; /* check if the resource is valid */ @@ -32521,9 +33315,10 @@ diff -urNp linux-2.6.38.7/drivers/pnp/resource.c linux-2.6.38.7/drivers/pnp/reso return 0; /* check if the resource is reserved */ -diff -urNp linux-2.6.38.7/drivers/rtc/rtc-dev.c linux-2.6.38.7/drivers/rtc/rtc-dev.c ---- linux-2.6.38.7/drivers/rtc/rtc-dev.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/rtc/rtc-dev.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c +index d0e06ed..9b30711 100644 +--- a/drivers/rtc/rtc-dev.c ++++ b/drivers/rtc/rtc-dev.c @@ -14,6 +14,7 @@ #include <linux/module.h> #include <linux/rtc.h> @@ -32532,7 +33327,7 @@ diff -urNp linux-2.6.38.7/drivers/rtc/rtc-dev.c linux-2.6.38.7/drivers/rtc/rtc-d #include "rtc-core.h" static dev_t rtc_devt; -@@ -345,6 +346,8 @@ static long rtc_dev_ioctl(struct file *f +@@ -345,6 +346,8 @@ static long rtc_dev_ioctl(struct file *file, if (copy_from_user(&tm, uarg, sizeof(tm))) return -EFAULT; @@ -32541,10 +33336,11 @@ diff -urNp linux-2.6.38.7/drivers/rtc/rtc-dev.c linux-2.6.38.7/drivers/rtc/rtc-d return rtc_set_time(rtc, &tm); case RTC_PIE_ON: -diff -urNp linux-2.6.38.7/drivers/s390/cio/qdio_debug.c linux-2.6.38.7/drivers/s390/cio/qdio_debug.c ---- linux-2.6.38.7/drivers/s390/cio/qdio_debug.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/s390/cio/qdio_debug.c 2011-04-28 19:34:15.000000000 -0400 -@@ -225,7 +225,7 @@ static int qperf_seq_open(struct inode * +diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c +index f8b03a6..7d629c0 100644 +--- a/drivers/s390/cio/qdio_debug.c ++++ b/drivers/s390/cio/qdio_debug.c +@@ -225,7 +225,7 @@ static int qperf_seq_open(struct inode *inode, struct file *filp) filp->f_path.dentry->d_inode->i_private); } @@ -32553,10 +33349,24 @@ diff -urNp linux-2.6.38.7/drivers/s390/cio/qdio_debug.c linux-2.6.38.7/drivers/s .owner = THIS_MODULE, .open = qperf_seq_open, .read = seq_read, -diff -urNp linux-2.6.38.7/drivers/scsi/aacraid/commctrl.c linux-2.6.38.7/drivers/scsi/aacraid/commctrl.c ---- linux-2.6.38.7/drivers/scsi/aacraid/commctrl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/aacraid/commctrl.c 2011-05-16 21:47:08.000000000 -0400 -@@ -481,6 +481,7 @@ static int aac_send_raw_srb(struct aac_d +diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c +index f66c33b..7ae5823 100644 +--- a/drivers/scsi/BusLogic.c ++++ b/drivers/scsi/BusLogic.c +@@ -962,6 +962,8 @@ static int __init BusLogic_InitializeFlashPointProbeInfo(struct BusLogic_HostAda + static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter + *PrototypeHostAdapter) + { ++ pax_track_stack(); ++ + /* + If a PCI BIOS is present, interrogate it for MultiMaster and FlashPoint + Host Adapters; otherwise, default to the standard ISA MultiMaster probe. +diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c +index 645ddd9..bdd3ba2 100644 +--- a/drivers/scsi/aacraid/commctrl.c ++++ b/drivers/scsi/aacraid/commctrl.c +@@ -481,6 +481,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) u32 actual_fibsize64, actual_fibsize = 0; int i; @@ -32564,10 +33374,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/aacraid/commctrl.c linux-2.6.38.7/drivers if (dev->in_reset) { dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n")); -diff -urNp linux-2.6.38.7/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.38.7/drivers/scsi/aic94xx/aic94xx_init.c ---- linux-2.6.38.7/drivers/scsi/aic94xx/aic94xx_init.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/aic94xx/aic94xx_init.c 2011-04-28 19:34:15.000000000 -0400 -@@ -486,7 +486,7 @@ static ssize_t asd_show_update_bios(stru +diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c +index 3b7e83d..d5ff142 100644 +--- a/drivers/scsi/aic94xx/aic94xx_init.c ++++ b/drivers/scsi/aic94xx/aic94xx_init.c +@@ -486,7 +486,7 @@ static ssize_t asd_show_update_bios(struct device *dev, flash_error_table[i].reason); } @@ -32576,22 +33387,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.38.7/dri asd_show_update_bios, asd_store_update_bios); static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha) -diff -urNp linux-2.6.38.7/drivers/scsi/bfa/bfad.c linux-2.6.38.7/drivers/scsi/bfa/bfad.c ---- linux-2.6.38.7/drivers/scsi/bfa/bfad.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/bfa/bfad.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1027,6 +1027,8 @@ bfad_start_ops(struct bfad_s *bfad) { - struct bfad_vport_s *vport, *vport_new; - struct bfa_fcs_driver_info_s driver_info; - -+ pax_track_stack(); -+ - /* Fill the driver_info info to fcs*/ - memset(&driver_info, 0, sizeof(driver_info)); - strncpy(driver_info.version, BFAD_DRIVER_VERSION, -diff -urNp linux-2.6.38.7/drivers/scsi/bfa/bfa_fcs_lport.c linux-2.6.38.7/drivers/scsi/bfa/bfa_fcs_lport.c ---- linux-2.6.38.7/drivers/scsi/bfa/bfa_fcs_lport.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/bfa/bfa_fcs_lport.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1559,6 +1559,8 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struc +diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c +index 43fa986b..ffbfe41 100644 +--- a/drivers/scsi/bfa/bfa_fcs_lport.c ++++ b/drivers/scsi/bfa/bfa_fcs_lport.c +@@ -1559,6 +1559,8 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struct bfa_fcs_lport_fdmi_s *fdmi, u8 *pyld) u16 len, count; u16 templen; @@ -32600,7 +33400,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/bfa/bfa_fcs_lport.c linux-2.6.38.7/driver /* * get hba attributes */ -@@ -1836,6 +1838,8 @@ bfa_fcs_lport_fdmi_build_portattr_block( +@@ -1836,6 +1838,8 @@ bfa_fcs_lport_fdmi_build_portattr_block(struct bfa_fcs_lport_fdmi_s *fdmi, u8 count = 0; u16 templen; @@ -32609,10 +33409,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/bfa/bfa_fcs_lport.c linux-2.6.38.7/driver /* * get port attributes */ -diff -urNp linux-2.6.38.7/drivers/scsi/bfa/bfa_fcs_rport.c linux-2.6.38.7/drivers/scsi/bfa/bfa_fcs_rport.c ---- linux-2.6.38.7/drivers/scsi/bfa/bfa_fcs_rport.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/bfa/bfa_fcs_rport.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1844,6 +1844,8 @@ bfa_fcs_rport_process_rpsc(struct bfa_fc +diff --git a/drivers/scsi/bfa/bfa_fcs_rport.c b/drivers/scsi/bfa/bfa_fcs_rport.c +index caaee6f..efce56b 100644 +--- a/drivers/scsi/bfa/bfa_fcs_rport.c ++++ b/drivers/scsi/bfa/bfa_fcs_rport.c +@@ -1844,6 +1844,8 @@ bfa_fcs_rport_process_rpsc(struct bfa_fcs_rport_s *rport, struct fc_rpsc_speed_info_s speeds; struct bfa_port_attr_s pport_attr; @@ -32621,22 +33422,24 @@ diff -urNp linux-2.6.38.7/drivers/scsi/bfa/bfa_fcs_rport.c linux-2.6.38.7/driver bfa_trc(port->fcs, rx_fchs->s_id); bfa_trc(port->fcs, rx_fchs->d_id); -diff -urNp linux-2.6.38.7/drivers/scsi/BusLogic.c linux-2.6.38.7/drivers/scsi/BusLogic.c ---- linux-2.6.38.7/drivers/scsi/BusLogic.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/BusLogic.c 2011-05-16 21:47:08.000000000 -0400 -@@ -962,6 +962,8 @@ static int __init BusLogic_InitializeFla - static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter - *PrototypeHostAdapter) - { +diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c +index 44524cf..c1f943b 100644 +--- a/drivers/scsi/bfa/bfad.c ++++ b/drivers/scsi/bfa/bfad.c +@@ -1027,6 +1027,8 @@ bfad_start_ops(struct bfad_s *bfad) { + struct bfad_vport_s *vport, *vport_new; + struct bfa_fcs_driver_info_s driver_info; + + pax_track_stack(); + - /* - If a PCI BIOS is present, interrogate it for MultiMaster and FlashPoint - Host Adapters; otherwise, default to the standard ISA MultiMaster probe. -diff -urNp linux-2.6.38.7/drivers/scsi/dpt_i2o.c linux-2.6.38.7/drivers/scsi/dpt_i2o.c ---- linux-2.6.38.7/drivers/scsi/dpt_i2o.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/dpt_i2o.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1811,6 +1811,8 @@ static int adpt_i2o_passthru(adpt_hba* p + /* Fill the driver_info info to fcs*/ + memset(&driver_info, 0, sizeof(driver_info)); + strncpy(driver_info.version, BFAD_DRIVER_VERSION, +diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c +index cffcb10..82e5eb1 100644 +--- a/drivers/scsi/dpt_i2o.c ++++ b/drivers/scsi/dpt_i2o.c +@@ -1811,6 +1811,8 @@ static int adpt_i2o_passthru(adpt_hba* pHba, u32 __user *arg) dma_addr_t addr; ulong flags = 0; @@ -32645,7 +33448,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/dpt_i2o.c linux-2.6.38.7/drivers/scsi/dpt memset(&msg, 0, MAX_MESSAGE_SIZE*4); // get user msg size in u32s if(get_user(size, &user_msg[0])){ -@@ -2317,6 +2319,8 @@ static s32 adpt_scsi_to_i2o(adpt_hba* pH +@@ -2317,6 +2319,8 @@ static s32 adpt_scsi_to_i2o(adpt_hba* pHba, struct scsi_cmnd* cmd, struct adpt_d s32 rcode; dma_addr_t addr; @@ -32654,10 +33457,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/dpt_i2o.c linux-2.6.38.7/drivers/scsi/dpt memset(msg, 0 , sizeof(msg)); len = scsi_bufflen(cmd); direction = 0x00000000; -diff -urNp linux-2.6.38.7/drivers/scsi/eata.c linux-2.6.38.7/drivers/scsi/eata.c ---- linux-2.6.38.7/drivers/scsi/eata.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/eata.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1087,6 +1087,8 @@ static int port_detect(unsigned long por +diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c +index 53925ac..0ce6fa1 100644 +--- a/drivers/scsi/eata.c ++++ b/drivers/scsi/eata.c +@@ -1087,6 +1087,8 @@ static int port_detect(unsigned long port_base, unsigned int j, struct hostdata *ha; char name[16]; @@ -32666,10 +33470,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/eata.c linux-2.6.38.7/drivers/scsi/eata.c sprintf(name, "%s%d", driver_name, j); if (!request_region(port_base, REGION_SIZE, driver_name)) { -diff -urNp linux-2.6.38.7/drivers/scsi/fcoe/libfcoe.c linux-2.6.38.7/drivers/scsi/fcoe/libfcoe.c ---- linux-2.6.38.7/drivers/scsi/fcoe/libfcoe.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/fcoe/libfcoe.c 2011-05-16 21:47:08.000000000 -0400 -@@ -2484,6 +2484,8 @@ static int fcoe_ctlr_vn_recv(struct fcoe +diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c +index 625c6be..8db7e56 100644 +--- a/drivers/scsi/fcoe/libfcoe.c ++++ b/drivers/scsi/fcoe/libfcoe.c +@@ -2484,6 +2484,8 @@ static int fcoe_ctlr_vn_recv(struct fcoe_ctlr *fip, struct sk_buff *skb) } buf; int rc; @@ -32678,9 +33483,10 @@ diff -urNp linux-2.6.38.7/drivers/scsi/fcoe/libfcoe.c linux-2.6.38.7/drivers/scs fiph = (struct fip_header *)skb->data; sub = fiph->fip_subcode; -diff -urNp linux-2.6.38.7/drivers/scsi/gdth.c linux-2.6.38.7/drivers/scsi/gdth.c ---- linux-2.6.38.7/drivers/scsi/gdth.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/gdth.c 2011-05-16 21:47:08.000000000 -0400 +diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c +index 3242bca..45a83e7 100644 +--- a/drivers/scsi/gdth.c ++++ b/drivers/scsi/gdth.c @@ -4107,6 +4107,8 @@ static int ioc_lockdrv(void __user *arg) unsigned long flags; gdth_ha_str *ha; @@ -32690,7 +33496,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/gdth.c linux-2.6.38.7/drivers/scsi/gdth.c if (copy_from_user(&ldrv, arg, sizeof(gdth_ioctl_lockdrv))) return -EFAULT; ha = gdth_find_ha(ldrv.ionode); -@@ -4139,6 +4141,8 @@ static int ioc_resetdrv(void __user *arg +@@ -4139,6 +4141,8 @@ static int ioc_resetdrv(void __user *arg, char *cmnd) gdth_ha_str *ha; int rval; @@ -32699,7 +33505,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/gdth.c linux-2.6.38.7/drivers/scsi/gdth.c if (copy_from_user(&res, arg, sizeof(gdth_ioctl_reset)) || res.number >= MAX_HDRIVES) return -EFAULT; -@@ -4174,6 +4178,8 @@ static int ioc_general(void __user *arg, +@@ -4174,6 +4178,8 @@ static int ioc_general(void __user *arg, char *cmnd) gdth_ha_str *ha; int rval; @@ -32718,10 +33524,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/gdth.c linux-2.6.38.7/drivers/scsi/gdth.c memset(cmnd, 0xff, MAX_COMMAND_SIZE); TRACE2(("gdth_flush() hanum %d\n", ha->hanum)); -diff -urNp linux-2.6.38.7/drivers/scsi/gdth_proc.c linux-2.6.38.7/drivers/scsi/gdth_proc.c ---- linux-2.6.38.7/drivers/scsi/gdth_proc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/gdth_proc.c 2011-05-16 21:47:08.000000000 -0400 -@@ -47,6 +47,9 @@ static int gdth_set_asc_info(struct Scsi +diff --git a/drivers/scsi/gdth_proc.c b/drivers/scsi/gdth_proc.c +index 6527543..81e4fe2 100644 +--- a/drivers/scsi/gdth_proc.c ++++ b/drivers/scsi/gdth_proc.c +@@ -47,6 +47,9 @@ static int gdth_set_asc_info(struct Scsi_Host *host, char *buffer, u64 paddr; char cmnd[MAX_COMMAND_SIZE]; @@ -32731,7 +33538,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/gdth_proc.c linux-2.6.38.7/drivers/scsi/g memset(cmnd, 0xff, 12); memset(&gdtcmd, 0, sizeof(gdth_cmd_str)); -@@ -175,6 +178,8 @@ static int gdth_get_info(char *buffer,ch +@@ -175,6 +178,8 @@ static int gdth_get_info(char *buffer,char **start,off_t offset,int length, gdth_hget_str *phg; char cmnd[MAX_COMMAND_SIZE]; @@ -32740,9 +33547,10 @@ diff -urNp linux-2.6.38.7/drivers/scsi/gdth_proc.c linux-2.6.38.7/drivers/scsi/g gdtcmd = kmalloc(sizeof(*gdtcmd), GFP_KERNEL); estr = kmalloc(sizeof(*estr), GFP_KERNEL); if (!gdtcmd || !estr) -diff -urNp linux-2.6.38.7/drivers/scsi/hosts.c linux-2.6.38.7/drivers/scsi/hosts.c ---- linux-2.6.38.7/drivers/scsi/hosts.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/hosts.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c +index 4f7a582..b87341f 100644 +--- a/drivers/scsi/hosts.c ++++ b/drivers/scsi/hosts.c @@ -42,7 +42,7 @@ #include "scsi_logging.h" @@ -32752,7 +33560,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/hosts.c linux-2.6.38.7/drivers/scsi/hosts static void scsi_host_cls_release(struct device *dev) -@@ -354,7 +354,7 @@ struct Scsi_Host *scsi_host_alloc(struct +@@ -354,7 +354,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) * subtract one because we increment first then return, but we need to * know what the next host number was before increment */ @@ -32761,10 +33569,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/hosts.c linux-2.6.38.7/drivers/scsi/hosts shost->dma_channel = 0xff; /* These three are default values which can be overridden */ -diff -urNp linux-2.6.38.7/drivers/scsi/hpsa.c linux-2.6.38.7/drivers/scsi/hpsa.c ---- linux-2.6.38.7/drivers/scsi/hpsa.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/hpsa.c 2011-04-28 19:34:15.000000000 -0400 -@@ -2281,6 +2281,8 @@ static int hpsa_ioctl32_passthru(struct +diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c +index 12deffc..db49eec 100644 +--- a/drivers/scsi/hpsa.c ++++ b/drivers/scsi/hpsa.c +@@ -2281,6 +2281,8 @@ static int hpsa_ioctl32_passthru(struct scsi_device *dev, int cmd, void *arg) int err; u32 cp; @@ -32773,10 +33582,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/hpsa.c linux-2.6.38.7/drivers/scsi/hpsa.c err = 0; err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info, sizeof(arg64.LUN_info)); -diff -urNp linux-2.6.38.7/drivers/scsi/ipr.c linux-2.6.38.7/drivers/scsi/ipr.c ---- linux-2.6.38.7/drivers/scsi/ipr.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/ipr.c 2011-04-28 19:34:15.000000000 -0400 -@@ -6207,7 +6207,7 @@ static bool ipr_qc_fill_rtf(struct ata_q +diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c +index 9c5c8be..04d95bf 100644 +--- a/drivers/scsi/ipr.c ++++ b/drivers/scsi/ipr.c +@@ -6207,7 +6207,7 @@ static bool ipr_qc_fill_rtf(struct ata_queued_cmd *qc) return true; } @@ -32785,9 +33595,10 @@ diff -urNp linux-2.6.38.7/drivers/scsi/ipr.c linux-2.6.38.7/drivers/scsi/ipr.c .phy_reset = ipr_ata_phy_reset, .hardreset = ipr_sata_reset, .post_internal_cmd = ipr_ata_post_internal, -diff -urNp linux-2.6.38.7/drivers/scsi/libfc/fc_exch.c linux-2.6.38.7/drivers/scsi/libfc/fc_exch.c ---- linux-2.6.38.7/drivers/scsi/libfc/fc_exch.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/libfc/fc_exch.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c +index d21367d..09e8d4f 100644 +--- a/drivers/scsi/libfc/fc_exch.c ++++ b/drivers/scsi/libfc/fc_exch.c @@ -105,12 +105,12 @@ struct fc_exch_mgr { * all together if not used XXX */ @@ -32807,7 +33618,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/libfc/fc_exch.c linux-2.6.38.7/drivers/sc } stats; }; -@@ -687,7 +687,7 @@ static struct fc_exch *fc_exch_em_alloc( +@@ -687,7 +687,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport, /* allocate memory for exchange */ ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC); if (!ep) { @@ -32825,7 +33636,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/libfc/fc_exch.c linux-2.6.38.7/drivers/sc mempool_free(ep, mp->ep_pool); return NULL; } -@@ -893,7 +893,7 @@ static enum fc_pf_rjt_reason fc_seq_look +@@ -893,7 +893,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport, xid = ntohs(fh->fh_ox_id); /* we originated exch */ ep = fc_exch_find(mp, xid); if (!ep) { @@ -32834,7 +33645,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/libfc/fc_exch.c linux-2.6.38.7/drivers/sc reject = FC_RJT_OX_ID; goto out; } -@@ -923,7 +923,7 @@ static enum fc_pf_rjt_reason fc_seq_look +@@ -923,7 +923,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport, ep = fc_exch_find(mp, xid); if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) { if (ep) { @@ -32843,7 +33654,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/libfc/fc_exch.c linux-2.6.38.7/drivers/sc reject = FC_RJT_RX_ID; goto rel; } -@@ -934,7 +934,7 @@ static enum fc_pf_rjt_reason fc_seq_look +@@ -934,7 +934,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport, } xid = ep->xid; /* get our XID */ } else if (!ep) { @@ -32852,7 +33663,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/libfc/fc_exch.c linux-2.6.38.7/drivers/sc reject = FC_RJT_RX_ID; /* XID not found */ goto out; } -@@ -951,7 +951,7 @@ static enum fc_pf_rjt_reason fc_seq_look +@@ -951,7 +951,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport, } else { sp = &ep->seq; if (sp->id != fh->fh_seq_id) { @@ -32861,7 +33672,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/libfc/fc_exch.c linux-2.6.38.7/drivers/sc reject = FC_RJT_SEQ_ID; /* sequence/exch should exist */ goto rel; } -@@ -1368,22 +1368,22 @@ static void fc_exch_recv_seq_resp(struct +@@ -1368,22 +1368,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp) ep = fc_exch_find(mp, ntohs(fh->fh_ox_id)); if (!ep) { @@ -32888,7 +33699,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/libfc/fc_exch.c linux-2.6.38.7/drivers/sc goto rel; } sof = fr_sof(fp); -@@ -1392,7 +1392,7 @@ static void fc_exch_recv_seq_resp(struct +@@ -1392,7 +1392,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp) sp->ssb_stat |= SSB_ST_RESP; sp->id = fh->fh_seq_id; } else if (sp->id != fh->fh_seq_id) { @@ -32897,7 +33708,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/libfc/fc_exch.c linux-2.6.38.7/drivers/sc goto rel; } -@@ -1455,9 +1455,9 @@ static void fc_exch_recv_resp(struct fc_ +@@ -1455,9 +1455,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp) sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */ if (!sp) @@ -32909,10 +33720,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/libfc/fc_exch.c linux-2.6.38.7/drivers/sc fc_frame_free(fp); } -diff -urNp linux-2.6.38.7/drivers/scsi/libsas/sas_ata.c linux-2.6.38.7/drivers/scsi/libsas/sas_ata.c ---- linux-2.6.38.7/drivers/scsi/libsas/sas_ata.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/libsas/sas_ata.c 2011-04-28 19:34:15.000000000 -0400 -@@ -348,7 +348,7 @@ static int sas_ata_scr_read(struct ata_l +diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c +index e1a395b..af49bcd 100644 +--- a/drivers/scsi/libsas/sas_ata.c ++++ b/drivers/scsi/libsas/sas_ata.c +@@ -348,7 +348,7 @@ static int sas_ata_scr_read(struct ata_link *link, unsigned int sc_reg_in, } } @@ -32921,9 +33733,43 @@ diff -urNp linux-2.6.38.7/drivers/scsi/libsas/sas_ata.c linux-2.6.38.7/drivers/s .phy_reset = sas_ata_phy_reset, .post_internal_cmd = sas_ata_post_internal, .qc_defer = ata_std_qc_defer, -diff -urNp linux-2.6.38.7/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.38.7/drivers/scsi/lpfc/lpfc_debugfs.c ---- linux-2.6.38.7/drivers/scsi/lpfc/lpfc_debugfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/lpfc/lpfc_debugfs.c 2011-05-16 21:47:08.000000000 -0400 +diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h +index 746dd3d..26ec905 100644 +--- a/drivers/scsi/lpfc/lpfc.h ++++ b/drivers/scsi/lpfc/lpfc.h +@@ -414,7 +414,7 @@ struct lpfc_vport { + struct dentry *debug_nodelist; + struct dentry *vport_debugfs_root; + struct lpfc_debugfs_trc *disc_trc; +- atomic_t disc_trc_cnt; ++ atomic_unchecked_t disc_trc_cnt; + #endif + uint8_t stat_data_enabled; + uint8_t stat_data_blocked; +@@ -776,8 +776,8 @@ struct lpfc_hba { + struct timer_list fabric_block_timer; + unsigned long bit_flags; + #define FABRIC_COMANDS_BLOCKED 0 +- atomic_t num_rsrc_err; +- atomic_t num_cmd_success; ++ atomic_unchecked_t num_rsrc_err; ++ atomic_unchecked_t num_cmd_success; + unsigned long last_rsrc_error_time; + unsigned long last_ramp_down_time; + unsigned long last_ramp_up_time; +@@ -791,7 +791,7 @@ struct lpfc_hba { + struct dentry *debug_dumpDif; /* BlockGuard BPL*/ + struct dentry *debug_slow_ring_trc; + struct lpfc_debugfs_trc *slow_ring_trc; +- atomic_t slow_ring_trc_cnt; ++ atomic_unchecked_t slow_ring_trc_cnt; + #endif + + /* Used for deferred freeing of ELS data buffers */ +diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c +index a80d938..1812f41 100644 +--- a/drivers/scsi/lpfc/lpfc_debugfs.c ++++ b/drivers/scsi/lpfc/lpfc_debugfs.c @@ -125,7 +125,7 @@ struct lpfc_debug { int len; }; @@ -32933,7 +33779,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.38.7/driver static unsigned long lpfc_debugfs_start_time = 0L; /** -@@ -159,7 +159,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_v +@@ -159,7 +159,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size) lpfc_debugfs_enable = 0; len = 0; @@ -32942,7 +33788,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.38.7/driver (lpfc_debugfs_max_disc_trc - 1); for (i = index; i < lpfc_debugfs_max_disc_trc; i++) { dtp = vport->disc_trc + i; -@@ -220,7 +220,7 @@ lpfc_debugfs_slow_ring_trc_data(struct l +@@ -220,7 +220,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size) lpfc_debugfs_enable = 0; len = 0; @@ -32951,7 +33797,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.38.7/driver (lpfc_debugfs_max_slow_ring_trc - 1); for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) { dtp = phba->slow_ring_trc + i; -@@ -398,6 +398,8 @@ lpfc_debugfs_dumpHBASlim_data(struct lpf +@@ -398,6 +398,8 @@ lpfc_debugfs_dumpHBASlim_data(struct lpfc_hba *phba, char *buf, int size) uint32_t *ptr; char buffer[1024]; @@ -32960,7 +33806,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.38.7/driver off = 0; spin_lock_irq(&phba->hbalock); -@@ -635,14 +637,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport +@@ -635,14 +637,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt, !vport || !vport->disc_trc) return; @@ -32977,7 +33823,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.38.7/driver dtp->jif = jiffies; #endif return; -@@ -673,14 +675,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_h +@@ -673,14 +675,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt, !phba || !phba->slow_ring_trc) return; @@ -32994,7 +33840,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.38.7/driver dtp->jif = jiffies; #endif return; -@@ -1365,7 +1367,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor +@@ -1365,7 +1367,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport) "slow_ring buffer\n"); goto debug_failed; } @@ -33003,7 +33849,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.38.7/driver memset(phba->slow_ring_trc, 0, (sizeof(struct lpfc_debugfs_trc) * lpfc_debugfs_max_slow_ring_trc)); -@@ -1411,7 +1413,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor +@@ -1411,7 +1413,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport) "buffer\n"); goto debug_failed; } @@ -33012,42 +33858,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.38.7/driver snprintf(name, sizeof(name), "discovery_trace"); vport->debug_disc_trc = -diff -urNp linux-2.6.38.7/drivers/scsi/lpfc/lpfc.h linux-2.6.38.7/drivers/scsi/lpfc/lpfc.h ---- linux-2.6.38.7/drivers/scsi/lpfc/lpfc.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/lpfc/lpfc.h 2011-04-28 19:57:25.000000000 -0400 -@@ -414,7 +414,7 @@ struct lpfc_vport { - struct dentry *debug_nodelist; - struct dentry *vport_debugfs_root; - struct lpfc_debugfs_trc *disc_trc; -- atomic_t disc_trc_cnt; -+ atomic_unchecked_t disc_trc_cnt; - #endif - uint8_t stat_data_enabled; - uint8_t stat_data_blocked; -@@ -776,8 +776,8 @@ struct lpfc_hba { - struct timer_list fabric_block_timer; - unsigned long bit_flags; - #define FABRIC_COMANDS_BLOCKED 0 -- atomic_t num_rsrc_err; -- atomic_t num_cmd_success; -+ atomic_unchecked_t num_rsrc_err; -+ atomic_unchecked_t num_cmd_success; - unsigned long last_rsrc_error_time; - unsigned long last_ramp_down_time; - unsigned long last_ramp_up_time; -@@ -791,7 +791,7 @@ struct lpfc_hba { - struct dentry *debug_dumpDif; /* BlockGuard BPL*/ - struct dentry *debug_slow_ring_trc; - struct lpfc_debugfs_trc *slow_ring_trc; -- atomic_t slow_ring_trc_cnt; -+ atomic_unchecked_t slow_ring_trc_cnt; - #endif - - /* Used for deferred freeing of ELS data buffers */ -diff -urNp linux-2.6.38.7/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.38.7/drivers/scsi/lpfc/lpfc_scsi.c ---- linux-2.6.38.7/drivers/scsi/lpfc/lpfc_scsi.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/lpfc/lpfc_scsi.c 2011-04-28 19:57:25.000000000 -0400 -@@ -297,7 +297,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb +diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c +index c97751c..8bc92d7 100644 +--- a/drivers/scsi/lpfc/lpfc_scsi.c ++++ b/drivers/scsi/lpfc/lpfc_scsi.c +@@ -297,7 +297,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba) uint32_t evt_posted; spin_lock_irqsave(&phba->hbalock, flags); @@ -33056,7 +33871,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.38.7/drivers/s phba->last_rsrc_error_time = jiffies; if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) { -@@ -338,7 +338,7 @@ lpfc_rampup_queue_depth(struct lpfc_vpor +@@ -338,7 +338,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport, unsigned long flags; struct lpfc_hba *phba = vport->phba; uint32_t evt_posted; @@ -33065,7 +33880,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.38.7/drivers/s if (vport->cfg_lun_queue_depth <= queue_depth) return; -@@ -382,8 +382,8 @@ lpfc_ramp_down_queue_handler(struct lpfc +@@ -382,8 +382,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba) unsigned long num_rsrc_err, num_cmd_success; int i; @@ -33076,7 +33891,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.38.7/drivers/s vports = lpfc_create_vport_work_array(phba); if (vports != NULL) -@@ -403,8 +403,8 @@ lpfc_ramp_down_queue_handler(struct lpfc +@@ -403,8 +403,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba) } } lpfc_destroy_vport_work_array(phba, vports); @@ -33087,7 +33902,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.38.7/drivers/s } /** -@@ -438,8 +438,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_h +@@ -438,8 +438,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba) } } lpfc_destroy_vport_work_array(phba, vports); @@ -33098,10 +33913,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.38.7/drivers/s } /** -diff -urNp linux-2.6.38.7/drivers/scsi/megaraid/megaraid_mbox.c linux-2.6.38.7/drivers/scsi/megaraid/megaraid_mbox.c ---- linux-2.6.38.7/drivers/scsi/megaraid/megaraid_mbox.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/megaraid/megaraid_mbox.c 2011-05-16 21:47:08.000000000 -0400 -@@ -3510,6 +3510,8 @@ megaraid_cmm_register(adapter_t *adapter +diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c +index 5708cb2..40488d3 100644 +--- a/drivers/scsi/megaraid/megaraid_mbox.c ++++ b/drivers/scsi/megaraid/megaraid_mbox.c +@@ -3510,6 +3510,8 @@ megaraid_cmm_register(adapter_t *adapter) int rval; int i; @@ -33110,10 +33926,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/megaraid/megaraid_mbox.c linux-2.6.38.7/d // Allocate memory for the base list of scb for management module. adapter->uscb_list = kcalloc(MBOX_MAX_USER_CMDS, sizeof(scb_t), GFP_KERNEL); -diff -urNp linux-2.6.38.7/drivers/scsi/osd/osd_initiator.c linux-2.6.38.7/drivers/scsi/osd/osd_initiator.c ---- linux-2.6.38.7/drivers/scsi/osd/osd_initiator.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/osd/osd_initiator.c 2011-05-16 21:47:08.000000000 -0400 -@@ -97,6 +97,8 @@ static int _osd_get_print_system_info(st +diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c +index b37c8a3..1068773 100644 +--- a/drivers/scsi/osd/osd_initiator.c ++++ b/drivers/scsi/osd/osd_initiator.c +@@ -97,6 +97,8 @@ static int _osd_get_print_system_info(struct osd_dev *od, int nelem = ARRAY_SIZE(get_attrs), a = 0; int ret; @@ -33122,10 +33939,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/osd/osd_initiator.c linux-2.6.38.7/driver or = osd_start_request(od, GFP_KERNEL); if (!or) return -ENOMEM; -diff -urNp linux-2.6.38.7/drivers/scsi/pmcraid.c linux-2.6.38.7/drivers/scsi/pmcraid.c ---- linux-2.6.38.7/drivers/scsi/pmcraid.c 2011-05-10 22:06:29.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/pmcraid.c 2011-05-10 22:08:57.000000000 -0400 -@@ -201,8 +201,8 @@ static int pmcraid_slave_alloc(struct sc +diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c +index ce0701d..9b7fefe 100644 +--- a/drivers/scsi/pmcraid.c ++++ b/drivers/scsi/pmcraid.c +@@ -201,8 +201,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev) res->scsi_dev = scsi_dev; scsi_dev->hostdata = res; res->change_detected = 0; @@ -33136,7 +33954,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/pmcraid.c linux-2.6.38.7/drivers/scsi/pmc rc = 0; } spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags); -@@ -2677,9 +2677,9 @@ static int pmcraid_error_handler(struct +@@ -2677,9 +2677,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd) /* If this was a SCSI read/write command keep count of errors */ if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD) @@ -33166,7 +33984,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/pmcraid.c linux-2.6.38.7/drivers/scsi/pmc pinstance->num_hrrq; if (request_size) { -@@ -4495,7 +4495,7 @@ static void pmcraid_worker_function(stru +@@ -4495,7 +4495,7 @@ static void pmcraid_worker_function(struct work_struct *workp) pinstance = container_of(workp, struct pmcraid_instance, worker_q); /* add resources only after host is added into system */ @@ -33175,7 +33993,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/pmcraid.c linux-2.6.38.7/drivers/scsi/pmc return; fw_version = be16_to_cpu(pinstance->inq_data->fw_version); -@@ -5329,8 +5329,8 @@ static int __devinit pmcraid_init_instan +@@ -5329,8 +5329,8 @@ static int __devinit pmcraid_init_instance( init_waitqueue_head(&pinstance->reset_wait_q); atomic_set(&pinstance->outstanding_cmds, 0); @@ -33195,9 +34013,10 @@ diff -urNp linux-2.6.38.7/drivers/scsi/pmcraid.c linux-2.6.38.7/drivers/scsi/pmc schedule_work(&pinstance->worker_q); return rc; -diff -urNp linux-2.6.38.7/drivers/scsi/pmcraid.h linux-2.6.38.7/drivers/scsi/pmcraid.h ---- linux-2.6.38.7/drivers/scsi/pmcraid.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/pmcraid.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h +index 4db210d..9c7857c 100644 +--- a/drivers/scsi/pmcraid.h ++++ b/drivers/scsi/pmcraid.h @@ -750,7 +750,7 @@ struct pmcraid_instance { struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS]; @@ -33227,10 +34046,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/pmcraid.h linux-2.6.38.7/drivers/scsi/pmc /* To indicate add/delete/modify during CCN */ u8 change_detected; -diff -urNp linux-2.6.38.7/drivers/scsi/qla2xxx/qla_os.c linux-2.6.38.7/drivers/scsi/qla2xxx/qla_os.c ---- linux-2.6.38.7/drivers/scsi/qla2xxx/qla_os.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/qla2xxx/qla_os.c 2011-04-28 19:34:15.000000000 -0400 -@@ -4096,7 +4096,7 @@ static struct pci_driver qla2xxx_pci_dri +diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c +index 8f823bd..197f449 100644 +--- a/drivers/scsi/qla2xxx/qla_os.c ++++ b/drivers/scsi/qla2xxx/qla_os.c +@@ -4102,7 +4102,7 @@ static struct pci_driver qla2xxx_pci_driver = { .err_handler = &qla2xxx_err_handler, }; @@ -33239,9 +34059,10 @@ diff -urNp linux-2.6.38.7/drivers/scsi/qla2xxx/qla_os.c linux-2.6.38.7/drivers/s .owner = THIS_MODULE, .llseek = noop_llseek, }; -diff -urNp linux-2.6.38.7/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.38.7/drivers/scsi/qla4xxx/ql4_def.h ---- linux-2.6.38.7/drivers/scsi/qla4xxx/ql4_def.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/qla4xxx/ql4_def.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h +index 2fc0045..8b41140 100644 +--- a/drivers/scsi/qla4xxx/ql4_def.h ++++ b/drivers/scsi/qla4xxx/ql4_def.h @@ -256,7 +256,7 @@ struct ddb_entry { atomic_t retry_relogin_timer; /* Min Time between relogins * (4000 only) */ @@ -33251,10 +34072,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.38.7/drivers/ * retried */ uint16_t port; -diff -urNp linux-2.6.38.7/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.38.7/drivers/scsi/qla4xxx/ql4_init.c ---- linux-2.6.38.7/drivers/scsi/qla4xxx/ql4_init.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/qla4xxx/ql4_init.c 2011-04-28 19:57:25.000000000 -0400 -@@ -680,7 +680,7 @@ static struct ddb_entry * qla4xxx_alloc_ +diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c +index 1629c48..fa891b2 100644 +--- a/drivers/scsi/qla4xxx/ql4_init.c ++++ b/drivers/scsi/qla4xxx/ql4_init.c +@@ -680,7 +680,7 @@ static struct ddb_entry * qla4xxx_alloc_ddb(struct scsi_qla_host *ha, ddb_entry->fw_ddb_index = fw_ddb_index; atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY); atomic_set(&ddb_entry->relogin_timer, 0); @@ -33263,7 +34085,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.38.7/drivers atomic_set(&ddb_entry->state, DDB_STATE_ONLINE); list_add_tail(&ddb_entry->list, &ha->ddb_list); ha->fw_ddb_index_map[fw_ddb_index] = ddb_entry; -@@ -1570,7 +1570,7 @@ int qla4xxx_process_ddb_changed(struct s +@@ -1570,7 +1570,7 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha, uint32_t fw_ddb_index, /* Device is back online. */ if (ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_ACTIVE) { atomic_set(&ddb_entry->state, DDB_STATE_ONLINE); @@ -33272,10 +34094,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.38.7/drivers atomic_set(&ddb_entry->relogin_timer, 0); clear_bit(DF_RELOGIN, &ddb_entry->flags); clear_bit(DF_NO_RELOGIN, &ddb_entry->flags); -diff -urNp linux-2.6.38.7/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.38.7/drivers/scsi/qla4xxx/ql4_os.c ---- linux-2.6.38.7/drivers/scsi/qla4xxx/ql4_os.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/qla4xxx/ql4_os.c 2011-04-28 19:57:25.000000000 -0400 -@@ -801,13 +801,13 @@ static void qla4xxx_timer(struct scsi_ql +diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c +index 3fc1d25..febec1a 100644 +--- a/drivers/scsi/qla4xxx/ql4_os.c ++++ b/drivers/scsi/qla4xxx/ql4_os.c +@@ -801,13 +801,13 @@ static void qla4xxx_timer(struct scsi_qla_host *ha) ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_FAILED) { /* Reset retry relogin timer */ @@ -33291,10 +34114,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.38.7/drivers/s relogin_retry_count)) ); start_dpc++; -diff -urNp linux-2.6.38.7/drivers/scsi/scsi.c linux-2.6.38.7/drivers/scsi/scsi.c ---- linux-2.6.38.7/drivers/scsi/scsi.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/scsi.c 2011-04-28 19:57:25.000000000 -0400 -@@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd * +diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c +index 2aeb2e9..46e3925 100644 +--- a/drivers/scsi/scsi.c ++++ b/drivers/scsi/scsi.c +@@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd) unsigned long timeout; int rtn = 0; @@ -33303,10 +34127,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/scsi.c linux-2.6.38.7/drivers/scsi/scsi.c /* check if the device is still usable */ if (unlikely(cmd->device->sdev_state == SDEV_DEL)) { -diff -urNp linux-2.6.38.7/drivers/scsi/scsi_debug.c linux-2.6.38.7/drivers/scsi/scsi_debug.c ---- linux-2.6.38.7/drivers/scsi/scsi_debug.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/scsi_debug.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1476,6 +1476,8 @@ static int resp_mode_select(struct scsi_ +diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c +index a6b2d72..e0aded7 100644 +--- a/drivers/scsi/scsi_debug.c ++++ b/drivers/scsi/scsi_debug.c +@@ -1476,6 +1476,8 @@ static int resp_mode_select(struct scsi_cmnd * scp, int mselect6, unsigned char arr[SDEBUG_MAX_MSELECT_SZ]; unsigned char *cmd = (unsigned char *)scp->cmnd; @@ -33315,7 +34140,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/scsi_debug.c linux-2.6.38.7/drivers/scsi/ if ((errsts = check_readiness(scp, 1, devip))) return errsts; memset(arr, 0, sizeof(arr)); -@@ -1573,6 +1575,8 @@ static int resp_log_sense(struct scsi_cm +@@ -1573,6 +1575,8 @@ static int resp_log_sense(struct scsi_cmnd * scp, unsigned char arr[SDEBUG_MAX_LSENSE_SZ]; unsigned char *cmd = (unsigned char *)scp->cmnd; @@ -33324,10 +34149,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/scsi_debug.c linux-2.6.38.7/drivers/scsi/ if ((errsts = check_readiness(scp, 1, devip))) return errsts; memset(arr, 0, sizeof(arr)); -diff -urNp linux-2.6.38.7/drivers/scsi/scsi_lib.c linux-2.6.38.7/drivers/scsi/scsi_lib.c ---- linux-2.6.38.7/drivers/scsi/scsi_lib.c 2011-05-10 22:06:29.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/scsi_lib.c 2011-05-10 22:08:57.000000000 -0400 -@@ -1381,7 +1381,7 @@ static void scsi_kill_request(struct req +diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c +index 415fdf2..262e2e9 100644 +--- a/drivers/scsi/scsi_lib.c ++++ b/drivers/scsi/scsi_lib.c +@@ -1381,7 +1381,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q) shost = sdev->host; scsi_init_cmd_errh(cmd); cmd->result = DID_NO_CONNECT << 16; @@ -33336,7 +34162,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/scsi_lib.c linux-2.6.38.7/drivers/scsi/sc /* * SCSI request completion path will do scsi_device_unbusy(), -@@ -1407,9 +1407,9 @@ static void scsi_softirq_done(struct req +@@ -1407,9 +1407,9 @@ static void scsi_softirq_done(struct request *rq) INIT_LIST_HEAD(&cmd->eh_entry); @@ -33348,10 +34174,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/scsi_lib.c linux-2.6.38.7/drivers/scsi/sc disposition = scsi_decide_disposition(cmd); if (disposition != SUCCESS && -diff -urNp linux-2.6.38.7/drivers/scsi/scsi_sysfs.c linux-2.6.38.7/drivers/scsi/scsi_sysfs.c ---- linux-2.6.38.7/drivers/scsi/scsi_sysfs.c 2011-05-10 22:06:29.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/scsi_sysfs.c 2011-05-10 22:08:57.000000000 -0400 -@@ -621,7 +621,7 @@ show_iostat_##field(struct device *dev, +diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c +index 360b7cb..b310124 100644 +--- a/drivers/scsi/scsi_sysfs.c ++++ b/drivers/scsi/scsi_sysfs.c +@@ -621,7 +621,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \ char *buf) \ { \ struct scsi_device *sdev = to_scsi_device(dev); \ @@ -33360,10 +34187,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/scsi_sysfs.c linux-2.6.38.7/drivers/scsi/ return snprintf(buf, 20, "0x%llx\n", count); \ } \ static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL) -diff -urNp linux-2.6.38.7/drivers/scsi/scsi_transport_fc.c linux-2.6.38.7/drivers/scsi/scsi_transport_fc.c ---- linux-2.6.38.7/drivers/scsi/scsi_transport_fc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/scsi_transport_fc.c 2011-04-28 19:57:25.000000000 -0400 -@@ -485,7 +485,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_ +diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c +index 5c3ccfc..c31ffe1 100644 +--- a/drivers/scsi/scsi_transport_fc.c ++++ b/drivers/scsi/scsi_transport_fc.c +@@ -485,7 +485,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class, * Netlink Infrastructure */ @@ -33381,7 +34209,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/scsi_transport_fc.c linux-2.6.38.7/driver } EXPORT_SYMBOL(fc_get_event_number); -@@ -646,7 +646,7 @@ static __init int fc_transport_init(void +@@ -646,7 +646,7 @@ static __init int fc_transport_init(void) { int error; @@ -33390,7 +34218,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/scsi_transport_fc.c linux-2.6.38.7/driver error = transport_class_register(&fc_host_class); if (error) -@@ -836,7 +836,7 @@ static int fc_str_to_dev_loss(const char +@@ -836,7 +836,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val) char *cp; *val = simple_strtoul(buf, &cp, 0); @@ -33399,9 +34227,10 @@ diff -urNp linux-2.6.38.7/drivers/scsi/scsi_transport_fc.c linux-2.6.38.7/driver return -EINVAL; /* * Check for overflow; dev_loss_tmo is u32 -diff -urNp linux-2.6.38.7/drivers/scsi/scsi_transport_iscsi.c linux-2.6.38.7/drivers/scsi/scsi_transport_iscsi.c ---- linux-2.6.38.7/drivers/scsi/scsi_transport_iscsi.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/scsi_transport_iscsi.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c +index 01543d2..9491fa7 100644 +--- a/drivers/scsi/scsi_transport_iscsi.c ++++ b/drivers/scsi/scsi_transport_iscsi.c @@ -83,7 +83,7 @@ struct iscsi_internal { struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1]; }; @@ -33411,7 +34240,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/scsi_transport_iscsi.c linux-2.6.38.7/dri static struct workqueue_struct *iscsi_eh_timer_workq; /* -@@ -761,7 +761,7 @@ int iscsi_add_session(struct iscsi_cls_s +@@ -761,7 +761,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id) int err; ihost = shost->shost_data; @@ -33420,7 +34249,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/scsi_transport_iscsi.c linux-2.6.38.7/dri if (id == ISCSI_MAX_TARGET) { for (id = 0; id < ISCSI_MAX_TARGET; id++) { -@@ -2130,7 +2130,7 @@ static __init int iscsi_transport_init(v +@@ -2130,7 +2130,7 @@ static __init int iscsi_transport_init(void) printk(KERN_INFO "Loading iSCSI transport class v%s.\n", ISCSI_TRANSPORT_VERSION); @@ -33429,9 +34258,10 @@ diff -urNp linux-2.6.38.7/drivers/scsi/scsi_transport_iscsi.c linux-2.6.38.7/dri err = class_register(&iscsi_transport_class); if (err) -diff -urNp linux-2.6.38.7/drivers/scsi/scsi_transport_srp.c linux-2.6.38.7/drivers/scsi/scsi_transport_srp.c ---- linux-2.6.38.7/drivers/scsi/scsi_transport_srp.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/scsi_transport_srp.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c +index 21a045e..ec89e03 100644 +--- a/drivers/scsi/scsi_transport_srp.c ++++ b/drivers/scsi/scsi_transport_srp.c @@ -33,7 +33,7 @@ #include "scsi_transport_srp_internal.h" @@ -33441,7 +34271,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/scsi_transport_srp.c linux-2.6.38.7/drive }; #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data) -@@ -62,7 +62,7 @@ static int srp_host_setup(struct transpo +@@ -62,7 +62,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev, struct Scsi_Host *shost = dev_to_shost(dev); struct srp_host_attrs *srp_host = to_srp_host_attrs(shost); @@ -33450,7 +34280,7 @@ diff -urNp linux-2.6.38.7/drivers/scsi/scsi_transport_srp.c linux-2.6.38.7/drive return 0; } -@@ -211,7 +211,7 @@ struct srp_rport *srp_rport_add(struct S +@@ -211,7 +211,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost, memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id)); rport->roles = ids->roles; @@ -33459,9 +34289,10 @@ diff -urNp linux-2.6.38.7/drivers/scsi/scsi_transport_srp.c linux-2.6.38.7/drive dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id); transport_setup_device(&rport->dev); -diff -urNp linux-2.6.38.7/drivers/scsi/sg.c linux-2.6.38.7/drivers/scsi/sg.c ---- linux-2.6.38.7/drivers/scsi/sg.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/sg.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c +index 909ed9e..a481c74 100644 +--- a/drivers/scsi/sg.c ++++ b/drivers/scsi/sg.c @@ -2310,7 +2310,7 @@ struct sg_proc_leaf { const struct file_operations * fops; }; @@ -33480,10 +34311,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/sg.c linux-2.6.38.7/drivers/scsi/sg.c sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); if (!sg_proc_sgp) -diff -urNp linux-2.6.38.7/drivers/scsi/sym53c8xx_2/sym_glue.c linux-2.6.38.7/drivers/scsi/sym53c8xx_2/sym_glue.c ---- linux-2.6.38.7/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1756,6 +1756,8 @@ static int __devinit sym2_probe(struct p +diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c +index b4543f5..e1b34b8 100644 +--- a/drivers/scsi/sym53c8xx_2/sym_glue.c ++++ b/drivers/scsi/sym53c8xx_2/sym_glue.c +@@ -1756,6 +1756,8 @@ static int __devinit sym2_probe(struct pci_dev *pdev, int do_iounmap = 0; int do_disable_device = 1; @@ -33492,10 +34324,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/sym53c8xx_2/sym_glue.c linux-2.6.38.7/dri memset(&sym_dev, 0, sizeof(sym_dev)); memset(&nvram, 0, sizeof(nvram)); sym_dev.pdev = pdev; -diff -urNp linux-2.6.38.7/drivers/scsi/vmw_pvscsi.c linux-2.6.38.7/drivers/scsi/vmw_pvscsi.c ---- linux-2.6.38.7/drivers/scsi/vmw_pvscsi.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/scsi/vmw_pvscsi.c 2011-05-16 21:47:08.000000000 -0400 -@@ -447,6 +447,8 @@ static void pvscsi_setup_all_rings(const +diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c +index a18996d..fe993cb 100644 +--- a/drivers/scsi/vmw_pvscsi.c ++++ b/drivers/scsi/vmw_pvscsi.c +@@ -447,6 +447,8 @@ static void pvscsi_setup_all_rings(const struct pvscsi_adapter *adapter) dma_addr_t base; unsigned i; @@ -33504,10 +34337,11 @@ diff -urNp linux-2.6.38.7/drivers/scsi/vmw_pvscsi.c linux-2.6.38.7/drivers/scsi/ cmd.ringsStatePPN = adapter->ringStatePA >> PAGE_SHIFT; cmd.reqRingNumPages = adapter->req_pages; cmd.cmpRingNumPages = adapter->cmp_pages; -diff -urNp linux-2.6.38.7/drivers/spi/spi.c linux-2.6.38.7/drivers/spi/spi.c ---- linux-2.6.38.7/drivers/spi/spi.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/spi/spi.c 2011-05-11 18:34:57.000000000 -0400 -@@ -1023,7 +1023,7 @@ int spi_bus_unlock(struct spi_master *ma +diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c +index 34bb17f..0048b09 100644 +--- a/drivers/spi/spi.c ++++ b/drivers/spi/spi.c +@@ -1023,7 +1023,7 @@ int spi_bus_unlock(struct spi_master *master) EXPORT_SYMBOL_GPL(spi_bus_unlock); /* portable code must never pass more than 32 bytes */ @@ -33516,10 +34350,11 @@ diff -urNp linux-2.6.38.7/drivers/spi/spi.c linux-2.6.38.7/drivers/spi/spi.c static u8 *buf; -diff -urNp linux-2.6.38.7/drivers/staging/autofs/root.c linux-2.6.38.7/drivers/staging/autofs/root.c ---- linux-2.6.38.7/drivers/staging/autofs/root.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/autofs/root.c 2011-04-28 19:34:15.000000000 -0400 -@@ -311,7 +311,8 @@ static int autofs_root_symlink(struct in +diff --git a/drivers/staging/autofs/root.c b/drivers/staging/autofs/root.c +index bf0e975..8c52ab48 100644 +--- a/drivers/staging/autofs/root.c ++++ b/drivers/staging/autofs/root.c +@@ -311,7 +311,8 @@ static int autofs_root_symlink(struct inode *dir, struct dentry *dentry, const c set_bit(n,sbi->symlink_bitmap); sl = &sbi->symlink[n]; sl->len = strlen(symname); @@ -33529,10 +34364,11 @@ diff -urNp linux-2.6.38.7/drivers/staging/autofs/root.c linux-2.6.38.7/drivers/s if (!sl->data) { clear_bit(n,sbi->symlink_bitmap); unlock_kernel(); -diff -urNp linux-2.6.38.7/drivers/staging/bcm/Bcmchar.c linux-2.6.38.7/drivers/staging/bcm/Bcmchar.c ---- linux-2.6.38.7/drivers/staging/bcm/Bcmchar.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/bcm/Bcmchar.c 2011-04-28 19:34:15.000000000 -0400 -@@ -2093,7 +2093,7 @@ static long bcm_char_ioctl(struct file * +diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c +index 31674ea..2186ab2 100644 +--- a/drivers/staging/bcm/Bcmchar.c ++++ b/drivers/staging/bcm/Bcmchar.c +@@ -2093,7 +2093,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) } @@ -33541,9 +34377,10 @@ diff -urNp linux-2.6.38.7/drivers/staging/bcm/Bcmchar.c linux-2.6.38.7/drivers/s .owner = THIS_MODULE, .open = bcm_char_open, .release = bcm_char_release, -diff -urNp linux-2.6.38.7/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2.6.38.7/drivers/staging/brcm80211/brcmfmac/dhd_linux.c ---- linux-2.6.38.7/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +index db45083..f52a544 100644 +--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c ++++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -863,14 +863,14 @@ static void dhd_op_if(dhd_if_t *ifp) free_netdev(ifp->net); } @@ -33561,7 +34398,7 @@ diff -urNp linux-2.6.38.7/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2 err = dhd_net_attach(&dhd->pub, ifp->idx); if (err != 0) { DHD_ERROR(("%s: dhd_net_attach failed, " -@@ -1969,25 +1969,23 @@ dhd_pub_t *dhd_attach(struct osl_info *o +@@ -1969,25 +1969,23 @@ dhd_pub_t *dhd_attach(struct osl_info *osh, struct dhd_bus *bus, strcpy(nv_path, nvram_path); /* Allocate etherdev, including space for private structure */ @@ -33590,7 +34427,7 @@ diff -urNp linux-2.6.38.7/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2 dhd->pub.osh = osh; /* Set network interface name if it was provided as module parameter */ -@@ -2105,7 +2103,7 @@ dhd_pub_t *dhd_attach(struct osl_info *o +@@ -2105,7 +2103,7 @@ dhd_pub_t *dhd_attach(struct osl_info *osh, struct dhd_bus *bus, /* * Save the dhd_info into the priv */ @@ -33599,9 +34436,10 @@ diff -urNp linux-2.6.38.7/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2 #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC) g_bus = bus; -diff -urNp linux-2.6.38.7/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.38.7/drivers/staging/brcm80211/brcmfmac/wl_iw.c ---- linux-2.6.38.7/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c +index db6e68e..1ef5977 100644 +--- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c ++++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c @@ -513,7 +513,7 @@ wl_iw_get_range(struct net_device *dev, list = (wl_u32_list_t *) channels; @@ -33611,10 +34449,11 @@ diff -urNp linux-2.6.38.7/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.3 range->min_nwid = range->max_nwid = 0; -diff -urNp linux-2.6.38.7/drivers/staging/comedi/comedi_fops.c linux-2.6.38.7/drivers/staging/comedi/comedi_fops.c ---- linux-2.6.38.7/drivers/staging/comedi/comedi_fops.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/comedi/comedi_fops.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1426,7 +1426,7 @@ static void comedi_unmap(struct vm_area_ +diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c +index 093032b..02a13ad 100644 +--- a/drivers/staging/comedi/comedi_fops.c ++++ b/drivers/staging/comedi/comedi_fops.c +@@ -1426,7 +1426,7 @@ static void comedi_unmap(struct vm_area_struct *area) mutex_unlock(&dev->mutex); } @@ -33623,10 +34462,11 @@ diff -urNp linux-2.6.38.7/drivers/staging/comedi/comedi_fops.c linux-2.6.38.7/dr .close = comedi_unmap, }; -diff -urNp linux-2.6.38.7/drivers/staging/et131x/et1310_tx.c linux-2.6.38.7/drivers/staging/et131x/et1310_tx.c ---- linux-2.6.38.7/drivers/staging/et131x/et1310_tx.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/et131x/et1310_tx.c 2011-04-28 19:57:25.000000000 -0400 -@@ -635,11 +635,11 @@ inline void et131x_free_send_packet(stru +diff --git a/drivers/staging/et131x/et1310_tx.c b/drivers/staging/et131x/et1310_tx.c +index 0f3473d..11f9411 100644 +--- a/drivers/staging/et131x/et1310_tx.c ++++ b/drivers/staging/et131x/et1310_tx.c +@@ -635,11 +635,11 @@ inline void et131x_free_send_packet(struct et131x_adapter *etdev, struct net_device_stats *stats = &etdev->net_stats; if (tcb->flags & fMP_DEST_BROAD) @@ -33641,9 +34481,10 @@ diff -urNp linux-2.6.38.7/drivers/staging/et131x/et1310_tx.c linux-2.6.38.7/driv if (tcb->skb) { stats->tx_bytes += tcb->skb->len; -diff -urNp linux-2.6.38.7/drivers/staging/et131x/et131x_adapter.h linux-2.6.38.7/drivers/staging/et131x/et131x_adapter.h ---- linux-2.6.38.7/drivers/staging/et131x/et131x_adapter.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/et131x/et131x_adapter.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h +index 64a678f..724a95c 100644 +--- a/drivers/staging/et131x/et131x_adapter.h ++++ b/drivers/staging/et131x/et131x_adapter.h @@ -112,11 +112,11 @@ typedef struct _ce_stats_t { * operations */ @@ -33659,9 +34500,10 @@ diff -urNp linux-2.6.38.7/drivers/staging/et131x/et131x_adapter.h linux-2.6.38.7 u32 norcvbuf; /* # Rx packets discarded */ u32 noxmtbuf; /* # Tx packets discarded */ -diff -urNp linux-2.6.38.7/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c linux-2.6.38.7/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c ---- linux-2.6.38.7/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +index 149ba59..ef6403b 100644 +--- a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c ++++ b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c @@ -55,7 +55,7 @@ int numofmsgbuf = 0; // // Table of entry-point routines for char device @@ -33671,10 +34513,11 @@ diff -urNp linux-2.6.38.7/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c linux { .unlocked_ioctl = ft1000_ioctl, .poll = ft1000_poll_dev, -diff -urNp linux-2.6.38.7/drivers/staging/go7007/go7007-v4l2.c linux-2.6.38.7/drivers/staging/go7007/go7007-v4l2.c ---- linux-2.6.38.7/drivers/staging/go7007/go7007-v4l2.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/go7007/go7007-v4l2.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1672,7 +1672,7 @@ static int go7007_vm_fault(struct vm_are +diff --git a/drivers/staging/go7007/go7007-v4l2.c b/drivers/staging/go7007/go7007-v4l2.c +index 2b27d8d..245b243 100644 +--- a/drivers/staging/go7007/go7007-v4l2.c ++++ b/drivers/staging/go7007/go7007-v4l2.c +@@ -1672,7 +1672,7 @@ static int go7007_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) return 0; } @@ -33683,10 +34526,11 @@ diff -urNp linux-2.6.38.7/drivers/staging/go7007/go7007-v4l2.c linux-2.6.38.7/dr .open = go7007_vm_open, .close = go7007_vm_close, .fault = go7007_vm_fault, -diff -urNp linux-2.6.38.7/drivers/staging/hv/channel.c linux-2.6.38.7/drivers/staging/hv/channel.c ---- linux-2.6.38.7/drivers/staging/hv/channel.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/hv/channel.c 2011-04-28 19:57:25.000000000 -0400 -@@ -501,8 +501,8 @@ int vmbus_establish_gpadl(struct vmbus_c +diff --git a/drivers/staging/hv/channel.c b/drivers/staging/hv/channel.c +index 09e596a..d7fa427 100644 +--- a/drivers/staging/hv/channel.c ++++ b/drivers/staging/hv/channel.c +@@ -501,8 +501,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer, unsigned long flags; int ret = 0; @@ -33697,10 +34541,11 @@ diff -urNp linux-2.6.38.7/drivers/staging/hv/channel.c linux-2.6.38.7/drivers/st ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount); if (ret) -diff -urNp linux-2.6.38.7/drivers/staging/hv/hv.c linux-2.6.38.7/drivers/staging/hv/hv.c ---- linux-2.6.38.7/drivers/staging/hv/hv.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/hv/hv.c 2011-04-28 19:34:15.000000000 -0400 -@@ -163,7 +163,7 @@ static u64 do_hypercall(u64 control, voi +diff --git a/drivers/staging/hv/hv.c b/drivers/staging/hv/hv.c +index a34d713..c43c648 100644 +--- a/drivers/staging/hv/hv.c ++++ b/drivers/staging/hv/hv.c +@@ -163,7 +163,7 @@ static u64 do_hypercall(u64 control, void *input, void *output) u64 output_address = (output) ? virt_to_phys(output) : 0; u32 output_address_hi = output_address >> 32; u32 output_address_lo = output_address & 0xFFFFFFFF; @@ -33709,9 +34554,10 @@ diff -urNp linux-2.6.38.7/drivers/staging/hv/hv.c linux-2.6.38.7/drivers/staging DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>", control, input, output); -diff -urNp linux-2.6.38.7/drivers/staging/hv/rndis_filter.c linux-2.6.38.7/drivers/staging/hv/rndis_filter.c ---- linux-2.6.38.7/drivers/staging/hv/rndis_filter.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/hv/rndis_filter.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c +index 53676dc..71909cf 100644 +--- a/drivers/staging/hv/rndis_filter.c ++++ b/drivers/staging/hv/rndis_filter.c @@ -47,7 +47,7 @@ struct rndis_device { enum rndis_device_state state; @@ -33721,7 +34567,7 @@ diff -urNp linux-2.6.38.7/drivers/staging/hv/rndis_filter.c linux-2.6.38.7/drive spinlock_t request_lock; struct list_head req_list; -@@ -145,7 +145,7 @@ static struct rndis_request *get_rndis_r +@@ -145,7 +145,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev, * template */ set = &rndis_msg->msg.set_req; @@ -33730,7 +34576,7 @@ diff -urNp linux-2.6.38.7/drivers/staging/hv/rndis_filter.c linux-2.6.38.7/drive /* Add to the request list */ spin_lock_irqsave(&dev->request_lock, flags); -@@ -707,7 +707,7 @@ static void rndis_filter_halt_device(str +@@ -707,7 +707,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev) /* Setup the rndis set */ halt = &request->request_msg.msg.halt_req; @@ -33739,10 +34585,11 @@ diff -urNp linux-2.6.38.7/drivers/staging/hv/rndis_filter.c linux-2.6.38.7/drive /* Ignore return since this msg is optional. */ rndis_filter_send_request(dev, request); -diff -urNp linux-2.6.38.7/drivers/staging/hv/vmbus_drv.c linux-2.6.38.7/drivers/staging/hv/vmbus_drv.c ---- linux-2.6.38.7/drivers/staging/hv/vmbus_drv.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/hv/vmbus_drv.c 2011-04-28 19:57:25.000000000 -0400 -@@ -727,14 +727,14 @@ int vmbus_child_device_register(struct h +diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c +index 87e6cf2..35b1fc7 100644 +--- a/drivers/staging/hv/vmbus_drv.c ++++ b/drivers/staging/hv/vmbus_drv.c +@@ -727,14 +727,14 @@ int vmbus_child_device_register(struct hv_device *root_device_obj, to_vm_device(root_device_obj); struct vm_device *child_device_ctx = to_vm_device(child_device_obj); @@ -33759,9 +34606,10 @@ diff -urNp linux-2.6.38.7/drivers/staging/hv/vmbus_drv.c linux-2.6.38.7/drivers/ /* The new device belongs to this bus */ child_device_ctx->device.bus = &g_vmbus_drv.bus; /* device->dev.bus; */ -diff -urNp linux-2.6.38.7/drivers/staging/hv/vmbus_private.h linux-2.6.38.7/drivers/staging/hv/vmbus_private.h ---- linux-2.6.38.7/drivers/staging/hv/vmbus_private.h 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/hv/vmbus_private.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/staging/hv/vmbus_private.h b/drivers/staging/hv/vmbus_private.h +index c75b2d7..adf3384 100644 +--- a/drivers/staging/hv/vmbus_private.h ++++ b/drivers/staging/hv/vmbus_private.h @@ -58,7 +58,7 @@ enum VMBUS_CONNECT_STATE { struct VMBUS_CONNECTION { enum VMBUS_CONNECT_STATE ConnectState; @@ -33771,29 +34619,11 @@ diff -urNp linux-2.6.38.7/drivers/staging/hv/vmbus_private.h linux-2.6.38.7/driv /* * Represents channel interrupts. Each bit position represents a -diff -urNp linux-2.6.38.7/drivers/staging/octeon/ethernet.c linux-2.6.38.7/drivers/staging/octeon/ethernet.c ---- linux-2.6.38.7/drivers/staging/octeon/ethernet.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/octeon/ethernet.c 2011-04-28 19:57:25.000000000 -0400 -@@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_ - * since the RX tasklet also increments it. - */ - #ifdef CONFIG_64BIT -- atomic64_add(rx_status.dropped_packets, -- (atomic64_t *)&priv->stats.rx_dropped); -+ atomic64_add_unchecked(rx_status.dropped_packets, -+ (atomic64_unchecked_t *)&priv->stats.rx_dropped); - #else -- atomic_add(rx_status.dropped_packets, -- (atomic_t *)&priv->stats.rx_dropped); -+ atomic_add_unchecked(rx_status.dropped_packets, -+ (atomic_unchecked_t *)&priv->stats.rx_dropped); - #endif - } - -diff -urNp linux-2.6.38.7/drivers/staging/octeon/ethernet-rx.c linux-2.6.38.7/drivers/staging/octeon/ethernet-rx.c ---- linux-2.6.38.7/drivers/staging/octeon/ethernet-rx.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/octeon/ethernet-rx.c 2011-04-28 19:57:25.000000000 -0400 -@@ -417,11 +417,11 @@ static int cvm_oct_napi_poll(struct napi +diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c +index cb38f9e..6b137b2 100644 +--- a/drivers/staging/octeon/ethernet-rx.c ++++ b/drivers/staging/octeon/ethernet-rx.c +@@ -417,11 +417,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget) /* Increment RX stats for virtual ports */ if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) { #ifdef CONFIG_64BIT @@ -33809,7 +34639,7 @@ diff -urNp linux-2.6.38.7/drivers/staging/octeon/ethernet-rx.c linux-2.6.38.7/dr #endif } netif_receive_skb(skb); -@@ -433,9 +433,9 @@ static int cvm_oct_napi_poll(struct napi +@@ -433,9 +433,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget) dev->name); */ #ifdef CONFIG_64BIT @@ -33821,10 +34651,31 @@ diff -urNp linux-2.6.38.7/drivers/staging/octeon/ethernet-rx.c linux-2.6.38.7/dr #endif dev_kfree_skb_irq(skb); } -diff -urNp linux-2.6.38.7/drivers/staging/phison/phison.c linux-2.6.38.7/drivers/staging/phison/phison.c ---- linux-2.6.38.7/drivers/staging/phison/phison.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/phison/phison.c 2011-04-28 19:34:15.000000000 -0400 -@@ -43,7 +43,7 @@ static struct scsi_host_template phison_ +diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c +index a8f780e..aef1098 100644 +--- a/drivers/staging/octeon/ethernet.c ++++ b/drivers/staging/octeon/ethernet.c +@@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev) + * since the RX tasklet also increments it. + */ + #ifdef CONFIG_64BIT +- atomic64_add(rx_status.dropped_packets, +- (atomic64_t *)&priv->stats.rx_dropped); ++ atomic64_add_unchecked(rx_status.dropped_packets, ++ (atomic64_unchecked_t *)&priv->stats.rx_dropped); + #else +- atomic_add(rx_status.dropped_packets, +- (atomic_t *)&priv->stats.rx_dropped); ++ atomic_add_unchecked(rx_status.dropped_packets, ++ (atomic_unchecked_t *)&priv->stats.rx_dropped); + #endif + } + +diff --git a/drivers/staging/phison/phison.c b/drivers/staging/phison/phison.c +index 683657c..f1054e9 100644 +--- a/drivers/staging/phison/phison.c ++++ b/drivers/staging/phison/phison.c +@@ -43,7 +43,7 @@ static struct scsi_host_template phison_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -33833,10 +34684,11 @@ diff -urNp linux-2.6.38.7/drivers/staging/phison/phison.c linux-2.6.38.7/drivers .inherits = &ata_bmdma_port_ops, .prereset = phison_pre_reset, }; -diff -urNp linux-2.6.38.7/drivers/staging/pohmelfs/inode.c linux-2.6.38.7/drivers/staging/pohmelfs/inode.c ---- linux-2.6.38.7/drivers/staging/pohmelfs/inode.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/pohmelfs/inode.c 2011-04-28 19:57:25.000000000 -0400 -@@ -1855,7 +1855,7 @@ static int pohmelfs_fill_super(struct su +diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c +index 56d3a4e..8912e8b 100644 +--- a/drivers/staging/pohmelfs/inode.c ++++ b/drivers/staging/pohmelfs/inode.c +@@ -1855,7 +1855,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent) mutex_init(&psb->mcache_lock); psb->mcache_root = RB_ROOT; psb->mcache_timeout = msecs_to_jiffies(5000); @@ -33845,7 +34697,7 @@ diff -urNp linux-2.6.38.7/drivers/staging/pohmelfs/inode.c linux-2.6.38.7/driver psb->trans_max_pages = 100; -@@ -1870,7 +1870,7 @@ static int pohmelfs_fill_super(struct su +@@ -1870,7 +1870,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent) INIT_LIST_HEAD(&psb->crypto_ready_list); INIT_LIST_HEAD(&psb->crypto_active_list); @@ -33854,10 +34706,11 @@ diff -urNp linux-2.6.38.7/drivers/staging/pohmelfs/inode.c linux-2.6.38.7/driver atomic_long_set(&psb->total_inodes, 0); mutex_init(&psb->state_lock); -diff -urNp linux-2.6.38.7/drivers/staging/pohmelfs/mcache.c linux-2.6.38.7/drivers/staging/pohmelfs/mcache.c ---- linux-2.6.38.7/drivers/staging/pohmelfs/mcache.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/pohmelfs/mcache.c 2011-04-28 19:34:15.000000000 -0400 -@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ +diff --git a/drivers/staging/pohmelfs/mcache.c b/drivers/staging/pohmelfs/mcache.c +index e22665c..a2a9390 100644 +--- a/drivers/staging/pohmelfs/mcache.c ++++ b/drivers/staging/pohmelfs/mcache.c +@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_alloc(struct pohmelfs_sb *psb, u64 start m->data = data; m->start = start; m->size = size; @@ -33866,9 +34719,10 @@ diff -urNp linux-2.6.38.7/drivers/staging/pohmelfs/mcache.c linux-2.6.38.7/drive mutex_lock(&psb->mcache_lock); err = pohmelfs_mcache_insert(psb, m); -diff -urNp linux-2.6.38.7/drivers/staging/pohmelfs/netfs.h linux-2.6.38.7/drivers/staging/pohmelfs/netfs.h ---- linux-2.6.38.7/drivers/staging/pohmelfs/netfs.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/pohmelfs/netfs.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/staging/pohmelfs/netfs.h b/drivers/staging/pohmelfs/netfs.h +index 63391d2..d478939 100644 +--- a/drivers/staging/pohmelfs/netfs.h ++++ b/drivers/staging/pohmelfs/netfs.h @@ -571,14 +571,14 @@ struct pohmelfs_config; struct pohmelfs_sb { struct rb_root mcache_root; @@ -33886,10 +34740,11 @@ diff -urNp linux-2.6.38.7/drivers/staging/pohmelfs/netfs.h linux-2.6.38.7/driver unsigned int crypto_attached_size; unsigned int crypto_align_size; -diff -urNp linux-2.6.38.7/drivers/staging/pohmelfs/trans.c linux-2.6.38.7/drivers/staging/pohmelfs/trans.c ---- linux-2.6.38.7/drivers/staging/pohmelfs/trans.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/pohmelfs/trans.c 2011-04-28 19:57:25.000000000 -0400 -@@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran +diff --git a/drivers/staging/pohmelfs/trans.c b/drivers/staging/pohmelfs/trans.c +index 36a2535..0591bf4 100644 +--- a/drivers/staging/pohmelfs/trans.c ++++ b/drivers/staging/pohmelfs/trans.c +@@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_trans *t, struct pohmelfs_sb *psb) int err; struct netfs_cmd *cmd = t->iovec.iov_base; @@ -33898,10 +34753,11 @@ diff -urNp linux-2.6.38.7/drivers/staging/pohmelfs/trans.c linux-2.6.38.7/driver cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) + t->attached_size + t->attached_pages * sizeof(struct netfs_cmd); -diff -urNp linux-2.6.38.7/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.38.7/drivers/staging/rtl8192u/ieee80211/proc.c ---- linux-2.6.38.7/drivers/staging/rtl8192u/ieee80211/proc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/rtl8192u/ieee80211/proc.c 2011-04-28 19:34:15.000000000 -0400 -@@ -99,7 +99,7 @@ static int crypto_info_open(struct inode +diff --git a/drivers/staging/rtl8192u/ieee80211/proc.c b/drivers/staging/rtl8192u/ieee80211/proc.c +index 6eda928..7e60f0e 100644 +--- a/drivers/staging/rtl8192u/ieee80211/proc.c ++++ b/drivers/staging/rtl8192u/ieee80211/proc.c +@@ -99,7 +99,7 @@ static int crypto_info_open(struct inode *inode, struct file *file) return seq_open(file, &crypto_seq_ops); } @@ -33910,10 +34766,11 @@ diff -urNp linux-2.6.38.7/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.38 .open = crypto_info_open, .read = seq_read, .llseek = seq_lseek, -diff -urNp linux-2.6.38.7/drivers/staging/spectra/ffsport.c linux-2.6.38.7/drivers/staging/spectra/ffsport.c ---- linux-2.6.38.7/drivers/staging/spectra/ffsport.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/spectra/ffsport.c 2011-04-28 19:34:15.000000000 -0400 -@@ -604,7 +604,7 @@ int GLOB_SBD_unlocked_ioctl(struct block +diff --git a/drivers/staging/spectra/ffsport.c b/drivers/staging/spectra/ffsport.c +index 007b24b..4ec0b83 100644 +--- a/drivers/staging/spectra/ffsport.c ++++ b/drivers/staging/spectra/ffsport.c +@@ -604,7 +604,7 @@ int GLOB_SBD_unlocked_ioctl(struct block_device *bdev, fmode_t mode, return ret; } @@ -33922,9 +34779,10 @@ diff -urNp linux-2.6.38.7/drivers/staging/spectra/ffsport.c linux-2.6.38.7/drive .owner = THIS_MODULE, .open = GLOB_SBD_open, .release = GLOB_SBD_release, -diff -urNp linux-2.6.38.7/drivers/staging/usbip/vhci.h linux-2.6.38.7/drivers/staging/usbip/vhci.h ---- linux-2.6.38.7/drivers/staging/usbip/vhci.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/usbip/vhci.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h +index afc3b1a..b06fc38 100644 +--- a/drivers/staging/usbip/vhci.h ++++ b/drivers/staging/usbip/vhci.h @@ -92,7 +92,7 @@ struct vhci_hcd { unsigned resuming:1; unsigned long re_timeout; @@ -33934,9 +34792,10 @@ diff -urNp linux-2.6.38.7/drivers/staging/usbip/vhci.h linux-2.6.38.7/drivers/st /* * NOTE: -diff -urNp linux-2.6.38.7/drivers/staging/usbip/vhci_hcd.c linux-2.6.38.7/drivers/staging/usbip/vhci_hcd.c ---- linux-2.6.38.7/drivers/staging/usbip/vhci_hcd.c 2011-05-10 22:06:29.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/usbip/vhci_hcd.c 2011-05-10 22:08:57.000000000 -0400 +diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c +index 7284d0c..c5bcfb1 100644 +--- a/drivers/staging/usbip/vhci_hcd.c ++++ b/drivers/staging/usbip/vhci_hcd.c @@ -535,7 +535,7 @@ static void vhci_tx_urb(struct urb *urb) return; } @@ -33946,7 +34805,7 @@ diff -urNp linux-2.6.38.7/drivers/staging/usbip/vhci_hcd.c linux-2.6.38.7/driver if (priv->seqnum == 0xffff) usbip_uinfo("seqnum max\n"); -@@ -794,7 +794,7 @@ static int vhci_urb_dequeue(struct usb_h +@@ -794,7 +794,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) return -ENOMEM; } @@ -33955,7 +34814,7 @@ diff -urNp linux-2.6.38.7/drivers/staging/usbip/vhci_hcd.c linux-2.6.38.7/driver if (unlink->seqnum == 0xffff) usbip_uinfo("seqnum max\n"); -@@ -989,7 +989,7 @@ static int vhci_start(struct usb_hcd *hc +@@ -989,7 +989,7 @@ static int vhci_start(struct usb_hcd *hcd) vdev->rhport = rhport; } @@ -33964,10 +34823,11 @@ diff -urNp linux-2.6.38.7/drivers/staging/usbip/vhci_hcd.c linux-2.6.38.7/driver spin_lock_init(&vhci->lock); -diff -urNp linux-2.6.38.7/drivers/staging/usbip/vhci_rx.c linux-2.6.38.7/drivers/staging/usbip/vhci_rx.c ---- linux-2.6.38.7/drivers/staging/usbip/vhci_rx.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/usbip/vhci_rx.c 2011-04-28 19:57:25.000000000 -0400 -@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct +diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c +index 109002a..4e0cae8 100644 +--- a/drivers/staging/usbip/vhci_rx.c ++++ b/drivers/staging/usbip/vhci_rx.c +@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev, usbip_uerr("cannot find a urb of seqnum %u\n", pdu->base.seqnum); usbip_uinfo("max seqnum %d\n", @@ -33976,10 +34836,11 @@ diff -urNp linux-2.6.38.7/drivers/staging/usbip/vhci_rx.c linux-2.6.38.7/drivers usbip_event_add(ud, VDEV_EVENT_ERROR_TCP); return; } -diff -urNp linux-2.6.38.7/drivers/staging/vme/devices/vme_user.c linux-2.6.38.7/drivers/staging/vme/devices/vme_user.c ---- linux-2.6.38.7/drivers/staging/vme/devices/vme_user.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/vme/devices/vme_user.c 2011-04-28 19:34:15.000000000 -0400 -@@ -138,7 +138,7 @@ static long vme_user_unlocked_ioctl(stru +diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c +index a571173..28f0f8e 100644 +--- a/drivers/staging/vme/devices/vme_user.c ++++ b/drivers/staging/vme/devices/vme_user.c +@@ -138,7 +138,7 @@ static long vme_user_unlocked_ioctl(struct file *, unsigned int, unsigned long); static int __devinit vme_user_probe(struct device *, int, int); static int __devexit vme_user_remove(struct device *, int, int); @@ -33988,10 +34849,11 @@ diff -urNp linux-2.6.38.7/drivers/staging/vme/devices/vme_user.c linux-2.6.38.7/ .open = vme_user_open, .release = vme_user_release, .read = vme_user_read, -diff -urNp linux-2.6.38.7/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c linux-2.6.38.7/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c ---- linux-2.6.38.7/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-04-28 19:34:15.000000000 -0400 -@@ -426,7 +426,7 @@ int cyasblkdev_revalidate_disk(struct ge +diff --git a/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c b/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c +index e1851f0..ae63ce3 100644 +--- a/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c ++++ b/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c +@@ -426,7 +426,7 @@ int cyasblkdev_revalidate_disk(struct gendisk *gd) /*standard block device driver interface */ @@ -34000,10 +34862,11 @@ diff -urNp linux-2.6.38.7/drivers/staging/westbridge/astoria/block/cyasblkdev_bl .open = cyasblkdev_blk_open, .release = cyasblkdev_blk_release, .ioctl = cyasblkdev_blk_ioctl, -diff -urNp linux-2.6.38.7/drivers/target/target_core_alua.c linux-2.6.38.7/drivers/target/target_core_alua.c ---- linux-2.6.38.7/drivers/target/target_core_alua.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/target/target_core_alua.c 2011-05-16 21:47:08.000000000 -0400 -@@ -675,6 +675,8 @@ static int core_alua_update_tpg_primary_ +diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c +index 2c5fcfe..5387e01 100644 +--- a/drivers/target/target_core_alua.c ++++ b/drivers/target/target_core_alua.c +@@ -675,6 +675,8 @@ static int core_alua_update_tpg_primary_metadata( char path[ALUA_METADATA_PATH_LEN]; int len; @@ -34012,7 +34875,7 @@ diff -urNp linux-2.6.38.7/drivers/target/target_core_alua.c linux-2.6.38.7/drive memset(path, 0, ALUA_METADATA_PATH_LEN); len = snprintf(md_buf, tg_pt_gp->tg_pt_gp_md_buf_len, -@@ -938,6 +940,8 @@ static int core_alua_update_tpg_secondar +@@ -938,6 +940,8 @@ static int core_alua_update_tpg_secondary_metadata( char path[ALUA_METADATA_PATH_LEN], wwn[ALUA_SECONDARY_METADATA_WWN_LEN]; int len; @@ -34021,10 +34884,11 @@ diff -urNp linux-2.6.38.7/drivers/target/target_core_alua.c linux-2.6.38.7/drive memset(path, 0, ALUA_METADATA_PATH_LEN); memset(wwn, 0, ALUA_SECONDARY_METADATA_WWN_LEN); -diff -urNp linux-2.6.38.7/drivers/target/target_core_cdb.c linux-2.6.38.7/drivers/target/target_core_cdb.c ---- linux-2.6.38.7/drivers/target/target_core_cdb.c 2011-04-18 17:27:14.000000000 -0400 -+++ linux-2.6.38.7/drivers/target/target_core_cdb.c 2011-05-16 21:47:08.000000000 -0400 -@@ -838,6 +838,8 @@ target_emulate_modesense(struct se_cmd * +diff --git a/drivers/target/target_core_cdb.c b/drivers/target/target_core_cdb.c +index 7f19c8b..5f21663 100644 +--- a/drivers/target/target_core_cdb.c ++++ b/drivers/target/target_core_cdb.c +@@ -838,6 +838,8 @@ target_emulate_modesense(struct se_cmd *cmd, int ten) int length = 0; unsigned char buf[SE_MODE_PAGE_BUF]; @@ -34033,10 +34897,11 @@ diff -urNp linux-2.6.38.7/drivers/target/target_core_cdb.c linux-2.6.38.7/driver memset(buf, 0, SE_MODE_PAGE_BUF); switch (cdb[2] & 0x3f) { -diff -urNp linux-2.6.38.7/drivers/target/target_core_configfs.c linux-2.6.38.7/drivers/target/target_core_configfs.c ---- linux-2.6.38.7/drivers/target/target_core_configfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/target/target_core_configfs.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1279,6 +1279,8 @@ static ssize_t target_core_dev_pr_show_a +diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c +index caf8dc1..177b334 100644 +--- a/drivers/target/target_core_configfs.c ++++ b/drivers/target/target_core_configfs.c +@@ -1279,6 +1279,8 @@ static ssize_t target_core_dev_pr_show_attr_res_pr_registered_i_pts( ssize_t len = 0; int reg_count = 0, prf_isid; @@ -34045,10 +34910,11 @@ diff -urNp linux-2.6.38.7/drivers/target/target_core_configfs.c linux-2.6.38.7/d if (!(su_dev->se_dev_ptr)) return -ENODEV; -diff -urNp linux-2.6.38.7/drivers/target/target_core_pr.c linux-2.6.38.7/drivers/target/target_core_pr.c ---- linux-2.6.38.7/drivers/target/target_core_pr.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/target/target_core_pr.c 2011-05-16 21:47:08.000000000 -0400 -@@ -918,6 +918,8 @@ static int __core_scsi3_check_aptpl_regi +diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c +index 2521f75..0846a85 100644 +--- a/drivers/target/target_core_pr.c ++++ b/drivers/target/target_core_pr.c +@@ -918,6 +918,8 @@ static int __core_scsi3_check_aptpl_registration( unsigned char t_port[PR_APTPL_MAX_TPORT_LEN]; u16 tpgt; @@ -34057,7 +34923,7 @@ diff -urNp linux-2.6.38.7/drivers/target/target_core_pr.c linux-2.6.38.7/drivers memset(i_port, 0, PR_APTPL_MAX_IPORT_LEN); memset(t_port, 0, PR_APTPL_MAX_TPORT_LEN); /* -@@ -1861,6 +1863,8 @@ static int __core_scsi3_update_aptpl_buf +@@ -1861,6 +1863,8 @@ static int __core_scsi3_update_aptpl_buf( ssize_t len = 0; int reg_count = 0; @@ -34066,7 +34932,7 @@ diff -urNp linux-2.6.38.7/drivers/target/target_core_pr.c linux-2.6.38.7/drivers memset(buf, 0, pr_aptpl_buf_len); /* * Called to clear metadata once APTPL has been deactivated. -@@ -1983,6 +1987,8 @@ static int __core_scsi3_write_aptpl_to_f +@@ -1983,6 +1987,8 @@ static int __core_scsi3_write_aptpl_to_file( char path[512]; int ret; @@ -34075,10 +34941,11 @@ diff -urNp linux-2.6.38.7/drivers/target/target_core_pr.c linux-2.6.38.7/drivers memset(iov, 0, sizeof(struct iovec)); memset(path, 0, 512); -diff -urNp linux-2.6.38.7/drivers/target/target_core_tmr.c linux-2.6.38.7/drivers/target/target_core_tmr.c ---- linux-2.6.38.7/drivers/target/target_core_tmr.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/target/target_core_tmr.c 2011-04-28 19:57:25.000000000 -0400 -@@ -262,7 +262,7 @@ int core_tmr_lun_reset( +diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c +index 59b8b9c..5193b21 100644 +--- a/drivers/target/target_core_tmr.c ++++ b/drivers/target/target_core_tmr.c +@@ -263,7 +263,7 @@ int core_tmr_lun_reset( CMD_TFO(cmd)->get_task_tag(cmd), cmd->pr_res_key, T_TASK(cmd)->t_task_cdbs, atomic_read(&T_TASK(cmd)->t_task_cdbs_left), @@ -34087,7 +34954,7 @@ diff -urNp linux-2.6.38.7/drivers/target/target_core_tmr.c linux-2.6.38.7/driver atomic_read(&T_TASK(cmd)->t_transport_active), atomic_read(&T_TASK(cmd)->t_transport_stop), atomic_read(&T_TASK(cmd)->t_transport_sent)); -@@ -304,7 +304,7 @@ int core_tmr_lun_reset( +@@ -305,7 +305,7 @@ int core_tmr_lun_reset( DEBUG_LR("LUN_RESET: got t_transport_active = 1 for" " task: %p, t_fe_count: %d dev: %p\n", task, fe_count, dev); @@ -34096,7 +34963,7 @@ diff -urNp linux-2.6.38.7/drivers/target/target_core_tmr.c linux-2.6.38.7/driver spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags); core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count); -@@ -314,7 +314,7 @@ int core_tmr_lun_reset( +@@ -315,7 +315,7 @@ int core_tmr_lun_reset( } DEBUG_LR("LUN_RESET: Got t_transport_active = 0 for task: %p," " t_fe_count: %d dev: %p\n", task, fe_count, dev); @@ -34105,10 +34972,11 @@ diff -urNp linux-2.6.38.7/drivers/target/target_core_tmr.c linux-2.6.38.7/driver spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags); core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count); -diff -urNp linux-2.6.38.7/drivers/target/target_core_transport.c linux-2.6.38.7/drivers/target/target_core_transport.c ---- linux-2.6.38.7/drivers/target/target_core_transport.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/target/target_core_transport.c 2011-04-28 19:57:25.000000000 -0400 -@@ -1678,7 +1678,7 @@ struct se_device *transport_add_device_t +diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c +index d2a5768..b116627 100644 +--- a/drivers/target/target_core_transport.c ++++ b/drivers/target/target_core_transport.c +@@ -1684,7 +1684,7 @@ struct se_device *transport_add_device_to_core_hba( dev->queue_depth = dev_limits->queue_depth; atomic_set(&dev->depth_left, dev->queue_depth); @@ -34117,7 +34985,7 @@ diff -urNp linux-2.6.38.7/drivers/target/target_core_transport.c linux-2.6.38.7/ se_dev_set_default_attribs(dev, dev_limits); -@@ -1880,7 +1880,7 @@ static int transport_check_alloc_task_at +@@ -1886,7 +1886,7 @@ static int transport_check_alloc_task_attr(struct se_cmd *cmd) * Used to determine when ORDERED commands should go from * Dormant to Active status. */ @@ -34126,7 +34994,7 @@ diff -urNp linux-2.6.38.7/drivers/target/target_core_transport.c linux-2.6.38.7/ smp_mb__after_atomic_inc(); DEBUG_STA("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n", cmd->se_ordered_id, cmd->sam_task_attr, -@@ -2160,7 +2160,7 @@ static void transport_generic_request_fa +@@ -2173,7 +2173,7 @@ static void transport_generic_request_failure( " t_transport_active: %d t_transport_stop: %d" " t_transport_sent: %d\n", T_TASK(cmd)->t_task_cdbs, atomic_read(&T_TASK(cmd)->t_task_cdbs_left), @@ -34135,7 +35003,7 @@ diff -urNp linux-2.6.38.7/drivers/target/target_core_transport.c linux-2.6.38.7/ atomic_read(&T_TASK(cmd)->t_task_cdbs_ex_left), atomic_read(&T_TASK(cmd)->t_transport_active), atomic_read(&T_TASK(cmd)->t_transport_stop), -@@ -2664,9 +2664,9 @@ check_depth: +@@ -2677,9 +2677,9 @@ check_depth: spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags); atomic_set(&task->task_active, 1); atomic_set(&task->task_sent, 1); @@ -34147,7 +35015,7 @@ diff -urNp linux-2.6.38.7/drivers/target/target_core_transport.c linux-2.6.38.7/ T_TASK(cmd)->t_task_cdbs) atomic_set(&cmd->transport_sent, 1); -@@ -5550,7 +5550,7 @@ static void transport_generic_wait_for_t +@@ -5569,7 +5569,7 @@ static void transport_generic_wait_for_tasks( atomic_set(&T_TASK(cmd)->transport_lun_stop, 0); } if (!atomic_read(&T_TASK(cmd)->t_transport_active) || @@ -34156,7 +35024,7 @@ diff -urNp linux-2.6.38.7/drivers/target/target_core_transport.c linux-2.6.38.7/ goto remove; atomic_set(&T_TASK(cmd)->t_transport_stop, 1); -@@ -5779,7 +5779,7 @@ int transport_check_aborted_status(struc +@@ -5798,7 +5798,7 @@ int transport_check_aborted_status(struct se_cmd *cmd, int send_status) { int ret = 0; @@ -34165,7 +35033,7 @@ diff -urNp linux-2.6.38.7/drivers/target/target_core_transport.c linux-2.6.38.7/ if (!(send_status) || (cmd->se_cmd_flags & SCF_SENT_DELAYED_TAS)) return 1; -@@ -5807,7 +5807,7 @@ void transport_send_task_abort(struct se +@@ -5826,7 +5826,7 @@ void transport_send_task_abort(struct se_cmd *cmd) */ if (cmd->data_direction == DMA_TO_DEVICE) { if (CMD_TFO(cmd)->write_pending_status(cmd) != 0) { @@ -34174,7 +35042,7 @@ diff -urNp linux-2.6.38.7/drivers/target/target_core_transport.c linux-2.6.38.7/ smp_mb__after_atomic_inc(); cmd->scsi_status = SAM_STAT_TASK_ABORTED; transport_new_cmd_failure(cmd); -@@ -5936,7 +5936,7 @@ static void transport_processing_shutdow +@@ -5955,7 +5955,7 @@ static void transport_processing_shutdown(struct se_device *dev) CMD_TFO(cmd)->get_task_tag(cmd), T_TASK(cmd)->t_task_cdbs, atomic_read(&T_TASK(cmd)->t_task_cdbs_left), @@ -34183,9 +35051,10 @@ diff -urNp linux-2.6.38.7/drivers/target/target_core_transport.c linux-2.6.38.7/ atomic_read(&T_TASK(cmd)->t_transport_active), atomic_read(&T_TASK(cmd)->t_transport_stop), atomic_read(&T_TASK(cmd)->t_transport_sent)); -diff -urNp linux-2.6.38.7/drivers/telephony/ixj.c linux-2.6.38.7/drivers/telephony/ixj.c ---- linux-2.6.38.7/drivers/telephony/ixj.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/telephony/ixj.c 2011-05-16 21:47:08.000000000 -0400 +diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c +index b001019..bd765f9 100644 +--- a/drivers/telephony/ixj.c ++++ b/drivers/telephony/ixj.c @@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j) bool mContinue; char *pIn, *pOut; @@ -34195,10 +35064,11 @@ diff -urNp linux-2.6.38.7/drivers/telephony/ixj.c linux-2.6.38.7/drivers/telepho if (!SCI_Prepare(j)) return 0; -diff -urNp linux-2.6.38.7/drivers/tty/hvc/hvc_console.h linux-2.6.38.7/drivers/tty/hvc/hvc_console.h ---- linux-2.6.38.7/drivers/tty/hvc/hvc_console.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/tty/hvc/hvc_console.h 2011-04-28 19:34:15.000000000 -0400 -@@ -82,6 +82,7 @@ extern int hvc_instantiate(uint32_t vter +diff --git a/drivers/tty/hvc/hvc_console.h b/drivers/tty/hvc/hvc_console.h +index 54381eba..41e362b 100644 +--- a/drivers/tty/hvc/hvc_console.h ++++ b/drivers/tty/hvc/hvc_console.h +@@ -82,6 +82,7 @@ extern int hvc_instantiate(uint32_t vtermno, int index, /* register a vterm for hvc tty operation (module_init or hotplug add) */ extern struct hvc_struct * hvc_alloc(uint32_t vtermno, int data, const struct hv_ops *ops, int outbuf_size); @@ -34206,9 +35076,50 @@ diff -urNp linux-2.6.38.7/drivers/tty/hvc/hvc_console.h linux-2.6.38.7/drivers/t /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ extern int hvc_remove(struct hvc_struct *hp); -diff -urNp linux-2.6.38.7/drivers/tty/hvc/hvcs.c linux-2.6.38.7/drivers/tty/hvc/hvcs.c ---- linux-2.6.38.7/drivers/tty/hvc/hvcs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/tty/hvc/hvcs.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c +index 3740e32..1edf7b4 100644 +--- a/drivers/tty/hvc/hvc_xen.c ++++ b/drivers/tty/hvc/hvc_xen.c +@@ -123,7 +123,7 @@ static int domU_read_console(uint32_t vtermno, char *buf, int len) + return recv; + } + +-static struct hv_ops domU_hvc_ops = { ++static const struct hv_ops domU_hvc_ops = { + .get_chars = domU_read_console, + .put_chars = domU_write_console, + .notifier_add = notifier_add_irq, +@@ -149,7 +149,7 @@ static int dom0_write_console(uint32_t vtermno, const char *str, int len) + return len; + } + +-static struct hv_ops dom0_hvc_ops = { ++static const struct hv_ops dom0_hvc_ops = { + .get_chars = dom0_read_console, + .put_chars = dom0_write_console, + .notifier_add = notifier_add_irq, +@@ -160,7 +160,7 @@ static struct hv_ops dom0_hvc_ops = { + static int __init xen_hvc_init(void) + { + struct hvc_struct *hp; +- struct hv_ops *ops; ++ const struct hv_ops *ops; + + if (!xen_pv_domain()) + return -ENODEV; +@@ -203,7 +203,7 @@ static void __exit xen_hvc_fini(void) + + static int xen_cons_init(void) + { +- struct hv_ops *ops; ++ const struct hv_ops *ops; + + if (!xen_pv_domain()) + return 0; +diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c +index bedc6c1..67a4716 100644 +--- a/drivers/tty/hvc/hvcs.c ++++ b/drivers/tty/hvc/hvcs.c @@ -83,6 +83,7 @@ #include <asm/hvcserver.h> #include <asm/uaccess.h> @@ -34226,7 +35137,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/hvc/hvcs.c linux-2.6.38.7/drivers/tty/hvc/ /* * Used to tell the driver kernel_thread what operations need to take -@@ -420,7 +421,7 @@ static ssize_t hvcs_vterm_state_store(st +@@ -420,7 +421,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut spin_lock_irqsave(&hvcsd->lock, flags); @@ -34235,7 +35146,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/hvc/hvcs.c linux-2.6.38.7/drivers/tty/hvc/ spin_unlock_irqrestore(&hvcsd->lock, flags); printk(KERN_INFO "HVCS: vterm state unchanged. " "The hvcs device node is still in use.\n"); -@@ -1136,7 +1137,7 @@ static int hvcs_open(struct tty_struct * +@@ -1136,7 +1137,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp) if ((retval = hvcs_partner_connect(hvcsd))) goto error_release; @@ -34253,7 +35164,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/hvc/hvcs.c linux-2.6.38.7/drivers/tty/hvc/ hvcsd->todo_mask |= HVCS_SCHED_READ; spin_unlock_irqrestore(&hvcsd->lock, flags); -@@ -1214,7 +1215,7 @@ static void hvcs_close(struct tty_struct +@@ -1214,7 +1215,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp) hvcsd = tty->driver_data; spin_lock_irqsave(&hvcsd->lock, flags); @@ -34262,7 +35173,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/hvc/hvcs.c linux-2.6.38.7/drivers/tty/hvc/ vio_disable_interrupts(hvcsd->vdev); -@@ -1240,10 +1241,10 @@ static void hvcs_close(struct tty_struct +@@ -1240,10 +1241,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp) free_irq(irq, hvcsd); kref_put(&hvcsd->kref, destroy_hvcs_struct); return; @@ -34275,7 +35186,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/hvc/hvcs.c linux-2.6.38.7/drivers/tty/hvc/ } spin_unlock_irqrestore(&hvcsd->lock, flags); -@@ -1259,7 +1260,7 @@ static void hvcs_hangup(struct tty_struc +@@ -1259,7 +1260,7 @@ static void hvcs_hangup(struct tty_struct * tty) spin_lock_irqsave(&hvcsd->lock, flags); /* Preserve this so that we know how many kref refs to put */ @@ -34284,7 +35195,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/hvc/hvcs.c linux-2.6.38.7/drivers/tty/hvc/ /* * Don't kref put inside the spinlock because the destruction -@@ -1274,7 +1275,7 @@ static void hvcs_hangup(struct tty_struc +@@ -1274,7 +1275,7 @@ static void hvcs_hangup(struct tty_struct * tty) hvcsd->tty->driver_data = NULL; hvcsd->tty = NULL; @@ -34293,7 +35204,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/hvc/hvcs.c linux-2.6.38.7/drivers/tty/hvc/ /* This will drop any buffered data on the floor which is OK in a hangup * scenario. */ -@@ -1345,7 +1346,7 @@ static int hvcs_write(struct tty_struct +@@ -1345,7 +1346,7 @@ static int hvcs_write(struct tty_struct *tty, * the middle of a write operation? This is a crummy place to do this * but we want to keep it all in the spinlock. */ @@ -34302,7 +35213,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/hvc/hvcs.c linux-2.6.38.7/drivers/tty/hvc/ spin_unlock_irqrestore(&hvcsd->lock, flags); return -ENODEV; } -@@ -1419,7 +1420,7 @@ static int hvcs_write_room(struct tty_st +@@ -1419,7 +1420,7 @@ static int hvcs_write_room(struct tty_struct *tty) { struct hvcs_struct *hvcsd = tty->driver_data; @@ -34311,49 +35222,11 @@ diff -urNp linux-2.6.38.7/drivers/tty/hvc/hvcs.c linux-2.6.38.7/drivers/tty/hvc/ return 0; return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; -diff -urNp linux-2.6.38.7/drivers/tty/hvc/hvc_xen.c linux-2.6.38.7/drivers/tty/hvc/hvc_xen.c ---- linux-2.6.38.7/drivers/tty/hvc/hvc_xen.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/tty/hvc/hvc_xen.c 2011-04-28 19:34:15.000000000 -0400 -@@ -123,7 +123,7 @@ static int domU_read_console(uint32_t vt - return recv; - } - --static struct hv_ops domU_hvc_ops = { -+static const struct hv_ops domU_hvc_ops = { - .get_chars = domU_read_console, - .put_chars = domU_write_console, - .notifier_add = notifier_add_irq, -@@ -149,7 +149,7 @@ static int dom0_write_console(uint32_t v - return len; - } - --static struct hv_ops dom0_hvc_ops = { -+static const struct hv_ops dom0_hvc_ops = { - .get_chars = dom0_read_console, - .put_chars = dom0_write_console, - .notifier_add = notifier_add_irq, -@@ -160,7 +160,7 @@ static struct hv_ops dom0_hvc_ops = { - static int __init xen_hvc_init(void) - { - struct hvc_struct *hp; -- struct hv_ops *ops; -+ const struct hv_ops *ops; - - if (!xen_pv_domain()) - return -ENODEV; -@@ -203,7 +203,7 @@ static void __exit xen_hvc_fini(void) - - static int xen_cons_init(void) - { -- struct hv_ops *ops; -+ const struct hv_ops *ops; - - if (!xen_pv_domain()) - return 0; -diff -urNp linux-2.6.38.7/drivers/tty/n_gsm.c linux-2.6.38.7/drivers/tty/n_gsm.c ---- linux-2.6.38.7/drivers/tty/n_gsm.c 2011-05-10 22:06:27.000000000 -0400 -+++ linux-2.6.38.7/drivers/tty/n_gsm.c 2011-05-10 22:06:56.000000000 -0400 -@@ -1589,7 +1589,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s +diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c +index c4b0ef1..42c0292 100644 +--- a/drivers/tty/n_gsm.c ++++ b/drivers/tty/n_gsm.c +@@ -1589,7 +1589,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr) return NULL; spin_lock_init(&dlci->lock); dlci->fifo = &dlci->_fifo; @@ -34362,10 +35235,11 @@ diff -urNp linux-2.6.38.7/drivers/tty/n_gsm.c linux-2.6.38.7/drivers/tty/n_gsm.c kfree(dlci); return NULL; } -diff -urNp linux-2.6.38.7/drivers/tty/n_tty.c linux-2.6.38.7/drivers/tty/n_tty.c ---- linux-2.6.38.7/drivers/tty/n_tty.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/tty/n_tty.c 2011-04-28 19:34:15.000000000 -0400 -@@ -2116,6 +2116,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ +diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c +index 428f4fe..36561a9 100644 +--- a/drivers/tty/n_tty.c ++++ b/drivers/tty/n_tty.c +@@ -2116,6 +2116,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops) { *ops = tty_ldisc_N_TTY; ops->owner = NULL; @@ -34374,9 +35248,10 @@ diff -urNp linux-2.6.38.7/drivers/tty/n_tty.c linux-2.6.38.7/drivers/tty/n_tty.c + ops->flags = 0; } EXPORT_SYMBOL_GPL(n_tty_inherit_ops); -diff -urNp linux-2.6.38.7/drivers/tty/pty.c linux-2.6.38.7/drivers/tty/pty.c ---- linux-2.6.38.7/drivers/tty/pty.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/tty/pty.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c +index 923a485..95f0a42 100644 +--- a/drivers/tty/pty.c ++++ b/drivers/tty/pty.c @@ -700,7 +700,18 @@ out: return retval; } @@ -34408,9 +35283,10 @@ diff -urNp linux-2.6.38.7/drivers/tty/pty.c linux-2.6.38.7/drivers/tty/pty.c cdev_init(&ptmx_cdev, &ptmx_fops); if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) -diff -urNp linux-2.6.38.7/drivers/tty/serial/kgdboc.c linux-2.6.38.7/drivers/tty/serial/kgdboc.c ---- linux-2.6.38.7/drivers/tty/serial/kgdboc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/tty/serial/kgdboc.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c +index 25a8bc5..1699dca 100644 +--- a/drivers/tty/serial/kgdboc.c ++++ b/drivers/tty/serial/kgdboc.c @@ -22,7 +22,7 @@ #define MAX_CONFIG_LEN 40 @@ -34420,7 +35296,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/serial/kgdboc.c linux-2.6.38.7/drivers/tty /* -1 = init not run yet, 0 = unconfigured, 1 = configured. */ static int configured = -1; -@@ -293,7 +293,7 @@ static void kgdboc_post_exp_handler(void +@@ -293,7 +293,7 @@ static void kgdboc_post_exp_handler(void) kgdboc_restore_input(); } @@ -34429,10 +35305,11 @@ diff -urNp linux-2.6.38.7/drivers/tty/serial/kgdboc.c linux-2.6.38.7/drivers/tty .name = "kgdboc", .read_char = kgdboc_get_char, .write_char = kgdboc_put_char, -diff -urNp linux-2.6.38.7/drivers/tty/serial/mrst_max3110.c linux-2.6.38.7/drivers/tty/serial/mrst_max3110.c ---- linux-2.6.38.7/drivers/tty/serial/mrst_max3110.c 2011-04-18 17:27:14.000000000 -0400 -+++ linux-2.6.38.7/drivers/tty/serial/mrst_max3110.c 2011-05-16 21:47:08.000000000 -0400 -@@ -393,6 +393,8 @@ static void max3110_con_receive(struct u +diff --git a/drivers/tty/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c +index 37e13c3..e86ffa8 100644 +--- a/drivers/tty/serial/mrst_max3110.c ++++ b/drivers/tty/serial/mrst_max3110.c +@@ -393,6 +393,8 @@ static void max3110_con_receive(struct uart_max3110 *max) int loop = 1, num, total = 0; u8 recv_buf[512], *pbuf; @@ -34441,9 +35318,10 @@ diff -urNp linux-2.6.38.7/drivers/tty/serial/mrst_max3110.c linux-2.6.38.7/drive pbuf = recv_buf; do { num = max3110_read_multi(max, pbuf); -diff -urNp linux-2.6.38.7/drivers/tty/tty_io.c linux-2.6.38.7/drivers/tty/tty_io.c ---- linux-2.6.38.7/drivers/tty/tty_io.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/tty/tty_io.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c +index 0065da4..d1c81dd 100644 +--- a/drivers/tty/tty_io.c ++++ b/drivers/tty/tty_io.c @@ -140,21 +140,11 @@ EXPORT_SYMBOL(tty_mutex); /* Spinlock to protect the tty->tty_files list */ DEFINE_SPINLOCK(tty_files_lock); @@ -34475,7 +35353,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/tty_io.c linux-2.6.38.7/drivers/tty/tty_io loff_t *ppos) { int i; -@@ -964,6 +954,8 @@ static ssize_t tty_read(struct file *fil +@@ -964,6 +954,8 @@ static ssize_t tty_read(struct file *file, char __user *buf, size_t count, return i; } @@ -34484,7 +35362,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/tty_io.c linux-2.6.38.7/drivers/tty/tty_io void tty_write_unlock(struct tty_struct *tty) { mutex_unlock(&tty->atomic_write_lock); -@@ -1113,7 +1105,7 @@ void tty_write_message(struct tty_struct +@@ -1113,7 +1105,7 @@ void tty_write_message(struct tty_struct *tty, char *msg) * write method will not be invoked in parallel for each device. */ @@ -34493,7 +35371,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/tty_io.c linux-2.6.38.7/drivers/tty/tty_io size_t count, loff_t *ppos) { struct inode *inode = file->f_path.dentry->d_inode; -@@ -1139,6 +1131,8 @@ static ssize_t tty_write(struct file *fi +@@ -1139,6 +1131,8 @@ static ssize_t tty_write(struct file *file, const char __user *buf, return ret; } @@ -34502,7 +35380,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/tty_io.c linux-2.6.38.7/drivers/tty/tty_io ssize_t redirected_tty_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { -@@ -1778,6 +1772,8 @@ int tty_release(struct inode *inode, str +@@ -1778,6 +1772,8 @@ int tty_release(struct inode *inode, struct file *filp) return 0; } @@ -34520,7 +35398,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/tty_io.c linux-2.6.38.7/drivers/tty/tty_io { struct tty_struct *tty = file_tty(filp); struct tty_ldisc *ld; -@@ -1985,6 +1981,8 @@ static unsigned int tty_poll(struct file +@@ -1985,6 +1981,8 @@ static unsigned int tty_poll(struct file *filp, poll_table *wait) return ret; } @@ -34538,7 +35416,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/tty_io.c linux-2.6.38.7/drivers/tty/tty_io { int retval; tty_lock(); -@@ -2035,6 +2033,8 @@ static int tty_fasync(int fd, struct fil +@@ -2035,6 +2033,8 @@ static int tty_fasync(int fd, struct file *filp, int on) return retval; } @@ -34547,7 +35425,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/tty_io.c linux-2.6.38.7/drivers/tty/tty_io /** * tiocsti - fake input character * @tty: tty to fake input into -@@ -2692,8 +2692,10 @@ long tty_ioctl(struct file *file, unsign +@@ -2692,8 +2692,10 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg) return retval; } @@ -34559,7 +35437,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/tty_io.c linux-2.6.38.7/drivers/tty/tty_io unsigned long arg) { struct inode *inode = file->f_dentry->d_inode; -@@ -2717,6 +2719,9 @@ static long tty_compat_ioctl(struct file +@@ -2717,6 +2719,9 @@ static long tty_compat_ioctl(struct file *file, unsigned int cmd, return retval; } @@ -34581,10 +35459,11 @@ diff -urNp linux-2.6.38.7/drivers/tty/tty_io.c linux-2.6.38.7/drivers/tty/tty_io /* * Initialize the console device. This is called *early*, so * we can't necessarily depend on lots of kernel help here. -diff -urNp linux-2.6.38.7/drivers/tty/tty_ldisc.c linux-2.6.38.7/drivers/tty/tty_ldisc.c ---- linux-2.6.38.7/drivers/tty/tty_ldisc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/tty/tty_ldisc.c 2011-04-28 19:34:15.000000000 -0400 -@@ -76,7 +76,7 @@ static void put_ldisc(struct tty_ldisc * +diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c +index 4214d58..4254a13 100644 +--- a/drivers/tty/tty_ldisc.c ++++ b/drivers/tty/tty_ldisc.c +@@ -76,7 +76,7 @@ static void put_ldisc(struct tty_ldisc *ld) if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { struct tty_ldisc_ops *ldo = ld->ops; @@ -34593,7 +35472,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/tty_ldisc.c linux-2.6.38.7/drivers/tty/tty module_put(ldo->owner); spin_unlock_irqrestore(&tty_ldisc_lock, flags); -@@ -111,7 +111,7 @@ int tty_register_ldisc(int disc, struct +@@ -111,7 +111,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc) spin_lock_irqsave(&tty_ldisc_lock, flags); tty_ldiscs[disc] = new_ldisc; new_ldisc->num = disc; @@ -34611,7 +35490,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/tty_ldisc.c linux-2.6.38.7/drivers/tty/tty ret = -EBUSY; else tty_ldiscs[disc] = NULL; -@@ -160,7 +160,7 @@ static struct tty_ldisc_ops *get_ldops(i +@@ -160,7 +160,7 @@ static struct tty_ldisc_ops *get_ldops(int disc) if (ldops) { ret = ERR_PTR(-EAGAIN); if (try_module_get(ldops->owner)) { @@ -34620,7 +35499,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/tty_ldisc.c linux-2.6.38.7/drivers/tty/tty ret = ldops; } } -@@ -173,7 +173,7 @@ static void put_ldops(struct tty_ldisc_o +@@ -173,7 +173,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops) unsigned long flags; spin_lock_irqsave(&tty_ldisc_lock, flags); @@ -34629,10 +35508,11 @@ diff -urNp linux-2.6.38.7/drivers/tty/tty_ldisc.c linux-2.6.38.7/drivers/tty/tty module_put(ldops->owner); spin_unlock_irqrestore(&tty_ldisc_lock, flags); } -diff -urNp linux-2.6.38.7/drivers/tty/vt/keyboard.c linux-2.6.38.7/drivers/tty/vt/keyboard.c ---- linux-2.6.38.7/drivers/tty/vt/keyboard.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/tty/vt/keyboard.c 2011-04-28 19:34:15.000000000 -0400 -@@ -657,6 +657,16 @@ static void k_spec(struct vc_data *vc, u +diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c +index e95d787..3bc1ca2 100644 +--- a/drivers/tty/vt/keyboard.c ++++ b/drivers/tty/vt/keyboard.c +@@ -657,6 +657,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag) kbd->kbdmode == VC_MEDIUMRAW) && value != KVAL(K_SAK)) return; /* SAK is allowed even in raw mode */ @@ -34649,10 +35529,11 @@ diff -urNp linux-2.6.38.7/drivers/tty/vt/keyboard.c linux-2.6.38.7/drivers/tty/v fn_handler[value](vc); } -diff -urNp linux-2.6.38.7/drivers/tty/vt/vt.c linux-2.6.38.7/drivers/tty/vt/vt.c ---- linux-2.6.38.7/drivers/tty/vt/vt.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/tty/vt/vt.c 2011-04-28 19:34:15.000000000 -0400 -@@ -262,7 +262,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier +diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c +index 147ede3..1610f45 100644 +--- a/drivers/tty/vt/vt.c ++++ b/drivers/tty/vt/vt.c +@@ -262,7 +262,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier); static void notify_write(struct vc_data *vc, unsigned int unicode) { @@ -34661,10 +35542,11 @@ diff -urNp linux-2.6.38.7/drivers/tty/vt/vt.c linux-2.6.38.7/drivers/tty/vt/vt.c atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, ¶m); } -diff -urNp linux-2.6.38.7/drivers/tty/vt/vt_ioctl.c linux-2.6.38.7/drivers/tty/vt/vt_ioctl.c ---- linux-2.6.38.7/drivers/tty/vt/vt_ioctl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/tty/vt/vt_ioctl.c 2011-04-28 19:34:15.000000000 -0400 -@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __ +diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c +index 1235ebd..1b4973d 100644 +--- a/drivers/tty/vt/vt_ioctl.c ++++ b/drivers/tty/vt/vt_ioctl.c +@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry))) return -EFAULT; @@ -34674,7 +35556,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/vt/vt_ioctl.c linux-2.6.38.7/drivers/tty/v switch (cmd) { case KDGKBENT: key_map = key_maps[s]; -@@ -224,6 +221,9 @@ do_kdsk_ioctl(int cmd, struct kbentry __ +@@ -224,6 +221,9 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str val = (i ? K_HOLE : K_NOSUCHMAP); return put_user(val, &user_kbe->kb_value); case KDSKBENT: @@ -34684,7 +35566,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/vt/vt_ioctl.c linux-2.6.38.7/drivers/tty/v if (!perm) return -EPERM; if (!i && v == K_NOSUCHMAP) { -@@ -325,9 +325,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry +@@ -325,9 +325,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm) int i, j, k; int ret; @@ -34694,7 +35576,7 @@ diff -urNp linux-2.6.38.7/drivers/tty/vt/vt_ioctl.c linux-2.6.38.7/drivers/tty/v kbs = kmalloc(sizeof(*kbs), GFP_KERNEL); if (!kbs) { ret = -ENOMEM; -@@ -361,6 +358,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry +@@ -361,6 +358,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm) kfree(kbs); return ((p && *p) ? -EOVERFLOW : 0); case KDSKBSENT: @@ -34704,9 +35586,10 @@ diff -urNp linux-2.6.38.7/drivers/tty/vt/vt_ioctl.c linux-2.6.38.7/drivers/tty/v if (!perm) { ret = -EPERM; goto reterr; -diff -urNp linux-2.6.38.7/drivers/uio/uio.c linux-2.6.38.7/drivers/uio/uio.c ---- linux-2.6.38.7/drivers/uio/uio.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/uio/uio.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c +index 51fe179..5acadc0 100644 +--- a/drivers/uio/uio.c ++++ b/drivers/uio/uio.c @@ -25,6 +25,7 @@ #include <linux/kobject.h> #include <linux/cdev.h> @@ -34728,7 +35611,7 @@ diff -urNp linux-2.6.38.7/drivers/uio/uio.c linux-2.6.38.7/drivers/uio/uio.c struct uio_info *info; struct kobject *map_dir; struct kobject *portio_dir; -@@ -242,7 +243,7 @@ static ssize_t show_event(struct device +@@ -242,7 +243,7 @@ static ssize_t show_event(struct device *dev, struct device_attribute *attr, char *buf) { struct uio_device *idev = dev_get_drvdata(dev); @@ -34737,7 +35620,7 @@ diff -urNp linux-2.6.38.7/drivers/uio/uio.c linux-2.6.38.7/drivers/uio/uio.c } static struct device_attribute uio_class_attributes[] = { -@@ -402,7 +403,7 @@ void uio_event_notify(struct uio_info *i +@@ -402,7 +403,7 @@ void uio_event_notify(struct uio_info *info) { struct uio_device *idev = info->uio_dev; @@ -34746,7 +35629,7 @@ diff -urNp linux-2.6.38.7/drivers/uio/uio.c linux-2.6.38.7/drivers/uio/uio.c wake_up_interruptible(&idev->wait); kill_fasync(&idev->async_queue, SIGIO, POLL_IN); } -@@ -455,7 +456,7 @@ static int uio_open(struct inode *inode, +@@ -455,7 +456,7 @@ static int uio_open(struct inode *inode, struct file *filep) } listener->dev = idev; @@ -34755,7 +35638,7 @@ diff -urNp linux-2.6.38.7/drivers/uio/uio.c linux-2.6.38.7/drivers/uio/uio.c filep->private_data = listener; if (idev->info->open) { -@@ -506,7 +507,7 @@ static unsigned int uio_poll(struct file +@@ -506,7 +507,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait) return -EIO; poll_wait(filep, &idev->wait, wait); @@ -34764,7 +35647,7 @@ diff -urNp linux-2.6.38.7/drivers/uio/uio.c linux-2.6.38.7/drivers/uio/uio.c return POLLIN | POLLRDNORM; return 0; } -@@ -531,7 +532,7 @@ static ssize_t uio_read(struct file *fil +@@ -531,7 +532,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf, do { set_current_state(TASK_INTERRUPTIBLE); @@ -34773,7 +35656,7 @@ diff -urNp linux-2.6.38.7/drivers/uio/uio.c linux-2.6.38.7/drivers/uio/uio.c if (event_count != listener->event_count) { if (copy_to_user(buf, &event_count, count)) retval = -EFAULT; -@@ -602,13 +603,13 @@ static int uio_find_mem_index(struct vm_ +@@ -602,13 +603,13 @@ static int uio_find_mem_index(struct vm_area_struct *vma) static void uio_vma_open(struct vm_area_struct *vma) { struct uio_device *idev = vma->vm_private_data; @@ -34789,7 +35672,7 @@ diff -urNp linux-2.6.38.7/drivers/uio/uio.c linux-2.6.38.7/drivers/uio/uio.c } static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf) -@@ -819,7 +820,7 @@ int __uio_register_device(struct module +@@ -819,7 +820,7 @@ int __uio_register_device(struct module *owner, idev->owner = owner; idev->info = info; init_waitqueue_head(&idev->wait); @@ -34798,10 +35681,11 @@ diff -urNp linux-2.6.38.7/drivers/uio/uio.c linux-2.6.38.7/drivers/uio/uio.c ret = uio_get_minor(idev); if (ret) -diff -urNp linux-2.6.38.7/drivers/usb/atm/cxacru.c linux-2.6.38.7/drivers/usb/atm/cxacru.c ---- linux-2.6.38.7/drivers/usb/atm/cxacru.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/usb/atm/cxacru.c 2011-04-28 19:34:15.000000000 -0400 -@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_c +diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c +index a845f8b..4f54072 100644 +--- a/drivers/usb/atm/cxacru.c ++++ b/drivers/usb/atm/cxacru.c +@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev, ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp); if (ret < 2) return -EINVAL; @@ -34810,10 +35694,11 @@ diff -urNp linux-2.6.38.7/drivers/usb/atm/cxacru.c linux-2.6.38.7/drivers/usb/at return -EINVAL; pos += tmp; -diff -urNp linux-2.6.38.7/drivers/usb/atm/usbatm.c linux-2.6.38.7/drivers/usb/atm/usbatm.c ---- linux-2.6.38.7/drivers/usb/atm/usbatm.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/usb/atm/usbatm.c 2011-04-28 19:34:15.000000000 -0400 -@@ -332,7 +332,7 @@ static void usbatm_extract_one_cell(stru +diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c +index 989e16e..32c4bc7 100644 +--- a/drivers/usb/atm/usbatm.c ++++ b/drivers/usb/atm/usbatm.c +@@ -332,7 +332,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char if (printk_ratelimit()) atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", __func__, vpi, vci); @@ -34822,7 +35707,7 @@ diff -urNp linux-2.6.38.7/drivers/usb/atm/usbatm.c linux-2.6.38.7/drivers/usb/at return; } -@@ -360,7 +360,7 @@ static void usbatm_extract_one_cell(stru +@@ -360,7 +360,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char if (length > ATM_MAX_AAL5_PDU) { atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n", __func__, length, vcc); @@ -34831,7 +35716,7 @@ diff -urNp linux-2.6.38.7/drivers/usb/atm/usbatm.c linux-2.6.38.7/drivers/usb/at goto out; } -@@ -369,14 +369,14 @@ static void usbatm_extract_one_cell(stru +@@ -369,14 +369,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char if (sarb->len < pdu_length) { atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n", __func__, pdu_length, sarb->len, vcc); @@ -34848,7 +35733,7 @@ diff -urNp linux-2.6.38.7/drivers/usb/atm/usbatm.c linux-2.6.38.7/drivers/usb/at goto out; } -@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(stru +@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char if (printk_ratelimit()) atm_err(instance, "%s: no memory for skb (length: %u)!\n", __func__, length); @@ -34857,7 +35742,7 @@ diff -urNp linux-2.6.38.7/drivers/usb/atm/usbatm.c linux-2.6.38.7/drivers/usb/at goto out; } -@@ -411,7 +411,7 @@ static void usbatm_extract_one_cell(stru +@@ -411,7 +411,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char vcc->push(vcc, skb); @@ -34866,7 +35751,7 @@ diff -urNp linux-2.6.38.7/drivers/usb/atm/usbatm.c linux-2.6.38.7/drivers/usb/at out: skb_trim(sarb, 0); } -@@ -614,7 +614,7 @@ static void usbatm_tx_process(unsigned l +@@ -614,7 +614,7 @@ static void usbatm_tx_process(unsigned long data) struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc; usbatm_pop(vcc, skb); @@ -34875,7 +35760,7 @@ diff -urNp linux-2.6.38.7/drivers/usb/atm/usbatm.c linux-2.6.38.7/drivers/usb/at skb = skb_dequeue(&instance->sndqueue); } -@@ -773,11 +773,11 @@ static int usbatm_atm_proc_read(struct a +@@ -773,11 +773,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag if (!left--) return sprintf(page, "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n", @@ -34892,9 +35777,10 @@ diff -urNp linux-2.6.38.7/drivers/usb/atm/usbatm.c linux-2.6.38.7/drivers/usb/at if (!left--) { if (instance->disconnected) -diff -urNp linux-2.6.38.7/drivers/usb/core/devices.c linux-2.6.38.7/drivers/usb/core/devices.c ---- linux-2.6.38.7/drivers/usb/core/devices.c 2011-04-22 19:20:59.000000000 -0400 -+++ linux-2.6.38.7/drivers/usb/core/devices.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c +index 96fdfb8..7b4b93b 100644 +--- a/drivers/usb/core/devices.c ++++ b/drivers/usb/core/devices.c @@ -126,7 +126,7 @@ static const char *format_endpt = * time it gets called. */ @@ -34904,7 +35790,7 @@ diff -urNp linux-2.6.38.7/drivers/usb/core/devices.c linux-2.6.38.7/drivers/usb/ wait_queue_head_t wait; } device_event = { .count = ATOMIC_INIT(1), -@@ -164,7 +164,7 @@ static const struct class_info clas_info +@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = { void usbfs_conn_disc_event(void) { @@ -34913,7 +35799,7 @@ diff -urNp linux-2.6.38.7/drivers/usb/core/devices.c linux-2.6.38.7/drivers/usb/ wake_up(&device_event.wait); } -@@ -648,7 +648,7 @@ static unsigned int usb_device_poll(stru +@@ -648,7 +648,7 @@ static unsigned int usb_device_poll(struct file *file, poll_wait(file, &device_event.wait, wait); @@ -34922,10 +35808,11 @@ diff -urNp linux-2.6.38.7/drivers/usb/core/devices.c linux-2.6.38.7/drivers/usb/ if (file->f_version != event_count) { file->f_version = event_count; return POLLIN | POLLRDNORM; -diff -urNp linux-2.6.38.7/drivers/usb/core/hcd.c linux-2.6.38.7/drivers/usb/core/hcd.c ---- linux-2.6.38.7/drivers/usb/core/hcd.c 2011-04-22 19:20:59.000000000 -0400 -+++ linux-2.6.38.7/drivers/usb/core/hcd.c 2011-04-28 19:34:15.000000000 -0400 -@@ -2457,7 +2457,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd +diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c +index a27dd22..973e94b 100644 +--- a/drivers/usb/core/hcd.c ++++ b/drivers/usb/core/hcd.c +@@ -2454,7 +2454,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutdown); #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) @@ -34934,7 +35821,7 @@ diff -urNp linux-2.6.38.7/drivers/usb/core/hcd.c linux-2.6.38.7/drivers/usb/core /* * The registration is unlocked. -@@ -2467,7 +2467,7 @@ struct usb_mon_operations *mon_ops; +@@ -2464,7 +2464,7 @@ struct usb_mon_operations *mon_ops; * symbols from usbcore, usbcore gets referenced and cannot be unloaded first. */ @@ -34943,10 +35830,11 @@ diff -urNp linux-2.6.38.7/drivers/usb/core/hcd.c linux-2.6.38.7/drivers/usb/core { if (mon_ops) -diff -urNp linux-2.6.38.7/drivers/usb/core/message.c linux-2.6.38.7/drivers/usb/core/message.c ---- linux-2.6.38.7/drivers/usb/core/message.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/usb/core/message.c 2011-04-28 19:34:15.000000000 -0400 -@@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device +diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c +index 8324874..2b581f6 100644 +--- a/drivers/usb/core/message.c ++++ b/drivers/usb/core/message.c +@@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device *udev, int index) buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); if (buf) { len = usb_string(udev, index, buf, MAX_USB_STRING_SIZE); @@ -34957,10 +35845,11 @@ diff -urNp linux-2.6.38.7/drivers/usb/core/message.c linux-2.6.38.7/drivers/usb/ if (!smallbuf) return buf; memcpy(smallbuf, buf, len); -diff -urNp linux-2.6.38.7/drivers/usb/early/ehci-dbgp.c linux-2.6.38.7/drivers/usb/early/ehci-dbgp.c ---- linux-2.6.38.7/drivers/usb/early/ehci-dbgp.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/usb/early/ehci-dbgp.c 2011-04-28 19:34:15.000000000 -0400 -@@ -96,7 +96,7 @@ static inline u32 dbgp_len_update(u32 x, +diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c +index 94ecdbc..414125e 100644 +--- a/drivers/usb/early/ehci-dbgp.c ++++ b/drivers/usb/early/ehci-dbgp.c +@@ -96,7 +96,7 @@ static inline u32 dbgp_len_update(u32 x, u32 len) } #ifdef CONFIG_KGDB @@ -34978,10 +35867,11 @@ diff -urNp linux-2.6.38.7/drivers/usb/early/ehci-dbgp.c linux-2.6.38.7/drivers/u .name = "kgdbdbgp", .read_char = kgdbdbgp_read_char, .write_char = kgdbdbgp_write_char, -diff -urNp linux-2.6.38.7/drivers/usb/host/xhci-mem.c linux-2.6.38.7/drivers/usb/host/xhci-mem.c ---- linux-2.6.38.7/drivers/usb/host/xhci-mem.c 2011-04-22 19:20:59.000000000 -0400 -+++ linux-2.6.38.7/drivers/usb/host/xhci-mem.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1616,6 +1616,8 @@ static int xhci_check_trb_in_td_math(str +diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c +index 175434d..d63e1a8 100644 +--- a/drivers/usb/host/xhci-mem.c ++++ b/drivers/usb/host/xhci-mem.c +@@ -1615,6 +1615,8 @@ static int xhci_check_trb_in_td_math(struct xhci_hcd *xhci, gfp_t mem_flags) unsigned int num_tests; int i, ret; @@ -34990,9 +35880,10 @@ diff -urNp linux-2.6.38.7/drivers/usb/host/xhci-mem.c linux-2.6.38.7/drivers/usb num_tests = ARRAY_SIZE(simple_test_vector); for (i = 0; i < num_tests; i++) { ret = xhci_test_trb_in_td(xhci, -diff -urNp linux-2.6.38.7/drivers/usb/mon/mon_main.c linux-2.6.38.7/drivers/usb/mon/mon_main.c ---- linux-2.6.38.7/drivers/usb/mon/mon_main.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/usb/mon/mon_main.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c +index 1040511..64d4ce2 100644 +--- a/drivers/usb/mon/mon_main.c ++++ b/drivers/usb/mon/mon_main.c @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { /* * Ops @@ -35002,9 +35893,10 @@ diff -urNp linux-2.6.38.7/drivers/usb/mon/mon_main.c linux-2.6.38.7/drivers/usb/ .urb_submit = mon_submit, .urb_submit_error = mon_submit_error, .urb_complete = mon_complete, -diff -urNp linux-2.6.38.7/drivers/usb/wusbcore/wa-hc.h linux-2.6.38.7/drivers/usb/wusbcore/wa-hc.h ---- linux-2.6.38.7/drivers/usb/wusbcore/wa-hc.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/usb/wusbcore/wa-hc.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h +index d6bea3e..60b250e 100644 +--- a/drivers/usb/wusbcore/wa-hc.h ++++ b/drivers/usb/wusbcore/wa-hc.h @@ -192,7 +192,7 @@ struct wahc { struct list_head xfer_delayed_list; spinlock_t xfer_list_lock; @@ -35014,7 +35906,7 @@ diff -urNp linux-2.6.38.7/drivers/usb/wusbcore/wa-hc.h linux-2.6.38.7/drivers/us }; -@@ -246,7 +246,7 @@ static inline void wa_init(struct wahc * +@@ -246,7 +246,7 @@ static inline void wa_init(struct wahc *wa) INIT_LIST_HEAD(&wa->xfer_delayed_list); spin_lock_init(&wa->xfer_list_lock); INIT_WORK(&wa->xfer_work, wa_urb_enqueue_run); @@ -35023,9 +35915,10 @@ diff -urNp linux-2.6.38.7/drivers/usb/wusbcore/wa-hc.h linux-2.6.38.7/drivers/us } /** -diff -urNp linux-2.6.38.7/drivers/usb/wusbcore/wa-xfer.c linux-2.6.38.7/drivers/usb/wusbcore/wa-xfer.c ---- linux-2.6.38.7/drivers/usb/wusbcore/wa-xfer.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/usb/wusbcore/wa-xfer.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c +index 84b744c..5674ac2 100644 +--- a/drivers/usb/wusbcore/wa-xfer.c ++++ b/drivers/usb/wusbcore/wa-xfer.c @@ -294,7 +294,7 @@ out: */ static void wa_xfer_id_init(struct wa_xfer *xfer) @@ -35035,10 +35928,11 @@ diff -urNp linux-2.6.38.7/drivers/usb/wusbcore/wa-xfer.c linux-2.6.38.7/drivers/ } /* -diff -urNp linux-2.6.38.7/drivers/vhost/vhost.c linux-2.6.38.7/drivers/vhost/vhost.c ---- linux-2.6.38.7/drivers/vhost/vhost.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/vhost/vhost.c 2011-04-28 19:34:15.000000000 -0400 -@@ -565,7 +565,7 @@ static int init_used(struct vhost_virtqu +diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c +index ade0568..e9dee76 100644 +--- a/drivers/vhost/vhost.c ++++ b/drivers/vhost/vhost.c +@@ -565,7 +565,7 @@ static int init_used(struct vhost_virtqueue *vq, return get_user(vq->last_used_idx, &used->idx); } @@ -35047,10 +35941,11 @@ diff -urNp linux-2.6.38.7/drivers/vhost/vhost.c linux-2.6.38.7/drivers/vhost/vho { struct file *eventfp, *filep = NULL, *pollstart = NULL, *pollstop = NULL; -diff -urNp linux-2.6.38.7/drivers/video/fbcmap.c linux-2.6.38.7/drivers/video/fbcmap.c ---- linux-2.6.38.7/drivers/video/fbcmap.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/video/fbcmap.c 2011-04-28 19:34:15.000000000 -0400 -@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user +diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c +index 5c3960d..15cf8fc 100644 +--- a/drivers/video/fbcmap.c ++++ b/drivers/video/fbcmap.c +@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info) rc = -ENODEV; goto out; } @@ -35060,10 +35955,11 @@ diff -urNp linux-2.6.38.7/drivers/video/fbcmap.c linux-2.6.38.7/drivers/video/fb rc = -EINVAL; goto out1; } -diff -urNp linux-2.6.38.7/drivers/video/fbmem.c linux-2.6.38.7/drivers/video/fbmem.c ---- linux-2.6.38.7/drivers/video/fbmem.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/video/fbmem.c 2011-05-16 21:47:08.000000000 -0400 -@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in +diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c +index e2bf953..337954a 100644 +--- a/drivers/video/fbmem.c ++++ b/drivers/video/fbmem.c +@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image, image->dx += image->width + 8; } } else if (rotate == FB_ROTATE_UD) { @@ -35072,7 +35968,7 @@ diff -urNp linux-2.6.38.7/drivers/video/fbmem.c linux-2.6.38.7/drivers/video/fbm info->fbops->fb_imageblit(info, image); image->dx -= image->width + 8; } -@@ -415,7 +415,7 @@ static void fb_do_show_logo(struct fb_in +@@ -415,7 +415,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image, image->dy += image->height + 8; } } else if (rotate == FB_ROTATE_CCW) { @@ -35081,7 +35977,7 @@ diff -urNp linux-2.6.38.7/drivers/video/fbmem.c linux-2.6.38.7/drivers/video/fbm info->fbops->fb_imageblit(info, image); image->dy -= image->height + 8; } -@@ -897,6 +897,8 @@ fb_set_var(struct fb_info *info, struct +@@ -897,6 +897,8 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) int flags = info->flags; int ret = 0; @@ -35090,7 +35986,7 @@ diff -urNp linux-2.6.38.7/drivers/video/fbmem.c linux-2.6.38.7/drivers/video/fbm if (var->activate & FB_ACTIVATE_INV_MODE) { struct fb_videomode mode1, mode2; -@@ -1022,6 +1024,8 @@ static long do_fb_ioctl(struct fb_info * +@@ -1022,6 +1024,8 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, void __user *argp = (void __user *)arg; long ret = 0; @@ -35099,7 +35995,7 @@ diff -urNp linux-2.6.38.7/drivers/video/fbmem.c linux-2.6.38.7/drivers/video/fbm switch (cmd) { case FBIOGET_VSCREENINFO: if (!lock_fb_info(info)) -@@ -1101,7 +1105,7 @@ static long do_fb_ioctl(struct fb_info * +@@ -1101,7 +1105,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, return -EFAULT; if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES) return -EINVAL; @@ -35108,10 +36004,11 @@ diff -urNp linux-2.6.38.7/drivers/video/fbmem.c linux-2.6.38.7/drivers/video/fbm return -EINVAL; if (!registered_fb[con2fb.framebuffer]) request_module("fb%d", con2fb.framebuffer); -diff -urNp linux-2.6.38.7/drivers/video/i810/i810_accel.c linux-2.6.38.7/drivers/video/i810/i810_accel.c ---- linux-2.6.38.7/drivers/video/i810/i810_accel.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/video/i810/i810_accel.c 2011-04-28 19:34:15.000000000 -0400 -@@ -73,6 +73,7 @@ static inline int wait_for_space(struct +diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c +index f5bedee..28c6028 100644 +--- a/drivers/video/i810/i810_accel.c ++++ b/drivers/video/i810/i810_accel.c +@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space) } } printk("ringbuffer lockup!!!\n"); @@ -35119,9 +36016,10 @@ diff -urNp linux-2.6.38.7/drivers/video/i810/i810_accel.c linux-2.6.38.7/drivers i810_report_error(mmio); par->dev_flags |= LOCKUP; info->pixmap.scan_align = 1; -diff -urNp linux-2.6.38.7/drivers/video/pxa3xx-gcu.c linux-2.6.38.7/drivers/video/pxa3xx-gcu.c ---- linux-2.6.38.7/drivers/video/pxa3xx-gcu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/video/pxa3xx-gcu.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/video/pxa3xx-gcu.c b/drivers/video/pxa3xx-gcu.c +index cf4beb9..378e591 100644 +--- a/drivers/video/pxa3xx-gcu.c ++++ b/drivers/video/pxa3xx-gcu.c @@ -103,7 +103,7 @@ struct pxa3xx_gcu_priv { dma_addr_t shared_phys; struct resource *resource_mem; @@ -35131,10 +36029,11 @@ diff -urNp linux-2.6.38.7/drivers/video/pxa3xx-gcu.c linux-2.6.38.7/drivers/vide wait_queue_head_t wait_idle; wait_queue_head_t wait_free; spinlock_t spinlock; -diff -urNp linux-2.6.38.7/drivers/video/udlfb.c linux-2.6.38.7/drivers/video/udlfb.c ---- linux-2.6.38.7/drivers/video/udlfb.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/video/udlfb.c 2011-04-28 19:57:25.000000000 -0400 -@@ -584,11 +584,11 @@ int dlfb_handle_damage(struct dlfb_data +diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c +index 2c8364e..ef9ea63 100644 +--- a/drivers/video/udlfb.c ++++ b/drivers/video/udlfb.c +@@ -584,11 +584,11 @@ int dlfb_handle_damage(struct dlfb_data *dev, int x, int y, dlfb_urb_completion(urb); error: @@ -35150,7 +36049,7 @@ diff -urNp linux-2.6.38.7/drivers/video/udlfb.c linux-2.6.38.7/drivers/video/udl >> 10)), /* Kcycles */ &dev->cpu_kcycles_used); -@@ -709,11 +709,11 @@ static void dlfb_dpy_deferred_io(struct +@@ -709,11 +709,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info, dlfb_urb_completion(urb); error: @@ -35166,7 +36065,7 @@ diff -urNp linux-2.6.38.7/drivers/video/udlfb.c linux-2.6.38.7/drivers/video/udl >> 10)), /* Kcycles */ &dev->cpu_kcycles_used); } -@@ -1301,7 +1301,7 @@ static ssize_t metrics_bytes_rendered_sh +@@ -1301,7 +1301,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev, struct fb_info *fb_info = dev_get_drvdata(fbdev); struct dlfb_data *dev = fb_info->par; return snprintf(buf, PAGE_SIZE, "%u\n", @@ -35175,7 +36074,7 @@ diff -urNp linux-2.6.38.7/drivers/video/udlfb.c linux-2.6.38.7/drivers/video/udl } static ssize_t metrics_bytes_identical_show(struct device *fbdev, -@@ -1309,7 +1309,7 @@ static ssize_t metrics_bytes_identical_s +@@ -1309,7 +1309,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev, struct fb_info *fb_info = dev_get_drvdata(fbdev); struct dlfb_data *dev = fb_info->par; return snprintf(buf, PAGE_SIZE, "%u\n", @@ -35184,7 +36083,7 @@ diff -urNp linux-2.6.38.7/drivers/video/udlfb.c linux-2.6.38.7/drivers/video/udl } static ssize_t metrics_bytes_sent_show(struct device *fbdev, -@@ -1317,7 +1317,7 @@ static ssize_t metrics_bytes_sent_show(s +@@ -1317,7 +1317,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev, struct fb_info *fb_info = dev_get_drvdata(fbdev); struct dlfb_data *dev = fb_info->par; return snprintf(buf, PAGE_SIZE, "%u\n", @@ -35193,7 +36092,7 @@ diff -urNp linux-2.6.38.7/drivers/video/udlfb.c linux-2.6.38.7/drivers/video/udl } static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev, -@@ -1325,7 +1325,7 @@ static ssize_t metrics_cpu_kcycles_used_ +@@ -1325,7 +1325,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev, struct fb_info *fb_info = dev_get_drvdata(fbdev); struct dlfb_data *dev = fb_info->par; return snprintf(buf, PAGE_SIZE, "%u\n", @@ -35202,7 +36101,7 @@ diff -urNp linux-2.6.38.7/drivers/video/udlfb.c linux-2.6.38.7/drivers/video/udl } static ssize_t edid_show( -@@ -1382,10 +1382,10 @@ static ssize_t metrics_reset_store(struc +@@ -1382,10 +1382,10 @@ static ssize_t metrics_reset_store(struct device *fbdev, struct fb_info *fb_info = dev_get_drvdata(fbdev); struct dlfb_data *dev = fb_info->par; @@ -35217,9 +36116,10 @@ diff -urNp linux-2.6.38.7/drivers/video/udlfb.c linux-2.6.38.7/drivers/video/udl return count; } -diff -urNp linux-2.6.38.7/drivers/video/uvesafb.c linux-2.6.38.7/drivers/video/uvesafb.c ---- linux-2.6.38.7/drivers/video/uvesafb.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/video/uvesafb.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c +index 52ec095..f2b41a5 100644 +--- a/drivers/video/uvesafb.c ++++ b/drivers/video/uvesafb.c @@ -19,6 +19,7 @@ #include <linux/io.h> #include <linux/mutex.h> @@ -35237,7 +36137,7 @@ diff -urNp linux-2.6.38.7/drivers/video/uvesafb.c linux-2.6.38.7/drivers/video/u } /* -@@ -569,10 +570,32 @@ static int __devinit uvesafb_vbe_getpmi( +@@ -569,10 +570,32 @@ static int __devinit uvesafb_vbe_getpmi(struct uvesafb_ktask *task, if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) { par->pmi_setpal = par->ypan = 0; } else { @@ -35282,7 +36182,7 @@ diff -urNp linux-2.6.38.7/drivers/video/uvesafb.c linux-2.6.38.7/drivers/video/u framebuffer_release(info); return err; } -@@ -1826,6 +1854,12 @@ static int uvesafb_remove(struct platfor +@@ -1826,6 +1854,12 @@ static int uvesafb_remove(struct platform_device *dev) kfree(par->vbe_state_orig); if (par->vbe_state_saved) kfree(par->vbe_state_saved); @@ -35295,9 +36195,10 @@ diff -urNp linux-2.6.38.7/drivers/video/uvesafb.c linux-2.6.38.7/drivers/video/u } framebuffer_release(info); -diff -urNp linux-2.6.38.7/drivers/video/vesafb.c linux-2.6.38.7/drivers/video/vesafb.c ---- linux-2.6.38.7/drivers/video/vesafb.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/video/vesafb.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c +index 6a069d0..c039b56 100644 +--- a/drivers/video/vesafb.c ++++ b/drivers/video/vesafb.c @@ -9,6 +9,7 @@ */ @@ -35306,7 +36207,7 @@ diff -urNp linux-2.6.38.7/drivers/video/vesafb.c linux-2.6.38.7/drivers/video/ve #include <linux/kernel.h> #include <linux/errno.h> #include <linux/string.h> -@@ -52,8 +53,8 @@ static int vram_remap __initdata; /* +@@ -52,8 +53,8 @@ static int vram_remap __initdata; /* Set amount of memory to be used */ static int vram_total __initdata; /* Set total amount of memory */ static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */ static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */ @@ -35317,7 +36218,7 @@ diff -urNp linux-2.6.38.7/drivers/video/vesafb.c linux-2.6.38.7/drivers/video/ve static int depth __read_mostly; static int vga_compat __read_mostly; /* --------------------------------------------------------------------- */ -@@ -232,6 +233,7 @@ static int __init vesafb_probe(struct pl +@@ -232,6 +233,7 @@ static int __init vesafb_probe(struct platform_device *dev) unsigned int size_vmode; unsigned int size_remap; unsigned int size_total; @@ -35325,7 +36226,7 @@ diff -urNp linux-2.6.38.7/drivers/video/vesafb.c linux-2.6.38.7/drivers/video/ve if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB) return -ENODEV; -@@ -274,10 +276,6 @@ static int __init vesafb_probe(struct pl +@@ -274,10 +276,6 @@ static int __init vesafb_probe(struct platform_device *dev) size_remap = size_total; vesafb_fix.smem_len = size_remap; @@ -35336,7 +36237,7 @@ diff -urNp linux-2.6.38.7/drivers/video/vesafb.c linux-2.6.38.7/drivers/video/ve if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) { printk(KERN_WARNING "vesafb: cannot reserve video memory at 0x%lx\n", -@@ -319,9 +317,21 @@ static int __init vesafb_probe(struct pl +@@ -319,9 +317,21 @@ static int __init vesafb_probe(struct platform_device *dev) printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n", vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages); @@ -35360,7 +36261,7 @@ diff -urNp linux-2.6.38.7/drivers/video/vesafb.c linux-2.6.38.7/drivers/video/ve } if (screen_info.vesapm_seg < 0xc000) -@@ -329,9 +339,25 @@ static int __init vesafb_probe(struct pl +@@ -329,9 +339,25 @@ static int __init vesafb_probe(struct platform_device *dev) if (ypan || pmi_setpal) { unsigned short *pmi_base; @@ -35389,7 +36290,7 @@ diff -urNp linux-2.6.38.7/drivers/video/vesafb.c linux-2.6.38.7/drivers/video/ve printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal); if (pmi_base[3]) { printk(KERN_INFO "vesafb: pmi: ports = "); -@@ -473,6 +499,11 @@ static int __init vesafb_probe(struct pl +@@ -473,6 +499,11 @@ static int __init vesafb_probe(struct platform_device *dev) info->node, info->fix.id); return 0; err: @@ -35401,10 +36302,11 @@ diff -urNp linux-2.6.38.7/drivers/video/vesafb.c linux-2.6.38.7/drivers/video/ve if (info->screen_base) iounmap(info->screen_base); framebuffer_release(info); -diff -urNp linux-2.6.38.7/drivers/virtio/virtio_balloon.c linux-2.6.38.7/drivers/virtio/virtio_balloon.c ---- linux-2.6.38.7/drivers/virtio/virtio_balloon.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/drivers/virtio/virtio_balloon.c 2011-05-16 21:47:08.000000000 -0400 -@@ -176,6 +176,8 @@ static void update_balloon_stats(struct +diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c +index 0f1da45..63e50e5 100644 +--- a/drivers/virtio/virtio_balloon.c ++++ b/drivers/virtio/virtio_balloon.c +@@ -176,6 +176,8 @@ static void update_balloon_stats(struct virtio_balloon *vb) struct sysinfo i; int idx = 0; @@ -35413,10 +36315,11 @@ diff -urNp linux-2.6.38.7/drivers/virtio/virtio_balloon.c linux-2.6.38.7/drivers all_vm_events(events); si_meminfo(&i); -diff -urNp linux-2.6.38.7/fs/9p/vfs_inode.c linux-2.6.38.7/fs/9p/vfs_inode.c ---- linux-2.6.38.7/fs/9p/vfs_inode.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/9p/vfs_inode.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1094,7 +1094,7 @@ static void *v9fs_vfs_follow_link(struct +diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c +index b76a40b..2ae89d4 100644 +--- a/fs/9p/vfs_inode.c ++++ b/fs/9p/vfs_inode.c +@@ -1094,7 +1094,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd) void v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) { @@ -35425,10 +36328,24 @@ diff -urNp linux-2.6.38.7/fs/9p/vfs_inode.c linux-2.6.38.7/fs/9p/vfs_inode.c P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, IS_ERR(s) ? "<error>" : s); -diff -urNp linux-2.6.38.7/fs/aio.c linux-2.6.38.7/fs/aio.c ---- linux-2.6.38.7/fs/aio.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.7/fs/aio.c 2011-05-16 21:47:08.000000000 -0400 -@@ -130,7 +130,7 @@ static int aio_setup_ring(struct kioctx +diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt +index 79e2ca7..5828ad1 100644 +--- a/fs/Kconfig.binfmt ++++ b/fs/Kconfig.binfmt +@@ -86,7 +86,7 @@ config HAVE_AOUT + + config BINFMT_AOUT + tristate "Kernel support for a.out and ECOFF binaries" +- depends on HAVE_AOUT ++ depends on HAVE_AOUT && BROKEN + ---help--- + A.out (Assembler.OUTput) is a set of formats for libraries and + executables used in the earliest versions of UNIX. Linux used +diff --git a/fs/aio.c b/fs/aio.c +index 88f0ed5..48eaaf0 100644 +--- a/fs/aio.c ++++ b/fs/aio.c +@@ -130,7 +130,7 @@ static int aio_setup_ring(struct kioctx *ctx) size += sizeof(struct io_event) * nr_events; nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; @@ -35437,7 +36354,7 @@ diff -urNp linux-2.6.38.7/fs/aio.c linux-2.6.38.7/fs/aio.c return -EINVAL; nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); -@@ -1099,6 +1099,8 @@ static int read_events(struct kioctx *ct +@@ -1099,6 +1099,8 @@ static int read_events(struct kioctx *ctx, struct aio_timeout to; int retry = 0; @@ -35446,10 +36363,11 @@ diff -urNp linux-2.6.38.7/fs/aio.c linux-2.6.38.7/fs/aio.c /* needed to zero any padding within an entry (there shouldn't be * any, but C is fun! */ -diff -urNp linux-2.6.38.7/fs/attr.c linux-2.6.38.7/fs/attr.c ---- linux-2.6.38.7/fs/attr.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/attr.c 2011-04-28 19:34:15.000000000 -0400 -@@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode +diff --git a/fs/attr.c b/fs/attr.c +index 7ca4181..afd07f2 100644 +--- a/fs/attr.c ++++ b/fs/attr.c +@@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset) unsigned long limit; limit = rlimit(RLIMIT_FSIZE); @@ -35457,10 +36375,11 @@ diff -urNp linux-2.6.38.7/fs/attr.c linux-2.6.38.7/fs/attr.c if (limit != RLIM_INFINITY && offset > limit) goto out_sig; if (offset > inode->i_sb->s_maxbytes) -diff -urNp linux-2.6.38.7/fs/befs/linuxvfs.c linux-2.6.38.7/fs/befs/linuxvfs.c ---- linux-2.6.38.7/fs/befs/linuxvfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/befs/linuxvfs.c 2011-04-28 19:34:15.000000000 -0400 -@@ -499,7 +499,7 @@ static void befs_put_link(struct dentry +diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c +index b1d0c79..7e0918f 100644 +--- a/fs/befs/linuxvfs.c ++++ b/fs/befs/linuxvfs.c +@@ -499,7 +499,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) { befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); if (befs_ino->i_flags & BEFS_LONG_SYMLINK) { @@ -35469,9 +36388,10 @@ diff -urNp linux-2.6.38.7/fs/befs/linuxvfs.c linux-2.6.38.7/fs/befs/linuxvfs.c if (!IS_ERR(link)) kfree(link); } -diff -urNp linux-2.6.38.7/fs/binfmt_aout.c linux-2.6.38.7/fs/binfmt_aout.c ---- linux-2.6.38.7/fs/binfmt_aout.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/binfmt_aout.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c +index a6395bd..a5b24c4 100644 +--- a/fs/binfmt_aout.c ++++ b/fs/binfmt_aout.c @@ -16,6 +16,7 @@ #include <linux/string.h> #include <linux/fs.h> @@ -35480,7 +36400,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_aout.c linux-2.6.38.7/fs/binfmt_aout.c #include <linux/stat.h> #include <linux/fcntl.h> #include <linux/ptrace.h> -@@ -86,6 +87,8 @@ static int aout_core_dump(struct coredum +@@ -86,6 +87,8 @@ static int aout_core_dump(struct coredump_params *cprm) #endif # define START_STACK(u) ((void __user *)u.start_stack) @@ -35489,7 +36409,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_aout.c linux-2.6.38.7/fs/binfmt_aout.c fs = get_fs(); set_fs(KERNEL_DS); has_dumped = 1; -@@ -97,10 +100,12 @@ static int aout_core_dump(struct coredum +@@ -97,10 +100,12 @@ static int aout_core_dump(struct coredump_params *cprm) /* If the size of the dump file exceeds the rlimit, then see what would happen if we wrote the stack, but not the data area. */ @@ -35502,7 +36422,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_aout.c linux-2.6.38.7/fs/binfmt_aout.c if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit) dump.u_ssize = 0; -@@ -234,6 +239,8 @@ static int load_aout_binary(struct linux +@@ -234,6 +239,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs) rlim = rlimit(RLIMIT_DATA); if (rlim >= RLIM_INFINITY) rlim = ~0; @@ -35511,7 +36431,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_aout.c linux-2.6.38.7/fs/binfmt_aout.c if (ex.a_data + ex.a_bss > rlim) return -ENOMEM; -@@ -262,6 +269,27 @@ static int load_aout_binary(struct linux +@@ -262,6 +269,27 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs) install_exec_creds(bprm); current->flags &= ~PF_FORKNOEXEC; @@ -35539,7 +36459,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_aout.c linux-2.6.38.7/fs/binfmt_aout.c if (N_MAGIC(ex) == OMAGIC) { unsigned long text_addr, map_size; loff_t pos; -@@ -334,7 +362,7 @@ static int load_aout_binary(struct linux +@@ -334,7 +362,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs) down_write(¤t->mm->mmap_sem); error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data, @@ -35548,10 +36468,11 @@ diff -urNp linux-2.6.38.7/fs/binfmt_aout.c linux-2.6.38.7/fs/binfmt_aout.c MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, fd_offset + ex.a_text); up_write(¤t->mm->mmap_sem); -diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c ---- linux-2.6.38.7/fs/binfmt_elf.c 2011-04-22 19:20:59.000000000 -0400 -+++ linux-2.6.38.7/fs/binfmt_elf.c 2011-05-16 21:47:08.000000000 -0400 -@@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump +diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c +index 70470b2..3052b8a 100644 +--- a/fs/binfmt_elf.c ++++ b/fs/binfmt_elf.c +@@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump_params *cprm); #define elf_core_dump NULL #endif @@ -35562,7 +36483,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c #if ELF_EXEC_PAGESIZE > PAGE_SIZE #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE #else -@@ -70,6 +74,11 @@ static struct linux_binfmt elf_format = +@@ -70,6 +74,11 @@ static struct linux_binfmt elf_format = { .load_binary = load_elf_binary, .load_shlib = load_elf_library, .core_dump = elf_core_dump, @@ -35574,7 +36495,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c .min_coredump = ELF_EXEC_PAGESIZE, }; -@@ -77,6 +86,8 @@ static struct linux_binfmt elf_format = +@@ -77,6 +86,8 @@ static struct linux_binfmt elf_format = { static int set_brk(unsigned long start, unsigned long end) { @@ -35583,7 +36504,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c start = ELF_PAGEALIGN(start); end = ELF_PAGEALIGN(end); if (end > start) { -@@ -87,7 +98,7 @@ static int set_brk(unsigned long start, +@@ -87,7 +98,7 @@ static int set_brk(unsigned long start, unsigned long end) if (BAD_ADDR(addr)) return addr; } @@ -35592,7 +36513,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c return 0; } -@@ -148,12 +159,15 @@ create_elf_tables(struct linux_binprm *b +@@ -148,12 +159,15 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec, elf_addr_t __user *u_rand_bytes; const char *k_platform = ELF_PLATFORM; const char *k_base_platform = ELF_BASE_PLATFORM; @@ -35609,7 +36530,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c /* * In some cases (e.g. Hyper-Threading), we want to avoid L1 -@@ -195,8 +209,12 @@ create_elf_tables(struct linux_binprm *b +@@ -195,8 +209,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec, * Generate 16 random bytes for userspace PRNG seeding. */ get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes)); @@ -35624,7 +36545,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes))) return -EFAULT; -@@ -308,9 +326,11 @@ create_elf_tables(struct linux_binprm *b +@@ -308,9 +326,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec, return -EFAULT; current->mm->env_end = p; @@ -35637,7 +36558,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c return -EFAULT; return 0; } -@@ -381,10 +401,10 @@ static unsigned long load_elf_interp(str +@@ -381,10 +401,10 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex, { struct elf_phdr *elf_phdata; struct elf_phdr *eppnt; @@ -35650,7 +36571,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c unsigned long total_size; int retval, i, size; -@@ -430,6 +450,11 @@ static unsigned long load_elf_interp(str +@@ -430,6 +450,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex, goto out_close; } @@ -35662,7 +36583,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c eppnt = elf_phdata; for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) { if (eppnt->p_type == PT_LOAD) { -@@ -473,8 +498,8 @@ static unsigned long load_elf_interp(str +@@ -473,8 +498,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex, k = load_addr + eppnt->p_vaddr; if (BAD_ADDR(k) || eppnt->p_filesz > eppnt->p_memsz || @@ -35867,7 +36788,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c /* * These are the functions used to load ELF style executables and shared * libraries. There is no binary dependent code anywhere else. -@@ -544,6 +756,11 @@ static unsigned long randomize_stack_top +@@ -544,6 +756,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top) { unsigned int random_variable = 0; @@ -35879,7 +36800,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c if ((current->flags & PF_RANDOMIZE) && !(current->personality & ADDR_NO_RANDOMIZE)) { random_variable = get_random_int() & STACK_RND_MASK; -@@ -562,7 +779,7 @@ static int load_elf_binary(struct linux_ +@@ -562,7 +779,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) unsigned long load_addr = 0, load_bias = 0; int load_addr_set = 0; char * elf_interpreter = NULL; @@ -35888,7 +36809,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c struct elf_phdr *elf_ppnt, *elf_phdata; unsigned long elf_bss, elf_brk; int retval, i; -@@ -572,11 +789,11 @@ static int load_elf_binary(struct linux_ +@@ -572,11 +789,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) unsigned long start_code, end_code, start_data, end_data; unsigned long reloc_func_desc = 0; int executable_stack = EXSTACK_DEFAULT; @@ -35901,7 +36822,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c loc = kmalloc(sizeof(*loc), GFP_KERNEL); if (!loc) { -@@ -714,11 +931,81 @@ static int load_elf_binary(struct linux_ +@@ -714,11 +931,81 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) /* OK, This is the point of no return */ current->flags &= ~PF_FORKNOEXEC; @@ -35984,7 +36905,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c if (elf_read_implies_exec(loc->elf_ex, executable_stack)) current->personality |= READ_IMPLIES_EXEC; -@@ -800,6 +1087,20 @@ static int load_elf_binary(struct linux_ +@@ -800,6 +1087,20 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) #else load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr); #endif @@ -36005,7 +36926,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c } error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, -@@ -832,9 +1133,9 @@ static int load_elf_binary(struct linux_ +@@ -832,9 +1133,9 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) * allowed task size. Note that p_filesz must always be * <= p_memsz so it is only necessary to check p_memsz. */ @@ -36018,7 +36939,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c /* set_brk can never work. Avoid overflows. */ send_sig(SIGKILL, current, 0); retval = -EINVAL; -@@ -862,6 +1163,11 @@ static int load_elf_binary(struct linux_ +@@ -862,6 +1163,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) start_data += load_bias; end_data += load_bias; @@ -36030,7 +36951,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c /* Calling set_brk effectively mmaps the pages that we need * for the bss and break sections. We must do this before * mapping in the interpreter, to make sure it doesn't wind -@@ -873,9 +1179,11 @@ static int load_elf_binary(struct linux_ +@@ -873,9 +1179,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) goto out_free_dentry; } if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) { @@ -36054,7 +36975,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c { #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type)) -@@ -1124,7 +1432,7 @@ static unsigned long vma_dump_size(struc +@@ -1124,7 +1432,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma, if (vma->vm_file == NULL) return 0; @@ -36063,7 +36984,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c goto whole; /* -@@ -1346,9 +1654,9 @@ static void fill_auxv_note(struct memelf +@@ -1346,9 +1654,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm) { elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv; int i = 0; @@ -36075,7 +36996,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv); } -@@ -1854,14 +2162,14 @@ static void fill_extnum_info(struct elfh +@@ -1854,14 +2162,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum, } static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma, @@ -36092,7 +37013,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c return size; } -@@ -1955,7 +2263,7 @@ static int elf_core_dump(struct coredump +@@ -1955,7 +2263,7 @@ static int elf_core_dump(struct coredump_params *cprm) dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE); @@ -36101,7 +37022,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c offset += elf_core_extra_data_size(); e_shoff = offset; -@@ -1969,10 +2277,12 @@ static int elf_core_dump(struct coredump +@@ -1969,10 +2277,12 @@ static int elf_core_dump(struct coredump_params *cprm) offset = dataoff; size += sizeof(*elf); @@ -36114,7 +37035,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c if (size > cprm->limit || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note))) goto end_coredump; -@@ -1986,7 +2296,7 @@ static int elf_core_dump(struct coredump +@@ -1986,7 +2296,7 @@ static int elf_core_dump(struct coredump_params *cprm) phdr.p_offset = offset; phdr.p_vaddr = vma->vm_start; phdr.p_paddr = 0; @@ -36123,7 +37044,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c phdr.p_memsz = vma->vm_end - vma->vm_start; offset += phdr.p_filesz; phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0; -@@ -1997,6 +2307,7 @@ static int elf_core_dump(struct coredump +@@ -1997,6 +2307,7 @@ static int elf_core_dump(struct coredump_params *cprm) phdr.p_align = ELF_EXEC_PAGESIZE; size += sizeof(phdr); @@ -36131,7 +37052,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c if (size > cprm->limit || !dump_write(cprm->file, &phdr, sizeof(phdr))) goto end_coredump; -@@ -2021,7 +2332,7 @@ static int elf_core_dump(struct coredump +@@ -2021,7 +2332,7 @@ static int elf_core_dump(struct coredump_params *cprm) unsigned long addr; unsigned long end; @@ -36140,7 +37061,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) { struct page *page; -@@ -2030,6 +2341,7 @@ static int elf_core_dump(struct coredump +@@ -2030,6 +2341,7 @@ static int elf_core_dump(struct coredump_params *cprm) page = get_dump_page(addr); if (page) { void *kaddr = kmap(page); @@ -36148,7 +37069,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c stop = ((size += PAGE_SIZE) > cprm->limit) || !dump_write(cprm->file, kaddr, PAGE_SIZE); -@@ -2047,6 +2359,7 @@ static int elf_core_dump(struct coredump +@@ -2047,6 +2359,7 @@ static int elf_core_dump(struct coredump_params *cprm) if (e_phnum == PN_XNUM) { size += sizeof(*shdr4extnum); @@ -36254,10 +37175,11 @@ diff -urNp linux-2.6.38.7/fs/binfmt_elf.c linux-2.6.38.7/fs/binfmt_elf.c static int __init init_elf_binfmt(void) { return register_binfmt(&elf_format); -diff -urNp linux-2.6.38.7/fs/binfmt_flat.c linux-2.6.38.7/fs/binfmt_flat.c ---- linux-2.6.38.7/fs/binfmt_flat.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/binfmt_flat.c 2011-04-28 19:34:15.000000000 -0400 -@@ -567,7 +567,9 @@ static int load_flat_file(struct linux_b +diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c +index 811384b..8dcee62 100644 +--- a/fs/binfmt_flat.c ++++ b/fs/binfmt_flat.c +@@ -567,7 +567,9 @@ static int load_flat_file(struct linux_binprm * bprm, realdatastart = (unsigned long) -ENOMEM; printk("Unable to allocate RAM for process data, errno %d\n", (int)-realdatastart); @@ -36267,7 +37189,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_flat.c linux-2.6.38.7/fs/binfmt_flat.c ret = realdatastart; goto err; } -@@ -591,8 +593,10 @@ static int load_flat_file(struct linux_b +@@ -591,8 +593,10 @@ static int load_flat_file(struct linux_binprm * bprm, } if (IS_ERR_VALUE(result)) { printk("Unable to read data+bss, errno %d\n", (int)-result); @@ -36278,7 +37200,7 @@ diff -urNp linux-2.6.38.7/fs/binfmt_flat.c linux-2.6.38.7/fs/binfmt_flat.c ret = result; goto err; } -@@ -661,8 +665,10 @@ static int load_flat_file(struct linux_b +@@ -661,8 +665,10 @@ static int load_flat_file(struct linux_binprm * bprm, } if (IS_ERR_VALUE(result)) { printk("Unable to read code+data+bss, errno %d\n",(int)-result); @@ -36289,10 +37211,11 @@ diff -urNp linux-2.6.38.7/fs/binfmt_flat.c linux-2.6.38.7/fs/binfmt_flat.c ret = result; goto err; } -diff -urNp linux-2.6.38.7/fs/bio.c linux-2.6.38.7/fs/bio.c ---- linux-2.6.38.7/fs/bio.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/bio.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct b +diff --git a/fs/bio.c b/fs/bio.c +index 4bd454f..b9399e3 100644 +--- a/fs/bio.c ++++ b/fs/bio.c +@@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err) const int read = bio_data_dir(bio) == READ; struct bio_map_data *bmd = bio->bi_private; int i; @@ -36301,10 +37224,11 @@ diff -urNp linux-2.6.38.7/fs/bio.c linux-2.6.38.7/fs/bio.c __bio_for_each_segment(bvec, bio, i, 0) { char *addr = page_address(bvec->bv_page); -diff -urNp linux-2.6.38.7/fs/block_dev.c linux-2.6.38.7/fs/block_dev.c ---- linux-2.6.38.7/fs/block_dev.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/block_dev.c 2011-04-28 19:34:15.000000000 -0400 -@@ -669,7 +669,7 @@ static bool bd_may_claim(struct block_de +diff --git a/fs/block_dev.c b/fs/block_dev.c +index 59277ba..7e99054 100644 +--- a/fs/block_dev.c ++++ b/fs/block_dev.c +@@ -669,7 +669,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole, else if (bdev->bd_contains == bdev) return true; /* is a whole device which isn't held */ @@ -36313,10 +37237,11 @@ diff -urNp linux-2.6.38.7/fs/block_dev.c linux-2.6.38.7/fs/block_dev.c return true; /* is a partition of a device that is being partitioned */ else if (whole->bd_holder != NULL) return false; /* is a partition of a held device */ -diff -urNp linux-2.6.38.7/fs/btrfs/ctree.c linux-2.6.38.7/fs/btrfs/ctree.c ---- linux-2.6.38.7/fs/btrfs/ctree.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/btrfs/ctree.c 2011-04-28 19:34:15.000000000 -0400 -@@ -468,9 +468,12 @@ static noinline int __btrfs_cow_block(st +diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c +index b5baff0..b811a08 100644 +--- a/fs/btrfs/ctree.c ++++ b/fs/btrfs/ctree.c +@@ -468,9 +468,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans, free_extent_buffer(buf); add_root_to_dirty_list(root); } else { @@ -36332,7 +37257,7 @@ diff -urNp linux-2.6.38.7/fs/btrfs/ctree.c linux-2.6.38.7/fs/btrfs/ctree.c parent_start = 0; WARN_ON(trans->transid != btrfs_header_generation(parent)); -@@ -3776,7 +3779,6 @@ setup_items_for_insert(struct btrfs_tran +@@ -3776,7 +3779,6 @@ setup_items_for_insert(struct btrfs_trans_handle *trans, ret = 0; if (slot == 0) { @@ -36340,9 +37265,10 @@ diff -urNp linux-2.6.38.7/fs/btrfs/ctree.c linux-2.6.38.7/fs/btrfs/ctree.c btrfs_cpu_key_to_disk(&disk_key, cpu_key); ret = fixup_low_keys(trans, root, path, &disk_key, 1); } -diff -urNp linux-2.6.38.7/fs/btrfs/disk-io.c linux-2.6.38.7/fs/btrfs/disk-io.c ---- linux-2.6.38.7/fs/btrfs/disk-io.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/fs/btrfs/disk-io.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c +index edd9efa..479ffd2 100644 +--- a/fs/btrfs/disk-io.c ++++ b/fs/btrfs/disk-io.c @@ -41,7 +41,7 @@ #include "tree-log.h" #include "free-space-cache.h" @@ -36352,7 +37278,7 @@ diff -urNp linux-2.6.38.7/fs/btrfs/disk-io.c linux-2.6.38.7/fs/btrfs/disk-io.c static void end_workqueue_fn(struct btrfs_work *work); static void free_fs_root(struct btrfs_root *root); static void btrfs_check_super_valid(struct btrfs_fs_info *fs_info, -@@ -3030,7 +3030,7 @@ static int btrfs_cleanup_transaction(str +@@ -3030,7 +3030,7 @@ static int btrfs_cleanup_transaction(struct btrfs_root *root) return 0; } @@ -36361,10 +37287,11 @@ diff -urNp linux-2.6.38.7/fs/btrfs/disk-io.c linux-2.6.38.7/fs/btrfs/disk-io.c .write_cache_pages_lock_hook = btree_lock_page_hook, .readpage_end_io_hook = btree_readpage_end_io_hook, .submit_bio_hook = btree_submit_bio_hook, -diff -urNp linux-2.6.38.7/fs/btrfs/extent_io.h linux-2.6.38.7/fs/btrfs/extent_io.h ---- linux-2.6.38.7/fs/btrfs/extent_io.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/btrfs/extent_io.h 2011-04-28 19:34:15.000000000 -0400 -@@ -55,36 +55,36 @@ typedef int (extent_submit_bio_hook_t)(s +diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h +index 9318dfe..505cf61 100644 +--- a/fs/btrfs/extent_io.h ++++ b/fs/btrfs/extent_io.h +@@ -55,36 +55,36 @@ typedef int (extent_submit_bio_hook_t)(struct inode *inode, int rw, struct bio *bio, int mirror_num, unsigned long bio_flags, u64 bio_offset); struct extent_io_ops { @@ -36424,10 +37351,11 @@ diff -urNp linux-2.6.38.7/fs/btrfs/extent_io.h linux-2.6.38.7/fs/btrfs/extent_io }; struct extent_state { -diff -urNp linux-2.6.38.7/fs/btrfs/free-space-cache.c linux-2.6.38.7/fs/btrfs/free-space-cache.c ---- linux-2.6.38.7/fs/btrfs/free-space-cache.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/btrfs/free-space-cache.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1855,8 +1855,6 @@ u64 btrfs_alloc_from_cluster(struct btrf +diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c +index a039065..654d570 100644 +--- a/fs/btrfs/free-space-cache.c ++++ b/fs/btrfs/free-space-cache.c +@@ -1855,8 +1855,6 @@ u64 btrfs_alloc_from_cluster(struct btrfs_block_group_cache *block_group, while(1) { if (entry->bytes < bytes || entry->offset < min_start) { @@ -36445,10 +37373,11 @@ diff -urNp linux-2.6.38.7/fs/btrfs/free-space-cache.c linux-2.6.38.7/fs/btrfs/fr if (entry->bitmap && entry->bytes > bytes + empty_size) { ret = btrfs_bitmap_cluster(block_group, entry, cluster, -diff -urNp linux-2.6.38.7/fs/btrfs/inode.c linux-2.6.38.7/fs/btrfs/inode.c ---- linux-2.6.38.7/fs/btrfs/inode.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/btrfs/inode.c 2011-04-28 19:34:15.000000000 -0400 -@@ -64,7 +64,7 @@ static const struct inode_operations btr +diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c +index 9007bbd..0863573 100644 +--- a/fs/btrfs/inode.c ++++ b/fs/btrfs/inode.c +@@ -64,7 +64,7 @@ static const struct inode_operations btrfs_file_inode_operations; static const struct address_space_operations btrfs_aops; static const struct address_space_operations btrfs_symlink_aops; static const struct file_operations btrfs_dir_file_operations; @@ -36466,7 +37395,7 @@ diff -urNp linux-2.6.38.7/fs/btrfs/inode.c linux-2.6.38.7/fs/btrfs/inode.c struct dentry *dentry, struct kstat *stat) { struct inode *inode = dentry->d_inode; -@@ -6808,6 +6808,14 @@ static int btrfs_getattr(struct vfsmount +@@ -6808,6 +6808,14 @@ static int btrfs_getattr(struct vfsmount *mnt, return 0; } @@ -36481,7 +37410,7 @@ diff -urNp linux-2.6.38.7/fs/btrfs/inode.c linux-2.6.38.7/fs/btrfs/inode.c static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir, struct dentry *new_dentry) { -@@ -7311,7 +7319,7 @@ static const struct file_operations btrf +@@ -7311,7 +7319,7 @@ static const struct file_operations btrfs_dir_file_operations = { .fsync = btrfs_sync_file, }; @@ -36490,10 +37419,11 @@ diff -urNp linux-2.6.38.7/fs/btrfs/inode.c linux-2.6.38.7/fs/btrfs/inode.c .fill_delalloc = run_delalloc_range, .submit_bio_hook = btrfs_submit_bio_hook, .merge_bio_hook = btrfs_merge_bio_hook, -diff -urNp linux-2.6.38.7/fs/btrfs/ioctl.c linux-2.6.38.7/fs/btrfs/ioctl.c ---- linux-2.6.38.7/fs/btrfs/ioctl.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/fs/btrfs/ioctl.c 2011-04-28 19:34:15.000000000 -0400 -@@ -2274,9 +2274,12 @@ long btrfs_ioctl_space_info(struct btrfs +diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c +index 2ff51e6..8d66d4e 100644 +--- a/fs/btrfs/ioctl.c ++++ b/fs/btrfs/ioctl.c +@@ -2274,9 +2274,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg) for (i = 0; i < num_types; i++) { struct btrfs_space_info *tmp; @@ -36506,7 +37436,7 @@ diff -urNp linux-2.6.38.7/fs/btrfs/ioctl.c linux-2.6.38.7/fs/btrfs/ioctl.c info = NULL; rcu_read_lock(); list_for_each_entry_rcu(tmp, &root->fs_info->space_info, -@@ -2298,10 +2301,7 @@ long btrfs_ioctl_space_info(struct btrfs +@@ -2298,10 +2301,7 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg) memcpy(dest, &space, sizeof(space)); dest++; space_args.total_spaces++; @@ -36517,10 +37447,11 @@ diff -urNp linux-2.6.38.7/fs/btrfs/ioctl.c linux-2.6.38.7/fs/btrfs/ioctl.c } up_read(&info->groups_sem); } -diff -urNp linux-2.6.38.7/fs/btrfs/relocation.c linux-2.6.38.7/fs/btrfs/relocation.c ---- linux-2.6.38.7/fs/btrfs/relocation.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/btrfs/relocation.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1239,7 +1239,7 @@ static int __update_reloc_root(struct bt +diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c +index 31ade58..29dba6a 100644 +--- a/fs/btrfs/relocation.c ++++ b/fs/btrfs/relocation.c +@@ -1239,7 +1239,7 @@ static int __update_reloc_root(struct btrfs_root *root, int del) } spin_unlock(&rc->reloc_root_tree.lock); @@ -36529,10 +37460,11 @@ diff -urNp linux-2.6.38.7/fs/btrfs/relocation.c linux-2.6.38.7/fs/btrfs/relocati if (!del) { spin_lock(&rc->reloc_root_tree.lock); -diff -urNp linux-2.6.38.7/fs/cachefiles/bind.c linux-2.6.38.7/fs/cachefiles/bind.c ---- linux-2.6.38.7/fs/cachefiles/bind.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/cachefiles/bind.c 2011-04-28 19:34:15.000000000 -0400 -@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef +diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c +index a2603e7..4c28e75 100644 +--- a/fs/cachefiles/bind.c ++++ b/fs/cachefiles/bind.c +@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args) args); /* start by checking things over */ @@ -36548,10 +37480,11 @@ diff -urNp linux-2.6.38.7/fs/cachefiles/bind.c linux-2.6.38.7/fs/cachefiles/bind cache->bcull_percent < cache->brun_percent && cache->brun_percent < 100); -diff -urNp linux-2.6.38.7/fs/cachefiles/daemon.c linux-2.6.38.7/fs/cachefiles/daemon.c ---- linux-2.6.38.7/fs/cachefiles/daemon.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/cachefiles/daemon.c 2011-04-28 19:34:15.000000000 -0400 -@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st +diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c +index 0a1467b..6a53245 100644 +--- a/fs/cachefiles/daemon.c ++++ b/fs/cachefiles/daemon.c +@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer, if (n > buflen) return -EMSGSIZE; @@ -36560,7 +37493,7 @@ diff -urNp linux-2.6.38.7/fs/cachefiles/daemon.c linux-2.6.38.7/fs/cachefiles/da return -EFAULT; return n; -@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(s +@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file, if (test_bit(CACHEFILES_DEAD, &cache->flags)) return -EIO; @@ -36569,7 +37502,7 @@ diff -urNp linux-2.6.38.7/fs/cachefiles/daemon.c linux-2.6.38.7/fs/cachefiles/da return -EOPNOTSUPP; /* drag the command string into the kernel so we can parse it */ -@@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struc +@@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args) if (args[0] != '%' || args[1] != '\0') return -EINVAL; @@ -36578,7 +37511,7 @@ diff -urNp linux-2.6.38.7/fs/cachefiles/daemon.c linux-2.6.38.7/fs/cachefiles/da return cachefiles_daemon_range_error(cache, args); cache->fstop_percent = fstop; -@@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struc +@@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args) if (args[0] != '%' || args[1] != '\0') return -EINVAL; @@ -36587,9 +37520,10 @@ diff -urNp linux-2.6.38.7/fs/cachefiles/daemon.c linux-2.6.38.7/fs/cachefiles/da return cachefiles_daemon_range_error(cache, args); cache->bstop_percent = bstop; -diff -urNp linux-2.6.38.7/fs/cachefiles/internal.h linux-2.6.38.7/fs/cachefiles/internal.h ---- linux-2.6.38.7/fs/cachefiles/internal.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/cachefiles/internal.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h +index bd6bc1b..b627b53 100644 +--- a/fs/cachefiles/internal.h ++++ b/fs/cachefiles/internal.h @@ -57,7 +57,7 @@ struct cachefiles_cache { wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */ struct rb_root active_nodes; /* active nodes (can't be culled) */ @@ -36599,7 +37533,7 @@ diff -urNp linux-2.6.38.7/fs/cachefiles/internal.h linux-2.6.38.7/fs/cachefiles/ unsigned frun_percent; /* when to stop culling (% files) */ unsigned fcull_percent; /* when to start culling (% files) */ unsigned fstop_percent; /* when to stop allocating (% files) */ -@@ -169,19 +169,19 @@ extern int cachefiles_check_in_use(struc +@@ -169,19 +169,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache, * proc.c */ #ifdef CONFIG_CACHEFILES_HISTOGRAM @@ -36624,9 +37558,10 @@ diff -urNp linux-2.6.38.7/fs/cachefiles/internal.h linux-2.6.38.7/fs/cachefiles/ } #else -diff -urNp linux-2.6.38.7/fs/cachefiles/namei.c linux-2.6.38.7/fs/cachefiles/namei.c ---- linux-2.6.38.7/fs/cachefiles/namei.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/cachefiles/namei.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c +index 42c7faf..475b0ca 100644 +--- a/fs/cachefiles/namei.c ++++ b/fs/cachefiles/namei.c @@ -309,7 +309,7 @@ try_again: /* first step is to make up a grave dentry in the graveyard */ sprintf(nbuffer, "%08x%08x", @@ -36636,9 +37571,10 @@ diff -urNp linux-2.6.38.7/fs/cachefiles/namei.c linux-2.6.38.7/fs/cachefiles/nam /* do the multiway lock magic */ trap = lock_rename(cache->graveyard, dir); -diff -urNp linux-2.6.38.7/fs/cachefiles/proc.c linux-2.6.38.7/fs/cachefiles/proc.c ---- linux-2.6.38.7/fs/cachefiles/proc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/cachefiles/proc.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c +index eccd339..4c1d995 100644 +--- a/fs/cachefiles/proc.c ++++ b/fs/cachefiles/proc.c @@ -14,9 +14,9 @@ #include <linux/seq_file.h> #include "internal.h" @@ -36652,7 +37588,7 @@ diff -urNp linux-2.6.38.7/fs/cachefiles/proc.c linux-2.6.38.7/fs/cachefiles/proc /* * display the latency histogram -@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(str +@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v) return 0; default: index = (unsigned long) v - 3; @@ -36665,10 +37601,11 @@ diff -urNp linux-2.6.38.7/fs/cachefiles/proc.c linux-2.6.38.7/fs/cachefiles/proc if (x == 0 && y == 0 && z == 0) return 0; -diff -urNp linux-2.6.38.7/fs/cachefiles/rdwr.c linux-2.6.38.7/fs/cachefiles/rdwr.c ---- linux-2.6.38.7/fs/cachefiles/rdwr.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/cachefiles/rdwr.c 2011-04-28 19:34:15.000000000 -0400 -@@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache +diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c +index 0e3c092..c4f23ec 100644 +--- a/fs/cachefiles/rdwr.c ++++ b/fs/cachefiles/rdwr.c +@@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page) old_fs = get_fs(); set_fs(KERNEL_DS); ret = file->f_op->write( @@ -36677,10 +37614,11 @@ diff -urNp linux-2.6.38.7/fs/cachefiles/rdwr.c linux-2.6.38.7/fs/cachefiles/rdwr set_fs(old_fs); kunmap(page); if (ret != len) -diff -urNp linux-2.6.38.7/fs/ceph/dir.c linux-2.6.38.7/fs/ceph/dir.c ---- linux-2.6.38.7/fs/ceph/dir.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/ceph/dir.c 2011-04-28 19:34:15.000000000 -0400 -@@ -226,7 +226,7 @@ static int ceph_readdir(struct file *fil +diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c +index ebafa65..7e6acd8 100644 +--- a/fs/ceph/dir.c ++++ b/fs/ceph/dir.c +@@ -226,7 +226,7 @@ static int ceph_readdir(struct file *filp, void *dirent, filldir_t filldir) struct ceph_fs_client *fsc = ceph_inode_to_client(inode); struct ceph_mds_client *mdsc = fsc->mdsc; unsigned frag = fpos_frag(filp->f_pos); @@ -36698,10 +37636,11 @@ diff -urNp linux-2.6.38.7/fs/ceph/dir.c linux-2.6.38.7/fs/ceph/dir.c u64 pos = ceph_make_fpos(frag, off); struct ceph_mds_reply_inode *in = rinfo->dir_in[off - fi->offset].in; -diff -urNp linux-2.6.38.7/fs/cifs/cifs_debug.c linux-2.6.38.7/fs/cifs/cifs_debug.c ---- linux-2.6.38.7/fs/cifs/cifs_debug.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/cifs/cifs_debug.c 2011-04-28 19:57:25.000000000 -0400 -@@ -279,25 +279,25 @@ static ssize_t cifs_stats_proc_write(str +diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c +index 65829d3..bbc9560 100644 +--- a/fs/cifs/cifs_debug.c ++++ b/fs/cifs/cifs_debug.c +@@ -279,25 +279,25 @@ static ssize_t cifs_stats_proc_write(struct file *file, tcon = list_entry(tmp3, struct cifsTconInfo, tcon_list); @@ -36746,7 +37685,7 @@ diff -urNp linux-2.6.38.7/fs/cifs/cifs_debug.c linux-2.6.38.7/fs/cifs/cifs_debug } } } -@@ -357,41 +357,41 @@ static int cifs_stats_proc_show(struct s +@@ -357,41 +357,41 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v) if (tcon->need_reconnect) seq_puts(m, "\tDISCONNECTED "); seq_printf(m, "\nSMBs: %d Oplock Breaks: %d", @@ -36808,9 +37747,10 @@ diff -urNp linux-2.6.38.7/fs/cifs/cifs_debug.c linux-2.6.38.7/fs/cifs/cifs_debug } } } -diff -urNp linux-2.6.38.7/fs/cifs/cifsglob.h linux-2.6.38.7/fs/cifs/cifsglob.h ---- linux-2.6.38.7/fs/cifs/cifsglob.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/cifs/cifsglob.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h +index 17afb0f..c18ca8d 100644 +--- a/fs/cifs/cifsglob.h ++++ b/fs/cifs/cifsglob.h @@ -305,28 +305,28 @@ struct cifsTconInfo { __u16 Flags; /* optional support bits */ enum statusEnum tidStatus; @@ -36862,7 +37802,7 @@ diff -urNp linux-2.6.38.7/fs/cifs/cifsglob.h linux-2.6.38.7/fs/cifs/cifsglob.h #ifdef CONFIG_CIFS_STATS2 unsigned long long time_writes; unsigned long long time_reads; -@@ -509,7 +509,7 @@ static inline char CIFS_DIR_SEP(const st +@@ -509,7 +509,7 @@ static inline char CIFS_DIR_SEP(const struct cifs_sb_info *cifs_sb) } #ifdef CONFIG_CIFS_STATS @@ -36871,9 +37811,10 @@ diff -urNp linux-2.6.38.7/fs/cifs/cifsglob.h linux-2.6.38.7/fs/cifs/cifsglob.h static inline void cifs_stats_bytes_written(struct cifsTconInfo *tcon, unsigned int bytes) -diff -urNp linux-2.6.38.7/fs/cifs/link.c linux-2.6.38.7/fs/cifs/link.c ---- linux-2.6.38.7/fs/cifs/link.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/cifs/link.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/cifs/link.c b/fs/cifs/link.c +index e8804d3..9e0f281 100644 +--- a/fs/cifs/link.c ++++ b/fs/cifs/link.c @@ -577,7 +577,7 @@ symlink_exit: void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) @@ -36883,9 +37824,10 @@ diff -urNp linux-2.6.38.7/fs/cifs/link.c linux-2.6.38.7/fs/cifs/link.c if (!IS_ERR(p)) kfree(p); } -diff -urNp linux-2.6.38.7/fs/coda/cache.c linux-2.6.38.7/fs/coda/cache.c ---- linux-2.6.38.7/fs/coda/cache.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/coda/cache.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/fs/coda/cache.c b/fs/coda/cache.c +index 6901578..d402eb5 100644 +--- a/fs/coda/cache.c ++++ b/fs/coda/cache.c @@ -24,7 +24,7 @@ #include "coda_linux.h" #include "coda_cache.h" @@ -36895,7 +37837,7 @@ diff -urNp linux-2.6.38.7/fs/coda/cache.c linux-2.6.38.7/fs/coda/cache.c /* replace or extend an acl cache hit */ void coda_cache_enter(struct inode *inode, int mask) -@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inod +@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask) struct coda_inode_info *cii = ITOC(inode); spin_lock(&cii->c_lock); @@ -36904,7 +37846,7 @@ diff -urNp linux-2.6.38.7/fs/coda/cache.c linux-2.6.38.7/fs/coda/cache.c if (cii->c_uid != current_fsuid()) { cii->c_uid = current_fsuid(); cii->c_cached_perm = mask; -@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode +@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode) { struct coda_inode_info *cii = ITOC(inode); spin_lock(&cii->c_lock); @@ -36921,7 +37863,7 @@ diff -urNp linux-2.6.38.7/fs/coda/cache.c linux-2.6.38.7/fs/coda/cache.c } -@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode +@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask) spin_lock(&cii->c_lock); hit = (mask & cii->c_cached_perm) == mask && cii->c_uid == current_fsuid() && @@ -36930,27 +37872,11 @@ diff -urNp linux-2.6.38.7/fs/coda/cache.c linux-2.6.38.7/fs/coda/cache.c spin_unlock(&cii->c_lock); return hit; -diff -urNp linux-2.6.38.7/fs/compat_binfmt_elf.c linux-2.6.38.7/fs/compat_binfmt_elf.c ---- linux-2.6.38.7/fs/compat_binfmt_elf.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/compat_binfmt_elf.c 2011-04-28 19:34: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.38.7/fs/compat.c linux-2.6.38.7/fs/compat.c ---- linux-2.6.38.7/fs/compat.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/compat.c 2011-05-16 21:47:08.000000000 -0400 -@@ -594,7 +594,7 @@ ssize_t compat_rw_copy_check_uvector(int +diff --git a/fs/compat.c b/fs/compat.c +index 691c3fd..c800dd4 100644 +--- a/fs/compat.c ++++ b/fs/compat.c +@@ -594,7 +594,7 @@ ssize_t compat_rw_copy_check_uvector(int type, goto out; ret = -EINVAL; @@ -36967,7 +37893,7 @@ diff -urNp linux-2.6.38.7/fs/compat.c linux-2.6.38.7/fs/compat.c int result; }; -@@ -893,6 +894,10 @@ static int compat_fillonedir(void *__buf +@@ -893,6 +894,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen, buf->result = -EOVERFLOW; return -EOVERFLOW; } @@ -36978,7 +37904,7 @@ diff -urNp linux-2.6.38.7/fs/compat.c linux-2.6.38.7/fs/compat.c buf->result++; dirent = buf->dirent; if (!access_ok(VERIFY_WRITE, dirent, -@@ -925,6 +930,7 @@ asmlinkage long compat_sys_old_readdir(u +@@ -925,6 +930,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd, buf.result = 0; buf.dirent = dirent; @@ -36994,7 +37920,7 @@ diff -urNp linux-2.6.38.7/fs/compat.c linux-2.6.38.7/fs/compat.c int count; int error; }; -@@ -966,6 +973,10 @@ static int compat_filldir(void *__buf, c +@@ -966,6 +973,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen, buf->error = -EOVERFLOW; return -EOVERFLOW; } @@ -37005,7 +37931,7 @@ diff -urNp linux-2.6.38.7/fs/compat.c linux-2.6.38.7/fs/compat.c dirent = buf->previous; if (dirent) { if (__put_user(offset, &dirent->d_off)) -@@ -1013,6 +1024,7 @@ asmlinkage long compat_sys_getdents(unsi +@@ -1013,6 +1024,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd, buf.previous = NULL; buf.count = count; buf.error = 0; @@ -37021,7 +37947,7 @@ diff -urNp linux-2.6.38.7/fs/compat.c linux-2.6.38.7/fs/compat.c int count; int error; }; -@@ -1050,6 +1063,10 @@ static int compat_filldir64(void * __buf +@@ -1050,6 +1063,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t buf->error = -EINVAL; /* only used if we fail.. */ if (reclen > buf->count) return -EINVAL; @@ -37032,7 +37958,7 @@ diff -urNp linux-2.6.38.7/fs/compat.c linux-2.6.38.7/fs/compat.c dirent = buf->previous; if (dirent) { -@@ -1101,6 +1118,7 @@ asmlinkage long compat_sys_getdents64(un +@@ -1101,6 +1118,7 @@ asmlinkage long compat_sys_getdents64(unsigned int fd, buf.previous = NULL; buf.count = count; buf.error = 0; @@ -37129,7 +38055,7 @@ diff -urNp linux-2.6.38.7/fs/compat.c linux-2.6.38.7/fs/compat.c out: if (bprm->mm) { acct_arg_size(bprm, 0); -@@ -1712,6 +1787,8 @@ int compat_core_sys_select(int n, compat +@@ -1712,6 +1787,8 @@ int compat_core_sys_select(int n, compat_ulong_t __user *inp, struct fdtable *fdt; long stack_fds[SELECT_STACK_ALLOC/sizeof(long)]; @@ -37138,10 +38064,29 @@ diff -urNp linux-2.6.38.7/fs/compat.c linux-2.6.38.7/fs/compat.c if (n < 0) goto out_nofds; -diff -urNp linux-2.6.38.7/fs/compat_ioctl.c linux-2.6.38.7/fs/compat_ioctl.c ---- linux-2.6.38.7/fs/compat_ioctl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/compat_ioctl.c 2011-04-28 19:34:15.000000000 -0400 -@@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsi +diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c +index 112e45a..b59845b 100644 +--- a/fs/compat_binfmt_elf.c ++++ b/fs/compat_binfmt_elf.c +@@ -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 --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c +index 61abb63..d93cbe5 100644 +--- a/fs/compat_ioctl.c ++++ b/fs/compat_ioctl.c +@@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsigned int fd, unsigned int cmd, err = get_user(palp, &up->palette); err |= get_user(length, &up->length); @@ -37150,7 +38095,7 @@ diff -urNp linux-2.6.38.7/fs/compat_ioctl.c linux-2.6.38.7/fs/compat_ioctl.c up_native = compat_alloc_user_space(sizeof(struct video_spu_palette)); err = put_user(compat_ptr(palp), &up_native->palette); -@@ -1638,8 +1640,8 @@ asmlinkage long compat_sys_ioctl(unsigne +@@ -1638,8 +1640,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd, static int __init init_sys32_ioctl_cmp(const void *p, const void *q) { unsigned int a, b; @@ -37161,10 +38106,11 @@ diff -urNp linux-2.6.38.7/fs/compat_ioctl.c linux-2.6.38.7/fs/compat_ioctl.c if (a > b) return 1; if (a < b) -diff -urNp linux-2.6.38.7/fs/configfs/dir.c linux-2.6.38.7/fs/configfs/dir.c ---- linux-2.6.38.7/fs/configfs/dir.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/configfs/dir.c 2011-05-11 18:34:57.000000000 -0400 -@@ -1571,7 +1571,8 @@ static int configfs_readdir(struct file +diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c +index 90ff3cb..c310eae 100644 +--- a/fs/configfs/dir.c ++++ b/fs/configfs/dir.c +@@ -1571,7 +1571,8 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir } for (p=q->next; p!= &parent_sd->s_children; p=p->next) { struct configfs_dirent *next; @@ -37174,7 +38120,7 @@ diff -urNp linux-2.6.38.7/fs/configfs/dir.c linux-2.6.38.7/fs/configfs/dir.c int len; next = list_entry(p, struct configfs_dirent, -@@ -1580,7 +1581,12 @@ static int configfs_readdir(struct file +@@ -1580,7 +1581,12 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir continue; name = configfs_get_name(next); @@ -37188,10 +38134,11 @@ diff -urNp linux-2.6.38.7/fs/configfs/dir.c linux-2.6.38.7/fs/configfs/dir.c if (next->s_dentry) ino = next->s_dentry->d_inode->i_ino; else -diff -urNp linux-2.6.38.7/fs/dcache.c linux-2.6.38.7/fs/dcache.c ---- linux-2.6.38.7/fs/dcache.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.7/fs/dcache.c 2011-04-28 19:34:15.000000000 -0400 -@@ -3092,7 +3092,7 @@ void __init vfs_caches_init(unsigned lon +diff --git a/fs/dcache.c b/fs/dcache.c +index 1baddc1..f72fb82 100644 +--- a/fs/dcache.c ++++ b/fs/dcache.c +@@ -3092,7 +3092,7 @@ void __init vfs_caches_init(unsigned long mempages) mempages -= reserve; names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0, @@ -37200,10 +38147,11 @@ diff -urNp linux-2.6.38.7/fs/dcache.c linux-2.6.38.7/fs/dcache.c dcache_init(); inode_init(); -diff -urNp linux-2.6.38.7/fs/dlm/lockspace.c linux-2.6.38.7/fs/dlm/lockspace.c ---- linux-2.6.38.7/fs/dlm/lockspace.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/dlm/lockspace.c 2011-04-28 19:34:15.000000000 -0400 -@@ -200,7 +200,7 @@ static int dlm_uevent(struct kset *kset, +diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c +index f994a7d..4dca551 100644 +--- a/fs/dlm/lockspace.c ++++ b/fs/dlm/lockspace.c +@@ -200,7 +200,7 @@ static int dlm_uevent(struct kset *kset, struct kobject *kobj, return 0; } @@ -37212,10 +38160,11 @@ diff -urNp linux-2.6.38.7/fs/dlm/lockspace.c linux-2.6.38.7/fs/dlm/lockspace.c .uevent = dlm_uevent, }; -diff -urNp linux-2.6.38.7/fs/ecryptfs/inode.c linux-2.6.38.7/fs/ecryptfs/inode.c ---- linux-2.6.38.7/fs/ecryptfs/inode.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/ecryptfs/inode.c 2011-04-28 19:34:15.000000000 -0400 -@@ -658,7 +658,7 @@ static int ecryptfs_readlink_lower(struc +diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c +index b592938..043ff74 100644 +--- a/fs/ecryptfs/inode.c ++++ b/fs/ecryptfs/inode.c +@@ -658,7 +658,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf, old_fs = get_fs(); set_fs(get_ds()); rc = lower_dentry->d_inode->i_op->readlink(lower_dentry, @@ -37224,7 +38173,7 @@ diff -urNp linux-2.6.38.7/fs/ecryptfs/inode.c linux-2.6.38.7/fs/ecryptfs/inode.c lower_bufsiz); set_fs(old_fs); if (rc < 0) -@@ -704,7 +704,7 @@ static void *ecryptfs_follow_link(struct +@@ -704,7 +704,7 @@ static void *ecryptfs_follow_link(struct dentry *dentry, struct nameidata *nd) } old_fs = get_fs(); set_fs(get_ds()); @@ -37242,9 +38191,10 @@ diff -urNp linux-2.6.38.7/fs/ecryptfs/inode.c linux-2.6.38.7/fs/ecryptfs/inode.c if (!IS_ERR(buf)) { /* Free the char* */ kfree(buf); -diff -urNp linux-2.6.38.7/fs/ecryptfs/miscdev.c linux-2.6.38.7/fs/ecryptfs/miscdev.c ---- linux-2.6.38.7/fs/ecryptfs/miscdev.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/ecryptfs/miscdev.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c +index 940a82e..63af89e 100644 +--- a/fs/ecryptfs/miscdev.c ++++ b/fs/ecryptfs/miscdev.c @@ -328,7 +328,7 @@ check_list: goto out_unlock_msg_ctx; i = 5; @@ -37254,9 +38204,10 @@ diff -urNp linux-2.6.38.7/fs/ecryptfs/miscdev.c linux-2.6.38.7/fs/ecryptfs/miscd goto out_unlock_msg_ctx; i += packet_length_size; if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size)) -diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c ---- linux-2.6.38.7/fs/exec.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/exec.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/fs/exec.c b/fs/exec.c +index 52a447d..3294552 100644 +--- a/fs/exec.c ++++ b/fs/exec.c @@ -55,12 +55,24 @@ #include <linux/fs_struct.h> #include <linux/pipe_fs_i.h> @@ -37291,7 +38242,7 @@ diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c /* The maximal length of core_pattern is also specified in sysctl.c */ -@@ -120,7 +132,7 @@ SYSCALL_DEFINE1(uselib, const char __use +@@ -120,7 +132,7 @@ SYSCALL_DEFINE1(uselib, const char __user *, library) goto out; file = do_filp_open(AT_FDCWD, tmp, @@ -37300,7 +38251,7 @@ diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c MAY_READ | MAY_EXEC | MAY_OPEN); putname(tmp); error = PTR_ERR(file); -@@ -187,18 +199,10 @@ struct page *get_arg_page(struct linux_b +@@ -187,18 +199,10 @@ struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos, int write) { struct page *page; @@ -37322,7 +38273,7 @@ diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c return NULL; if (write) { -@@ -273,6 +277,11 @@ static int __bprm_mm_init(struct linux_b +@@ -273,6 +277,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm) vma->vm_end = STACK_TOP_MAX; vma->vm_start = vma->vm_end - PAGE_SIZE; vma->vm_flags = VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP; @@ -37334,7 +38285,7 @@ diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); INIT_LIST_HEAD(&vma->anon_vma_chain); -@@ -287,6 +296,12 @@ static int __bprm_mm_init(struct linux_b +@@ -287,6 +296,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm) mm->stack_vm = mm->total_vm = 1; up_write(&mm->mmap_sem); bprm->p = vma->vm_end - sizeof(void *); @@ -37347,7 +38298,7 @@ diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c return 0; err: up_write(&mm->mmap_sem); -@@ -522,7 +537,7 @@ int copy_strings_kernel(int argc, const +@@ -522,7 +537,7 @@ int copy_strings_kernel(int argc, const char *const *argv, int r; mm_segment_t oldfs = get_fs(); set_fs(KERNEL_DS); @@ -37356,7 +38307,7 @@ diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c set_fs(oldfs); return r; } -@@ -552,7 +567,8 @@ static int shift_arg_pages(struct vm_are +@@ -552,7 +567,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) unsigned long new_end = old_end - shift; struct mmu_gather *tlb; @@ -37366,7 +38317,7 @@ diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c /* * ensure there are no vmas between where we want to go -@@ -561,6 +577,10 @@ static int shift_arg_pages(struct vm_are +@@ -561,6 +577,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) if (vma != find_vma(mm, new_start)) return -EFAULT; @@ -37377,7 +38328,7 @@ diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c /* * cover the whole range: [new_start, old_end) */ -@@ -641,10 +661,6 @@ int setup_arg_pages(struct linux_binprm +@@ -641,10 +661,6 @@ int setup_arg_pages(struct linux_binprm *bprm, stack_top = arch_align_stack(stack_top); stack_top = PAGE_ALIGN(stack_top); @@ -37388,7 +38339,7 @@ diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c stack_shift = vma->vm_end - stack_top; bprm->p -= stack_shift; -@@ -656,8 +672,28 @@ int setup_arg_pages(struct linux_binprm +@@ -656,8 +672,28 @@ int setup_arg_pages(struct linux_binprm *bprm, bprm->exec -= stack_shift; down_write(&mm->mmap_sem); @@ -37417,7 +38368,7 @@ diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c /* * Adjust stack execute permissions; explicitly enable for * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone -@@ -676,13 +712,6 @@ int setup_arg_pages(struct linux_binprm +@@ -676,13 +712,6 @@ int setup_arg_pages(struct linux_binprm *bprm, goto out_unlock; BUG_ON(prev != vma); @@ -37440,7 +38391,7 @@ diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c MAY_EXEC | MAY_OPEN); if (IS_ERR(file)) goto out; -@@ -760,7 +789,7 @@ int kernel_read(struct file *file, loff_ +@@ -760,7 +789,7 @@ int kernel_read(struct file *file, loff_t offset, old_fs = get_fs(); set_fs(get_ds()); /* The cast to a user pointer is valid due to the set_fs() */ @@ -37449,7 +38400,7 @@ diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c set_fs(old_fs); return result; } -@@ -1182,7 +1211,7 @@ int check_unsafe_exec(struct linux_binpr +@@ -1182,7 +1211,7 @@ int check_unsafe_exec(struct linux_binprm *bprm) } rcu_read_unlock(); @@ -37551,7 +38502,7 @@ diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c out: if (bprm->mm) { acct_arg_size(bprm, 0); -@@ -1501,7 +1591,7 @@ static int expand_corename(struct core_n +@@ -1501,7 +1591,7 @@ static int expand_corename(struct core_name *cn) { char *old_corename = cn->corename; @@ -37560,7 +38511,7 @@ diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL); if (!cn->corename) { -@@ -1554,7 +1644,7 @@ static int format_corename(struct core_n +@@ -1554,7 +1644,7 @@ static int format_corename(struct core_name *cn, long signr) int pid_in_pattern = 0; int err = 0; @@ -37778,7 +38729,7 @@ diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c static int zap_process(struct task_struct *start, int exit_code) { struct task_struct *t; -@@ -1852,17 +2144,17 @@ static void wait_for_dump_helpers(struct +@@ -1852,17 +2144,17 @@ static void wait_for_dump_helpers(struct file *file) pipe = file->f_path.dentry->d_inode->i_pipe; pipe_lock(pipe); @@ -37801,7 +38752,7 @@ diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c pipe_unlock(pipe); } -@@ -1923,7 +2215,7 @@ void do_coredump(long signr, int exit_co +@@ -1923,7 +2215,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs) int retval = 0; int flag = 0; int ispipe; @@ -37810,7 +38761,7 @@ diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c struct coredump_params cprm = { .signr = signr, .regs = regs, -@@ -1938,6 +2230,9 @@ void do_coredump(long signr, int exit_co +@@ -1938,6 +2230,9 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs) audit_core_dumps(signr); @@ -37820,7 +38771,7 @@ diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c binfmt = mm->binfmt; if (!binfmt || !binfmt->core_dump) goto fail; -@@ -1978,6 +2273,8 @@ void do_coredump(long signr, int exit_co +@@ -1978,6 +2273,8 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs) goto fail_corename; } @@ -37829,7 +38780,7 @@ diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c if (ispipe) { int dump_count; char **helper_argv; -@@ -2005,7 +2302,7 @@ void do_coredump(long signr, int exit_co +@@ -2005,7 +2302,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs) } cprm.limit = RLIM_INFINITY; @@ -37847,10 +38798,11 @@ diff -urNp linux-2.6.38.7/fs/exec.c linux-2.6.38.7/fs/exec.c fail_unlock: kfree(cn.corename); fail_corename: -diff -urNp linux-2.6.38.7/fs/ext2/balloc.c linux-2.6.38.7/fs/ext2/balloc.c ---- linux-2.6.38.7/fs/ext2/balloc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/ext2/balloc.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e +diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c +index 0d06f4e..3b518f1 100644 +--- a/fs/ext2/balloc.c ++++ b/fs/ext2/balloc.c +@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi) free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count); @@ -37859,10 +38811,11 @@ diff -urNp linux-2.6.38.7/fs/ext2/balloc.c linux-2.6.38.7/fs/ext2/balloc.c sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.38.7/fs/ext3/balloc.c linux-2.6.38.7/fs/ext3/balloc.c ---- linux-2.6.38.7/fs/ext3/balloc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/ext3/balloc.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1441,7 +1441,7 @@ static int ext3_has_free_blocks(struct e +diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c +index 045995c..6105d65 100644 +--- a/fs/ext3/balloc.c ++++ b/fs/ext3/balloc.c +@@ -1441,7 +1441,7 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi) free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count); @@ -37871,10 +38824,11 @@ diff -urNp linux-2.6.38.7/fs/ext3/balloc.c linux-2.6.38.7/fs/ext3/balloc.c sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.38.7/fs/ext4/balloc.c linux-2.6.38.7/fs/ext4/balloc.c ---- linux-2.6.38.7/fs/ext4/balloc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/ext4/balloc.c 2011-04-28 19:34:15.000000000 -0400 -@@ -519,7 +519,7 @@ static int ext4_has_free_blocks(struct e +diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c +index adf96b8..c4e34d6 100644 +--- a/fs/ext4/balloc.c ++++ b/fs/ext4/balloc.c +@@ -519,7 +519,7 @@ static int ext4_has_free_blocks(struct ext4_sb_info *sbi, s64 nblocks) /* Hm, nope. Are (enough) root reserved blocks available? */ if (sbi->s_resuid == current_fsuid() || ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) || @@ -37883,9 +38837,10 @@ diff -urNp linux-2.6.38.7/fs/ext4/balloc.c linux-2.6.38.7/fs/ext4/balloc.c if (free_blocks >= (nblocks + dirty_blocks)) return 1; } -diff -urNp linux-2.6.38.7/fs/ext4/ext4.h linux-2.6.38.7/fs/ext4/ext4.h ---- linux-2.6.38.7/fs/ext4/ext4.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/ext4/ext4.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h +index 0783b4f..353cc59 100644 +--- a/fs/ext4/ext4.h ++++ b/fs/ext4/ext4.h @@ -1166,19 +1166,19 @@ struct ext4_sb_info { unsigned long s_mb_last_start; @@ -37916,10 +38871,11 @@ diff -urNp linux-2.6.38.7/fs/ext4/ext4.h linux-2.6.38.7/fs/ext4/ext4.h atomic_t s_lock_busy; /* locality groups */ -diff -urNp linux-2.6.38.7/fs/ext4/mballoc.c linux-2.6.38.7/fs/ext4/mballoc.c ---- linux-2.6.38.7/fs/ext4/mballoc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/ext4/mballoc.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1846,7 +1846,7 @@ void ext4_mb_simple_scan_group(struct ex +diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c +index 1738236..08fc93c9 100644 +--- a/fs/ext4/mballoc.c ++++ b/fs/ext4/mballoc.c +@@ -1848,7 +1848,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac, BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len); if (EXT4_SB(sb)->s_mb_stats) @@ -37928,7 +38884,7 @@ diff -urNp linux-2.6.38.7/fs/ext4/mballoc.c linux-2.6.38.7/fs/ext4/mballoc.c break; } -@@ -2140,7 +2140,7 @@ repeat: +@@ -2142,7 +2142,7 @@ repeat: ac->ac_status = AC_STATUS_CONTINUE; ac->ac_flags |= EXT4_MB_HINT_FIRST; cr = 3; @@ -37937,7 +38893,7 @@ diff -urNp linux-2.6.38.7/fs/ext4/mballoc.c linux-2.6.38.7/fs/ext4/mballoc.c goto repeat; } } -@@ -2183,6 +2183,8 @@ static int ext4_mb_seq_groups_show(struc +@@ -2185,6 +2185,8 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v) ext4_grpblk_t counters[16]; } sg; @@ -37946,7 +38902,7 @@ diff -urNp linux-2.6.38.7/fs/ext4/mballoc.c linux-2.6.38.7/fs/ext4/mballoc.c group--; if (group == 0) seq_printf(seq, "#%-5s: %-5s %-5s %-5s " -@@ -2606,25 +2608,25 @@ int ext4_mb_release(struct super_block * +@@ -2608,25 +2610,25 @@ int ext4_mb_release(struct super_block *sb) if (sbi->s_mb_stats) { printk(KERN_INFO "EXT4-fs: mballoc: %u blocks %u reqs (%u success)\n", @@ -37982,7 +38938,7 @@ diff -urNp linux-2.6.38.7/fs/ext4/mballoc.c linux-2.6.38.7/fs/ext4/mballoc.c } free_percpu(sbi->s_locality_groups); -@@ -3100,16 +3102,16 @@ static void ext4_mb_collect_stats(struct +@@ -3102,16 +3104,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac) struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb); if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) { @@ -38005,7 +38961,7 @@ diff -urNp linux-2.6.38.7/fs/ext4/mballoc.c linux-2.6.38.7/fs/ext4/mballoc.c } if (ac->ac_op == EXT4_MB_HISTORY_ALLOC) -@@ -3507,7 +3509,7 @@ ext4_mb_new_inode_pa(struct ext4_allocat +@@ -3509,7 +3511,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) trace_ext4_mb_new_inode_pa(ac, pa); ext4_mb_use_inode_pa(ac, pa); @@ -38014,7 +38970,7 @@ diff -urNp linux-2.6.38.7/fs/ext4/mballoc.c linux-2.6.38.7/fs/ext4/mballoc.c ei = EXT4_I(ac->ac_inode); grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group); -@@ -3567,7 +3569,7 @@ ext4_mb_new_group_pa(struct ext4_allocat +@@ -3569,7 +3571,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac) trace_ext4_mb_new_group_pa(ac, pa); ext4_mb_use_group_pa(ac, pa); @@ -38023,7 +38979,7 @@ diff -urNp linux-2.6.38.7/fs/ext4/mballoc.c linux-2.6.38.7/fs/ext4/mballoc.c grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group); lg = ac->ac_lg; -@@ -3654,7 +3656,7 @@ ext4_mb_release_inode_pa(struct ext4_bud +@@ -3656,7 +3658,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh, * from the bitmap and continue. */ } @@ -38032,7 +38988,7 @@ diff -urNp linux-2.6.38.7/fs/ext4/mballoc.c linux-2.6.38.7/fs/ext4/mballoc.c return err; } -@@ -3672,7 +3674,7 @@ ext4_mb_release_group_pa(struct ext4_bud +@@ -3674,7 +3676,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b, ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit); BUG_ON(group != e4b->bd_group && pa->pa_len != 0); mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len); @@ -38041,10 +38997,11 @@ diff -urNp linux-2.6.38.7/fs/ext4/mballoc.c linux-2.6.38.7/fs/ext4/mballoc.c trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len); return 0; -diff -urNp linux-2.6.38.7/fs/fcntl.c linux-2.6.38.7/fs/fcntl.c ---- linux-2.6.38.7/fs/fcntl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/fcntl.c 2011-04-28 19:34:15.000000000 -0400 -@@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct +diff --git a/fs/fcntl.c b/fs/fcntl.c +index cb10261..3f88c98 100644 +--- a/fs/fcntl.c ++++ b/fs/fcntl.c +@@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type, if (err) return err; @@ -38056,7 +39013,7 @@ diff -urNp linux-2.6.38.7/fs/fcntl.c linux-2.6.38.7/fs/fcntl.c f_modown(filp, pid, type, force); return 0; } -@@ -348,6 +353,7 @@ static long do_fcntl(int fd, unsigned in +@@ -348,6 +353,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg, switch (cmd) { case F_DUPFD: case F_DUPFD_CLOEXEC: @@ -38081,10 +39038,11 @@ diff -urNp linux-2.6.38.7/fs/fcntl.c linux-2.6.38.7/fs/fcntl.c )); fasync_cache = kmem_cache_create("fasync_cache", -diff -urNp linux-2.6.38.7/fs/fifo.c linux-2.6.38.7/fs/fifo.c ---- linux-2.6.38.7/fs/fifo.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/fifo.c 2011-04-28 19:34:15.000000000 -0400 -@@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode +diff --git a/fs/fifo.c b/fs/fifo.c +index 4e303c2..77a56b2 100644 +--- a/fs/fifo.c ++++ b/fs/fifo.c +@@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode, struct file *filp) */ filp->f_op = &read_pipefifo_fops; pipe->r_counter++; @@ -38097,7 +39055,7 @@ diff -urNp linux-2.6.38.7/fs/fifo.c linux-2.6.38.7/fs/fifo.c if ((filp->f_flags & O_NONBLOCK)) { /* suppress POLLHUP until we have * seen a writer */ -@@ -82,15 +82,15 @@ static int fifo_open(struct inode *inode +@@ -82,15 +82,15 @@ static int fifo_open(struct inode *inode, struct file *filp) * errno=ENXIO when there is no process reading the FIFO. */ ret = -ENXIO; @@ -38116,7 +39074,7 @@ diff -urNp linux-2.6.38.7/fs/fifo.c linux-2.6.38.7/fs/fifo.c wait_for_partner(inode, &pipe->r_counter); if (signal_pending(current)) goto err_wr; -@@ -106,11 +106,11 @@ static int fifo_open(struct inode *inode +@@ -106,11 +106,11 @@ static int fifo_open(struct inode *inode, struct file *filp) */ filp->f_op = &rdwr_pipefifo_fops; @@ -38131,7 +39089,7 @@ diff -urNp linux-2.6.38.7/fs/fifo.c linux-2.6.38.7/fs/fifo.c wake_up_partner(inode); break; -@@ -124,19 +124,19 @@ static int fifo_open(struct inode *inode +@@ -124,19 +124,19 @@ static int fifo_open(struct inode *inode, struct file *filp) return 0; err_rd: @@ -38154,9 +39112,10 @@ diff -urNp linux-2.6.38.7/fs/fifo.c linux-2.6.38.7/fs/fifo.c free_pipe_info(inode); err_nocleanup: -diff -urNp linux-2.6.38.7/fs/file.c linux-2.6.38.7/fs/file.c ---- linux-2.6.38.7/fs/file.c 2011-05-10 22:06:27.000000000 -0400 -+++ linux-2.6.38.7/fs/file.c 2011-05-10 22:06:56.000000000 -0400 +diff --git a/fs/file.c b/fs/file.c +index 4c6992d..104cdea 100644 +--- a/fs/file.c ++++ b/fs/file.c @@ -15,6 +15,7 @@ #include <linux/slab.h> #include <linux/vmalloc.h> @@ -38165,7 +39124,7 @@ diff -urNp linux-2.6.38.7/fs/file.c linux-2.6.38.7/fs/file.c #include <linux/fdtable.h> #include <linux/bitops.h> #include <linux/interrupt.h> -@@ -254,6 +255,7 @@ int expand_files(struct files_struct *fi +@@ -254,6 +255,7 @@ int expand_files(struct files_struct *files, int nr) * N.B. For clone tasks sharing a files structure, this test * will limit the total number of files that can be opened. */ @@ -38173,10 +39132,11 @@ diff -urNp linux-2.6.38.7/fs/file.c linux-2.6.38.7/fs/file.c if (nr >= rlimit(RLIMIT_NOFILE)) return -EMFILE; -diff -urNp linux-2.6.38.7/fs/filesystems.c linux-2.6.38.7/fs/filesystems.c ---- linux-2.6.38.7/fs/filesystems.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/filesystems.c 2011-04-28 19:34:15.000000000 -0400 -@@ -275,7 +275,12 @@ struct file_system_type *get_fs_type(con +diff --git a/fs/filesystems.c b/fs/filesystems.c +index 751d6b2..0540ff2 100644 +--- a/fs/filesystems.c ++++ b/fs/filesystems.c +@@ -275,7 +275,12 @@ struct file_system_type *get_fs_type(const char *name) int len = dot ? dot - name : strlen(name); fs = __get_fs_type(name, len); @@ -38189,10 +39149,104 @@ diff -urNp linux-2.6.38.7/fs/filesystems.c linux-2.6.38.7/fs/filesystems.c fs = __get_fs_type(name, len); if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) { -diff -urNp linux-2.6.38.7/fs/fscache/cookie.c linux-2.6.38.7/fs/fscache/cookie.c ---- linux-2.6.38.7/fs/fscache/cookie.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/fscache/cookie.c 2011-04-28 19:57:25.000000000 -0400 -@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire +diff --git a/fs/fs_struct.c b/fs/fs_struct.c +index 78b519c..212c0d0 100644 +--- a/fs/fs_struct.c ++++ b/fs/fs_struct.c +@@ -4,6 +4,7 @@ + #include <linux/path.h> + #include <linux/slab.h> + #include <linux/fs_struct.h> ++#include <linux/grsecurity.h> + #include "internal.h" + + static inline void path_get_longterm(struct path *path) +@@ -31,6 +32,7 @@ void set_fs_root(struct fs_struct *fs, struct path *path) + old_root = fs->root; + fs->root = *path; + path_get_longterm(path); ++ gr_set_chroot_entries(current, path); + write_seqcount_end(&fs->seq); + spin_unlock(&fs->lock); + if (old_root.dentry) +@@ -74,6 +76,7 @@ void chroot_fs_refs(struct path *old_root, struct path *new_root) + && fs->root.mnt == old_root->mnt) { + path_get_longterm(new_root); + fs->root = *new_root; ++ gr_set_chroot_entries(p, new_root); + count++; + } + if (fs->pwd.dentry == old_root->dentry +@@ -109,7 +112,8 @@ void exit_fs(struct task_struct *tsk) + spin_lock(&fs->lock); + write_seqcount_begin(&fs->seq); + tsk->fs = NULL; +- kill = !--fs->users; ++ gr_clear_chroot_entries(tsk); ++ kill = !atomic_dec_return(&fs->users); + write_seqcount_end(&fs->seq); + spin_unlock(&fs->lock); + task_unlock(tsk); +@@ -123,7 +127,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old) + struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL); + /* We don't need to lock fs - think why ;-) */ + if (fs) { +- fs->users = 1; ++ atomic_set(&fs->users, 1); + fs->in_exec = 0; + spin_lock_init(&fs->lock); + seqcount_init(&fs->seq); +@@ -132,6 +136,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old) + spin_lock(&old->lock); + fs->root = old->root; + path_get_longterm(&fs->root); ++ /* instead of calling gr_set_chroot_entries here, ++ we call it from every caller of this function ++ */ + fs->pwd = old->pwd; + path_get_longterm(&fs->pwd); + spin_unlock(&old->lock); +@@ -150,8 +157,9 @@ int unshare_fs_struct(void) + + task_lock(current); + spin_lock(&fs->lock); +- kill = !--fs->users; ++ kill = !atomic_dec_return(&fs->users); + current->fs = new_fs; ++ gr_set_chroot_entries(current, &new_fs->root); + spin_unlock(&fs->lock); + task_unlock(current); + +@@ -170,7 +178,7 @@ EXPORT_SYMBOL(current_umask); + + /* to be mentioned only in INIT_TASK */ + struct fs_struct init_fs = { +- .users = 1, ++ .users = ATOMIC_INIT(1), + .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock), + .seq = SEQCNT_ZERO, + .umask = 0022, +@@ -186,12 +194,13 @@ void daemonize_fs_struct(void) + task_lock(current); + + spin_lock(&init_fs.lock); +- init_fs.users++; ++ atomic_inc(&init_fs.users); + spin_unlock(&init_fs.lock); + + spin_lock(&fs->lock); + current->fs = &init_fs; +- kill = !--fs->users; ++ gr_set_chroot_entries(current, ¤t->fs->root); ++ kill = !atomic_dec_return(&fs->users); + spin_unlock(&fs->lock); + + task_unlock(current); +diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c +index 9905350..02eaec4 100644 +--- a/fs/fscache/cookie.c ++++ b/fs/fscache/cookie.c +@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire_cookie( parent ? (char *) parent->def->name : "<no-parent>", def->name, netfs_data); @@ -38206,7 +39260,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/cookie.c linux-2.6.38.7/fs/fscache/cookie.c _leave(" [no parent]"); return NULL; } -@@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire +@@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire_cookie( /* allocate and initialise a cookie */ cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL); if (!cookie) { @@ -38215,7 +39269,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/cookie.c linux-2.6.38.7/fs/fscache/cookie.c _leave(" [ENOMEM]"); return NULL; } -@@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire +@@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire_cookie( switch (cookie->def->type) { case FSCACHE_COOKIE_TYPE_INDEX: @@ -38232,7 +39286,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/cookie.c linux-2.6.38.7/fs/fscache/cookie.c break; } -@@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire +@@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire_cookie( if (fscache_acquire_non_index_cookie(cookie) < 0) { atomic_dec(&parent->n_children); __fscache_cookie_put(cookie); @@ -38248,7 +39302,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/cookie.c linux-2.6.38.7/fs/fscache/cookie.c _leave(" = %p", cookie); return cookie; } -@@ -168,7 +168,7 @@ static int fscache_acquire_non_index_coo +@@ -168,7 +168,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie) cache = fscache_select_cache_for_object(cookie->parent); if (!cache) { up_read(&fscache_addremove_sem); @@ -38257,7 +39311,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/cookie.c linux-2.6.38.7/fs/fscache/cookie.c _leave(" = -ENOMEDIUM [no cache]"); return -ENOMEDIUM; } -@@ -256,12 +256,12 @@ static int fscache_alloc_object(struct f +@@ -256,12 +256,12 @@ static int fscache_alloc_object(struct fscache_cache *cache, object = cache->ops->alloc_object(cache, cookie); fscache_stat_d(&fscache_n_cop_alloc_object); if (IS_ERR(object)) { @@ -38272,7 +39326,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/cookie.c linux-2.6.38.7/fs/fscache/cookie.c object->debug_id = atomic_inc_return(&fscache_object_debug_id); -@@ -377,10 +377,10 @@ void __fscache_update_cookie(struct fsca +@@ -377,10 +377,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie) struct fscache_object *object; struct hlist_node *_p; @@ -38285,7 +39339,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/cookie.c linux-2.6.38.7/fs/fscache/cookie.c _leave(" [no cookie]"); return; } -@@ -414,12 +414,12 @@ void __fscache_relinquish_cookie(struct +@@ -414,12 +414,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire) struct fscache_object *object; unsigned long event; @@ -38301,7 +39355,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/cookie.c linux-2.6.38.7/fs/fscache/cookie.c _leave(" [no cookie]"); return; } -@@ -435,7 +435,7 @@ void __fscache_relinquish_cookie(struct +@@ -435,7 +435,7 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire) /* wait for the cookie to finish being instantiated (or to fail) */ if (test_bit(FSCACHE_COOKIE_CREATING, &cookie->flags)) { @@ -38310,9 +39364,10 @@ diff -urNp linux-2.6.38.7/fs/fscache/cookie.c linux-2.6.38.7/fs/fscache/cookie.c wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING, fscache_wait_bit, TASK_UNINTERRUPTIBLE); } -diff -urNp linux-2.6.38.7/fs/fscache/internal.h linux-2.6.38.7/fs/fscache/internal.h ---- linux-2.6.38.7/fs/fscache/internal.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/fscache/internal.h 2011-05-02 19:07:09.000000000 -0400 +diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h +index f6aad48..88dcf26 100644 +--- a/fs/fscache/internal.h ++++ b/fs/fscache/internal.h @@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void); extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS]; extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS]; @@ -38496,7 +39551,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/internal.h linux-2.6.38.7/fs/fscache/intern extern atomic_t fscache_n_cop_alloc_object; extern atomic_t fscache_n_cop_lookup_object; -@@ -255,6 +255,11 @@ static inline void fscache_stat(atomic_t +@@ -255,6 +255,11 @@ static inline void fscache_stat(atomic_t *stat) atomic_inc(stat); } @@ -38508,7 +39563,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/internal.h linux-2.6.38.7/fs/fscache/intern static inline void fscache_stat_d(atomic_t *stat) { atomic_dec(stat); -@@ -267,6 +272,7 @@ extern const struct file_operations fsca +@@ -267,6 +272,7 @@ extern const struct file_operations fscache_stats_fops; #define __fscache_stat(stat) (NULL) #define fscache_stat(stat) do {} while (0) @@ -38516,10 +39571,11 @@ diff -urNp linux-2.6.38.7/fs/fscache/internal.h linux-2.6.38.7/fs/fscache/intern #define fscache_stat_d(stat) do {} while (0) #endif -diff -urNp linux-2.6.38.7/fs/fscache/object.c linux-2.6.38.7/fs/fscache/object.c ---- linux-2.6.38.7/fs/fscache/object.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/fscache/object.c 2011-04-28 19:57:25.000000000 -0400 -@@ -128,7 +128,7 @@ static void fscache_object_state_machine +diff --git a/fs/fscache/object.c b/fs/fscache/object.c +index b6b897c..0ffff9c 100644 +--- a/fs/fscache/object.c ++++ b/fs/fscache/object.c +@@ -128,7 +128,7 @@ static void fscache_object_state_machine(struct fscache_object *object) /* update the object metadata on disk */ case FSCACHE_OBJECT_UPDATING: clear_bit(FSCACHE_OBJECT_EV_UPDATE, &object->events); @@ -38528,7 +39584,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/object.c linux-2.6.38.7/fs/fscache/object.c fscache_stat(&fscache_n_cop_update_object); object->cache->ops->update_object(object); fscache_stat_d(&fscache_n_cop_update_object); -@@ -217,7 +217,7 @@ static void fscache_object_state_machine +@@ -217,7 +217,7 @@ static void fscache_object_state_machine(struct fscache_object *object) spin_lock(&object->lock); object->state = FSCACHE_OBJECT_DEAD; spin_unlock(&object->lock); @@ -38537,7 +39593,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/object.c linux-2.6.38.7/fs/fscache/object.c goto terminal_transit; /* handle the parent cache of this object being withdrawn from -@@ -232,7 +232,7 @@ static void fscache_object_state_machine +@@ -232,7 +232,7 @@ static void fscache_object_state_machine(struct fscache_object *object) spin_lock(&object->lock); object->state = FSCACHE_OBJECT_DEAD; spin_unlock(&object->lock); @@ -38546,7 +39602,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/object.c linux-2.6.38.7/fs/fscache/object.c goto terminal_transit; /* complain about the object being woken up once it is -@@ -461,7 +461,7 @@ static void fscache_lookup_object(struct +@@ -461,7 +461,7 @@ static void fscache_lookup_object(struct fscache_object *object) parent->cookie->def->name, cookie->def->name, object->cache->tag->name); @@ -38555,7 +39611,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/object.c linux-2.6.38.7/fs/fscache/object.c fscache_stat(&fscache_n_cop_lookup_object); ret = object->cache->ops->lookup_object(object); fscache_stat_d(&fscache_n_cop_lookup_object); -@@ -472,7 +472,7 @@ static void fscache_lookup_object(struct +@@ -472,7 +472,7 @@ static void fscache_lookup_object(struct fscache_object *object) if (ret == -ETIMEDOUT) { /* probably stuck behind another object, so move this one to * the back of the queue */ @@ -38564,7 +39620,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/object.c linux-2.6.38.7/fs/fscache/object.c set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events); } -@@ -495,7 +495,7 @@ void fscache_object_lookup_negative(stru +@@ -495,7 +495,7 @@ void fscache_object_lookup_negative(struct fscache_object *object) spin_lock(&object->lock); if (object->state == FSCACHE_OBJECT_LOOKING_UP) { @@ -38573,7 +39629,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/object.c linux-2.6.38.7/fs/fscache/object.c /* transit here to allow write requests to begin stacking up * and read requests to begin returning ENODATA */ -@@ -541,7 +541,7 @@ void fscache_obtained_object(struct fsca +@@ -541,7 +541,7 @@ void fscache_obtained_object(struct fscache_object *object) * result, in which case there may be data available */ spin_lock(&object->lock); if (object->state == FSCACHE_OBJECT_LOOKING_UP) { @@ -38582,7 +39638,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/object.c linux-2.6.38.7/fs/fscache/object.c clear_bit(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags); -@@ -555,7 +555,7 @@ void fscache_obtained_object(struct fsca +@@ -555,7 +555,7 @@ void fscache_obtained_object(struct fscache_object *object) set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events); } else { ASSERTCMP(object->state, ==, FSCACHE_OBJECT_CREATING); @@ -38591,7 +39647,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/object.c linux-2.6.38.7/fs/fscache/object.c object->state = FSCACHE_OBJECT_AVAILABLE; spin_unlock(&object->lock); -@@ -602,7 +602,7 @@ static void fscache_object_available(str +@@ -602,7 +602,7 @@ static void fscache_object_available(struct fscache_object *object) fscache_enqueue_dependents(object); fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif); @@ -38600,7 +39656,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/object.c linux-2.6.38.7/fs/fscache/object.c _leave(""); } -@@ -861,7 +861,7 @@ enum fscache_checkaux fscache_check_aux( +@@ -861,7 +861,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object, enum fscache_checkaux result; if (!object->cookie->def->check_aux) { @@ -38609,7 +39665,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/object.c linux-2.6.38.7/fs/fscache/object.c return FSCACHE_CHECKAUX_OKAY; } -@@ -870,17 +870,17 @@ enum fscache_checkaux fscache_check_aux( +@@ -870,17 +870,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object, switch (result) { /* entry okay as is */ case FSCACHE_CHECKAUX_OKAY: @@ -38630,9 +39686,10 @@ diff -urNp linux-2.6.38.7/fs/fscache/object.c linux-2.6.38.7/fs/fscache/object.c break; default: -diff -urNp linux-2.6.38.7/fs/fscache/operation.c linux-2.6.38.7/fs/fscache/operation.c ---- linux-2.6.38.7/fs/fscache/operation.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/fscache/operation.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c +index 48a18f1..e58a5e6 100644 +--- a/fs/fscache/operation.c ++++ b/fs/fscache/operation.c @@ -17,7 +17,7 @@ #include <linux/slab.h> #include "internal.h" @@ -38642,7 +39699,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/operation.c linux-2.6.38.7/fs/fscache/opera EXPORT_SYMBOL(fscache_op_debug_id); /** -@@ -40,7 +40,7 @@ void fscache_enqueue_operation(struct fs +@@ -40,7 +40,7 @@ void fscache_enqueue_operation(struct fscache_operation *op) ASSERTCMP(op->object->state, >=, FSCACHE_OBJECT_AVAILABLE); ASSERTCMP(atomic_read(&op->usage), >, 0); @@ -38651,7 +39708,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/operation.c linux-2.6.38.7/fs/fscache/opera switch (op->flags & FSCACHE_OP_TYPE) { case FSCACHE_OP_ASYNC: _debug("queue async"); -@@ -73,7 +73,7 @@ static void fscache_run_op(struct fscach +@@ -73,7 +73,7 @@ static void fscache_run_op(struct fscache_object *object, wake_up_bit(&op->flags, FSCACHE_OP_WAITING); if (op->processor) fscache_enqueue_operation(op); @@ -38660,7 +39717,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/operation.c linux-2.6.38.7/fs/fscache/opera } /* -@@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct f +@@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object, if (object->n_ops > 1) { atomic_inc(&op->usage); list_add_tail(&op->pend_link, &object->pending_ops); @@ -38674,7 +39731,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/operation.c linux-2.6.38.7/fs/fscache/opera fscache_start_operations(object); } else { ASSERTCMP(object->n_in_progress, ==, 0); -@@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct f +@@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object, object->n_exclusive++; /* reads and writes must wait */ atomic_inc(&op->usage); list_add_tail(&op->pend_link, &object->pending_ops); @@ -38683,7 +39740,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/operation.c linux-2.6.38.7/fs/fscache/opera ret = 0; } else { /* not allowed to submit ops in any other state */ -@@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_obj +@@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object, if (object->n_exclusive > 0) { atomic_inc(&op->usage); list_add_tail(&op->pend_link, &object->pending_ops); @@ -38697,7 +39754,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/operation.c linux-2.6.38.7/fs/fscache/opera fscache_start_operations(object); } else { ASSERTCMP(object->n_exclusive, ==, 0); -@@ -227,12 +227,12 @@ int fscache_submit_op(struct fscache_obj +@@ -227,12 +227,12 @@ int fscache_submit_op(struct fscache_object *object, object->n_ops++; atomic_inc(&op->usage); list_add_tail(&op->pend_link, &object->pending_ops); @@ -38712,7 +39769,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/operation.c linux-2.6.38.7/fs/fscache/opera ret = -ENOBUFS; } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) { fscache_report_unexpected_submission(object, op, ostate); -@@ -302,7 +302,7 @@ int fscache_cancel_op(struct fscache_ope +@@ -302,7 +302,7 @@ int fscache_cancel_op(struct fscache_operation *op) ret = -EBUSY; if (!list_empty(&op->pend_link)) { @@ -38721,7 +39778,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/operation.c linux-2.6.38.7/fs/fscache/opera list_del_init(&op->pend_link); object->n_ops--; if (test_bit(FSCACHE_OP_EXCLUSIVE, &op->flags)) -@@ -341,7 +341,7 @@ void fscache_put_operation(struct fscach +@@ -341,7 +341,7 @@ void fscache_put_operation(struct fscache_operation *op) if (test_and_set_bit(FSCACHE_OP_DEAD, &op->flags)) BUG(); @@ -38730,7 +39787,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/operation.c linux-2.6.38.7/fs/fscache/opera if (op->release) { op->release(op); -@@ -358,7 +358,7 @@ void fscache_put_operation(struct fscach +@@ -358,7 +358,7 @@ void fscache_put_operation(struct fscache_operation *op) * lock, and defer it otherwise */ if (!spin_trylock(&object->lock)) { _debug("defer put"); @@ -38739,7 +39796,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/operation.c linux-2.6.38.7/fs/fscache/opera cache = object->cache; spin_lock(&cache->op_gc_list_lock); -@@ -420,7 +420,7 @@ void fscache_operation_gc(struct work_st +@@ -420,7 +420,7 @@ void fscache_operation_gc(struct work_struct *work) _debug("GC DEFERRED REL OBJ%x OP%x", object->debug_id, op->debug_id); @@ -38748,10 +39805,11 @@ diff -urNp linux-2.6.38.7/fs/fscache/operation.c linux-2.6.38.7/fs/fscache/opera ASSERTCMP(atomic_read(&op->usage), ==, 0); -diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c ---- linux-2.6.38.7/fs/fscache/page.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/fscache/page.c 2011-04-28 19:57:25.000000000 -0400 -@@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct +diff --git a/fs/fscache/page.c b/fs/fscache/page.c +index 41c441c..39ffc1e 100644 +--- a/fs/fscache/page.c ++++ b/fs/fscache/page.c +@@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie, val = radix_tree_lookup(&cookie->stores, page->index); if (!val) { rcu_read_unlock(); @@ -38760,7 +39818,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c __fscache_uncache_page(cookie, page); return true; } -@@ -90,11 +90,11 @@ bool __fscache_maybe_release_page(struct +@@ -90,11 +90,11 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie, spin_unlock(&cookie->stores_lock); if (xpage) { @@ -38784,7 +39842,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c return false; } EXPORT_SYMBOL(__fscache_maybe_release_page); -@@ -131,7 +131,7 @@ static void fscache_end_page_write(struc +@@ -131,7 +131,7 @@ static void fscache_end_page_write(struct fscache_object *object, FSCACHE_COOKIE_STORING_TAG); if (!radix_tree_tag_get(&cookie->stores, page->index, FSCACHE_COOKIE_PENDING_TAG)) { @@ -38793,7 +39851,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c xpage = radix_tree_delete(&cookie->stores, page->index); } spin_unlock(&cookie->stores_lock); -@@ -152,7 +152,7 @@ static void fscache_attr_changed_op(stru +@@ -152,7 +152,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op) _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id); @@ -38802,7 +39860,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c if (fscache_object_is_active(object)) { fscache_set_op_state(op, "CallFS"); -@@ -179,11 +179,11 @@ int __fscache_attr_changed(struct fscach +@@ -179,11 +179,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie) ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX); @@ -38816,7 +39874,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c _leave(" = -ENOMEM"); return -ENOMEM; } -@@ -202,7 +202,7 @@ int __fscache_attr_changed(struct fscach +@@ -202,7 +202,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie) if (fscache_submit_exclusive_op(object, op) < 0) goto nobufs; spin_unlock(&cookie->lock); @@ -38825,7 +39883,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c fscache_put_operation(op); _leave(" = 0"); return 0; -@@ -210,7 +210,7 @@ int __fscache_attr_changed(struct fscach +@@ -210,7 +210,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie) nobufs: spin_unlock(&cookie->lock); kfree(op); @@ -38834,7 +39892,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c _leave(" = %d", -ENOBUFS); return -ENOBUFS; } -@@ -246,7 +246,7 @@ static struct fscache_retrieval *fscache +@@ -246,7 +246,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval( /* allocate a retrieval operation and attempt to submit it */ op = kzalloc(sizeof(*op), GFP_NOIO); if (!op) { @@ -38843,7 +39901,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c return NULL; } -@@ -275,13 +275,13 @@ static int fscache_wait_for_deferred_loo +@@ -275,13 +275,13 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie) return 0; } @@ -38859,7 +39917,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c _leave(" = -ERESTARTSYS"); return -ERESTARTSYS; } -@@ -299,8 +299,8 @@ static int fscache_wait_for_deferred_loo +@@ -299,8 +299,8 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie) */ static int fscache_wait_for_retrieval_activation(struct fscache_object *object, struct fscache_retrieval *op, @@ -38870,7 +39928,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c { int ret; -@@ -308,7 +308,7 @@ static int fscache_wait_for_retrieval_ac +@@ -308,7 +308,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object, goto check_if_dead; _debug(">>> WT"); @@ -38879,7 +39937,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c if (wait_on_bit(&op->op.flags, FSCACHE_OP_WAITING, fscache_wait_bit_interruptible, TASK_INTERRUPTIBLE) < 0) { -@@ -325,7 +325,7 @@ static int fscache_wait_for_retrieval_ac +@@ -325,7 +325,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object, check_if_dead: if (unlikely(fscache_object_is_dead(object))) { @@ -38888,7 +39946,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c return -ENOBUFS; } return 0; -@@ -352,7 +352,7 @@ int __fscache_read_or_alloc_page(struct +@@ -352,7 +352,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie, _enter("%p,%p,,,", cookie, page); @@ -38897,7 +39955,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c if (hlist_empty(&cookie->backing_objects)) goto nobufs; -@@ -386,7 +386,7 @@ int __fscache_read_or_alloc_page(struct +@@ -386,7 +386,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie, goto nobufs_unlock; spin_unlock(&cookie->lock); @@ -38906,7 +39964,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c /* pin the netfs read context in case we need to do the actual netfs * read because we've encountered a cache read failure */ -@@ -416,15 +416,15 @@ int __fscache_read_or_alloc_page(struct +@@ -416,15 +416,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie, error: if (ret == -ENOMEM) @@ -38936,7 +39994,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c _leave(" = -ENOBUFS"); return -ENOBUFS; } -@@ -472,7 +472,7 @@ int __fscache_read_or_alloc_pages(struct +@@ -472,7 +472,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie, _enter("%p,,%d,,,", cookie, *nr_pages); @@ -38945,7 +40003,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c if (hlist_empty(&cookie->backing_objects)) goto nobufs; -@@ -503,7 +503,7 @@ int __fscache_read_or_alloc_pages(struct +@@ -503,7 +503,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie, goto nobufs_unlock; spin_unlock(&cookie->lock); @@ -38954,7 +40012,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c /* pin the netfs read context in case we need to do the actual netfs * read because we've encountered a cache read failure */ -@@ -533,15 +533,15 @@ int __fscache_read_or_alloc_pages(struct +@@ -533,15 +533,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie, error: if (ret == -ENOMEM) @@ -38984,7 +40042,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c _leave(" = -ENOBUFS"); return -ENOBUFS; } -@@ -575,7 +575,7 @@ int __fscache_alloc_page(struct fscache_ +@@ -575,7 +575,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie, _enter("%p,%p,,,", cookie, page); @@ -38993,7 +40051,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c if (hlist_empty(&cookie->backing_objects)) goto nobufs; -@@ -602,7 +602,7 @@ int __fscache_alloc_page(struct fscache_ +@@ -602,7 +602,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie, goto nobufs_unlock; spin_unlock(&cookie->lock); @@ -39002,7 +40060,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c ret = fscache_wait_for_retrieval_activation( object, op, -@@ -618,11 +618,11 @@ int __fscache_alloc_page(struct fscache_ +@@ -618,11 +618,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie, error: if (ret == -ERESTARTSYS) @@ -39026,7 +40084,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c _leave(" = -ENOBUFS"); return -ENOBUFS; } -@@ -675,7 +675,7 @@ static void fscache_write_op(struct fsca +@@ -675,7 +675,7 @@ static void fscache_write_op(struct fscache_operation *_op) spin_lock(&cookie->stores_lock); @@ -39035,7 +40093,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c /* find a page to store */ page = NULL; -@@ -686,7 +686,7 @@ static void fscache_write_op(struct fsca +@@ -686,7 +686,7 @@ static void fscache_write_op(struct fscache_operation *_op) page = results[0]; _debug("gang %d [%lx]", n, page->index); if (page->index > op->store_limit) { @@ -39044,7 +40102,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c goto superseded; } -@@ -699,7 +699,7 @@ static void fscache_write_op(struct fsca +@@ -699,7 +699,7 @@ static void fscache_write_op(struct fscache_operation *_op) spin_unlock(&object->lock); fscache_set_op_state(&op->op, "Store"); @@ -39053,7 +40111,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c fscache_stat(&fscache_n_cop_write_page); ret = object->cache->ops->write_page(op, page); fscache_stat_d(&fscache_n_cop_write_page); -@@ -769,7 +769,7 @@ int __fscache_write_page(struct fscache_ +@@ -769,7 +769,7 @@ int __fscache_write_page(struct fscache_cookie *cookie, ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX); ASSERT(PageFsCache(page)); @@ -39062,7 +40120,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c op = kzalloc(sizeof(*op), GFP_NOIO); if (!op) -@@ -821,7 +821,7 @@ int __fscache_write_page(struct fscache_ +@@ -821,7 +821,7 @@ int __fscache_write_page(struct fscache_cookie *cookie, spin_unlock(&cookie->stores_lock); spin_unlock(&object->lock); @@ -39071,7 +40129,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c op->store_limit = object->store_limit; if (fscache_submit_op(object, &op->op) < 0) -@@ -829,8 +829,8 @@ int __fscache_write_page(struct fscache_ +@@ -829,8 +829,8 @@ int __fscache_write_page(struct fscache_cookie *cookie, spin_unlock(&cookie->lock); radix_tree_preload_end(); @@ -39082,7 +40140,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c /* the work queue now carries its own ref on the object */ fscache_put_operation(&op->op); -@@ -838,14 +838,14 @@ int __fscache_write_page(struct fscache_ +@@ -838,14 +838,14 @@ int __fscache_write_page(struct fscache_cookie *cookie, return 0; already_queued: @@ -39116,7 +40174,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c _leave(" = -ENOMEM"); return -ENOMEM; } -@@ -889,7 +889,7 @@ void __fscache_uncache_page(struct fscac +@@ -889,7 +889,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page) ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX); ASSERTCMP(page, !=, NULL); @@ -39125,7 +40183,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c /* cache withdrawal may beat us to it */ if (!PageFsCache(page)) -@@ -942,7 +942,7 @@ void fscache_mark_pages_cached(struct fs +@@ -942,7 +942,7 @@ void fscache_mark_pages_cached(struct fscache_retrieval *op, unsigned long loop; #ifdef CONFIG_FSCACHE_STATS @@ -39134,9 +40192,10 @@ diff -urNp linux-2.6.38.7/fs/fscache/page.c linux-2.6.38.7/fs/fscache/page.c #endif for (loop = 0; loop < pagevec->nr; loop++) { -diff -urNp linux-2.6.38.7/fs/fscache/stats.c linux-2.6.38.7/fs/fscache/stats.c ---- linux-2.6.38.7/fs/fscache/stats.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/fscache/stats.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c +index 4765190..2a067f2 100644 +--- a/fs/fscache/stats.c ++++ b/fs/fscache/stats.c @@ -18,95 +18,95 @@ /* * operation counters @@ -39322,7 +40381,7 @@ diff -urNp linux-2.6.38.7/fs/fscache/stats.c linux-2.6.38.7/fs/fscache/stats.c atomic_t fscache_n_cop_alloc_object; atomic_t fscache_n_cop_lookup_object; -@@ -133,113 +133,113 @@ static int fscache_stats_show(struct seq +@@ -133,113 +133,113 @@ static int fscache_stats_show(struct seq_file *m, void *v) seq_puts(m, "FS-Cache statistics\n"); seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n", @@ -39512,102 +40571,11 @@ diff -urNp linux-2.6.38.7/fs/fscache/stats.c linux-2.6.38.7/fs/fscache/stats.c seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n", atomic_read(&fscache_n_cop_alloc_object), -diff -urNp linux-2.6.38.7/fs/fs_struct.c linux-2.6.38.7/fs/fs_struct.c ---- linux-2.6.38.7/fs/fs_struct.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/fs_struct.c 2011-04-28 19:34:15.000000000 -0400 -@@ -4,6 +4,7 @@ - #include <linux/path.h> - #include <linux/slab.h> - #include <linux/fs_struct.h> -+#include <linux/grsecurity.h> - #include "internal.h" - - static inline void path_get_longterm(struct path *path) -@@ -31,6 +32,7 @@ void set_fs_root(struct fs_struct *fs, s - old_root = fs->root; - fs->root = *path; - path_get_longterm(path); -+ gr_set_chroot_entries(current, path); - write_seqcount_end(&fs->seq); - spin_unlock(&fs->lock); - if (old_root.dentry) -@@ -74,6 +76,7 @@ void chroot_fs_refs(struct path *old_roo - && fs->root.mnt == old_root->mnt) { - path_get_longterm(new_root); - fs->root = *new_root; -+ gr_set_chroot_entries(p, new_root); - count++; - } - if (fs->pwd.dentry == old_root->dentry -@@ -109,7 +112,8 @@ void exit_fs(struct task_struct *tsk) - spin_lock(&fs->lock); - write_seqcount_begin(&fs->seq); - tsk->fs = NULL; -- kill = !--fs->users; -+ gr_clear_chroot_entries(tsk); -+ kill = !atomic_dec_return(&fs->users); - write_seqcount_end(&fs->seq); - spin_unlock(&fs->lock); - task_unlock(tsk); -@@ -123,7 +127,7 @@ struct fs_struct *copy_fs_struct(struct - struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL); - /* We don't need to lock fs - think why ;-) */ - if (fs) { -- fs->users = 1; -+ atomic_set(&fs->users, 1); - fs->in_exec = 0; - spin_lock_init(&fs->lock); - seqcount_init(&fs->seq); -@@ -132,6 +136,9 @@ struct fs_struct *copy_fs_struct(struct - spin_lock(&old->lock); - fs->root = old->root; - path_get_longterm(&fs->root); -+ /* instead of calling gr_set_chroot_entries here, -+ we call it from every caller of this function -+ */ - fs->pwd = old->pwd; - path_get_longterm(&fs->pwd); - spin_unlock(&old->lock); -@@ -150,8 +157,9 @@ int unshare_fs_struct(void) - - task_lock(current); - spin_lock(&fs->lock); -- kill = !--fs->users; -+ kill = !atomic_dec_return(&fs->users); - current->fs = new_fs; -+ gr_set_chroot_entries(current, &new_fs->root); - spin_unlock(&fs->lock); - task_unlock(current); - -@@ -170,7 +178,7 @@ EXPORT_SYMBOL(current_umask); - - /* to be mentioned only in INIT_TASK */ - struct fs_struct init_fs = { -- .users = 1, -+ .users = ATOMIC_INIT(1), - .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock), - .seq = SEQCNT_ZERO, - .umask = 0022, -@@ -186,12 +194,13 @@ void daemonize_fs_struct(void) - task_lock(current); - - spin_lock(&init_fs.lock); -- init_fs.users++; -+ atomic_inc(&init_fs.users); - spin_unlock(&init_fs.lock); - - spin_lock(&fs->lock); - current->fs = &init_fs; -- kill = !--fs->users; -+ gr_set_chroot_entries(current, ¤t->fs->root); -+ kill = !atomic_dec_return(&fs->users); - spin_unlock(&fs->lock); - - task_unlock(current); -diff -urNp linux-2.6.38.7/fs/fuse/cuse.c linux-2.6.38.7/fs/fuse/cuse.c ---- linux-2.6.38.7/fs/fuse/cuse.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/fuse/cuse.c 2011-04-28 19:34:15.000000000 -0400 -@@ -530,8 +530,18 @@ static int cuse_channel_release(struct i +diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c +index 3e87cce..b555884 100644 +--- a/fs/fuse/cuse.c ++++ b/fs/fuse/cuse.c +@@ -530,8 +530,18 @@ static int cuse_channel_release(struct inode *inode, struct file *file) return rc; } @@ -39641,10 +40609,11 @@ diff -urNp linux-2.6.38.7/fs/fuse/cuse.c linux-2.6.38.7/fs/fuse/cuse.c cuse_class = class_create(THIS_MODULE, "cuse"); if (IS_ERR(cuse_class)) return PTR_ERR(cuse_class); -diff -urNp linux-2.6.38.7/fs/fuse/dev.c linux-2.6.38.7/fs/fuse/dev.c ---- linux-2.6.38.7/fs/fuse/dev.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/fuse/dev.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1183,7 +1183,7 @@ static ssize_t fuse_dev_do_read(struct f +diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c +index cf8d28d..f110bb6 100644 +--- a/fs/fuse/dev.c ++++ b/fs/fuse/dev.c +@@ -1183,7 +1183,7 @@ static ssize_t fuse_dev_do_read(struct fuse_conn *fc, struct file *file, return err; } @@ -39653,7 +40622,7 @@ diff -urNp linux-2.6.38.7/fs/fuse/dev.c linux-2.6.38.7/fs/fuse/dev.c unsigned long nr_segs, loff_t pos) { struct fuse_copy_state cs; -@@ -1197,6 +1197,8 @@ static ssize_t fuse_dev_read(struct kioc +@@ -1197,6 +1197,8 @@ static ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov, return fuse_dev_do_read(fc, file, &cs, iov_length(iov, nr_segs)); } @@ -39662,7 +40631,7 @@ diff -urNp linux-2.6.38.7/fs/fuse/dev.c linux-2.6.38.7/fs/fuse/dev.c static int fuse_dev_pipe_buf_steal(struct pipe_inode_info *pipe, struct pipe_buffer *buf) { -@@ -1240,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(stru +@@ -1240,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos, ret = 0; pipe_lock(pipe); @@ -39671,7 +40640,7 @@ diff -urNp linux-2.6.38.7/fs/fuse/dev.c linux-2.6.38.7/fs/fuse/dev.c send_sig(SIGPIPE, current, 0); if (!ret) ret = -EPIPE; -@@ -1733,7 +1735,7 @@ static ssize_t fuse_dev_do_write(struct +@@ -1733,7 +1735,7 @@ static ssize_t fuse_dev_do_write(struct fuse_conn *fc, return err; } @@ -39680,7 +40649,7 @@ diff -urNp linux-2.6.38.7/fs/fuse/dev.c linux-2.6.38.7/fs/fuse/dev.c unsigned long nr_segs, loff_t pos) { struct fuse_copy_state cs; -@@ -1746,6 +1748,8 @@ static ssize_t fuse_dev_write(struct kio +@@ -1746,6 +1748,8 @@ static ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov, return fuse_dev_do_write(fc, &cs, iov_length(iov, nr_segs)); } @@ -39698,7 +40667,7 @@ diff -urNp linux-2.6.38.7/fs/fuse/dev.c linux-2.6.38.7/fs/fuse/dev.c { unsigned mask = POLLOUT | POLLWRNORM; struct fuse_conn *fc = fuse_get_conn(file); -@@ -1843,6 +1847,8 @@ static unsigned fuse_dev_poll(struct fil +@@ -1843,6 +1847,8 @@ static unsigned fuse_dev_poll(struct file *file, poll_table *wait) return mask; } @@ -39707,7 +40676,7 @@ diff -urNp linux-2.6.38.7/fs/fuse/dev.c linux-2.6.38.7/fs/fuse/dev.c /* * Abort all requests on the given list (pending or processing) * -@@ -1962,7 +1968,7 @@ int fuse_dev_release(struct inode *inode +@@ -1962,7 +1968,7 @@ int fuse_dev_release(struct inode *inode, struct file *file) } EXPORT_SYMBOL_GPL(fuse_dev_release); @@ -39716,7 +40685,7 @@ diff -urNp linux-2.6.38.7/fs/fuse/dev.c linux-2.6.38.7/fs/fuse/dev.c { struct fuse_conn *fc = fuse_get_conn(file); if (!fc) -@@ -1972,6 +1978,8 @@ static int fuse_dev_fasync(int fd, struc +@@ -1972,6 +1978,8 @@ static int fuse_dev_fasync(int fd, struct file *file, int on) return fasync_helper(fd, file, on, &fc->fasync); } @@ -39725,10 +40694,11 @@ diff -urNp linux-2.6.38.7/fs/fuse/dev.c linux-2.6.38.7/fs/fuse/dev.c const struct file_operations fuse_dev_operations = { .owner = THIS_MODULE, .llseek = no_llseek, -diff -urNp linux-2.6.38.7/fs/fuse/dir.c linux-2.6.38.7/fs/fuse/dir.c ---- linux-2.6.38.7/fs/fuse/dir.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/fuse/dir.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1133,7 +1133,7 @@ static char *read_link(struct dentry *de +diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c +index 8bd0ef9..c75c358 100644 +--- a/fs/fuse/dir.c ++++ b/fs/fuse/dir.c +@@ -1133,7 +1133,7 @@ static char *read_link(struct dentry *dentry) return link; } @@ -39737,10 +40707,11 @@ diff -urNp linux-2.6.38.7/fs/fuse/dir.c linux-2.6.38.7/fs/fuse/dir.c { if (!IS_ERR(link)) free_page((unsigned long) link); -diff -urNp linux-2.6.38.7/fs/fuse/fuse_i.h linux-2.6.38.7/fs/fuse/fuse_i.h ---- linux-2.6.38.7/fs/fuse/fuse_i.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/fuse/fuse_i.h 2011-04-28 19:34:15.000000000 -0400 -@@ -541,6 +541,16 @@ extern const struct file_operations fuse +diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h +index d428694..b44f072 100644 +--- a/fs/fuse/fuse_i.h ++++ b/fs/fuse/fuse_i.h +@@ -541,6 +541,16 @@ extern const struct file_operations fuse_dev_operations; extern const struct dentry_operations fuse_dentry_operations; @@ -39757,10 +40728,11 @@ diff -urNp linux-2.6.38.7/fs/fuse/fuse_i.h linux-2.6.38.7/fs/fuse/fuse_i.h /** * Inode to nodeid comparison. */ -diff -urNp linux-2.6.38.7/fs/gfs2/ops_inode.c linux-2.6.38.7/fs/gfs2/ops_inode.c ---- linux-2.6.38.7/fs/gfs2/ops_inode.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/gfs2/ops_inode.c 2011-05-16 21:47:08.000000000 -0400 -@@ -740,6 +740,8 @@ static int gfs2_rename(struct inode *odi +diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c +index d8b26ac..95833f5 100644 +--- a/fs/gfs2/ops_inode.c ++++ b/fs/gfs2/ops_inode.c +@@ -740,6 +740,8 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry, unsigned int x; int error; @@ -39778,10 +40750,11 @@ diff -urNp linux-2.6.38.7/fs/gfs2/ops_inode.c linux-2.6.38.7/fs/gfs2/ops_inode.c if (!IS_ERR(s)) kfree(s); } -diff -urNp linux-2.6.38.7/fs/hfsplus/catalog.c linux-2.6.38.7/fs/hfsplus/catalog.c ---- linux-2.6.38.7/fs/hfsplus/catalog.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/hfsplus/catalog.c 2011-05-16 21:47:08.000000000 -0400 -@@ -179,6 +179,8 @@ int hfsplus_find_cat(struct super_block +diff --git a/fs/hfsplus/catalog.c b/fs/hfsplus/catalog.c +index b4ba1b3..6295691 100644 +--- a/fs/hfsplus/catalog.c ++++ b/fs/hfsplus/catalog.c +@@ -179,6 +179,8 @@ int hfsplus_find_cat(struct super_block *sb, u32 cnid, int err; u16 type; @@ -39790,7 +40763,7 @@ diff -urNp linux-2.6.38.7/fs/hfsplus/catalog.c linux-2.6.38.7/fs/hfsplus/catalog hfsplus_cat_build_key(sb, fd->search_key, cnid, NULL); err = hfs_brec_read(fd, &tmp, sizeof(hfsplus_cat_entry)); if (err) -@@ -210,6 +212,8 @@ int hfsplus_create_cat(u32 cnid, struct +@@ -210,6 +212,8 @@ int hfsplus_create_cat(u32 cnid, struct inode *dir, int entry_size; int err; @@ -39808,10 +40781,11 @@ diff -urNp linux-2.6.38.7/fs/hfsplus/catalog.c linux-2.6.38.7/fs/hfsplus/catalog dprint(DBG_CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n", cnid, src_dir->i_ino, src_name->name, dst_dir->i_ino, dst_name->name); -diff -urNp linux-2.6.38.7/fs/hfsplus/dir.c linux-2.6.38.7/fs/hfsplus/dir.c ---- linux-2.6.38.7/fs/hfsplus/dir.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/hfsplus/dir.c 2011-05-16 21:47:08.000000000 -0400 -@@ -129,6 +129,8 @@ static int hfsplus_readdir(struct file * +diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c +index 4df5059..00a2dcd 100644 +--- a/fs/hfsplus/dir.c ++++ b/fs/hfsplus/dir.c +@@ -129,6 +129,8 @@ static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir) struct hfsplus_readdir_data *rd; u16 type; @@ -39820,10 +40794,11 @@ diff -urNp linux-2.6.38.7/fs/hfsplus/dir.c linux-2.6.38.7/fs/hfsplus/dir.c if (filp->f_pos >= inode->i_size) return 0; -diff -urNp linux-2.6.38.7/fs/hfsplus/inode.c linux-2.6.38.7/fs/hfsplus/inode.c ---- linux-2.6.38.7/fs/hfsplus/inode.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/hfsplus/inode.c 2011-05-16 21:47:08.000000000 -0400 -@@ -491,6 +491,8 @@ int hfsplus_cat_read_inode(struct inode +diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c +index a8df651..2d77dbd 100644 +--- a/fs/hfsplus/inode.c ++++ b/fs/hfsplus/inode.c +@@ -491,6 +491,8 @@ int hfsplus_cat_read_inode(struct inode *inode, struct hfs_find_data *fd) int res = 0; u16 type; @@ -39832,7 +40807,7 @@ diff -urNp linux-2.6.38.7/fs/hfsplus/inode.c linux-2.6.38.7/fs/hfsplus/inode.c type = hfs_bnode_read_u16(fd->bnode, fd->entryoffset); HFSPLUS_I(inode)->linkid = 0; -@@ -554,6 +556,8 @@ int hfsplus_cat_write_inode(struct inode +@@ -554,6 +556,8 @@ int hfsplus_cat_write_inode(struct inode *inode) struct hfs_find_data fd; hfsplus_cat_entry entry; @@ -39841,10 +40816,11 @@ diff -urNp linux-2.6.38.7/fs/hfsplus/inode.c linux-2.6.38.7/fs/hfsplus/inode.c if (HFSPLUS_IS_RSRC(inode)) main_inode = HFSPLUS_I(inode)->rsrc_inode; -diff -urNp linux-2.6.38.7/fs/hfsplus/ioctl.c linux-2.6.38.7/fs/hfsplus/ioctl.c ---- linux-2.6.38.7/fs/hfsplus/ioctl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/hfsplus/ioctl.c 2011-05-16 21:47:08.000000000 -0400 -@@ -122,6 +122,8 @@ int hfsplus_setxattr(struct dentry *dent +diff --git a/fs/hfsplus/ioctl.c b/fs/hfsplus/ioctl.c +index 508ce66..1bdc653 100644 +--- a/fs/hfsplus/ioctl.c ++++ b/fs/hfsplus/ioctl.c +@@ -122,6 +122,8 @@ int hfsplus_setxattr(struct dentry *dentry, const char *name, struct hfsplus_cat_file *file; int res; @@ -39853,7 +40829,7 @@ diff -urNp linux-2.6.38.7/fs/hfsplus/ioctl.c linux-2.6.38.7/fs/hfsplus/ioctl.c if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode)) return -EOPNOTSUPP; -@@ -166,6 +168,8 @@ ssize_t hfsplus_getxattr(struct dentry * +@@ -166,6 +168,8 @@ ssize_t hfsplus_getxattr(struct dentry *dentry, const char *name, struct hfsplus_cat_file *file; ssize_t res = 0; @@ -39862,10 +40838,11 @@ diff -urNp linux-2.6.38.7/fs/hfsplus/ioctl.c linux-2.6.38.7/fs/hfsplus/ioctl.c if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode)) return -EOPNOTSUPP; -diff -urNp linux-2.6.38.7/fs/hfsplus/super.c linux-2.6.38.7/fs/hfsplus/super.c ---- linux-2.6.38.7/fs/hfsplus/super.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/hfsplus/super.c 2011-05-16 21:47:08.000000000 -0400 -@@ -340,6 +340,8 @@ static int hfsplus_fill_super(struct sup +diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c +index b49b555..6caf51d 100644 +--- a/fs/hfsplus/super.c ++++ b/fs/hfsplus/super.c +@@ -340,6 +340,8 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent) struct nls_table *nls = NULL; int err; @@ -39874,10 +40851,11 @@ diff -urNp linux-2.6.38.7/fs/hfsplus/super.c linux-2.6.38.7/fs/hfsplus/super.c err = -EINVAL; sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); if (!sbi) -diff -urNp linux-2.6.38.7/fs/hugetlbfs/inode.c linux-2.6.38.7/fs/hugetlbfs/inode.c ---- linux-2.6.38.7/fs/hugetlbfs/inode.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/hugetlbfs/inode.c 2011-04-28 19:34:15.000000000 -0400 -@@ -915,7 +915,7 @@ static struct file_system_type hugetlbfs +diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c +index 9885082..6837c7c 100644 +--- a/fs/hugetlbfs/inode.c ++++ b/fs/hugetlbfs/inode.c +@@ -915,7 +915,7 @@ static struct file_system_type hugetlbfs_fs_type = { .kill_sb = kill_litter_super, }; @@ -39886,9 +40864,10 @@ diff -urNp linux-2.6.38.7/fs/hugetlbfs/inode.c linux-2.6.38.7/fs/hugetlbfs/inode static int can_do_hugetlb_shm(void) { -diff -urNp linux-2.6.38.7/fs/inode.c linux-2.6.38.7/fs/inode.c ---- linux-2.6.38.7/fs/inode.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/inode.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/inode.c b/fs/inode.c +index 0647d80..349005c 100644 +--- a/fs/inode.c ++++ b/fs/inode.c @@ -801,8 +801,8 @@ unsigned int get_next_ino(void) #ifdef CONFIG_SMP @@ -39900,10 +40879,11 @@ diff -urNp linux-2.6.38.7/fs/inode.c linux-2.6.38.7/fs/inode.c res = next - LAST_INO_BATCH; } -diff -urNp linux-2.6.38.7/fs/jbd/checkpoint.c linux-2.6.38.7/fs/jbd/checkpoint.c ---- linux-2.6.38.7/fs/jbd/checkpoint.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/jbd/checkpoint.c 2011-05-16 21:47:08.000000000 -0400 -@@ -350,6 +350,8 @@ int log_do_checkpoint(journal_t *journal +diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c +index e4b87bc..37402f7 100644 +--- a/fs/jbd/checkpoint.c ++++ b/fs/jbd/checkpoint.c +@@ -350,6 +350,8 @@ int log_do_checkpoint(journal_t *journal) tid_t this_tid; int result; @@ -39912,10 +40892,11 @@ diff -urNp linux-2.6.38.7/fs/jbd/checkpoint.c linux-2.6.38.7/fs/jbd/checkpoint.c jbd_debug(1, "Start checkpoint\n"); /* -diff -urNp linux-2.6.38.7/fs/jffs2/compr_rtime.c linux-2.6.38.7/fs/jffs2/compr_rtime.c ---- linux-2.6.38.7/fs/jffs2/compr_rtime.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/jffs2/compr_rtime.c 2011-05-16 21:47:08.000000000 -0400 -@@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned +diff --git a/fs/jffs2/compr_rtime.c b/fs/jffs2/compr_rtime.c +index 16a5047..88ff6ca 100644 +--- a/fs/jffs2/compr_rtime.c ++++ b/fs/jffs2/compr_rtime.c +@@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned char *data_in, int outpos = 0; int pos=0; @@ -39924,7 +40905,7 @@ diff -urNp linux-2.6.38.7/fs/jffs2/compr_rtime.c linux-2.6.38.7/fs/jffs2/compr_r memset(positions,0,sizeof(positions)); while (pos < (*sourcelen) && outpos <= (*dstlen)-2) { -@@ -78,6 +80,8 @@ static int jffs2_rtime_decompress(unsign +@@ -78,6 +80,8 @@ static int jffs2_rtime_decompress(unsigned char *data_in, int outpos = 0; int pos=0; @@ -39933,10 +40914,11 @@ diff -urNp linux-2.6.38.7/fs/jffs2/compr_rtime.c linux-2.6.38.7/fs/jffs2/compr_r memset(positions,0,sizeof(positions)); while (outpos<destlen) { -diff -urNp linux-2.6.38.7/fs/jffs2/compr_rubin.c linux-2.6.38.7/fs/jffs2/compr_rubin.c ---- linux-2.6.38.7/fs/jffs2/compr_rubin.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/jffs2/compr_rubin.c 2011-05-16 21:47:08.000000000 -0400 -@@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsig +diff --git a/fs/jffs2/compr_rubin.c b/fs/jffs2/compr_rubin.c +index 9e7cec8..4713089 100644 +--- a/fs/jffs2/compr_rubin.c ++++ b/fs/jffs2/compr_rubin.c +@@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsigned char *data_in, int ret; uint32_t mysrclen, mydstlen; @@ -39945,10 +40927,11 @@ diff -urNp linux-2.6.38.7/fs/jffs2/compr_rubin.c linux-2.6.38.7/fs/jffs2/compr_r mysrclen = *sourcelen; mydstlen = *dstlen - 8; -diff -urNp linux-2.6.38.7/fs/jffs2/erase.c linux-2.6.38.7/fs/jffs2/erase.c ---- linux-2.6.38.7/fs/jffs2/erase.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/jffs2/erase.c 2011-04-28 19:34:15.000000000 -0400 -@@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(stru +diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c +index e513f19..2ab1351 100644 +--- a/fs/jffs2/erase.c ++++ b/fs/jffs2/erase.c +@@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb struct jffs2_unknown_node marker = { .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER), @@ -39958,10 +40941,11 @@ diff -urNp linux-2.6.38.7/fs/jffs2/erase.c linux-2.6.38.7/fs/jffs2/erase.c }; jffs2_prealloc_raw_node_refs(c, jeb, 1); -diff -urNp linux-2.6.38.7/fs/jffs2/wbuf.c linux-2.6.38.7/fs/jffs2/wbuf.c ---- linux-2.6.38.7/fs/jffs2/wbuf.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/jffs2/wbuf.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o +diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c +index 07ee154..d8b657a 100644 +--- a/fs/jffs2/wbuf.c ++++ b/fs/jffs2/wbuf.c +@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node oob_cleanmarker = { .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER), @@ -39971,10 +40955,11 @@ diff -urNp linux-2.6.38.7/fs/jffs2/wbuf.c linux-2.6.38.7/fs/jffs2/wbuf.c }; /* -diff -urNp linux-2.6.38.7/fs/jffs2/xattr.c linux-2.6.38.7/fs/jffs2/xattr.c ---- linux-2.6.38.7/fs/jffs2/xattr.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/jffs2/xattr.c 2011-05-16 21:47:08.000000000 -0400 -@@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct +diff --git a/fs/jffs2/xattr.c b/fs/jffs2/xattr.c +index 4f9cc04..dac9014 100644 +--- a/fs/jffs2/xattr.c ++++ b/fs/jffs2/xattr.c +@@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct jffs2_sb_info *c) BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING)); @@ -39983,22 +40968,11 @@ diff -urNp linux-2.6.38.7/fs/jffs2/xattr.c linux-2.6.38.7/fs/jffs2/xattr.c /* Phase.1 : Merge same xref */ for (i=0; i < XREF_TMPHASH_SIZE; i++) xref_tmphash[i] = NULL; -diff -urNp linux-2.6.38.7/fs/Kconfig.binfmt linux-2.6.38.7/fs/Kconfig.binfmt ---- linux-2.6.38.7/fs/Kconfig.binfmt 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/Kconfig.binfmt 2011-04-28 19:34:15.000000000 -0400 -@@ -86,7 +86,7 @@ config HAVE_AOUT - - config BINFMT_AOUT - tristate "Kernel support for a.out and ECOFF binaries" -- depends on HAVE_AOUT -+ depends on HAVE_AOUT && BROKEN - ---help--- - A.out (Assembler.OUTput) is a set of formats for libraries and - executables used in the earliest versions of UNIX. Linux used -diff -urNp linux-2.6.38.7/fs/libfs.c linux-2.6.38.7/fs/libfs.c ---- linux-2.6.38.7/fs/libfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/libfs.c 2011-05-11 18:34:57.000000000 -0400 -@@ -163,6 +163,9 @@ int dcache_readdir(struct file * filp, v +diff --git a/fs/libfs.c b/fs/libfs.c +index c88eab5..40ef667 100644 +--- a/fs/libfs.c ++++ b/fs/libfs.c +@@ -163,6 +163,9 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir) for (p=q->next; p != &dentry->d_subdirs; p=p->next) { struct dentry *next; @@ -40008,7 +40982,7 @@ diff -urNp linux-2.6.38.7/fs/libfs.c linux-2.6.38.7/fs/libfs.c next = list_entry(p, struct dentry, d_u.d_child); spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED); if (!simple_positive(next)) { -@@ -172,7 +175,12 @@ int dcache_readdir(struct file * filp, v +@@ -172,7 +175,12 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir) spin_unlock(&next->d_lock); spin_unlock(&dentry->d_lock); @@ -40022,10 +40996,11 @@ diff -urNp linux-2.6.38.7/fs/libfs.c linux-2.6.38.7/fs/libfs.c next->d_name.len, filp->f_pos, next->d_inode->i_ino, dt_type(next->d_inode)) < 0) -diff -urNp linux-2.6.38.7/fs/lockd/clntproc.c linux-2.6.38.7/fs/lockd/clntproc.c ---- linux-2.6.38.7/fs/lockd/clntproc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/lockd/clntproc.c 2011-05-16 21:47:08.000000000 -0400 -@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt +diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c +index adb45ec..a8c217c 100644 +--- a/fs/lockd/clntproc.c ++++ b/fs/lockd/clntproc.c +@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops; /* * Cookie counter for NLM requests */ @@ -40039,7 +41014,7 @@ diff -urNp linux-2.6.38.7/fs/lockd/clntproc.c linux-2.6.38.7/fs/lockd/clntproc.c memcpy(c->data, &cookie, 4); c->len=4; -@@ -620,6 +620,8 @@ nlmclnt_reclaim(struct nlm_host *host, s +@@ -620,6 +620,8 @@ nlmclnt_reclaim(struct nlm_host *host, struct file_lock *fl) struct nlm_rqst reqst, *req; int status; @@ -40048,9 +41023,10 @@ diff -urNp linux-2.6.38.7/fs/lockd/clntproc.c linux-2.6.38.7/fs/lockd/clntproc.c req = &reqst; memset(req, 0, sizeof(*req)); locks_init_lock(&req->a_args.lock.fl); -diff -urNp linux-2.6.38.7/fs/lockd/svc.c linux-2.6.38.7/fs/lockd/svc.c ---- linux-2.6.38.7/fs/lockd/svc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/lockd/svc.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c +index abfff9d..143361b 100644 +--- a/fs/lockd/svc.c ++++ b/fs/lockd/svc.c @@ -41,7 +41,7 @@ static struct svc_program nlmsvc_program; @@ -40060,10 +41036,11 @@ diff -urNp linux-2.6.38.7/fs/lockd/svc.c linux-2.6.38.7/fs/lockd/svc.c EXPORT_SYMBOL_GPL(nlmsvc_ops); static DEFINE_MUTEX(nlmsvc_mutex); -diff -urNp linux-2.6.38.7/fs/locks.c linux-2.6.38.7/fs/locks.c ---- linux-2.6.38.7/fs/locks.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/locks.c 2011-04-28 19:34:15.000000000 -0400 -@@ -2044,16 +2044,16 @@ void locks_remove_flock(struct file *fil +diff --git a/fs/locks.c b/fs/locks.c +index 0f39982..8b81129 100644 +--- a/fs/locks.c ++++ b/fs/locks.c +@@ -2044,16 +2044,16 @@ void locks_remove_flock(struct file *filp) return; if (filp->f_op && filp->f_op->flock) { @@ -40084,10 +41061,11 @@ diff -urNp linux-2.6.38.7/fs/locks.c linux-2.6.38.7/fs/locks.c } lock_flocks(); -diff -urNp linux-2.6.38.7/fs/logfs/super.c linux-2.6.38.7/fs/logfs/super.c ---- linux-2.6.38.7/fs/logfs/super.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/logfs/super.c 2011-05-16 21:47:08.000000000 -0400 -@@ -266,6 +266,8 @@ static int logfs_recover_sb(struct super +diff --git a/fs/logfs/super.c b/fs/logfs/super.c +index 33435e4..ea06c2b 100644 +--- a/fs/logfs/super.c ++++ b/fs/logfs/super.c +@@ -266,6 +266,8 @@ static int logfs_recover_sb(struct super_block *sb) struct logfs_disk_super _ds1, *ds1 = &_ds1; int err, valid0, valid1; @@ -40096,10 +41074,11 @@ diff -urNp linux-2.6.38.7/fs/logfs/super.c linux-2.6.38.7/fs/logfs/super.c /* read first superblock */ err = wbuf_read(sb, super->s_sb_ofs[0], sizeof(*ds0), ds0); if (err) -diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c ---- linux-2.6.38.7/fs/namei.c 2011-04-22 19:20:59.000000000 -0400 -+++ linux-2.6.38.7/fs/namei.c 2011-05-22 16:14:10.000000000 -0400 -@@ -226,20 +226,30 @@ int generic_permission(struct inode *ino +diff --git a/fs/namei.c b/fs/namei.c +index 3095ca8..3d19ac4 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -226,20 +226,30 @@ int generic_permission(struct inode *inode, int mask, unsigned int flags, return ret; /* @@ -40138,13 +41117,13 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c return -EACCES; } -@@ -687,8 +697,17 @@ static inline int exec_permission(struct +@@ -687,8 +697,17 @@ static inline int exec_permission(struct inode *inode, unsigned int flags) if (ret == -ECHILD) return ret; - if (capable(CAP_DAC_OVERRIDE) || capable(CAP_DAC_READ_SEARCH)) + if (capable_nolog(CAP_DAC_OVERRIDE)) -+ goto ok; + goto ok; + else { +#ifdef CONFIG_GRKERNSEC + if (flags & IPERM_FLAG_RCU) @@ -40152,12 +41131,12 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c +#endif + if (capable(CAP_DAC_READ_SEARCH) || + capable(CAP_DAC_OVERRIDE)) - goto ok; ++ goto ok; + } return ret; ok: -@@ -776,7 +795,7 @@ __do_follow_link(const struct path *link +@@ -776,7 +795,7 @@ __do_follow_link(const struct path *link, struct nameidata *nd, void **p) *p = dentry->d_inode->i_op->follow_link(dentry, nd); error = PTR_ERR(*p); if (!IS_ERR(*p)) { @@ -40166,7 +41145,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c error = 0; if (s) error = __vfs_follow_link(nd, s); -@@ -815,6 +834,13 @@ static inline int do_follow_link(struct +@@ -815,6 +834,13 @@ static inline int do_follow_link(struct inode *inode, struct path *path, struct err = security_inode_follow_link(path->dentry, nd); if (err) goto loop; @@ -40217,7 +41196,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c path_put(&nd->path); return_err: return err; -@@ -1739,6 +1788,9 @@ static int do_path_lookup(int dfd, const +@@ -1739,6 +1788,9 @@ static int do_path_lookup(int dfd, const char *name, } if (likely(!retval)) { @@ -40227,7 +41206,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c if (unlikely(!audit_dummy_context())) { if (nd->path.dentry && nd->inode) audit_inode(name, nd->path.dentry); -@@ -2079,6 +2131,30 @@ int vfs_create(struct inode *dir, struct +@@ -2079,6 +2131,30 @@ int vfs_create(struct inode *dir, struct dentry *dentry, int mode, return error; } @@ -40258,7 +41237,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c int may_open(struct path *path, int acc_mode, int flag) { struct dentry *dentry = path->dentry; -@@ -2127,7 +2203,27 @@ int may_open(struct path *path, int acc_ +@@ -2127,7 +2203,27 @@ int may_open(struct path *path, int acc_mode, int flag) /* * Ensure there are no outstanding leases on the file. */ @@ -40287,7 +41266,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c } static int handle_truncate(struct file *filp) -@@ -2162,6 +2258,12 @@ static int __open_namei_create(struct na +@@ -2162,6 +2258,12 @@ static int __open_namei_create(struct nameidata *nd, struct path *path, { int error; struct dentry *dir = nd->path.dentry; @@ -40300,7 +41279,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c if (!IS_POSIXACL(dir->d_inode)) mode &= ~current_umask(); -@@ -2169,6 +2271,8 @@ static int __open_namei_create(struct na +@@ -2169,6 +2271,8 @@ static int __open_namei_create(struct nameidata *nd, struct path *path, if (error) goto out_unlock; error = vfs_create(dir->d_inode, path->dentry, mode, nd); @@ -40340,7 +41319,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c static int open_will_truncate(int flag, struct inode *inode) { /* -@@ -2274,6 +2354,7 @@ static struct file *do_last(struct namei +@@ -2274,6 +2354,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path, int mode, const char *pathname) { struct dentry *dir = nd->path.dentry; @@ -40348,7 +41327,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c struct file *filp; int error = -EISDIR; -@@ -2352,6 +2433,14 @@ static struct file *do_last(struct namei +@@ -2352,6 +2433,14 @@ static struct file *do_last(struct nameidata *nd, struct path *path, /* * It already exists. */ @@ -40375,7 +41354,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c error = __do_follow_link(&link, &nd, &cookie); if (unlikely(error)) { if (!IS_ERR(cookie) && linki->i_op->put_link) -@@ -2705,6 +2799,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const +@@ -2705,6 +2799,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode, error = may_mknod(mode); if (error) goto out_dput; @@ -40393,7 +41372,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c error = mnt_want_write(nd.path.mnt); if (error) goto out_dput; -@@ -2725,6 +2830,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const +@@ -2725,6 +2830,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode, } out_drop_write: mnt_drop_write(nd.path.mnt); @@ -40403,7 +41382,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c out_dput: dput(dentry); out_unlock: -@@ -2777,6 +2885,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const +@@ -2777,6 +2885,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, int, mode) if (IS_ERR(dentry)) goto out_unlock; @@ -40415,7 +41394,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c if (!IS_POSIXACL(nd.path.dentry->d_inode)) mode &= ~current_umask(); error = mnt_want_write(nd.path.mnt); -@@ -2788,6 +2901,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const +@@ -2788,6 +2901,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, int, mode) error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode); out_drop_write: mnt_drop_write(nd.path.mnt); @@ -40426,7 +41405,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c out_dput: dput(dentry); out_unlock: -@@ -2867,6 +2984,8 @@ static long do_rmdir(int dfd, const char +@@ -2867,6 +2984,8 @@ static long do_rmdir(int dfd, const char __user *pathname) char * name; struct dentry *dentry; struct nameidata nd; @@ -40435,7 +41414,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c error = user_path_parent(dfd, pathname, &nd, &name); if (error) -@@ -2891,6 +3010,19 @@ static long do_rmdir(int dfd, const char +@@ -2891,6 +3010,19 @@ static long do_rmdir(int dfd, const char __user *pathname) error = PTR_ERR(dentry); if (IS_ERR(dentry)) goto exit2; @@ -40455,7 +41434,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c error = mnt_want_write(nd.path.mnt); if (error) goto exit3; -@@ -2898,6 +3030,8 @@ static long do_rmdir(int dfd, const char +@@ -2898,6 +3030,8 @@ static long do_rmdir(int dfd, const char __user *pathname) if (error) goto exit4; error = vfs_rmdir(nd.path.dentry->d_inode, dentry); @@ -40464,7 +41443,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c exit4: mnt_drop_write(nd.path.mnt); exit3: -@@ -2960,6 +3094,8 @@ static long do_unlinkat(int dfd, const c +@@ -2960,6 +3094,8 @@ static long do_unlinkat(int dfd, const char __user *pathname) struct dentry *dentry; struct nameidata nd; struct inode *inode = NULL; @@ -40473,7 +41452,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c error = user_path_parent(dfd, pathname, &nd, &name); if (error) -@@ -2979,8 +3115,17 @@ static long do_unlinkat(int dfd, const c +@@ -2979,8 +3115,17 @@ static long do_unlinkat(int dfd, const char __user *pathname) if (nd.last.name[nd.last.len]) goto slashes; inode = dentry->d_inode; @@ -40492,7 +41471,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c error = mnt_want_write(nd.path.mnt); if (error) goto exit2; -@@ -2988,6 +3133,8 @@ static long do_unlinkat(int dfd, const c +@@ -2988,6 +3133,8 @@ static long do_unlinkat(int dfd, const char __user *pathname) if (error) goto exit3; error = vfs_unlink(nd.path.dentry->d_inode, dentry); @@ -40501,7 +41480,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c exit3: mnt_drop_write(nd.path.mnt); exit2: -@@ -3065,6 +3212,11 @@ SYSCALL_DEFINE3(symlinkat, const char __ +@@ -3065,6 +3212,11 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname, if (IS_ERR(dentry)) goto out_unlock; @@ -40513,7 +41492,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c error = mnt_want_write(nd.path.mnt); if (error) goto out_dput; -@@ -3072,6 +3224,8 @@ SYSCALL_DEFINE3(symlinkat, const char __ +@@ -3072,6 +3224,8 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname, if (error) goto out_drop_write; error = vfs_symlink(nd.path.dentry->d_inode, dentry, from); @@ -40522,7 +41501,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c out_drop_write: mnt_drop_write(nd.path.mnt); out_dput: -@@ -3164,6 +3318,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con +@@ -3164,6 +3318,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname, error = PTR_ERR(new_dentry); if (IS_ERR(new_dentry)) goto out_unlock; @@ -40543,7 +41522,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c error = mnt_want_write(nd.path.mnt); if (error) goto out_dput; -@@ -3171,6 +3339,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con +@@ -3171,6 +3339,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname, if (error) goto out_drop_write; error = vfs_link(old_path.dentry, nd.path.dentry->d_inode, new_dentry); @@ -40552,7 +41531,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c out_drop_write: mnt_drop_write(nd.path.mnt); out_dput: -@@ -3348,6 +3518,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c +@@ -3348,6 +3518,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname, char *to; int error; @@ -40561,7 +41540,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c error = user_path_parent(olddfd, oldname, &oldnd, &from); if (error) goto exit; -@@ -3404,6 +3576,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c +@@ -3404,6 +3576,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname, if (new_dentry == trap) goto exit5; @@ -40574,7 +41553,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c error = mnt_want_write(oldnd.path.mnt); if (error) goto exit5; -@@ -3413,6 +3591,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c +@@ -3413,6 +3591,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname, goto exit6; error = vfs_rename(old_dir->d_inode, old_dentry, new_dir->d_inode, new_dentry); @@ -40584,7 +41563,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c exit6: mnt_drop_write(oldnd.path.mnt); exit5: -@@ -3438,6 +3619,8 @@ SYSCALL_DEFINE2(rename, const char __use +@@ -3438,6 +3619,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link) { @@ -40593,7 +41572,7 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c int len; len = PTR_ERR(link); -@@ -3447,7 +3630,14 @@ int vfs_readlink(struct dentry *dentry, +@@ -3447,7 +3630,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c len = strlen(link); if (len > (unsigned) buflen) len = buflen; @@ -40609,10 +41588,11 @@ diff -urNp linux-2.6.38.7/fs/namei.c linux-2.6.38.7/fs/namei.c len = -EFAULT; out: return len; -diff -urNp linux-2.6.38.7/fs/namespace.c linux-2.6.38.7/fs/namespace.c ---- linux-2.6.38.7/fs/namespace.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.7/fs/namespace.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1285,6 +1285,9 @@ static int do_umount(struct vfsmount *mn +diff --git a/fs/namespace.c b/fs/namespace.c +index 445534b..5b2b3b5 100644 +--- a/fs/namespace.c ++++ b/fs/namespace.c +@@ -1285,6 +1285,9 @@ static int do_umount(struct vfsmount *mnt, int flags) if (!(sb->s_flags & MS_RDONLY)) retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); up_write(&sb->s_umount); @@ -40622,7 +41602,7 @@ diff -urNp linux-2.6.38.7/fs/namespace.c linux-2.6.38.7/fs/namespace.c return retval; } -@@ -1304,6 +1307,9 @@ static int do_umount(struct vfsmount *mn +@@ -1304,6 +1307,9 @@ static int do_umount(struct vfsmount *mnt, int flags) br_write_unlock(vfsmount_lock); up_write(&namespace_sem); release_mounts(&umount_list); @@ -40632,7 +41612,7 @@ diff -urNp linux-2.6.38.7/fs/namespace.c linux-2.6.38.7/fs/namespace.c return retval; } -@@ -2241,6 +2247,16 @@ long do_mount(char *dev_name, char *dir_ +@@ -2241,6 +2247,16 @@ long do_mount(char *dev_name, char *dir_name, char *type_page, MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT | MS_STRICTATIME); @@ -40649,7 +41629,7 @@ diff -urNp linux-2.6.38.7/fs/namespace.c linux-2.6.38.7/fs/namespace.c if (flags & MS_REMOUNT) retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags, data_page); -@@ -2255,6 +2271,9 @@ long do_mount(char *dev_name, char *dir_ +@@ -2255,6 +2271,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page, dev_name, data_page); dput_out: path_put(&path); @@ -40659,7 +41639,7 @@ diff -urNp linux-2.6.38.7/fs/namespace.c linux-2.6.38.7/fs/namespace.c return retval; } -@@ -2480,6 +2499,12 @@ SYSCALL_DEFINE2(pivot_root, const char _ +@@ -2480,6 +2499,12 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root, goto out1; } @@ -40672,10 +41652,11 @@ diff -urNp linux-2.6.38.7/fs/namespace.c linux-2.6.38.7/fs/namespace.c get_fs_root(current->fs, &root); down_write(&namespace_sem); mutex_lock(&old.dentry->d_inode->i_mutex); -diff -urNp linux-2.6.38.7/fs/ncpfs/dir.c linux-2.6.38.7/fs/ncpfs/dir.c ---- linux-2.6.38.7/fs/ncpfs/dir.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/ncpfs/dir.c 2011-05-16 21:47:09.000000000 -0400 -@@ -299,6 +299,8 @@ ncp_lookup_validate(struct dentry *dentr +diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c +index f6946bb..c688671 100644 +--- a/fs/ncpfs/dir.c ++++ b/fs/ncpfs/dir.c +@@ -299,6 +299,8 @@ ncp_lookup_validate(struct dentry *dentry, struct nameidata *nd) int res, val = 0, len; __u8 __name[NCP_MAXPATHLEN + 1]; @@ -40684,7 +41665,7 @@ diff -urNp linux-2.6.38.7/fs/ncpfs/dir.c linux-2.6.38.7/fs/ncpfs/dir.c if (dentry == dentry->d_sb->s_root) return 1; -@@ -844,6 +846,8 @@ static struct dentry *ncp_lookup(struct +@@ -844,6 +846,8 @@ static struct dentry *ncp_lookup(struct inode *dir, struct dentry *dentry, struc int error, res, len; __u8 __name[NCP_MAXPATHLEN + 1]; @@ -40693,7 +41674,7 @@ diff -urNp linux-2.6.38.7/fs/ncpfs/dir.c linux-2.6.38.7/fs/ncpfs/dir.c error = -EIO; if (!ncp_conn_valid(server)) goto finished; -@@ -931,6 +935,8 @@ int ncp_create_new(struct inode *dir, st +@@ -931,6 +935,8 @@ int ncp_create_new(struct inode *dir, struct dentry *dentry, int mode, PPRINTK("ncp_create_new: creating %s/%s, mode=%x\n", dentry->d_parent->d_name.name, dentry->d_name.name, mode); @@ -40702,7 +41683,7 @@ diff -urNp linux-2.6.38.7/fs/ncpfs/dir.c linux-2.6.38.7/fs/ncpfs/dir.c ncp_age_dentry(server, dentry); len = sizeof(__name); error = ncp_io2vol(server, __name, &len, dentry->d_name.name, -@@ -992,6 +998,8 @@ static int ncp_mkdir(struct inode *dir, +@@ -992,6 +998,8 @@ static int ncp_mkdir(struct inode *dir, struct dentry *dentry, int mode) int error, len; __u8 __name[NCP_MAXPATHLEN + 1]; @@ -40711,7 +41692,7 @@ diff -urNp linux-2.6.38.7/fs/ncpfs/dir.c linux-2.6.38.7/fs/ncpfs/dir.c DPRINTK("ncp_mkdir: making %s/%s\n", dentry->d_parent->d_name.name, dentry->d_name.name); -@@ -1135,6 +1143,8 @@ static int ncp_rename(struct inode *old_ +@@ -1135,6 +1143,8 @@ static int ncp_rename(struct inode *old_dir, struct dentry *old_dentry, int old_len, new_len; __u8 __old_name[NCP_MAXPATHLEN + 1], __new_name[NCP_MAXPATHLEN + 1]; @@ -40720,10 +41701,11 @@ diff -urNp linux-2.6.38.7/fs/ncpfs/dir.c linux-2.6.38.7/fs/ncpfs/dir.c DPRINTK("ncp_rename: %s/%s to %s/%s\n", old_dentry->d_parent->d_name.name, old_dentry->d_name.name, new_dentry->d_parent->d_name.name, new_dentry->d_name.name); -diff -urNp linux-2.6.38.7/fs/ncpfs/inode.c linux-2.6.38.7/fs/ncpfs/inode.c ---- linux-2.6.38.7/fs/ncpfs/inode.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/ncpfs/inode.c 2011-05-16 21:47:09.000000000 -0400 -@@ -461,6 +461,8 @@ static int ncp_fill_super(struct super_b +diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c +index 00a1d1c..944dba1 100644 +--- a/fs/ncpfs/inode.c ++++ b/fs/ncpfs/inode.c +@@ -461,6 +461,8 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent) #endif struct ncp_entry_info finfo; @@ -40732,10 +41714,11 @@ diff -urNp linux-2.6.38.7/fs/ncpfs/inode.c linux-2.6.38.7/fs/ncpfs/inode.c data.wdog_pid = NULL; server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL); if (!server) -diff -urNp linux-2.6.38.7/fs/nfs/inode.c linux-2.6.38.7/fs/nfs/inode.c ---- linux-2.6.38.7/fs/nfs/inode.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/nfs/inode.c 2011-04-28 19:34:15.000000000 -0400 -@@ -998,16 +998,16 @@ static int nfs_size_need_update(const st +diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c +index 2f8e618..5094d93 100644 +--- a/fs/nfs/inode.c ++++ b/fs/nfs/inode.c +@@ -998,16 +998,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); } @@ -40755,9 +41738,10 @@ diff -urNp linux-2.6.38.7/fs/nfs/inode.c linux-2.6.38.7/fs/nfs/inode.c } void nfs_fattr_init(struct nfs_fattr *fattr) -diff -urNp linux-2.6.38.7/fs/nfsd/lockd.c linux-2.6.38.7/fs/nfsd/lockd.c ---- linux-2.6.38.7/fs/nfsd/lockd.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/fs/nfsd/lockd.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c +index 7c831a2..332c6af 100644 +--- a/fs/nfsd/lockd.c ++++ b/fs/nfsd/lockd.c @@ -60,7 +60,7 @@ nlm_fclose(struct file *filp) fput(filp); } @@ -40767,10 +41751,11 @@ diff -urNp linux-2.6.38.7/fs/nfsd/lockd.c linux-2.6.38.7/fs/nfsd/lockd.c .fopen = nlm_fopen, /* open file for locking */ .fclose = nlm_fclose, /* close file */ }; -diff -urNp linux-2.6.38.7/fs/nfsd/nfs4state.c linux-2.6.38.7/fs/nfsd/nfs4state.c ---- linux-2.6.38.7/fs/nfsd/nfs4state.c 2011-05-10 22:06:27.000000000 -0400 -+++ linux-2.6.38.7/fs/nfsd/nfs4state.c 2011-05-16 21:47:09.000000000 -0400 -@@ -3783,6 +3783,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc +diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c +index 18c356c..4ff7ed3 100644 +--- a/fs/nfsd/nfs4state.c ++++ b/fs/nfsd/nfs4state.c +@@ -3783,6 +3783,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, unsigned int strhashval; int err; @@ -40779,10 +41764,11 @@ diff -urNp linux-2.6.38.7/fs/nfsd/nfs4state.c linux-2.6.38.7/fs/nfsd/nfs4state.c dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n", (long long) lock->lk_offset, (long long) lock->lk_length); -diff -urNp linux-2.6.38.7/fs/nfsd/nfs4xdr.c linux-2.6.38.7/fs/nfsd/nfs4xdr.c ---- linux-2.6.38.7/fs/nfsd/nfs4xdr.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.7/fs/nfsd/nfs4xdr.c 2011-05-16 21:47:09.000000000 -0400 -@@ -1793,6 +1793,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s +diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c +index c6766af..7d5e9ec 100644 +--- a/fs/nfsd/nfs4xdr.c ++++ b/fs/nfsd/nfs4xdr.c +@@ -1793,6 +1793,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, .dentry = dentry, }; @@ -40791,10 +41777,11 @@ diff -urNp linux-2.6.38.7/fs/nfsd/nfs4xdr.c linux-2.6.38.7/fs/nfsd/nfs4xdr.c BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1); BUG_ON(bmval0 & ~nfsd_suppattrs0(minorversion)); BUG_ON(bmval1 & ~nfsd_suppattrs1(minorversion)); -diff -urNp linux-2.6.38.7/fs/nfsd/nfsctl.c linux-2.6.38.7/fs/nfsd/nfsctl.c ---- linux-2.6.38.7/fs/nfsd/nfsctl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/nfsd/nfsctl.c 2011-04-28 19:34:15.000000000 -0400 -@@ -180,7 +180,7 @@ static int export_features_open(struct i +diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c +index 33b3e2b..4fc39f3 100644 +--- a/fs/nfsd/nfsctl.c ++++ b/fs/nfsd/nfsctl.c +@@ -180,7 +180,7 @@ static int export_features_open(struct inode *inode, struct file *file) return single_open(file, export_features_show, NULL); } @@ -40803,10 +41790,11 @@ diff -urNp linux-2.6.38.7/fs/nfsd/nfsctl.c linux-2.6.38.7/fs/nfsd/nfsctl.c .open = export_features_open, .read = seq_read, .llseek = seq_lseek, -diff -urNp linux-2.6.38.7/fs/nfsd/vfs.c linux-2.6.38.7/fs/nfsd/vfs.c ---- linux-2.6.38.7/fs/nfsd/vfs.c 2011-05-10 22:06:29.000000000 -0400 -+++ linux-2.6.38.7/fs/nfsd/vfs.c 2011-05-10 22:08:57.000000000 -0400 -@@ -898,7 +898,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st +diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c +index 435f407..363ad5a 100644 +--- a/fs/nfsd/vfs.c ++++ b/fs/nfsd/vfs.c +@@ -898,7 +898,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, } else { oldfs = get_fs(); set_fs(KERNEL_DS); @@ -40815,7 +41803,7 @@ diff -urNp linux-2.6.38.7/fs/nfsd/vfs.c linux-2.6.38.7/fs/nfsd/vfs.c set_fs(oldfs); } -@@ -1002,7 +1002,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, s +@@ -1002,7 +1002,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, /* Write the data. */ oldfs = get_fs(); set_fs(KERNEL_DS); @@ -40824,7 +41812,7 @@ diff -urNp linux-2.6.38.7/fs/nfsd/vfs.c linux-2.6.38.7/fs/nfsd/vfs.c set_fs(oldfs); if (host_err < 0) goto out_nfserr; -@@ -1525,7 +1525,7 @@ nfsd_readlink(struct svc_rqst *rqstp, st +@@ -1525,7 +1525,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp) */ oldfs = get_fs(); set_fs(KERNEL_DS); @@ -40833,10 +41821,11 @@ diff -urNp linux-2.6.38.7/fs/nfsd/vfs.c linux-2.6.38.7/fs/nfsd/vfs.c set_fs(oldfs); if (host_err < 0) -diff -urNp linux-2.6.38.7/fs/notify/dnotify/dnotify.c linux-2.6.38.7/fs/notify/dnotify/dnotify.c ---- linux-2.6.38.7/fs/notify/dnotify/dnotify.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/notify/dnotify/dnotify.c 2011-04-28 19:34:15.000000000 -0400 -@@ -151,7 +151,7 @@ static void dnotify_free_mark(struct fsn +diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c +index 3344bdd..b76f2a5 100644 +--- a/fs/notify/dnotify/dnotify.c ++++ b/fs/notify/dnotify/dnotify.c +@@ -151,7 +151,7 @@ static void dnotify_free_mark(struct fsnotify_mark *fsn_mark) kmem_cache_free(dnotify_mark_cache, dn_mark); } @@ -40845,10 +41834,11 @@ diff -urNp linux-2.6.38.7/fs/notify/dnotify/dnotify.c linux-2.6.38.7/fs/notify/d .handle_event = dnotify_handle_event, .should_send_event = dnotify_should_send_event, .free_group_priv = NULL, -diff -urNp linux-2.6.38.7/fs/notify/notification.c linux-2.6.38.7/fs/notify/notification.c ---- linux-2.6.38.7/fs/notify/notification.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/notify/notification.c 2011-04-28 19:57:25.000000000 -0400 -@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event +diff --git a/fs/notify/notification.c b/fs/notify/notification.c +index f39260f..79e6b04 100644 +--- a/fs/notify/notification.c ++++ b/fs/notify/notification.c +@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event_holder_cachep; * get set to 0 so it will never get 'freed' */ static struct fsnotify_event *q_overflow_event; @@ -40857,7 +41847,7 @@ diff -urNp linux-2.6.38.7/fs/notify/notification.c linux-2.6.38.7/fs/notify/noti /** * fsnotify_get_cookie - return a unique cookie for use in synchronizing events. -@@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = A +@@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0); */ u32 fsnotify_get_cookie(void) { @@ -40866,9 +41856,10 @@ diff -urNp linux-2.6.38.7/fs/notify/notification.c linux-2.6.38.7/fs/notify/noti } EXPORT_SYMBOL_GPL(fsnotify_get_cookie); -diff -urNp linux-2.6.38.7/fs/ntfs/dir.c linux-2.6.38.7/fs/ntfs/dir.c ---- linux-2.6.38.7/fs/ntfs/dir.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/ntfs/dir.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c +index 0f48e7c..3cba773 100644 +--- a/fs/ntfs/dir.c ++++ b/fs/ntfs/dir.c @@ -1329,7 +1329,7 @@ find_next_index_buffer: ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK & ~(s64)(ndir->itype.index.block_size - 1))); @@ -40878,10 +41869,11 @@ diff -urNp linux-2.6.38.7/fs/ntfs/dir.c linux-2.6.38.7/fs/ntfs/dir.c ntfs_error(sb, "Out of bounds check failed. Corrupt directory " "inode 0x%lx or driver bug.", vdir->i_ino); goto err_out; -diff -urNp linux-2.6.38.7/fs/ntfs/file.c linux-2.6.38.7/fs/ntfs/file.c ---- linux-2.6.38.7/fs/ntfs/file.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/ntfs/file.c 2011-04-28 19:34:15.000000000 -0400 -@@ -2222,6 +2222,6 @@ const struct inode_operations ntfs_file_ +diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c +index f4b1057..a0e2493 100644 +--- a/fs/ntfs/file.c ++++ b/fs/ntfs/file.c +@@ -2222,6 +2222,6 @@ const struct inode_operations ntfs_file_inode_ops = { #endif /* NTFS_RW */ }; @@ -40890,10 +41882,11 @@ diff -urNp linux-2.6.38.7/fs/ntfs/file.c linux-2.6.38.7/fs/ntfs/file.c -const struct inode_operations ntfs_empty_inode_ops = {}; +const struct inode_operations ntfs_empty_inode_ops __read_only; -diff -urNp linux-2.6.38.7/fs/ocfs2/localalloc.c linux-2.6.38.7/fs/ocfs2/localalloc.c ---- linux-2.6.38.7/fs/ocfs2/localalloc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/ocfs2/localalloc.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1307,7 +1307,7 @@ static int ocfs2_local_alloc_slide_windo +diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c +index ec6adbf..f129c5e 100644 +--- a/fs/ocfs2/localalloc.c ++++ b/fs/ocfs2/localalloc.c +@@ -1307,7 +1307,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb, goto bail; } @@ -40902,10 +41895,11 @@ diff -urNp linux-2.6.38.7/fs/ocfs2/localalloc.c linux-2.6.38.7/fs/ocfs2/localall bail: if (handle) -diff -urNp linux-2.6.38.7/fs/ocfs2/namei.c linux-2.6.38.7/fs/ocfs2/namei.c ---- linux-2.6.38.7/fs/ocfs2/namei.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/ocfs2/namei.c 2011-05-16 21:47:09.000000000 -0400 -@@ -1064,6 +1064,8 @@ static int ocfs2_rename(struct inode *ol +diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c +index 849fb4a..f48c5b7 100644 +--- a/fs/ocfs2/namei.c ++++ b/fs/ocfs2/namei.c +@@ -1064,6 +1064,8 @@ static int ocfs2_rename(struct inode *old_dir, struct ocfs2_dir_lookup_result orphan_insert = { NULL, }; struct ocfs2_dir_lookup_result target_insert = { NULL, }; @@ -40914,9 +41908,10 @@ diff -urNp linux-2.6.38.7/fs/ocfs2/namei.c linux-2.6.38.7/fs/ocfs2/namei.c /* At some point it might be nice to break this function up a * bit. */ -diff -urNp linux-2.6.38.7/fs/ocfs2/ocfs2.h linux-2.6.38.7/fs/ocfs2/ocfs2.h ---- linux-2.6.38.7/fs/ocfs2/ocfs2.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/ocfs2/ocfs2.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h +index 51cd689..a150644 100644 +--- a/fs/ocfs2/ocfs2.h ++++ b/fs/ocfs2/ocfs2.h @@ -230,11 +230,11 @@ enum ocfs2_vol_state struct ocfs2_alloc_stats @@ -40934,10 +41929,11 @@ diff -urNp linux-2.6.38.7/fs/ocfs2/ocfs2.h linux-2.6.38.7/fs/ocfs2/ocfs2.h }; enum ocfs2_local_alloc_state -diff -urNp linux-2.6.38.7/fs/ocfs2/suballoc.c linux-2.6.38.7/fs/ocfs2/suballoc.c ---- linux-2.6.38.7/fs/ocfs2/suballoc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/ocfs2/suballoc.c 2011-05-11 18:34:57.000000000 -0400 -@@ -877,7 +877,7 @@ static int ocfs2_reserve_suballoc_bits(s +diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c +index 71998d4..73d7c38 100644 +--- a/fs/ocfs2/suballoc.c ++++ b/fs/ocfs2/suballoc.c +@@ -877,7 +877,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb, mlog_errno(status); goto bail; } @@ -40946,7 +41942,7 @@ diff -urNp linux-2.6.38.7/fs/ocfs2/suballoc.c linux-2.6.38.7/fs/ocfs2/suballoc.c /* You should never ask for this much metadata */ BUG_ON(bits_wanted > -@@ -2012,7 +2012,7 @@ int ocfs2_claim_metadata(handle_t *handl +@@ -2012,7 +2012,7 @@ int ocfs2_claim_metadata(handle_t *handle, mlog_errno(status); goto bail; } @@ -40955,7 +41951,7 @@ diff -urNp linux-2.6.38.7/fs/ocfs2/suballoc.c linux-2.6.38.7/fs/ocfs2/suballoc.c *suballoc_loc = res.sr_bg_blkno; *suballoc_bit_start = res.sr_bit_offset; -@@ -2175,7 +2175,7 @@ int ocfs2_claim_new_inode_at_loc(handle_ +@@ -2175,7 +2175,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle, mlog(0, "Allocated %u bits from suballocator %llu\n", res->sr_bits, (unsigned long long)di_blkno); @@ -40964,7 +41960,7 @@ diff -urNp linux-2.6.38.7/fs/ocfs2/suballoc.c linux-2.6.38.7/fs/ocfs2/suballoc.c BUG_ON(res->sr_bits != 1); -@@ -2219,7 +2219,7 @@ int ocfs2_claim_new_inode(handle_t *hand +@@ -2219,7 +2219,7 @@ int ocfs2_claim_new_inode(handle_t *handle, mlog_errno(status); goto bail; } @@ -40973,7 +41969,7 @@ diff -urNp linux-2.6.38.7/fs/ocfs2/suballoc.c linux-2.6.38.7/fs/ocfs2/suballoc.c BUG_ON(res.sr_bits != 1); -@@ -2324,7 +2324,7 @@ int __ocfs2_claim_clusters(handle_t *han +@@ -2324,7 +2324,7 @@ int __ocfs2_claim_clusters(handle_t *handle, cluster_start, num_clusters); if (!status) @@ -40982,7 +41978,7 @@ diff -urNp linux-2.6.38.7/fs/ocfs2/suballoc.c linux-2.6.38.7/fs/ocfs2/suballoc.c } else { if (min_clusters > (osb->bitmap_cpg - 1)) { /* The only paths asking for contiguousness -@@ -2350,7 +2350,7 @@ int __ocfs2_claim_clusters(handle_t *han +@@ -2350,7 +2350,7 @@ int __ocfs2_claim_clusters(handle_t *handle, ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode, res.sr_bg_blkno, res.sr_bit_offset); @@ -40991,10 +41987,11 @@ diff -urNp linux-2.6.38.7/fs/ocfs2/suballoc.c linux-2.6.38.7/fs/ocfs2/suballoc.c *num_clusters = res.sr_bits; } } -diff -urNp linux-2.6.38.7/fs/ocfs2/super.c linux-2.6.38.7/fs/ocfs2/super.c ---- linux-2.6.38.7/fs/ocfs2/super.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/ocfs2/super.c 2011-04-28 19:34:15.000000000 -0400 -@@ -297,11 +297,11 @@ static int ocfs2_osb_dump(struct ocfs2_s +diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c +index 36c423f..2f7ae8e 100644 +--- a/fs/ocfs2/super.c ++++ b/fs/ocfs2/super.c +@@ -297,11 +297,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len) "%10s => GlobalAllocs: %d LocalAllocs: %d " "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", "Stats", @@ -41011,7 +42008,7 @@ diff -urNp linux-2.6.38.7/fs/ocfs2/super.c linux-2.6.38.7/fs/ocfs2/super.c out += snprintf(buf + out, len - out, "%10s => State: %u Descriptor: %llu Size: %u bits " -@@ -2141,11 +2141,11 @@ static int ocfs2_initialize_super(struct +@@ -2141,11 +2141,11 @@ static int ocfs2_initialize_super(struct super_block *sb, spin_lock_init(&osb->osb_xattr_lock); ocfs2_init_steal_slots(osb); @@ -41028,9 +42025,10 @@ diff -urNp linux-2.6.38.7/fs/ocfs2/super.c linux-2.6.38.7/fs/ocfs2/super.c /* Copy the blockcheck stats from the superblock probe */ osb->osb_ecc_stats = *stats; -diff -urNp linux-2.6.38.7/fs/ocfs2/symlink.c linux-2.6.38.7/fs/ocfs2/symlink.c ---- linux-2.6.38.7/fs/ocfs2/symlink.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/ocfs2/symlink.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c +index 9975457..7a170f2 100644 +--- a/fs/ocfs2/symlink.c ++++ b/fs/ocfs2/symlink.c @@ -148,7 +148,7 @@ bail: static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) @@ -41040,10 +42038,11 @@ diff -urNp linux-2.6.38.7/fs/ocfs2/symlink.c linux-2.6.38.7/fs/ocfs2/symlink.c if (!IS_ERR(link)) kfree(link); } -diff -urNp linux-2.6.38.7/fs/open.c linux-2.6.38.7/fs/open.c ---- linux-2.6.38.7/fs/open.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/open.c 2011-04-28 19:34:15.000000000 -0400 -@@ -112,6 +112,10 @@ static long do_sys_truncate(const char _ +diff --git a/fs/open.c b/fs/open.c +index b47aab3..f230762 100644 +--- a/fs/open.c ++++ b/fs/open.c +@@ -112,6 +112,10 @@ static long do_sys_truncate(const char __user *pathname, loff_t length) error = locks_verify_truncate(inode, NULL, length); if (!error) error = security_path_truncate(&path); @@ -41054,7 +42053,7 @@ diff -urNp linux-2.6.38.7/fs/open.c linux-2.6.38.7/fs/open.c if (!error) error = do_truncate(path.dentry, length, 0, NULL); -@@ -358,6 +362,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, con +@@ -358,6 +362,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode) if (__mnt_is_readonly(path.mnt)) res = -EROFS; @@ -41064,7 +42063,7 @@ diff -urNp linux-2.6.38.7/fs/open.c linux-2.6.38.7/fs/open.c out_path_release: path_put(&path); out: -@@ -384,6 +391,8 @@ SYSCALL_DEFINE1(chdir, const char __user +@@ -384,6 +391,8 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename) if (error) goto dput_and_out; @@ -41073,7 +42072,7 @@ diff -urNp linux-2.6.38.7/fs/open.c linux-2.6.38.7/fs/open.c set_fs_pwd(current->fs, &path); dput_and_out: -@@ -410,6 +419,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd +@@ -410,6 +419,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd) goto out_putf; error = inode_permission(inode, MAY_EXEC | MAY_CHDIR); @@ -41087,7 +42086,7 @@ diff -urNp linux-2.6.38.7/fs/open.c linux-2.6.38.7/fs/open.c if (!error) set_fs_pwd(current->fs, &file->f_path); out_putf: -@@ -438,7 +454,18 @@ SYSCALL_DEFINE1(chroot, const char __use +@@ -438,7 +454,18 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename) if (error) goto dput_and_out; @@ -41106,7 +42105,7 @@ diff -urNp linux-2.6.38.7/fs/open.c linux-2.6.38.7/fs/open.c error = 0; dput_and_out: path_put(&path); -@@ -466,12 +493,25 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd +@@ -466,12 +493,25 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd, mode_t, mode) err = mnt_want_write_file(file); if (err) goto out_putf; @@ -41132,7 +42131,7 @@ diff -urNp linux-2.6.38.7/fs/open.c linux-2.6.38.7/fs/open.c newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO); newattrs.ia_valid = ATTR_MODE | ATTR_CTIME; err = notify_change(dentry, &newattrs); -@@ -499,12 +539,25 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons +@@ -499,12 +539,25 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, const char __user *, filename, mode_t, mode) error = mnt_want_write(path.mnt); if (error) goto dput_and_out; @@ -41158,7 +42157,7 @@ diff -urNp linux-2.6.38.7/fs/open.c linux-2.6.38.7/fs/open.c newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO); newattrs.ia_valid = ATTR_MODE | ATTR_CTIME; error = notify_change(path.dentry, &newattrs); -@@ -528,6 +581,9 @@ static int chown_common(struct path *pat +@@ -528,6 +581,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group) int error; struct iattr newattrs; @@ -41168,7 +42167,7 @@ diff -urNp linux-2.6.38.7/fs/open.c linux-2.6.38.7/fs/open.c newattrs.ia_valid = ATTR_CTIME; if (user != (uid_t) -1) { newattrs.ia_valid |= ATTR_UID; -@@ -898,7 +954,10 @@ long do_sys_open(int dfd, const char __u +@@ -898,7 +954,10 @@ long do_sys_open(int dfd, const char __user *filename, int flags, int mode) if (!IS_ERR(tmp)) { fd = get_unused_fd_flags(flags); if (fd >= 0) { @@ -41180,10 +42179,11 @@ diff -urNp linux-2.6.38.7/fs/open.c linux-2.6.38.7/fs/open.c if (IS_ERR(f)) { put_unused_fd(fd); fd = PTR_ERR(f); -diff -urNp linux-2.6.38.7/fs/partitions/ldm.c linux-2.6.38.7/fs/partitions/ldm.c ---- linux-2.6.38.7/fs/partitions/ldm.c 2011-05-10 22:06:29.000000000 -0400 -+++ linux-2.6.38.7/fs/partitions/ldm.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data +diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c +index a29d5cc..116492b 100644 +--- a/fs/partitions/ldm.c ++++ b/fs/partitions/ldm.c +@@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data, int size, struct list_head *frags) ldm_error ("A VBLK claims to have %d parts.", num); return false; } @@ -41191,7 +42191,7 @@ diff -urNp linux-2.6.38.7/fs/partitions/ldm.c linux-2.6.38.7/fs/partitions/ldm.c if (rec >= num) { ldm_error("REC value (%d) exceeds NUM value (%d)", rec, num); return false; -@@ -1322,7 +1323,7 @@ static bool ldm_frag_add (const u8 *data +@@ -1322,7 +1323,7 @@ static bool ldm_frag_add (const u8 *data, int size, struct list_head *frags) goto found; } @@ -41200,9 +42200,10 @@ diff -urNp linux-2.6.38.7/fs/partitions/ldm.c linux-2.6.38.7/fs/partitions/ldm.c if (!f) { ldm_crit ("Out of memory."); return false; -diff -urNp linux-2.6.38.7/fs/pipe.c linux-2.6.38.7/fs/pipe.c ---- linux-2.6.38.7/fs/pipe.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/pipe.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/pipe.c b/fs/pipe.c +index da42f7d..315f4e2 100644 +--- a/fs/pipe.c ++++ b/fs/pipe.c @@ -420,9 +420,9 @@ redo: } if (bufs) /* More to do? */ @@ -41215,7 +42216,7 @@ diff -urNp linux-2.6.38.7/fs/pipe.c linux-2.6.38.7/fs/pipe.c /* syscall merging: Usually we must not sleep * if O_NONBLOCK is set, or if we got some data. * But if a writer sleeps in kernel space, then -@@ -481,7 +481,7 @@ pipe_write(struct kiocb *iocb, const str +@@ -481,7 +481,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov, mutex_lock(&inode->i_mutex); pipe = inode->i_pipe; @@ -41245,7 +42246,7 @@ diff -urNp linux-2.6.38.7/fs/pipe.c linux-2.6.38.7/fs/pipe.c } out: mutex_unlock(&inode->i_mutex); -@@ -685,7 +685,7 @@ pipe_poll(struct file *filp, poll_table +@@ -685,7 +685,7 @@ pipe_poll(struct file *filp, poll_table *wait) mask = 0; if (filp->f_mode & FMODE_READ) { mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0; @@ -41254,7 +42255,7 @@ diff -urNp linux-2.6.38.7/fs/pipe.c linux-2.6.38.7/fs/pipe.c mask |= POLLHUP; } -@@ -695,7 +695,7 @@ pipe_poll(struct file *filp, poll_table +@@ -695,7 +695,7 @@ pipe_poll(struct file *filp, poll_table *wait) * Most Unices do not set POLLERR for FIFOs but on Linux they * behave exactly like pipes for poll(). */ @@ -41263,7 +42264,7 @@ diff -urNp linux-2.6.38.7/fs/pipe.c linux-2.6.38.7/fs/pipe.c mask |= POLLERR; } -@@ -709,10 +709,10 @@ pipe_release(struct inode *inode, int de +@@ -709,10 +709,10 @@ pipe_release(struct inode *inode, int decr, int decw) mutex_lock(&inode->i_mutex); pipe = inode->i_pipe; @@ -41277,7 +42278,7 @@ diff -urNp linux-2.6.38.7/fs/pipe.c linux-2.6.38.7/fs/pipe.c free_pipe_info(inode); } else { wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP); -@@ -802,7 +802,7 @@ pipe_read_open(struct inode *inode, stru +@@ -802,7 +802,7 @@ pipe_read_open(struct inode *inode, struct file *filp) if (inode->i_pipe) { ret = 0; @@ -41286,7 +42287,7 @@ diff -urNp linux-2.6.38.7/fs/pipe.c linux-2.6.38.7/fs/pipe.c } mutex_unlock(&inode->i_mutex); -@@ -819,7 +819,7 @@ pipe_write_open(struct inode *inode, str +@@ -819,7 +819,7 @@ pipe_write_open(struct inode *inode, struct file *filp) if (inode->i_pipe) { ret = 0; @@ -41295,7 +42296,7 @@ diff -urNp linux-2.6.38.7/fs/pipe.c linux-2.6.38.7/fs/pipe.c } mutex_unlock(&inode->i_mutex); -@@ -837,9 +837,9 @@ pipe_rdwr_open(struct inode *inode, stru +@@ -837,9 +837,9 @@ pipe_rdwr_open(struct inode *inode, struct file *filp) if (inode->i_pipe) { ret = 0; if (filp->f_mode & FMODE_READ) @@ -41316,7 +42317,7 @@ diff -urNp linux-2.6.38.7/fs/pipe.c linux-2.6.38.7/fs/pipe.c /* * pipefs_dname() is called from d_path(). -@@ -961,7 +961,8 @@ static struct inode * get_pipe_inode(voi +@@ -961,7 +961,8 @@ static struct inode * get_pipe_inode(void) goto fail_iput; inode->i_pipe = pipe; @@ -41326,9 +42327,41 @@ diff -urNp linux-2.6.38.7/fs/pipe.c linux-2.6.38.7/fs/pipe.c inode->i_fop = &rdwr_pipefifo_fops; /* -diff -urNp linux-2.6.38.7/fs/proc/array.c linux-2.6.38.7/fs/proc/array.c ---- linux-2.6.38.7/fs/proc/array.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.7/fs/proc/array.c 2011-05-16 21:47:08.000000000 -0400 +diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig +index 15af622..0e9f4467 100644 +--- a/fs/proc/Kconfig ++++ b/fs/proc/Kconfig +@@ -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" +- 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 EXPERT + help + Various /proc files exist to monitor process memory utilization: +diff --git a/fs/proc/array.c b/fs/proc/array.c +index 5e4f776..5e06b36 100644 +--- a/fs/proc/array.c ++++ b/fs/proc/array.c @@ -60,6 +60,7 @@ #include <linux/tty.h> #include <linux/string.h> @@ -41337,7 +42370,7 @@ diff -urNp linux-2.6.38.7/fs/proc/array.c linux-2.6.38.7/fs/proc/array.c #include <linux/proc_fs.h> #include <linux/ioport.h> #include <linux/uaccess.h> -@@ -337,6 +338,21 @@ static void task_cpus_allowed(struct seq +@@ -337,6 +338,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task) seq_putc(m, '\n'); } @@ -41359,7 +42392,7 @@ diff -urNp linux-2.6.38.7/fs/proc/array.c linux-2.6.38.7/fs/proc/array.c int proc_pid_status(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task) { -@@ -354,9 +370,24 @@ int proc_pid_status(struct seq_file *m, +@@ -354,9 +370,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns, task_cpus_allowed(m, task); cpuset_task_status_allowed(m, task); task_context_switch_counts(m, task); @@ -41384,7 +42417,7 @@ diff -urNp linux-2.6.38.7/fs/proc/array.c linux-2.6.38.7/fs/proc/array.c static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task, int whole) { -@@ -375,9 +406,11 @@ static int do_task_stat(struct seq_file +@@ -375,9 +406,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, cputime_t cutime, cstime, utime, stime; cputime_t cgtime, gtime; unsigned long rsslim = 0; @@ -41397,7 +42430,7 @@ diff -urNp linux-2.6.38.7/fs/proc/array.c linux-2.6.38.7/fs/proc/array.c state = *get_task_state(task); vsize = eip = esp = 0; permitted = ptrace_may_access(task, PTRACE_MODE_READ); -@@ -449,6 +482,19 @@ static int do_task_stat(struct seq_file +@@ -449,6 +482,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, gtime = task->gtime; } @@ -41417,7 +42450,7 @@ diff -urNp linux-2.6.38.7/fs/proc/array.c linux-2.6.38.7/fs/proc/array.c /* scale priority and nice values from timeslices to -20..20 */ /* to make it look like a "normal" Unix priority/nice value */ priority = task_prio(task); -@@ -489,9 +535,15 @@ static int do_task_stat(struct seq_file +@@ -489,9 +535,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, vsize, mm ? get_mm_rss(mm) : 0, rsslim, @@ -41433,7 +42466,7 @@ diff -urNp linux-2.6.38.7/fs/proc/array.c linux-2.6.38.7/fs/proc/array.c esp, eip, /* The signal information here is obsolete. -@@ -544,3 +596,18 @@ int proc_pid_statm(struct seq_file *m, s +@@ -544,3 +596,18 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, return 0; } @@ -41452,9 +42485,10 @@ diff -urNp linux-2.6.38.7/fs/proc/array.c linux-2.6.38.7/fs/proc/array.c + return sprintf(buffer, "%pI4\n", &curr_ip); +} +#endif -diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c ---- linux-2.6.38.7/fs/proc/base.c 2011-04-22 19:20:59.000000000 -0400 -+++ linux-2.6.38.7/fs/proc/base.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/proc/base.c b/fs/proc/base.c +index 71a85d8..a91e039 100644 +--- a/fs/proc/base.c ++++ b/fs/proc/base.c @@ -104,6 +104,22 @@ struct pid_entry { union proc_op op; }; @@ -41478,7 +42512,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c #define NOD(NAME, MODE, IOP, FOP, OP) { \ .name = (NAME), \ .len = sizeof(NAME) - 1, \ -@@ -203,6 +219,9 @@ static int check_mem_permission(struct t +@@ -203,6 +219,9 @@ static int check_mem_permission(struct task_struct *task) if (task == current) return 0; @@ -41488,7 +42522,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c /* * If current is actively ptrace'ing, and would also be * permitted to freshly attach with ptrace now, permit it. -@@ -250,6 +269,9 @@ static int proc_pid_cmdline(struct task_ +@@ -250,6 +269,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer) if (!mm->arg_end) goto out_mm; /* Shh! No looking before we're done */ @@ -41527,7 +42561,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c do { nwords += 2; } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */ -@@ -296,7 +334,7 @@ static int proc_pid_auxv(struct task_str +@@ -296,7 +334,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer) } @@ -41536,7 +42570,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c /* * Provides a wchan file via kallsyms in a proper one-value-per-file format. * Returns the resolved symbol. If that fails, simply return the address. -@@ -318,7 +356,7 @@ static int proc_pid_wchan(struct task_st +@@ -318,7 +356,7 @@ static int proc_pid_wchan(struct task_struct *task, char *buffer) } #endif /* CONFIG_KALLSYMS */ @@ -41545,7 +42579,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c #define MAX_STACK_TRACE_DEPTH 64 -@@ -503,7 +541,7 @@ static int proc_pid_limits(struct task_s +@@ -503,7 +541,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer) return count; } @@ -41554,7 +42588,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c static int proc_pid_syscall(struct task_struct *task, char *buffer) { long nr; -@@ -528,7 +566,7 @@ static int proc_pid_syscall(struct task_ +@@ -528,7 +566,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer) /************************************************************************/ /* permission checks */ @@ -41563,7 +42597,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c { struct task_struct *task; int allowed = 0; -@@ -538,7 +576,10 @@ static int proc_fd_access_allowed(struct +@@ -538,7 +576,10 @@ static int proc_fd_access_allowed(struct inode *inode) */ task = get_proc_task(inode); if (task) { @@ -41575,7 +42609,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c put_task_struct(task); } return allowed; -@@ -917,6 +958,9 @@ static ssize_t environ_read(struct file +@@ -917,6 +958,9 @@ static ssize_t environ_read(struct file *file, char __user *buf, if (!task) goto out_no_task; @@ -41585,7 +42619,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c if (!ptrace_may_access(task, PTRACE_MODE_READ)) goto out; -@@ -1606,7 +1650,7 @@ static void *proc_pid_follow_link(struct +@@ -1606,7 +1650,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd) path_put(&nd->path); /* Are we allowed to snoop on the tasks file descriptors? */ @@ -41594,7 +42628,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c goto out; error = PROC_I(inode)->op.proc_get_link(inode, &nd->path); -@@ -1645,8 +1689,18 @@ static int proc_pid_readlink(struct dent +@@ -1645,8 +1689,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b struct path path; /* Are we allowed to snoop on the tasks file descriptors? */ @@ -41615,7 +42649,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c error = PROC_I(inode)->op.proc_get_link(inode, &path); if (error) -@@ -1712,7 +1766,11 @@ static struct inode *proc_pid_make_inode +@@ -1712,7 +1766,11 @@ static struct inode *proc_pid_make_inode(struct super_block * sb, struct task_st rcu_read_lock(); cred = __task_cred(task); inode->i_uid = cred->euid; @@ -41627,7 +42661,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c rcu_read_unlock(); } security_task_to_inode(task, inode); -@@ -1730,6 +1788,9 @@ static int pid_getattr(struct vfsmount * +@@ -1730,6 +1788,9 @@ static int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat struct inode *inode = dentry->d_inode; struct task_struct *task; const struct cred *cred; @@ -41637,7 +42671,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c generic_fillattr(inode, stat); -@@ -1737,12 +1798,34 @@ static int pid_getattr(struct vfsmount * +@@ -1737,12 +1798,34 @@ static int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat stat->uid = 0; stat->gid = 0; task = pid_task(proc_pid(inode), PIDTYPE_PID); @@ -41673,7 +42707,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c } } rcu_read_unlock(); -@@ -1780,11 +1863,20 @@ static int pid_revalidate(struct dentry +@@ -1780,11 +1863,20 @@ static int pid_revalidate(struct dentry *dentry, struct nameidata *nd) if (task) { if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) || @@ -41694,7 +42728,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c rcu_read_unlock(); } else { inode->i_uid = 0; -@@ -1905,7 +1997,8 @@ static int proc_fd_info(struct inode *in +@@ -1905,7 +1997,8 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info) int fd = proc_fd(inode); if (task) { @@ -41704,7 +42738,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c put_task_struct(task); } if (files) { -@@ -2165,15 +2258,25 @@ static const struct file_operations proc +@@ -2165,15 +2258,25 @@ static const struct file_operations proc_fd_operations = { */ static int proc_fd_permission(struct inode *inode, int mask, unsigned int flags) { @@ -41732,7 +42766,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c return rv; } -@@ -2283,6 +2386,9 @@ static struct dentry *proc_pident_lookup +@@ -2283,6 +2386,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir, if (!task) goto out_no_task; @@ -41742,7 +42776,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c /* * Yes, it does not scale. And it should not. Don't add * new entries into /proc/<tgid>/ without very good reasons. -@@ -2327,6 +2433,9 @@ static int proc_pident_readdir(struct fi +@@ -2327,6 +2433,9 @@ static int proc_pident_readdir(struct file *filp, if (!task) goto out_no_task; @@ -41752,7 +42786,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c ret = 0; i = filp->f_pos; switch (i) { -@@ -2597,7 +2706,7 @@ static void *proc_self_follow_link(struc +@@ -2597,7 +2706,7 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd) static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) { @@ -41761,7 +42795,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c if (!IS_ERR(s)) __putname(s); } -@@ -2777,7 +2886,7 @@ static const struct pid_entry tgid_base_ +@@ -2777,7 +2886,7 @@ static const struct pid_entry tgid_base_stuff[] = { REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations), #endif REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations), @@ -41770,7 +42804,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c INF("syscall", S_IRUSR, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -2802,10 +2911,10 @@ static const struct pid_entry tgid_base_ +@@ -2802,10 +2911,10 @@ static const struct pid_entry tgid_base_stuff[] = { #ifdef CONFIG_SECURITY DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations), #endif @@ -41783,7 +42817,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c ONE("stack", S_IRUSR, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -@@ -2836,6 +2945,9 @@ static const struct pid_entry tgid_base_ +@@ -2836,6 +2945,9 @@ static const struct pid_entry tgid_base_stuff[] = { #ifdef CONFIG_TASK_IO_ACCOUNTING INF("io", S_IRUGO, proc_tgid_io_accounting), #endif @@ -41793,7 +42827,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c }; static int proc_tgid_base_readdir(struct file * filp, -@@ -2961,7 +3073,14 @@ static struct dentry *proc_pid_instantia +@@ -2961,7 +3073,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir, if (!inode) goto out; @@ -41808,7 +42842,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c inode->i_op = &proc_tgid_base_inode_operations; inode->i_fop = &proc_tgid_base_operations; inode->i_flags|=S_IMMUTABLE; -@@ -3003,7 +3122,11 @@ struct dentry *proc_pid_lookup(struct in +@@ -3003,7 +3122,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct if (!task) goto out; @@ -41820,7 +42854,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c put_task_struct(task); out: return result; -@@ -3068,6 +3191,11 @@ int proc_pid_readdir(struct file * filp, +@@ -3068,6 +3191,11 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir) { unsigned int nr; struct task_struct *reaper; @@ -41832,7 +42866,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c struct tgid_iter iter; struct pid_namespace *ns; -@@ -3091,8 +3219,27 @@ int proc_pid_readdir(struct file * filp, +@@ -3091,8 +3219,27 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir) for (iter = next_tgid(ns, iter); iter.task; iter.tgid += 1, iter = next_tgid(ns, iter)) { @@ -41861,7 +42895,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c put_task_struct(iter.task); goto out; } -@@ -3119,7 +3266,7 @@ static const struct pid_entry tid_base_s +@@ -3119,7 +3266,7 @@ static const struct pid_entry tid_base_stuff[] = { REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), #endif REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations), @@ -41870,7 +42904,7 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c INF("syscall", S_IRUSR, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -3143,10 +3290,10 @@ static const struct pid_entry tid_base_s +@@ -3143,10 +3290,10 @@ static const struct pid_entry tid_base_stuff[] = { #ifdef CONFIG_SECURITY DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations), #endif @@ -41883,10 +42917,11 @@ diff -urNp linux-2.6.38.7/fs/proc/base.c linux-2.6.38.7/fs/proc/base.c ONE("stack", S_IRUSR, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -diff -urNp linux-2.6.38.7/fs/proc/cmdline.c linux-2.6.38.7/fs/proc/cmdline.c ---- linux-2.6.38.7/fs/proc/cmdline.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/proc/cmdline.c 2011-04-28 19:34:15.000000000 -0400 -@@ -23,7 +23,11 @@ static const struct file_operations cmdl +diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c +index 82676e3..5f8518a 100644 +--- a/fs/proc/cmdline.c ++++ b/fs/proc/cmdline.c +@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = { static int __init proc_cmdline_init(void) { @@ -41898,10 +42933,11 @@ diff -urNp linux-2.6.38.7/fs/proc/cmdline.c linux-2.6.38.7/fs/proc/cmdline.c return 0; } module_init(proc_cmdline_init); -diff -urNp linux-2.6.38.7/fs/proc/devices.c linux-2.6.38.7/fs/proc/devices.c ---- linux-2.6.38.7/fs/proc/devices.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/proc/devices.c 2011-04-28 19:34:15.000000000 -0400 -@@ -64,7 +64,11 @@ static const struct file_operations proc +diff --git a/fs/proc/devices.c b/fs/proc/devices.c +index b143471..bb105e5 100644 +--- a/fs/proc/devices.c ++++ b/fs/proc/devices.c +@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = { static int __init proc_devices_init(void) { @@ -41913,10 +42949,11 @@ diff -urNp linux-2.6.38.7/fs/proc/devices.c linux-2.6.38.7/fs/proc/devices.c return 0; } module_init(proc_devices_init); -diff -urNp linux-2.6.38.7/fs/proc/inode.c linux-2.6.38.7/fs/proc/inode.c ---- linux-2.6.38.7/fs/proc/inode.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/proc/inode.c 2011-04-28 19:34:15.000000000 -0400 -@@ -435,7 +435,11 @@ struct inode *proc_get_inode(struct supe +diff --git a/fs/proc/inode.c b/fs/proc/inode.c +index d6a7ca1..fc19786 100644 +--- a/fs/proc/inode.c ++++ b/fs/proc/inode.c +@@ -435,7 +435,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de) if (de->mode) { inode->i_mode = de->mode; inode->i_uid = de->uid; @@ -41928,10 +42965,11 @@ diff -urNp linux-2.6.38.7/fs/proc/inode.c linux-2.6.38.7/fs/proc/inode.c } if (de->size) inode->i_size = de->size; -diff -urNp linux-2.6.38.7/fs/proc/internal.h linux-2.6.38.7/fs/proc/internal.h ---- linux-2.6.38.7/fs/proc/internal.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/proc/internal.h 2011-04-28 19:34:15.000000000 -0400 -@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi +diff --git a/fs/proc/internal.h b/fs/proc/internal.h +index 9ad561d..7d4c5f7 100644 +--- a/fs/proc/internal.h ++++ b/fs/proc/internal.h +@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task); extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task); @@ -41941,40 +42979,11 @@ diff -urNp linux-2.6.38.7/fs/proc/internal.h linux-2.6.38.7/fs/proc/internal.h extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); extern const struct file_operations proc_maps_operations; -diff -urNp linux-2.6.38.7/fs/proc/Kconfig linux-2.6.38.7/fs/proc/Kconfig ---- linux-2.6.38.7/fs/proc/Kconfig 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/proc/Kconfig 2011-04-28 19:34:15.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" -- 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 EXPERT - help - Various /proc files exist to monitor process memory utilization: -diff -urNp linux-2.6.38.7/fs/proc/kcore.c linux-2.6.38.7/fs/proc/kcore.c ---- linux-2.6.38.7/fs/proc/kcore.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/proc/kcore.c 2011-05-16 21:47:08.000000000 -0400 -@@ -321,6 +321,8 @@ static void elf_kcore_store_hdr(char *bu +diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c +index d245cb2..7e645bd 100644 +--- a/fs/proc/kcore.c ++++ b/fs/proc/kcore.c +@@ -321,6 +321,8 @@ static void elf_kcore_store_hdr(char *bufp, int nphdr, int dataoff) off_t offset = 0; struct kcore_list *m; @@ -41983,7 +42992,7 @@ diff -urNp linux-2.6.38.7/fs/proc/kcore.c linux-2.6.38.7/fs/proc/kcore.c /* setup ELF header */ elf = (struct elfhdr *) bufp; bufp += sizeof(struct elfhdr); -@@ -478,9 +480,10 @@ read_kcore(struct file *file, char __use +@@ -478,9 +480,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) * the addresses in the elf_phdr on our list. */ start = kc_offset_to_vaddr(*fpos - elf_buflen); @@ -41996,14 +43005,12 @@ diff -urNp linux-2.6.38.7/fs/proc/kcore.c linux-2.6.38.7/fs/proc/kcore.c while (buflen) { struct kcore_list *m; -@@ -509,20 +512,23 @@ read_kcore(struct file *file, char __use +@@ -509,20 +512,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) kfree(elf_buf); } else { if (kern_addr_valid(start)) { - unsigned long n; -+ char *elf_buf; -+ mm_segment_t oldfs; - +- - n = copy_to_user(buffer, (char *)start, tsz); - /* - * We cannot distingush between fault on source @@ -42014,6 +43021,9 @@ diff -urNp linux-2.6.38.7/fs/proc/kcore.c linux-2.6.38.7/fs/proc/kcore.c - if (n) { - if (clear_user(buffer + tsz - n, - n)) ++ char *elf_buf; ++ mm_segment_t oldfs; ++ + elf_buf = kmalloc(tsz, GFP_KERNEL); + if (!elf_buf) + return -ENOMEM; @@ -42031,7 +43041,7 @@ diff -urNp linux-2.6.38.7/fs/proc/kcore.c linux-2.6.38.7/fs/proc/kcore.c } else { if (clear_user(buffer, tsz)) return -EFAULT; -@@ -542,6 +548,9 @@ read_kcore(struct file *file, char __use +@@ -542,6 +548,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) static int open_kcore(struct inode *inode, struct file *filp) { @@ -42041,10 +43051,11 @@ diff -urNp linux-2.6.38.7/fs/proc/kcore.c linux-2.6.38.7/fs/proc/kcore.c if (!capable(CAP_SYS_RAWIO)) return -EPERM; if (kcore_need_update) -diff -urNp linux-2.6.38.7/fs/proc/meminfo.c linux-2.6.38.7/fs/proc/meminfo.c ---- linux-2.6.38.7/fs/proc/meminfo.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/proc/meminfo.c 2011-05-16 21:47:08.000000000 -0400 -@@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_ +diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c +index ed257d1..dda1954 100644 +--- a/fs/proc/meminfo.c ++++ b/fs/proc/meminfo.c +@@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_file *m, void *v) unsigned long pages[NR_LRU_LISTS]; int lru; @@ -42053,7 +43064,7 @@ diff -urNp linux-2.6.38.7/fs/proc/meminfo.c linux-2.6.38.7/fs/proc/meminfo.c /* * display in kilobytes. */ -@@ -157,7 +159,7 @@ static int meminfo_proc_show(struct seq_ +@@ -157,7 +159,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) vmi.used >> 10, vmi.largest_chunk >> 10 #ifdef CONFIG_MEMORY_FAILURE @@ -42062,10 +43073,11 @@ diff -urNp linux-2.6.38.7/fs/proc/meminfo.c linux-2.6.38.7/fs/proc/meminfo.c #endif #ifdef CONFIG_TRANSPARENT_HUGEPAGE ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) * -diff -urNp linux-2.6.38.7/fs/proc/nommu.c linux-2.6.38.7/fs/proc/nommu.c ---- linux-2.6.38.7/fs/proc/nommu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/proc/nommu.c 2011-04-28 19:34:15.000000000 -0400 -@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_ +diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c +index b1822dd..df622cb 100644 +--- a/fs/proc/nommu.c ++++ b/fs/proc/nommu.c +@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region) if (len < 1) len = 1; seq_printf(m, "%*c", len, ' '); @@ -42074,10 +43086,11 @@ diff -urNp linux-2.6.38.7/fs/proc/nommu.c linux-2.6.38.7/fs/proc/nommu.c } seq_putc(m, '\n'); -diff -urNp linux-2.6.38.7/fs/proc/proc_net.c linux-2.6.38.7/fs/proc/proc_net.c ---- linux-2.6.38.7/fs/proc/proc_net.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/proc/proc_net.c 2011-04-28 19:34:15.000000000 -0400 -@@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str +diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c +index 9020ac1..15a7335 100644 +--- a/fs/proc/proc_net.c ++++ b/fs/proc/proc_net.c +@@ -105,6 +105,17 @@ static struct net *get_proc_task_net(struct inode *dir) struct task_struct *task; struct nsproxy *ns; struct net *net = NULL; @@ -42095,9 +43108,10 @@ diff -urNp linux-2.6.38.7/fs/proc/proc_net.c linux-2.6.38.7/fs/proc/proc_net.c rcu_read_lock(); task = pid_task(proc_pid(dir), PIDTYPE_PID); -diff -urNp linux-2.6.38.7/fs/proc/proc_sysctl.c linux-2.6.38.7/fs/proc/proc_sysctl.c ---- linux-2.6.38.7/fs/proc/proc_sysctl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/proc/proc_sysctl.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c +index 8eb2522..5e5fdce 100644 +--- a/fs/proc/proc_sysctl.c ++++ b/fs/proc/proc_sysctl.c @@ -8,6 +8,8 @@ #include <linux/namei.h> #include "internal.h" @@ -42107,7 +43121,7 @@ diff -urNp linux-2.6.38.7/fs/proc/proc_sysctl.c linux-2.6.38.7/fs/proc/proc_sysc static const struct dentry_operations proc_sys_dentry_operations; static const struct file_operations proc_sys_file_operations; static const struct inode_operations proc_sys_inode_operations; -@@ -112,6 +114,9 @@ static struct dentry *proc_sys_lookup(st +@@ -112,6 +114,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry, if (!p) goto out; @@ -42117,7 +43131,7 @@ diff -urNp linux-2.6.38.7/fs/proc/proc_sysctl.c linux-2.6.38.7/fs/proc/proc_sysc err = ERR_PTR(-ENOMEM); inode = proc_sys_make_inode(dir->i_sb, h ? h : head, p); if (h) -@@ -231,6 +236,9 @@ static int scan(struct ctl_table_header +@@ -231,6 +236,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table, if (*pos < file->f_pos) continue; @@ -42127,7 +43141,7 @@ diff -urNp linux-2.6.38.7/fs/proc/proc_sysctl.c linux-2.6.38.7/fs/proc/proc_sysc res = proc_sys_fill_cache(file, dirent, filldir, head, table); if (res) return res; -@@ -359,6 +367,9 @@ static int proc_sys_getattr(struct vfsmo +@@ -359,6 +367,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct if (IS_ERR(head)) return PTR_ERR(head); @@ -42137,9 +43151,10 @@ diff -urNp linux-2.6.38.7/fs/proc/proc_sysctl.c linux-2.6.38.7/fs/proc/proc_sysc generic_fillattr(inode, stat); if (table) stat->mode = (stat->mode & S_IFMT) | table->mode; -diff -urNp linux-2.6.38.7/fs/proc/root.c linux-2.6.38.7/fs/proc/root.c ---- linux-2.6.38.7/fs/proc/root.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/proc/root.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/proc/root.c b/fs/proc/root.c +index ef9fa8e..1810de5 100644 +--- a/fs/proc/root.c ++++ b/fs/proc/root.c @@ -132,7 +132,15 @@ void __init proc_root_init(void) #ifdef CONFIG_PROC_DEVICETREE proc_device_tree_init(); @@ -42156,10 +43171,11 @@ diff -urNp linux-2.6.38.7/fs/proc/root.c linux-2.6.38.7/fs/proc/root.c proc_sys_init(); } -diff -urNp linux-2.6.38.7/fs/proc/task_mmu.c linux-2.6.38.7/fs/proc/task_mmu.c ---- linux-2.6.38.7/fs/proc/task_mmu.c 2011-05-22 23:05:20.000000000 -0400 -+++ linux-2.6.38.7/fs/proc/task_mmu.c 2011-05-22 23:06:04.000000000 -0400 -@@ -49,8 +49,13 @@ void task_mem(struct seq_file *m, struct +diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c +index c4bec29..d72bbaa 100644 +--- a/fs/proc/task_mmu.c ++++ b/fs/proc/task_mmu.c +@@ -49,8 +49,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm) "VmExe:\t%8lu kB\n" "VmLib:\t%8lu kB\n" "VmPTE:\t%8lu kB\n" @@ -42175,7 +43191,7 @@ diff -urNp linux-2.6.38.7/fs/proc/task_mmu.c linux-2.6.38.7/fs/proc/task_mmu.c (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10), mm->locked_vm << (PAGE_SHIFT-10), hiwater_rss << (PAGE_SHIFT-10), -@@ -58,7 +63,13 @@ void task_mem(struct seq_file *m, struct +@@ -58,7 +63,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm) data << (PAGE_SHIFT-10), mm->stack_vm << (PAGE_SHIFT-10), text, lib, (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10, @@ -42190,7 +43206,7 @@ diff -urNp linux-2.6.38.7/fs/proc/task_mmu.c linux-2.6.38.7/fs/proc/task_mmu.c } unsigned long task_vsize(struct mm_struct *mm) -@@ -180,7 +191,8 @@ static void m_stop(struct seq_file *m, v +@@ -180,7 +191,8 @@ static void m_stop(struct seq_file *m, void *v) struct proc_maps_private *priv = m->private; struct vm_area_struct *vma = v; @@ -42200,7 +43216,7 @@ diff -urNp linux-2.6.38.7/fs/proc/task_mmu.c linux-2.6.38.7/fs/proc/task_mmu.c if (priv->task) put_task_struct(priv->task); } -@@ -204,6 +216,12 @@ static int do_maps_open(struct inode *in +@@ -204,6 +216,12 @@ static int do_maps_open(struct inode *inode, struct file *file, return ret; } @@ -42213,7 +43229,7 @@ diff -urNp linux-2.6.38.7/fs/proc/task_mmu.c linux-2.6.38.7/fs/proc/task_mmu.c static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma) { struct mm_struct *mm = vma->vm_mm; -@@ -211,7 +229,6 @@ static void show_map_vma(struct seq_file +@@ -211,7 +229,6 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma) int flags = vma->vm_flags; unsigned long ino = 0; unsigned long long pgoff = 0; @@ -42221,7 +43237,7 @@ diff -urNp linux-2.6.38.7/fs/proc/task_mmu.c linux-2.6.38.7/fs/proc/task_mmu.c dev_t dev = 0; int len; -@@ -222,22 +239,23 @@ static void show_map_vma(struct seq_file +@@ -222,22 +239,23 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma) pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT; } @@ -42255,7 +43271,7 @@ diff -urNp linux-2.6.38.7/fs/proc/task_mmu.c linux-2.6.38.7/fs/proc/task_mmu.c MAJOR(dev), MINOR(dev), ino, &len); /* -@@ -246,16 +264,16 @@ static void show_map_vma(struct seq_file +@@ -246,16 +264,16 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma) */ if (file) { pad_len_spaces(m, len); @@ -42277,7 +43293,7 @@ diff -urNp linux-2.6.38.7/fs/proc/task_mmu.c linux-2.6.38.7/fs/proc/task_mmu.c name = "[stack]"; } } else { -@@ -401,11 +419,16 @@ static int show_smap(struct seq_file *m, +@@ -401,11 +419,16 @@ static int show_smap(struct seq_file *m, void *v) }; memset(&mss, 0, sizeof mss); @@ -42299,7 +43315,7 @@ diff -urNp linux-2.6.38.7/fs/proc/task_mmu.c linux-2.6.38.7/fs/proc/task_mmu.c show_map_vma(m, vma); seq_printf(m, -@@ -422,7 +445,11 @@ static int show_smap(struct seq_file *m, +@@ -422,7 +445,11 @@ static int show_smap(struct seq_file *m, void *v) "KernelPageSize: %8lu kB\n" "MMUPageSize: %8lu kB\n" "Locked: %8lu kB\n", @@ -42311,10 +43327,11 @@ diff -urNp linux-2.6.38.7/fs/proc/task_mmu.c linux-2.6.38.7/fs/proc/task_mmu.c mss.resident >> 10, (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), mss.shared_clean >> 10, -diff -urNp linux-2.6.38.7/fs/proc/task_nommu.c linux-2.6.38.7/fs/proc/task_nommu.c ---- linux-2.6.38.7/fs/proc/task_nommu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/proc/task_nommu.c 2011-04-28 19:34:15.000000000 -0400 -@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct +diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c +index b535d3e..398f41e 100644 +--- a/fs/proc/task_nommu.c ++++ b/fs/proc/task_nommu.c +@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm) else bytes += kobjsize(mm); @@ -42323,7 +43340,7 @@ diff -urNp linux-2.6.38.7/fs/proc/task_nommu.c linux-2.6.38.7/fs/proc/task_nommu sbytes += kobjsize(current->fs); else bytes += kobjsize(current->fs); -@@ -166,7 +166,7 @@ static int nommu_vma_show(struct seq_fil +@@ -166,7 +166,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma) if (file) { pad_len_spaces(m, len); @@ -42332,10 +43349,11 @@ diff -urNp linux-2.6.38.7/fs/proc/task_nommu.c linux-2.6.38.7/fs/proc/task_nommu } else if (mm) { if (vma->vm_start <= mm->start_stack && vma->vm_end >= mm->start_stack) { -diff -urNp linux-2.6.38.7/fs/quota/netlink.c linux-2.6.38.7/fs/quota/netlink.c ---- linux-2.6.38.7/fs/quota/netlink.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/quota/netlink.c 2011-04-28 19:57:25.000000000 -0400 -@@ -33,7 +33,7 @@ static struct genl_family quota_genl_fam +diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c +index d67908b..d13f6a6 100644 +--- a/fs/quota/netlink.c ++++ b/fs/quota/netlink.c +@@ -33,7 +33,7 @@ static struct genl_family quota_genl_family = { void quota_send_warning(short type, unsigned int id, dev_t dev, const char warntype) { @@ -42344,7 +43362,7 @@ diff -urNp linux-2.6.38.7/fs/quota/netlink.c linux-2.6.38.7/fs/quota/netlink.c struct sk_buff *skb; void *msg_head; int ret; -@@ -49,7 +49,7 @@ void quota_send_warning(short type, unsi +@@ -49,7 +49,7 @@ void quota_send_warning(short type, unsigned int id, dev_t dev, "VFS: Not enough memory to send quota warning.\n"); return; } @@ -42353,9 +43371,10 @@ diff -urNp linux-2.6.38.7/fs/quota/netlink.c linux-2.6.38.7/fs/quota/netlink.c "a_genl_family, 0, QUOTA_NL_C_WARNING); if (!msg_head) { printk(KERN_ERR -diff -urNp linux-2.6.38.7/fs/readdir.c linux-2.6.38.7/fs/readdir.c ---- linux-2.6.38.7/fs/readdir.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/readdir.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/readdir.c b/fs/readdir.c +index 356f715..43d6f23 100644 +--- a/fs/readdir.c ++++ b/fs/readdir.c @@ -17,6 +17,7 @@ #include <linux/security.h> #include <linux/syscalls.h> @@ -42372,7 +43391,7 @@ diff -urNp linux-2.6.38.7/fs/readdir.c linux-2.6.38.7/fs/readdir.c int result; }; -@@ -84,6 +86,10 @@ static int fillonedir(void * __buf, cons +@@ -84,6 +86,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset buf->result = -EOVERFLOW; return -EOVERFLOW; } @@ -42383,7 +43402,7 @@ diff -urNp linux-2.6.38.7/fs/readdir.c linux-2.6.38.7/fs/readdir.c buf->result++; dirent = buf->dirent; if (!access_ok(VERIFY_WRITE, dirent, -@@ -116,6 +122,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned in +@@ -116,6 +122,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd, buf.result = 0; buf.dirent = dirent; @@ -42399,7 +43418,7 @@ diff -urNp linux-2.6.38.7/fs/readdir.c linux-2.6.38.7/fs/readdir.c int count; int error; }; -@@ -163,6 +171,10 @@ static int filldir(void * __buf, const c +@@ -163,6 +171,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset, buf->error = -EOVERFLOW; return -EOVERFLOW; } @@ -42410,7 +43429,7 @@ diff -urNp linux-2.6.38.7/fs/readdir.c linux-2.6.38.7/fs/readdir.c dirent = buf->previous; if (dirent) { if (__put_user(offset, &dirent->d_off)) -@@ -210,6 +222,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, +@@ -210,6 +222,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd, buf.previous = NULL; buf.count = count; buf.error = 0; @@ -42426,7 +43445,7 @@ diff -urNp linux-2.6.38.7/fs/readdir.c linux-2.6.38.7/fs/readdir.c int count; int error; }; -@@ -244,6 +258,10 @@ static int filldir64(void * __buf, const +@@ -244,6 +258,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset, buf->error = -EINVAL; /* only used if we fail.. */ if (reclen > buf->count) return -EINVAL; @@ -42437,7 +43456,7 @@ diff -urNp linux-2.6.38.7/fs/readdir.c linux-2.6.38.7/fs/readdir.c dirent = buf->previous; if (dirent) { if (__put_user(offset, &dirent->d_off)) -@@ -291,6 +309,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int +@@ -291,6 +309,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd, buf.current_dir = dirent; buf.previous = NULL; @@ -42445,10 +43464,11 @@ diff -urNp linux-2.6.38.7/fs/readdir.c linux-2.6.38.7/fs/readdir.c buf.count = count; buf.error = 0; -diff -urNp linux-2.6.38.7/fs/reiserfs/dir.c linux-2.6.38.7/fs/reiserfs/dir.c ---- linux-2.6.38.7/fs/reiserfs/dir.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/reiserfs/dir.c 2011-05-16 21:47:09.000000000 -0400 -@@ -66,6 +66,8 @@ int reiserfs_readdir_dentry(struct dentr +diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c +index 198dabf..94f661b 100644 +--- a/fs/reiserfs/dir.c ++++ b/fs/reiserfs/dir.c +@@ -66,6 +66,8 @@ int reiserfs_readdir_dentry(struct dentry *dentry, void *dirent, struct reiserfs_dir_entry de; int ret = 0; @@ -42457,10 +43477,11 @@ diff -urNp linux-2.6.38.7/fs/reiserfs/dir.c linux-2.6.38.7/fs/reiserfs/dir.c reiserfs_write_lock(inode->i_sb); reiserfs_check_lock_depth(inode->i_sb, "readdir"); -diff -urNp linux-2.6.38.7/fs/reiserfs/do_balan.c linux-2.6.38.7/fs/reiserfs/do_balan.c ---- linux-2.6.38.7/fs/reiserfs/do_balan.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/reiserfs/do_balan.c 2011-04-28 19:34:15.000000000 -0400 -@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, +diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c +index 60c0804..d814f98 100644 +--- a/fs/reiserfs/do_balan.c ++++ b/fs/reiserfs/do_balan.c +@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */ return; } @@ -42469,10 +43490,11 @@ diff -urNp linux-2.6.38.7/fs/reiserfs/do_balan.c linux-2.6.38.7/fs/reiserfs/do_b do_balance_starts(tb); /* balance leaf returns 0 except if combining L R and S into -diff -urNp linux-2.6.38.7/fs/reiserfs/item_ops.c linux-2.6.38.7/fs/reiserfs/item_ops.c ---- linux-2.6.38.7/fs/reiserfs/item_ops.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/reiserfs/item_ops.c 2011-04-28 19:34:15.000000000 -0400 -@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i +diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c +index 72cb1cc..d0e3181 100644 +--- a/fs/reiserfs/item_ops.c ++++ b/fs/reiserfs/item_ops.c +@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_item *vi) vi->vi_index, vi->vi_type, vi->vi_ih); } @@ -42481,7 +43503,7 @@ diff -urNp linux-2.6.38.7/fs/reiserfs/item_ops.c linux-2.6.38.7/fs/reiserfs/item .bytes_number = sd_bytes_number, .decrement_key = sd_decrement_key, .is_left_mergeable = sd_is_left_mergeable, -@@ -196,7 +196,7 @@ static void direct_print_vi(struct virtu +@@ -196,7 +196,7 @@ static void direct_print_vi(struct virtual_item *vi) vi->vi_index, vi->vi_type, vi->vi_ih); } @@ -42490,7 +43512,7 @@ diff -urNp linux-2.6.38.7/fs/reiserfs/item_ops.c linux-2.6.38.7/fs/reiserfs/item .bytes_number = direct_bytes_number, .decrement_key = direct_decrement_key, .is_left_mergeable = direct_is_left_mergeable, -@@ -341,7 +341,7 @@ static void indirect_print_vi(struct vir +@@ -341,7 +341,7 @@ static void indirect_print_vi(struct virtual_item *vi) vi->vi_index, vi->vi_type, vi->vi_ih); } @@ -42499,7 +43521,7 @@ diff -urNp linux-2.6.38.7/fs/reiserfs/item_ops.c linux-2.6.38.7/fs/reiserfs/item .bytes_number = indirect_bytes_number, .decrement_key = indirect_decrement_key, .is_left_mergeable = indirect_is_left_mergeable, -@@ -628,7 +628,7 @@ static void direntry_print_vi(struct vir +@@ -628,7 +628,7 @@ static void direntry_print_vi(struct virtual_item *vi) printk("\n"); } @@ -42508,7 +43530,7 @@ diff -urNp linux-2.6.38.7/fs/reiserfs/item_ops.c linux-2.6.38.7/fs/reiserfs/item .bytes_number = direntry_bytes_number, .decrement_key = direntry_decrement_key, .is_left_mergeable = direntry_is_left_mergeable, -@@ -724,7 +724,7 @@ static void errcatch_print_vi(struct vir +@@ -724,7 +724,7 @@ static void errcatch_print_vi(struct virtual_item *vi) "Invalid item type observed, run fsck ASAP"); } @@ -42517,7 +43539,7 @@ diff -urNp linux-2.6.38.7/fs/reiserfs/item_ops.c linux-2.6.38.7/fs/reiserfs/item errcatch_bytes_number, errcatch_decrement_key, errcatch_is_left_mergeable, -@@ -746,7 +746,7 @@ static struct item_operations errcatch_o +@@ -746,7 +746,7 @@ static struct item_operations errcatch_ops = { #error Item types must use disk-format assigned values. #endif @@ -42526,10 +43548,11 @@ diff -urNp linux-2.6.38.7/fs/reiserfs/item_ops.c linux-2.6.38.7/fs/reiserfs/item &stat_data_ops, &indirect_ops, &direct_ops, -diff -urNp linux-2.6.38.7/fs/reiserfs/journal.c linux-2.6.38.7/fs/reiserfs/journal.c ---- linux-2.6.38.7/fs/reiserfs/journal.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/reiserfs/journal.c 2011-05-16 21:47:09.000000000 -0400 -@@ -2299,6 +2299,8 @@ static struct buffer_head *reiserfs_brea +diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c +index 3eea859..318aa12 100644 +--- a/fs/reiserfs/journal.c ++++ b/fs/reiserfs/journal.c +@@ -2299,6 +2299,8 @@ static struct buffer_head *reiserfs_breada(struct block_device *dev, struct buffer_head *bh; int i, j; @@ -42538,10 +43561,11 @@ diff -urNp linux-2.6.38.7/fs/reiserfs/journal.c linux-2.6.38.7/fs/reiserfs/journ bh = __getblk(dev, block, bufsize); if (buffer_uptodate(bh)) return (bh); -diff -urNp linux-2.6.38.7/fs/reiserfs/namei.c linux-2.6.38.7/fs/reiserfs/namei.c ---- linux-2.6.38.7/fs/reiserfs/namei.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/reiserfs/namei.c 2011-05-16 21:47:09.000000000 -0400 -@@ -1228,6 +1228,8 @@ static int reiserfs_rename(struct inode +diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c +index 68fdf45..afb6494 100644 +--- a/fs/reiserfs/namei.c ++++ b/fs/reiserfs/namei.c +@@ -1228,6 +1228,8 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry, unsigned long savelink = 1; struct timespec ctime; @@ -42550,10 +43574,11 @@ diff -urNp linux-2.6.38.7/fs/reiserfs/namei.c linux-2.6.38.7/fs/reiserfs/namei.c /* three balancings: (1) old name removal, (2) new name insertion and (3) maybe "save" link insertion stat data updates: (1) old directory, -diff -urNp linux-2.6.38.7/fs/reiserfs/procfs.c linux-2.6.38.7/fs/reiserfs/procfs.c ---- linux-2.6.38.7/fs/reiserfs/procfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/reiserfs/procfs.c 2011-05-16 21:47:08.000000000 -0400 -@@ -113,7 +113,7 @@ static int show_super(struct seq_file *m +diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c +index 7a99811..2c9286f 100644 +--- a/fs/reiserfs/procfs.c ++++ b/fs/reiserfs/procfs.c +@@ -113,7 +113,7 @@ static int show_super(struct seq_file *m, struct super_block *sb) "SMALL_TAILS " : "NO_TAILS ", replay_only(sb) ? "REPLAY_ONLY " : "", convert_reiserfs(sb) ? "CONV " : "", @@ -42562,7 +43587,7 @@ diff -urNp linux-2.6.38.7/fs/reiserfs/procfs.c linux-2.6.38.7/fs/reiserfs/procfs 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), -@@ -299,6 +299,8 @@ static int show_journal(struct seq_file +@@ -299,6 +299,8 @@ static int show_journal(struct seq_file *m, struct super_block *sb) struct journal_params *jp = &rs->s_v1.s_journal; char b[BDEVNAME_SIZE]; @@ -42571,10 +43596,11 @@ diff -urNp linux-2.6.38.7/fs/reiserfs/procfs.c linux-2.6.38.7/fs/reiserfs/procfs seq_printf(m, /* on-disk fields */ "jp_journal_1st_block: \t%i\n" "jp_journal_dev: \t%s[%x]\n" -diff -urNp linux-2.6.38.7/fs/reiserfs/stree.c linux-2.6.38.7/fs/reiserfs/stree.c ---- linux-2.6.38.7/fs/reiserfs/stree.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/reiserfs/stree.c 2011-05-16 21:47:09.000000000 -0400 -@@ -1196,6 +1196,8 @@ int reiserfs_delete_item(struct reiserfs +diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c +index 313d39d..3a5811b 100644 +--- a/fs/reiserfs/stree.c ++++ b/fs/reiserfs/stree.c +@@ -1196,6 +1196,8 @@ int reiserfs_delete_item(struct reiserfs_transaction_handle *th, int iter = 0; #endif @@ -42583,7 +43609,7 @@ diff -urNp linux-2.6.38.7/fs/reiserfs/stree.c linux-2.6.38.7/fs/reiserfs/stree.c BUG_ON(!th->t_trans_id); init_tb_struct(th, &s_del_balance, sb, path, -@@ -1333,6 +1335,8 @@ void reiserfs_delete_solid_item(struct r +@@ -1333,6 +1335,8 @@ void reiserfs_delete_solid_item(struct reiserfs_transaction_handle *th, int retval; int quota_cut_bytes = 0; @@ -42592,7 +43618,7 @@ diff -urNp linux-2.6.38.7/fs/reiserfs/stree.c linux-2.6.38.7/fs/reiserfs/stree.c BUG_ON(!th->t_trans_id); le_key2cpu_key(&cpu_key, key); -@@ -1562,6 +1566,8 @@ int reiserfs_cut_from_item(struct reiser +@@ -1562,6 +1566,8 @@ int reiserfs_cut_from_item(struct reiserfs_transaction_handle *th, int quota_cut_bytes; loff_t tail_pos = 0; @@ -42601,7 +43627,7 @@ diff -urNp linux-2.6.38.7/fs/reiserfs/stree.c linux-2.6.38.7/fs/reiserfs/stree.c BUG_ON(!th->t_trans_id); init_tb_struct(th, &s_cut_balance, inode->i_sb, path, -@@ -1957,6 +1963,8 @@ int reiserfs_paste_into_item(struct reis +@@ -1957,6 +1963,8 @@ int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th, struct tree int retval; int fs_gen; @@ -42610,7 +43636,7 @@ diff -urNp linux-2.6.38.7/fs/reiserfs/stree.c linux-2.6.38.7/fs/reiserfs/stree.c BUG_ON(!th->t_trans_id); fs_gen = get_generation(inode->i_sb); -@@ -2045,6 +2053,8 @@ int reiserfs_insert_item(struct reiserfs +@@ -2045,6 +2053,8 @@ int reiserfs_insert_item(struct reiserfs_transaction_handle *th, int fs_gen = 0; int quota_bytes = 0; @@ -42619,10 +43645,11 @@ diff -urNp linux-2.6.38.7/fs/reiserfs/stree.c linux-2.6.38.7/fs/reiserfs/stree.c BUG_ON(!th->t_trans_id); if (inode) { /* Do we count quotas for item? */ -diff -urNp linux-2.6.38.7/fs/reiserfs/super.c linux-2.6.38.7/fs/reiserfs/super.c ---- linux-2.6.38.7/fs/reiserfs/super.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/reiserfs/super.c 2011-05-16 21:47:09.000000000 -0400 -@@ -927,6 +927,8 @@ static int reiserfs_parse_options(struct +diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c +index 0aab04f..7aa917f 100644 +--- a/fs/reiserfs/super.c ++++ b/fs/reiserfs/super.c +@@ -927,6 +927,8 @@ static int reiserfs_parse_options(struct super_block *s, char *options, /* strin {.option_name = NULL} }; @@ -42631,9 +43658,10 @@ diff -urNp linux-2.6.38.7/fs/reiserfs/super.c linux-2.6.38.7/fs/reiserfs/super.c *blocks = 0; if (!options || !*options) /* use default configuration: create tails, journaling on, no -diff -urNp linux-2.6.38.7/fs/select.c linux-2.6.38.7/fs/select.c ---- linux-2.6.38.7/fs/select.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/select.c 2011-05-16 21:47:08.000000000 -0400 +diff --git a/fs/select.c b/fs/select.c +index e56560d..06082bb 100644 +--- a/fs/select.c ++++ b/fs/select.c @@ -20,6 +20,7 @@ #include <linux/module.h> #include <linux/slab.h> @@ -42642,7 +43670,7 @@ diff -urNp linux-2.6.38.7/fs/select.c linux-2.6.38.7/fs/select.c #include <linux/personality.h> /* for STICKY_TIMEOUTS */ #include <linux/file.h> #include <linux/fdtable.h> -@@ -403,6 +404,8 @@ int do_select(int n, fd_set_bits *fds, s +@@ -403,6 +404,8 @@ int do_select(int n, fd_set_bits *fds, struct timespec *end_time) int retval, i, timed_out = 0; unsigned long slack = 0; @@ -42651,7 +43679,7 @@ diff -urNp linux-2.6.38.7/fs/select.c linux-2.6.38.7/fs/select.c rcu_read_lock(); retval = max_select_fd(n, fds); rcu_read_unlock(); -@@ -531,6 +534,8 @@ int core_sys_select(int n, fd_set __user +@@ -531,6 +534,8 @@ int core_sys_select(int n, fd_set __user *inp, fd_set __user *outp, /* Allocate small arguments on the stack to save memory and be faster */ long stack_fds[SELECT_STACK_ALLOC/sizeof(long)]; @@ -42660,7 +43688,7 @@ diff -urNp linux-2.6.38.7/fs/select.c linux-2.6.38.7/fs/select.c ret = -EINVAL; if (n < 0) goto out_nofds; -@@ -840,6 +845,9 @@ int do_sys_poll(struct pollfd __user *uf +@@ -840,6 +845,9 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds, struct poll_list *walk = head; unsigned long todo = nfds; @@ -42670,10 +43698,11 @@ diff -urNp linux-2.6.38.7/fs/select.c linux-2.6.38.7/fs/select.c if (nfds > rlimit(RLIMIT_NOFILE)) return -EINVAL; -diff -urNp linux-2.6.38.7/fs/seq_file.c linux-2.6.38.7/fs/seq_file.c ---- linux-2.6.38.7/fs/seq_file.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/seq_file.c 2011-04-28 19:34:15.000000000 -0400 -@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, +diff --git a/fs/seq_file.c b/fs/seq_file.c +index 05d6b0e..6537392 100644 +--- a/fs/seq_file.c ++++ b/fs/seq_file.c +@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, loff_t offset) return 0; } if (!m->buf) { @@ -42683,7 +43712,7 @@ diff -urNp linux-2.6.38.7/fs/seq_file.c linux-2.6.38.7/fs/seq_file.c if (!m->buf) return -ENOMEM; } -@@ -116,7 +117,8 @@ static int traverse(struct seq_file *m, +@@ -116,7 +117,8 @@ static int traverse(struct seq_file *m, loff_t offset) Eoverflow: m->op->stop(m, p); kfree(m->buf); @@ -42693,7 +43722,7 @@ diff -urNp linux-2.6.38.7/fs/seq_file.c linux-2.6.38.7/fs/seq_file.c return !m->buf ? -ENOMEM : -EAGAIN; } -@@ -169,7 +171,8 @@ ssize_t seq_read(struct file *file, char +@@ -169,7 +171,8 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos) m->version = file->f_version; /* grab buffer if we didn't have one */ if (!m->buf) { @@ -42703,7 +43732,7 @@ diff -urNp linux-2.6.38.7/fs/seq_file.c linux-2.6.38.7/fs/seq_file.c if (!m->buf) goto Enomem; } -@@ -210,7 +213,8 @@ ssize_t seq_read(struct file *file, char +@@ -210,7 +213,8 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos) goto Fill; m->op->stop(m, p); kfree(m->buf); @@ -42713,10 +43742,11 @@ diff -urNp linux-2.6.38.7/fs/seq_file.c linux-2.6.38.7/fs/seq_file.c if (!m->buf) goto Enomem; m->count = 0; -diff -urNp linux-2.6.38.7/fs/splice.c linux-2.6.38.7/fs/splice.c ---- linux-2.6.38.7/fs/splice.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/splice.c 2011-05-16 21:47:08.000000000 -0400 -@@ -186,7 +186,7 @@ ssize_t splice_to_pipe(struct pipe_inode +diff --git a/fs/splice.c b/fs/splice.c +index 50a5d978..593d623 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -186,7 +186,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe, pipe_lock(pipe); for (;;) { @@ -42725,7 +43755,7 @@ diff -urNp linux-2.6.38.7/fs/splice.c linux-2.6.38.7/fs/splice.c send_sig(SIGPIPE, current, 0); if (!ret) ret = -EPIPE; -@@ -240,9 +240,9 @@ ssize_t splice_to_pipe(struct pipe_inode +@@ -240,9 +240,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe, do_wakeup = 0; } @@ -42737,7 +43767,7 @@ diff -urNp linux-2.6.38.7/fs/splice.c linux-2.6.38.7/fs/splice.c } pipe_unlock(pipe); -@@ -316,6 +316,8 @@ __generic_file_splice_read(struct file * +@@ -316,6 +316,8 @@ __generic_file_splice_read(struct file *in, loff_t *ppos, .spd_release = spd_release_page, }; @@ -42746,7 +43776,7 @@ diff -urNp linux-2.6.38.7/fs/splice.c linux-2.6.38.7/fs/splice.c if (splice_grow_spd(pipe, &spd)) return -ENOMEM; -@@ -556,7 +558,7 @@ static ssize_t kernel_readv(struct file +@@ -556,7 +558,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec, old_fs = get_fs(); set_fs(get_ds()); /* The cast to a user pointer is valid due to the set_fs() */ @@ -42755,7 +43785,7 @@ diff -urNp linux-2.6.38.7/fs/splice.c linux-2.6.38.7/fs/splice.c set_fs(old_fs); return res; -@@ -571,7 +573,7 @@ static ssize_t kernel_write(struct file +@@ -571,7 +573,7 @@ static ssize_t kernel_write(struct file *file, const char *buf, size_t count, old_fs = get_fs(); set_fs(get_ds()); /* The cast to a user pointer is valid due to the set_fs() */ @@ -42764,7 +43794,7 @@ diff -urNp linux-2.6.38.7/fs/splice.c linux-2.6.38.7/fs/splice.c set_fs(old_fs); return res; -@@ -599,6 +601,8 @@ ssize_t default_file_splice_read(struct +@@ -599,6 +601,8 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos, .spd_release = spd_release_page, }; @@ -42773,7 +43803,7 @@ diff -urNp linux-2.6.38.7/fs/splice.c linux-2.6.38.7/fs/splice.c if (splice_grow_spd(pipe, &spd)) return -ENOMEM; -@@ -622,7 +626,7 @@ ssize_t default_file_splice_read(struct +@@ -622,7 +626,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos, goto err; this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset); @@ -42795,7 +43825,7 @@ diff -urNp linux-2.6.38.7/fs/splice.c linux-2.6.38.7/fs/splice.c return 0; if (sd->flags & SPLICE_F_NONBLOCK) -@@ -1178,7 +1182,7 @@ ssize_t splice_direct_to_actor(struct fi +@@ -1178,7 +1182,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd, * out of the pipe right after the splice_to_pipe(). So set * PIPE_READERS appropriately. */ @@ -42804,7 +43834,7 @@ diff -urNp linux-2.6.38.7/fs/splice.c linux-2.6.38.7/fs/splice.c current->splice_pipe = pipe; } -@@ -1615,6 +1619,8 @@ static long vmsplice_to_pipe(struct file +@@ -1615,6 +1619,8 @@ static long vmsplice_to_pipe(struct file *file, const struct iovec __user *iov, }; long ret; @@ -42813,7 +43843,7 @@ diff -urNp linux-2.6.38.7/fs/splice.c linux-2.6.38.7/fs/splice.c pipe = get_pipe_info(file); if (!pipe) return -EBADF; -@@ -1730,9 +1736,9 @@ static int ipipe_prep(struct pipe_inode_ +@@ -1730,9 +1736,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags) ret = -ERESTARTSYS; break; } @@ -42825,7 +43855,7 @@ diff -urNp linux-2.6.38.7/fs/splice.c linux-2.6.38.7/fs/splice.c if (flags & SPLICE_F_NONBLOCK) { ret = -EAGAIN; break; -@@ -1764,7 +1770,7 @@ static int opipe_prep(struct pipe_inode_ +@@ -1764,7 +1770,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags) pipe_lock(pipe); while (pipe->nrbufs >= pipe->buffers) { @@ -42834,7 +43864,7 @@ diff -urNp linux-2.6.38.7/fs/splice.c linux-2.6.38.7/fs/splice.c send_sig(SIGPIPE, current, 0); ret = -EPIPE; break; -@@ -1777,9 +1783,9 @@ static int opipe_prep(struct pipe_inode_ +@@ -1777,9 +1783,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags) ret = -ERESTARTSYS; break; } @@ -42863,7 +43893,7 @@ diff -urNp linux-2.6.38.7/fs/splice.c linux-2.6.38.7/fs/splice.c break; /* -@@ -1922,7 +1928,7 @@ static int link_pipe(struct pipe_inode_i +@@ -1922,7 +1928,7 @@ static int link_pipe(struct pipe_inode_info *ipipe, pipe_double_lock(ipipe, opipe); do { @@ -42872,7 +43902,7 @@ diff -urNp linux-2.6.38.7/fs/splice.c linux-2.6.38.7/fs/splice.c send_sig(SIGPIPE, current, 0); if (!ret) ret = -EPIPE; -@@ -1967,7 +1973,7 @@ static int link_pipe(struct pipe_inode_i +@@ -1967,7 +1973,7 @@ static int link_pipe(struct pipe_inode_info *ipipe, * return EAGAIN if we have the potential of some data in the * future, otherwise just return 0 */ @@ -42881,10 +43911,11 @@ diff -urNp linux-2.6.38.7/fs/splice.c linux-2.6.38.7/fs/splice.c ret = -EAGAIN; pipe_unlock(ipipe); -diff -urNp linux-2.6.38.7/fs/sysfs/file.c linux-2.6.38.7/fs/sysfs/file.c ---- linux-2.6.38.7/fs/sysfs/file.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/sysfs/file.c 2011-04-28 19:57:25.000000000 -0400 -@@ -44,7 +44,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent +diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c +index da3fefe..0b429f2 100644 +--- a/fs/sysfs/file.c ++++ b/fs/sysfs/file.c +@@ -44,7 +44,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock); struct sysfs_open_dirent { atomic_t refcnt; @@ -42893,7 +43924,7 @@ diff -urNp linux-2.6.38.7/fs/sysfs/file.c linux-2.6.38.7/fs/sysfs/file.c wait_queue_head_t poll; struct list_head buffers; /* goes through sysfs_buffer.list */ }; -@@ -88,7 +88,7 @@ static int fill_read_buffer(struct dentr +@@ -88,7 +88,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer if (!sysfs_get_active(attr_sd)) return -ENODEV; @@ -42902,7 +43933,7 @@ diff -urNp linux-2.6.38.7/fs/sysfs/file.c linux-2.6.38.7/fs/sysfs/file.c count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page); sysfs_put_active(attr_sd); -@@ -294,7 +294,7 @@ static int sysfs_get_open_dirent(struct +@@ -294,7 +294,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd, return -ENOMEM; atomic_set(&new_od->refcnt, 0); @@ -42911,7 +43942,7 @@ diff -urNp linux-2.6.38.7/fs/sysfs/file.c linux-2.6.38.7/fs/sysfs/file.c init_waitqueue_head(&new_od->poll); INIT_LIST_HEAD(&new_od->buffers); goto retry; -@@ -444,7 +444,7 @@ static unsigned int sysfs_poll(struct fi +@@ -444,7 +444,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait) sysfs_put_active(attr_sd); @@ -42920,7 +43951,7 @@ diff -urNp linux-2.6.38.7/fs/sysfs/file.c linux-2.6.38.7/fs/sysfs/file.c goto trigger; return DEFAULT_POLLMASK; -@@ -463,7 +463,7 @@ void sysfs_notify_dirent(struct sysfs_di +@@ -463,7 +463,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd) od = sd->s_attr.open; if (od) { @@ -42929,9 +43960,10 @@ diff -urNp linux-2.6.38.7/fs/sysfs/file.c linux-2.6.38.7/fs/sysfs/file.c wake_up_interruptible(&od->poll); } -diff -urNp linux-2.6.38.7/fs/sysfs/mount.c linux-2.6.38.7/fs/sysfs/mount.c ---- linux-2.6.38.7/fs/sysfs/mount.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/sysfs/mount.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c +index 2668957..444dde5 100644 +--- a/fs/sysfs/mount.c ++++ b/fs/sysfs/mount.c @@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = { .s_name = "", .s_count = ATOMIC_INIT(1), @@ -42944,10 +43976,11 @@ diff -urNp linux-2.6.38.7/fs/sysfs/mount.c linux-2.6.38.7/fs/sysfs/mount.c .s_ino = 1, }; -diff -urNp linux-2.6.38.7/fs/sysfs/symlink.c linux-2.6.38.7/fs/sysfs/symlink.c ---- linux-2.6.38.7/fs/sysfs/symlink.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/sysfs/symlink.c 2011-04-28 19:34:15.000000000 -0400 -@@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de +diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c +index a7ac78f..02158e1 100644 +--- a/fs/sysfs/symlink.c ++++ b/fs/sysfs/symlink.c +@@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd) static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) { @@ -42956,10 +43989,11 @@ diff -urNp linux-2.6.38.7/fs/sysfs/symlink.c linux-2.6.38.7/fs/sysfs/symlink.c if (!IS_ERR(page)) free_page((unsigned long)page); } -diff -urNp linux-2.6.38.7/fs/udf/inode.c linux-2.6.38.7/fs/udf/inode.c ---- linux-2.6.38.7/fs/udf/inode.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/udf/inode.c 2011-05-16 21:47:09.000000000 -0400 -@@ -477,6 +477,8 @@ static struct buffer_head *inode_getblk( +diff --git a/fs/udf/inode.c b/fs/udf/inode.c +index c6a2e78..6d0bca2 100644 +--- a/fs/udf/inode.c ++++ b/fs/udf/inode.c +@@ -477,6 +477,8 @@ static struct buffer_head *inode_getblk(struct inode *inode, sector_t block, int goal = 0, pgoal = iinfo->i_location.logicalBlockNum; int lastblock = 0; @@ -42968,10 +44002,11 @@ diff -urNp linux-2.6.38.7/fs/udf/inode.c linux-2.6.38.7/fs/udf/inode.c prev_epos.offset = udf_file_entry_alloc_offset(inode); prev_epos.block = iinfo->i_location; prev_epos.bh = NULL; -diff -urNp linux-2.6.38.7/fs/udf/misc.c linux-2.6.38.7/fs/udf/misc.c ---- linux-2.6.38.7/fs/udf/misc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/udf/misc.c 2011-04-28 19:34:15.000000000 -0400 -@@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id +diff --git a/fs/udf/misc.c b/fs/udf/misc.c +index 9215700..bf1f68e 100644 +--- a/fs/udf/misc.c ++++ b/fs/udf/misc.c +@@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum, u8 udf_tag_checksum(const struct tag *t) { @@ -42980,9 +44015,10 @@ diff -urNp linux-2.6.38.7/fs/udf/misc.c linux-2.6.38.7/fs/udf/misc.c u8 checksum = 0; int i; for (i = 0; i < sizeof(struct tag); ++i) -diff -urNp linux-2.6.38.7/fs/utimes.c linux-2.6.38.7/fs/utimes.c ---- linux-2.6.38.7/fs/utimes.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/utimes.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/utimes.c b/fs/utimes.c +index 179b586..e334adb 100644 +--- a/fs/utimes.c ++++ b/fs/utimes.c @@ -1,6 +1,7 @@ #include <linux/compiler.h> #include <linux/file.h> @@ -42991,7 +44027,7 @@ diff -urNp linux-2.6.38.7/fs/utimes.c linux-2.6.38.7/fs/utimes.c #include <linux/linkage.h> #include <linux/mount.h> #include <linux/namei.h> -@@ -101,6 +102,12 @@ static int utimes_common(struct path *pa +@@ -101,6 +102,12 @@ static int utimes_common(struct path *path, struct timespec *times) goto mnt_drop_write_and_out; } } @@ -43004,23 +44040,10 @@ diff -urNp linux-2.6.38.7/fs/utimes.c linux-2.6.38.7/fs/utimes.c mutex_lock(&inode->i_mutex); error = notify_change(path->dentry, &newattrs); mutex_unlock(&inode->i_mutex); -diff -urNp linux-2.6.38.7/fs/xattr_acl.c linux-2.6.38.7/fs/xattr_acl.c ---- linux-2.6.38.7/fs/xattr_acl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/xattr_acl.c 2011-04-28 19:34:15.000000000 -0400 -@@ -17,8 +17,8 @@ - struct posix_acl * - posix_acl_from_xattr(const void *value, size_t size) - { -- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value; -- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end; -+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value; -+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end; - int count; - struct posix_acl *acl; - struct posix_acl_entry *acl_e; -diff -urNp linux-2.6.38.7/fs/xattr.c linux-2.6.38.7/fs/xattr.c ---- linux-2.6.38.7/fs/xattr.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/xattr.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/xattr.c b/fs/xattr.c +index 01bb813..c946fcd 100644 +--- a/fs/xattr.c ++++ b/fs/xattr.c @@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr); * Extended attribute SET operations */ @@ -43030,7 +44053,7 @@ diff -urNp linux-2.6.38.7/fs/xattr.c linux-2.6.38.7/fs/xattr.c size_t size, int flags) { int error; -@@ -271,7 +271,13 @@ setxattr(struct dentry *d, const char __ +@@ -271,7 +271,13 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value, return PTR_ERR(kvalue); } @@ -43045,7 +44068,7 @@ diff -urNp linux-2.6.38.7/fs/xattr.c linux-2.6.38.7/fs/xattr.c kfree(kvalue); return error; } -@@ -288,7 +294,7 @@ SYSCALL_DEFINE5(setxattr, const char __u +@@ -288,7 +294,7 @@ SYSCALL_DEFINE5(setxattr, const char __user *, pathname, return error; error = mnt_want_write(path.mnt); if (!error) { @@ -43054,7 +44077,7 @@ diff -urNp linux-2.6.38.7/fs/xattr.c linux-2.6.38.7/fs/xattr.c mnt_drop_write(path.mnt); } path_put(&path); -@@ -307,7 +313,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __ +@@ -307,7 +313,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __user *, pathname, return error; error = mnt_want_write(path.mnt); if (!error) { @@ -43063,7 +44086,7 @@ diff -urNp linux-2.6.38.7/fs/xattr.c linux-2.6.38.7/fs/xattr.c mnt_drop_write(path.mnt); } path_put(&path); -@@ -318,17 +324,15 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, cons +@@ -318,17 +324,15 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name, const void __user *,value, size_t, size, int, flags) { struct file *f; @@ -43083,20 +44106,25 @@ diff -urNp linux-2.6.38.7/fs/xattr.c linux-2.6.38.7/fs/xattr.c mnt_drop_write(f->f_path.mnt); } fput(f); -diff -urNp linux-2.6.38.7/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.38.7/fs/xfs/linux-2.6/xfs_ioctl32.c ---- linux-2.6.38.7/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-04-28 19:34:15.000000000 -0400 -@@ -73,6 +73,7 @@ xfs_compat_ioc_fsgeometry_v1( - xfs_fsop_geom_t fsgeo; - int error; - -+ memset(&fsgeo, 0, sizeof(fsgeo)); - error = xfs_fs_geometry(mp, &fsgeo, 3); - if (error) - return -error; -diff -urNp linux-2.6.38.7/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.38.7/fs/xfs/linux-2.6/xfs_ioctl.c ---- linux-2.6.38.7/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/xfs/linux-2.6/xfs_ioctl.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c +index 8d5a506..7f62712 100644 +--- a/fs/xattr_acl.c ++++ b/fs/xattr_acl.c +@@ -17,8 +17,8 @@ + struct posix_acl * + posix_acl_from_xattr(const void *value, size_t size) + { +- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value; +- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end; ++ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value; ++ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end; + int count; + struct posix_acl *acl; + struct posix_acl_entry *acl_e; +diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c +index 0ca0e3c..4a0a499 100644 +--- a/fs/xfs/linux-2.6/xfs_ioctl.c ++++ b/fs/xfs/linux-2.6/xfs_ioctl.c @@ -128,7 +128,7 @@ xfs_find_handle( } @@ -43106,9 +44134,22 @@ diff -urNp linux-2.6.38.7/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.38.7/fs/xfs/lin copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) goto out_put; -diff -urNp linux-2.6.38.7/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.38.7/fs/xfs/linux-2.6/xfs_iops.c ---- linux-2.6.38.7/fs/xfs/linux-2.6/xfs_iops.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/xfs/linux-2.6/xfs_iops.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/xfs/linux-2.6/xfs_ioctl32.c b/fs/xfs/linux-2.6/xfs_ioctl32.c +index b3486df..f25d38e 100644 +--- a/fs/xfs/linux-2.6/xfs_ioctl32.c ++++ b/fs/xfs/linux-2.6/xfs_ioctl32.c +@@ -73,6 +73,7 @@ xfs_compat_ioc_fsgeometry_v1( + xfs_fsop_geom_t fsgeo; + int error; + ++ memset(&fsgeo, 0, sizeof(fsgeo)); + error = xfs_fs_geometry(mp, &fsgeo, 3); + if (error) + return -error; +diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c +index bd57278..403133d 100644 +--- a/fs/xfs/linux-2.6/xfs_iops.c ++++ b/fs/xfs/linux-2.6/xfs_iops.c @@ -436,7 +436,7 @@ xfs_vn_put_link( struct nameidata *nd, void *p) @@ -43118,9 +44159,10 @@ diff -urNp linux-2.6.38.7/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.38.7/fs/xfs/linu if (!IS_ERR(s)) kfree(s); -diff -urNp linux-2.6.38.7/fs/xfs/xfs_bmap.c linux-2.6.38.7/fs/xfs/xfs_bmap.c ---- linux-2.6.38.7/fs/xfs/xfs_bmap.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/xfs/xfs_bmap.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c +index dc3afd7..adf4edb 100644 +--- a/fs/xfs/xfs_bmap.c ++++ b/fs/xfs/xfs_bmap.c @@ -287,7 +287,7 @@ xfs_bmap_validate_ret( int nmap, int ret_nmap); @@ -43130,9 +44172,10 @@ diff -urNp linux-2.6.38.7/fs/xfs/xfs_bmap.c linux-2.6.38.7/fs/xfs/xfs_bmap.c #endif /* DEBUG */ STATIC int -diff -urNp linux-2.6.38.7/fs/xfs/xfs_dir2_sf.c linux-2.6.38.7/fs/xfs/xfs_dir2_sf.c ---- linux-2.6.38.7/fs/xfs/xfs_dir2_sf.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/fs/xfs/xfs_dir2_sf.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c +index b1bae6b..5aa3993 100644 +--- a/fs/xfs/xfs_dir2_sf.c ++++ b/fs/xfs/xfs_dir2_sf.c @@ -780,7 +780,15 @@ xfs_dir2_sf_getdents( } @@ -43150,118 +44193,1097 @@ diff -urNp linux-2.6.38.7/fs/xfs/xfs_dir2_sf.c linux-2.6.38.7/fs/xfs/xfs_dir2_sf off & 0x7fffffff, ino, DT_UNKNOWN)) { *offset = off & 0x7fffffff; return 0; -diff -urNp linux-2.6.38.7/grsecurity/gracl_alloc.c linux-2.6.38.7/grsecurity/gracl_alloc.c ---- linux-2.6.38.7/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/gracl_alloc.c 2011-04-28 19:34:15.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> +diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig +new file mode 100644 +index 0000000..88cef24 +--- /dev/null ++++ b/grsecurity/Kconfig +@@ -0,0 +1,1045 @@ ++# ++# grecurity configuration ++# + -+static unsigned long alloc_stack_next = 1; -+static unsigned long alloc_stack_size = 1; -+static void **alloc_stack; ++menu "Grsecurity" + -+static __inline__ int -+alloc_pop(void) -+{ -+ if (alloc_stack_next == 1) -+ return 0; ++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. + -+ kfree(alloc_stack[alloc_stack_next - 2]); ++choice ++ prompt "Security Level" ++ depends on GRKERNSEC ++ default GRKERNSEC_CUSTOM + -+ alloc_stack_next--; ++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 + -+ 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: + -+static __inline__ int -+alloc_push(void *buf) -+{ -+ if (alloc_stack_next >= alloc_stack_size) -+ return 1; ++ - Linking restrictions ++ - FIFO restrictions ++ - Enforcing RLIMIT_NPROC on execve ++ - Restricted dmesg ++ - Enforced chdir("/") on chroot ++ - Runtime module disabling + -+ alloc_stack[alloc_stack_next - 1] = buf; ++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 || PPC) && (SLAB || SLUB || SLOB)) + -+ alloc_stack_next++; ++ 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: + -+ return 0; -+} ++ - 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 + -+void * -+acl_alloc(unsigned long len) -+{ -+ void *ret = NULL; ++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_SYSFS_RESTRICT ++ 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 GRKERNSEC_KERN_LOCKOUT if (X86) ++ 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 ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN) ++ select PAX_MEMORY_UDEREF if (X86 && !XEN) ++ select PAX_RANDKSTACK if (X86_TSC && X86) ++ 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_ELFRELOCS if (PAX_ETEXECRELOCS || (IA64 || PPC || X86)) ++ select PAX_REFCOUNT if (X86 || SPARC64) ++ select PAX_USERCOPY if ((X86 || PPC || 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: + -+ if (!len || len > PAGE_SIZE) -+ goto out; ++ - 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 ++ - Restricted sysfs/debugfs ++ - Active kernel exploit response + -+ ret = kmalloc(len, GFP_KERNEL); ++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. + -+ if (ret) { -+ if (alloc_push(ret)) { -+ kfree(ret); -+ ret = NULL; -+ } -+ } ++endchoice + -+out: -+ return ret; -+} ++menu "Address Space Protection" ++depends on GRKERNSEC + -+void * -+acl_alloc_num(unsigned long num, unsigned long len) -+{ -+ if (!len || (num > (PAGE_SIZE / len))) -+ return NULL; ++config GRKERNSEC_KMEM ++ bool "Deny writing to /dev/kmem, /dev/mem, and /dev/port" ++ select STRICT_DEVMEM if (X86 || ARM || TILE || S390) ++ 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. + -+ return acl_alloc(num * len); -+} ++config GRKERNSEC_VM86 ++ bool "Restrict VM86 mode" ++ depends on X86_32 + -+void -+acl_free_all(void) -+{ -+ if (gr_acl_is_enabled() || !alloc_stack) -+ return; ++ 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. + -+ while (alloc_pop()) ; ++config GRKERNSEC_IO ++ bool "Disable privileged I/O" ++ depends on X86 ++ select RTC_CLASS ++ select RTC_INTF_DEV ++ select RTC_DRV_CMOS + -+ if (alloc_stack) { -+ if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE) -+ kfree(alloc_stack); -+ else -+ vfree(alloc_stack); -+ } ++ 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. + -+ alloc_stack = NULL; -+ alloc_stack_size = 1; -+ alloc_stack_next = 1; ++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. + -+ return; -+} ++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, as well as against suid/sgid binaries ++ will be deterred. When a child of a forking daemon is killed by PaX ++ or crashes due to an illegal instruction or other suspicious signal, ++ 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. ++ In the suid/sgid case, the attempt is logged, the user has all their ++ processes terminated, and they are prevented from executing any further ++ processes for 15 minutes. ++ It is recommended that you also enable signal logging in the auditing ++ section so that logs are generated when a process triggers a suspicious ++ signal. + -+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_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. + -+ alloc_stack_size = size; ++ 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. + -+ if (!alloc_stack) -+ return 0; -+ else -+ return 1; -+} -diff -urNp linux-2.6.38.7/grsecurity/gracl.c linux-2.6.38.7/grsecurity/gracl.c ---- linux-2.6.38.7/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/gracl.c 2011-05-17 17:30:19.000000000 -0400 ++ 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. ++ ++ This option also prevents leaking of kernel addresses through ++ several /proc entries. ++ ++ 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 have also enabled GRKERNSEC_DMESG ++ 3) 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. ++ ++config GRKERNSEC_KERN_LOCKOUT ++ bool "Active kernel exploit response" ++ depends on X86 ++ help ++ If you say Y here, when a PaX alert is triggered due to suspicious ++ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY) ++ or an OOPs occurs due to bad memory accesses, instead of just ++ terminating the offending process (and potentially allowing ++ a subsequent exploit from the same user), we will take one of two ++ actions: ++ If the user was root, we will panic the system ++ If the user was non-root, we will log the attempt, terminate ++ all processes owned by the user, then prevent them from creating ++ any new processes until the system is restarted ++ This deters repeated kernel exploitation/bruteforcing attempts ++ and is useful for later forensics. ++ ++endmenu ++menu "Role Based Access Control Options" ++depends on GRKERNSEC ++ ++config GRKERNSEC_RBAC_DEBUG ++ bool ++ ++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 and network-related information. If you've ++ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still ++ remain hidden. 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 (e.g. /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 (e.g. /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_SYSFS_RESTRICT ++ bool "Sysfs/debugfs restriction" ++ depends on SYSFS ++ help ++ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and ++ any filesystem normally mounted under it (e.g. debugfs) will only ++ be accessible by root. These filesystems generally provide access ++ to hardware and debug information that isn't appropriate for unprivileged ++ users of the system. Sysfs and debugfs have also become a large source ++ of new vulnerabilities, ranging from infoleaks to local compromise. ++ There has been very little oversight with an eye toward security involved ++ in adding new exporters of information to these filesystems, so their ++ use is discouraged. ++ This option is equivalent to a chmod 0700 of the mount paths. ++ ++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_RWXMAP_LOG ++ bool 'Denied RWX mmap/mprotect logging' ++ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT ++ help ++ If you say Y here, calls to mmap() and mprotect() with explicit ++ usage of PROT_WRITE and PROT_EXEC together will be logged when ++ denied by the PAX_MPROTECT feature. If the sysctl option is ++ enabled, a sysctl option with name "rwxmap_logging" is created. ++ ++config GRKERNSEC_AUDIT_TEXTREL ++ bool 'ELF text relocations logging (READ HELP)' ++ depends on PAX_MPROTECT ++ 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. ++ The kernel's log buffer often contains kernel addresses and other ++ identifying information useful to an attacker in fingerprinting a ++ system for a targeted exploit. ++ 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 all non-root users" ++ depends on GRKERNSEC_TPE ++ help ++ If you say Y here, all non-root users will be covered under ++ a weaker TPE restriction. This is separate from, and in addition to, ++ the main TPE options that you have selected elsewhere. Thus, if a ++ "trusted" GID is chosen, this restriction applies to even that GID. ++ Under this restriction, all non-root users 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. If the sysctl option is enabled, a sysctl option ++ with name "tpe_invert" is created. Unlike other sysctl options, this ++ entry will default to on for backward-compatibility. ++ ++config GRKERNSEC_TPE_GID ++ int "GID for untrusted users" ++ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT ++ default 1005 ++ help ++ 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 ++ Setting this GID determines what group TPE restrictions will be ++ *disabled* 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. ++ ++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. ++ ++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. ++ ++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. ++ ++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. ++ ++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. ++ ++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* ++ ++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* ++ ++ Currently this option creates the following sysctl entries: ++ "Disable Privileged I/O": "disable_priv_io" ++ ++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. ++ ++endmenu ++menu "Logging Options" ++depends on GRKERNSEC ++ ++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. ++ ++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. ++ ++endmenu ++ ++endmenu +diff --git a/grsecurity/Makefile b/grsecurity/Makefile +new file mode 100644 +index 0000000..de14237 +--- /dev/null ++++ b/grsecurity/Makefile +@@ -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 ++ ++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_pax.o grsec_ptrace.o ++ ++obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_ip.o gracl_segv.o \ ++ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \ ++ gracl_learn.o grsec_log.o ++obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o ++ ++ifndef CONFIG_GRKERNSEC ++obj-y += grsec_disabled.o ++endif ++ ++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 --git a/grsecurity/gracl.c b/grsecurity/gracl.c +new file mode 100644 +index 0000000..b0493f1 +--- /dev/null ++++ b/grsecurity/gracl.c @@ -0,0 +1,4098 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -47361,9 +49383,122 @@ diff -urNp linux-2.6.38.7/grsecurity/gracl.c linux-2.6.38.7/grsecurity/gracl.c +EXPORT_SYMBOL(gr_check_group_change); +#endif + -diff -urNp linux-2.6.38.7/grsecurity/gracl_cap.c linux-2.6.38.7/grsecurity/gracl_cap.c ---- linux-2.6.38.7/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/gracl_cap.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c +new file mode 100644 +index 0000000..34fefda +--- /dev/null ++++ b/grsecurity/gracl_alloc.c +@@ -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 --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c +new file mode 100644 +index 0000000..b033b49 +--- /dev/null ++++ b/grsecurity/gracl_cap.c @@ -0,0 +1,139 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -47504,9 +49639,11 @@ diff -urNp linux-2.6.38.7/grsecurity/gracl_cap.c linux-2.6.38.7/grsecurity/gracl + return 0; +} + -diff -urNp linux-2.6.38.7/grsecurity/gracl_fs.c linux-2.6.38.7/grsecurity/gracl_fs.c ---- linux-2.6.38.7/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/gracl_fs.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c +new file mode 100644 +index 0000000..b560284 +--- /dev/null ++++ b/grsecurity/gracl_fs.c @@ -0,0 +1,431 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -47939,9 +50076,11 @@ diff -urNp linux-2.6.38.7/grsecurity/gracl_fs.c linux-2.6.38.7/grsecurity/gracl_ + + return 0; +} -diff -urNp linux-2.6.38.7/grsecurity/gracl_ip.c linux-2.6.38.7/grsecurity/gracl_ip.c ---- linux-2.6.38.7/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/gracl_ip.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c +new file mode 100644 +index 0000000..8f6bb84 +--- /dev/null ++++ b/grsecurity/gracl_ip.c @@ -0,0 +1,382 @@ +#include <linux/kernel.h> +#include <asm/uaccess.h> @@ -48325,9 +50464,11 @@ diff -urNp linux-2.6.38.7/grsecurity/gracl_ip.c linux-2.6.38.7/grsecurity/gracl_ + + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); +} -diff -urNp linux-2.6.38.7/grsecurity/gracl_learn.c linux-2.6.38.7/grsecurity/gracl_learn.c ---- linux-2.6.38.7/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/gracl_learn.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c +new file mode 100644 +index 0000000..5a112b0 +--- /dev/null ++++ b/grsecurity/gracl_learn.c @@ -0,0 +1,211 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -48540,9 +50681,11 @@ diff -urNp linux-2.6.38.7/grsecurity/gracl_learn.c linux-2.6.38.7/grsecurity/gra + .release = close_learn, + .poll = poll_learn, +}; -diff -urNp linux-2.6.38.7/grsecurity/gracl_res.c linux-2.6.38.7/grsecurity/gracl_res.c ---- linux-2.6.38.7/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/gracl_res.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c +new file mode 100644 +index 0000000..39645c9 +--- /dev/null ++++ b/grsecurity/gracl_res.c @@ -0,0 +1,68 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -48612,9 +50755,11 @@ diff -urNp linux-2.6.38.7/grsecurity/gracl_res.c linux-2.6.38.7/grsecurity/gracl + rcu_read_unlock(); + return; +} -diff -urNp linux-2.6.38.7/grsecurity/gracl_segv.c linux-2.6.38.7/grsecurity/gracl_segv.c ---- linux-2.6.38.7/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/gracl_segv.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c +new file mode 100644 +index 0000000..66ebf6a +--- /dev/null ++++ b/grsecurity/gracl_segv.c @@ -0,0 +1,300 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -48916,9 +51061,11 @@ diff -urNp linux-2.6.38.7/grsecurity/gracl_segv.c linux-2.6.38.7/grsecurity/grac + + return; +} -diff -urNp linux-2.6.38.7/grsecurity/gracl_shm.c linux-2.6.38.7/grsecurity/gracl_shm.c ---- linux-2.6.38.7/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/gracl_shm.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c +new file mode 100644 +index 0000000..9d83a69 +--- /dev/null ++++ b/grsecurity/gracl_shm.c @@ -0,0 +1,40 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -48960,9 +51107,11 @@ diff -urNp linux-2.6.38.7/grsecurity/gracl_shm.c linux-2.6.38.7/grsecurity/gracl + + return 1; +} -diff -urNp linux-2.6.38.7/grsecurity/grsec_chdir.c linux-2.6.38.7/grsecurity/grsec_chdir.c ---- linux-2.6.38.7/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/grsec_chdir.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c +new file mode 100644 +index 0000000..bc0be01 +--- /dev/null ++++ b/grsecurity/grsec_chdir.c @@ -0,0 +1,19 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -48983,9 +51132,11 @@ diff -urNp linux-2.6.38.7/grsecurity/grsec_chdir.c linux-2.6.38.7/grsecurity/grs +#endif + return; +} -diff -urNp linux-2.6.38.7/grsecurity/grsec_chroot.c linux-2.6.38.7/grsecurity/grsec_chroot.c ---- linux-2.6.38.7/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/grsec_chroot.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c +new file mode 100644 +index 0000000..92e5bf7 +--- /dev/null ++++ b/grsecurity/grsec_chroot.c @@ -0,0 +1,355 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -49342,9 +51493,11 @@ diff -urNp linux-2.6.38.7/grsecurity/grsec_chroot.c linux-2.6.38.7/grsecurity/gr +#ifdef CONFIG_SECURITY +EXPORT_SYMBOL(gr_handle_chroot_caps); +#endif -diff -urNp linux-2.6.38.7/grsecurity/grsec_disabled.c linux-2.6.38.7/grsecurity/grsec_disabled.c ---- linux-2.6.38.7/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/grsec_disabled.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c +new file mode 100644 +index 0000000..3ae621c +--- /dev/null ++++ b/grsecurity/grsec_disabled.c @@ -0,0 +1,447 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -49793,9 +51946,11 @@ diff -urNp linux-2.6.38.7/grsecurity/grsec_disabled.c linux-2.6.38.7/grsecurity/ +EXPORT_SYMBOL(gr_check_user_change); +EXPORT_SYMBOL(gr_check_group_change); +#endif -diff -urNp linux-2.6.38.7/grsecurity/grsec_exec.c linux-2.6.38.7/grsecurity/grsec_exec.c ---- linux-2.6.38.7/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/grsec_exec.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c +new file mode 100644 +index 0000000..90d56b2 +--- /dev/null ++++ b/grsecurity/grsec_exec.c @@ -0,0 +1,147 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -49944,9 +52099,11 @@ diff -urNp linux-2.6.38.7/grsecurity/grsec_exec.c linux-2.6.38.7/grsecurity/grse + return; +} +#endif -diff -urNp linux-2.6.38.7/grsecurity/grsec_fifo.c linux-2.6.38.7/grsecurity/grsec_fifo.c ---- linux-2.6.38.7/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/grsec_fifo.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c +new file mode 100644 +index 0000000..d3ee748 +--- /dev/null ++++ b/grsecurity/grsec_fifo.c @@ -0,0 +1,24 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -49972,9 +52129,11 @@ diff -urNp linux-2.6.38.7/grsecurity/grsec_fifo.c linux-2.6.38.7/grsecurity/grse +#endif + return 0; +} -diff -urNp linux-2.6.38.7/grsecurity/grsec_fork.c linux-2.6.38.7/grsecurity/grsec_fork.c ---- linux-2.6.38.7/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/grsec_fork.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c +new file mode 100644 +index 0000000..8ca18bf +--- /dev/null ++++ b/grsecurity/grsec_fork.c @@ -0,0 +1,23 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -49999,9 +52158,11 @@ diff -urNp linux-2.6.38.7/grsecurity/grsec_fork.c linux-2.6.38.7/grsecurity/grse +#endif + return; +} -diff -urNp linux-2.6.38.7/grsecurity/grsec_init.c linux-2.6.38.7/grsecurity/grsec_init.c ---- linux-2.6.38.7/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/grsec_init.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c +new file mode 100644 +index 0000000..15f4f4e +--- /dev/null ++++ b/grsecurity/grsec_init.c @@ -0,0 +1,270 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -50273,9 +52434,11 @@ diff -urNp linux-2.6.38.7/grsecurity/grsec_init.c linux-2.6.38.7/grsecurity/grse + + return; +} -diff -urNp linux-2.6.38.7/grsecurity/grsec_link.c linux-2.6.38.7/grsecurity/grsec_link.c ---- linux-2.6.38.7/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/grsec_link.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c +new file mode 100644 +index 0000000..3efe141 +--- /dev/null ++++ b/grsecurity/grsec_link.c @@ -0,0 +1,43 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -50320,9 +52483,11 @@ diff -urNp linux-2.6.38.7/grsecurity/grsec_link.c linux-2.6.38.7/grsecurity/grse +#endif + return 0; +} -diff -urNp linux-2.6.38.7/grsecurity/grsec_log.c linux-2.6.38.7/grsecurity/grsec_log.c ---- linux-2.6.38.7/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/grsec_log.c 2011-05-10 21:15:15.000000000 -0400 +diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c +new file mode 100644 +index 0000000..fca6cf4 +--- /dev/null ++++ b/grsecurity/grsec_log.c @@ -0,0 +1,310 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -50634,9 +52799,11 @@ diff -urNp linux-2.6.38.7/grsecurity/grsec_log.c linux-2.6.38.7/grsecurity/grsec + gr_log_end(audit); + END_LOCKS(audit); +} -diff -urNp linux-2.6.38.7/grsecurity/grsec_mem.c linux-2.6.38.7/grsecurity/grsec_mem.c ---- linux-2.6.38.7/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/grsec_mem.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c +new file mode 100644 +index 0000000..6c0416b +--- /dev/null ++++ b/grsecurity/grsec_mem.c @@ -0,0 +1,33 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -50671,9 +52838,11 @@ diff -urNp linux-2.6.38.7/grsecurity/grsec_mem.c linux-2.6.38.7/grsecurity/grsec + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); + return; +} -diff -urNp linux-2.6.38.7/grsecurity/grsec_mount.c linux-2.6.38.7/grsecurity/grsec_mount.c ---- linux-2.6.38.7/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/grsec_mount.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c +new file mode 100644 +index 0000000..cbbe03e +--- /dev/null ++++ b/grsecurity/grsec_mount.c @@ -0,0 +1,62 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -50737,9 +52906,11 @@ diff -urNp linux-2.6.38.7/grsecurity/grsec_mount.c linux-2.6.38.7/grsecurity/grs +#endif + return 0; +} -diff -urNp linux-2.6.38.7/grsecurity/grsec_pax.c linux-2.6.38.7/grsecurity/grsec_pax.c ---- linux-2.6.38.7/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/grsec_pax.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c +new file mode 100644 +index 0000000..a3b12a0 +--- /dev/null ++++ b/grsecurity/grsec_pax.c @@ -0,0 +1,36 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -50777,9 +52948,11 @@ diff -urNp linux-2.6.38.7/grsecurity/grsec_pax.c linux-2.6.38.7/grsecurity/grsec +#endif + return; +} -diff -urNp linux-2.6.38.7/grsecurity/grsec_ptrace.c linux-2.6.38.7/grsecurity/grsec_ptrace.c ---- linux-2.6.38.7/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/grsec_ptrace.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c +new file mode 100644 +index 0000000..472c1d6 +--- /dev/null ++++ b/grsecurity/grsec_ptrace.c @@ -0,0 +1,14 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -50795,9 +52968,11 @@ diff -urNp linux-2.6.38.7/grsecurity/grsec_ptrace.c linux-2.6.38.7/grsecurity/gr +#endif + return; +} -diff -urNp linux-2.6.38.7/grsecurity/grsec_sig.c linux-2.6.38.7/grsecurity/grsec_sig.c ---- linux-2.6.38.7/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/grsec_sig.c 2011-05-17 17:30:33.000000000 -0400 +diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c +new file mode 100644 +index 0000000..306ba79 +--- /dev/null ++++ b/grsecurity/grsec_sig.c @@ -0,0 +1,203 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -51002,9 +53177,11 @@ diff -urNp linux-2.6.38.7/grsecurity/grsec_sig.c linux-2.6.38.7/grsecurity/grsec +#endif + return 0; +} -diff -urNp linux-2.6.38.7/grsecurity/grsec_sock.c linux-2.6.38.7/grsecurity/grsec_sock.c ---- linux-2.6.38.7/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/grsec_sock.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c +new file mode 100644 +index 0000000..b24f755 +--- /dev/null ++++ b/grsecurity/grsec_sock.c @@ -0,0 +1,275 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -51281,9 +53458,11 @@ diff -urNp linux-2.6.38.7/grsecurity/grsec_sock.c linux-2.6.38.7/grsecurity/grse + return current_cap(); +#endif +} -diff -urNp linux-2.6.38.7/grsecurity/grsec_sysctl.c linux-2.6.38.7/grsecurity/grsec_sysctl.c ---- linux-2.6.38.7/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/grsec_sysctl.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c +new file mode 100644 +index 0000000..0c12525 +--- /dev/null ++++ b/grsecurity/grsec_sysctl.c @@ -0,0 +1,433 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -51718,9 +53897,11 @@ diff -urNp linux-2.6.38.7/grsecurity/grsec_sysctl.c linux-2.6.38.7/grsecurity/gr + { } +}; +#endif -diff -urNp linux-2.6.38.7/grsecurity/grsec_time.c linux-2.6.38.7/grsecurity/grsec_time.c ---- linux-2.6.38.7/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/grsec_time.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c +new file mode 100644 +index 0000000..0dc13c3 +--- /dev/null ++++ b/grsecurity/grsec_time.c @@ -0,0 +1,16 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -51738,9 +53919,11 @@ diff -urNp linux-2.6.38.7/grsecurity/grsec_time.c linux-2.6.38.7/grsecurity/grse +} + +EXPORT_SYMBOL(gr_log_timechange); -diff -urNp linux-2.6.38.7/grsecurity/grsec_tpe.c linux-2.6.38.7/grsecurity/grsec_tpe.c ---- linux-2.6.38.7/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/grsec_tpe.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c +new file mode 100644 +index 0000000..4a78774 +--- /dev/null ++++ b/grsecurity/grsec_tpe.c @@ -0,0 +1,39 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -51781,9 +53964,11 @@ diff -urNp linux-2.6.38.7/grsecurity/grsec_tpe.c linux-2.6.38.7/grsecurity/grsec +#endif + return 1; +} -diff -urNp linux-2.6.38.7/grsecurity/grsum.c linux-2.6.38.7/grsecurity/grsum.c ---- linux-2.6.38.7/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/grsum.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c +new file mode 100644 +index 0000000..9f7b1ac +--- /dev/null ++++ b/grsecurity/grsum.c @@ -0,0 +1,61 @@ +#include <linux/err.h> +#include <linux/kernel.h> @@ -51846,1091 +54031,10 @@ diff -urNp linux-2.6.38.7/grsecurity/grsum.c linux-2.6.38.7/grsecurity/grsum.c + + return retval; +} -diff -urNp linux-2.6.38.7/grsecurity/Kconfig linux-2.6.38.7/grsecurity/Kconfig ---- linux-2.6.38.7/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/Kconfig 2011-04-28 19:34:15.000000000 -0400 -@@ -0,0 +1,1045 @@ -+# -+# 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 || PPC) && (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_SYSFS_RESTRICT -+ 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 GRKERNSEC_KERN_LOCKOUT if (X86) -+ 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 ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN) -+ select PAX_MEMORY_UDEREF if (X86 && !XEN) -+ select PAX_RANDKSTACK if (X86_TSC && X86) -+ 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_ELFRELOCS if (PAX_ETEXECRELOCS || (IA64 || PPC || X86)) -+ select PAX_REFCOUNT if (X86 || SPARC64) -+ select PAX_USERCOPY if ((X86 || PPC || 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 -+ - Restricted sysfs/debugfs -+ - Active kernel exploit response -+ -+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" -+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390) -+ 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, as well as against suid/sgid binaries -+ will be deterred. When a child of a forking daemon is killed by PaX -+ or crashes due to an illegal instruction or other suspicious signal, -+ 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. -+ In the suid/sgid case, the attempt is logged, the user has all their -+ processes terminated, and they are prevented from executing any further -+ processes for 15 minutes. -+ It is recommended that you also enable signal logging in the auditing -+ section so that logs are generated when a process triggers a suspicious -+ signal. -+ -+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. -+ -+ This option also prevents leaking of kernel addresses through -+ several /proc entries. -+ -+ 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 have also enabled GRKERNSEC_DMESG -+ 3) 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. -+ -+config GRKERNSEC_KERN_LOCKOUT -+ bool "Active kernel exploit response" -+ depends on X86 -+ help -+ If you say Y here, when a PaX alert is triggered due to suspicious -+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY) -+ or an OOPs occurs due to bad memory accesses, instead of just -+ terminating the offending process (and potentially allowing -+ a subsequent exploit from the same user), we will take one of two -+ actions: -+ If the user was root, we will panic the system -+ If the user was non-root, we will log the attempt, terminate -+ all processes owned by the user, then prevent them from creating -+ any new processes until the system is restarted -+ This deters repeated kernel exploitation/bruteforcing attempts -+ and is useful for later forensics. -+ -+endmenu -+menu "Role Based Access Control Options" -+depends on GRKERNSEC -+ -+config GRKERNSEC_RBAC_DEBUG -+ bool -+ -+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 and network-related information. If you've -+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still -+ remain hidden. 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 (e.g. /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 (e.g. /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_SYSFS_RESTRICT -+ bool "Sysfs/debugfs restriction" -+ depends on SYSFS -+ help -+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and -+ any filesystem normally mounted under it (e.g. debugfs) will only -+ be accessible by root. These filesystems generally provide access -+ to hardware and debug information that isn't appropriate for unprivileged -+ users of the system. Sysfs and debugfs have also become a large source -+ of new vulnerabilities, ranging from infoleaks to local compromise. -+ There has been very little oversight with an eye toward security involved -+ in adding new exporters of information to these filesystems, so their -+ use is discouraged. -+ This option is equivalent to a chmod 0700 of the mount paths. -+ -+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_RWXMAP_LOG -+ bool 'Denied RWX mmap/mprotect logging' -+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT -+ help -+ If you say Y here, calls to mmap() and mprotect() with explicit -+ usage of PROT_WRITE and PROT_EXEC together will be logged when -+ denied by the PAX_MPROTECT feature. If the sysctl option is -+ enabled, a sysctl option with name "rwxmap_logging" is created. -+ -+config GRKERNSEC_AUDIT_TEXTREL -+ bool 'ELF text relocations logging (READ HELP)' -+ depends on PAX_MPROTECT -+ 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. -+ The kernel's log buffer often contains kernel addresses and other -+ identifying information useful to an attacker in fingerprinting a -+ system for a targeted exploit. -+ 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 all non-root users" -+ depends on GRKERNSEC_TPE -+ help -+ If you say Y here, all non-root users will be covered under -+ a weaker TPE restriction. This is separate from, and in addition to, -+ the main TPE options that you have selected elsewhere. Thus, if a -+ "trusted" GID is chosen, this restriction applies to even that GID. -+ Under this restriction, all non-root users 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. If the sysctl option is enabled, a sysctl option -+ with name "tpe_invert" is created. Unlike other sysctl options, this -+ entry will default to on for backward-compatibility. -+ -+config GRKERNSEC_TPE_GID -+ int "GID for untrusted users" -+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT -+ default 1005 -+ help -+ 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 -+ Setting this GID determines what group TPE restrictions will be -+ *disabled* 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. -+ -+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. -+ -+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. -+ -+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. -+ -+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. -+ -+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. -+ -+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* -+ -+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* -+ -+ Currently this option creates the following sysctl entries: -+ "Disable Privileged I/O": "disable_priv_io" -+ -+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. -+ -+endmenu -+menu "Logging Options" -+depends on GRKERNSEC -+ -+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. -+ -+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. -+ -+endmenu -+ -+endmenu -diff -urNp linux-2.6.38.7/grsecurity/Makefile linux-2.6.38.7/grsecurity/Makefile ---- linux-2.6.38.7/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/grsecurity/Makefile 2011-04-28 19:34:15.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 -+ -+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_pax.o grsec_ptrace.o -+ -+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_ip.o gracl_segv.o \ -+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \ -+ gracl_learn.o grsec_log.o -+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o -+ -+ifndef CONFIG_GRKERNSEC -+obj-y += grsec_disabled.o -+endif -+ -+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.38.7/include/acpi/acpi_drivers.h linux-2.6.38.7/include/acpi/acpi_drivers.h ---- linux-2.6.38.7/include/acpi/acpi_drivers.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/acpi/acpi_drivers.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h +index 3090471..b70bc64 100644 +--- a/include/acpi/acpi_drivers.h ++++ b/include/acpi/acpi_drivers.h @@ -119,8 +119,8 @@ void pci_acpi_crs_quirks(void); Dock Station -------------------------------------------------------------------------- */ @@ -52942,7 +54046,7 @@ diff -urNp linux-2.6.38.7/include/acpi/acpi_drivers.h linux-2.6.38.7/include/acp }; #if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE) -@@ -128,7 +128,7 @@ extern int is_dock_device(acpi_handle ha +@@ -128,7 +128,7 @@ extern int is_dock_device(acpi_handle handle); extern int register_dock_notifier(struct notifier_block *nb); extern void unregister_dock_notifier(struct notifier_block *nb); extern int register_hotplug_dock_device(acpi_handle handle, @@ -52951,7 +54055,7 @@ diff -urNp linux-2.6.38.7/include/acpi/acpi_drivers.h linux-2.6.38.7/include/acp void *context); extern void unregister_hotplug_dock_device(acpi_handle handle); #else -@@ -144,7 +144,7 @@ static inline void unregister_dock_notif +@@ -144,7 +144,7 @@ static inline void unregister_dock_notifier(struct notifier_block *nb) { } static inline int register_hotplug_dock_device(acpi_handle handle, @@ -52960,9 +54064,10 @@ diff -urNp linux-2.6.38.7/include/acpi/acpi_drivers.h linux-2.6.38.7/include/acp void *context) { return -ENODEV; -diff -urNp linux-2.6.38.7/include/asm-generic/atomic-long.h linux-2.6.38.7/include/asm-generic/atomic-long.h ---- linux-2.6.38.7/include/asm-generic/atomic-long.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/asm-generic/atomic-long.h 2011-05-16 21:47:08.000000000 -0400 +diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h +index b7babf0..5b6fcb5 100644 +--- a/include/asm-generic/atomic-long.h ++++ b/include/asm-generic/atomic-long.h @@ -22,6 +22,12 @@ typedef atomic64_t atomic_long_t; @@ -52976,7 +54081,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/atomic-long.h linux-2.6.38.7/inclu #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i) static inline long atomic_long_read(atomic_long_t *l) -@@ -31,6 +37,15 @@ static inline long atomic_long_read(atom +@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l) return (long)atomic64_read(v); } @@ -52992,7 +54097,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/atomic-long.h linux-2.6.38.7/inclu static inline void atomic_long_set(atomic_long_t *l, long i) { atomic64_t *v = (atomic64_t *)l; -@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomi +@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i) atomic64_set(v, i); } @@ -53008,7 +54113,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/atomic-long.h linux-2.6.38.7/inclu static inline void atomic_long_inc(atomic_long_t *l) { atomic64_t *v = (atomic64_t *)l; -@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomi +@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l) atomic64_inc(v); } @@ -53024,7 +54129,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/atomic-long.h linux-2.6.38.7/inclu static inline void atomic_long_dec(atomic_long_t *l) { atomic64_t *v = (atomic64_t *)l; -@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomi +@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l) atomic64_dec(v); } @@ -53040,7 +54145,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/atomic-long.h linux-2.6.38.7/inclu static inline void atomic_long_add(long i, atomic_long_t *l) { atomic64_t *v = (atomic64_t *)l; -@@ -59,6 +101,15 @@ static inline void atomic_long_add(long +@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l) atomic64_add(i, v); } @@ -53056,7 +54161,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/atomic-long.h linux-2.6.38.7/inclu static inline void atomic_long_sub(long i, atomic_long_t *l) { atomic64_t *v = (atomic64_t *)l; -@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long +@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l) atomic64_sub(i, v); } @@ -53072,7 +54177,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/atomic-long.h linux-2.6.38.7/inclu static inline int atomic_long_sub_and_test(long i, atomic_long_t *l) { atomic64_t *v = (atomic64_t *)l; -@@ -115,6 +175,15 @@ static inline long atomic_long_inc_retur +@@ -115,6 +175,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l) return (long)atomic64_inc_return(v); } @@ -53088,7 +54193,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/atomic-long.h linux-2.6.38.7/inclu static inline long atomic_long_dec_return(atomic_long_t *l) { atomic64_t *v = (atomic64_t *)l; -@@ -140,6 +209,12 @@ static inline long atomic_long_add_unles +@@ -140,6 +209,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u) typedef atomic_t atomic_long_t; @@ -53101,7 +54206,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/atomic-long.h linux-2.6.38.7/inclu #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i) static inline long atomic_long_read(atomic_long_t *l) { -@@ -148,6 +223,15 @@ static inline long atomic_long_read(atom +@@ -148,6 +223,15 @@ static inline long atomic_long_read(atomic_long_t *l) return (long)atomic_read(v); } @@ -53117,7 +54222,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/atomic-long.h linux-2.6.38.7/inclu static inline void atomic_long_set(atomic_long_t *l, long i) { atomic_t *v = (atomic_t *)l; -@@ -155,6 +239,15 @@ static inline void atomic_long_set(atomi +@@ -155,6 +239,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i) atomic_set(v, i); } @@ -53133,7 +54238,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/atomic-long.h linux-2.6.38.7/inclu static inline void atomic_long_inc(atomic_long_t *l) { atomic_t *v = (atomic_t *)l; -@@ -162,6 +255,15 @@ static inline void atomic_long_inc(atomi +@@ -162,6 +255,15 @@ static inline void atomic_long_inc(atomic_long_t *l) atomic_inc(v); } @@ -53149,7 +54254,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/atomic-long.h linux-2.6.38.7/inclu static inline void atomic_long_dec(atomic_long_t *l) { atomic_t *v = (atomic_t *)l; -@@ -169,6 +271,15 @@ static inline void atomic_long_dec(atomi +@@ -169,6 +271,15 @@ static inline void atomic_long_dec(atomic_long_t *l) atomic_dec(v); } @@ -53165,7 +54270,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/atomic-long.h linux-2.6.38.7/inclu static inline void atomic_long_add(long i, atomic_long_t *l) { atomic_t *v = (atomic_t *)l; -@@ -176,6 +287,15 @@ static inline void atomic_long_add(long +@@ -176,6 +287,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l) atomic_add(i, v); } @@ -53181,7 +54286,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/atomic-long.h linux-2.6.38.7/inclu static inline void atomic_long_sub(long i, atomic_long_t *l) { atomic_t *v = (atomic_t *)l; -@@ -183,6 +303,15 @@ static inline void atomic_long_sub(long +@@ -183,6 +303,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l) atomic_sub(i, v); } @@ -53197,7 +54302,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/atomic-long.h linux-2.6.38.7/inclu static inline int atomic_long_sub_and_test(long i, atomic_long_t *l) { atomic_t *v = (atomic_t *)l; -@@ -232,6 +361,15 @@ static inline long atomic_long_inc_retur +@@ -232,6 +361,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l) return (long)atomic_inc_return(v); } @@ -53213,7 +54318,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/atomic-long.h linux-2.6.38.7/inclu static inline long atomic_long_dec_return(atomic_long_t *l) { atomic_t *v = (atomic_t *)l; -@@ -255,4 +393,49 @@ static inline long atomic_long_add_unles +@@ -255,4 +393,49 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u) #endif /* BITS_PER_LONG == 64 */ @@ -53263,9 +54368,10 @@ diff -urNp linux-2.6.38.7/include/asm-generic/atomic-long.h linux-2.6.38.7/inclu +#endif + #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ -diff -urNp linux-2.6.38.7/include/asm-generic/cache.h linux-2.6.38.7/include/asm-generic/cache.h ---- linux-2.6.38.7/include/asm-generic/cache.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/asm-generic/cache.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h +index 1bfcfe5..f4916f2 100644 +--- a/include/asm-generic/cache.h ++++ b/include/asm-generic/cache.h @@ -6,7 +6,7 @@ * cache lines need to provide their own cache.h. */ @@ -53276,10 +54382,11 @@ diff -urNp linux-2.6.38.7/include/asm-generic/cache.h linux-2.6.38.7/include/asm +#define L1_CACHE_BYTES (1U << L1_CACHE_SHIFT) #endif /* __ASM_GENERIC_CACHE_H */ -diff -urNp linux-2.6.38.7/include/asm-generic/dma-mapping-common.h linux-2.6.38.7/include/asm-generic/dma-mapping-common.h ---- linux-2.6.38.7/include/asm-generic/dma-mapping-common.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/asm-generic/dma-mapping-common.h 2011-04-28 19:34:15.000000000 -0400 -@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ +diff --git a/include/asm-generic/dma-mapping-common.h b/include/asm-generic/dma-mapping-common.h +index 0c80bb3..6baf94b 100644 +--- a/include/asm-generic/dma-mapping-common.h ++++ b/include/asm-generic/dma-mapping-common.h +@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_attrs(struct device *dev, void *ptr, enum dma_data_direction dir, struct dma_attrs *attrs) { @@ -53288,7 +54395,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/dma-mapping-common.h linux-2.6.38. dma_addr_t addr; kmemcheck_mark_initialized(ptr, size); -@@ -30,7 +30,7 @@ static inline void dma_unmap_single_attr +@@ -30,7 +30,7 @@ static inline void dma_unmap_single_attrs(struct device *dev, dma_addr_t addr, enum dma_data_direction dir, struct dma_attrs *attrs) { @@ -53297,7 +54404,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/dma-mapping-common.h linux-2.6.38. BUG_ON(!valid_dma_direction(dir)); if (ops->unmap_page) -@@ -42,7 +42,7 @@ static inline int dma_map_sg_attrs(struc +@@ -42,7 +42,7 @@ static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg, int nents, enum dma_data_direction dir, struct dma_attrs *attrs) { @@ -53306,7 +54413,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/dma-mapping-common.h linux-2.6.38. int i, ents; struct scatterlist *s; -@@ -59,7 +59,7 @@ static inline void dma_unmap_sg_attrs(st +@@ -59,7 +59,7 @@ static inline void dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg int nents, enum dma_data_direction dir, struct dma_attrs *attrs) { @@ -53315,7 +54422,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/dma-mapping-common.h linux-2.6.38. BUG_ON(!valid_dma_direction(dir)); debug_dma_unmap_sg(dev, sg, nents, dir); -@@ -71,7 +71,7 @@ static inline dma_addr_t dma_map_page(st +@@ -71,7 +71,7 @@ static inline dma_addr_t dma_map_page(struct device *dev, struct page *page, size_t offset, size_t size, enum dma_data_direction dir) { @@ -53324,7 +54431,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/dma-mapping-common.h linux-2.6.38. dma_addr_t addr; kmemcheck_mark_initialized(page_address(page) + offset, size); -@@ -85,7 +85,7 @@ static inline dma_addr_t dma_map_page(st +@@ -85,7 +85,7 @@ static inline dma_addr_t dma_map_page(struct device *dev, struct page *page, static inline void dma_unmap_page(struct device *dev, dma_addr_t addr, size_t size, enum dma_data_direction dir) { @@ -53333,7 +54440,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/dma-mapping-common.h linux-2.6.38. BUG_ON(!valid_dma_direction(dir)); if (ops->unmap_page) -@@ -97,7 +97,7 @@ static inline void dma_sync_single_for_c +@@ -97,7 +97,7 @@ static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr, size_t size, enum dma_data_direction dir) { @@ -53342,7 +54449,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/dma-mapping-common.h linux-2.6.38. BUG_ON(!valid_dma_direction(dir)); if (ops->sync_single_for_cpu) -@@ -109,7 +109,7 @@ static inline void dma_sync_single_for_d +@@ -109,7 +109,7 @@ static inline void dma_sync_single_for_device(struct device *dev, dma_addr_t addr, size_t size, enum dma_data_direction dir) { @@ -53369,9 +54476,10 @@ diff -urNp linux-2.6.38.7/include/asm-generic/dma-mapping-common.h linux-2.6.38. BUG_ON(!valid_dma_direction(dir)); if (ops->sync_sg_for_device) -diff -urNp linux-2.6.38.7/include/asm-generic/futex.h linux-2.6.38.7/include/asm-generic/futex.h ---- linux-2.6.38.7/include/asm-generic/futex.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/asm-generic/futex.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h +index 3c2344f..4590a7d 100644 +--- a/include/asm-generic/futex.h ++++ b/include/asm-generic/futex.h @@ -6,7 +6,7 @@ #include <asm/errno.h> @@ -53381,7 +54489,7 @@ diff -urNp linux-2.6.38.7/include/asm-generic/futex.h linux-2.6.38.7/include/asm { int op = (encoded_op >> 28) & 7; int cmp = (encoded_op >> 24) & 15; -@@ -48,7 +48,7 @@ futex_atomic_op_inuser (int encoded_op, +@@ -48,7 +48,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) } static inline int @@ -53390,9 +54498,10 @@ diff -urNp linux-2.6.38.7/include/asm-generic/futex.h linux-2.6.38.7/include/asm { return -ENOSYS; } -diff -urNp linux-2.6.38.7/include/asm-generic/int-l64.h linux-2.6.38.7/include/asm-generic/int-l64.h ---- linux-2.6.38.7/include/asm-generic/int-l64.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/asm-generic/int-l64.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/asm-generic/int-l64.h b/include/asm-generic/int-l64.h +index 1ca3efc..e3dc852 100644 +--- a/include/asm-generic/int-l64.h ++++ b/include/asm-generic/int-l64.h @@ -46,6 +46,8 @@ typedef unsigned int u32; typedef signed long s64; typedef unsigned long u64; @@ -53402,9 +54511,10 @@ diff -urNp linux-2.6.38.7/include/asm-generic/int-l64.h linux-2.6.38.7/include/a #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.38.7/include/asm-generic/int-ll64.h linux-2.6.38.7/include/asm-generic/int-ll64.h ---- linux-2.6.38.7/include/asm-generic/int-ll64.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/asm-generic/int-ll64.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/asm-generic/int-ll64.h b/include/asm-generic/int-ll64.h +index f394147..b6152b9 100644 +--- a/include/asm-generic/int-ll64.h ++++ b/include/asm-generic/int-ll64.h @@ -51,6 +51,8 @@ typedef unsigned int u32; typedef signed long long s64; typedef unsigned long long u64; @@ -53414,9 +54524,10 @@ diff -urNp linux-2.6.38.7/include/asm-generic/int-ll64.h linux-2.6.38.7/include/ #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.38.7/include/asm-generic/kmap_types.h linux-2.6.38.7/include/asm-generic/kmap_types.h ---- linux-2.6.38.7/include/asm-generic/kmap_types.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/asm-generic/kmap_types.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h +index 0232ccb..13d9165 100644 +--- a/include/asm-generic/kmap_types.h ++++ b/include/asm-generic/kmap_types.h @@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE, KMAP_D(17) KM_NMI, KMAP_D(18) KM_NMI_PTE, @@ -53430,27 +54541,10 @@ diff -urNp linux-2.6.38.7/include/asm-generic/kmap_types.h linux-2.6.38.7/includ }; #undef KMAP_D -diff -urNp linux-2.6.38.7/include/asm-generic/pgtable.h linux-2.6.38.7/include/asm-generic/pgtable.h ---- linux-2.6.38.7/include/asm-generic/pgtable.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/asm-generic/pgtable.h 2011-04-28 19:34:15.000000000 -0400 -@@ -447,6 +447,14 @@ static inline int pmd_write(pmd_t pmd) - #endif /* __HAVE_ARCH_PMD_WRITE */ - #endif - -+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL -+static inline unsigned long pax_open_kernel(void) { return 0; } -+#endif -+ -+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL -+static inline unsigned long pax_close_kernel(void) { return 0; } -+#endif -+ - #endif /* !__ASSEMBLY__ */ - - #endif /* _ASM_GENERIC_PGTABLE_H */ -diff -urNp linux-2.6.38.7/include/asm-generic/pgtable-nopmd.h linux-2.6.38.7/include/asm-generic/pgtable-nopmd.h ---- linux-2.6.38.7/include/asm-generic/pgtable-nopmd.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/asm-generic/pgtable-nopmd.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h +index 725612b..9cc513a 100644 +--- a/include/asm-generic/pgtable-nopmd.h ++++ b/include/asm-generic/pgtable-nopmd.h @@ -1,14 +1,19 @@ #ifndef _PGTABLE_NOPMD_H #define _PGTABLE_NOPMD_H @@ -53487,9 +54581,10 @@ diff -urNp linux-2.6.38.7/include/asm-generic/pgtable-nopmd.h linux-2.6.38.7/inc /* * The "pud_xxx()" functions here are trivial for a folded two-level * setup: the pmd is never bad, and a pmd always exists (as it's folded -diff -urNp linux-2.6.38.7/include/asm-generic/pgtable-nopud.h linux-2.6.38.7/include/asm-generic/pgtable-nopud.h ---- linux-2.6.38.7/include/asm-generic/pgtable-nopud.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/asm-generic/pgtable-nopud.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h +index 810431d..ccc3638 100644 +--- a/include/asm-generic/pgtable-nopud.h ++++ b/include/asm-generic/pgtable-nopud.h @@ -1,10 +1,15 @@ #ifndef _PGTABLE_NOPUD_H #define _PGTABLE_NOPUD_H @@ -53520,9 +54615,29 @@ diff -urNp linux-2.6.38.7/include/asm-generic/pgtable-nopud.h linux-2.6.38.7/inc /* * The "pgd_xxx()" functions here are trivial for a folded two-level * setup: the pud is never bad, and a pud always exists (as it's folded -diff -urNp linux-2.6.38.7/include/asm-generic/vmlinux.lds.h linux-2.6.38.7/include/asm-generic/vmlinux.lds.h ---- linux-2.6.38.7/include/asm-generic/vmlinux.lds.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/asm-generic/vmlinux.lds.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h +index b4bfe33..625cfa2 100644 +--- a/include/asm-generic/pgtable.h ++++ b/include/asm-generic/pgtable.h +@@ -447,6 +447,14 @@ static inline int pmd_write(pmd_t pmd) + #endif /* __HAVE_ARCH_PMD_WRITE */ + #endif + ++#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL ++static inline unsigned long pax_open_kernel(void) { return 0; } ++#endif ++ ++#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL ++static inline unsigned long pax_close_kernel(void) { return 0; } ++#endif ++ + #endif /* !__ASSEMBLY__ */ + + #endif /* _ASM_GENERIC_PGTABLE_H */ +diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h +index fe77e33..88723cb 100644 +--- a/include/asm-generic/vmlinux.lds.h ++++ b/include/asm-generic/vmlinux.lds.h @@ -213,6 +213,7 @@ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start_rodata) = .; \ @@ -53559,9 +54674,10 @@ diff -urNp linux-2.6.38.7/include/asm-generic/vmlinux.lds.h linux-2.6.38.7/inclu /** * PERCPU - define output section for percpu area, simple version -diff -urNp linux-2.6.38.7/include/drm/drmP.h linux-2.6.38.7/include/drm/drmP.h ---- linux-2.6.38.7/include/drm/drmP.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/drm/drmP.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/drm/drmP.h b/include/drm/drmP.h +index 348843b..e43a5a8 100644 +--- a/include/drm/drmP.h ++++ b/include/drm/drmP.h @@ -73,6 +73,7 @@ #include <linux/workqueue.h> #include <linux/poll.h> @@ -53615,9 +54731,10 @@ diff -urNp linux-2.6.38.7/include/drm/drmP.h linux-2.6.38.7/include/drm/drmP.h void *dev_private; /**< device private data */ void *mm_private; struct address_space *dev_mapping; -diff -urNp linux-2.6.38.7/include/linux/a.out.h linux-2.6.38.7/include/linux/a.out.h ---- linux-2.6.38.7/include/linux/a.out.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/a.out.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/a.out.h b/include/linux/a.out.h +index e86dfca..40cc55f 100644 +--- a/include/linux/a.out.h ++++ b/include/linux/a.out.h @@ -39,6 +39,14 @@ enum machine_type { M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ }; @@ -53633,9 +54750,10 @@ diff -urNp linux-2.6.38.7/include/linux/a.out.h linux-2.6.38.7/include/linux/a.o #if !defined (N_MAGIC) #define N_MAGIC(exec) ((exec).a_info & 0xffff) #endif -diff -urNp linux-2.6.38.7/include/linux/atmdev.h linux-2.6.38.7/include/linux/atmdev.h ---- linux-2.6.38.7/include/linux/atmdev.h 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/include/linux/atmdev.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h +index 381f4ce..6e875a6 100644 +--- a/include/linux/atmdev.h ++++ b/include/linux/atmdev.h @@ -237,7 +237,7 @@ struct compat_atm_iobuf { #endif @@ -53645,9 +54763,10 @@ diff -urNp linux-2.6.38.7/include/linux/atmdev.h linux-2.6.38.7/include/linux/at __AAL_STAT_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.38.7/include/linux/binfmts.h linux-2.6.38.7/include/linux/binfmts.h ---- linux-2.6.38.7/include/linux/binfmts.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/binfmts.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h +index c3d6512..152b708 100644 +--- a/include/linux/binfmts.h ++++ b/include/linux/binfmts.h @@ -92,6 +92,7 @@ struct linux_binfmt { int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); int (*load_shlib)(struct file *); @@ -53656,10 +54775,11 @@ diff -urNp linux-2.6.38.7/include/linux/binfmts.h linux-2.6.38.7/include/linux/b unsigned long min_coredump; /* minimal dump size */ }; -diff -urNp linux-2.6.38.7/include/linux/blkdev.h linux-2.6.38.7/include/linux/blkdev.h ---- linux-2.6.38.7/include/linux/blkdev.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/blkdev.h 2011-04-28 19:34:15.000000000 -0400 -@@ -1247,22 +1247,22 @@ queue_max_integrity_segments(struct requ +diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h +index 6566147..931b5e4 100644 +--- a/include/linux/blkdev.h ++++ b/include/linux/blkdev.h +@@ -1250,22 +1250,22 @@ queue_max_integrity_segments(struct request_queue *q) #endif /* CONFIG_BLK_DEV_INTEGRITY */ struct block_device_operations { @@ -53694,9 +54814,10 @@ diff -urNp linux-2.6.38.7/include/linux/blkdev.h linux-2.6.38.7/include/linux/bl }; extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, -diff -urNp linux-2.6.38.7/include/linux/blktrace_api.h linux-2.6.38.7/include/linux/blktrace_api.h ---- linux-2.6.38.7/include/linux/blktrace_api.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/blktrace_api.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h +index b22fb0d..50e6873 100644 +--- a/include/linux/blktrace_api.h ++++ b/include/linux/blktrace_api.h @@ -161,7 +161,7 @@ struct blk_trace { struct dentry *dir; struct dentry *dropped_file; @@ -53706,9 +54827,10 @@ diff -urNp linux-2.6.38.7/include/linux/blktrace_api.h linux-2.6.38.7/include/li }; extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *); -diff -urNp linux-2.6.38.7/include/linux/byteorder/little_endian.h linux-2.6.38.7/include/linux/byteorder/little_endian.h ---- linux-2.6.38.7/include/linux/byteorder/little_endian.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/byteorder/little_endian.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/byteorder/little_endian.h b/include/linux/byteorder/little_endian.h +index 83195fb..0b0f77d 100644 +--- a/include/linux/byteorder/little_endian.h ++++ b/include/linux/byteorder/little_endian.h @@ -42,51 +42,51 @@ static inline __le64 __cpu_to_le64p(const __u64 *p) @@ -53773,9 +54895,10 @@ diff -urNp linux-2.6.38.7/include/linux/byteorder/little_endian.h linux-2.6.38.7 } #define __cpu_to_le64s(x) do { (void)(x); } while (0) #define __le64_to_cpus(x) do { (void)(x); } while (0) -diff -urNp linux-2.6.38.7/include/linux/cache.h linux-2.6.38.7/include/linux/cache.h ---- linux-2.6.38.7/include/linux/cache.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/cache.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/cache.h b/include/linux/cache.h +index 4c57065..4307975 100644 +--- a/include/linux/cache.h ++++ b/include/linux/cache.h @@ -16,6 +16,10 @@ #define __read_mostly #endif @@ -53787,10 +54910,11 @@ diff -urNp linux-2.6.38.7/include/linux/cache.h linux-2.6.38.7/include/linux/cac #ifndef ____cacheline_aligned #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif -diff -urNp linux-2.6.38.7/include/linux/capability.h linux-2.6.38.7/include/linux/capability.h ---- linux-2.6.38.7/include/linux/capability.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/capability.h 2011-04-28 19:34:15.000000000 -0400 -@@ -561,6 +561,7 @@ extern const kernel_cap_t __cap_init_eff +diff --git a/include/linux/capability.h b/include/linux/capability.h +index fb16a36..9c528fc 100644 +--- a/include/linux/capability.h ++++ b/include/linux/capability.h +@@ -561,6 +561,7 @@ extern const kernel_cap_t __cap_init_eff_set; (security_real_capable_noaudit((t), (cap)) == 0) extern int capable(int cap); @@ -53798,9 +54922,10 @@ diff -urNp linux-2.6.38.7/include/linux/capability.h linux-2.6.38.7/include/linu /* audit system wants to get cap info from files as well */ struct dentry; -diff -urNp linux-2.6.38.7/include/linux/compiler-gcc4.h linux-2.6.38.7/include/linux/compiler-gcc4.h ---- linux-2.6.38.7/include/linux/compiler-gcc4.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/compiler-gcc4.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h +index fcfa5b9..b487b3e 100644 +--- a/include/linux/compiler-gcc4.h ++++ b/include/linux/compiler-gcc4.h @@ -54,6 +54,10 @@ #endif @@ -53812,10 +54937,11 @@ diff -urNp linux-2.6.38.7/include/linux/compiler-gcc4.h linux-2.6.38.7/include/l #endif #if __GNUC_MINOR__ > 0 -diff -urNp linux-2.6.38.7/include/linux/compiler.h linux-2.6.38.7/include/linux/compiler.h ---- linux-2.6.38.7/include/linux/compiler.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/compiler.h 2011-04-28 19:34:15.000000000 -0400 -@@ -273,6 +273,22 @@ void ftrace_likely_update(struct ftrace_ +diff --git a/include/linux/compiler.h b/include/linux/compiler.h +index 320d6c9..561e1c9 100644 +--- a/include/linux/compiler.h ++++ b/include/linux/compiler.h +@@ -273,6 +273,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); #define __cold #endif @@ -53838,7 +54964,7 @@ diff -urNp linux-2.6.38.7/include/linux/compiler.h linux-2.6.38.7/include/linux/ /* Simple shorthand for a section definition */ #ifndef __section # define __section(S) __attribute__ ((__section__(#S))) -@@ -306,6 +322,7 @@ void ftrace_likely_update(struct ftrace_ +@@ -306,6 +322,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); * use is to mediate communication between process-level code and irq/NMI * handlers, all running on the same CPU. */ @@ -53847,10 +54973,11 @@ diff -urNp linux-2.6.38.7/include/linux/compiler.h linux-2.6.38.7/include/linux/ +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x)) #endif /* __LINUX_COMPILER_H */ -diff -urNp linux-2.6.38.7/include/linux/cpuset.h linux-2.6.38.7/include/linux/cpuset.h ---- linux-2.6.38.7/include/linux/cpuset.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/cpuset.h 2011-04-28 19:34:15.000000000 -0400 -@@ -118,7 +118,7 @@ static inline void put_mems_allowed(void +diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h +index f20eb8f..77a8fbc 100644 +--- a/include/linux/cpuset.h ++++ b/include/linux/cpuset.h +@@ -118,7 +118,7 @@ static inline void put_mems_allowed(void) * nodemask. */ smp_mb(); @@ -53859,9 +54986,10 @@ diff -urNp linux-2.6.38.7/include/linux/cpuset.h linux-2.6.38.7/include/linux/cp } static inline void set_mems_allowed(nodemask_t nodemask) -diff -urNp linux-2.6.38.7/include/linux/decompress/mm.h linux-2.6.38.7/include/linux/decompress/mm.h ---- linux-2.6.38.7/include/linux/decompress/mm.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/decompress/mm.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h +index 4cb72b9..cb75820 100644 +--- a/include/linux/decompress/mm.h ++++ b/include/linux/decompress/mm.h @@ -77,7 +77,7 @@ static void free(void *where) * warnings when not needed (indeed large_malloc / large_free are not * needed by inflate */ @@ -53871,9 +54999,10 @@ diff -urNp linux-2.6.38.7/include/linux/decompress/mm.h linux-2.6.38.7/include/l #define free(a) kfree(a) #define large_malloc(a) vmalloc(a) -diff -urNp linux-2.6.38.7/include/linux/dma-mapping.h linux-2.6.38.7/include/linux/dma-mapping.h ---- linux-2.6.38.7/include/linux/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/dma-mapping.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h +index ba8319a..876b13e 100644 +--- a/include/linux/dma-mapping.h ++++ b/include/linux/dma-mapping.h @@ -16,40 +16,40 @@ enum dma_data_direction { }; @@ -53929,9 +55058,10 @@ diff -urNp linux-2.6.38.7/include/linux/dma-mapping.h linux-2.6.38.7/include/lin }; #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) -diff -urNp linux-2.6.38.7/include/linux/elf.h linux-2.6.38.7/include/linux/elf.h ---- linux-2.6.38.7/include/linux/elf.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/elf.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/elf.h b/include/linux/elf.h +index 4d60801..9f6b7af 100644 +--- a/include/linux/elf.h ++++ b/include/linux/elf.h @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; #define PT_GNU_EH_FRAME 0x6474e550 @@ -54004,30 +55134,10 @@ diff -urNp linux-2.6.38.7/include/linux/elf.h linux-2.6.38.7/include/linux/elf.h #endif -diff -urNp linux-2.6.38.7/include/linux/fscache-cache.h linux-2.6.38.7/include/linux/fscache-cache.h ---- linux-2.6.38.7/include/linux/fscache-cache.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/fscache-cache.h 2011-04-28 19:57:25.000000000 -0400 -@@ -113,7 +113,7 @@ struct fscache_operation { - #endif - }; - --extern atomic_t fscache_op_debug_id; -+extern atomic_unchecked_t fscache_op_debug_id; - extern void fscache_op_work_func(struct work_struct *work); - - extern void fscache_enqueue_operation(struct fscache_operation *); -@@ -133,7 +133,7 @@ static inline void fscache_operation_ini - { - INIT_WORK(&op->work, fscache_op_work_func); - atomic_set(&op->usage, 1); -- op->debug_id = atomic_inc_return(&fscache_op_debug_id); -+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id); - op->processor = processor; - op->release = release; - INIT_LIST_HEAD(&op->pend_link); -diff -urNp linux-2.6.38.7/include/linux/fs.h linux-2.6.38.7/include/linux/fs.h ---- linux-2.6.38.7/include/linux/fs.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/fs.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/fs.h b/include/linux/fs.h +index e38b50a..07ff219 100644 +--- a/include/linux/fs.h ++++ b/include/linux/fs.h @@ -105,6 +105,11 @@ struct inodes_stat_t { /* File was opened by fanotify and shouldn't generate fanotify events */ #define FMODE_NONOTIFY ((__force fmode_t)0x1000000) @@ -54040,7 +55150,7 @@ diff -urNp linux-2.6.38.7/include/linux/fs.h linux-2.6.38.7/include/linux/fs.h /* * The below are the various read and write types that we support. Some of * them include behavioral modifiers that send information down to the -@@ -581,42 +586,42 @@ typedef int (*read_actor_t)(read_descrip +@@ -581,42 +586,42 @@ typedef int (*read_actor_t)(read_descriptor_t *, struct page *, unsigned long, unsigned long); struct address_space_operations { @@ -54101,7 +55211,7 @@ diff -urNp linux-2.6.38.7/include/linux/fs.h linux-2.6.38.7/include/linux/fs.h }; /* -@@ -1059,17 +1064,17 @@ static inline int file_check_writeable(s +@@ -1059,17 +1064,17 @@ static inline int file_check_writeable(struct file *filp) typedef struct files_struct *fl_owner_t; struct file_lock_operations { @@ -54127,15 +55237,13 @@ diff -urNp linux-2.6.38.7/include/linux/fs.h linux-2.6.38.7/include/linux/fs.h }; struct lock_manager { -@@ -1604,29 +1609,29 @@ extern ssize_t vfs_writev(struct file *, +@@ -1604,29 +1609,29 @@ extern ssize_t vfs_writev(struct file *, const struct iovec __user *, unsigned long, loff_t *); struct super_operations { - struct inode *(*alloc_inode)(struct super_block *sb); - void (*destroy_inode)(struct inode *); -+ struct inode *(* const alloc_inode)(struct super_block *sb); -+ void (* const destroy_inode)(struct inode *); - +- - void (*dirty_inode) (struct inode *); - int (*write_inode) (struct inode *, struct writeback_control *wbc); - int (*drop_inode) (struct inode *); @@ -54148,6 +55256,12 @@ diff -urNp linux-2.6.38.7/include/linux/fs.h linux-2.6.38.7/include/linux/fs.h - int (*statfs) (struct dentry *, struct kstatfs *); - int (*remount_fs) (struct super_block *, int *, char *); - void (*umount_begin) (struct super_block *); +- +- int (*show_options)(struct seq_file *, struct vfsmount *); +- int (*show_stats)(struct seq_file *, struct vfsmount *); ++ struct inode *(* const alloc_inode)(struct super_block *sb); ++ void (* const destroy_inode)(struct inode *); ++ + void (* const dirty_inode) (struct inode *); + int (* const write_inode) (struct inode *, struct writeback_control *wbc); + int (* const drop_inode) (struct inode *); @@ -54160,9 +55274,7 @@ diff -urNp linux-2.6.38.7/include/linux/fs.h linux-2.6.38.7/include/linux/fs.h + int (* const statfs) (struct dentry *, struct kstatfs *); + int (* const remount_fs) (struct super_block *, int *, char *); + void (* const umount_begin) (struct super_block *); - -- int (*show_options)(struct seq_file *, struct vfsmount *); -- int (*show_stats)(struct seq_file *, struct vfsmount *); ++ + int (* const show_options)(struct seq_file *, struct vfsmount *); + int (* const show_stats)(struct seq_file *, struct vfsmount *); #ifdef CONFIG_QUOTA @@ -54176,9 +55288,10 @@ diff -urNp linux-2.6.38.7/include/linux/fs.h linux-2.6.38.7/include/linux/fs.h }; /* -diff -urNp linux-2.6.38.7/include/linux/fs_struct.h linux-2.6.38.7/include/linux/fs_struct.h ---- linux-2.6.38.7/include/linux/fs_struct.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/fs_struct.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h +index 003dc0f..3c4ea97 100644 +--- a/include/linux/fs_struct.h ++++ b/include/linux/fs_struct.h @@ -6,7 +6,7 @@ #include <linux/seqlock.h> @@ -54188,10 +55301,33 @@ diff -urNp linux-2.6.38.7/include/linux/fs_struct.h linux-2.6.38.7/include/linux spinlock_t lock; seqcount_t seq; int umask; -diff -urNp linux-2.6.38.7/include/linux/ftrace_event.h linux-2.6.38.7/include/linux/ftrace_event.h ---- linux-2.6.38.7/include/linux/ftrace_event.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/ftrace_event.h 2011-05-02 19:07:09.000000000 -0400 -@@ -236,7 +236,7 @@ extern int trace_define_field(struct ftr +diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h +index b8581c0..2934a3d 100644 +--- a/include/linux/fscache-cache.h ++++ b/include/linux/fscache-cache.h +@@ -113,7 +113,7 @@ struct fscache_operation { + #endif + }; + +-extern atomic_t fscache_op_debug_id; ++extern atomic_unchecked_t fscache_op_debug_id; + extern void fscache_op_work_func(struct work_struct *work); + + extern void fscache_enqueue_operation(struct fscache_operation *); +@@ -133,7 +133,7 @@ static inline void fscache_operation_init(struct fscache_operation *op, + { + INIT_WORK(&op->work, fscache_op_work_func); + atomic_set(&op->usage, 1); +- op->debug_id = atomic_inc_return(&fscache_op_debug_id); ++ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id); + op->processor = processor; + op->release = release; + INIT_LIST_HEAD(&op->pend_link); +diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h +index 47e3997..5c22516 100644 +--- a/include/linux/ftrace_event.h ++++ b/include/linux/ftrace_event.h +@@ -236,7 +236,7 @@ extern int trace_define_field(struct ftrace_event_call *call, const char *type, extern int trace_add_event_call(struct ftrace_event_call *call); extern void trace_remove_event_call(struct ftrace_event_call *call); @@ -54200,10 +55336,11 @@ diff -urNp linux-2.6.38.7/include/linux/ftrace_event.h linux-2.6.38.7/include/li int trace_set_clr_event(const char *system, const char *event, int set); -diff -urNp linux-2.6.38.7/include/linux/genhd.h linux-2.6.38.7/include/linux/genhd.h ---- linux-2.6.38.7/include/linux/genhd.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/genhd.h 2011-04-28 19:34:15.000000000 -0400 -@@ -183,7 +183,7 @@ struct gendisk { +diff --git a/include/linux/genhd.h b/include/linux/genhd.h +index 035bc67..862d9e6 100644 +--- a/include/linux/genhd.h ++++ b/include/linux/genhd.h +@@ -184,7 +184,7 @@ struct gendisk { struct kobject *slave_dir; struct timer_rand_state *random; @@ -54212,9 +55349,11 @@ diff -urNp linux-2.6.38.7/include/linux/genhd.h linux-2.6.38.7/include/linux/gen struct disk_events *ev; #ifdef CONFIG_BLK_DEV_INTEGRITY struct blk_integrity *integrity; -diff -urNp linux-2.6.38.7/include/linux/gracl.h linux-2.6.38.7/include/linux/gracl.h ---- linux-2.6.38.7/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/include/linux/gracl.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/gracl.h b/include/linux/gracl.h +new file mode 100644 +index 0000000..0dc3943 +--- /dev/null ++++ b/include/linux/gracl.h @@ -0,0 +1,317 @@ +#ifndef GR_ACL_H +#define GR_ACL_H @@ -54533,9 +55672,11 @@ diff -urNp linux-2.6.38.7/include/linux/gracl.h linux-2.6.38.7/include/linux/gra + +#endif + -diff -urNp linux-2.6.38.7/include/linux/gralloc.h linux-2.6.38.7/include/linux/gralloc.h ---- linux-2.6.38.7/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/include/linux/gralloc.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h +new file mode 100644 +index 0000000..323ecf2 +--- /dev/null ++++ b/include/linux/gralloc.h @@ -0,0 +1,9 @@ +#ifndef __GRALLOC_H +#define __GRALLOC_H @@ -54546,9 +55687,11 @@ diff -urNp linux-2.6.38.7/include/linux/gralloc.h linux-2.6.38.7/include/linux/g +void *acl_alloc_num(unsigned long num, unsigned long len); + +#endif -diff -urNp linux-2.6.38.7/include/linux/grdefs.h linux-2.6.38.7/include/linux/grdefs.h ---- linux-2.6.38.7/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/include/linux/grdefs.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h +new file mode 100644 +index 0000000..22d7a5d +--- /dev/null ++++ b/include/linux/grdefs.h @@ -0,0 +1,139 @@ +#ifndef GRDEFS_H +#define GRDEFS_H @@ -54689,9 +55832,11 @@ diff -urNp linux-2.6.38.7/include/linux/grdefs.h linux-2.6.38.7/include/linux/gr +}; + +#endif -diff -urNp linux-2.6.38.7/include/linux/grinternal.h linux-2.6.38.7/include/linux/grinternal.h ---- linux-2.6.38.7/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/include/linux/grinternal.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h +new file mode 100644 +index 0000000..bdf0e10 +--- /dev/null ++++ b/include/linux/grinternal.h @@ -0,0 +1,219 @@ +#ifndef __GRINTERNAL_H +#define __GRINTERNAL_H @@ -54912,9 +56057,11 @@ diff -urNp linux-2.6.38.7/include/linux/grinternal.h linux-2.6.38.7/include/linu +#endif + +#endif -diff -urNp linux-2.6.38.7/include/linux/grmsg.h linux-2.6.38.7/include/linux/grmsg.h ---- linux-2.6.38.7/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/include/linux/grmsg.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h +new file mode 100644 +index 0000000..0141e03 +--- /dev/null ++++ b/include/linux/grmsg.h @@ -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" @@ -55024,9 +56171,11 @@ diff -urNp linux-2.6.38.7/include/linux/grmsg.h linux-2.6.38.7/include/linux/grm +#define GR_VM86_MSG "denied use of vm86 by " +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by " -diff -urNp linux-2.6.38.7/include/linux/grsecurity.h linux-2.6.38.7/include/linux/grsecurity.h ---- linux-2.6.38.7/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/include/linux/grsecurity.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h +new file mode 100644 +index 0000000..227c301 +--- /dev/null ++++ b/include/linux/grsecurity.h @@ -0,0 +1,212 @@ +#ifndef GR_SECURITY_H +#define GR_SECURITY_H @@ -55240,9 +56389,11 @@ diff -urNp linux-2.6.38.7/include/linux/grsecurity.h linux-2.6.38.7/include/linu +#endif + +#endif -diff -urNp linux-2.6.38.7/include/linux/grsock.h linux-2.6.38.7/include/linux/grsock.h ---- linux-2.6.38.7/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/include/linux/grsock.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/grsock.h b/include/linux/grsock.h +new file mode 100644 +index 0000000..e7ffaaf +--- /dev/null ++++ b/include/linux/grsock.h @@ -0,0 +1,19 @@ +#ifndef __GRSOCK_H +#define __GRSOCK_H @@ -55263,10 +56414,11 @@ diff -urNp linux-2.6.38.7/include/linux/grsock.h linux-2.6.38.7/include/linux/gr + const int protocol); + +#endif -diff -urNp linux-2.6.38.7/include/linux/highmem.h linux-2.6.38.7/include/linux/highmem.h ---- linux-2.6.38.7/include/linux/highmem.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/highmem.h 2011-04-28 19:34:15.000000000 -0400 -@@ -185,6 +185,18 @@ static inline void clear_highpage(struct +diff --git a/include/linux/highmem.h b/include/linux/highmem.h +index 3a93f73..b19d0b3 100644 +--- a/include/linux/highmem.h ++++ b/include/linux/highmem.h +@@ -185,6 +185,18 @@ static inline void clear_highpage(struct page *page) kunmap_atomic(kaddr, KM_USER0); } @@ -55285,9 +56437,10 @@ diff -urNp linux-2.6.38.7/include/linux/highmem.h linux-2.6.38.7/include/linux/h static inline void zero_user_segments(struct page *page, unsigned start1, unsigned end1, unsigned start2, unsigned end2) -diff -urNp linux-2.6.38.7/include/linux/i2o.h linux-2.6.38.7/include/linux/i2o.h ---- linux-2.6.38.7/include/linux/i2o.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/i2o.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/include/linux/i2o.h b/include/linux/i2o.h +index 9e7a12d..2a6f32e 100644 +--- a/include/linux/i2o.h ++++ b/include/linux/i2o.h @@ -564,7 +564,7 @@ struct i2o_controller { struct i2o_device *exec; /* Executive */ #if BITS_PER_LONG == 64 @@ -55297,10 +56450,11 @@ diff -urNp linux-2.6.38.7/include/linux/i2o.h linux-2.6.38.7/include/linux/i2o.h struct list_head context_list; /* list of context id's and pointers */ #endif -diff -urNp linux-2.6.38.7/include/linux/init.h linux-2.6.38.7/include/linux/init.h ---- linux-2.6.38.7/include/linux/init.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/init.h 2011-04-28 19:34:15.000000000 -0400 -@@ -293,13 +293,13 @@ void __init parse_early_options(char *cm +diff --git a/include/linux/init.h b/include/linux/init.h +index 577671c..b0042e9 100644 +--- a/include/linux/init.h ++++ b/include/linux/init.h +@@ -293,13 +293,13 @@ void __init parse_early_options(char *cmdline); /* Each module must use one module_init(). */ #define module_init(initfn) \ @@ -55316,9 +56470,10 @@ diff -urNp linux-2.6.38.7/include/linux/init.h linux-2.6.38.7/include/linux/init { return exitfn; } \ void cleanup_module(void) __attribute__((alias(#exitfn))); -diff -urNp linux-2.6.38.7/include/linux/init_task.h linux-2.6.38.7/include/linux/init_task.h ---- linux-2.6.38.7/include/linux/init_task.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/init_task.h 2011-04-30 19:59:43.000000000 -0400 +diff --git a/include/linux/init_task.h b/include/linux/init_task.h +index caa151f..462d8f2 100644 +--- a/include/linux/init_task.h ++++ b/include/linux/init_task.h @@ -83,6 +83,12 @@ extern struct group_info init_groups; #define INIT_IDS #endif @@ -55340,9 +56495,10 @@ diff -urNp linux-2.6.38.7/include/linux/init_task.h linux-2.6.38.7/include/linux .fs = &init_fs, \ .files = &init_files, \ .signal = &init_signals, \ -diff -urNp linux-2.6.38.7/include/linux/interrupt.h linux-2.6.38.7/include/linux/interrupt.h ---- linux-2.6.38.7/include/linux/interrupt.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/interrupt.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h +index 55e0d42..88b62fb 100644 +--- a/include/linux/interrupt.h ++++ b/include/linux/interrupt.h @@ -393,7 +393,7 @@ enum /* map softirq index to softirq name. update 'softirq_to_name' in * kernel/softirq.c when adding a new softirq. @@ -55352,7 +56508,7 @@ diff -urNp linux-2.6.38.7/include/linux/interrupt.h linux-2.6.38.7/include/linux /* softirq mask and active fields moved to irq_cpustat_t in * asm/hardirq.h to get better cache usage. KAO -@@ -401,12 +401,12 @@ extern char *softirq_to_name[NR_SOFTIRQS +@@ -401,12 +401,12 @@ extern char *softirq_to_name[NR_SOFTIRQS]; struct softirq_action { @@ -55367,9 +56523,10 @@ diff -urNp linux-2.6.38.7/include/linux/interrupt.h linux-2.6.38.7/include/linux extern void softirq_init(void); static inline void __raise_softirq_irqoff(unsigned int nr) { -diff -urNp linux-2.6.38.7/include/linux/kallsyms.h linux-2.6.38.7/include/linux/kallsyms.h ---- linux-2.6.38.7/include/linux/kallsyms.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/kallsyms.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h +index d8e9b3d..e6e63f9 100644 +--- a/include/linux/kallsyms.h ++++ b/include/linux/kallsyms.h @@ -15,7 +15,8 @@ struct module; @@ -55380,7 +56537,7 @@ diff -urNp linux-2.6.38.7/include/linux/kallsyms.h linux-2.6.38.7/include/linux/ /* Lookup the address for a symbol. Returns 0 if not found. */ unsigned long kallsyms_lookup_name(const char *name); -@@ -92,6 +93,15 @@ static inline int lookup_symbol_attrs(un +@@ -92,6 +93,15 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u /* Stupid that this does nothing, but I didn't create this mess. */ #define __print_symbol(fmt, addr) #endif /*CONFIG_KALLSYMS*/ @@ -55396,9 +56553,10 @@ diff -urNp linux-2.6.38.7/include/linux/kallsyms.h linux-2.6.38.7/include/linux/ /* This macro allows us to keep printk typechecking */ static void __check_printsym_format(const char *fmt, ...) -diff -urNp linux-2.6.38.7/include/linux/kgdb.h linux-2.6.38.7/include/linux/kgdb.h ---- linux-2.6.38.7/include/linux/kgdb.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/kgdb.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h +index 092e425..4f013a8 100644 +--- a/include/linux/kgdb.h ++++ b/include/linux/kgdb.h @@ -53,7 +53,7 @@ extern int kgdb_connected; extern int kgdb_io_module_registered; @@ -55441,10 +56599,11 @@ diff -urNp linux-2.6.38.7/include/linux/kgdb.h linux-2.6.38.7/include/linux/kgdb extern int kgdb_hex2long(char **ptr, unsigned long *long_val); extern char *kgdb_mem2hex(char *mem, char *buf, int count); -diff -urNp linux-2.6.38.7/include/linux/kmod.h linux-2.6.38.7/include/linux/kmod.h ---- linux-2.6.38.7/include/linux/kmod.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/kmod.h 2011-04-28 19:34:15.000000000 -0400 -@@ -33,6 +33,8 @@ extern char modprobe_path[]; /* for sysc +diff --git a/include/linux/kmod.h b/include/linux/kmod.h +index 6efd7a7..1bd2600 100644 +--- a/include/linux/kmod.h ++++ b/include/linux/kmod.h +@@ -33,6 +33,8 @@ extern char modprobe_path[]; /* for sysctl */ * usually useless though. */ extern int __request_module(bool wait, const char *name, ...) \ __attribute__((format(printf, 2, 3))); @@ -55453,10 +56612,11 @@ diff -urNp linux-2.6.38.7/include/linux/kmod.h linux-2.6.38.7/include/linux/kmod #define request_module(mod...) __request_module(true, mod) #define request_module_nowait(mod...) __request_module(false, mod) #define try_then_request_module(x, mod...) \ -diff -urNp linux-2.6.38.7/include/linux/kvm_host.h linux-2.6.38.7/include/linux/kvm_host.h ---- linux-2.6.38.7/include/linux/kvm_host.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/kvm_host.h 2011-04-28 19:34:15.000000000 -0400 -@@ -288,7 +288,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc +diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h +index b5021db..50b5c79 100644 +--- a/include/linux/kvm_host.h ++++ b/include/linux/kvm_host.h +@@ -288,7 +288,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu); void vcpu_load(struct kvm_vcpu *vcpu); void vcpu_put(struct kvm_vcpu *vcpu); @@ -55465,7 +56625,7 @@ diff -urNp linux-2.6.38.7/include/linux/kvm_host.h linux-2.6.38.7/include/linux/ struct module *module); void kvm_exit(void); -@@ -428,7 +428,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug( +@@ -428,7 +428,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, struct kvm_guest_debug *dbg); int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run); @@ -55474,9 +56634,10 @@ diff -urNp linux-2.6.38.7/include/linux/kvm_host.h linux-2.6.38.7/include/linux/ void kvm_arch_exit(void); int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); -diff -urNp linux-2.6.38.7/include/linux/libata.h linux-2.6.38.7/include/linux/libata.h ---- linux-2.6.38.7/include/linux/libata.h 2011-05-10 22:06:27.000000000 -0400 -+++ linux-2.6.38.7/include/linux/libata.h 2011-05-10 22:06:56.000000000 -0400 +diff --git a/include/linux/libata.h b/include/linux/libata.h +index 1f00080..233a12e 100644 +--- a/include/linux/libata.h ++++ b/include/linux/libata.h @@ -531,11 +531,11 @@ struct ata_ioports { struct ata_host { @@ -55509,7 +56670,7 @@ diff -urNp linux-2.6.38.7/include/linux/libata.h linux-2.6.38.7/include/linux/li void *private_data; }; -@@ -938,7 +938,7 @@ extern const unsigned long sata_deb_timi +@@ -938,7 +938,7 @@ extern const unsigned long sata_deb_timing_normal[]; extern const unsigned long sata_deb_timing_hotplug[]; extern const unsigned long sata_deb_timing_long[]; @@ -55518,7 +56679,7 @@ diff -urNp linux-2.6.38.7/include/linux/libata.h linux-2.6.38.7/include/linux/li extern const struct ata_port_info ata_dummy_port_info; static inline const unsigned long * -@@ -984,7 +984,7 @@ extern int ata_host_activate(struct ata_ +@@ -984,7 +984,7 @@ extern int ata_host_activate(struct ata_host *host, int irq, struct scsi_host_template *sht); extern void ata_host_detach(struct ata_host *host); extern void ata_host_init(struct ata_host *, struct device *, @@ -55527,9 +56688,10 @@ diff -urNp linux-2.6.38.7/include/linux/libata.h linux-2.6.38.7/include/linux/li extern int ata_scsi_detect(struct scsi_host_template *sht); extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); extern int ata_scsi_queuecmd(struct Scsi_Host *h, struct scsi_cmnd *cmd); -diff -urNp linux-2.6.38.7/include/linux/lockd/bind.h linux-2.6.38.7/include/linux/lockd/bind.h ---- linux-2.6.38.7/include/linux/lockd/bind.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/lockd/bind.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/lockd/bind.h b/include/linux/lockd/bind.h +index fbc48f8..0886e57 100644 +--- a/include/linux/lockd/bind.h ++++ b/include/linux/lockd/bind.h @@ -23,13 +23,13 @@ struct svc_rqst; * This is the set of functions for lockd->nfsd communication */ @@ -55547,10 +56709,11 @@ diff -urNp linux-2.6.38.7/include/linux/lockd/bind.h linux-2.6.38.7/include/linu /* * Similar to nfs_client_initdata, but without the NFS-specific -diff -urNp linux-2.6.38.7/include/linux/mm.h linux-2.6.38.7/include/linux/mm.h ---- linux-2.6.38.7/include/linux/mm.h 2011-05-22 23:05:20.000000000 -0400 -+++ linux-2.6.38.7/include/linux/mm.h 2011-05-22 23:06:04.000000000 -0400 -@@ -113,7 +113,14 @@ extern unsigned int kobjsize(const void +diff --git a/include/linux/mm.h b/include/linux/mm.h +index 957a90b..13ce8ac 100644 +--- a/include/linux/mm.h ++++ b/include/linux/mm.h +@@ -113,7 +113,14 @@ extern unsigned int kobjsize(const void *objp); #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */ #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */ @@ -55624,7 +56787,7 @@ diff -urNp linux-2.6.38.7/include/linux/mm.h linux-2.6.38.7/include/linux/mm.h extern unsigned long do_brk(unsigned long, unsigned long); -@@ -1517,6 +1506,10 @@ extern struct vm_area_struct * find_vma( +@@ -1517,6 +1506,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr, struct vm_area_struct **pprev); @@ -55635,7 +56798,7 @@ diff -urNp linux-2.6.38.7/include/linux/mm.h linux-2.6.38.7/include/linux/mm.h /* Look up the first VMA which intersects the interval start_addr..end_addr-1, NULL if none. Assume start_addr < end_addr. */ static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr) -@@ -1533,15 +1526,6 @@ static inline unsigned long vma_pages(st +@@ -1533,15 +1526,6 @@ static inline unsigned long vma_pages(struct vm_area_struct *vma) return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; } @@ -55651,7 +56814,7 @@ diff -urNp linux-2.6.38.7/include/linux/mm.h linux-2.6.38.7/include/linux/mm.h struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr); int remap_pfn_range(struct vm_area_struct *, unsigned long addr, unsigned long pfn, unsigned long size, pgprot_t); -@@ -1650,7 +1634,7 @@ extern int unpoison_memory(unsigned long +@@ -1650,7 +1634,7 @@ extern int unpoison_memory(unsigned long pfn); extern int sysctl_memory_failure_early_kill; extern int sysctl_memory_failure_recovery; extern void shake_page(struct page *p, int access); @@ -55660,7 +56823,7 @@ diff -urNp linux-2.6.38.7/include/linux/mm.h linux-2.6.38.7/include/linux/mm.h extern int soft_offline_page(struct page *page, int flags); #ifdef CONFIG_MEMORY_FAILURE int is_hwpoison_address(unsigned long addr); -@@ -1672,5 +1656,11 @@ extern void copy_user_huge_page(struct p +@@ -1672,5 +1656,11 @@ extern void copy_user_huge_page(struct page *dst, struct page *src, unsigned int pages_per_huge_page); #endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLBFS */ @@ -55672,9 +56835,10 @@ diff -urNp linux-2.6.38.7/include/linux/mm.h linux-2.6.38.7/include/linux/mm.h + #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ -diff -urNp linux-2.6.38.7/include/linux/mm_types.h linux-2.6.38.7/include/linux/mm_types.h ---- linux-2.6.38.7/include/linux/mm_types.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/mm_types.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h +index 26bc4e2..b521923 100644 +--- a/include/linux/mm_types.h ++++ b/include/linux/mm_types.h @@ -183,6 +183,8 @@ struct vm_area_struct { #ifdef CONFIG_NUMA struct mempolicy *vm_policy; /* NUMA policy for the VMA */ @@ -55709,10 +56873,11 @@ diff -urNp linux-2.6.38.7/include/linux/mm_types.h linux-2.6.38.7/include/linux/ }; /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ -diff -urNp linux-2.6.38.7/include/linux/mmu_notifier.h linux-2.6.38.7/include/linux/mmu_notifier.h ---- linux-2.6.38.7/include/linux/mmu_notifier.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/mmu_notifier.h 2011-04-28 19:34:15.000000000 -0400 -@@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destr +diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h +index cc2e7df..a9690af 100644 +--- a/include/linux/mmu_notifier.h ++++ b/include/linux/mmu_notifier.h +@@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm) */ #define ptep_clear_flush_notify(__vma, __address, __ptep) \ ({ \ @@ -55728,9 +56893,10 @@ diff -urNp linux-2.6.38.7/include/linux/mmu_notifier.h linux-2.6.38.7/include/li }) #define pmdp_clear_flush_notify(__vma, __address, __pmdp) \ -diff -urNp linux-2.6.38.7/include/linux/mmzone.h linux-2.6.38.7/include/linux/mmzone.h ---- linux-2.6.38.7/include/linux/mmzone.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/mmzone.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h +index 02ecb01..547679a 100644 +--- a/include/linux/mmzone.h ++++ b/include/linux/mmzone.h @@ -355,7 +355,7 @@ struct zone { unsigned long flags; /* zone flags, see below */ @@ -55740,9 +56906,10 @@ diff -urNp linux-2.6.38.7/include/linux/mmzone.h linux-2.6.38.7/include/linux/mm /* * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on -diff -urNp linux-2.6.38.7/include/linux/mod_devicetable.h linux-2.6.38.7/include/linux/mod_devicetable.h ---- linux-2.6.38.7/include/linux/mod_devicetable.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/mod_devicetable.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h +index 48c007d..01960ea 100644 +--- a/include/linux/mod_devicetable.h ++++ b/include/linux/mod_devicetable.h @@ -12,7 +12,7 @@ typedef unsigned long kernel_ulong_t; #endif @@ -55761,9 +56928,10 @@ diff -urNp linux-2.6.38.7/include/linux/mod_devicetable.h linux-2.6.38.7/include struct hid_device_id { __u16 bus; -diff -urNp linux-2.6.38.7/include/linux/module.h linux-2.6.38.7/include/linux/module.h ---- linux-2.6.38.7/include/linux/module.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/module.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/module.h b/include/linux/module.h +index 5de4204..18967e3 100644 +--- a/include/linux/module.h ++++ b/include/linux/module.h @@ -324,19 +324,16 @@ struct module int (*init)(void); @@ -55788,7 +56956,7 @@ diff -urNp linux-2.6.38.7/include/linux/module.h linux-2.6.38.7/include/linux/mo /* Arch-specific module values */ struct mod_arch_specific arch; -@@ -441,16 +438,46 @@ bool is_module_address(unsigned long add +@@ -441,16 +438,46 @@ bool is_module_address(unsigned long addr); bool is_module_percpu_address(unsigned long addr); bool is_module_text_address(unsigned long addr); @@ -55839,10 +57007,11 @@ diff -urNp linux-2.6.38.7/include/linux/module.h linux-2.6.38.7/include/linux/mo } /* Search for module by name: must hold module_mutex. */ -diff -urNp linux-2.6.38.7/include/linux/moduleloader.h linux-2.6.38.7/include/linux/moduleloader.h ---- linux-2.6.38.7/include/linux/moduleloader.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/moduleloader.h 2011-04-28 19:34:15.000000000 -0400 -@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st +diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h +index c1f40c2..682ca53 100644 +--- a/include/linux/moduleloader.h ++++ b/include/linux/moduleloader.h +@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section); sections. Returns NULL on failure. */ void *module_alloc(unsigned long size); @@ -55864,10 +57033,11 @@ diff -urNp linux-2.6.38.7/include/linux/moduleloader.h linux-2.6.38.7/include/li /* Apply the given relocation to the (simplified) ELF. Return -error or 0. */ int apply_relocate(Elf_Shdr *sechdrs, -diff -urNp linux-2.6.38.7/include/linux/moduleparam.h linux-2.6.38.7/include/linux/moduleparam.h ---- linux-2.6.38.7/include/linux/moduleparam.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/moduleparam.h 2011-04-28 19:34:15.000000000 -0400 -@@ -255,7 +255,7 @@ static inline void __kernel_param_unlock +diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h +index 07b4195..882bf56 100644 +--- a/include/linux/moduleparam.h ++++ b/include/linux/moduleparam.h +@@ -255,7 +255,7 @@ static inline void __kernel_param_unlock(void) * @len is usually just sizeof(string). */ #define module_param_string(name, string, len, perm) \ @@ -55876,7 +57046,7 @@ diff -urNp linux-2.6.38.7/include/linux/moduleparam.h linux-2.6.38.7/include/lin = { len, string }; \ __module_param_call(MODULE_PARAM_PREFIX, name, \ ¶m_ops_string, \ -@@ -370,7 +370,7 @@ extern int param_get_invbool(char *buffe +@@ -370,7 +370,7 @@ extern int param_get_invbool(char *buffer, const struct kernel_param *kp); * module_param_named() for why this might be necessary. */ #define module_param_array_named(name, array, type, nump, perm) \ @@ -55885,9 +57055,10 @@ diff -urNp linux-2.6.38.7/include/linux/moduleparam.h linux-2.6.38.7/include/lin = { ARRAY_SIZE(array), nump, ¶m_ops_##type, \ sizeof(array[0]), array }; \ __module_param_call(MODULE_PARAM_PREFIX, name, \ -diff -urNp linux-2.6.38.7/include/linux/mutex.h linux-2.6.38.7/include/linux/mutex.h ---- linux-2.6.38.7/include/linux/mutex.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/mutex.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/mutex.h b/include/linux/mutex.h +index 94b48bd..c75471d 100644 +--- a/include/linux/mutex.h ++++ b/include/linux/mutex.h @@ -51,7 +51,7 @@ struct mutex { spinlock_t wait_lock; struct list_head wait_list; @@ -55897,9 +57068,10 @@ diff -urNp linux-2.6.38.7/include/linux/mutex.h linux-2.6.38.7/include/linux/mut #endif #ifdef CONFIG_DEBUG_MUTEXES const char *name; -diff -urNp linux-2.6.38.7/include/linux/namei.h linux-2.6.38.7/include/linux/namei.h ---- linux-2.6.38.7/include/linux/namei.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/namei.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/namei.h b/include/linux/namei.h +index f276d4f..e0b97b1 100644 +--- a/include/linux/namei.h ++++ b/include/linux/namei.h @@ -25,7 +25,7 @@ struct nameidata { unsigned seq; int last_type; @@ -55924,9 +57096,11 @@ diff -urNp linux-2.6.38.7/include/linux/namei.h linux-2.6.38.7/include/linux/nam { return nd->saved_names[nd->depth]; } -diff -urNp linux-2.6.38.7/include/linux/netfilter/xt_gradm.h linux-2.6.38.7/include/linux/netfilter/xt_gradm.h ---- linux-2.6.38.7/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/include/linux/netfilter/xt_gradm.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h +new file mode 100644 +index 0000000..33f4af8 +--- /dev/null ++++ b/include/linux/netfilter/xt_gradm.h @@ -0,0 +1,9 @@ +#ifndef _LINUX_NETFILTER_XT_GRADM_H +#define _LINUX_NETFILTER_XT_GRADM_H 1 @@ -55937,10 +57111,11 @@ diff -urNp linux-2.6.38.7/include/linux/netfilter/xt_gradm.h linux-2.6.38.7/incl +}; + +#endif -diff -urNp linux-2.6.38.7/include/linux/oprofile.h linux-2.6.38.7/include/linux/oprofile.h ---- linux-2.6.38.7/include/linux/oprofile.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/oprofile.h 2011-04-28 19:34:15.000000000 -0400 -@@ -132,9 +132,9 @@ int oprofilefs_create_ulong(struct super +diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h +index 1ca6411..a44b46d 100644 +--- a/include/linux/oprofile.h ++++ b/include/linux/oprofile.h +@@ -132,9 +132,9 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root, int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, char const * name, ulong * val); @@ -55952,9 +57127,10 @@ diff -urNp linux-2.6.38.7/include/linux/oprofile.h linux-2.6.38.7/include/linux/ /** create a directory */ struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, -diff -urNp linux-2.6.38.7/include/linux/padata.h linux-2.6.38.7/include/linux/padata.h ---- linux-2.6.38.7/include/linux/padata.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/padata.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/include/linux/padata.h b/include/linux/padata.h +index 4633b2f..988bc08 100644 +--- a/include/linux/padata.h ++++ b/include/linux/padata.h @@ -129,7 +129,7 @@ struct parallel_data { struct padata_instance *pinst; struct padata_parallel_queue __percpu *pqueue; @@ -55964,9 +57140,10 @@ diff -urNp linux-2.6.38.7/include/linux/padata.h linux-2.6.38.7/include/linux/pa atomic_t reorder_objects; atomic_t refcnt; unsigned int max_seq_nr; -diff -urNp linux-2.6.38.7/include/linux/perf_event.h linux-2.6.38.7/include/linux/perf_event.h ---- linux-2.6.38.7/include/linux/perf_event.h 2011-04-22 19:20:59.000000000 -0400 -+++ linux-2.6.38.7/include/linux/perf_event.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h +index a9bd9c0..c6ba5b7 100644 +--- a/include/linux/perf_event.h ++++ b/include/linux/perf_event.h @@ -732,8 +732,8 @@ struct perf_event { enum perf_event_active_state state; @@ -55989,9 +57166,10 @@ diff -urNp linux-2.6.38.7/include/linux/perf_event.h linux-2.6.38.7/include/linu /* * Protect attach/detach and child_list: -diff -urNp linux-2.6.38.7/include/linux/pipe_fs_i.h linux-2.6.38.7/include/linux/pipe_fs_i.h ---- linux-2.6.38.7/include/linux/pipe_fs_i.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/pipe_fs_i.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h +index 77257c9..51d473a 100644 +--- a/include/linux/pipe_fs_i.h ++++ b/include/linux/pipe_fs_i.h @@ -46,9 +46,9 @@ struct pipe_buffer { struct pipe_inode_info { wait_queue_head_t wait; @@ -56005,10 +57183,11 @@ diff -urNp linux-2.6.38.7/include/linux/pipe_fs_i.h linux-2.6.38.7/include/linux unsigned int r_counter; unsigned int w_counter; struct page *tmp_page; -diff -urNp linux-2.6.38.7/include/linux/pm_runtime.h linux-2.6.38.7/include/linux/pm_runtime.h ---- linux-2.6.38.7/include/linux/pm_runtime.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/pm_runtime.h 2011-04-28 19:34:15.000000000 -0400 -@@ -89,7 +89,7 @@ static inline bool pm_runtime_enabled(st +diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h +index d34f067..3bcebed 100644 +--- a/include/linux/pm_runtime.h ++++ b/include/linux/pm_runtime.h +@@ -89,7 +89,7 @@ static inline bool pm_runtime_enabled(struct device *dev) static inline void pm_runtime_mark_last_busy(struct device *dev) { @@ -56017,9 +57196,10 @@ diff -urNp linux-2.6.38.7/include/linux/pm_runtime.h linux-2.6.38.7/include/linu } #else /* !CONFIG_PM_RUNTIME */ -diff -urNp linux-2.6.38.7/include/linux/poison.h linux-2.6.38.7/include/linux/poison.h ---- linux-2.6.38.7/include/linux/poison.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/poison.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/poison.h b/include/linux/poison.h +index 2110a81..13a11bb 100644 +--- a/include/linux/poison.h ++++ b/include/linux/poison.h @@ -19,8 +19,8 @@ * under normal circumstances, used to verify that nobody uses * non-initialized list entries. @@ -56031,10 +57211,11 @@ diff -urNp linux-2.6.38.7/include/linux/poison.h linux-2.6.38.7/include/linux/po /********** include/linux/timer.h **********/ /* -diff -urNp linux-2.6.38.7/include/linux/proc_fs.h linux-2.6.38.7/include/linux/proc_fs.h ---- linux-2.6.38.7/include/linux/proc_fs.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/proc_fs.h 2011-04-28 19:34:15.000000000 -0400 -@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro +diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h +index 379eaed..3471a57 100644 +--- a/include/linux/proc_fs.h ++++ b/include/linux/proc_fs.h +@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *proc_create(const char *name, mode_t mode, return proc_create_data(name, mode, parent, proc_fops, NULL); } @@ -56054,10 +57235,11 @@ diff -urNp linux-2.6.38.7/include/linux/proc_fs.h linux-2.6.38.7/include/linux/p static inline struct proc_dir_entry *create_proc_read_entry(const char *name, mode_t mode, struct proc_dir_entry *base, read_proc_t *read_proc, void * data) -diff -urNp linux-2.6.38.7/include/linux/ptrace.h linux-2.6.38.7/include/linux/ptrace.h ---- linux-2.6.38.7/include/linux/ptrace.h 2011-05-22 23:05:20.000000000 -0400 -+++ linux-2.6.38.7/include/linux/ptrace.h 2011-05-22 23:06:04.000000000 -0400 -@@ -115,10 +115,10 @@ extern void __ptrace_unlink(struct task_ +diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h +index 9178d5c..ff0a136 100644 +--- a/include/linux/ptrace.h ++++ b/include/linux/ptrace.h +@@ -115,10 +115,10 @@ extern void __ptrace_unlink(struct task_struct *child); extern void exit_ptrace(struct task_struct *tracer); #define PTRACE_MODE_READ 1 #define PTRACE_MODE_ATTACH 2 @@ -56070,9 +57252,10 @@ diff -urNp linux-2.6.38.7/include/linux/ptrace.h linux-2.6.38.7/include/linux/pt static inline int ptrace_reparented(struct task_struct *child) { -diff -urNp linux-2.6.38.7/include/linux/random.h linux-2.6.38.7/include/linux/random.h ---- linux-2.6.38.7/include/linux/random.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/random.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/random.h b/include/linux/random.h +index fb7ab9d..262eb28 100644 +--- a/include/linux/random.h ++++ b/include/linux/random.h @@ -80,12 +80,17 @@ void srandom32(u32 seed); u32 prandom32(struct rnd_state *); @@ -56092,10 +57275,11 @@ diff -urNp linux-2.6.38.7/include/linux/random.h linux-2.6.38.7/include/linux/ra } /** -diff -urNp linux-2.6.38.7/include/linux/reboot.h linux-2.6.38.7/include/linux/reboot.h ---- linux-2.6.38.7/include/linux/reboot.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/reboot.h 2011-05-22 23:03:34.000000000 -0400 -@@ -47,9 +47,9 @@ extern int unregister_reboot_notifier(st +diff --git a/include/linux/reboot.h b/include/linux/reboot.h +index 3005d5a..77c2dba 100644 +--- a/include/linux/reboot.h ++++ b/include/linux/reboot.h +@@ -47,9 +47,9 @@ extern int unregister_reboot_notifier(struct notifier_block *); * Architecture-specific implementations of sys_reboot commands. */ @@ -56108,7 +57292,7 @@ diff -urNp linux-2.6.38.7/include/linux/reboot.h linux-2.6.38.7/include/linux/re extern void machine_shutdown(void); struct pt_regs; -@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struc +@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *); */ extern void kernel_restart_prepare(char *cmd); @@ -56130,10 +57314,11 @@ diff -urNp linux-2.6.38.7/include/linux/reboot.h linux-2.6.38.7/include/linux/re #include <asm/emergency-restart.h> #endif -diff -urNp linux-2.6.38.7/include/linux/reiserfs_fs.h linux-2.6.38.7/include/linux/reiserfs_fs.h ---- linux-2.6.38.7/include/linux/reiserfs_fs.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/reiserfs_fs.h 2011-04-28 19:34:15.000000000 -0400 -@@ -1403,7 +1403,7 @@ static inline loff_t max_reiserfs_offset +diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h +index c21072a..37d75a5 100644 +--- a/include/linux/reiserfs_fs.h ++++ b/include/linux/reiserfs_fs.h +@@ -1403,7 +1403,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode) #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter) @@ -56142,7 +57327,7 @@ diff -urNp linux-2.6.38.7/include/linux/reiserfs_fs.h linux-2.6.38.7/include/lin #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen) #define __fs_changed(gen,s) (gen != get_generation (s)) #define fs_changed(gen,s) \ -@@ -1615,24 +1615,24 @@ static inline struct super_block *sb_fro +@@ -1615,24 +1615,24 @@ static inline struct super_block *sb_from_bi(struct buffer_info *bi) */ struct item_operations { @@ -56179,9 +57364,10 @@ diff -urNp linux-2.6.38.7/include/linux/reiserfs_fs.h linux-2.6.38.7/include/lin #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize) -diff -urNp linux-2.6.38.7/include/linux/reiserfs_fs_sb.h linux-2.6.38.7/include/linux/reiserfs_fs_sb.h ---- linux-2.6.38.7/include/linux/reiserfs_fs_sb.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/reiserfs_fs_sb.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h +index 52c83b6..18ed7eb 100644 +--- a/include/linux/reiserfs_fs_sb.h ++++ b/include/linux/reiserfs_fs_sb.h @@ -386,7 +386,7 @@ struct reiserfs_sb_info { /* Comment? -Hans */ wait_queue_head_t s_wait; @@ -56191,10 +57377,11 @@ diff -urNp linux-2.6.38.7/include/linux/reiserfs_fs_sb.h linux-2.6.38.7/include/ // tree gets re-balanced unsigned long s_properties; /* File system properties. Currently holds on-disk FS format */ -diff -urNp linux-2.6.38.7/include/linux/rmap.h linux-2.6.38.7/include/linux/rmap.h ---- linux-2.6.38.7/include/linux/rmap.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/rmap.h 2011-04-28 19:34:15.000000000 -0400 -@@ -145,8 +145,8 @@ static inline void anon_vma_unlock(struc +diff --git a/include/linux/rmap.h b/include/linux/rmap.h +index e9fd04c..4aefe50 100644 +--- a/include/linux/rmap.h ++++ b/include/linux/rmap.h +@@ -145,8 +145,8 @@ static inline void anon_vma_unlock(struct anon_vma *anon_vma) void anon_vma_init(void); /* create anon_vma_cachep */ int anon_vma_prepare(struct vm_area_struct *); void unlink_anon_vmas(struct vm_area_struct *); @@ -56205,9 +57392,10 @@ diff -urNp linux-2.6.38.7/include/linux/rmap.h linux-2.6.38.7/include/linux/rmap void __anon_vma_link(struct vm_area_struct *); void anon_vma_free(struct anon_vma *); -diff -urNp linux-2.6.38.7/include/linux/sched.h linux-2.6.38.7/include/linux/sched.h ---- linux-2.6.38.7/include/linux/sched.h 2011-05-22 23:05:20.000000000 -0400 -+++ linux-2.6.38.7/include/linux/sched.h 2011-05-22 23:06:04.000000000 -0400 +diff --git a/include/linux/sched.h b/include/linux/sched.h +index d2a5da91..62799a6 100644 +--- a/include/linux/sched.h ++++ b/include/linux/sched.h @@ -99,6 +99,7 @@ struct robust_list_head; struct bio_list; struct fs_struct; @@ -56216,7 +57404,7 @@ diff -urNp linux-2.6.38.7/include/linux/sched.h linux-2.6.38.7/include/linux/sch /* * List of flags we want to share for kernel threads, -@@ -359,7 +360,7 @@ extern signed long schedule_timeout_inte +@@ -359,7 +360,7 @@ extern signed long schedule_timeout_interruptible(signed long timeout); extern signed long schedule_timeout_killable(signed long timeout); extern signed long schedule_timeout_uninterruptible(signed long timeout); asmlinkage void schedule(void); @@ -56419,7 +57607,7 @@ diff -urNp linux-2.6.38.7/include/linux/sched.h linux-2.6.38.7/include/linux/sch unsigned long stack[THREAD_SIZE/sizeof(long)]; }; -@@ -2175,7 +2275,7 @@ extern void __cleanup_sighand(struct sig +@@ -2175,7 +2275,7 @@ extern void __cleanup_sighand(struct sighand_struct *); extern void exit_itimers(struct signal_struct *); extern void flush_itimer_signals(void); @@ -56428,7 +57616,7 @@ diff -urNp linux-2.6.38.7/include/linux/sched.h linux-2.6.38.7/include/linux/sch extern void daemonize(const char *, ...); extern int allow_signal(int); -@@ -2316,13 +2416,17 @@ static inline unsigned long *end_of_stac +@@ -2316,13 +2416,17 @@ static inline unsigned long *end_of_stack(struct task_struct *p) #endif @@ -56448,9 +57636,10 @@ diff -urNp linux-2.6.38.7/include/linux/sched.h linux-2.6.38.7/include/linux/sch extern void thread_info_cache_init(void); #ifdef CONFIG_DEBUG_STACK_USAGE -diff -urNp linux-2.6.38.7/include/linux/screen_info.h linux-2.6.38.7/include/linux/screen_info.h ---- linux-2.6.38.7/include/linux/screen_info.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/screen_info.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h +index 899fbb4..1cb4138 100644 +--- a/include/linux/screen_info.h ++++ b/include/linux/screen_info.h @@ -43,7 +43,8 @@ struct screen_info { __u16 pages; /* 0x32 */ __u16 vesa_attributes; /* 0x34 */ @@ -56461,9 +57650,10 @@ diff -urNp linux-2.6.38.7/include/linux/screen_info.h linux-2.6.38.7/include/lin } __attribute__((packed)); #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ -diff -urNp linux-2.6.38.7/include/linux/security.h linux-2.6.38.7/include/linux/security.h ---- linux-2.6.38.7/include/linux/security.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/security.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/security.h b/include/linux/security.h +index b2b7f97..3ba03d9 100644 +--- a/include/linux/security.h ++++ b/include/linux/security.h @@ -35,6 +35,7 @@ #include <linux/key.h> #include <linux/xfrm.h> @@ -56472,10 +57662,11 @@ diff -urNp linux-2.6.38.7/include/linux/security.h linux-2.6.38.7/include/linux/ #include <net/flow.h> /* Maximum number of letters for an LSM name string */ -diff -urNp linux-2.6.38.7/include/linux/shm.h linux-2.6.38.7/include/linux/shm.h ---- linux-2.6.38.7/include/linux/shm.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/shm.h 2011-04-28 19:34:15.000000000 -0400 -@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke +diff --git a/include/linux/shm.h b/include/linux/shm.h +index eca6235..c7417ed 100644 +--- a/include/linux/shm.h ++++ b/include/linux/shm.h +@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the kernel */ pid_t shm_cprid; pid_t shm_lprid; struct user_struct *mlock_user; @@ -56486,10 +57677,11 @@ diff -urNp linux-2.6.38.7/include/linux/shm.h linux-2.6.38.7/include/linux/shm.h }; /* shm_mode upper byte flags */ -diff -urNp linux-2.6.38.7/include/linux/skbuff.h linux-2.6.38.7/include/linux/skbuff.h ---- linux-2.6.38.7/include/linux/skbuff.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/skbuff.h 2011-04-28 19:57:25.000000000 -0400 -@@ -589,7 +589,7 @@ static inline struct skb_shared_hwtstamp +diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h +index bf221d6..77434e4 100644 +--- a/include/linux/skbuff.h ++++ b/include/linux/skbuff.h +@@ -589,7 +589,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb) */ static inline int skb_queue_empty(const struct sk_buff_head *list) { @@ -56498,7 +57690,7 @@ diff -urNp linux-2.6.38.7/include/linux/skbuff.h linux-2.6.38.7/include/linux/sk } /** -@@ -602,7 +602,7 @@ static inline int skb_queue_empty(const +@@ -602,7 +602,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list) static inline bool skb_queue_is_last(const struct sk_buff_head *list, const struct sk_buff *skb) { @@ -56507,7 +57699,7 @@ diff -urNp linux-2.6.38.7/include/linux/skbuff.h linux-2.6.38.7/include/linux/sk } /** -@@ -615,7 +615,7 @@ static inline bool skb_queue_is_last(con +@@ -615,7 +615,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list, static inline bool skb_queue_is_first(const struct sk_buff_head *list, const struct sk_buff *skb) { @@ -56516,7 +57708,7 @@ diff -urNp linux-2.6.38.7/include/linux/skbuff.h linux-2.6.38.7/include/linux/sk } /** -@@ -1432,7 +1432,7 @@ static inline int pskb_network_may_pull( +@@ -1432,7 +1432,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len) * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) */ #ifndef NET_SKB_PAD @@ -56525,27 +57717,10 @@ diff -urNp linux-2.6.38.7/include/linux/skbuff.h linux-2.6.38.7/include/linux/sk #endif extern int ___pskb_trim(struct sk_buff *skb, unsigned int len); -diff -urNp linux-2.6.38.7/include/linux/slab_def.h linux-2.6.38.7/include/linux/slab_def.h ---- linux-2.6.38.7/include/linux/slab_def.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/slab_def.h 2011-04-28 19:57:25.000000000 -0400 -@@ -96,10 +96,10 @@ struct kmem_cache { - unsigned long node_allocs; - unsigned long node_frees; - unsigned long node_overflow; -- atomic_t allochit; -- atomic_t allocmiss; -- atomic_t freehit; -- atomic_t freemiss; -+ atomic_unchecked_t allochit; -+ atomic_unchecked_t allocmiss; -+ atomic_unchecked_t freehit; -+ atomic_unchecked_t freemiss; - - /* - * If debugging is enabled, then the allocator can add additional -diff -urNp linux-2.6.38.7/include/linux/slab.h linux-2.6.38.7/include/linux/slab.h ---- linux-2.6.38.7/include/linux/slab.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/slab.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/slab.h b/include/linux/slab.h +index fa90866..15a7c4c 100644 +--- a/include/linux/slab.h ++++ b/include/linux/slab.h @@ -11,12 +11,20 @@ #include <linux/gfp.h> @@ -56584,7 +57759,7 @@ diff -urNp linux-2.6.38.7/include/linux/slab.h linux-2.6.38.7/include/linux/slab /* * struct kmem_cache related prototypes -@@ -142,6 +153,7 @@ void * __must_check krealloc(const void +@@ -142,6 +153,7 @@ void * __must_check krealloc(const void *, size_t, gfp_t); void kfree(const void *); void kzfree(const void *); size_t ksize(const void *); @@ -56592,7 +57767,7 @@ diff -urNp linux-2.6.38.7/include/linux/slab.h linux-2.6.38.7/include/linux/slab /* * Allocator specific definitions. These are mainly used to establish optimized -@@ -334,4 +346,37 @@ static inline void *kzalloc_node(size_t +@@ -334,4 +346,37 @@ static inline void *kzalloc_node(size_t size, gfp_t flags, int node) void __init kmem_cache_init_late(void); @@ -56630,9 +57805,29 @@ diff -urNp linux-2.6.38.7/include/linux/slab.h linux-2.6.38.7/include/linux/slab +}) + #endif /* _LINUX_SLAB_H */ -diff -urNp linux-2.6.38.7/include/linux/slub_def.h linux-2.6.38.7/include/linux/slub_def.h ---- linux-2.6.38.7/include/linux/slub_def.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/slub_def.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h +index 83203ae..855726b 100644 +--- a/include/linux/slab_def.h ++++ b/include/linux/slab_def.h +@@ -96,10 +96,10 @@ struct kmem_cache { + unsigned long node_allocs; + unsigned long node_frees; + unsigned long node_overflow; +- atomic_t allochit; +- atomic_t allocmiss; +- atomic_t freehit; +- atomic_t freemiss; ++ atomic_unchecked_t allochit; ++ atomic_unchecked_t allocmiss; ++ atomic_unchecked_t freehit; ++ atomic_unchecked_t freemiss; + + /* + * If debugging is enabled, then the allocator can add additional +diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h +index 8b6e8ae..6c6a35b 100644 +--- a/include/linux/slub_def.h ++++ b/include/linux/slub_def.h @@ -79,7 +79,7 @@ struct kmem_cache { struct kmem_cache_order_objects max; struct kmem_cache_order_objects min; @@ -56642,9 +57837,10 @@ diff -urNp linux-2.6.38.7/include/linux/slub_def.h linux-2.6.38.7/include/linux/ void (*ctor)(void *); int inuse; /* Offset to metadata */ int align; /* Alignment */ -diff -urNp linux-2.6.38.7/include/linux/sonet.h linux-2.6.38.7/include/linux/sonet.h ---- linux-2.6.38.7/include/linux/sonet.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/sonet.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/sonet.h b/include/linux/sonet.h +index 67ad11f..0bbd8af 100644 +--- a/include/linux/sonet.h ++++ b/include/linux/sonet.h @@ -61,7 +61,7 @@ struct sonet_stats { #include <asm/atomic.h> @@ -56654,10 +57850,11 @@ diff -urNp linux-2.6.38.7/include/linux/sonet.h linux-2.6.38.7/include/linux/son __SONET_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.38.7/include/linux/sunrpc/clnt.h linux-2.6.38.7/include/linux/sunrpc/clnt.h ---- linux-2.6.38.7/include/linux/sunrpc/clnt.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/sunrpc/clnt.h 2011-04-28 19:34:15.000000000 -0400 -@@ -168,9 +168,9 @@ static inline unsigned short rpc_get_por +diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h +index ef9476a..78dc662 100644 +--- a/include/linux/sunrpc/clnt.h ++++ b/include/linux/sunrpc/clnt.h +@@ -168,9 +168,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap) { switch (sap->sa_family) { case AF_INET: @@ -56669,7 +57866,7 @@ diff -urNp linux-2.6.38.7/include/linux/sunrpc/clnt.h linux-2.6.38.7/include/lin } return 0; } -@@ -203,7 +203,7 @@ static inline bool __rpc_cmp_addr4(const +@@ -203,7 +203,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1, static inline bool __rpc_copy_addr4(struct sockaddr *dst, const struct sockaddr *src) { @@ -56678,7 +57875,7 @@ diff -urNp linux-2.6.38.7/include/linux/sunrpc/clnt.h linux-2.6.38.7/include/lin struct sockaddr_in *dsin = (struct sockaddr_in *) dst; dsin->sin_family = ssin->sin_family; -@@ -300,7 +300,7 @@ static inline u32 rpc_get_scope_id(const +@@ -300,7 +300,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa) if (sa->sa_family != AF_INET6) return 0; @@ -56687,9 +57884,10 @@ diff -urNp linux-2.6.38.7/include/linux/sunrpc/clnt.h linux-2.6.38.7/include/lin } #endif /* __KERNEL__ */ -diff -urNp linux-2.6.38.7/include/linux/sunrpc/svc_rdma.h linux-2.6.38.7/include/linux/sunrpc/svc_rdma.h ---- linux-2.6.38.7/include/linux/sunrpc/svc_rdma.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/sunrpc/svc_rdma.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h +index c14fe86..393245e 100644 +--- a/include/linux/sunrpc/svc_rdma.h ++++ b/include/linux/sunrpc/svc_rdma.h @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord; extern unsigned int svcrdma_max_requests; extern unsigned int svcrdma_max_req_size; @@ -56715,9 +57913,10 @@ diff -urNp linux-2.6.38.7/include/linux/sunrpc/svc_rdma.h linux-2.6.38.7/include #define RPCRDMA_VERSION 1 -diff -urNp linux-2.6.38.7/include/linux/suspend.h linux-2.6.38.7/include/linux/suspend.h ---- linux-2.6.38.7/include/linux/suspend.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/suspend.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/suspend.h b/include/linux/suspend.h +index 5a89e36..922adcc 100644 +--- a/include/linux/suspend.h ++++ b/include/linux/suspend.h @@ -106,15 +106,15 @@ typedef int __bitwise suspend_state_t; * which require special recovery actions in that situation. */ @@ -56743,7 +57942,7 @@ diff -urNp linux-2.6.38.7/include/linux/suspend.h linux-2.6.38.7/include/linux/s }; #ifdef CONFIG_SUSPEND -@@ -217,16 +217,16 @@ extern void mark_free_pages(struct zone +@@ -217,16 +217,16 @@ extern void mark_free_pages(struct zone *zone); * platforms which require special recovery actions in that situation. */ struct platform_hibernation_ops { @@ -56770,9 +57969,10 @@ diff -urNp linux-2.6.38.7/include/linux/suspend.h linux-2.6.38.7/include/linux/s }; #ifdef CONFIG_HIBERNATION -diff -urNp linux-2.6.38.7/include/linux/sysctl.h linux-2.6.38.7/include/linux/sysctl.h ---- linux-2.6.38.7/include/linux/sysctl.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/sysctl.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h +index 11684d9..0d245eb 100644 +--- a/include/linux/sysctl.h ++++ b/include/linux/sysctl.h @@ -155,7 +155,11 @@ enum KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ }; @@ -56786,7 +57986,7 @@ diff -urNp linux-2.6.38.7/include/linux/sysctl.h linux-2.6.38.7/include/linux/sy /* CTL_VM names: */ enum -@@ -967,6 +971,8 @@ typedef int proc_handler (struct ctl_tab +@@ -967,6 +971,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write, extern int proc_dostring(struct ctl_table *, int, void __user *, size_t *, loff_t *); @@ -56795,9 +57995,10 @@ diff -urNp linux-2.6.38.7/include/linux/sysctl.h linux-2.6.38.7/include/linux/sy extern int proc_dointvec(struct ctl_table *, int, void __user *, size_t *, loff_t *); extern int proc_dointvec_minmax(struct ctl_table *, int, -diff -urNp linux-2.6.38.7/include/linux/sysfs.h linux-2.6.38.7/include/linux/sysfs.h ---- linux-2.6.38.7/include/linux/sysfs.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/sysfs.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h +index 30b8815..a867952 100644 +--- a/include/linux/sysfs.h ++++ b/include/linux/sysfs.h @@ -110,8 +110,8 @@ struct bin_attribute { #define sysfs_bin_attr_init(bin_attr) sysfs_attr_init(&(bin_attr)->attr) @@ -56809,9 +58010,10 @@ diff -urNp linux-2.6.38.7/include/linux/sysfs.h linux-2.6.38.7/include/linux/sys }; struct sysfs_dirent; -diff -urNp linux-2.6.38.7/include/linux/tty.h linux-2.6.38.7/include/linux/tty.h ---- linux-2.6.38.7/include/linux/tty.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/tty.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/tty.h b/include/linux/tty.h +index 54e4eaa..f27f0fc 100644 +--- a/include/linux/tty.h ++++ b/include/linux/tty.h @@ -13,6 +13,8 @@ #include <linux/tty_driver.h> #include <linux/tty_ldisc.h> @@ -56821,7 +58023,7 @@ diff -urNp linux-2.6.38.7/include/linux/tty.h linux-2.6.38.7/include/linux/tty.h #include <asm/system.h> -@@ -465,7 +467,6 @@ extern int tty_perform_flush(struct tty_ +@@ -465,7 +467,6 @@ extern int tty_perform_flush(struct tty_struct *tty, unsigned long arg); extern dev_t tty_devnum(struct tty_struct *tty); extern void proc_clear_tty(struct task_struct *p); extern struct tty_struct *get_current_tty(void); @@ -56848,9 +58050,10 @@ diff -urNp linux-2.6.38.7/include/linux/tty.h linux-2.6.38.7/include/linux/tty.h /* n_tty.c */ extern struct tty_ldisc_ops tty_ldisc_N_TTY; -diff -urNp linux-2.6.38.7/include/linux/tty_ldisc.h linux-2.6.38.7/include/linux/tty_ldisc.h ---- linux-2.6.38.7/include/linux/tty_ldisc.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/tty_ldisc.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h +index ff7dc08..893e1bd 100644 +--- a/include/linux/tty_ldisc.h ++++ b/include/linux/tty_ldisc.h @@ -148,7 +148,7 @@ struct tty_ldisc_ops { struct module *owner; @@ -56860,9 +58063,10 @@ diff -urNp linux-2.6.38.7/include/linux/tty_ldisc.h linux-2.6.38.7/include/linux }; struct tty_ldisc { -diff -urNp linux-2.6.38.7/include/linux/types.h linux-2.6.38.7/include/linux/types.h ---- linux-2.6.38.7/include/linux/types.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/types.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/types.h b/include/linux/types.h +index c2a9eb4..03a71e9 100644 +--- a/include/linux/types.h ++++ b/include/linux/types.h @@ -207,10 +207,26 @@ typedef struct { int counter; } atomic_t; @@ -56890,10 +58094,11 @@ diff -urNp linux-2.6.38.7/include/linux/types.h linux-2.6.38.7/include/linux/typ #endif struct list_head { -diff -urNp linux-2.6.38.7/include/linux/uaccess.h linux-2.6.38.7/include/linux/uaccess.h ---- linux-2.6.38.7/include/linux/uaccess.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/uaccess.h 2011-04-28 19:34:15.000000000 -0400 -@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ +diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h +index d512d98..73371e8 100644 +--- a/include/linux/uaccess.h ++++ b/include/linux/uaccess.h +@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_user_nocache(void *to, long ret; \ mm_segment_t old_fs = get_fs(); \ \ @@ -56907,7 +58112,7 @@ diff -urNp linux-2.6.38.7/include/linux/uaccess.h linux-2.6.38.7/include/linux/u ret; \ }) -@@ -93,8 +93,8 @@ static inline unsigned long __copy_from_ +@@ -93,8 +93,8 @@ static inline unsigned long __copy_from_user_nocache(void *to, * Safely read from address @src to the buffer at @dst. If a kernel fault * happens, handle that and return -EFAULT. */ @@ -56918,7 +58123,7 @@ diff -urNp linux-2.6.38.7/include/linux/uaccess.h linux-2.6.38.7/include/linux/u /* * probe_kernel_write(): safely attempt to write to a location -@@ -105,7 +105,7 @@ extern long __probe_kernel_read(void *ds +@@ -105,7 +105,7 @@ extern long __probe_kernel_read(void *dst, void *src, size_t size); * Safely write to address @dst from the buffer at @src. If a kernel fault * happens, handle that and return -EFAULT. */ @@ -56928,9 +58133,10 @@ diff -urNp linux-2.6.38.7/include/linux/uaccess.h linux-2.6.38.7/include/linux/u +extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size); #endif /* __LINUX_UACCESS_H__ */ -diff -urNp linux-2.6.38.7/include/linux/unaligned/access_ok.h linux-2.6.38.7/include/linux/unaligned/access_ok.h ---- linux-2.6.38.7/include/linux/unaligned/access_ok.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/unaligned/access_ok.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h +index 99c1b4d..bb94261 100644 +--- a/include/linux/unaligned/access_ok.h ++++ b/include/linux/unaligned/access_ok.h @@ -6,32 +6,32 @@ static inline u16 get_unaligned_le16(const void *p) @@ -56970,9 +58176,10 @@ diff -urNp linux-2.6.38.7/include/linux/unaligned/access_ok.h linux-2.6.38.7/inc } static inline void put_unaligned_le16(u16 val, void *p) -diff -urNp linux-2.6.38.7/include/linux/usb/hcd.h linux-2.6.38.7/include/linux/usb/hcd.h ---- linux-2.6.38.7/include/linux/usb/hcd.h 2011-04-18 17:27:14.000000000 -0400 -+++ linux-2.6.38.7/include/linux/usb/hcd.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h +index f21f599..c6b2cc7 100644 +--- a/include/linux/usb/hcd.h ++++ b/include/linux/usb/hcd.h @@ -589,7 +589,7 @@ struct usb_mon_operations { /* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */ }; @@ -56982,7 +58189,7 @@ diff -urNp linux-2.6.38.7/include/linux/usb/hcd.h linux-2.6.38.7/include/linux/u static inline void usbmon_urb_submit(struct usb_bus *bus, struct urb *urb) { -@@ -611,7 +611,7 @@ static inline void usbmon_urb_complete(s +@@ -611,7 +611,7 @@ static inline void usbmon_urb_complete(struct usb_bus *bus, struct urb *urb, (*mon_ops->urb_complete)(bus, urb, status); } @@ -56991,10 +58198,11 @@ diff -urNp linux-2.6.38.7/include/linux/usb/hcd.h linux-2.6.38.7/include/linux/u void usb_mon_deregister(void); #else -diff -urNp linux-2.6.38.7/include/linux/vmalloc.h linux-2.6.38.7/include/linux/vmalloc.h ---- linux-2.6.38.7/include/linux/vmalloc.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/vmalloc.h 2011-04-28 19:34:15.000000000 -0400 -@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining +diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h +index 4ed6fcd..14f54ff 100644 +--- a/include/linux/vmalloc.h ++++ b/include/linux/vmalloc.h +@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */ #define VM_MAP 0x00000004 /* vmap()ed pages */ #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */ @@ -57006,7 +58214,7 @@ diff -urNp linux-2.6.38.7/include/linux/vmalloc.h linux-2.6.38.7/include/linux/v /* bits [20..32] reserved for arch specific ioremap internals */ /* -@@ -123,4 +128,103 @@ struct vm_struct **pcpu_get_vm_areas(con +@@ -123,4 +128,103 @@ struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets, void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms); #endif @@ -57110,10 +58318,11 @@ diff -urNp linux-2.6.38.7/include/linux/vmalloc.h linux-2.6.38.7/include/linux/v +}) + #endif /* _LINUX_VMALLOC_H */ -diff -urNp linux-2.6.38.7/include/linux/vmstat.h linux-2.6.38.7/include/linux/vmstat.h ---- linux-2.6.38.7/include/linux/vmstat.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/linux/vmstat.h 2011-04-28 19:34:15.000000000 -0400 -@@ -140,18 +140,18 @@ static inline void vm_events_fold_cpu(in +diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h +index 833e676..28d9d10 100644 +--- a/include/linux/vmstat.h ++++ b/include/linux/vmstat.h +@@ -140,18 +140,18 @@ static inline void vm_events_fold_cpu(int cpu) /* * Zone based page accounting with per cpu differentials. */ @@ -57136,7 +58345,7 @@ diff -urNp linux-2.6.38.7/include/linux/vmstat.h linux-2.6.38.7/include/linux/vm #ifdef CONFIG_SMP if (x < 0) x = 0; -@@ -162,7 +162,7 @@ static inline unsigned long global_page_ +@@ -162,7 +162,7 @@ static inline unsigned long global_page_state(enum zone_stat_item item) static inline unsigned long zone_page_state(struct zone *zone, enum zone_stat_item item) { @@ -57145,7 +58354,7 @@ diff -urNp linux-2.6.38.7/include/linux/vmstat.h linux-2.6.38.7/include/linux/vm #ifdef CONFIG_SMP if (x < 0) x = 0; -@@ -179,7 +179,7 @@ static inline unsigned long zone_page_st +@@ -179,7 +179,7 @@ static inline unsigned long zone_page_state(struct zone *zone, static inline unsigned long zone_page_state_snapshot(struct zone *zone, enum zone_stat_item item) { @@ -57154,7 +58363,7 @@ diff -urNp linux-2.6.38.7/include/linux/vmstat.h linux-2.6.38.7/include/linux/vm #ifdef CONFIG_SMP int cpu; -@@ -273,8 +273,8 @@ static inline void __mod_zone_page_state +@@ -273,8 +273,8 @@ static inline void __mod_zone_page_state(struct zone *zone, static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item) { @@ -57165,7 +58374,7 @@ diff -urNp linux-2.6.38.7/include/linux/vmstat.h linux-2.6.38.7/include/linux/vm } static inline void __inc_zone_page_state(struct page *page, -@@ -285,8 +285,8 @@ static inline void __inc_zone_page_state +@@ -285,8 +285,8 @@ static inline void __inc_zone_page_state(struct page *page, static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item) { @@ -57176,10 +58385,11 @@ diff -urNp linux-2.6.38.7/include/linux/vmstat.h linux-2.6.38.7/include/linux/vm } static inline void __dec_zone_page_state(struct page *page, -diff -urNp linux-2.6.38.7/include/media/v4l2-device.h linux-2.6.38.7/include/media/v4l2-device.h ---- linux-2.6.38.7/include/media/v4l2-device.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/media/v4l2-device.h 2011-04-28 19:57:25.000000000 -0400 -@@ -77,7 +77,7 @@ int __must_check v4l2_device_register(st +diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h +index b16f307..fdb36a4 100644 +--- a/include/media/v4l2-device.h ++++ b/include/media/v4l2-device.h +@@ -77,7 +77,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4 this function returns 0. If the name ends with a digit (e.g. cx18), then the name will be set to cx18-0 since cx180 looks really odd. */ int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename, @@ -57188,9 +58398,10 @@ diff -urNp linux-2.6.38.7/include/media/v4l2-device.h linux-2.6.38.7/include/med /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects. Since the parent disappears this ensures that v4l2_dev doesn't have an -diff -urNp linux-2.6.38.7/include/net/caif/cfctrl.h linux-2.6.38.7/include/net/caif/cfctrl.h ---- linux-2.6.38.7/include/net/caif/cfctrl.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/net/caif/cfctrl.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h +index e54f639..7dffc71 100644 +--- a/include/net/caif/cfctrl.h ++++ b/include/net/caif/cfctrl.h @@ -101,8 +101,8 @@ struct cfctrl_request_info { struct cfctrl { struct cfsrvl serv; @@ -57202,10 +58413,11 @@ diff -urNp linux-2.6.38.7/include/net/caif/cfctrl.h linux-2.6.38.7/include/net/c struct list_head list; /* Protects from simultaneous access to first_req list */ spinlock_t info_list_lock; -diff -urNp linux-2.6.38.7/include/net/flow.h linux-2.6.38.7/include/net/flow.h ---- linux-2.6.38.7/include/net/flow.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/net/flow.h 2011-04-28 19:57:25.000000000 -0400 -@@ -109,7 +109,7 @@ extern struct flow_cache_object *flow_ca +diff --git a/include/net/flow.h b/include/net/flow.h +index 240b7f3..4266618 100644 +--- a/include/net/flow.h ++++ b/include/net/flow.h +@@ -109,7 +109,7 @@ extern struct flow_cache_object *flow_cache_lookup( u8 dir, flow_resolve_t resolver, void *ctx); extern void flow_cache_flush(void); @@ -57214,9 +58426,10 @@ diff -urNp linux-2.6.38.7/include/net/flow.h linux-2.6.38.7/include/net/flow.h static inline int flow_cache_uli_match(struct flowi *fl1, struct flowi *fl2) { -diff -urNp linux-2.6.38.7/include/net/inetpeer.h linux-2.6.38.7/include/net/inetpeer.h ---- linux-2.6.38.7/include/net/inetpeer.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/net/inetpeer.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h +index 599d96e..1cb0341 100644 +--- a/include/net/inetpeer.h ++++ b/include/net/inetpeer.h @@ -38,8 +38,8 @@ struct inet_peer { */ union { @@ -57228,7 +58441,7 @@ diff -urNp linux-2.6.38.7/include/net/inetpeer.h linux-2.6.38.7/include/net/inet __u32 tcp_ts; __u32 tcp_ts_stamp; }; -@@ -88,7 +88,7 @@ static inline __u16 inet_getid(struct in +@@ -88,7 +88,7 @@ static inline __u16 inet_getid(struct inet_peer *p, int more) { more++; inet_peer_refcheck(p); @@ -57237,9 +58450,10 @@ diff -urNp linux-2.6.38.7/include/net/inetpeer.h linux-2.6.38.7/include/net/inet } #endif /* _NET_INETPEER_H */ -diff -urNp linux-2.6.38.7/include/net/ip_vs.h linux-2.6.38.7/include/net/ip_vs.h ---- linux-2.6.38.7/include/net/ip_vs.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/net/ip_vs.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h +index b7bbd6c..e11836e 100644 +--- a/include/net/ip_vs.h ++++ b/include/net/ip_vs.h @@ -404,7 +404,7 @@ struct ip_vs_conn { struct ip_vs_conn *control; /* Master control connection */ atomic_t n_control; /* Number of controlled ones */ @@ -57258,9 +58472,10 @@ diff -urNp linux-2.6.38.7/include/net/ip_vs.h linux-2.6.38.7/include/net/ip_vs.h atomic_t weight; /* server weight */ atomic_t refcnt; /* reference counter */ -diff -urNp linux-2.6.38.7/include/net/irda/ircomm_tty.h linux-2.6.38.7/include/net/irda/ircomm_tty.h ---- linux-2.6.38.7/include/net/irda/ircomm_tty.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/net/irda/ircomm_tty.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h +index eea2e61..08c692d 100644 +--- a/include/net/irda/ircomm_tty.h ++++ b/include/net/irda/ircomm_tty.h @@ -35,6 +35,7 @@ #include <linux/termios.h> #include <linux/timer.h> @@ -57280,9 +58495,10 @@ diff -urNp linux-2.6.38.7/include/net/irda/ircomm_tty.h linux-2.6.38.7/include/n /* Protect concurent access to : * o self->open_count -diff -urNp linux-2.6.38.7/include/net/iucv/af_iucv.h linux-2.6.38.7/include/net/iucv/af_iucv.h ---- linux-2.6.38.7/include/net/iucv/af_iucv.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/net/iucv/af_iucv.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h +index f82a1e8..82d81e8 100644 +--- a/include/net/iucv/af_iucv.h ++++ b/include/net/iucv/af_iucv.h @@ -87,7 +87,7 @@ struct iucv_sock { struct iucv_sock_list { struct hlist_head head; @@ -57292,9 +58508,10 @@ diff -urNp linux-2.6.38.7/include/net/iucv/af_iucv.h linux-2.6.38.7/include/net/ }; unsigned int iucv_sock_poll(struct file *file, struct socket *sock, -diff -urNp linux-2.6.38.7/include/net/neighbour.h linux-2.6.38.7/include/net/neighbour.h ---- linux-2.6.38.7/include/net/neighbour.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/net/neighbour.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/net/neighbour.h b/include/net/neighbour.h +index 4014b62..22feab1 100644 +--- a/include/net/neighbour.h ++++ b/include/net/neighbour.h @@ -118,12 +118,12 @@ struct neighbour { struct neigh_ops { @@ -57314,10 +58531,11 @@ diff -urNp linux-2.6.38.7/include/net/neighbour.h linux-2.6.38.7/include/net/nei }; struct pneigh_entry { -diff -urNp linux-2.6.38.7/include/net/netlink.h linux-2.6.38.7/include/net/netlink.h ---- linux-2.6.38.7/include/net/netlink.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/net/netlink.h 2011-04-28 19:34:15.000000000 -0400 -@@ -562,7 +562,7 @@ static inline void *nlmsg_get_pos(struct +diff --git a/include/net/netlink.h b/include/net/netlink.h +index 373f1a9..e1016e2 100644 +--- a/include/net/netlink.h ++++ b/include/net/netlink.h +@@ -562,7 +562,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb) static inline void nlmsg_trim(struct sk_buff *skb, const void *mark) { if (mark) @@ -57326,9 +58544,10 @@ diff -urNp linux-2.6.38.7/include/net/netlink.h linux-2.6.38.7/include/net/netli } /** -diff -urNp linux-2.6.38.7/include/net/netns/ipv4.h linux-2.6.38.7/include/net/netns/ipv4.h ---- linux-2.6.38.7/include/net/netns/ipv4.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/net/netns/ipv4.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h +index d68c3f1..698378f 100644 +--- a/include/net/netns/ipv4.h ++++ b/include/net/netns/ipv4.h @@ -55,7 +55,7 @@ struct netns_ipv4 { int sysctl_rt_cache_rebuild_count; int current_rt_cache_rebuild_count; @@ -57338,9 +58557,10 @@ diff -urNp linux-2.6.38.7/include/net/netns/ipv4.h linux-2.6.38.7/include/net/ne #ifdef CONFIG_IP_MROUTE #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES -diff -urNp linux-2.6.38.7/include/net/sctp/sctp.h linux-2.6.38.7/include/net/sctp/sctp.h ---- linux-2.6.38.7/include/net/sctp/sctp.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/net/sctp/sctp.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h +index 505845d..f2e8060 100644 +--- a/include/net/sctp/sctp.h ++++ b/include/net/sctp/sctp.h @@ -316,9 +316,9 @@ do { \ #else /* SCTP_DEBUG */ @@ -57354,9 +58574,10 @@ diff -urNp linux-2.6.38.7/include/net/sctp/sctp.h linux-2.6.38.7/include/net/sct #define SCTP_ENABLE_DEBUG #define SCTP_DISABLE_DEBUG #define SCTP_ASSERT(expr, str, func) -diff -urNp linux-2.6.38.7/include/net/sock.h linux-2.6.38.7/include/net/sock.h ---- linux-2.6.38.7/include/net/sock.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/net/sock.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/include/net/sock.h b/include/net/sock.h +index bc1cf7d8..c6abfb4 100644 +--- a/include/net/sock.h ++++ b/include/net/sock.h @@ -277,7 +277,7 @@ struct sock { #ifdef CONFIG_RPS __u32 sk_rxhash; @@ -57366,9 +58587,10 @@ diff -urNp linux-2.6.38.7/include/net/sock.h linux-2.6.38.7/include/net/sock.h int sk_rcvbuf; struct sk_filter __rcu *sk_filter; -diff -urNp linux-2.6.38.7/include/net/tcp.h linux-2.6.38.7/include/net/tcp.h ---- linux-2.6.38.7/include/net/tcp.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/net/tcp.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/net/tcp.h b/include/net/tcp.h +index 38509f0..ac3205f 100644 +--- a/include/net/tcp.h ++++ b/include/net/tcp.h @@ -1382,7 +1382,7 @@ enum tcp_seq_states { struct tcp_seq_afinfo { char *name; @@ -57378,9 +58600,10 @@ diff -urNp linux-2.6.38.7/include/net/tcp.h linux-2.6.38.7/include/net/tcp.h struct seq_operations seq_ops; }; -diff -urNp linux-2.6.38.7/include/net/udp.h linux-2.6.38.7/include/net/udp.h ---- linux-2.6.38.7/include/net/udp.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/net/udp.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/net/udp.h b/include/net/udp.h +index bb967dd..e47c5f7 100644 +--- a/include/net/udp.h ++++ b/include/net/udp.h @@ -223,7 +223,7 @@ struct udp_seq_afinfo { char *name; sa_family_t family; @@ -57390,9 +58613,10 @@ diff -urNp linux-2.6.38.7/include/net/udp.h linux-2.6.38.7/include/net/udp.h struct seq_operations seq_ops; }; -diff -urNp linux-2.6.38.7/include/net/xfrm.h linux-2.6.38.7/include/net/xfrm.h ---- linux-2.6.38.7/include/net/xfrm.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/net/xfrm.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/include/net/xfrm.h b/include/net/xfrm.h +index b9f385d..a29bd9c 100644 +--- a/include/net/xfrm.h ++++ b/include/net/xfrm.h @@ -484,7 +484,7 @@ struct xfrm_policy { struct timer_list timer; @@ -57402,9 +58626,10 @@ diff -urNp linux-2.6.38.7/include/net/xfrm.h linux-2.6.38.7/include/net/xfrm.h u32 priority; u32 index; struct xfrm_mark mark; -diff -urNp linux-2.6.38.7/include/scsi/scsi_device.h linux-2.6.38.7/include/scsi/scsi_device.h ---- linux-2.6.38.7/include/scsi/scsi_device.h 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/include/scsi/scsi_device.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h +index bfd36ff..a62ac9f 100644 +--- a/include/scsi/scsi_device.h ++++ b/include/scsi/scsi_device.h @@ -161,9 +161,9 @@ struct scsi_device { unsigned int max_device_blocked; /* what device_blocked counts down from */ #define SCSI_DEFAULT_DEVICE_BLOCKED 3 @@ -57418,9 +58643,10 @@ diff -urNp linux-2.6.38.7/include/scsi/scsi_device.h linux-2.6.38.7/include/scsi struct device sdev_gendev, sdev_dev; -diff -urNp linux-2.6.38.7/include/sound/ac97_codec.h linux-2.6.38.7/include/sound/ac97_codec.h ---- linux-2.6.38.7/include/sound/ac97_codec.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/sound/ac97_codec.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h +index b602f47..8c2c872 100644 +--- a/include/sound/ac97_codec.h ++++ b/include/sound/ac97_codec.h @@ -419,15 +419,15 @@ struct snd_ac97; @@ -57444,9 +58670,10 @@ diff -urNp linux-2.6.38.7/include/sound/ac97_codec.h linux-2.6.38.7/include/soun }; struct snd_ac97_bus_ops { -diff -urNp linux-2.6.38.7/include/sound/ymfpci.h linux-2.6.38.7/include/sound/ymfpci.h ---- linux-2.6.38.7/include/sound/ymfpci.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/sound/ymfpci.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h +index 444cd6b..3327cc5 100644 +--- a/include/sound/ymfpci.h ++++ b/include/sound/ymfpci.h @@ -358,7 +358,7 @@ struct snd_ymfpci { spinlock_t reg_lock; spinlock_t voice_lock; @@ -57456,10 +58683,11 @@ diff -urNp linux-2.6.38.7/include/sound/ymfpci.h linux-2.6.38.7/include/sound/ym struct snd_info_entry *proc_entry; const struct firmware *dsp_microcode; const struct firmware *controller_microcode; -diff -urNp linux-2.6.38.7/include/target/target_core_base.h linux-2.6.38.7/include/target/target_core_base.h ---- linux-2.6.38.7/include/target/target_core_base.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/target/target_core_base.h 2011-04-28 19:57:25.000000000 -0400 -@@ -431,8 +431,8 @@ struct se_transport_task { +diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h +index 95c9d98..b0ac7e9 100644 +--- a/include/target/target_core_base.h ++++ b/include/target/target_core_base.h +@@ -432,8 +432,8 @@ struct se_transport_task { atomic_t t_task_cdbs_left; atomic_t t_task_cdbs_ex_left; atomic_t t_task_cdbs_timeout_left; @@ -57470,7 +58698,7 @@ diff -urNp linux-2.6.38.7/include/target/target_core_base.h linux-2.6.38.7/inclu atomic_t t_transport_active; atomic_t t_transport_complete; atomic_t t_transport_queue_active; -@@ -753,7 +753,7 @@ struct se_device { +@@ -754,7 +754,7 @@ struct se_device { atomic_t active_cmds; atomic_t simple_cmds; atomic_t depth_left; @@ -57479,9 +58707,10 @@ diff -urNp linux-2.6.38.7/include/target/target_core_base.h linux-2.6.38.7/inclu atomic_t dev_tur_active; atomic_t execute_tasks; atomic_t dev_status_thr_count; -diff -urNp linux-2.6.38.7/include/trace/events/irq.h linux-2.6.38.7/include/trace/events/irq.h ---- linux-2.6.38.7/include/trace/events/irq.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/trace/events/irq.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h +index 1c09820..7f5ec79 100644 +--- a/include/trace/events/irq.h ++++ b/include/trace/events/irq.h @@ -36,7 +36,7 @@ struct softirq_action; */ TRACE_EVENT(irq_handler_entry, @@ -57500,9 +58729,10 @@ diff -urNp linux-2.6.38.7/include/trace/events/irq.h linux-2.6.38.7/include/trac TP_ARGS(irq, action, ret), -diff -urNp linux-2.6.38.7/include/video/udlfb.h linux-2.6.38.7/include/video/udlfb.h ---- linux-2.6.38.7/include/video/udlfb.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/video/udlfb.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/include/video/udlfb.h b/include/video/udlfb.h +index 69d485a..dd0bee7 100644 +--- a/include/video/udlfb.h ++++ b/include/video/udlfb.h @@ -51,10 +51,10 @@ struct dlfb_data { int base8; u32 pseudo_palette[256]; @@ -57518,9 +58748,10 @@ diff -urNp linux-2.6.38.7/include/video/udlfb.h linux-2.6.38.7/include/video/udl }; #define NR_USB_REQUEST_I2C_SUB_IO 0x02 -diff -urNp linux-2.6.38.7/include/video/uvesafb.h linux-2.6.38.7/include/video/uvesafb.h ---- linux-2.6.38.7/include/video/uvesafb.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/include/video/uvesafb.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h +index 0993a22..32ba2fe 100644 +--- a/include/video/uvesafb.h ++++ b/include/video/uvesafb.h @@ -177,6 +177,7 @@ struct uvesafb_par { u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ u8 pmi_setpal; /* PMI for palette changes */ @@ -57529,10 +58760,24 @@ diff -urNp linux-2.6.38.7/include/video/uvesafb.h linux-2.6.38.7/include/video/u void *pmi_start; void *pmi_pal; u8 *vbe_state_orig; /* -diff -urNp linux-2.6.38.7/init/do_mounts.c linux-2.6.38.7/init/do_mounts.c ---- linux-2.6.38.7/init/do_mounts.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/init/do_mounts.c 2011-04-28 19:34:15.000000000 -0400 -@@ -287,7 +287,7 @@ static void __init get_fs_names(char *pa +diff --git a/init/Kconfig b/init/Kconfig +index 47dd02f..37e5c40 100644 +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -1185,7 +1185,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 --git a/init/do_mounts.c b/init/do_mounts.c +index 2b54bef..0628a7c 100644 +--- a/init/do_mounts.c ++++ b/init/do_mounts.c +@@ -287,7 +287,7 @@ static void __init get_fs_names(char *page) static int __init do_mount_root(char *name, char *fs, int flags, void *data) { @@ -57541,7 +58786,7 @@ diff -urNp linux-2.6.38.7/init/do_mounts.c linux-2.6.38.7/init/do_mounts.c if (err) return err; -@@ -382,18 +382,18 @@ void __init change_floppy(char *fmt, ... +@@ -382,18 +382,18 @@ void __init change_floppy(char *fmt, ...) va_start(args, fmt); vsprintf(buf, fmt, args); va_end(args); @@ -57571,9 +58816,10 @@ diff -urNp linux-2.6.38.7/init/do_mounts.c linux-2.6.38.7/init/do_mounts.c + sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); sys_chroot((const char __user __force *)"."); } -diff -urNp linux-2.6.38.7/init/do_mounts.h linux-2.6.38.7/init/do_mounts.h ---- linux-2.6.38.7/init/do_mounts.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/init/do_mounts.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/init/do_mounts.h b/init/do_mounts.h +index f5b978a..1228092 100644 +--- a/init/do_mounts.h ++++ b/init/do_mounts.h @@ -15,15 +15,15 @@ extern int root_mountflags; static inline int create_dev(char *name, dev_t dev) @@ -57593,9 +58839,10 @@ diff -urNp linux-2.6.38.7/init/do_mounts.h linux-2.6.38.7/init/do_mounts.h return 0; if (!S_ISBLK(stat.st_mode)) return 0; -diff -urNp linux-2.6.38.7/init/do_mounts_initrd.c linux-2.6.38.7/init/do_mounts_initrd.c ---- linux-2.6.38.7/init/do_mounts_initrd.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/init/do_mounts_initrd.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c +index 3098a38..67a9120 100644 +--- a/init/do_mounts_initrd.c ++++ b/init/do_mounts_initrd.c @@ -44,13 +44,13 @@ static void __init handle_initrd(void) create_dev("/dev/root.old", Root_RAM0); /* mount initrd on rootfs' /root */ @@ -57670,9 +58917,10 @@ diff -urNp linux-2.6.38.7/init/do_mounts_initrd.c linux-2.6.38.7/init/do_mounts_ + sys_unlink((__force const char __user *)"/initrd.image"); return 0; } -diff -urNp linux-2.6.38.7/init/do_mounts_md.c linux-2.6.38.7/init/do_mounts_md.c ---- linux-2.6.38.7/init/do_mounts_md.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/init/do_mounts_md.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c +index 32c4799..b194786 100644 +--- a/init/do_mounts_md.c ++++ b/init/do_mounts_md.c @@ -170,7 +170,7 @@ static void __init md_setup_drive(void) partitioned ? "_d" : "", minor, md_setup_args[ent].device_names); @@ -57691,9 +58939,10 @@ diff -urNp linux-2.6.38.7/init/do_mounts_md.c linux-2.6.38.7/init/do_mounts_md.c sys_ioctl(fd, BLKRRPART, 0); } sys_close(fd); -diff -urNp linux-2.6.38.7/init/initramfs.c linux-2.6.38.7/init/initramfs.c ---- linux-2.6.38.7/init/initramfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/init/initramfs.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/init/initramfs.c b/init/initramfs.c +index 2531811..cd32f02 100644 +--- a/init/initramfs.c ++++ b/init/initramfs.c @@ -74,7 +74,7 @@ static void __init free_hash(void) } } @@ -57721,7 +58970,7 @@ diff -urNp linux-2.6.38.7/init/initramfs.c linux-2.6.38.7/init/initramfs.c } return 0; } -@@ -280,11 +280,11 @@ static void __init clean_path(char *path +@@ -280,11 +280,11 @@ static void __init clean_path(char *path, mode_t mode) { struct stat st; @@ -57802,22 +59051,11 @@ diff -urNp linux-2.6.38.7/init/initramfs.c linux-2.6.38.7/init/initramfs.c state = SkipIt; next_state = Reset; return 0; -diff -urNp linux-2.6.38.7/init/Kconfig linux-2.6.38.7/init/Kconfig ---- linux-2.6.38.7/init/Kconfig 2011-05-10 22:06:27.000000000 -0400 -+++ linux-2.6.38.7/init/Kconfig 2011-05-10 22:06:56.000000000 -0400 -@@ -1185,7 +1185,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.38.7/init/main.c linux-2.6.38.7/init/main.c ---- linux-2.6.38.7/init/main.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/init/main.c 2011-05-22 23:03:34.000000000 -0400 -@@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) +diff --git a/init/main.c b/init/main.c +index a7fcde2..78f0adc 100644 +--- a/init/main.c ++++ b/init/main.c +@@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) { } extern void tc_init(void); #endif @@ -57826,7 +59064,7 @@ diff -urNp linux-2.6.38.7/init/main.c linux-2.6.38.7/init/main.c /* * Debug helper: via this flag we know that we are in 'early bootup code' * where only the boot processor is running with IRQ disabled. This means -@@ -206,6 +208,49 @@ static int __init set_reset_devices(char +@@ -206,6 +208,49 @@ static int __init set_reset_devices(char *str) __setup("reset_devices", set_reset_devices); @@ -57876,7 +59114,7 @@ diff -urNp linux-2.6.38.7/init/main.c linux-2.6.38.7/init/main.c static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, }; const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, }; static const char *panic_later, *panic_param; -@@ -751,6 +796,7 @@ int __init_or_module do_one_initcall(ini +@@ -751,6 +796,7 @@ int __init_or_module do_one_initcall(initcall_t fn) { int count = preempt_count(); int ret; @@ -57884,7 +59122,7 @@ diff -urNp linux-2.6.38.7/init/main.c linux-2.6.38.7/init/main.c if (initcall_debug) ret = do_one_initcall_debug(fn); -@@ -763,15 +809,15 @@ int __init_or_module do_one_initcall(ini +@@ -763,15 +809,15 @@ int __init_or_module do_one_initcall(initcall_t fn) sprintf(msgbuf, "error code %d ", ret); if (preempt_count() != count) { @@ -57904,7 +59142,7 @@ diff -urNp linux-2.6.38.7/init/main.c linux-2.6.38.7/init/main.c } return ret; -@@ -898,7 +944,7 @@ static int __init kernel_init(void * unu +@@ -898,7 +944,7 @@ static int __init kernel_init(void * unused) do_basic_setup(); /* Open the /dev/console on the rootfs, this should never fail */ @@ -57913,7 +59151,7 @@ diff -urNp linux-2.6.38.7/init/main.c linux-2.6.38.7/init/main.c printk(KERN_WARNING "Warning: unable to open an initial console.\n"); (void) sys_dup(0); -@@ -911,11 +957,13 @@ static int __init kernel_init(void * unu +@@ -911,11 +957,13 @@ static int __init kernel_init(void * unused) if (!ramdisk_execute_command) ramdisk_execute_command = "/init"; @@ -57928,10 +59166,11 @@ diff -urNp linux-2.6.38.7/init/main.c linux-2.6.38.7/init/main.c /* * Ok, we have completed the initial bootup, and * we're essentially up and running. Get rid of the -diff -urNp linux-2.6.38.7/ipc/mqueue.c linux-2.6.38.7/ipc/mqueue.c ---- linux-2.6.38.7/ipc/mqueue.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/ipc/mqueue.c 2011-04-28 19:34:15.000000000 -0400 -@@ -154,6 +154,7 @@ static struct inode *mqueue_get_inode(st +diff --git a/ipc/mqueue.c b/ipc/mqueue.c +index 14fb6d6..dba3157 100644 +--- a/ipc/mqueue.c ++++ b/ipc/mqueue.c +@@ -154,6 +154,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb, mq_bytes = (mq_msg_tblsz + (info->attr.mq_maxmsg * info->attr.mq_msgsize)); @@ -57939,10 +59178,11 @@ diff -urNp linux-2.6.38.7/ipc/mqueue.c linux-2.6.38.7/ipc/mqueue.c spin_lock(&mq_lock); if (u->mq_bytes + mq_bytes < u->mq_bytes || u->mq_bytes + mq_bytes > -diff -urNp linux-2.6.38.7/ipc/sem.c linux-2.6.38.7/ipc/sem.c ---- linux-2.6.38.7/ipc/sem.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/ipc/sem.c 2011-05-16 21:47:08.000000000 -0400 -@@ -854,6 +854,8 @@ static int semctl_main(struct ipc_namesp +diff --git a/ipc/sem.c b/ipc/sem.c +index 0e0d49b..cc52a40 100644 +--- a/ipc/sem.c ++++ b/ipc/sem.c +@@ -854,6 +854,8 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum, int nsems; struct list_head tasks; @@ -57951,7 +59191,7 @@ diff -urNp linux-2.6.38.7/ipc/sem.c linux-2.6.38.7/ipc/sem.c sma = sem_lock_check(ns, semid); if (IS_ERR(sma)) return PTR_ERR(sma); -@@ -1299,6 +1301,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid, +@@ -1299,6 +1301,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops, struct ipc_namespace *ns; struct list_head tasks; @@ -57960,10 +59200,11 @@ diff -urNp linux-2.6.38.7/ipc/sem.c linux-2.6.38.7/ipc/sem.c ns = current->nsproxy->ipc_ns; if (nsops < 1 || semid < 0) -diff -urNp linux-2.6.38.7/ipc/shm.c linux-2.6.38.7/ipc/shm.c ---- linux-2.6.38.7/ipc/shm.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/ipc/shm.c 2011-04-28 19:34:15.000000000 -0400 -@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name +diff --git a/ipc/shm.c b/ipc/shm.c +index 7d3bb22..2fee7a1 100644 +--- a/ipc/shm.c ++++ b/ipc/shm.c +@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp); static int sysvipc_shm_proc_show(struct seq_file *s, void *it); #endif @@ -57978,7 +59219,7 @@ diff -urNp linux-2.6.38.7/ipc/shm.c linux-2.6.38.7/ipc/shm.c void shm_init_ns(struct ipc_namespace *ns) { ns->shm_ctlmax = SHMMAX; -@@ -401,6 +409,14 @@ static int newseg(struct ipc_namespace * +@@ -401,6 +409,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params) shp->shm_lprid = 0; shp->shm_atim = shp->shm_dtim = 0; shp->shm_ctim = get_seconds(); @@ -57993,7 +59234,7 @@ diff -urNp linux-2.6.38.7/ipc/shm.c linux-2.6.38.7/ipc/shm.c shp->shm_segsz = size; shp->shm_nattch = 0; shp->shm_file = file; -@@ -761,8 +777,6 @@ SYSCALL_DEFINE3(shmctl, int, shmid, int, +@@ -761,8 +777,6 @@ SYSCALL_DEFINE3(shmctl, int, shmid, int, cmd, struct shmid_ds __user *, buf) case SHM_LOCK: case SHM_UNLOCK: { @@ -58002,7 +59243,7 @@ diff -urNp linux-2.6.38.7/ipc/shm.c linux-2.6.38.7/ipc/shm.c lru_add_drain_all(); /* drain pagevecs to lru lists */ shp = shm_lock_check(ns, shmid); -@@ -895,9 +909,21 @@ long do_shmat(int shmid, char __user *sh +@@ -895,9 +909,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr) if (err) goto out_unlock; @@ -58024,10 +59265,11 @@ diff -urNp linux-2.6.38.7/ipc/shm.c linux-2.6.38.7/ipc/shm.c size = i_size_read(path.dentry->d_inode); shm_unlock(shp); -diff -urNp linux-2.6.38.7/kernel/acct.c linux-2.6.38.7/kernel/acct.c ---- linux-2.6.38.7/kernel/acct.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/acct.c 2011-04-28 19:34:15.000000000 -0400 -@@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a +diff --git a/kernel/acct.c b/kernel/acct.c +index fa7eb3d..60142a4 100644 +--- a/kernel/acct.c ++++ b/kernel/acct.c +@@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_acct_struct *acct, */ flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY; @@ -58036,9 +59278,10 @@ diff -urNp linux-2.6.38.7/kernel/acct.c linux-2.6.38.7/kernel/acct.c sizeof(acct_t), &file->f_pos); current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; set_fs(fs); -diff -urNp linux-2.6.38.7/kernel/audit.c linux-2.6.38.7/kernel/audit.c ---- linux-2.6.38.7/kernel/audit.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/audit.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/kernel/audit.c b/kernel/audit.c +index e495624..ac77e48 100644 +--- a/kernel/audit.c ++++ b/kernel/audit.c @@ -110,7 +110,7 @@ u32 audit_sig_sid = 0; 3) suppressed due to audit_rate_limit 4) suppressed due to audit_backlog_limit @@ -58066,7 +59309,7 @@ diff -urNp linux-2.6.38.7/kernel/audit.c linux-2.6.38.7/kernel/audit.c audit_rate_limit, audit_backlog_limit); audit_panic(message); -@@ -684,7 +684,7 @@ static int audit_receive_msg(struct sk_b +@@ -684,7 +684,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) status_set.pid = audit_pid; status_set.rate_limit = audit_rate_limit; status_set.backlog_limit = audit_backlog_limit; @@ -58075,10 +59318,11 @@ diff -urNp linux-2.6.38.7/kernel/audit.c linux-2.6.38.7/kernel/audit.c status_set.backlog = skb_queue_len(&audit_skb_queue); audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0, &status_set, sizeof(status_set)); -diff -urNp linux-2.6.38.7/kernel/auditsc.c linux-2.6.38.7/kernel/auditsc.c ---- linux-2.6.38.7/kernel/auditsc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/auditsc.c 2011-04-28 19:57:25.000000000 -0400 -@@ -2111,7 +2111,7 @@ int auditsc_get_stamp(struct audit_conte +diff --git a/kernel/auditsc.c b/kernel/auditsc.c +index f49a031..f47cd5a 100644 +--- a/kernel/auditsc.c ++++ b/kernel/auditsc.c +@@ -2111,7 +2111,7 @@ int auditsc_get_stamp(struct audit_context *ctx, } /* global counter which is incremented every time something logs in */ @@ -58087,7 +59331,7 @@ diff -urNp linux-2.6.38.7/kernel/auditsc.c linux-2.6.38.7/kernel/auditsc.c /** * audit_set_loginuid - set a task's audit_context loginuid -@@ -2124,7 +2124,7 @@ static atomic_t session_id = ATOMIC_INIT +@@ -2124,7 +2124,7 @@ static atomic_t session_id = ATOMIC_INIT(0); */ int audit_set_loginuid(struct task_struct *task, uid_t loginuid) { @@ -58096,10 +59340,11 @@ diff -urNp linux-2.6.38.7/kernel/auditsc.c linux-2.6.38.7/kernel/auditsc.c struct audit_context *context = task->audit_context; if (context && context->in_syscall) { -diff -urNp linux-2.6.38.7/kernel/capability.c linux-2.6.38.7/kernel/capability.c ---- linux-2.6.38.7/kernel/capability.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/capability.c 2011-04-28 19:34:15.000000000 -0400 -@@ -205,6 +205,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_ +diff --git a/kernel/capability.c b/kernel/capability.c +index 9e9385f..6e6d5e2 100644 +--- a/kernel/capability.c ++++ b/kernel/capability.c +@@ -205,6 +205,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr) * before modification is attempted and the application * fails. */ @@ -58137,9 +59382,10 @@ diff -urNp linux-2.6.38.7/kernel/capability.c linux-2.6.38.7/kernel/capability.c + EXPORT_SYMBOL(capable); +EXPORT_SYMBOL(capable_nolog); -diff -urNp linux-2.6.38.7/kernel/cgroup.c linux-2.6.38.7/kernel/cgroup.c ---- linux-2.6.38.7/kernel/cgroup.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.7/kernel/cgroup.c 2011-05-16 21:47:09.000000000 -0400 +diff --git a/kernel/cgroup.c b/kernel/cgroup.c +index bcc7336..c6e1be5 100644 +--- a/kernel/cgroup.c ++++ b/kernel/cgroup.c @@ -598,6 +598,8 @@ static struct css_set *find_css_set( struct hlist_head *hhead; struct cg_cgroup_link *link; @@ -58149,9 +59395,10 @@ diff -urNp linux-2.6.38.7/kernel/cgroup.c linux-2.6.38.7/kernel/cgroup.c /* First see if we already have a cgroup group that matches * the desired set */ read_lock(&css_set_lock); -diff -urNp linux-2.6.38.7/kernel/compat.c linux-2.6.38.7/kernel/compat.c ---- linux-2.6.38.7/kernel/compat.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/compat.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/kernel/compat.c b/kernel/compat.c +index c9e2ec0..7830f9b 100644 +--- a/kernel/compat.c ++++ b/kernel/compat.c @@ -13,6 +13,7 @@ #include <linux/linkage.h> @@ -58160,9 +59407,10 @@ diff -urNp linux-2.6.38.7/kernel/compat.c linux-2.6.38.7/kernel/compat.c #include <linux/errno.h> #include <linux/time.h> #include <linux/signal.h> -diff -urNp linux-2.6.38.7/kernel/configs.c linux-2.6.38.7/kernel/configs.c ---- linux-2.6.38.7/kernel/configs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/configs.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/kernel/configs.c b/kernel/configs.c +index b4066b4..c2e76b1 100644 +--- a/kernel/configs.c ++++ b/kernel/configs.c @@ -74,8 +74,19 @@ static int __init ikconfig_init(void) struct proc_dir_entry *entry; @@ -58183,10 +59431,11 @@ diff -urNp linux-2.6.38.7/kernel/configs.c linux-2.6.38.7/kernel/configs.c if (!entry) return -ENOMEM; -diff -urNp linux-2.6.38.7/kernel/cred.c linux-2.6.38.7/kernel/cred.c ---- linux-2.6.38.7/kernel/cred.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/cred.c 2011-05-17 19:31:43.000000000 -0400 -@@ -157,6 +157,8 @@ static void put_cred_rcu(struct rcu_head +diff --git a/kernel/cred.c b/kernel/cred.c +index 3a9d6dd..d99ac42 100644 +--- a/kernel/cred.c ++++ b/kernel/cred.c +@@ -157,6 +157,8 @@ static void put_cred_rcu(struct rcu_head *rcu) */ void __put_cred(struct cred *cred) { @@ -58204,7 +59453,7 @@ diff -urNp linux-2.6.38.7/kernel/cred.c linux-2.6.38.7/kernel/cred.c kdebug("exit_creds(%u,%p,%p,{%d,%d})", tsk->pid, tsk->real_cred, tsk->cred, atomic_read(&tsk->cred->usage), read_cred_subscribers(tsk->cred)); -@@ -219,6 +223,8 @@ const struct cred *get_task_cred(struct +@@ -219,6 +223,8 @@ const struct cred *get_task_cred(struct task_struct *task) { const struct cred *cred; @@ -58240,7 +59489,7 @@ diff -urNp linux-2.6.38.7/kernel/cred.c linux-2.6.38.7/kernel/cred.c #ifdef CONFIG_KEYS tgcred = kmalloc(sizeof(*tgcred), GFP_KERNEL); if (!tgcred) -@@ -384,6 +396,8 @@ int copy_creds(struct task_struct *p, un +@@ -384,6 +396,8 @@ int copy_creds(struct task_struct *p, unsigned long clone_flags) struct cred *new; int ret; @@ -58276,7 +59525,7 @@ diff -urNp linux-2.6.38.7/kernel/cred.c linux-2.6.38.7/kernel/cred.c kdebug("abort_creds(%p{%d,%d})", new, atomic_read(&new->usage), read_cred_subscribers(new)); -@@ -568,6 +588,8 @@ const struct cred *override_creds(const +@@ -568,6 +588,8 @@ const struct cred *override_creds(const struct cred *new) { const struct cred *old = current->cred; @@ -58285,7 +59534,7 @@ diff -urNp linux-2.6.38.7/kernel/cred.c linux-2.6.38.7/kernel/cred.c kdebug("override_creds(%p{%d,%d})", new, atomic_read(&new->usage), read_cred_subscribers(new)); -@@ -597,6 +619,8 @@ void revert_creds(const struct cred *old +@@ -597,6 +619,8 @@ void revert_creds(const struct cred *old) { const struct cred *override = current->cred; @@ -58294,7 +59543,7 @@ diff -urNp linux-2.6.38.7/kernel/cred.c linux-2.6.38.7/kernel/cred.c kdebug("revert_creds(%p{%d,%d})", old, atomic_read(&old->usage), read_cred_subscribers(old)); -@@ -643,6 +667,8 @@ struct cred *prepare_kernel_cred(struct +@@ -643,6 +667,8 @@ struct cred *prepare_kernel_cred(struct task_struct *daemon) const struct cred *old; struct cred *new; @@ -58312,7 +59561,7 @@ diff -urNp linux-2.6.38.7/kernel/cred.c linux-2.6.38.7/kernel/cred.c return security_kernel_act_as(new, secid); } EXPORT_SYMBOL(set_security_override); -@@ -716,6 +744,8 @@ int set_security_override_from_ctx(struc +@@ -716,6 +744,8 @@ int set_security_override_from_ctx(struct cred *new, const char *secctx) u32 secid; int ret; @@ -58321,9 +59570,10 @@ diff -urNp linux-2.6.38.7/kernel/cred.c linux-2.6.38.7/kernel/cred.c ret = security_secctx_to_secid(secctx, strlen(secctx), &secid); if (ret < 0) return ret; -diff -urNp linux-2.6.38.7/kernel/debug/debug_core.c linux-2.6.38.7/kernel/debug/debug_core.c ---- linux-2.6.38.7/kernel/debug/debug_core.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/debug/debug_core.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c +index cefd4a1..7a9d2b3 100644 +--- a/kernel/debug/debug_core.c ++++ b/kernel/debug/debug_core.c @@ -72,7 +72,7 @@ int kgdb_io_module_registered; /* Guard for recursive entry */ static int exception_level; @@ -58333,7 +59583,7 @@ diff -urNp linux-2.6.38.7/kernel/debug/debug_core.c linux-2.6.38.7/kernel/debug/ static DEFINE_SPINLOCK(kgdb_registration_lock); /* kgdb console driver is loaded */ -@@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_loc +@@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock); */ static atomic_t masters_in_kgdb; static atomic_t slaves_in_kgdb; @@ -58371,7 +59621,7 @@ diff -urNp linux-2.6.38.7/kernel/debug/debug_core.c linux-2.6.38.7/kernel/debug/ if (kgdb_info[sstep_cpu].task) kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid; else -@@ -834,18 +834,18 @@ static void kgdb_unregister_callbacks(vo +@@ -834,18 +834,18 @@ static void kgdb_unregister_callbacks(void) static void kgdb_tasklet_bpt(unsigned long ing) { kgdb_breakpoint(); @@ -58393,7 +59643,7 @@ diff -urNp linux-2.6.38.7/kernel/debug/debug_core.c linux-2.6.38.7/kernel/debug/ tasklet_schedule(&kgdb_tasklet_breakpoint); } EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint); -@@ -864,7 +864,7 @@ static void kgdb_initial_breakpoint(void +@@ -864,7 +864,7 @@ static void kgdb_initial_breakpoint(void) * * Register it with the KGDB core. */ @@ -58402,7 +59652,7 @@ diff -urNp linux-2.6.38.7/kernel/debug/debug_core.c linux-2.6.38.7/kernel/debug/ { int err; -@@ -909,7 +909,7 @@ EXPORT_SYMBOL_GPL(kgdb_register_io_modul +@@ -909,7 +909,7 @@ EXPORT_SYMBOL_GPL(kgdb_register_io_module); * * Unregister it with the KGDB core. */ @@ -58411,10 +59661,11 @@ diff -urNp linux-2.6.38.7/kernel/debug/debug_core.c linux-2.6.38.7/kernel/debug/ { BUG_ON(kgdb_connected); -diff -urNp linux-2.6.38.7/kernel/debug/kdb/kdb_main.c linux-2.6.38.7/kernel/debug/kdb/kdb_main.c ---- linux-2.6.38.7/kernel/debug/kdb/kdb_main.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/debug/kdb/kdb_main.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha +diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c +index bd3e8e2..bc52173 100644 +--- a/kernel/debug/kdb/kdb_main.c ++++ b/kernel/debug/kdb/kdb_main.c +@@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const char **argv) list_for_each_entry(mod, kdb_modules, list) { kdb_printf("%-20s%8u 0x%p ", mod->name, @@ -58423,7 +59674,7 @@ diff -urNp linux-2.6.38.7/kernel/debug/kdb/kdb_main.c linux-2.6.38.7/kernel/debu #ifdef CONFIG_MODULE_UNLOAD kdb_printf("%4d ", module_refcount(mod)); #endif -@@ -1990,7 +1990,7 @@ static int kdb_lsmod(int argc, const cha +@@ -1990,7 +1990,7 @@ static int kdb_lsmod(int argc, const char **argv) kdb_printf(" (Loading)"); else kdb_printf(" (Live)"); @@ -58432,9 +59683,10 @@ diff -urNp linux-2.6.38.7/kernel/debug/kdb/kdb_main.c linux-2.6.38.7/kernel/debu #ifdef CONFIG_MODULE_UNLOAD { -diff -urNp linux-2.6.38.7/kernel/exit.c linux-2.6.38.7/kernel/exit.c ---- linux-2.6.38.7/kernel/exit.c 2011-05-22 23:05:20.000000000 -0400 -+++ linux-2.6.38.7/kernel/exit.c 2011-05-22 23:06:04.000000000 -0400 +diff --git a/kernel/exit.c b/kernel/exit.c +index 557a348..e74d865 100644 +--- a/kernel/exit.c ++++ b/kernel/exit.c @@ -57,6 +57,10 @@ #include <asm/pgtable.h> #include <asm/mmu_context.h> @@ -58446,7 +59698,7 @@ diff -urNp linux-2.6.38.7/kernel/exit.c linux-2.6.38.7/kernel/exit.c static void exit_mm(struct task_struct * tsk); static void __unhash_process(struct task_struct *p, bool group_dead) -@@ -169,6 +173,8 @@ void release_task(struct task_struct * p +@@ -169,6 +173,8 @@ void release_task(struct task_struct * p) struct task_struct *leader; int zap_leader; repeat: @@ -58554,10 +59806,11 @@ diff -urNp linux-2.6.38.7/kernel/exit.c linux-2.6.38.7/kernel/exit.c exit_mm(tsk); if (group_dead) -diff -urNp linux-2.6.38.7/kernel/fork.c linux-2.6.38.7/kernel/fork.c ---- linux-2.6.38.7/kernel/fork.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/fork.c 2011-04-28 19:34:15.000000000 -0400 -@@ -280,7 +280,7 @@ static struct task_struct *dup_task_stru +diff --git a/kernel/fork.c b/kernel/fork.c +index 25e4291..ecb98e8 100644 +--- a/kernel/fork.c ++++ b/kernel/fork.c +@@ -280,7 +280,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig) *stackend = STACK_END_MAGIC; /* for overflow detection */ #ifdef CONFIG_CC_STACKPROTECTOR @@ -58647,7 +59900,7 @@ diff -urNp linux-2.6.38.7/kernel/fork.c linux-2.6.38.7/kernel/fork.c down_write(&oldmm->mmap_sem); flush_cache_dup_mm(oldmm); -@@ -320,8 +385,8 @@ static int dup_mmap(struct mm_struct *mm +@@ -320,8 +385,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) mm->locked_vm = 0; mm->mmap = NULL; mm->mmap_cache = NULL; @@ -58658,7 +59911,7 @@ diff -urNp linux-2.6.38.7/kernel/fork.c linux-2.6.38.7/kernel/fork.c mm->map_count = 0; cpumask_clear(mm_cpumask(mm)); mm->mm_rb = RB_ROOT; -@@ -337,8 +402,6 @@ static int dup_mmap(struct mm_struct *mm +@@ -337,8 +402,6 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) prev = NULL; for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) { @@ -58667,7 +59920,7 @@ diff -urNp linux-2.6.38.7/kernel/fork.c linux-2.6.38.7/kernel/fork.c if (mpnt->vm_flags & VM_DONTCOPY) { long pages = vma_pages(mpnt); mm->total_vm -= pages; -@@ -346,56 +409,13 @@ static int dup_mmap(struct mm_struct *mm +@@ -346,56 +409,13 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) -pages); continue; } @@ -58728,7 +59981,7 @@ diff -urNp linux-2.6.38.7/kernel/fork.c linux-2.6.38.7/kernel/fork.c * Link in the new vma and copy the page table entries. */ *pprev = tmp; -@@ -416,6 +436,31 @@ static int dup_mmap(struct mm_struct *mm +@@ -416,6 +436,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) if (retval) goto out; } @@ -58775,7 +60028,7 @@ diff -urNp linux-2.6.38.7/kernel/fork.c linux-2.6.38.7/kernel/fork.c } static inline int mm_alloc_pgd(struct mm_struct * mm) -@@ -778,13 +815,14 @@ static int copy_fs(unsigned long clone_f +@@ -778,13 +815,14 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk) spin_unlock(&fs->lock); return -EAGAIN; } @@ -58791,7 +60044,7 @@ diff -urNp linux-2.6.38.7/kernel/fork.c linux-2.6.38.7/kernel/fork.c return 0; } -@@ -1042,10 +1080,13 @@ static struct task_struct *copy_process( +@@ -1042,10 +1080,13 @@ static struct task_struct *copy_process(unsigned long clone_flags, DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); #endif retval = -EAGAIN; @@ -58807,7 +60060,7 @@ diff -urNp linux-2.6.38.7/kernel/fork.c linux-2.6.38.7/kernel/fork.c goto bad_fork_free; } -@@ -1199,6 +1240,8 @@ static struct task_struct *copy_process( +@@ -1199,6 +1240,8 @@ static struct task_struct *copy_process(unsigned long clone_flags, goto bad_fork_free_pid; } @@ -58834,7 +60087,7 @@ diff -urNp linux-2.6.38.7/kernel/fork.c linux-2.6.38.7/kernel/fork.c if (clone_flags & CLONE_VFORK) { p->vfork_done = &vfork; init_completion(&vfork); -@@ -1559,7 +1606,7 @@ static int unshare_fs(unsigned long unsh +@@ -1559,7 +1606,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp) return 0; /* don't need lock here; in the worst case we'll do useless copy */ @@ -58843,7 +60096,7 @@ diff -urNp linux-2.6.38.7/kernel/fork.c linux-2.6.38.7/kernel/fork.c return 0; *new_fsp = copy_fs_struct(fs); -@@ -1682,7 +1729,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, +@@ -1682,7 +1729,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) fs = current->fs; spin_lock(&fs->lock); current->fs = new_fs; @@ -58853,9 +60106,10 @@ diff -urNp linux-2.6.38.7/kernel/fork.c linux-2.6.38.7/kernel/fork.c new_fs = NULL; else new_fs = fs; -diff -urNp linux-2.6.38.7/kernel/futex.c linux-2.6.38.7/kernel/futex.c ---- linux-2.6.38.7/kernel/futex.c 2011-04-22 19:20:59.000000000 -0400 -+++ linux-2.6.38.7/kernel/futex.c 2011-05-16 21:47:08.000000000 -0400 +diff --git a/kernel/futex.c b/kernel/futex.c +index d5065e8..6c02591 100644 +--- a/kernel/futex.c ++++ b/kernel/futex.c @@ -54,6 +54,7 @@ #include <linux/mount.h> #include <linux/pagemap.h> @@ -58864,7 +60118,7 @@ diff -urNp linux-2.6.38.7/kernel/futex.c linux-2.6.38.7/kernel/futex.c #include <linux/signal.h> #include <linux/module.h> #include <linux/magic.h> -@@ -236,6 +237,11 @@ get_futex_key(u32 __user *uaddr, int fsh +@@ -236,6 +237,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key) struct page *page, *page_head; int err; @@ -58876,7 +60130,7 @@ diff -urNp linux-2.6.38.7/kernel/futex.c linux-2.6.38.7/kernel/futex.c /* * The futex address must be "naturally" aligned. */ -@@ -1833,6 +1839,8 @@ static int futex_wait(u32 __user *uaddr, +@@ -1833,6 +1839,8 @@ static int futex_wait(u32 __user *uaddr, unsigned int flags, u32 val, struct futex_q q = futex_q_init; int ret; @@ -58885,7 +60139,7 @@ diff -urNp linux-2.6.38.7/kernel/futex.c linux-2.6.38.7/kernel/futex.c if (!bitset) return -EINVAL; q.bitset = bitset; -@@ -2232,6 +2240,8 @@ static int futex_wait_requeue_pi(u32 __u +@@ -2232,6 +2240,8 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, struct futex_q q = futex_q_init; int res, ret; @@ -58894,7 +60148,7 @@ diff -urNp linux-2.6.38.7/kernel/futex.c linux-2.6.38.7/kernel/futex.c if (!bitset) return -EINVAL; -@@ -2404,7 +2414,9 @@ SYSCALL_DEFINE3(get_robust_list, int, pi +@@ -2404,7 +2414,9 @@ SYSCALL_DEFINE3(get_robust_list, int, pid, { struct robust_list_head __user *head; unsigned long ret; @@ -58904,7 +60158,7 @@ diff -urNp linux-2.6.38.7/kernel/futex.c linux-2.6.38.7/kernel/futex.c if (!futex_cmpxchg_enabled) return -ENOSYS; -@@ -2420,11 +2432,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pi +@@ -2420,11 +2432,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pid, if (!p) goto err_unlock; ret = -EPERM; @@ -58940,9 +60194,10 @@ diff -urNp linux-2.6.38.7/kernel/futex.c linux-2.6.38.7/kernel/futex.c if (curval == -EFAULT) futex_cmpxchg_enabled = 1; -diff -urNp linux-2.6.38.7/kernel/futex_compat.c linux-2.6.38.7/kernel/futex_compat.c ---- linux-2.6.38.7/kernel/futex_compat.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/futex_compat.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c +index a7934ac..d21ff12 100644 +--- a/kernel/futex_compat.c ++++ b/kernel/futex_compat.c @@ -10,6 +10,7 @@ #include <linux/compat.h> #include <linux/nsproxy.h> @@ -58951,7 +60206,7 @@ diff -urNp linux-2.6.38.7/kernel/futex_compat.c linux-2.6.38.7/kernel/futex_comp #include <asm/uaccess.h> -@@ -136,7 +137,10 @@ compat_sys_get_robust_list(int pid, comp +@@ -136,7 +137,10 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr, { struct compat_robust_list_head __user *head; unsigned long ret; @@ -58963,7 +60218,7 @@ diff -urNp linux-2.6.38.7/kernel/futex_compat.c linux-2.6.38.7/kernel/futex_comp if (!futex_cmpxchg_enabled) return -ENOSYS; -@@ -152,11 +156,16 @@ compat_sys_get_robust_list(int pid, comp +@@ -152,11 +156,16 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr, if (!p) goto err_unlock; ret = -EPERM; @@ -58980,9 +60235,10 @@ diff -urNp linux-2.6.38.7/kernel/futex_compat.c linux-2.6.38.7/kernel/futex_comp head = p->compat_robust_list; rcu_read_unlock(); } -diff -urNp linux-2.6.38.7/kernel/gcov/base.c linux-2.6.38.7/kernel/gcov/base.c ---- linux-2.6.38.7/kernel/gcov/base.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/gcov/base.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c +index 9b22d03..6295b62 100644 +--- a/kernel/gcov/base.c ++++ b/kernel/gcov/base.c @@ -102,11 +102,6 @@ void gcov_enable_events(void) } @@ -58995,7 +60251,7 @@ diff -urNp linux-2.6.38.7/kernel/gcov/base.c linux-2.6.38.7/kernel/gcov/base.c /* Update list and generate events when modules are unloaded. */ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event, void *data) -@@ -121,7 +116,7 @@ static int gcov_module_notifier(struct n +@@ -121,7 +116,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event, prev = NULL; /* Remove entries located in module from linked list. */ for (info = gcov_info_head; info; info = info->next) { @@ -59004,9 +60260,10 @@ diff -urNp linux-2.6.38.7/kernel/gcov/base.c linux-2.6.38.7/kernel/gcov/base.c if (prev) prev->next = info->next; else -diff -urNp linux-2.6.38.7/kernel/hrtimer.c linux-2.6.38.7/kernel/hrtimer.c ---- linux-2.6.38.7/kernel/hrtimer.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/hrtimer.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c +index 0c8d7c0..c25dfe5 100644 +--- a/kernel/hrtimer.c ++++ b/kernel/hrtimer.c @@ -1371,7 +1371,7 @@ void hrtimer_peek_ahead_timers(void) local_irq_restore(flags); } @@ -59016,9 +60273,10 @@ diff -urNp linux-2.6.38.7/kernel/hrtimer.c linux-2.6.38.7/kernel/hrtimer.c { hrtimer_peek_ahead_timers(); } -diff -urNp linux-2.6.38.7/kernel/jump_label.c linux-2.6.38.7/kernel/jump_label.c ---- linux-2.6.38.7/kernel/jump_label.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/jump_label.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/kernel/jump_label.c b/kernel/jump_label.c +index 3b79bd9..c8b0bf9 100644 +--- a/kernel/jump_label.c ++++ b/kernel/jump_label.c @@ -49,6 +49,17 @@ void jump_label_unlock(void) mutex_unlock(&jump_label_mutex); } @@ -59037,7 +60295,7 @@ diff -urNp linux-2.6.38.7/kernel/jump_label.c linux-2.6.38.7/kernel/jump_label.c static int jump_label_cmp(const void *a, const void *b) { const struct jump_entry *jea = a; -@@ -70,7 +81,7 @@ sort_jump_label_entries(struct jump_entr +@@ -70,7 +81,7 @@ sort_jump_label_entries(struct jump_entry *start, struct jump_entry *stop) size = (((unsigned long)stop - (unsigned long)start) / sizeof(struct jump_entry)); @@ -59046,7 +60304,7 @@ diff -urNp linux-2.6.38.7/kernel/jump_label.c linux-2.6.38.7/kernel/jump_label.c } static struct jump_label_entry *get_jump_label_entry(jump_label_t key) -@@ -407,8 +418,11 @@ static void remove_jump_label_module_ini +@@ -407,8 +418,11 @@ static void remove_jump_label_module_init(struct module *mod) count = e_module->nr_entries; iter = e_module->table; while (count--) { @@ -59059,9 +60317,10 @@ diff -urNp linux-2.6.38.7/kernel/jump_label.c linux-2.6.38.7/kernel/jump_label.c iter++; } } -diff -urNp linux-2.6.38.7/kernel/kallsyms.c linux-2.6.38.7/kernel/kallsyms.c ---- linux-2.6.38.7/kernel/kallsyms.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/kallsyms.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c +index 6f6d091..b3aaa18 100644 +--- a/kernel/kallsyms.c ++++ b/kernel/kallsyms.c @@ -11,6 +11,9 @@ * Changed the compression method from stem compression to "table lookup" * compression (see scripts/kallsyms.c for a more complete description) @@ -59072,7 +60331,7 @@ diff -urNp linux-2.6.38.7/kernel/kallsyms.c linux-2.6.38.7/kernel/kallsyms.c #include <linux/kallsyms.h> #include <linux/module.h> #include <linux/init.h> -@@ -53,12 +56,33 @@ extern const unsigned long kallsyms_mark +@@ -53,12 +56,33 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak)); static inline int is_kernel_inittext(unsigned long addr) { @@ -59106,7 +60365,7 @@ diff -urNp linux-2.6.38.7/kernel/kallsyms.c linux-2.6.38.7/kernel/kallsyms.c static inline int is_kernel_text(unsigned long addr) { if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) || -@@ -69,13 +93,28 @@ static inline int is_kernel_text(unsigne +@@ -69,13 +93,28 @@ static inline int is_kernel_text(unsigned long addr) static inline int is_kernel(unsigned long addr) { @@ -59135,7 +60394,7 @@ diff -urNp linux-2.6.38.7/kernel/kallsyms.c linux-2.6.38.7/kernel/kallsyms.c if (all_var) return is_kernel(addr); -@@ -416,7 +455,6 @@ static unsigned long get_ksymbol_core(st +@@ -416,7 +455,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter) static void reset_iter(struct kallsym_iter *iter, loff_t new_pos) { @@ -59143,7 +60402,7 @@ diff -urNp linux-2.6.38.7/kernel/kallsyms.c linux-2.6.38.7/kernel/kallsyms.c iter->nameoff = get_symbol_offset(new_pos); iter->pos = new_pos; } -@@ -464,6 +502,11 @@ static int s_show(struct seq_file *m, vo +@@ -464,6 +502,11 @@ static int s_show(struct seq_file *m, void *p) { struct kallsym_iter *iter = m->private; @@ -59155,7 +60414,7 @@ diff -urNp linux-2.6.38.7/kernel/kallsyms.c linux-2.6.38.7/kernel/kallsyms.c /* Some debugging symbols have no name. Ignore them. */ if (!iter->name[0]) return 0; -@@ -504,7 +547,7 @@ static int kallsyms_open(struct inode *i +@@ -504,7 +547,7 @@ static int kallsyms_open(struct inode *inode, struct file *file) struct kallsym_iter *iter; int ret; @@ -59164,10 +60423,11 @@ diff -urNp linux-2.6.38.7/kernel/kallsyms.c linux-2.6.38.7/kernel/kallsyms.c if (!iter) return -ENOMEM; reset_iter(iter, 0); -diff -urNp linux-2.6.38.7/kernel/kmod.c linux-2.6.38.7/kernel/kmod.c ---- linux-2.6.38.7/kernel/kmod.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/kmod.c 2011-04-28 19:34:15.000000000 -0400 -@@ -65,13 +65,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sb +diff --git a/kernel/kmod.c b/kernel/kmod.c +index 9cd0591..c778d07 100644 +--- a/kernel/kmod.c ++++ b/kernel/kmod.c +@@ -65,13 +65,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sbin/modprobe"; * If module auto-loading support is disabled then this function * becomes a no-operation. */ @@ -59183,7 +60443,7 @@ diff -urNp linux-2.6.38.7/kernel/kmod.c linux-2.6.38.7/kernel/kmod.c static char *envp[] = { "HOME=/", "TERM=linux", "PATH=/sbin:/usr/sbin:/bin:/usr/bin", -@@ -80,9 +79,7 @@ int __request_module(bool wait, const ch +@@ -80,9 +79,7 @@ int __request_module(bool wait, const char *fmt, ...) #define MAX_KMOD_CONCURRENT 50 /* Completely arbitrary value - KAO */ static int kmod_loop_msg; @@ -59194,7 +60454,7 @@ diff -urNp linux-2.6.38.7/kernel/kmod.c linux-2.6.38.7/kernel/kmod.c if (ret >= MODULE_NAME_LEN) return -ENAMETOOLONG; -@@ -90,6 +87,20 @@ int __request_module(bool wait, const ch +@@ -90,6 +87,20 @@ int __request_module(bool wait, const char *fmt, ...) if (ret) return ret; @@ -59215,7 +60475,7 @@ diff -urNp linux-2.6.38.7/kernel/kmod.c linux-2.6.38.7/kernel/kmod.c /* 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 -@@ -123,6 +134,47 @@ int __request_module(bool wait, const ch +@@ -123,6 +134,47 @@ int __request_module(bool wait, const char *fmt, ...) atomic_dec(&kmod_concurrent); return ret; } @@ -59263,10 +60523,11 @@ diff -urNp linux-2.6.38.7/kernel/kmod.c linux-2.6.38.7/kernel/kmod.c EXPORT_SYMBOL(__request_module); #endif /* CONFIG_MODULES */ -diff -urNp linux-2.6.38.7/kernel/kprobes.c linux-2.6.38.7/kernel/kprobes.c ---- linux-2.6.38.7/kernel/kprobes.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/kprobes.c 2011-04-28 19:34:15.000000000 -0400 -@@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_ +diff --git a/kernel/kprobes.c b/kernel/kprobes.c +index 7798181..2fcc39d 100644 +--- a/kernel/kprobes.c ++++ b/kernel/kprobes.c +@@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_insn_slot(struct kprobe_insn_cache *c) * kernel image and loaded module images reside. This is required * so x86_64 can correctly handle the %rip-relative fixups. */ @@ -59275,7 +60536,7 @@ diff -urNp linux-2.6.38.7/kernel/kprobes.c linux-2.6.38.7/kernel/kprobes.c if (!kip->insns) { kfree(kip); return NULL; -@@ -225,7 +225,7 @@ static int __kprobes collect_one_slot(st +@@ -225,7 +225,7 @@ static int __kprobes collect_one_slot(struct kprobe_insn_page *kip, int idx) */ if (!list_is_singular(&kip->list)) { list_del(&kip->list); @@ -59293,7 +60554,7 @@ diff -urNp linux-2.6.38.7/kernel/kprobes.c linux-2.6.38.7/kernel/kprobes.c const char *symbol_name; void *addr; struct kprobe_blackpoint *kb; -@@ -2062,7 +2062,7 @@ static int __kprobes show_kprobe_addr(st +@@ -2062,7 +2062,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v) const char *sym = NULL; unsigned int i = *(loff_t *) v; unsigned long offset = 0; @@ -59302,9 +60563,10 @@ diff -urNp linux-2.6.38.7/kernel/kprobes.c linux-2.6.38.7/kernel/kprobes.c head = &kprobe_table[i]; preempt_disable(); -diff -urNp linux-2.6.38.7/kernel/lockdep.c linux-2.6.38.7/kernel/lockdep.c ---- linux-2.6.38.7/kernel/lockdep.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/lockdep.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/kernel/lockdep.c b/kernel/lockdep.c +index 0d2058d..2cadb2c 100644 +--- a/kernel/lockdep.c ++++ b/kernel/lockdep.c @@ -571,6 +571,10 @@ static int static_obj(void *obj) end = (unsigned long) &_end, addr = (unsigned long) obj; @@ -59316,7 +60578,7 @@ diff -urNp linux-2.6.38.7/kernel/lockdep.c linux-2.6.38.7/kernel/lockdep.c /* * static variable? */ -@@ -706,6 +710,7 @@ register_lock_class(struct lockdep_map * +@@ -706,6 +710,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force) if (!static_obj(lock->key)) { debug_locks_off(); printk("INFO: trying to register non-static key.\n"); @@ -59324,7 +60586,7 @@ diff -urNp linux-2.6.38.7/kernel/lockdep.c linux-2.6.38.7/kernel/lockdep.c printk("the code is fine but needs lockdep annotation.\n"); printk("turning off the locking correctness validator.\n"); dump_stack(); -@@ -2752,7 +2757,7 @@ static int __lock_acquire(struct lockdep +@@ -2752,7 +2757,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass, if (!class) return 0; } @@ -59333,10 +60595,11 @@ diff -urNp linux-2.6.38.7/kernel/lockdep.c linux-2.6.38.7/kernel/lockdep.c if (very_verbose(class)) { printk("\nacquire class [%p] %s", class->key, class->name); if (class->name_version > 1) -diff -urNp linux-2.6.38.7/kernel/lockdep_proc.c linux-2.6.38.7/kernel/lockdep_proc.c ---- linux-2.6.38.7/kernel/lockdep_proc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/lockdep_proc.c 2011-04-28 19:34:15.000000000 -0400 -@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v +diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c +index 1969d2f..8741134 100644 +--- a/kernel/lockdep_proc.c ++++ b/kernel/lockdep_proc.c +@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, void *v) static void print_name(struct seq_file *m, struct lock_class *class) { @@ -59345,9 +60608,10 @@ diff -urNp linux-2.6.38.7/kernel/lockdep_proc.c linux-2.6.38.7/kernel/lockdep_pr const char *name = class->name; if (!name) { -diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c ---- linux-2.6.38.7/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/module.c 2011-04-29 18:46:41.000000000 -0400 +diff --git a/kernel/module.c b/kernel/module.c +index efa290e..f687dc4 100644 +--- a/kernel/module.c ++++ b/kernel/module.c @@ -57,6 +57,7 @@ #include <linux/kmemleak.h> #include <linux/jump_label.h> @@ -59356,7 +60620,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c #define CREATE_TRACE_POINTS #include <trace/events/module.h> -@@ -118,7 +119,8 @@ static BLOCKING_NOTIFIER_HEAD(module_not +@@ -118,7 +119,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list); /* Bounds of module allocation, for speeding __module_address. * Protected by module_mutex. */ @@ -59366,7 +60630,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c int register_module_notifier(struct notifier_block * nb) { -@@ -282,7 +284,7 @@ bool each_symbol(bool (*fn)(const struct +@@ -282,7 +284,7 @@ bool each_symbol(bool (*fn)(const struct symsearch *arr, struct module *owner, return true; list_for_each_entry_rcu(mod, &modules, list) { @@ -59375,7 +60639,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c { mod->syms, mod->syms + mod->num_syms, mod->crcs, NOT_GPL_ONLY, false }, { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms, -@@ -304,7 +306,7 @@ bool each_symbol(bool (*fn)(const struct +@@ -304,7 +306,7 @@ bool each_symbol(bool (*fn)(const struct symsearch *arr, struct module *owner, #endif }; @@ -59384,7 +60648,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c return true; } return false; -@@ -415,7 +417,7 @@ static inline void __percpu *mod_percpu( +@@ -415,7 +417,7 @@ static inline void __percpu *mod_percpu(struct module *mod) static int percpu_modalloc(struct module *mod, unsigned long size, unsigned long align) { @@ -59402,7 +60666,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c static inline bool sect_empty(const Elf_Shdr *sect) { return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0; -@@ -1612,17 +1614,17 @@ void unset_section_ro_nx(struct module * +@@ -1612,17 +1614,17 @@ void unset_section_ro_nx(struct module *mod, void *module_region) { unsigned long total_pages; @@ -59470,7 +60734,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c set_memory_ro); } } -@@ -1696,17 +1698,20 @@ static void free_module(struct module *m +@@ -1696,17 +1698,20 @@ static void free_module(struct module *mod) destroy_params(mod->kp, mod->num_kp); /* This may be NULL, but that's OK */ @@ -59496,7 +60760,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c #ifdef CONFIG_MPU update_protections(current->mm); -@@ -1775,10 +1780,31 @@ static int simplify_symbols(struct modul +@@ -1775,10 +1780,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info) unsigned int i; int ret = 0; const struct kernel_symbol *ksym; @@ -59528,7 +60792,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c switch (sym[i].st_shndx) { case SHN_COMMON: /* We compiled with -fno-common. These are not -@@ -1799,7 +1825,9 @@ static int simplify_symbols(struct modul +@@ -1799,7 +1825,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info) ksym = resolve_symbol_wait(mod, info, name); /* Ok if resolved. */ if (ksym && !IS_ERR(ksym)) { @@ -59538,7 +60802,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c break; } -@@ -1818,11 +1846,20 @@ static int simplify_symbols(struct modul +@@ -1818,11 +1846,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info) secbase = (unsigned long)mod_percpu(mod); else secbase = info->sechdrs[sym[i].st_shndx].sh_addr; @@ -59559,7 +60823,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c return ret; } -@@ -1906,22 +1943,12 @@ static void layout_sections(struct modul +@@ -1906,22 +1943,12 @@ static void layout_sections(struct module *mod, struct load_info *info) || s->sh_entsize != ~0UL || strstarts(sname, ".init")) continue; @@ -59586,7 +60850,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c } DEBUGP("Init section allocation order:\n"); -@@ -1935,23 +1962,13 @@ static void layout_sections(struct modul +@@ -1935,23 +1962,13 @@ static void layout_sections(struct module *mod, struct load_info *info) || s->sh_entsize != ~0UL || !strstarts(sname, ".init")) continue; @@ -59615,7 +60879,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c } } -@@ -2119,7 +2136,7 @@ static void layout_symtab(struct module +@@ -2119,7 +2136,7 @@ static void layout_symtab(struct module *mod, struct load_info *info) /* Put symbol section at end of init part of module. */ symsect->sh_flags |= SHF_ALLOC; @@ -59624,7 +60888,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c info->index.sym) | INIT_OFFSET_MASK; DEBUGP("\t%s\n", info->secstrings + symsect->sh_name); -@@ -2136,19 +2153,19 @@ static void layout_symtab(struct module +@@ -2136,19 +2153,19 @@ static void layout_symtab(struct module *mod, struct load_info *info) } /* Append room for core symbols at end of core part. */ @@ -59649,7 +60913,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c } static void add_kallsyms(struct module *mod, const struct load_info *info) -@@ -2164,11 +2181,13 @@ static void add_kallsyms(struct module * +@@ -2164,11 +2181,13 @@ static void add_kallsyms(struct module *mod, const struct load_info *info) /* Make sure we get permanent strtab: don't use info->strtab. */ mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr; @@ -59664,7 +60928,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c src = mod->symtab; *dst = *src; for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) { -@@ -2181,10 +2200,12 @@ static void add_kallsyms(struct module * +@@ -2181,10 +2200,12 @@ static void add_kallsyms(struct module *mod, const struct load_info *info) } mod->core_num_syms = ndst; @@ -59678,7 +60942,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c } #else static inline void layout_symtab(struct module *mod, struct load_info *info) -@@ -2213,17 +2234,33 @@ static void dynamic_debug_remove(struct +@@ -2213,17 +2234,33 @@ static void dynamic_debug_remove(struct _ddebug *debug) ddebug_remove_module(debug->modname); } @@ -59717,7 +60981,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c mutex_unlock(&module_mutex); } return ret; -@@ -2516,7 +2553,7 @@ static int move_module(struct module *mo +@@ -2516,7 +2553,7 @@ static int move_module(struct module *mod, struct load_info *info) void *ptr; /* Do the allocs. */ @@ -59726,7 +60990,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c /* * The pointer to this block is stored in the module structure * which is inside the block. Just mark it as not being a -@@ -2526,23 +2563,50 @@ static int move_module(struct module *mo +@@ -2526,23 +2563,50 @@ static int move_module(struct module *mod, struct load_info *info) if (!ptr) return -ENOMEM; @@ -59785,7 +61049,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c /* Transfer each section which specifies SHF_ALLOC */ DEBUGP("final section addresses:\n"); -@@ -2553,16 +2617,45 @@ static int move_module(struct module *mo +@@ -2553,16 +2617,45 @@ static int move_module(struct module *mod, struct load_info *info) if (!(shdr->sh_flags & SHF_ALLOC)) continue; @@ -59838,7 +61102,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c DEBUGP("\t0x%lx %s\n", shdr->sh_addr, info->secstrings + shdr->sh_name); } -@@ -2613,12 +2706,12 @@ static void flush_module_icache(const st +@@ -2613,12 +2706,12 @@ static void flush_module_icache(const struct module *mod) * Do it before processing of module parameters, so the module * can provide parameter accessor functions of its own. */ @@ -59857,7 +61121,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c set_fs(old_fs); } -@@ -2690,8 +2783,10 @@ static void module_deallocate(struct mod +@@ -2690,8 +2783,10 @@ static void module_deallocate(struct module *mod, struct load_info *info) { kfree(info->strmap); percpu_modfree(mod); @@ -59870,7 +61134,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c } static int post_relocation(struct module *mod, const struct load_info *info) -@@ -2748,9 +2843,38 @@ static struct module *load_module(void _ +@@ -2748,9 +2843,38 @@ static struct module *load_module(void __user *umod, if (err) goto free_unload; @@ -59909,7 +61173,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c /* Fix up syms, so that st_value is a pointer to location. */ err = simplify_symbols(mod, &info); if (err < 0) -@@ -2766,13 +2890,6 @@ static struct module *load_module(void _ +@@ -2766,13 +2890,6 @@ static struct module *load_module(void __user *umod, flush_module_icache(mod); @@ -59923,7 +61187,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c /* Mark state as coming so strong_try_module_get() ignores us. */ mod->state = MODULE_STATE_COMING; -@@ -2832,11 +2949,10 @@ static struct module *load_module(void _ +@@ -2832,11 +2949,10 @@ static struct module *load_module(void __user *umod, unlock: mutex_unlock(&module_mutex); synchronize_sched(); @@ -59936,7 +61200,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c free_unload: module_unload_free(mod); free_module: -@@ -2877,16 +2993,16 @@ SYSCALL_DEFINE3(init_module, void __user +@@ -2877,16 +2993,16 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, MODULE_STATE_COMING, mod); /* Set RO and NX regions for core */ @@ -59961,7 +61225,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c do_mod_ctors(mod); /* Start the module */ -@@ -2931,11 +3047,13 @@ SYSCALL_DEFINE3(init_module, void __user +@@ -2931,11 +3047,13 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, mod->symtab = mod->core_symtab; mod->strtab = mod->core_strtab; #endif @@ -59980,7 +61244,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c mutex_unlock(&module_mutex); return 0; -@@ -2966,10 +3084,16 @@ static const char *get_ksymbol(struct mo +@@ -2966,10 +3084,16 @@ static const char *get_ksymbol(struct module *mod, unsigned long nextval; /* At worse, next value is at end of module */ @@ -60000,7 +61264,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c /* Scan for closest preceeding symbol, and next symbol. (ELF starts real symbols at 1). */ -@@ -3215,7 +3339,7 @@ static int m_show(struct seq_file *m, vo +@@ -3215,7 +3339,7 @@ static int m_show(struct seq_file *m, void *p) char buf[8]; seq_printf(m, "%s %u", @@ -60009,7 +61273,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c print_unload_info(m, mod); /* Informative for users. */ -@@ -3224,7 +3348,7 @@ static int m_show(struct seq_file *m, vo +@@ -3224,7 +3348,7 @@ static int m_show(struct seq_file *m, void *p) mod->state == MODULE_STATE_COMING ? "Loading": "Live"); /* Used by oprofile and other similar tools. */ @@ -60018,7 +61282,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c /* Taints info */ if (mod->taints) -@@ -3260,7 +3384,17 @@ static const struct file_operations proc +@@ -3260,7 +3384,17 @@ static const struct file_operations proc_modules_operations = { static int __init proc_modules_init(void) { @@ -60036,7 +61300,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c return 0; } module_init(proc_modules_init); -@@ -3319,12 +3453,12 @@ struct module *__module_address(unsigned +@@ -3319,12 +3453,12 @@ struct module *__module_address(unsigned long addr) { struct module *mod; @@ -60052,7 +61316,7 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c return mod; return NULL; } -@@ -3358,11 +3492,20 @@ bool is_module_text_address(unsigned lon +@@ -3358,11 +3492,20 @@ bool is_module_text_address(unsigned long addr) */ struct module *__module_text_address(unsigned long addr) { @@ -60076,50 +61340,11 @@ diff -urNp linux-2.6.38.7/kernel/module.c linux-2.6.38.7/kernel/module.c mod = NULL; } return mod; -diff -urNp linux-2.6.38.7/kernel/mutex.c linux-2.6.38.7/kernel/mutex.c ---- linux-2.6.38.7/kernel/mutex.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/mutex.c 2011-05-22 13:38:03.000000000 -0400 -@@ -160,7 +160,7 @@ __mutex_lock_common(struct mutex *lock, - */ - - for (;;) { -- struct thread_info *owner; -+ struct task_struct *owner; - - /* - * If we own the BKL, then don't spin. The owner of -@@ -205,7 +205,7 @@ __mutex_lock_common(struct mutex *lock, - spin_lock_mutex(&lock->wait_lock, flags); - - debug_mutex_lock_common(lock, &waiter); -- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task)); -+ debug_mutex_add_waiter(lock, &waiter, task); - - /* add waiting tasks to the end of the waitqueue (FIFO): */ - list_add_tail(&waiter.list, &lock->wait_list); -@@ -234,8 +234,7 @@ __mutex_lock_common(struct mutex *lock, - * TASK_UNINTERRUPTIBLE case.) - */ - if (unlikely(signal_pending_state(state, task))) { -- mutex_remove_waiter(lock, &waiter, -- task_thread_info(task)); -+ mutex_remove_waiter(lock, &waiter, task); - mutex_release(&lock->dep_map, 1, ip); - spin_unlock_mutex(&lock->wait_lock, flags); - -@@ -256,7 +255,7 @@ __mutex_lock_common(struct mutex *lock, - done: - lock_acquired(&lock->dep_map, ip); - /* got the lock - rejoice! */ -- mutex_remove_waiter(lock, &waiter, current_thread_info()); -+ mutex_remove_waiter(lock, &waiter, task); - mutex_set_owner(lock); - - /* set it to 0 if there are no waiters left: */ -diff -urNp linux-2.6.38.7/kernel/mutex-debug.c linux-2.6.38.7/kernel/mutex-debug.c ---- linux-2.6.38.7/kernel/mutex-debug.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/mutex-debug.c 2011-05-22 13:31:07.000000000 -0400 -@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute +diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c +index ec815a9..fe46e99 100644 +--- a/kernel/mutex-debug.c ++++ b/kernel/mutex-debug.c +@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter) } void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter, @@ -60147,7 +61372,7 @@ diff -urNp linux-2.6.38.7/kernel/mutex-debug.c linux-2.6.38.7/kernel/mutex-debug list_del_init(&waiter->list); waiter->task = NULL; -@@ -75,7 +75,7 @@ void debug_mutex_unlock(struct mutex *lo +@@ -75,7 +75,7 @@ void debug_mutex_unlock(struct mutex *lock) return; DEBUG_LOCKS_WARN_ON(lock->magic != lock); @@ -60156,10 +61381,11 @@ diff -urNp linux-2.6.38.7/kernel/mutex-debug.c linux-2.6.38.7/kernel/mutex-debug DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next); mutex_clear_owner(lock); } -diff -urNp linux-2.6.38.7/kernel/mutex-debug.h linux-2.6.38.7/kernel/mutex-debug.h ---- linux-2.6.38.7/kernel/mutex-debug.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/mutex-debug.h 2011-04-28 19:34:15.000000000 -0400 -@@ -20,16 +20,16 @@ extern void debug_mutex_wake_waiter(stru +diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h +index 57d527a..d06ae3b 100644 +--- a/kernel/mutex-debug.h ++++ b/kernel/mutex-debug.h +@@ -20,16 +20,16 @@ extern void debug_mutex_wake_waiter(struct mutex *lock, extern void debug_mutex_free_waiter(struct mutex_waiter *waiter); extern void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter, @@ -60179,9 +61405,51 @@ diff -urNp linux-2.6.38.7/kernel/mutex-debug.h linux-2.6.38.7/kernel/mutex-debug } static inline void mutex_clear_owner(struct mutex *lock) -diff -urNp linux-2.6.38.7/kernel/mutex.h linux-2.6.38.7/kernel/mutex.h ---- linux-2.6.38.7/kernel/mutex.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/mutex.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/kernel/mutex.c b/kernel/mutex.c +index a5889fb..d5f2ff2 100644 +--- a/kernel/mutex.c ++++ b/kernel/mutex.c +@@ -160,7 +160,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, + */ + + for (;;) { +- struct thread_info *owner; ++ struct task_struct *owner; + + /* + * If we own the BKL, then don't spin. The owner of +@@ -205,7 +205,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, + spin_lock_mutex(&lock->wait_lock, flags); + + debug_mutex_lock_common(lock, &waiter); +- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task)); ++ debug_mutex_add_waiter(lock, &waiter, task); + + /* add waiting tasks to the end of the waitqueue (FIFO): */ + list_add_tail(&waiter.list, &lock->wait_list); +@@ -234,8 +234,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, + * TASK_UNINTERRUPTIBLE case.) + */ + if (unlikely(signal_pending_state(state, task))) { +- mutex_remove_waiter(lock, &waiter, +- task_thread_info(task)); ++ mutex_remove_waiter(lock, &waiter, task); + mutex_release(&lock->dep_map, 1, ip); + spin_unlock_mutex(&lock->wait_lock, flags); + +@@ -256,7 +255,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, + done: + lock_acquired(&lock->dep_map, ip); + /* got the lock - rejoice! */ +- mutex_remove_waiter(lock, &waiter, current_thread_info()); ++ mutex_remove_waiter(lock, &waiter, task); + mutex_set_owner(lock); + + /* set it to 0 if there are no waiters left: */ +diff --git a/kernel/mutex.h b/kernel/mutex.h +index 67578ca..4115fbf 100644 +--- a/kernel/mutex.h ++++ b/kernel/mutex.h @@ -19,7 +19,7 @@ #ifdef CONFIG_SMP static inline void mutex_set_owner(struct mutex *lock) @@ -60191,10 +61459,11 @@ diff -urNp linux-2.6.38.7/kernel/mutex.h linux-2.6.38.7/kernel/mutex.h } static inline void mutex_clear_owner(struct mutex *lock) -diff -urNp linux-2.6.38.7/kernel/padata.c linux-2.6.38.7/kernel/padata.c ---- linux-2.6.38.7/kernel/padata.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/padata.c 2011-04-28 19:57:25.000000000 -0400 -@@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_ins +diff --git a/kernel/padata.c b/kernel/padata.c +index 7510194..8d6863d 100644 +--- a/kernel/padata.c ++++ b/kernel/padata.c +@@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_instance *pinst, padata->pd = pd; padata->cb_cpu = cb_cpu; @@ -60208,7 +61477,7 @@ diff -urNp linux-2.6.38.7/kernel/padata.c linux-2.6.38.7/kernel/padata.c target_cpu = padata_cpu_hash(padata); queue = per_cpu_ptr(pd->pqueue, target_cpu); -@@ -444,7 +444,7 @@ static struct parallel_data *padata_allo +@@ -444,7 +444,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst, padata_init_pqueues(pd); padata_init_squeues(pd); setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd); @@ -60217,10 +61486,11 @@ diff -urNp linux-2.6.38.7/kernel/padata.c linux-2.6.38.7/kernel/padata.c atomic_set(&pd->reorder_objects, 0); atomic_set(&pd->refcnt, 0); pd->pinst = pinst; -diff -urNp linux-2.6.38.7/kernel/panic.c linux-2.6.38.7/kernel/panic.c ---- linux-2.6.38.7/kernel/panic.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/panic.c 2011-04-28 19:34:15.000000000 -0400 -@@ -369,7 +369,7 @@ static void warn_slowpath_common(const c +diff --git a/kernel/panic.c b/kernel/panic.c +index 991bb87..ae5f9be 100644 +--- a/kernel/panic.c ++++ b/kernel/panic.c +@@ -369,7 +369,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller, const char *board; printk(KERN_WARNING "------------[ cut here ]------------\n"); @@ -60239,10 +61509,11 @@ diff -urNp linux-2.6.38.7/kernel/panic.c linux-2.6.38.7/kernel/panic.c __builtin_return_address(0)); } EXPORT_SYMBOL(__stack_chk_fail); -diff -urNp linux-2.6.38.7/kernel/perf_event.c linux-2.6.38.7/kernel/perf_event.c ---- linux-2.6.38.7/kernel/perf_event.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/kernel/perf_event.c 2011-04-28 19:57:25.000000000 -0400 -@@ -70,7 +70,7 @@ int sysctl_perf_event_mlock __read_mostl +diff --git a/kernel/perf_event.c b/kernel/perf_event.c +index b2536bd..c7789c9 100644 +--- a/kernel/perf_event.c ++++ b/kernel/perf_event.c +@@ -70,7 +70,7 @@ int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' */ int sysctl_perf_event_sample_rate __read_mostly = 100000; @@ -60251,7 +61522,7 @@ diff -urNp linux-2.6.38.7/kernel/perf_event.c linux-2.6.38.7/kernel/perf_event.c static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx, enum event_type_t event_type); -@@ -1923,7 +1923,7 @@ static void __perf_event_read(void *info +@@ -1923,7 +1923,7 @@ static void __perf_event_read(void *info) static inline u64 perf_event_count(struct perf_event *event) { @@ -60260,7 +61531,7 @@ diff -urNp linux-2.6.38.7/kernel/perf_event.c linux-2.6.38.7/kernel/perf_event.c } static u64 perf_event_read(struct perf_event *event) -@@ -2442,9 +2442,9 @@ u64 perf_event_read_value(struct perf_ev +@@ -2442,9 +2442,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running) mutex_lock(&event->child_mutex); total += perf_event_read(event); *enabled += event->total_time_enabled + @@ -60272,7 +61543,7 @@ diff -urNp linux-2.6.38.7/kernel/perf_event.c linux-2.6.38.7/kernel/perf_event.c list_for_each_entry(child, &event->child_list, child_list) { total += perf_event_read(child); -@@ -2807,10 +2807,10 @@ void perf_event_update_userpage(struct p +@@ -2807,10 +2807,10 @@ void perf_event_update_userpage(struct perf_event *event) userpg->offset -= local64_read(&event->hw.prev_count); userpg->time_enabled = event->total_time_enabled + @@ -60285,7 +61556,7 @@ diff -urNp linux-2.6.38.7/kernel/perf_event.c linux-2.6.38.7/kernel/perf_event.c barrier(); ++userpg->lock; -@@ -3607,11 +3607,11 @@ static void perf_output_read_one(struct +@@ -3607,11 +3607,11 @@ static void perf_output_read_one(struct perf_output_handle *handle, values[n++] = perf_event_count(event); if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) { values[n++] = enabled + @@ -60299,7 +61570,7 @@ diff -urNp linux-2.6.38.7/kernel/perf_event.c linux-2.6.38.7/kernel/perf_event.c } if (read_format & PERF_FORMAT_ID) values[n++] = primary_event_id(event); -@@ -5597,7 +5597,7 @@ perf_event_alloc(struct perf_event_attr +@@ -5597,7 +5597,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu, event->parent = parent_event; event->ns = get_pid_ns(current->nsproxy->pid_ns); @@ -60308,7 +61579,7 @@ diff -urNp linux-2.6.38.7/kernel/perf_event.c linux-2.6.38.7/kernel/perf_event.c event->state = PERF_EVENT_STATE_INACTIVE; -@@ -6095,10 +6095,10 @@ static void sync_child_event(struct perf +@@ -6095,10 +6095,10 @@ static void sync_child_event(struct perf_event *child_event, /* * Add back the child's count to the parent's count: */ @@ -60322,9 +61593,10 @@ diff -urNp linux-2.6.38.7/kernel/perf_event.c linux-2.6.38.7/kernel/perf_event.c &parent_event->child_total_time_running); /* -diff -urNp linux-2.6.38.7/kernel/pid.c linux-2.6.38.7/kernel/pid.c ---- linux-2.6.38.7/kernel/pid.c 2011-04-22 19:20:59.000000000 -0400 -+++ linux-2.6.38.7/kernel/pid.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/kernel/pid.c b/kernel/pid.c +index 6aeebc2..230c80c 100644 +--- a/kernel/pid.c ++++ b/kernel/pid.c @@ -33,6 +33,7 @@ #include <linux/rculist.h> #include <linux/bootmem.h> @@ -60333,7 +61605,7 @@ diff -urNp linux-2.6.38.7/kernel/pid.c linux-2.6.38.7/kernel/pid.c #include <linux/pid_namespace.h> #include <linux/init_task.h> #include <linux/syscalls.h> -@@ -45,7 +46,7 @@ struct pid init_struct_pid = INIT_STRUCT +@@ -45,7 +46,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID; int pid_max = PID_MAX_DEFAULT; @@ -60359,9 +61631,10 @@ diff -urNp linux-2.6.38.7/kernel/pid.c linux-2.6.38.7/kernel/pid.c } struct task_struct *find_task_by_vpid(pid_t vnr) -diff -urNp linux-2.6.38.7/kernel/posix-cpu-timers.c linux-2.6.38.7/kernel/posix-cpu-timers.c ---- linux-2.6.38.7/kernel/posix-cpu-timers.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/posix-cpu-timers.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c +index 05bb717..c22d8e8 100644 +--- a/kernel/posix-cpu-timers.c ++++ b/kernel/posix-cpu-timers.c @@ -6,6 +6,7 @@ #include <linux/posix-timers.h> #include <linux/errno.h> @@ -60370,9 +61643,10 @@ diff -urNp linux-2.6.38.7/kernel/posix-cpu-timers.c linux-2.6.38.7/kernel/posix- #include <asm/uaccess.h> #include <linux/kernel_stat.h> #include <trace/events/timer.h> -diff -urNp linux-2.6.38.7/kernel/posix-timers.c linux-2.6.38.7/kernel/posix-timers.c ---- linux-2.6.38.7/kernel/posix-timers.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/posix-timers.c 2011-05-16 21:47:09.000000000 -0400 +diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c +index 93bd2eb..e5f41d5 100644 +--- a/kernel/posix-timers.c ++++ b/kernel/posix-timers.c @@ -42,6 +42,7 @@ #include <linux/compiler.h> #include <linux/idr.h> @@ -60381,7 +61655,7 @@ diff -urNp linux-2.6.38.7/kernel/posix-timers.c linux-2.6.38.7/kernel/posix-time #include <linux/syscalls.h> #include <linux/wait.h> #include <linux/workqueue.h> -@@ -302,6 +303,8 @@ static __init int init_posix_timers(void +@@ -302,6 +303,8 @@ static __init int init_posix_timers(void) .nsleep = no_nsleep, }; @@ -60390,7 +61664,7 @@ diff -urNp linux-2.6.38.7/kernel/posix-timers.c linux-2.6.38.7/kernel/posix-time register_posix_clock(CLOCK_REALTIME, &clock_realtime); register_posix_clock(CLOCK_MONOTONIC, &clock_monotonic); register_posix_clock(CLOCK_MONOTONIC_RAW, &clock_monotonic_raw); -@@ -955,6 +958,13 @@ SYSCALL_DEFINE2(clock_settime, const clo +@@ -955,6 +958,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock, if (copy_from_user(&new_tp, tp, sizeof (*tp))) return -EFAULT; @@ -60404,10 +61678,11 @@ diff -urNp linux-2.6.38.7/kernel/posix-timers.c linux-2.6.38.7/kernel/posix-time return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp)); } -diff -urNp linux-2.6.38.7/kernel/power/poweroff.c linux-2.6.38.7/kernel/power/poweroff.c ---- linux-2.6.38.7/kernel/power/poweroff.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/power/poweroff.c 2011-04-28 19:34:15.000000000 -0400 -@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof +diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c +index d523593..68197a4 100644 +--- a/kernel/power/poweroff.c ++++ b/kernel/power/poweroff.c +@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_poweroff_op = { .enable_mask = SYSRQ_ENABLE_BOOT, }; @@ -60416,10 +61691,11 @@ diff -urNp linux-2.6.38.7/kernel/power/poweroff.c linux-2.6.38.7/kernel/power/po { register_sysrq_key('o', &sysrq_poweroff_op); return 0; -diff -urNp linux-2.6.38.7/kernel/power/process.c linux-2.6.38.7/kernel/power/process.c ---- linux-2.6.38.7/kernel/power/process.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/power/process.c 2011-04-28 19:34:15.000000000 -0400 -@@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_ +diff --git a/kernel/power/process.c b/kernel/power/process.c +index 0cf3a27..5481be4 100644 +--- a/kernel/power/process.c ++++ b/kernel/power/process.c +@@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_only) u64 elapsed_csecs64; unsigned int elapsed_csecs; bool wakeup = false; @@ -60427,7 +61703,7 @@ diff -urNp linux-2.6.38.7/kernel/power/process.c linux-2.6.38.7/kernel/power/pro do_gettimeofday(&start); -@@ -51,6 +52,8 @@ static int try_to_freeze_tasks(bool sig_ +@@ -51,6 +52,8 @@ static int try_to_freeze_tasks(bool sig_only) while (true) { todo = 0; @@ -60436,7 +61712,7 @@ diff -urNp linux-2.6.38.7/kernel/power/process.c linux-2.6.38.7/kernel/power/pro read_lock(&tasklist_lock); do_each_thread(g, p) { if (frozen(p) || !freezable(p)) -@@ -71,9 +74,13 @@ static int try_to_freeze_tasks(bool sig_ +@@ -71,9 +74,13 @@ static int try_to_freeze_tasks(bool sig_only) * try_to_stop() after schedule() in ptrace/signal * stop sees TIF_FREEZE. */ @@ -60452,7 +61728,7 @@ diff -urNp linux-2.6.38.7/kernel/power/process.c linux-2.6.38.7/kernel/power/pro } while_each_thread(g, p); read_unlock(&tasklist_lock); -@@ -82,7 +89,7 @@ static int try_to_freeze_tasks(bool sig_ +@@ -82,7 +89,7 @@ static int try_to_freeze_tasks(bool sig_only) todo += wq_busy; } @@ -60461,10 +61737,11 @@ diff -urNp linux-2.6.38.7/kernel/power/process.c linux-2.6.38.7/kernel/power/pro break; if (pm_wakeup_pending()) { -diff -urNp linux-2.6.38.7/kernel/printk.c linux-2.6.38.7/kernel/printk.c ---- linux-2.6.38.7/kernel/printk.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/printk.c 2011-04-28 19:34:15.000000000 -0400 -@@ -279,12 +279,17 @@ static int check_syslog_permissions(int +diff --git a/kernel/printk.c b/kernel/printk.c +index 3623152..2b2ffcf 100644 +--- a/kernel/printk.c ++++ b/kernel/printk.c +@@ -279,12 +279,17 @@ static int check_syslog_permissions(int type, bool from_file) if (from_file && type != SYSLOG_ACTION_OPEN) return 0; @@ -60483,9 +61760,10 @@ diff -urNp linux-2.6.38.7/kernel/printk.c linux-2.6.38.7/kernel/printk.c "but no CAP_SYSLOG (deprecated).\n"); return 0; } -diff -urNp linux-2.6.38.7/kernel/profile.c linux-2.6.38.7/kernel/profile.c ---- linux-2.6.38.7/kernel/profile.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/profile.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/kernel/profile.c b/kernel/profile.c +index 66f841b..0983d40 100644 +--- a/kernel/profile.c ++++ b/kernel/profile.c @@ -39,7 +39,7 @@ struct profile_hit { /* Oprofile timer tick hook */ static int (*timer_hook)(struct pt_regs *) __read_mostly; @@ -60504,7 +61782,7 @@ diff -urNp linux-2.6.38.7/kernel/profile.c linux-2.6.38.7/kernel/profile.c hits[i].hits = hits[i].pc = 0; } } -@@ -346,9 +346,9 @@ void profile_hits(int type, void *__pc, +@@ -346,9 +346,9 @@ void profile_hits(int type, void *__pc, unsigned int nr_hits) * Add the current hit(s) and flush the write-queue out * to the global buffer: */ @@ -60516,7 +61794,7 @@ diff -urNp linux-2.6.38.7/kernel/profile.c linux-2.6.38.7/kernel/profile.c hits[i].pc = hits[i].hits = 0; } out: -@@ -426,7 +426,7 @@ void profile_hits(int type, void *__pc, +@@ -426,7 +426,7 @@ void profile_hits(int type, void *__pc, unsigned int nr_hits) if (prof_on != type || !prof_buffer) return; pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift; @@ -60525,7 +61803,7 @@ diff -urNp linux-2.6.38.7/kernel/profile.c linux-2.6.38.7/kernel/profile.c } #endif /* !CONFIG_SMP */ EXPORT_SYMBOL_GPL(profile_hits); -@@ -517,7 +517,7 @@ read_profile(struct file *file, char __u +@@ -517,7 +517,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos) return -EFAULT; buf++; p++; count--; read++; } @@ -60534,7 +61812,7 @@ diff -urNp linux-2.6.38.7/kernel/profile.c linux-2.6.38.7/kernel/profile.c if (copy_to_user(buf, (void *)pnt, count)) return -EFAULT; read += count; -@@ -548,7 +548,7 @@ static ssize_t write_profile(struct file +@@ -548,7 +548,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf, } #endif profile_discard_flip_buffers(); @@ -60543,10 +61821,11 @@ diff -urNp linux-2.6.38.7/kernel/profile.c linux-2.6.38.7/kernel/profile.c return count; } -diff -urNp linux-2.6.38.7/kernel/ptrace.c linux-2.6.38.7/kernel/ptrace.c ---- linux-2.6.38.7/kernel/ptrace.c 2011-05-22 23:05:20.000000000 -0400 -+++ linux-2.6.38.7/kernel/ptrace.c 2011-05-22 23:06:04.000000000 -0400 -@@ -117,7 +117,8 @@ int ptrace_check_attach(struct task_stru +diff --git a/kernel/ptrace.c b/kernel/ptrace.c +index 254ad5b..f79e393 100644 +--- a/kernel/ptrace.c ++++ b/kernel/ptrace.c +@@ -117,7 +117,8 @@ int ptrace_check_attach(struct task_struct *child, int kill) return ret; } @@ -60556,7 +61835,7 @@ diff -urNp linux-2.6.38.7/kernel/ptrace.c linux-2.6.38.7/kernel/ptrace.c { const struct cred *cred = current_cred(), *tcred; -@@ -141,7 +142,9 @@ int __ptrace_may_access(struct task_stru +@@ -141,7 +142,9 @@ int __ptrace_may_access(struct task_struct *task, unsigned int mode) cred->gid != tcred->egid || cred->gid != tcred->sgid || cred->gid != tcred->gid) && @@ -60567,7 +61846,7 @@ diff -urNp linux-2.6.38.7/kernel/ptrace.c linux-2.6.38.7/kernel/ptrace.c rcu_read_unlock(); return -EPERM; } -@@ -149,7 +152,9 @@ int __ptrace_may_access(struct task_stru +@@ -149,7 +152,9 @@ int __ptrace_may_access(struct task_struct *task, unsigned int mode) smp_rmb(); if (task->mm) dumpable = get_dumpable(task->mm); @@ -60578,7 +61857,7 @@ diff -urNp linux-2.6.38.7/kernel/ptrace.c linux-2.6.38.7/kernel/ptrace.c return -EPERM; return security_ptrace_access_check(task, mode); -@@ -159,7 +164,16 @@ bool ptrace_may_access(struct task_struc +@@ -159,7 +164,16 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode) { int err; task_lock(task); @@ -60596,7 +61875,7 @@ diff -urNp linux-2.6.38.7/kernel/ptrace.c linux-2.6.38.7/kernel/ptrace.c task_unlock(task); return !err; } -@@ -186,7 +200,7 @@ static int ptrace_attach(struct task_str +@@ -186,7 +200,7 @@ static int ptrace_attach(struct task_struct *task) goto out; task_lock(task); @@ -60605,7 +61884,7 @@ diff -urNp linux-2.6.38.7/kernel/ptrace.c linux-2.6.38.7/kernel/ptrace.c task_unlock(task); if (retval) goto unlock_creds; -@@ -199,7 +213,7 @@ static int ptrace_attach(struct task_str +@@ -199,7 +213,7 @@ static int ptrace_attach(struct task_struct *task) goto unlock_tasklist; task->ptrace = PT_PTRACED; @@ -60614,7 +61893,7 @@ diff -urNp linux-2.6.38.7/kernel/ptrace.c linux-2.6.38.7/kernel/ptrace.c task->ptrace |= PT_PTRACE_CAP; __ptrace_link(task, current); -@@ -359,6 +373,8 @@ int ptrace_readdata(struct task_struct * +@@ -359,6 +373,8 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst { int copied = 0; @@ -60623,7 +61902,7 @@ diff -urNp linux-2.6.38.7/kernel/ptrace.c linux-2.6.38.7/kernel/ptrace.c while (len > 0) { char buf[128]; int this_len, retval; -@@ -370,7 +386,7 @@ int ptrace_readdata(struct task_struct * +@@ -370,7 +386,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst break; return -EIO; } @@ -60632,7 +61911,7 @@ diff -urNp linux-2.6.38.7/kernel/ptrace.c linux-2.6.38.7/kernel/ptrace.c return -EFAULT; copied += retval; src += retval; -@@ -384,6 +400,8 @@ int ptrace_writedata(struct task_struct +@@ -384,6 +400,8 @@ int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long ds { int copied = 0; @@ -60641,7 +61920,7 @@ diff -urNp linux-2.6.38.7/kernel/ptrace.c linux-2.6.38.7/kernel/ptrace.c while (len > 0) { char buf[128]; int this_len, retval; -@@ -566,9 +584,11 @@ int ptrace_request(struct task_struct *c +@@ -566,9 +584,11 @@ int ptrace_request(struct task_struct *child, long request, { int ret = -EIO; siginfo_t siginfo; @@ -60654,7 +61933,7 @@ diff -urNp linux-2.6.38.7/kernel/ptrace.c linux-2.6.38.7/kernel/ptrace.c switch (request) { case PTRACE_PEEKTEXT: case PTRACE_PEEKDATA: -@@ -714,14 +734,21 @@ SYSCALL_DEFINE4(ptrace, long, request, l +@@ -714,14 +734,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr, goto out; } @@ -60677,7 +61956,7 @@ diff -urNp linux-2.6.38.7/kernel/ptrace.c linux-2.6.38.7/kernel/ptrace.c goto out_put_task_struct; } -@@ -746,7 +773,7 @@ int generic_ptrace_peekdata(struct task_ +@@ -746,7 +773,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr, copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0); if (copied != sizeof(tmp)) return -EIO; @@ -60686,7 +61965,7 @@ diff -urNp linux-2.6.38.7/kernel/ptrace.c linux-2.6.38.7/kernel/ptrace.c } int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr, -@@ -769,6 +796,8 @@ int compat_ptrace_request(struct task_st +@@ -769,6 +796,8 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request, siginfo_t siginfo; int ret; @@ -60695,7 +61974,7 @@ diff -urNp linux-2.6.38.7/kernel/ptrace.c linux-2.6.38.7/kernel/ptrace.c switch (request) { case PTRACE_PEEKTEXT: case PTRACE_PEEKDATA: -@@ -856,14 +885,21 @@ asmlinkage long compat_sys_ptrace(compat +@@ -856,14 +885,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid, goto out; } @@ -60718,10 +61997,11 @@ diff -urNp linux-2.6.38.7/kernel/ptrace.c linux-2.6.38.7/kernel/ptrace.c goto out_put_task_struct; } -diff -urNp linux-2.6.38.7/kernel/rcutorture.c linux-2.6.38.7/kernel/rcutorture.c ---- linux-2.6.38.7/kernel/rcutorture.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/rcutorture.c 2011-04-28 19:57:25.000000000 -0400 -@@ -139,12 +139,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_ +diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c +index 89613f9..9a89562 100644 +--- a/kernel/rcutorture.c ++++ b/kernel/rcutorture.c +@@ -139,12 +139,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) = { 0 }; static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) = { 0 }; @@ -60772,7 +62052,7 @@ diff -urNp linux-2.6.38.7/kernel/rcutorture.c linux-2.6.38.7/kernel/rcutorture.c if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) { rp->rtort_mbtest = 0; rcu_torture_free(rp); -@@ -410,7 +410,7 @@ static void rcu_sync_torture_deferred_fr +@@ -410,7 +410,7 @@ static void rcu_sync_torture_deferred_free(struct rcu_torture *p) i = rp->rtort_pipe_count; if (i > RCU_TORTURE_PIPE_LEN) i = RCU_TORTURE_PIPE_LEN; @@ -60790,7 +62070,7 @@ diff -urNp linux-2.6.38.7/kernel/rcutorture.c linux-2.6.38.7/kernel/rcutorture.c old_rp->rtort_pipe_count++; cur_ops->deferred_free(old_rp); } -@@ -952,7 +952,7 @@ static void rcu_torture_timer(unsigned l +@@ -952,7 +952,7 @@ static void rcu_torture_timer(unsigned long unused) return; } if (p->rtort_mbtest == 0) @@ -60885,10 +62165,11 @@ diff -urNp linux-2.6.38.7/kernel/rcutorture.c linux-2.6.38.7/kernel/rcutorture.c for_each_possible_cpu(cpu) { for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) { per_cpu(rcu_torture_count, cpu)[i] = 0; -diff -urNp linux-2.6.38.7/kernel/rcutree.c linux-2.6.38.7/kernel/rcutree.c ---- linux-2.6.38.7/kernel/rcutree.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/rcutree.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1389,7 +1389,7 @@ __rcu_process_callbacks(struct rcu_state +diff --git a/kernel/rcutree.c b/kernel/rcutree.c +index dd4aea8..2c20a79 100644 +--- a/kernel/rcutree.c ++++ b/kernel/rcutree.c +@@ -1389,7 +1389,7 @@ __rcu_process_callbacks(struct rcu_state *rsp, struct rcu_data *rdp) /* * Do softirq processing for the current CPU. */ @@ -60897,9 +62178,10 @@ diff -urNp linux-2.6.38.7/kernel/rcutree.c linux-2.6.38.7/kernel/rcutree.c { /* * Memory references from any prior RCU read-side critical sections -diff -urNp linux-2.6.38.7/kernel/rcutree_plugin.h linux-2.6.38.7/kernel/rcutree_plugin.h ---- linux-2.6.38.7/kernel/rcutree_plugin.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/rcutree_plugin.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h +index a363871..6545b35 100644 +--- a/kernel/rcutree_plugin.h ++++ b/kernel/rcutree_plugin.h @@ -730,7 +730,7 @@ void synchronize_rcu_expedited(void) /* Clean up and exit. */ @@ -60909,7 +62191,7 @@ diff -urNp linux-2.6.38.7/kernel/rcutree_plugin.h linux-2.6.38.7/kernel/rcutree_ unlock_mb_ret: mutex_unlock(&sync_rcu_preempt_exp_mutex); mb_ret: -@@ -1025,8 +1025,8 @@ EXPORT_SYMBOL_GPL(synchronize_sched_expe +@@ -1025,8 +1025,8 @@ EXPORT_SYMBOL_GPL(synchronize_sched_expedited); #else /* #ifndef CONFIG_SMP */ @@ -60962,10 +62244,11 @@ diff -urNp linux-2.6.38.7/kernel/rcutree_plugin.h linux-2.6.38.7/kernel/rcutree_ put_online_cpus(); } -diff -urNp linux-2.6.38.7/kernel/relay.c linux-2.6.38.7/kernel/relay.c ---- linux-2.6.38.7/kernel/relay.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/relay.c 2011-05-16 21:47:09.000000000 -0400 -@@ -1236,6 +1236,8 @@ static ssize_t subbuf_splice_actor(struc +diff --git a/kernel/relay.c b/kernel/relay.c +index 859ea5a..096e2fe 100644 +--- a/kernel/relay.c ++++ b/kernel/relay.c +@@ -1236,6 +1236,8 @@ static ssize_t subbuf_splice_actor(struct file *in, }; ssize_t ret; @@ -60974,10 +62257,11 @@ diff -urNp linux-2.6.38.7/kernel/relay.c linux-2.6.38.7/kernel/relay.c if (rbuf->subbufs_produced == rbuf->subbufs_consumed) return 0; if (splice_grow_spd(pipe, &spd)) -diff -urNp linux-2.6.38.7/kernel/resource.c linux-2.6.38.7/kernel/resource.c ---- linux-2.6.38.7/kernel/resource.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/resource.c 2011-04-28 19:34:15.000000000 -0400 -@@ -133,8 +133,18 @@ static const struct file_operations proc +diff --git a/kernel/resource.c b/kernel/resource.c +index 798e2fa..896e9ed 100644 +--- a/kernel/resource.c ++++ b/kernel/resource.c +@@ -133,8 +133,18 @@ static const struct file_operations proc_iomem_operations = { static int __init ioresources_init(void) { @@ -60996,21 +62280,10 @@ diff -urNp linux-2.6.38.7/kernel/resource.c linux-2.6.38.7/kernel/resource.c return 0; } __initcall(ioresources_init); -diff -urNp linux-2.6.38.7/kernel/rtmutex.c linux-2.6.38.7/kernel/rtmutex.c ---- linux-2.6.38.7/kernel/rtmutex.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/rtmutex.c 2011-04-28 19:34:15.000000000 -0400 -@@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt - */ - raw_spin_lock_irqsave(&pendowner->pi_lock, flags); - -- WARN_ON(!pendowner->pi_blocked_on); -+ BUG_ON(!pendowner->pi_blocked_on); - WARN_ON(pendowner->pi_blocked_on != waiter); - WARN_ON(pendowner->pi_blocked_on->lock != lock); - -diff -urNp linux-2.6.38.7/kernel/rtmutex-tester.c linux-2.6.38.7/kernel/rtmutex-tester.c ---- linux-2.6.38.7/kernel/rtmutex-tester.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/rtmutex-tester.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/kernel/rtmutex-tester.c b/kernel/rtmutex-tester.c +index 66cb89b..dac7f0d 100644 +--- a/kernel/rtmutex-tester.c ++++ b/kernel/rtmutex-tester.c @@ -21,7 +21,7 @@ #define MAX_RT_TEST_MUTEXES 8 @@ -61020,7 +62293,7 @@ diff -urNp linux-2.6.38.7/kernel/rtmutex-tester.c linux-2.6.38.7/kernel/rtmutex- struct test_thread_data { int opcode; -@@ -64,7 +64,7 @@ static int handle_op(struct test_thread_ +@@ -64,7 +64,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup) case RTTEST_LOCKCONT: td->mutexes[td->opdata] = 1; @@ -61029,7 +62302,7 @@ diff -urNp linux-2.6.38.7/kernel/rtmutex-tester.c linux-2.6.38.7/kernel/rtmutex- return 0; case RTTEST_RESET: -@@ -84,7 +84,7 @@ static int handle_op(struct test_thread_ +@@ -84,7 +84,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup) return 0; case RTTEST_RESETEVENT: @@ -61038,7 +62311,7 @@ diff -urNp linux-2.6.38.7/kernel/rtmutex-tester.c linux-2.6.38.7/kernel/rtmutex- return 0; default: -@@ -101,9 +101,9 @@ static int handle_op(struct test_thread_ +@@ -101,9 +101,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup) return ret; td->mutexes[id] = 1; @@ -61050,7 +62323,7 @@ diff -urNp linux-2.6.38.7/kernel/rtmutex-tester.c linux-2.6.38.7/kernel/rtmutex- td->mutexes[id] = 4; return 0; -@@ -114,9 +114,9 @@ static int handle_op(struct test_thread_ +@@ -114,9 +114,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup) return ret; td->mutexes[id] = 1; @@ -61062,7 +62335,7 @@ diff -urNp linux-2.6.38.7/kernel/rtmutex-tester.c linux-2.6.38.7/kernel/rtmutex- td->mutexes[id] = ret ? 0 : 4; return ret ? -EINTR : 0; -@@ -125,9 +125,9 @@ static int handle_op(struct test_thread_ +@@ -125,9 +125,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup) if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4) return ret; @@ -61074,7 +62347,7 @@ diff -urNp linux-2.6.38.7/kernel/rtmutex-tester.c linux-2.6.38.7/kernel/rtmutex- td->mutexes[id] = 0; return 0; -@@ -193,7 +193,7 @@ void schedule_rt_mutex_test(struct rt_mu +@@ -193,7 +193,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex) break; td->mutexes[dat] = 2; @@ -61083,7 +62356,7 @@ diff -urNp linux-2.6.38.7/kernel/rtmutex-tester.c linux-2.6.38.7/kernel/rtmutex- break; case RTTEST_LOCKBKL: -@@ -214,7 +214,7 @@ void schedule_rt_mutex_test(struct rt_mu +@@ -214,7 +214,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex) return; td->mutexes[dat] = 3; @@ -61092,7 +62365,7 @@ diff -urNp linux-2.6.38.7/kernel/rtmutex-tester.c linux-2.6.38.7/kernel/rtmutex- break; case RTTEST_LOCKNOWAIT: -@@ -226,7 +226,7 @@ void schedule_rt_mutex_test(struct rt_mu +@@ -226,7 +226,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex) return; td->mutexes[dat] = 1; @@ -61101,30 +62374,23 @@ diff -urNp linux-2.6.38.7/kernel/rtmutex-tester.c linux-2.6.38.7/kernel/rtmutex- return; case RTTEST_LOCKBKL: -diff -urNp linux-2.6.38.7/kernel/sched_autogroup.c linux-2.6.38.7/kernel/sched_autogroup.c ---- linux-2.6.38.7/kernel/sched_autogroup.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/sched_autogroup.c 2011-04-28 19:57:25.000000000 -0400 -@@ -7,7 +7,7 @@ - - unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1; - static struct autogroup autogroup_default; --static atomic_t autogroup_seq_nr; -+static atomic_unchecked_t autogroup_seq_nr; +diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c +index a960481..d373438 100644 +--- a/kernel/rtmutex.c ++++ b/kernel/rtmutex.c +@@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt_mutex *lock) + */ + raw_spin_lock_irqsave(&pendowner->pi_lock, flags); - static void __init autogroup_init(struct task_struct *init_task) - { -@@ -79,7 +79,7 @@ static inline struct autogroup *autogrou +- WARN_ON(!pendowner->pi_blocked_on); ++ BUG_ON(!pendowner->pi_blocked_on); + WARN_ON(pendowner->pi_blocked_on != waiter); + WARN_ON(pendowner->pi_blocked_on->lock != lock); - kref_init(&ag->kref); - init_rwsem(&ag->lock); -- ag->id = atomic_inc_return(&autogroup_seq_nr); -+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr); - ag->tg = tg; - #ifdef CONFIG_RT_GROUP_SCHED - /* -diff -urNp linux-2.6.38.7/kernel/sched.c linux-2.6.38.7/kernel/sched.c ---- linux-2.6.38.7/kernel/sched.c 2011-04-18 17:27:14.000000000 -0400 -+++ linux-2.6.38.7/kernel/sched.c 2011-05-22 23:03:34.000000000 -0400 +diff --git a/kernel/sched.c b/kernel/sched.c +index c164920..2758d12 100644 +--- a/kernel/sched.c ++++ b/kernel/sched.c @@ -3938,6 +3938,8 @@ asmlinkage void __sched schedule(void) struct rq *rq; int cpu; @@ -61143,7 +62409,7 @@ diff -urNp linux-2.6.38.7/kernel/sched.c linux-2.6.38.7/kernel/sched.c { unsigned int cpu; struct rq *rq; -@@ -4038,10 +4040,10 @@ int mutex_spin_on_owner(struct mutex *lo +@@ -4038,10 +4040,10 @@ int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner) * DEBUG_PAGEALLOC could have unmapped it if * the mutex owner just released it and exited. */ @@ -61156,7 +62422,7 @@ diff -urNp linux-2.6.38.7/kernel/sched.c linux-2.6.38.7/kernel/sched.c #endif /* -@@ -4078,7 +4080,7 @@ int mutex_spin_on_owner(struct mutex *lo +@@ -4078,7 +4080,7 @@ int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner) /* * Is that owner really running on that cpu? */ @@ -61165,7 +62431,7 @@ diff -urNp linux-2.6.38.7/kernel/sched.c linux-2.6.38.7/kernel/sched.c return 0; arch_mutex_cpu_relax(); -@@ -4638,6 +4640,8 @@ int can_nice(const struct task_struct *p +@@ -4638,6 +4640,8 @@ int can_nice(const struct task_struct *p, const int nice) /* convert nice value [19,-20] to rlimit style value [1,40] */ int nice_rlim = 20 - nice; @@ -61192,7 +62458,7 @@ diff -urNp linux-2.6.38.7/kernel/sched.c linux-2.6.38.7/kernel/sched.c /* can't set/change the rt policy */ if (policy != p->policy && !rlim_rtprio) return -EPERM; -@@ -6942,7 +6948,7 @@ static void init_sched_groups_power(int +@@ -6942,7 +6948,7 @@ static void init_sched_groups_power(int cpu, struct sched_domain *sd) long power; int weight; @@ -61201,10 +62467,33 @@ diff -urNp linux-2.6.38.7/kernel/sched.c linux-2.6.38.7/kernel/sched.c if (cpu != group_first_cpu(sd->groups)) return; -diff -urNp linux-2.6.38.7/kernel/sched_fair.c linux-2.6.38.7/kernel/sched_fair.c ---- linux-2.6.38.7/kernel/sched_fair.c 2011-04-22 19:20:59.000000000 -0400 -+++ linux-2.6.38.7/kernel/sched_fair.c 2011-04-28 19:34:15.000000000 -0400 -@@ -3957,7 +3957,7 @@ static void nohz_idle_balance(int this_c +diff --git a/kernel/sched_autogroup.c b/kernel/sched_autogroup.c +index 9fb6562..89b0e3f 100644 +--- a/kernel/sched_autogroup.c ++++ b/kernel/sched_autogroup.c +@@ -7,7 +7,7 @@ + + unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1; + static struct autogroup autogroup_default; +-static atomic_t autogroup_seq_nr; ++static atomic_unchecked_t autogroup_seq_nr; + + static void __init autogroup_init(struct task_struct *init_task) + { +@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void) + + kref_init(&ag->kref); + init_rwsem(&ag->lock); +- ag->id = atomic_inc_return(&autogroup_seq_nr); ++ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr); + ag->tg = tg; + #ifdef CONFIG_RT_GROUP_SCHED + /* +diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c +index 7406f36..f686a8d 100644 +--- a/kernel/sched_fair.c ++++ b/kernel/sched_fair.c +@@ -3957,7 +3957,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { } * run_rebalance_domains is triggered when needed from the scheduler tick. * Also triggered for nohz idle balancing (with nohz_balancing_kick set). */ @@ -61213,10 +62502,11 @@ diff -urNp linux-2.6.38.7/kernel/sched_fair.c linux-2.6.38.7/kernel/sched_fair.c { int this_cpu = smp_processor_id(); struct rq *this_rq = cpu_rq(this_cpu); -diff -urNp linux-2.6.38.7/kernel/signal.c linux-2.6.38.7/kernel/signal.c ---- linux-2.6.38.7/kernel/signal.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/kernel/signal.c 2011-05-22 23:03:34.000000000 -0400 -@@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache +diff --git a/kernel/signal.c b/kernel/signal.c +index bf11d269..3c34bda 100644 +--- a/kernel/signal.c ++++ b/kernel/signal.c +@@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cachep; int print_fatal_signals __read_mostly; @@ -61231,7 +62521,7 @@ diff -urNp linux-2.6.38.7/kernel/signal.c linux-2.6.38.7/kernel/signal.c { /* Is it explicitly or implicitly ignored? */ return handler == SIG_IGN || -@@ -60,7 +60,7 @@ static int sig_handler_ignored(void __us +@@ -60,7 +60,7 @@ static int sig_handler_ignored(void __user *handler, int sig) static int sig_task_ignored(struct task_struct *t, int sig, int from_ancestor_ns) { @@ -61240,7 +62530,7 @@ diff -urNp linux-2.6.38.7/kernel/signal.c linux-2.6.38.7/kernel/signal.c handler = sig_handler(t, sig); -@@ -243,6 +243,9 @@ __sigqueue_alloc(int sig, struct task_st +@@ -243,6 +243,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi atomic_inc(&user->sigpending); rcu_read_unlock(); @@ -61250,7 +62540,7 @@ diff -urNp linux-2.6.38.7/kernel/signal.c linux-2.6.38.7/kernel/signal.c if (override_rlimit || atomic_read(&user->sigpending) <= task_rlimit(t, RLIMIT_SIGPENDING)) { -@@ -367,7 +370,7 @@ flush_signal_handlers(struct task_struct +@@ -367,7 +370,7 @@ flush_signal_handlers(struct task_struct *t, int force_default) int unhandled_signal(struct task_struct *tsk, int sig) { @@ -61259,7 +62549,7 @@ diff -urNp linux-2.6.38.7/kernel/signal.c linux-2.6.38.7/kernel/signal.c if (is_global_init(tsk)) return 1; if (handler != SIG_IGN && handler != SIG_DFL) -@@ -678,6 +681,9 @@ static int check_kill_permission(int sig +@@ -678,6 +681,9 @@ static int check_kill_permission(int sig, struct siginfo *info, } } @@ -61269,7 +62559,7 @@ diff -urNp linux-2.6.38.7/kernel/signal.c linux-2.6.38.7/kernel/signal.c return security_task_kill(t, info, sig, 0); } -@@ -1025,7 +1031,7 @@ __group_send_sig_info(int sig, struct si +@@ -1025,7 +1031,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p) return send_signal(sig, info, p, 1); } @@ -61278,7 +62568,7 @@ diff -urNp linux-2.6.38.7/kernel/signal.c linux-2.6.38.7/kernel/signal.c specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t) { return send_signal(sig, info, t, 0); -@@ -1062,6 +1068,7 @@ force_sig_info(int sig, struct siginfo * +@@ -1062,6 +1068,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t) unsigned long int flags; int ret, blocked, ignored; struct k_sigaction *action; @@ -61286,7 +62576,7 @@ diff -urNp linux-2.6.38.7/kernel/signal.c linux-2.6.38.7/kernel/signal.c spin_lock_irqsave(&t->sighand->siglock, flags); action = &t->sighand->action[sig-1]; -@@ -1076,9 +1083,18 @@ force_sig_info(int sig, struct siginfo * +@@ -1076,9 +1083,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t) } if (action->sa.sa_handler == SIG_DFL) t->signal->flags &= ~SIGNAL_UNKILLABLE; @@ -61305,7 +62595,7 @@ diff -urNp linux-2.6.38.7/kernel/signal.c linux-2.6.38.7/kernel/signal.c return ret; } -@@ -1137,8 +1153,11 @@ int group_send_sig_info(int sig, struct +@@ -1137,8 +1153,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p) ret = check_kill_permission(sig, info, p); rcu_read_unlock(); @@ -61327,10 +62617,11 @@ diff -urNp linux-2.6.38.7/kernel/signal.c linux-2.6.38.7/kernel/signal.c BUG_ON((exit_code & (0x7f | ~0xffff)) != SIGTRAP); memset(&info, 0, sizeof info); -diff -urNp linux-2.6.38.7/kernel/smp.c linux-2.6.38.7/kernel/smp.c ---- linux-2.6.38.7/kernel/smp.c 2011-04-18 17:27:14.000000000 -0400 -+++ linux-2.6.38.7/kernel/smp.c 2011-04-28 19:34:15.000000000 -0400 -@@ -583,22 +583,22 @@ int smp_call_function(smp_call_func_t fu +diff --git a/kernel/smp.c b/kernel/smp.c +index 9545489..11acd39 100644 +--- a/kernel/smp.c ++++ b/kernel/smp.c +@@ -583,22 +583,22 @@ int smp_call_function(smp_call_func_t func, void *info, int wait) } EXPORT_SYMBOL(smp_call_function); @@ -61357,10 +62648,11 @@ diff -urNp linux-2.6.38.7/kernel/smp.c linux-2.6.38.7/kernel/smp.c { raw_spin_unlock_irq(&call_function.lock); } -diff -urNp linux-2.6.38.7/kernel/softirq.c linux-2.6.38.7/kernel/softirq.c ---- linux-2.6.38.7/kernel/softirq.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/softirq.c 2011-04-28 19:34:15.000000000 -0400 -@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec +diff --git a/kernel/softirq.c b/kernel/softirq.c +index 68eb5ef..ffd301d 100644 +--- a/kernel/softirq.c ++++ b/kernel/softirq.c +@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); @@ -61396,7 +62688,7 @@ diff -urNp linux-2.6.38.7/kernel/softirq.c linux-2.6.38.7/kernel/softirq.c { softirq_vec[nr].action = action; } -@@ -421,7 +421,7 @@ void __tasklet_hi_schedule_first(struct +@@ -421,7 +421,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t) EXPORT_SYMBOL(__tasklet_hi_schedule_first); @@ -61405,7 +62697,7 @@ diff -urNp linux-2.6.38.7/kernel/softirq.c linux-2.6.38.7/kernel/softirq.c { struct tasklet_struct *list; -@@ -456,7 +456,7 @@ static void tasklet_action(struct softir +@@ -456,7 +456,7 @@ static void tasklet_action(struct softirq_action *a) } } @@ -61414,10 +62706,11 @@ diff -urNp linux-2.6.38.7/kernel/softirq.c linux-2.6.38.7/kernel/softirq.c { struct tasklet_struct *list; -diff -urNp linux-2.6.38.7/kernel/sys.c linux-2.6.38.7/kernel/sys.c ---- linux-2.6.38.7/kernel/sys.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/sys.c 2011-04-28 19:34:15.000000000 -0400 -@@ -136,6 +136,12 @@ static int set_one_prio(struct task_stru +diff --git a/kernel/sys.c b/kernel/sys.c +index 18da702..eef32e9 100644 +--- a/kernel/sys.c ++++ b/kernel/sys.c +@@ -136,6 +136,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error) error = -EACCES; goto out; } @@ -61430,7 +62723,7 @@ diff -urNp linux-2.6.38.7/kernel/sys.c linux-2.6.38.7/kernel/sys.c no_nice = security_task_setnice(p, niceval); if (no_nice) { error = no_nice; -@@ -517,6 +523,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g +@@ -517,6 +523,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid) goto error; } @@ -61451,7 +62744,7 @@ diff -urNp linux-2.6.38.7/kernel/sys.c linux-2.6.38.7/kernel/sys.c if (capable(CAP_SETGID)) new->gid = new->egid = new->sgid = new->fsgid = gid; else if (gid == old->gid || gid == old->sgid) -@@ -626,6 +639,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u +@@ -626,6 +639,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid) goto error; } @@ -61474,7 +62767,7 @@ diff -urNp linux-2.6.38.7/kernel/sys.c linux-2.6.38.7/kernel/sys.c if (capable(CAP_SETUID)) { new->suid = new->uid = uid; if (uid != old->uid) { -@@ -724,6 +746,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, +@@ -724,6 +746,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid) goto error; } @@ -61484,7 +62777,7 @@ diff -urNp linux-2.6.38.7/kernel/sys.c linux-2.6.38.7/kernel/sys.c if (ruid != (uid_t) -1) { new->uid = ruid; if (ruid != old->uid) { -@@ -788,6 +813,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, +@@ -788,6 +813,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid) goto error; } @@ -61529,7 +62822,7 @@ diff -urNp linux-2.6.38.7/kernel/sys.c linux-2.6.38.7/kernel/sys.c abort_creds(new); return old_fsgid; -@@ -1616,7 +1652,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi +@@ -1616,7 +1652,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, error = get_dumpable(me->mm); break; case PR_SET_DUMPABLE: @@ -61538,9 +62831,10 @@ diff -urNp linux-2.6.38.7/kernel/sys.c linux-2.6.38.7/kernel/sys.c error = -EINVAL; break; } -diff -urNp linux-2.6.38.7/kernel/sysctl.c linux-2.6.38.7/kernel/sysctl.c ---- linux-2.6.38.7/kernel/sysctl.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.7/kernel/sysctl.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/kernel/sysctl.c b/kernel/sysctl.c +index 443fd20..ee63a78 100644 +--- a/kernel/sysctl.c ++++ b/kernel/sysctl.c @@ -84,6 +84,13 @@ @@ -61555,7 +62849,7 @@ diff -urNp linux-2.6.38.7/kernel/sysctl.c linux-2.6.38.7/kernel/sysctl.c /* External variables not in a header file. */ extern int sysctl_overcommit_memory; -@@ -195,6 +202,7 @@ static int sysrq_sysctl_handler(ctl_tabl +@@ -195,6 +202,7 @@ static int sysrq_sysctl_handler(ctl_table *table, int write, } #endif @@ -61652,7 +62946,7 @@ diff -urNp linux-2.6.38.7/kernel/sysctl.c linux-2.6.38.7/kernel/sysctl.c #else { .procname = "nr_trim_pages", -@@ -1698,6 +1747,16 @@ int sysctl_perm(struct ctl_table_root *r +@@ -1698,6 +1747,16 @@ int sysctl_perm(struct ctl_table_root *root, struct ctl_table *table, int op) int error; int mode; @@ -61669,7 +62963,7 @@ diff -urNp linux-2.6.38.7/kernel/sysctl.c linux-2.6.38.7/kernel/sysctl.c error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); if (error) return error; -@@ -2105,6 +2164,16 @@ int proc_dostring(struct ctl_table *tabl +@@ -2105,6 +2164,16 @@ int proc_dostring(struct ctl_table *table, int write, buffer, lenp, ppos); } @@ -61686,7 +62980,7 @@ diff -urNp linux-2.6.38.7/kernel/sysctl.c linux-2.6.38.7/kernel/sysctl.c static size_t proc_skip_spaces(char **buf) { size_t ret; -@@ -2210,6 +2279,8 @@ static int proc_put_long(void __user **b +@@ -2210,6 +2279,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val, len = strlen(tmp); if (len > *size) len = *size; @@ -61695,7 +62989,7 @@ diff -urNp linux-2.6.38.7/kernel/sysctl.c linux-2.6.38.7/kernel/sysctl.c if (copy_to_user(*buf, tmp, len)) return -EFAULT; *size -= len; -@@ -2526,8 +2597,11 @@ static int __do_proc_doulongvec_minmax(v +@@ -2526,8 +2597,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int *i = val; } else { val = convdiv * (*i) / convmul; @@ -61708,7 +63002,7 @@ diff -urNp linux-2.6.38.7/kernel/sysctl.c linux-2.6.38.7/kernel/sysctl.c err = proc_put_long(&buffer, &left, val, false); if (err) break; -@@ -2922,6 +2996,12 @@ int proc_dostring(struct ctl_table *tabl +@@ -2922,6 +2996,12 @@ int proc_dostring(struct ctl_table *table, int write, return -ENOSYS; } @@ -61729,10 +63023,11 @@ diff -urNp linux-2.6.38.7/kernel/sysctl.c linux-2.6.38.7/kernel/sysctl.c EXPORT_SYMBOL(proc_doulongvec_minmax); EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax); EXPORT_SYMBOL(register_sysctl_table); -diff -urNp linux-2.6.38.7/kernel/sysctl_check.c linux-2.6.38.7/kernel/sysctl_check.c ---- linux-2.6.38.7/kernel/sysctl_check.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/sysctl_check.c 2011-04-28 19:34:15.000000000 -0400 -@@ -131,6 +131,7 @@ int sysctl_check_table(struct nsproxy *n +diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c +index 10b90d8..30be85a 100644 +--- a/kernel/sysctl_check.c ++++ b/kernel/sysctl_check.c +@@ -131,6 +131,7 @@ int sysctl_check_table(struct nsproxy *namespaces, struct ctl_table *table) set_fail(&fail, table, "Directory with extra2"); } else { if ((table->proc_handler == proc_dostring) || @@ -61740,9 +63035,10 @@ diff -urNp linux-2.6.38.7/kernel/sysctl_check.c linux-2.6.38.7/kernel/sysctl_che (table->proc_handler == proc_dointvec) || (table->proc_handler == proc_dointvec_minmax) || (table->proc_handler == proc_dointvec_jiffies) || -diff -urNp linux-2.6.38.7/kernel/taskstats.c linux-2.6.38.7/kernel/taskstats.c ---- linux-2.6.38.7/kernel/taskstats.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/taskstats.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/kernel/taskstats.c b/kernel/taskstats.c +index 3971c6b..24ceb04 100644 +--- a/kernel/taskstats.c ++++ b/kernel/taskstats.c @@ -27,9 +27,12 @@ #include <linux/cgroup.h> #include <linux/fs.h> @@ -61766,10 +63062,27 @@ diff -urNp linux-2.6.38.7/kernel/taskstats.c linux-2.6.38.7/kernel/taskstats.c if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK]) return cmd_attr_register_cpumask(info); else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK]) -diff -urNp linux-2.6.38.7/kernel/time/tick-broadcast.c linux-2.6.38.7/kernel/time/tick-broadcast.c ---- linux-2.6.38.7/kernel/time/tick-broadcast.c 2011-05-22 23:05:20.000000000 -0400 -+++ linux-2.6.38.7/kernel/time/tick-broadcast.c 2011-05-22 23:06:04.000000000 -0400 -@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl +diff --git a/kernel/time.c b/kernel/time.c +index 3217435..3df434d 100644 +--- a/kernel/time.c ++++ b/kernel/time.c +@@ -163,6 +163,11 @@ int do_sys_settimeofday(struct timespec *tv, struct timezone *tz) + return error; + + if (tz) { ++ /* we log in do_settimeofday called below, so don't log twice ++ */ ++ if (!tv) ++ gr_log_timechange(); ++ + /* SMP safe, global irq locking makes it work. */ + sys_tz = *tz; + update_vsyscall_tz(); +diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c +index 2bb742c..d18e573 100644 +--- a/kernel/time/tick-broadcast.c ++++ b/kernel/time/tick-broadcast.c +@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu) * then clear the broadcast bit. */ if (!(dev->features & CLOCK_EVT_FEAT_C3STOP)) { @@ -61778,9 +63091,10 @@ diff -urNp linux-2.6.38.7/kernel/time/tick-broadcast.c linux-2.6.38.7/kernel/tim cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); tick_broadcast_clear_oneshot(cpu); -diff -urNp linux-2.6.38.7/kernel/time/timekeeping.c linux-2.6.38.7/kernel/time/timekeeping.c ---- linux-2.6.38.7/kernel/time/timekeeping.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/time/timekeeping.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c +index d27c756..6d69585 100644 +--- a/kernel/time/timekeeping.c ++++ b/kernel/time/timekeeping.c @@ -14,6 +14,7 @@ #include <linux/init.h> #include <linux/mm.h> @@ -61798,10 +63112,11 @@ diff -urNp linux-2.6.38.7/kernel/time/timekeeping.c linux-2.6.38.7/kernel/time/t write_seqlock_irqsave(&xtime_lock, flags); timekeeping_forward_now(); -diff -urNp linux-2.6.38.7/kernel/time/timer_list.c linux-2.6.38.7/kernel/time/timer_list.c ---- linux-2.6.38.7/kernel/time/timer_list.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/time/timer_list.c 2011-04-28 19:34:15.000000000 -0400 -@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, +diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c +index 3258455..f35227d 100644 +--- a/kernel/time/timer_list.c ++++ b/kernel/time/timer_list.c +@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases); static void print_name_offset(struct seq_file *m, void *sym) { @@ -61830,7 +63145,7 @@ diff -urNp linux-2.6.38.7/kernel/time/timer_list.c linux-2.6.38.7/kernel/time/ti SEQ_printf(m, " .index: %d\n", base->index); SEQ_printf(m, " .resolution: %Lu nsecs\n", -@@ -293,7 +301,11 @@ static int __init init_timer_list_procfs +@@ -293,7 +301,11 @@ static int __init init_timer_list_procfs(void) { struct proc_dir_entry *pe; @@ -61842,9 +63157,10 @@ diff -urNp linux-2.6.38.7/kernel/time/timer_list.c linux-2.6.38.7/kernel/time/ti if (!pe) return -ENOMEM; return 0; -diff -urNp linux-2.6.38.7/kernel/time/timer_stats.c linux-2.6.38.7/kernel/time/timer_stats.c ---- linux-2.6.38.7/kernel/time/timer_stats.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/time/timer_stats.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c +index 2f3b585..2425fbe 100644 +--- a/kernel/time/timer_stats.c ++++ b/kernel/time/timer_stats.c @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop; static unsigned long nr_entries; static struct entry entries[MAX_ENTRIES]; @@ -61863,7 +63179,7 @@ diff -urNp linux-2.6.38.7/kernel/time/timer_stats.c linux-2.6.38.7/kernel/time/t } static struct entry *alloc_entry(void) -@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *time +@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf, if (likely(entry)) entry->count++; else @@ -61872,7 +63188,7 @@ diff -urNp linux-2.6.38.7/kernel/time/timer_stats.c linux-2.6.38.7/kernel/time/t out_unlock: raw_spin_unlock_irqrestore(lock, flags); -@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *time +@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf, static void print_name_offset(struct seq_file *m, unsigned long addr) { @@ -61889,7 +63205,7 @@ diff -urNp linux-2.6.38.7/kernel/time/timer_stats.c linux-2.6.38.7/kernel/time/t } static int tstats_show(struct seq_file *m, void *v) -@@ -300,9 +304,9 @@ static int tstats_show(struct seq_file * +@@ -300,9 +304,9 @@ static int tstats_show(struct seq_file *m, void *v) seq_puts(m, "Timer Stats Version: v0.2\n"); seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms); @@ -61901,7 +63217,7 @@ diff -urNp linux-2.6.38.7/kernel/time/timer_stats.c linux-2.6.38.7/kernel/time/t for (i = 0; i < nr_entries; i++) { entry = entries + i; -@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(voi +@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void) { struct proc_dir_entry *pe; @@ -61913,24 +63229,10 @@ diff -urNp linux-2.6.38.7/kernel/time/timer_stats.c linux-2.6.38.7/kernel/time/t if (!pe) return -ENOMEM; return 0; -diff -urNp linux-2.6.38.7/kernel/time.c linux-2.6.38.7/kernel/time.c ---- linux-2.6.38.7/kernel/time.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/time.c 2011-04-28 19:34:15.000000000 -0400 -@@ -163,6 +163,11 @@ int do_sys_settimeofday(struct timespec - return error; - - if (tz) { -+ /* we log in do_settimeofday called below, so don't log twice -+ */ -+ if (!tv) -+ gr_log_timechange(); -+ - /* SMP safe, global irq locking makes it work. */ - sys_tz = *tz; - update_vsyscall_tz(); -diff -urNp linux-2.6.38.7/kernel/timer.c linux-2.6.38.7/kernel/timer.c ---- linux-2.6.38.7/kernel/timer.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/timer.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/kernel/timer.c b/kernel/timer.c +index d645992..2b9748a 100644 +--- a/kernel/timer.c ++++ b/kernel/timer.c @@ -1276,7 +1276,7 @@ void update_process_times(int user_tick) /* * This function runs timers and the timer-tq in bottom half context. @@ -61940,10 +63242,11 @@ diff -urNp linux-2.6.38.7/kernel/timer.c linux-2.6.38.7/kernel/timer.c { struct tvec_base *base = __this_cpu_read(tvec_bases); -diff -urNp linux-2.6.38.7/kernel/trace/blktrace.c linux-2.6.38.7/kernel/trace/blktrace.c ---- linux-2.6.38.7/kernel/trace/blktrace.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/trace/blktrace.c 2011-04-28 19:57:25.000000000 -0400 -@@ -321,7 +321,7 @@ static ssize_t blk_dropped_read(struct f +diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c +index cbafed7..8e41d9d 100644 +--- a/kernel/trace/blktrace.c ++++ b/kernel/trace/blktrace.c +@@ -321,7 +321,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer, struct blk_trace *bt = filp->private_data; char buf[16]; @@ -61952,7 +63255,7 @@ diff -urNp linux-2.6.38.7/kernel/trace/blktrace.c linux-2.6.38.7/kernel/trace/bl return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf)); } -@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(str +@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf, return 1; bt = buf->chan->private_data; @@ -61961,7 +63264,7 @@ diff -urNp linux-2.6.38.7/kernel/trace/blktrace.c linux-2.6.38.7/kernel/trace/bl return 0; } -@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_qu +@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, bt->dir = dir; bt->dev = dev; @@ -61970,10 +63273,11 @@ diff -urNp linux-2.6.38.7/kernel/trace/blktrace.c linux-2.6.38.7/kernel/trace/bl ret = -EIO; bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt, -diff -urNp linux-2.6.38.7/kernel/trace/ftrace.c linux-2.6.38.7/kernel/trace/ftrace.c ---- linux-2.6.38.7/kernel/trace/ftrace.c 2011-04-18 17:27:14.000000000 -0400 -+++ linux-2.6.38.7/kernel/trace/ftrace.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1107,13 +1107,18 @@ ftrace_code_disable(struct module *mod, +diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c +index 9803b68..42b944f 100644 +--- a/kernel/trace/ftrace.c ++++ b/kernel/trace/ftrace.c +@@ -1107,13 +1107,18 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec) ip = rec->ip; @@ -61994,10 +63298,11 @@ diff -urNp linux-2.6.38.7/kernel/trace/ftrace.c linux-2.6.38.7/kernel/trace/ftra } /* -diff -urNp linux-2.6.38.7/kernel/trace/ring_buffer.c linux-2.6.38.7/kernel/trace/ring_buffer.c ---- linux-2.6.38.7/kernel/trace/ring_buffer.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/trace/ring_buffer.c 2011-04-28 19:34:15.000000000 -0400 -@@ -669,7 +669,7 @@ static struct list_head *rb_list_head(st +diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c +index bd1c35a..6ee56b4 100644 +--- a/kernel/trace/ring_buffer.c ++++ b/kernel/trace/ring_buffer.c +@@ -669,7 +669,7 @@ static struct list_head *rb_list_head(struct list_head *list) * the reader page). But if the next page is a header page, * its flags will be non zero. */ @@ -62006,10 +63311,11 @@ diff -urNp linux-2.6.38.7/kernel/trace/ring_buffer.c linux-2.6.38.7/kernel/trace rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, struct buffer_page *page, struct list_head *list) { -diff -urNp linux-2.6.38.7/kernel/trace/trace.c linux-2.6.38.7/kernel/trace/trace.c ---- linux-2.6.38.7/kernel/trace/trace.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/trace/trace.c 2011-05-16 21:47:08.000000000 -0400 -@@ -3316,6 +3316,8 @@ static ssize_t tracing_splice_read_pipe( +diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c +index dc53ecb..c2ced85 100644 +--- a/kernel/trace/trace.c ++++ b/kernel/trace/trace.c +@@ -3316,6 +3316,8 @@ static ssize_t tracing_splice_read_pipe(struct file *filp, size_t rem; unsigned int i; @@ -62018,7 +63324,7 @@ diff -urNp linux-2.6.38.7/kernel/trace/trace.c linux-2.6.38.7/kernel/trace/trace if (splice_grow_spd(pipe, &spd)) return -ENOMEM; -@@ -3799,6 +3801,8 @@ tracing_buffers_splice_read(struct file +@@ -3799,6 +3801,8 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos, int entries, size, i; size_t ret; @@ -62027,7 +63333,7 @@ diff -urNp linux-2.6.38.7/kernel/trace/trace.c linux-2.6.38.7/kernel/trace/trace if (splice_grow_spd(pipe, &spd)) return -ENOMEM; -@@ -3967,10 +3971,9 @@ static const struct file_operations trac +@@ -3967,10 +3971,9 @@ static const struct file_operations tracing_dyn_info_fops = { }; #endif @@ -62051,10 +63357,11 @@ diff -urNp linux-2.6.38.7/kernel/trace/trace.c linux-2.6.38.7/kernel/trace/trace static int once; struct dentry *d_tracer; -diff -urNp linux-2.6.38.7/kernel/trace/trace_events.c linux-2.6.38.7/kernel/trace/trace_events.c ---- linux-2.6.38.7/kernel/trace/trace_events.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/trace/trace_events.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1240,10 +1240,10 @@ static LIST_HEAD(ftrace_module_file_list +diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c +index 5f499e0..8462a2a 100644 +--- a/kernel/trace/trace_events.c ++++ b/kernel/trace/trace_events.c +@@ -1240,10 +1240,10 @@ static LIST_HEAD(ftrace_module_file_list); struct ftrace_module_file_ops { struct list_head list; struct module *mod; @@ -62069,9 +63376,10 @@ diff -urNp linux-2.6.38.7/kernel/trace/trace_events.c linux-2.6.38.7/kernel/trac }; static struct ftrace_module_file_ops * -diff -urNp linux-2.6.38.7/kernel/trace/trace_mmiotrace.c linux-2.6.38.7/kernel/trace/trace_mmiotrace.c ---- linux-2.6.38.7/kernel/trace/trace_mmiotrace.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/trace/trace_mmiotrace.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c +index 017fa37..39f50bc 100644 +--- a/kernel/trace/trace_mmiotrace.c ++++ b/kernel/trace/trace_mmiotrace.c @@ -24,7 +24,7 @@ struct header_iter { static struct trace_array *mmio_trace_array; static bool overrun_detected; @@ -62081,7 +63389,7 @@ diff -urNp linux-2.6.38.7/kernel/trace/trace_mmiotrace.c linux-2.6.38.7/kernel/t static void mmio_reset_data(struct trace_array *tr) { -@@ -127,7 +127,7 @@ static void mmio_close(struct trace_iter +@@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter) static unsigned long count_overruns(struct trace_iterator *iter) { @@ -62090,7 +63398,7 @@ diff -urNp linux-2.6.38.7/kernel/trace/trace_mmiotrace.c linux-2.6.38.7/kernel/t unsigned long over = ring_buffer_overruns(iter->tr->buffer); if (over > prev_overruns) -@@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct +@@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr, event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW, sizeof(*entry), 0, pc); if (!event) { @@ -62099,7 +63407,7 @@ diff -urNp linux-2.6.38.7/kernel/trace/trace_mmiotrace.c linux-2.6.38.7/kernel/t return; } entry = ring_buffer_event_data(event); -@@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct +@@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr, event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP, sizeof(*entry), 0, pc); if (!event) { @@ -62108,10 +63416,11 @@ diff -urNp linux-2.6.38.7/kernel/trace/trace_mmiotrace.c linux-2.6.38.7/kernel/t return; } entry = ring_buffer_event_data(event); -diff -urNp linux-2.6.38.7/kernel/trace/trace_output.c linux-2.6.38.7/kernel/trace/trace_output.c ---- linux-2.6.38.7/kernel/trace/trace_output.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/trace/trace_output.c 2011-04-28 19:34:15.000000000 -0400 -@@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, +diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c +index 02272ba..7915ee4 100644 +--- a/kernel/trace/trace_output.c ++++ b/kernel/trace/trace_output.c +@@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, struct path *path) p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); if (!IS_ERR(p)) { @@ -62120,9 +63429,10 @@ diff -urNp linux-2.6.38.7/kernel/trace/trace_output.c linux-2.6.38.7/kernel/trac if (p) { s->len = p - s->buffer; return 1; -diff -urNp linux-2.6.38.7/kernel/trace/trace_stack.c linux-2.6.38.7/kernel/trace/trace_stack.c ---- linux-2.6.38.7/kernel/trace/trace_stack.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/trace/trace_stack.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c +index 4c5dead..9ea847d 100644 +--- a/kernel/trace/trace_stack.c ++++ b/kernel/trace/trace_stack.c @@ -50,7 +50,7 @@ static inline void check_stack(void) return; @@ -62132,9 +63442,10 @@ diff -urNp linux-2.6.38.7/kernel/trace/trace_stack.c linux-2.6.38.7/kernel/trace return; local_irq_save(flags); -diff -urNp linux-2.6.38.7/kernel/trace/trace_workqueue.c linux-2.6.38.7/kernel/trace/trace_workqueue.c ---- linux-2.6.38.7/kernel/trace/trace_workqueue.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/kernel/trace/trace_workqueue.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/kernel/trace/trace_workqueue.c b/kernel/trace/trace_workqueue.c +index 209b379..7f76423 100644 +--- a/kernel/trace/trace_workqueue.c ++++ b/kernel/trace/trace_workqueue.c @@ -22,7 +22,7 @@ struct cpu_workqueue_stats { int cpu; pid_t pid; @@ -62153,7 +63464,7 @@ diff -urNp linux-2.6.38.7/kernel/trace/trace_workqueue.c linux-2.6.38.7/kernel/t goto found; } } -@@ -210,7 +210,7 @@ static int workqueue_stat_show(struct se +@@ -210,7 +210,7 @@ static int workqueue_stat_show(struct seq_file *s, void *p) tsk = get_pid_task(pid, PIDTYPE_PID); if (tsk) { seq_printf(s, "%3d %6d %6u %s\n", cws->cpu, @@ -62162,10 +63473,23 @@ diff -urNp linux-2.6.38.7/kernel/trace/trace_workqueue.c linux-2.6.38.7/kernel/t tsk->comm); put_task_struct(tsk); } -diff -urNp linux-2.6.38.7/lib/bug.c linux-2.6.38.7/lib/bug.c ---- linux-2.6.38.7/lib/bug.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/lib/bug.c 2011-04-28 19:34:15.000000000 -0400 -@@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l +diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug +index d1b5951..b9e45c4 100644 +--- a/lib/Kconfig.debug ++++ b/lib/Kconfig.debug +@@ -1066,6 +1066,7 @@ config LATENCYTOP + depends on DEBUG_KERNEL + depends on STACKTRACE_SUPPORT + depends on PROC_FS ++ depends on !GRKERNSEC_HIDESYM + select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE + select KALLSYMS + select KALLSYMS_ALL +diff --git a/lib/bug.c b/lib/bug.c +index 1955209..cbbb2ad 100644 +--- a/lib/bug.c ++++ b/lib/bug.c +@@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs) return BUG_TRAP_TYPE_NONE; bug = find_bug(bugaddr); @@ -62174,10 +63498,11 @@ diff -urNp linux-2.6.38.7/lib/bug.c linux-2.6.38.7/lib/bug.c file = NULL; line = 0; -diff -urNp linux-2.6.38.7/lib/debugobjects.c linux-2.6.38.7/lib/debugobjects.c ---- linux-2.6.38.7/lib/debugobjects.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/lib/debugobjects.c 2011-04-28 19:34:15.000000000 -0400 -@@ -281,7 +281,7 @@ static void debug_object_is_on_stack(voi +diff --git a/lib/debugobjects.c b/lib/debugobjects.c +index deebcc5..6f0a6ef 100644 +--- a/lib/debugobjects.c ++++ b/lib/debugobjects.c +@@ -281,7 +281,7 @@ static void debug_object_is_on_stack(void *addr, int onstack) if (limit > 4) return; @@ -62186,9 +63511,10 @@ diff -urNp linux-2.6.38.7/lib/debugobjects.c linux-2.6.38.7/lib/debugobjects.c if (is_on_stack == onstack) return; -diff -urNp linux-2.6.38.7/lib/dma-debug.c linux-2.6.38.7/lib/dma-debug.c ---- linux-2.6.38.7/lib/dma-debug.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/lib/dma-debug.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/lib/dma-debug.c b/lib/dma-debug.c +index 4bfb047..c143a82 100644 +--- a/lib/dma-debug.c ++++ b/lib/dma-debug.c @@ -862,7 +862,7 @@ out: static void check_for_stack(struct device *dev, void *addr) @@ -62198,9 +63524,10 @@ diff -urNp linux-2.6.38.7/lib/dma-debug.c linux-2.6.38.7/lib/dma-debug.c err_printk(dev, NULL, "DMA-API: device driver maps memory from" "stack [addr=%p]\n", addr); } -diff -urNp linux-2.6.38.7/lib/inflate.c linux-2.6.38.7/lib/inflate.c ---- linux-2.6.38.7/lib/inflate.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/lib/inflate.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/lib/inflate.c b/lib/inflate.c +index 013a761..c28f3fc 100644 +--- a/lib/inflate.c ++++ b/lib/inflate.c @@ -269,7 +269,7 @@ static void free(void *where) malloc_ptr = free_mem_ptr; } @@ -62210,20 +63537,10 @@ diff -urNp linux-2.6.38.7/lib/inflate.c linux-2.6.38.7/lib/inflate.c #define free(a) kfree(a) #endif -diff -urNp linux-2.6.38.7/lib/Kconfig.debug linux-2.6.38.7/lib/Kconfig.debug ---- linux-2.6.38.7/lib/Kconfig.debug 2011-04-22 19:20:59.000000000 -0400 -+++ linux-2.6.38.7/lib/Kconfig.debug 2011-04-28 19:34:15.000000000 -0400 -@@ -1066,6 +1066,7 @@ config LATENCYTOP - depends on DEBUG_KERNEL - depends on STACKTRACE_SUPPORT - depends on PROC_FS -+ depends on !GRKERNSEC_HIDESYM - select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE - select KALLSYMS - select KALLSYMS_ALL -diff -urNp linux-2.6.38.7/lib/kref.c linux-2.6.38.7/lib/kref.c ---- linux-2.6.38.7/lib/kref.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/lib/kref.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/lib/kref.c b/lib/kref.c +index 3efb882..8492f4c 100644 +--- a/lib/kref.c ++++ b/lib/kref.c @@ -52,7 +52,7 @@ void kref_get(struct kref *kref) */ int kref_put(struct kref *kref, void (*release)(struct kref *kref)) @@ -62233,9 +63550,10 @@ diff -urNp linux-2.6.38.7/lib/kref.c linux-2.6.38.7/lib/kref.c WARN_ON(release == (void (*)(struct kref *))kfree); if (atomic_dec_and_test(&kref->refcount)) { -diff -urNp linux-2.6.38.7/lib/radix-tree.c linux-2.6.38.7/lib/radix-tree.c ---- linux-2.6.38.7/lib/radix-tree.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/lib/radix-tree.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/lib/radix-tree.c b/lib/radix-tree.c +index 7ea2e03..cabda0f 100644 +--- a/lib/radix-tree.c ++++ b/lib/radix-tree.c @@ -80,7 +80,7 @@ struct radix_tree_preload { int nr; struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; @@ -62245,9 +63563,10 @@ diff -urNp linux-2.6.38.7/lib/radix-tree.c linux-2.6.38.7/lib/radix-tree.c static inline void *ptr_to_indirect(void *ptr) { -diff -urNp linux-2.6.38.7/lib/vsprintf.c linux-2.6.38.7/lib/vsprintf.c ---- linux-2.6.38.7/lib/vsprintf.c 2011-04-22 19:20:59.000000000 -0400 -+++ linux-2.6.38.7/lib/vsprintf.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/lib/vsprintf.c b/lib/vsprintf.c +index f3fd99a..3e0408c 100644 +--- a/lib/vsprintf.c ++++ b/lib/vsprintf.c @@ -16,6 +16,9 @@ * - scnprintf and vscnprintf */ @@ -62258,7 +63577,7 @@ diff -urNp linux-2.6.38.7/lib/vsprintf.c linux-2.6.38.7/lib/vsprintf.c #include <stdarg.h> #include <linux/module.h> #include <linux/types.h> -@@ -433,7 +436,7 @@ char *symbol_string(char *buf, char *end +@@ -433,7 +436,7 @@ char *symbol_string(char *buf, char *end, void *ptr, unsigned long value = (unsigned long) ptr; #ifdef CONFIG_KALLSYMS char sym[KSYM_SYMBOL_LEN]; @@ -62267,7 +63586,7 @@ diff -urNp linux-2.6.38.7/lib/vsprintf.c linux-2.6.38.7/lib/vsprintf.c sprint_symbol(sym, value); else kallsyms_lookup(value, NULL, NULL, NULL, sym); -@@ -795,7 +798,11 @@ char *uuid_string(char *buf, char *end, +@@ -795,7 +798,11 @@ char *uuid_string(char *buf, char *end, const u8 *addr, return string(buf, end, uuid, spec); } @@ -62288,7 +63607,7 @@ diff -urNp linux-2.6.38.7/lib/vsprintf.c linux-2.6.38.7/lib/vsprintf.c * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref] * - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201] * - 'M' For a 6-byte MAC address, it prints the address in the -@@ -852,12 +861,12 @@ char *pointer(const char *fmt, char *buf +@@ -852,12 +861,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, { if (!ptr) { /* @@ -62303,7 +63622,7 @@ diff -urNp linux-2.6.38.7/lib/vsprintf.c linux-2.6.38.7/lib/vsprintf.c } switch (*fmt) { -@@ -867,6 +876,13 @@ char *pointer(const char *fmt, char *buf +@@ -867,6 +876,13 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, /* Fallthrough */ case 'S': case 's': @@ -62317,7 +63636,7 @@ diff -urNp linux-2.6.38.7/lib/vsprintf.c linux-2.6.38.7/lib/vsprintf.c return symbol_string(buf, end, ptr, spec, *fmt); case 'R': case 'r': -@@ -1631,11 +1647,11 @@ int bstr_printf(char *buf, size_t size, +@@ -1631,11 +1647,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf) typeof(type) value; \ if (sizeof(type) == 8) { \ args = PTR_ALIGN(args, sizeof(u32)); \ @@ -62332,7 +63651,7 @@ diff -urNp linux-2.6.38.7/lib/vsprintf.c linux-2.6.38.7/lib/vsprintf.c } \ args += sizeof(type); \ value; \ -@@ -1698,7 +1714,7 @@ int bstr_printf(char *buf, size_t size, +@@ -1698,7 +1714,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf) case FORMAT_TYPE_STR: { const char *str_arg = args; args += strlen(str_arg) + 1; @@ -62341,46 +63660,31 @@ diff -urNp linux-2.6.38.7/lib/vsprintf.c linux-2.6.38.7/lib/vsprintf.c break; } -diff -urNp linux-2.6.38.7/localversion-grsec linux-2.6.38.7/localversion-grsec ---- linux-2.6.38.7/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/localversion-grsec 2011-04-28 19:34:15.000000000 -0400 +diff --git a/localversion-grsec b/localversion-grsec +new file mode 100644 +index 0000000..7cd6065 +--- /dev/null ++++ b/localversion-grsec @@ -0,0 +1 @@ +-grsec -diff -urNp linux-2.6.38.7/Makefile linux-2.6.38.7/Makefile ---- linux-2.6.38.7/Makefile 2011-05-22 23:05:17.000000000 -0400 -+++ linux-2.6.38.7/Makefile 2011-05-22 23:05:53.000000000 -0400 -@@ -233,8 +233,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" - - HOSTCC = gcc - HOSTCXX = g++ --HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer --HOSTCXXFLAGS = -O2 -+HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-empty-body -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks -+HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks - - # Decide whether to build built-in, modular, or both. - # Normally, just do built-in. -@@ -352,6 +352,7 @@ LINUXINCLUDE := -I$(srctree)/arch/$(h - KBUILD_CPPFLAGS := -D__KERNEL__ - - KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ -+ -W -Wno-empty-body -Wno-unused-parameter -Wno-missing-field-initializers \ - -fno-strict-aliasing -fno-common \ - -Werror-implicit-function-declaration \ - -Wno-format-security \ -@@ -681,7 +682,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.38.7/mm/bootmem.c linux-2.6.38.7/mm/bootmem.c ---- linux-2.6.38.7/mm/bootmem.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/bootmem.c 2011-04-28 19:34:15.000000000 -0400 -@@ -201,19 +201,30 @@ static void __init __free_pages_memory(u +diff --git a/mm/Kconfig b/mm/Kconfig +index e9c0c61..7c31b91 100644 +--- a/mm/Kconfig ++++ b/mm/Kconfig +@@ -240,7 +240,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 --git a/mm/bootmem.c b/mm/bootmem.c +index 13b0caa..5ad9e8d 100644 +--- a/mm/bootmem.c ++++ b/mm/bootmem.c +@@ -201,19 +201,30 @@ static void __init __free_pages_memory(unsigned long start, unsigned long end) unsigned long __init free_all_memory_core_early(int nodeid) { int i; @@ -62413,10 +63717,11 @@ diff -urNp linux-2.6.38.7/mm/bootmem.c linux-2.6.38.7/mm/bootmem.c return count; } -diff -urNp linux-2.6.38.7/mm/filemap.c linux-2.6.38.7/mm/filemap.c ---- linux-2.6.38.7/mm/filemap.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/filemap.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1664,7 +1664,7 @@ int generic_file_mmap(struct file * file +diff --git a/mm/filemap.c b/mm/filemap.c +index 83a45d3..54678c3 100644 +--- a/mm/filemap.c ++++ b/mm/filemap.c +@@ -1664,7 +1664,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma) struct address_space *mapping = file->f_mapping; if (!mapping->a_ops->readpage) @@ -62425,7 +63730,7 @@ diff -urNp linux-2.6.38.7/mm/filemap.c linux-2.6.38.7/mm/filemap.c file_accessed(file); vma->vm_ops = &generic_file_vm_ops; vma->vm_flags |= VM_CAN_NONLINEAR; -@@ -2060,6 +2060,7 @@ inline int generic_write_checks(struct f +@@ -2060,6 +2060,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i *pos = i_size_read(inode); if (limit != RLIM_INFINITY) { @@ -62433,10 +63738,11 @@ diff -urNp linux-2.6.38.7/mm/filemap.c linux-2.6.38.7/mm/filemap.c if (*pos >= limit) { send_sig(SIGXFSZ, current, 0); return -EFBIG; -diff -urNp linux-2.6.38.7/mm/fremap.c linux-2.6.38.7/mm/fremap.c ---- linux-2.6.38.7/mm/fremap.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/fremap.c 2011-04-28 19:34:15.000000000 -0400 -@@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign +diff --git a/mm/fremap.c b/mm/fremap.c +index ec520c7..85844a1 100644 +--- a/mm/fremap.c ++++ b/mm/fremap.c +@@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, retry: vma = find_vma(mm, start); @@ -62448,7 +63754,7 @@ diff -urNp linux-2.6.38.7/mm/fremap.c linux-2.6.38.7/mm/fremap.c /* * Make sure the vma is shared, that it supports prefaulting, * and that the remapped range is valid and fully within -@@ -224,7 +229,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsign +@@ -224,7 +229,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, /* * drop PG_Mlocked flag for over-mapped range */ @@ -62457,9 +63763,10 @@ diff -urNp linux-2.6.38.7/mm/fremap.c linux-2.6.38.7/mm/fremap.c munlock_vma_pages_range(vma, start, start + size); vma->vm_flags = saved_flags; } -diff -urNp linux-2.6.38.7/mm/highmem.c linux-2.6.38.7/mm/highmem.c ---- linux-2.6.38.7/mm/highmem.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/highmem.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/mm/highmem.c b/mm/highmem.c +index 693394d..fc807e2 100644 +--- a/mm/highmem.c ++++ b/mm/highmem.c @@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void) * So no dangers, even with speculative execution. */ @@ -62485,9 +63792,10 @@ diff -urNp linux-2.6.38.7/mm/highmem.c linux-2.6.38.7/mm/highmem.c pkmap_count[last_pkmap_nr] = 1; set_page_address(page, (void *)vaddr); -diff -urNp linux-2.6.38.7/mm/huge_memory.c linux-2.6.38.7/mm/huge_memory.c ---- linux-2.6.38.7/mm/huge_memory.c 2011-05-10 22:06:27.000000000 -0400 -+++ linux-2.6.38.7/mm/huge_memory.c 2011-05-10 22:06:56.000000000 -0400 +diff --git a/mm/huge_memory.c b/mm/huge_memory.c +index 56cac93..f8fb029 100644 +--- a/mm/huge_memory.c ++++ b/mm/huge_memory.c @@ -698,7 +698,7 @@ out: * run pte_offset_map on the pmd, if an huge pmd could * materialize from under us from a different thread. @@ -62497,10 +63805,11 @@ diff -urNp linux-2.6.38.7/mm/huge_memory.c linux-2.6.38.7/mm/huge_memory.c return VM_FAULT_OOM; /* if an huge pmd materialized from under us just retry later */ if (unlikely(pmd_trans_huge(*pmd))) -diff -urNp linux-2.6.38.7/mm/hugetlb.c linux-2.6.38.7/mm/hugetlb.c ---- linux-2.6.38.7/mm/hugetlb.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/hugetlb.c 2011-04-28 19:34:15.000000000 -0400 -@@ -2333,6 +2333,27 @@ static int unmap_ref_private(struct mm_s +diff --git a/mm/hugetlb.c b/mm/hugetlb.c +index bb0b7c1..3543536 100644 +--- a/mm/hugetlb.c ++++ b/mm/hugetlb.c +@@ -2333,6 +2333,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma, return 1; } @@ -62551,7 +63860,7 @@ diff -urNp linux-2.6.38.7/mm/hugetlb.c linux-2.6.38.7/mm/hugetlb.c if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) { /* Optimization, do the COW without a second fault */ ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page); -@@ -2614,6 +2644,10 @@ int hugetlb_fault(struct mm_struct *mm, +@@ -2614,6 +2644,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, static DEFINE_MUTEX(hugetlb_instantiation_mutex); struct hstate *h = hstate_vma(vma); @@ -62562,7 +63871,7 @@ diff -urNp linux-2.6.38.7/mm/hugetlb.c linux-2.6.38.7/mm/hugetlb.c ptep = huge_pte_offset(mm, address); if (ptep) { entry = huge_ptep_get(ptep); -@@ -2625,6 +2659,26 @@ int hugetlb_fault(struct mm_struct *mm, +@@ -2625,6 +2659,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, VM_FAULT_SET_HINDEX(h - hstates); } @@ -62589,22 +63898,11 @@ diff -urNp linux-2.6.38.7/mm/hugetlb.c linux-2.6.38.7/mm/hugetlb.c ptep = huge_pte_alloc(mm, address, huge_page_size(h)); if (!ptep) return VM_FAULT_OOM; -diff -urNp linux-2.6.38.7/mm/Kconfig linux-2.6.38.7/mm/Kconfig ---- linux-2.6.38.7/mm/Kconfig 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/Kconfig 2011-04-28 19:34:15.000000000 -0400 -@@ -240,7 +240,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.38.7/mm/kmemleak.c linux-2.6.38.7/mm/kmemleak.c ---- linux-2.6.38.7/mm/kmemleak.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/kmemleak.c 2011-04-28 19:34:15.000000000 -0400 -@@ -357,7 +357,7 @@ static void print_unreferenced(struct se +diff --git a/mm/kmemleak.c b/mm/kmemleak.c +index a351b68..b7d6566 100644 +--- a/mm/kmemleak.c ++++ b/mm/kmemleak.c +@@ -357,7 +357,7 @@ static void print_unreferenced(struct seq_file *seq, for (i = 0; i < object->trace_len; i++) { void *ptr = (void *)object->trace[i]; @@ -62613,9 +63911,10 @@ diff -urNp linux-2.6.38.7/mm/kmemleak.c linux-2.6.38.7/mm/kmemleak.c } } -diff -urNp linux-2.6.38.7/mm/maccess.c linux-2.6.38.7/mm/maccess.c ---- linux-2.6.38.7/mm/maccess.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/maccess.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/mm/maccess.c b/mm/maccess.c +index e2b6f56..4cee182 100644 +--- a/mm/maccess.c ++++ b/mm/maccess.c @@ -15,10 +15,10 @@ * happens, handle that and return -EFAULT. */ @@ -62642,10 +63941,11 @@ diff -urNp linux-2.6.38.7/mm/maccess.c linux-2.6.38.7/mm/maccess.c { long ret; mm_segment_t old_fs = get_fs(); -diff -urNp linux-2.6.38.7/mm/madvise.c linux-2.6.38.7/mm/madvise.c ---- linux-2.6.38.7/mm/madvise.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/madvise.c 2011-04-28 19:34:15.000000000 -0400 -@@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a +diff --git a/mm/madvise.c b/mm/madvise.c +index 2221491..b8ee2d8 100644 +--- a/mm/madvise.c ++++ b/mm/madvise.c +@@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_area_struct * vma, pgoff_t pgoff; unsigned long new_flags = vma->vm_flags; @@ -62670,7 +63970,7 @@ diff -urNp linux-2.6.38.7/mm/madvise.c linux-2.6.38.7/mm/madvise.c vma->vm_flags = new_flags; out: -@@ -168,6 +179,11 @@ static long madvise_dontneed(struct vm_a +@@ -168,6 +179,11 @@ static long madvise_dontneed(struct vm_area_struct * vma, struct vm_area_struct ** prev, unsigned long start, unsigned long end) { @@ -62682,7 +63982,7 @@ diff -urNp linux-2.6.38.7/mm/madvise.c linux-2.6.38.7/mm/madvise.c *prev = vma; if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP)) return -EINVAL; -@@ -180,6 +196,21 @@ static long madvise_dontneed(struct vm_a +@@ -180,6 +196,21 @@ static long madvise_dontneed(struct vm_area_struct * vma, zap_page_range(vma, start, end - start, &details); } else zap_page_range(vma, start, end - start, NULL); @@ -62704,7 +64004,7 @@ diff -urNp linux-2.6.38.7/mm/madvise.c linux-2.6.38.7/mm/madvise.c return 0; } -@@ -376,6 +407,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, +@@ -376,6 +407,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior) if (end < start) goto out; @@ -62721,10 +64021,87 @@ diff -urNp linux-2.6.38.7/mm/madvise.c linux-2.6.38.7/mm/madvise.c error = 0; if (end == start) goto out; -diff -urNp linux-2.6.38.7/mm/memory.c linux-2.6.38.7/mm/memory.c ---- linux-2.6.38.7/mm/memory.c 2011-05-22 23:05:20.000000000 -0400 -+++ linux-2.6.38.7/mm/memory.c 2011-05-22 23:08:56.000000000 -0400 -@@ -259,8 +259,12 @@ static inline void free_pmd_range(struct +diff --git a/mm/memory-failure.c b/mm/memory-failure.c +index 0207c2f..cfd4b68 100644 +--- a/mm/memory-failure.c ++++ b/mm/memory-failure.c +@@ -58,7 +58,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0; + + 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) + +@@ -1012,7 +1012,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags) + } + + nr_pages = 1 << compound_trans_order(hpage); +- atomic_long_add(nr_pages, &mce_bad_pages); ++ atomic_long_add_unchecked(nr_pages, &mce_bad_pages); + + /* + * We need/can do nothing about count=0 pages. +@@ -1042,7 +1042,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags) + if (!PageHWPoison(hpage) + || (hwpoison_filter(p) && TestClearPageHWPoison(p)) + || (p != hpage && TestSetPageHWPoison(hpage))) { +- atomic_long_sub(nr_pages, &mce_bad_pages); ++ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages); + return 0; + } + set_page_hwpoison_huge_page(hpage); +@@ -1100,7 +1100,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags) + } + if (hwpoison_filter(p)) { + if (TestClearPageHWPoison(p)) +- atomic_long_sub(nr_pages, &mce_bad_pages); ++ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages); + unlock_page(hpage); + put_page(hpage); + return 0; +@@ -1226,7 +1226,7 @@ int unpoison_memory(unsigned long pfn) + return 0; + } + if (TestClearPageHWPoison(p)) +- atomic_long_sub(nr_pages, &mce_bad_pages); ++ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages); + pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn); + return 0; + } +@@ -1240,7 +1240,7 @@ int unpoison_memory(unsigned long pfn) + */ + if (TestClearPageHWPoison(page)) { + pr_info("MCE: Software-unpoisoned page %#lx\n", pfn); +- atomic_long_sub(nr_pages, &mce_bad_pages); ++ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages); + freeit = 1; + if (PageHuge(page)) + clear_page_hwpoison_huge_page(page); +@@ -1353,7 +1353,7 @@ static int soft_offline_huge_page(struct page *page, int flags) + } + done: + if (!PageHWPoison(hpage)) +- atomic_long_add(1 << compound_trans_order(hpage), &mce_bad_pages); ++ atomic_long_add_unchecked(1 << compound_trans_order(hpage), &mce_bad_pages); + set_page_hwpoison_huge_page(hpage); + dequeue_hwpoisoned_huge_page(hpage); + /* keep elevated page count for bad page */ +@@ -1482,7 +1482,7 @@ int soft_offline_page(struct page *page, int flags) + 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 --git a/mm/memory.c b/mm/memory.c +index c8fff70..ba759c5 100644 +--- a/mm/memory.c ++++ b/mm/memory.c +@@ -259,8 +259,12 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud, return; pmd = pmd_offset(pud, start); @@ -62737,7 +64114,7 @@ diff -urNp linux-2.6.38.7/mm/memory.c linux-2.6.38.7/mm/memory.c } static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, -@@ -291,9 +295,12 @@ static inline void free_pud_range(struct +@@ -291,9 +295,12 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, if (end - 1 > ceiling - 1) return; @@ -62763,7 +64140,7 @@ diff -urNp linux-2.6.38.7/mm/memory.c linux-2.6.38.7/mm/memory.c int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, unsigned long start, int nr_pages, unsigned int gup_flags, struct page **pages, struct vm_area_struct **vmas, -@@ -1439,10 +1440,10 @@ int __get_user_pages(struct task_struct +@@ -1439,10 +1440,10 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE); i = 0; @@ -62776,7 +64153,7 @@ diff -urNp linux-2.6.38.7/mm/memory.c linux-2.6.38.7/mm/memory.c if (!vma && in_gate_area(tsk, start)) { unsigned long pg = start & PAGE_MASK; pgd_t *pgd; -@@ -1490,7 +1491,7 @@ int __get_user_pages(struct task_struct +@@ -1490,7 +1491,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, goto next_page; } @@ -62785,7 +64162,7 @@ diff -urNp linux-2.6.38.7/mm/memory.c linux-2.6.38.7/mm/memory.c (vma->vm_flags & (VM_IO | VM_PFNMAP)) || !(vm_flags & vma->vm_flags)) return i ? : -EFAULT; -@@ -1517,11 +1518,6 @@ int __get_user_pages(struct task_struct +@@ -1517,11 +1518,6 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, int ret; unsigned int fault_flags = 0; @@ -62806,7 +64183,7 @@ diff -urNp linux-2.6.38.7/mm/memory.c linux-2.6.38.7/mm/memory.c return i; } -@@ -1731,6 +1727,10 @@ static int insert_page(struct vm_area_st +@@ -1731,6 +1727,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr, page_add_file_rmap(page); set_pte_at(mm, addr, pte, mk_pte(page, prot)); @@ -62840,7 +64217,7 @@ diff -urNp linux-2.6.38.7/mm/memory.c linux-2.6.38.7/mm/memory.c vma->vm_flags |= VM_INSERTPAGE; return insert_page(vma, addr, page, vma->vm_page_prot); } -@@ -1854,6 +1866,7 @@ int vm_insert_mixed(struct vm_area_struc +@@ -1854,6 +1866,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn) { BUG_ON(!(vma->vm_flags & VM_MIXEDMAP)); @@ -62848,7 +64225,7 @@ diff -urNp linux-2.6.38.7/mm/memory.c linux-2.6.38.7/mm/memory.c if (addr < vma->vm_start || addr >= vma->vm_end) return -EFAULT; -@@ -2169,6 +2182,186 @@ static inline void cow_user_page(struct +@@ -2169,6 +2182,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo copy_user_highpage(dst, src, va, vma); } @@ -63059,7 +64436,7 @@ diff -urNp linux-2.6.38.7/mm/memory.c linux-2.6.38.7/mm/memory.c /* Free the old page.. */ new_page = old_page; ret |= VM_FAULT_WRITE; -@@ -2841,6 +3044,11 @@ static int do_swap_page(struct mm_struct +@@ -2841,6 +3044,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma, swap_free(entry); if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page)) try_to_free_swap(page); @@ -63071,7 +64448,7 @@ diff -urNp linux-2.6.38.7/mm/memory.c linux-2.6.38.7/mm/memory.c unlock_page(page); if (swapcache) { /* -@@ -2864,6 +3072,11 @@ static int do_swap_page(struct mm_struct +@@ -2864,6 +3072,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma, /* No need to invalidate - it was non-present before */ update_mmu_cache(vma, address, page_table); @@ -63124,7 +64501,7 @@ diff -urNp linux-2.6.38.7/mm/memory.c linux-2.6.38.7/mm/memory.c * We enter with non-exclusive mmap_sem (to exclude vma changes, * but allow concurrent faults), and pte mapped but not yet locked. * We return with mmap_sem still held, but pte unmapped and unlocked. -@@ -2925,27 +3104,23 @@ static int do_anonymous_page(struct mm_s +@@ -2925,27 +3104,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long address, pte_t *page_table, pmd_t *pmd, unsigned int flags) { @@ -63157,7 +64534,7 @@ diff -urNp linux-2.6.38.7/mm/memory.c linux-2.6.38.7/mm/memory.c if (unlikely(anon_vma_prepare(vma))) goto oom; page = alloc_zeroed_user_highpage_movable(vma, address); -@@ -2964,6 +3139,11 @@ static int do_anonymous_page(struct mm_s +@@ -2964,6 +3139,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, if (!pte_none(*page_table)) goto release; @@ -63182,7 +64559,7 @@ diff -urNp linux-2.6.38.7/mm/memory.c linux-2.6.38.7/mm/memory.c unlock: pte_unmap_unlock(page_table, ptl); return 0; -@@ -3108,6 +3294,12 @@ static int __do_fault(struct mm_struct * +@@ -3108,6 +3294,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma, */ /* Only go through if we didn't race with anybody else... */ if (likely(pte_same(*page_table, orig_pte))) { @@ -63195,7 +64572,7 @@ diff -urNp linux-2.6.38.7/mm/memory.c linux-2.6.38.7/mm/memory.c flush_icache_page(vma, page); entry = mk_pte(page, vma->vm_page_prot); if (flags & FAULT_FLAG_WRITE) -@@ -3127,6 +3319,14 @@ static int __do_fault(struct mm_struct * +@@ -3127,6 +3319,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma, /* no need to invalidate: a not-present page won't be cached */ update_mmu_cache(vma, address, page_table); @@ -63210,7 +64587,7 @@ diff -urNp linux-2.6.38.7/mm/memory.c linux-2.6.38.7/mm/memory.c } else { if (charged) mem_cgroup_uncharge_page(page); -@@ -3274,6 +3474,12 @@ int handle_pte_fault(struct mm_struct *m +@@ -3274,6 +3474,12 @@ int handle_pte_fault(struct mm_struct *mm, if (flags & FAULT_FLAG_WRITE) flush_tlb_fix_spurious_fault(vma, address); } @@ -63223,7 +64600,7 @@ diff -urNp linux-2.6.38.7/mm/memory.c linux-2.6.38.7/mm/memory.c unlock: pte_unmap_unlock(pte, ptl); return 0; -@@ -3290,6 +3496,10 @@ int handle_mm_fault(struct mm_struct *mm +@@ -3290,6 +3496,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, pmd_t *pmd; pte_t *pte; @@ -63234,7 +64611,7 @@ diff -urNp linux-2.6.38.7/mm/memory.c linux-2.6.38.7/mm/memory.c __set_current_state(TASK_RUNNING); count_vm_event(PGFAULT); -@@ -3300,6 +3510,34 @@ int handle_mm_fault(struct mm_struct *mm +@@ -3300,6 +3510,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, if (unlikely(is_vm_hugetlb_page(vma))) return hugetlb_fault(mm, vma, address, flags); @@ -63269,7 +64646,7 @@ diff -urNp linux-2.6.38.7/mm/memory.c linux-2.6.38.7/mm/memory.c pgd = pgd_offset(mm, address); pud = pud_alloc(mm, pgd, address); if (!pud) -@@ -3329,7 +3567,7 @@ int handle_mm_fault(struct mm_struct *mm +@@ -3329,7 +3567,7 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, * run pte_offset_map on the pmd, if an huge pmd could * materialize from under us from a different thread. */ @@ -63287,85 +64664,11 @@ diff -urNp linux-2.6.38.7/mm/memory.c linux-2.6.38.7/mm/memory.c /* * Make sure the vDSO gets into every core dump. * Dumping its contents makes post-mortem fully interpretable later -diff -urNp linux-2.6.38.7/mm/memory-failure.c linux-2.6.38.7/mm/memory-failure.c ---- linux-2.6.38.7/mm/memory-failure.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/memory-failure.c 2011-04-28 19:34:15.000000000 -0400 -@@ -58,7 +58,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) - -@@ -1012,7 +1012,7 @@ int __memory_failure(unsigned long pfn, - } - - nr_pages = 1 << compound_trans_order(hpage); -- atomic_long_add(nr_pages, &mce_bad_pages); -+ atomic_long_add_unchecked(nr_pages, &mce_bad_pages); - - /* - * We need/can do nothing about count=0 pages. -@@ -1042,7 +1042,7 @@ int __memory_failure(unsigned long pfn, - if (!PageHWPoison(hpage) - || (hwpoison_filter(p) && TestClearPageHWPoison(p)) - || (p != hpage && TestSetPageHWPoison(hpage))) { -- atomic_long_sub(nr_pages, &mce_bad_pages); -+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages); - return 0; - } - set_page_hwpoison_huge_page(hpage); -@@ -1100,7 +1100,7 @@ int __memory_failure(unsigned long pfn, - } - if (hwpoison_filter(p)) { - if (TestClearPageHWPoison(p)) -- atomic_long_sub(nr_pages, &mce_bad_pages); -+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages); - unlock_page(hpage); - put_page(hpage); - return 0; -@@ -1226,7 +1226,7 @@ int unpoison_memory(unsigned long pfn) - return 0; - } - if (TestClearPageHWPoison(p)) -- atomic_long_sub(nr_pages, &mce_bad_pages); -+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages); - pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn); - return 0; - } -@@ -1240,7 +1240,7 @@ int unpoison_memory(unsigned long pfn) - */ - if (TestClearPageHWPoison(page)) { - pr_info("MCE: Software-unpoisoned page %#lx\n", pfn); -- atomic_long_sub(nr_pages, &mce_bad_pages); -+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages); - freeit = 1; - if (PageHuge(page)) - clear_page_hwpoison_huge_page(page); -@@ -1353,7 +1353,7 @@ static int soft_offline_huge_page(struct - } - done: - if (!PageHWPoison(hpage)) -- atomic_long_add(1 << compound_trans_order(hpage), &mce_bad_pages); -+ atomic_long_add_unchecked(1 << compound_trans_order(hpage), &mce_bad_pages); - set_page_hwpoison_huge_page(hpage); - dequeue_hwpoisoned_huge_page(hpage); - /* keep elevated page count for bad page */ -@@ -1482,7 +1482,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.38.7/mm/mempolicy.c linux-2.6.38.7/mm/mempolicy.c ---- linux-2.6.38.7/mm/mempolicy.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/mempolicy.c 2011-04-28 19:34:15.000000000 -0400 -@@ -643,6 +643,10 @@ static int mbind_range(struct mm_struct +diff --git a/mm/mempolicy.c b/mm/mempolicy.c +index b53ec99..3c40f15 100644 +--- a/mm/mempolicy.c ++++ b/mm/mempolicy.c +@@ -643,6 +643,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start, unsigned long vmstart; unsigned long vmend; @@ -63376,7 +64679,7 @@ diff -urNp linux-2.6.38.7/mm/mempolicy.c linux-2.6.38.7/mm/mempolicy.c vma = find_vma_prev(mm, start, &prev); if (!vma || vma->vm_start > start) return -EFAULT; -@@ -673,6 +677,16 @@ static int mbind_range(struct mm_struct +@@ -673,6 +677,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start, err = policy_vma(vma, new_pol); if (err) goto out; @@ -63393,7 +64696,7 @@ diff -urNp linux-2.6.38.7/mm/mempolicy.c linux-2.6.38.7/mm/mempolicy.c } out: -@@ -1106,6 +1120,17 @@ static long do_mbind(unsigned long start +@@ -1106,6 +1120,17 @@ static long do_mbind(unsigned long start, unsigned long len, if (end < start) return -EINVAL; @@ -63411,7 +64714,7 @@ diff -urNp linux-2.6.38.7/mm/mempolicy.c linux-2.6.38.7/mm/mempolicy.c if (end == start) return 0; -@@ -1324,6 +1349,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi +@@ -1324,6 +1349,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode, if (!mm) goto out; @@ -63426,7 +64729,7 @@ diff -urNp linux-2.6.38.7/mm/mempolicy.c linux-2.6.38.7/mm/mempolicy.c /* * Check if this process has the right to modify the specified * process. The right exists if the process has administrative -@@ -1333,8 +1366,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi +@@ -1333,8 +1366,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode, rcu_read_lock(); tcred = __task_cred(task); if (cred->euid != tcred->suid && cred->euid != tcred->uid && @@ -63436,7 +64739,7 @@ diff -urNp linux-2.6.38.7/mm/mempolicy.c linux-2.6.38.7/mm/mempolicy.c rcu_read_unlock(); err = -EPERM; goto out; -@@ -2635,7 +2667,7 @@ int show_numa_map(struct seq_file *m, vo +@@ -2635,7 +2667,7 @@ int show_numa_map(struct seq_file *m, void *v) if (file) { seq_printf(m, " file="); @@ -63445,10 +64748,11 @@ diff -urNp linux-2.6.38.7/mm/mempolicy.c linux-2.6.38.7/mm/mempolicy.c } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { seq_printf(m, " heap"); } else if (vma->vm_start <= mm->start_stack && -diff -urNp linux-2.6.38.7/mm/migrate.c linux-2.6.38.7/mm/migrate.c ---- linux-2.6.38.7/mm/migrate.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/migrate.c 2011-05-16 21:47:09.000000000 -0400 -@@ -1115,6 +1115,8 @@ static int do_pages_move(struct mm_struc +diff --git a/mm/migrate.c b/mm/migrate.c +index 352de555..57a4dae 100644 +--- a/mm/migrate.c ++++ b/mm/migrate.c +@@ -1115,6 +1115,8 @@ static int do_pages_move(struct mm_struct *mm, struct task_struct *task, unsigned long chunk_start; int err; @@ -63457,7 +64761,7 @@ diff -urNp linux-2.6.38.7/mm/migrate.c linux-2.6.38.7/mm/migrate.c task_nodes = cpuset_mems_allowed(task); err = -ENOMEM; -@@ -1299,6 +1301,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, +@@ -1299,6 +1301,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages, if (!mm) return -EINVAL; @@ -63472,7 +64776,7 @@ diff -urNp linux-2.6.38.7/mm/migrate.c linux-2.6.38.7/mm/migrate.c /* * Check if this process has the right to modify the specified * process. The right exists if the process has administrative -@@ -1308,8 +1318,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, +@@ -1308,8 +1318,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages, rcu_read_lock(); tcred = __task_cred(task); if (cred->euid != tcred->suid && cred->euid != tcred->uid && @@ -63482,9 +64786,10 @@ diff -urNp linux-2.6.38.7/mm/migrate.c linux-2.6.38.7/mm/migrate.c rcu_read_unlock(); err = -EPERM; goto out; -diff -urNp linux-2.6.38.7/mm/mlock.c linux-2.6.38.7/mm/mlock.c ---- linux-2.6.38.7/mm/mlock.c 2011-05-10 22:06:29.000000000 -0400 -+++ linux-2.6.38.7/mm/mlock.c 2011-05-10 22:09:01.000000000 -0400 +diff --git a/mm/mlock.c b/mm/mlock.c +index c8e7790..0f0ba37 100644 +--- a/mm/mlock.c ++++ b/mm/mlock.c @@ -13,6 +13,7 @@ #include <linux/pagemap.h> #include <linux/mempolicy.h> @@ -63493,7 +64798,7 @@ diff -urNp linux-2.6.38.7/mm/mlock.c linux-2.6.38.7/mm/mlock.c #include <linux/sched.h> #include <linux/module.h> #include <linux/rmap.h> -@@ -377,6 +378,9 @@ static int do_mlock(unsigned long start, +@@ -377,6 +378,9 @@ static int do_mlock(unsigned long start, size_t len, int on) return -EINVAL; if (end == start) return 0; @@ -63503,7 +64808,7 @@ diff -urNp linux-2.6.38.7/mm/mlock.c linux-2.6.38.7/mm/mlock.c vma = find_vma_prev(current->mm, start, &prev); if (!vma || vma->vm_start > start) return -ENOMEM; -@@ -387,6 +391,11 @@ static int do_mlock(unsigned long start, +@@ -387,6 +391,11 @@ static int do_mlock(unsigned long start, size_t len, int on) for (nstart = start ; ; ) { unsigned int newflags; @@ -63515,7 +64820,7 @@ diff -urNp linux-2.6.38.7/mm/mlock.c linux-2.6.38.7/mm/mlock.c /* Here we know that vma->vm_start <= nstart < vma->vm_end. */ newflags = vma->vm_flags | VM_LOCKED; -@@ -492,6 +501,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st +@@ -492,6 +501,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len) lock_limit >>= PAGE_SHIFT; /* check against resource limits */ @@ -63523,7 +64828,7 @@ diff -urNp linux-2.6.38.7/mm/mlock.c linux-2.6.38.7/mm/mlock.c if ((locked <= lock_limit) || capable(CAP_IPC_LOCK)) error = do_mlock(start, len, 1); up_write(¤t->mm->mmap_sem); -@@ -515,17 +525,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, +@@ -515,17 +525,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len) static int do_mlockall(int flags) { struct vm_area_struct * vma, * prev = NULL; @@ -63559,9 +64864,10 @@ diff -urNp linux-2.6.38.7/mm/mlock.c linux-2.6.38.7/mm/mlock.c if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || capable(CAP_IPC_LOCK)) ret = do_mlockall(flags); -diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c ---- linux-2.6.38.7/mm/mmap.c 2011-05-22 23:05:20.000000000 -0400 -+++ linux-2.6.38.7/mm/mmap.c 2011-05-22 23:06:04.000000000 -0400 +diff --git a/mm/mmap.c b/mm/mmap.c +index 772140c..fd95347 100644 +--- a/mm/mmap.c ++++ b/mm/mmap.c @@ -46,6 +46,16 @@ #define arch_rebalance_pgtables(addr, len) (addr) #endif @@ -63579,7 +64885,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c static void unmap_region(struct mm_struct *mm, struct vm_area_struct *vma, struct vm_area_struct *prev, unsigned long start, unsigned long end); -@@ -71,22 +81,32 @@ static void unmap_region(struct mm_struc +@@ -71,22 +81,32 @@ static void unmap_region(struct mm_struct *mm, * x: (no) no x: (no) yes x: (no) yes x: (yes) yes * */ @@ -63614,7 +64920,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c struct percpu_counter vm_committed_as; /* -@@ -232,6 +252,7 @@ static struct vm_area_struct *remove_vma +@@ -232,6 +252,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma) struct vm_area_struct *next = vma->vm_next; might_sleep(); @@ -63656,7 +64962,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c if (is_mergeable_vma(vma, file, vm_flags) && is_mergeable_anon_vma(anon_vma, vma->anon_vma)) { pgoff_t vm_pglen; -@@ -780,13 +814,20 @@ can_vma_merge_after(struct vm_area_struc +@@ -780,13 +814,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags, struct vm_area_struct *vma_merge(struct mm_struct *mm, struct vm_area_struct *prev, unsigned long addr, unsigned long end, unsigned long vm_flags, @@ -63678,7 +64984,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c /* * We later require that vma->vm_flags == vm_flags, * so this tests vma->vm_flags & VM_SPECIAL, too. -@@ -802,6 +843,15 @@ struct vm_area_struct *vma_merge(struct +@@ -802,6 +843,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm, if (next && next->vm_end == end) /* cases 6, 7, 8 */ next = next->vm_next; @@ -63694,7 +65000,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c /* * Can it merge with the predecessor? */ -@@ -821,9 +871,24 @@ struct vm_area_struct *vma_merge(struct +@@ -821,9 +871,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm, /* cases 1, 6 */ err = vma_adjust(prev, prev->vm_start, next->vm_end, prev->vm_pgoff, NULL); @@ -63720,7 +65026,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c if (err) return NULL; khugepaged_enter_vma_merge(prev); -@@ -837,12 +902,27 @@ struct vm_area_struct *vma_merge(struct +@@ -837,12 +902,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm, mpol_equal(policy, vma_policy(next)) && can_vma_merge_before(next, vm_flags, anon_vma, file, pgoff+pglen)) { @@ -63766,7 +65072,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c mm->stack_vm += pages; if (flags & (VM_RESERVED|VM_IO)) mm->reserved_vm += pages; -@@ -992,7 +1069,7 @@ unsigned long do_mmap_pgoff(struct file +@@ -992,7 +1069,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, * (the exception is when the underlying filesystem is noexec * mounted, in which case we dont add PROT_EXEC.) */ @@ -63775,7 +65081,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC))) prot |= PROT_EXEC; -@@ -1018,7 +1095,7 @@ unsigned long do_mmap_pgoff(struct file +@@ -1018,7 +1095,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, /* Obtain the address to map to. we verify (or select) it and ensure * that it represents a valid section of the address space. */ @@ -63784,7 +65090,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c if (addr & ~PAGE_MASK) return addr; -@@ -1029,6 +1106,36 @@ unsigned long do_mmap_pgoff(struct file +@@ -1029,6 +1106,36 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) | mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC; @@ -63821,7 +65127,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c if (flags & MAP_LOCKED) if (!can_do_mlock()) return -EPERM; -@@ -1040,6 +1147,7 @@ unsigned long do_mmap_pgoff(struct file +@@ -1040,6 +1147,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, locked += mm->locked_vm; lock_limit = rlimit(RLIMIT_MEMLOCK); lock_limit >>= PAGE_SHIFT; @@ -63829,7 +65135,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c if (locked > lock_limit && !capable(CAP_IPC_LOCK)) return -EAGAIN; } -@@ -1110,6 +1218,9 @@ unsigned long do_mmap_pgoff(struct file +@@ -1110,6 +1218,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, if (error) return error; @@ -63839,7 +65145,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c return mmap_region(file, addr, len, flags, vm_flags, pgoff); } EXPORT_SYMBOL(do_mmap_pgoff); -@@ -1187,10 +1298,10 @@ SYSCALL_DEFINE1(old_mmap, struct mmap_ar +@@ -1187,10 +1298,10 @@ SYSCALL_DEFINE1(old_mmap, struct mmap_arg_struct __user *, arg) */ int vma_wants_writenotify(struct vm_area_struct *vma) { @@ -63852,7 +65158,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c return 0; /* The backer wishes to know when pages are first written to? */ -@@ -1239,14 +1350,24 @@ unsigned long mmap_region(struct file *f +@@ -1239,14 +1350,24 @@ unsigned long mmap_region(struct file *file, unsigned long addr, unsigned long charged = 0; struct inode *inode = file ? file->f_path.dentry->d_inode : NULL; @@ -63994,7 +65300,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c /* Get an address range which is currently unmapped. * For shmat() with addr=0. * -@@ -1411,18 +1605,23 @@ arch_get_unmapped_area(struct file *filp +@@ -1411,18 +1605,23 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, if (flags & MAP_FIXED) return addr; @@ -64077,7 +65383,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c mm->free_area_cache = addr; mm->cached_hole_size = ~0UL; } -@@ -1478,7 +1683,7 @@ arch_get_unmapped_area_topdown(struct fi +@@ -1478,7 +1683,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, { struct vm_area_struct *vma; struct mm_struct *mm = current->mm; @@ -64086,7 +65392,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c /* requested length too big for entire address space */ if (len > TASK_SIZE) -@@ -1487,13 +1692,18 @@ arch_get_unmapped_area_topdown(struct fi +@@ -1487,13 +1692,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, if (flags & MAP_FIXED) return addr; @@ -64109,7 +65415,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c } /* check if free_area_cache is useful for us */ -@@ -1508,7 +1718,7 @@ arch_get_unmapped_area_topdown(struct fi +@@ -1508,7 +1718,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, /* make sure it can fit in the remaining address space */ if (addr > len) { vma = find_vma(mm, addr-len); @@ -64118,7 +65424,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c /* remember the address as a hint for next time */ return (mm->free_area_cache = addr-len); } -@@ -1525,7 +1735,7 @@ arch_get_unmapped_area_topdown(struct fi +@@ -1525,7 +1735,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, * return with success: */ vma = find_vma(mm, addr); @@ -64127,7 +65433,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c /* remember the address as a hint for next time */ return (mm->free_area_cache = addr); -@@ -1534,8 +1744,8 @@ arch_get_unmapped_area_topdown(struct fi +@@ -1534,8 +1744,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, mm->cached_hole_size = vma->vm_start - addr; /* try just below the current vma->vm_start */ @@ -64175,7 +65481,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c /* * Is this a new hole at the highest possible address? */ -@@ -1566,8 +1790,10 @@ void arch_unmap_area_topdown(struct mm_s +@@ -1566,8 +1790,10 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr) mm->free_area_cache = addr; /* dont allow allocations above current base */ @@ -64216,7 +65522,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c /* * Verify that the stack growth is acceptable and * update accounting. This is shared with both the -@@ -1691,6 +1939,7 @@ static int acct_stack_growth(struct vm_a +@@ -1691,6 +1939,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns return -ENOMEM; /* Stack limit test */ @@ -64224,7 +65530,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur)) return -ENOMEM; -@@ -1701,6 +1950,7 @@ static int acct_stack_growth(struct vm_a +@@ -1701,6 +1950,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns locked = mm->locked_vm + grow; limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur); limit >>= PAGE_SHIFT; @@ -64232,7 +65538,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c if (locked > limit && !capable(CAP_IPC_LOCK)) return -ENOMEM; } -@@ -1731,37 +1981,48 @@ static int acct_stack_growth(struct vm_a +@@ -1731,37 +1981,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns * PA-RISC uses this for its stack; IA64 for its Register Backing Store. * vma is the last one with address > vma->vm_end. Have to extend vma. */ @@ -64290,7 +65596,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c unsigned long size, grow; size = address - vma->vm_start; -@@ -1776,6 +2037,8 @@ int expand_upwards(struct vm_area_struct +@@ -1776,6 +2037,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address) } } } @@ -64299,7 +65605,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c vma_unlock_anon_vma(vma); khugepaged_enter_vma_merge(vma); return error; -@@ -1789,6 +2052,8 @@ static int expand_downwards(struct vm_ar +@@ -1789,6 +2052,8 @@ static int expand_downwards(struct vm_area_struct *vma, unsigned long address) { int error; @@ -64308,7 +65614,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c /* * We must make sure the anon_vma is allocated -@@ -1802,6 +2067,15 @@ static int expand_downwards(struct vm_ar +@@ -1802,6 +2067,15 @@ static int expand_downwards(struct vm_area_struct *vma, if (error) return error; @@ -64324,7 +65630,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c vma_lock_anon_vma(vma); /* -@@ -1811,9 +2085,17 @@ static int expand_downwards(struct vm_ar +@@ -1811,9 +2085,17 @@ static int expand_downwards(struct vm_area_struct *vma, */ /* Somebody else might have raced and expanded it already */ @@ -64343,7 +65649,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c size = vma->vm_end - address; grow = (vma->vm_start - address) >> PAGE_SHIFT; -@@ -1823,11 +2105,22 @@ static int expand_downwards(struct vm_ar +@@ -1823,11 +2105,22 @@ static int expand_downwards(struct vm_area_struct *vma, if (!error) { vma->vm_start = address; vma->vm_pgoff -= grow; @@ -64366,7 +65672,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c khugepaged_enter_vma_merge(vma); return error; } -@@ -1902,6 +2195,13 @@ static void remove_vma_list(struct mm_st +@@ -1902,6 +2195,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma) do { long nrpages = vma_pages(vma); @@ -64380,7 +65686,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c mm->total_vm -= nrpages; vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages); vma = remove_vma(vma); -@@ -1947,6 +2247,16 @@ detach_vmas_to_be_unmapped(struct mm_str +@@ -1947,6 +2247,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma, insertion_point = (prev ? &prev->vm_next : &mm->mmap); vma->vm_prev = NULL; do { @@ -64397,7 +65703,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c rb_erase(&vma->vm_rb, &mm->mm_rb); mm->map_count--; tail_vma = vma; -@@ -1975,14 +2285,33 @@ static int __split_vma(struct mm_struct +@@ -1975,14 +2285,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, struct vm_area_struct *new; int err = -ENOMEM; @@ -64431,7 +65737,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c /* most fields are the same, copy all, and then fixup */ *new = *vma; -@@ -1995,6 +2324,22 @@ static int __split_vma(struct mm_struct +@@ -1995,6 +2324,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT); } @@ -64454,7 +65760,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c pol = mpol_dup(vma_policy(vma)); if (IS_ERR(pol)) { err = PTR_ERR(pol); -@@ -2020,6 +2365,42 @@ static int __split_vma(struct mm_struct +@@ -2020,6 +2365,42 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, else err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); @@ -64497,7 +65803,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c /* Success. */ if (!err) return 0; -@@ -2032,10 +2413,18 @@ static int __split_vma(struct mm_struct +@@ -2032,10 +2413,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, removed_exe_file_vma(mm); fput(new->vm_file); } @@ -64517,7 +65823,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c kmem_cache_free(vm_area_cachep, new); out_err: return err; -@@ -2048,6 +2437,15 @@ static int __split_vma(struct mm_struct +@@ -2048,6 +2437,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, int split_vma(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long addr, int new_below) { @@ -64533,13 +65839,13 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c if (mm->map_count >= sysctl_max_map_count) return -ENOMEM; -@@ -2059,11 +2457,30 @@ int split_vma(struct mm_struct *mm, stru +@@ -2059,11 +2457,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma, * work. This now handles partial unmappings. * Jeremy Fitzhardinge <jeremy@goop.org> */ +#ifdef CONFIG_PAX_SEGMEXEC -+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) -+{ + int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) + { + int ret = __do_munmap(mm, start, len); + if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC)) + return ret; @@ -64549,9 +65855,9 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c + +int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len) +#else - int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) ++int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) +#endif - { ++{ unsigned long end; struct vm_area_struct *vma, *prev, *last; @@ -64564,7 +65870,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start) return -EINVAL; -@@ -2137,6 +2554,8 @@ int do_munmap(struct mm_struct *mm, unsi +@@ -2137,6 +2554,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) /* Fix up all other VM information */ remove_vma_list(mm, vma); @@ -64573,7 +65879,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c return 0; } -@@ -2149,22 +2568,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a +@@ -2149,22 +2568,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len) profile_munmap(addr); @@ -64602,7 +65908,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c /* * this is really a simplified "do_mmap". it only handles * anonymous maps. eventually we may be able to do some -@@ -2178,6 +2593,7 @@ unsigned long do_brk(unsigned long addr, +@@ -2178,6 +2593,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len) struct rb_node ** rb_link, * rb_parent; pgoff_t pgoff = addr >> PAGE_SHIFT; int error; @@ -64610,7 +65916,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c len = PAGE_ALIGN(len); if (!len) -@@ -2189,16 +2605,30 @@ unsigned long do_brk(unsigned long addr, +@@ -2189,16 +2605,30 @@ unsigned long do_brk(unsigned long addr, unsigned long len) flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; @@ -64642,7 +65948,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c locked += mm->locked_vm; lock_limit = rlimit(RLIMIT_MEMLOCK); lock_limit >>= PAGE_SHIFT; -@@ -2215,22 +2645,22 @@ unsigned long do_brk(unsigned long addr, +@@ -2215,22 +2645,22 @@ unsigned long do_brk(unsigned long addr, unsigned long len) /* * Clear old maps. this also does some error checking for us */ @@ -64669,7 +65975,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c return -ENOMEM; /* Can we just expand an old private anonymous mapping? */ -@@ -2244,7 +2674,7 @@ unsigned long do_brk(unsigned long addr, +@@ -2244,7 +2674,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len) */ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); if (!vma) { @@ -64678,7 +65984,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c return -ENOMEM; } -@@ -2258,11 +2688,12 @@ unsigned long do_brk(unsigned long addr, +@@ -2258,11 +2688,12 @@ unsigned long do_brk(unsigned long addr, unsigned long len) vma_link(mm, vma, prev, rb_link, rb_parent); out: perf_event_mmap(vma); @@ -64705,7 +66011,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT); } -@@ -2324,6 +2757,13 @@ int insert_vm_struct(struct mm_struct * +@@ -2324,6 +2757,13 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma) struct vm_area_struct * __vma, * prev; struct rb_node ** rb_link, * rb_parent; @@ -64719,7 +66025,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c /* * The vm_pgoff of a purely anonymous vma should be irrelevant * until its first write fault, when page's anon_vma and index -@@ -2346,7 +2786,22 @@ int insert_vm_struct(struct mm_struct * +@@ -2346,7 +2786,22 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma) if ((vma->vm_flags & VM_ACCOUNT) && security_vm_enough_memory_mm(mm, vma_pages(vma))) return -ENOMEM; @@ -64742,7 +66048,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c return 0; } -@@ -2364,6 +2819,8 @@ struct vm_area_struct *copy_vma(struct v +@@ -2364,6 +2819,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, struct rb_node **rb_link, *rb_parent; struct mempolicy *pol; @@ -64751,7 +66057,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c /* * If anonymous vma has not yet been faulted, update new pgoff * to match new location, to increase its chance of merging. -@@ -2413,6 +2870,39 @@ struct vm_area_struct *copy_vma(struct v +@@ -2413,6 +2870,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, kmem_cache_free(vm_area_cachep, new_vma); return NULL; } @@ -64791,7 +66097,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c /* * Return true if the calling process may expand its vm space by the passed -@@ -2424,7 +2914,7 @@ int may_expand_vm(struct mm_struct *mm, +@@ -2424,7 +2914,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages) unsigned long lim; lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT; @@ -64800,7 +66106,7 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c if (cur + npages > lim) return 0; return 1; -@@ -2495,6 +2985,22 @@ int install_special_mapping(struct mm_st +@@ -2495,6 +2985,22 @@ int install_special_mapping(struct mm_struct *mm, vma->vm_start = addr; vma->vm_end = addr + len; @@ -64823,9 +66129,10 @@ diff -urNp linux-2.6.38.7/mm/mmap.c linux-2.6.38.7/mm/mmap.c vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); -diff -urNp linux-2.6.38.7/mm/mprotect.c linux-2.6.38.7/mm/mprotect.c ---- linux-2.6.38.7/mm/mprotect.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/mprotect.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/mm/mprotect.c b/mm/mprotect.c +index 5a688a2..27e031c 100644 +--- a/mm/mprotect.c ++++ b/mm/mprotect.c @@ -23,10 +23,16 @@ #include <linux/mmu_notifier.h> #include <linux/migrate.h> @@ -64843,7 +66150,7 @@ diff -urNp linux-2.6.38.7/mm/mprotect.c linux-2.6.38.7/mm/mprotect.c #ifndef pgprot_modify static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot) -@@ -141,6 +147,48 @@ static void change_protection(struct vm_ +@@ -141,6 +147,48 @@ static void change_protection(struct vm_area_struct *vma, flush_tlb_range(vma, start, end); } @@ -64892,7 +66199,7 @@ diff -urNp linux-2.6.38.7/mm/mprotect.c linux-2.6.38.7/mm/mprotect.c int mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev, unsigned long start, unsigned long end, unsigned long newflags) -@@ -153,11 +201,29 @@ mprotect_fixup(struct vm_area_struct *vm +@@ -153,11 +201,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev, int error; int dirty_accountable = 0; @@ -64922,7 +66229,7 @@ diff -urNp linux-2.6.38.7/mm/mprotect.c linux-2.6.38.7/mm/mprotect.c /* * If we make a private mapping writable we increase our commit; * but (without finer accounting) cannot reduce our commit if we -@@ -174,6 +240,42 @@ mprotect_fixup(struct vm_area_struct *vm +@@ -174,6 +240,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev, } } @@ -64988,7 +66295,7 @@ diff -urNp linux-2.6.38.7/mm/mprotect.c linux-2.6.38.7/mm/mprotect.c if (vma_wants_writenotify(vma)) { vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED); -@@ -248,6 +362,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, +@@ -248,6 +362,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, end = start + len; if (end <= start) return -ENOMEM; @@ -65006,7 +66313,7 @@ diff -urNp linux-2.6.38.7/mm/mprotect.c linux-2.6.38.7/mm/mprotect.c if (!arch_validate_prot(prot)) return -EINVAL; -@@ -255,7 +380,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, +@@ -255,7 +380,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, /* * Does the application expect PROT_READ to imply PROT_EXEC: */ @@ -65015,7 +66322,7 @@ diff -urNp linux-2.6.38.7/mm/mprotect.c linux-2.6.38.7/mm/mprotect.c prot |= PROT_EXEC; vm_flags = calc_vm_prot_bits(prot); -@@ -287,6 +412,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, +@@ -287,6 +412,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, if (start > vma->vm_start) prev = vma; @@ -65027,7 +66334,7 @@ diff -urNp linux-2.6.38.7/mm/mprotect.c linux-2.6.38.7/mm/mprotect.c for (nstart = start ; ; ) { unsigned long newflags; -@@ -296,6 +426,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, +@@ -296,6 +426,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, /* newflags >> 4 shift VM_MAY% in place of VM_% */ if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) { @@ -65042,7 +66349,7 @@ diff -urNp linux-2.6.38.7/mm/mprotect.c linux-2.6.38.7/mm/mprotect.c error = -EACCES; goto out; } -@@ -310,6 +448,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, +@@ -310,6 +448,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, error = mprotect_fixup(vma, &prev, nstart, tmp, newflags); if (error) goto out; @@ -65052,10 +66359,11 @@ diff -urNp linux-2.6.38.7/mm/mprotect.c linux-2.6.38.7/mm/mprotect.c nstart = tmp; if (nstart < prev->vm_end) -diff -urNp linux-2.6.38.7/mm/mremap.c linux-2.6.38.7/mm/mremap.c ---- linux-2.6.38.7/mm/mremap.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/mm/mremap.c 2011-04-28 19:34:15.000000000 -0400 -@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str +diff --git a/mm/mremap.c b/mm/mremap.c +index a7c1f9f..1ce9e38 100644 +--- a/mm/mremap.c ++++ b/mm/mremap.c +@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd, continue; pte = ptep_clear_flush(vma, old_addr, old_pte); pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr); @@ -65068,7 +66376,7 @@ diff -urNp linux-2.6.38.7/mm/mremap.c linux-2.6.38.7/mm/mremap.c set_pte_at(mm, new_addr, new_pte, pte); } -@@ -273,6 +279,11 @@ static struct vm_area_struct *vma_to_res +@@ -273,6 +279,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr, if (is_vm_hugetlb_page(vma)) goto Einval; @@ -65080,7 +66388,7 @@ diff -urNp linux-2.6.38.7/mm/mremap.c linux-2.6.38.7/mm/mremap.c /* We can't remap across vm area boundaries */ if (old_len > vma->vm_end - addr) goto Efault; -@@ -329,20 +340,25 @@ static unsigned long mremap_to(unsigned +@@ -329,20 +340,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long ret = -EINVAL; unsigned long charged = 0; unsigned long map_flags; @@ -65111,7 +66419,7 @@ diff -urNp linux-2.6.38.7/mm/mremap.c linux-2.6.38.7/mm/mremap.c goto out; ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1); -@@ -414,6 +430,7 @@ unsigned long do_mremap(unsigned long ad +@@ -414,6 +430,7 @@ unsigned long do_mremap(unsigned long addr, struct vm_area_struct *vma; unsigned long ret = -EINVAL; unsigned long charged = 0; @@ -65119,7 +66427,7 @@ diff -urNp linux-2.6.38.7/mm/mremap.c linux-2.6.38.7/mm/mremap.c if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE)) goto out; -@@ -432,6 +449,17 @@ unsigned long do_mremap(unsigned long ad +@@ -432,6 +449,17 @@ unsigned long do_mremap(unsigned long addr, if (!new_len) goto out; @@ -65137,7 +66445,7 @@ diff -urNp linux-2.6.38.7/mm/mremap.c linux-2.6.38.7/mm/mremap.c if (flags & MREMAP_FIXED) { if (flags & MREMAP_MAYMOVE) ret = mremap_to(addr, old_len, new_addr, new_len); -@@ -481,6 +509,7 @@ unsigned long do_mremap(unsigned long ad +@@ -481,6 +509,7 @@ unsigned long do_mremap(unsigned long addr, addr + new_len); } ret = addr; @@ -65145,7 +66453,7 @@ diff -urNp linux-2.6.38.7/mm/mremap.c linux-2.6.38.7/mm/mremap.c goto out; } } -@@ -507,7 +536,13 @@ unsigned long do_mremap(unsigned long ad +@@ -507,7 +536,13 @@ unsigned long do_mremap(unsigned long addr, ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1); if (ret) goto out; @@ -65159,10 +66467,11 @@ diff -urNp linux-2.6.38.7/mm/mremap.c linux-2.6.38.7/mm/mremap.c } out: if (ret & ~PAGE_MASK) -diff -urNp linux-2.6.38.7/mm/nommu.c linux-2.6.38.7/mm/nommu.c ---- linux-2.6.38.7/mm/nommu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/nommu.c 2011-04-28 19:34:15.000000000 -0400 -@@ -63,7 +63,6 @@ int sysctl_overcommit_memory = OVERCOMMI +diff --git a/mm/nommu.c b/mm/nommu.c +index f59e142..98fa4cc 100644 +--- a/mm/nommu.c ++++ b/mm/nommu.c +@@ -63,7 +63,6 @@ int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */ int sysctl_overcommit_ratio = 50; /* default is 50% */ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT; int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS; @@ -65170,7 +66479,7 @@ diff -urNp linux-2.6.38.7/mm/nommu.c linux-2.6.38.7/mm/nommu.c atomic_long_t mmap_pages_allocated; -@@ -833,15 +832,6 @@ struct vm_area_struct *find_vma(struct m +@@ -833,15 +832,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr) EXPORT_SYMBOL(find_vma); /* @@ -65186,7 +66495,7 @@ diff -urNp linux-2.6.38.7/mm/nommu.c linux-2.6.38.7/mm/nommu.c * expand a stack to a given address * - not supported under NOMMU conditions */ -@@ -1563,6 +1553,7 @@ int split_vma(struct mm_struct *mm, stru +@@ -1563,6 +1553,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma, /* most fields are the same, copy all, and then fixup */ *new = *vma; @@ -65194,10 +66503,11 @@ diff -urNp linux-2.6.38.7/mm/nommu.c linux-2.6.38.7/mm/nommu.c *region = *vma->vm_region; new->vm_region = region; -diff -urNp linux-2.6.38.7/mm/page_alloc.c linux-2.6.38.7/mm/page_alloc.c ---- linux-2.6.38.7/mm/page_alloc.c 2011-05-22 23:05:20.000000000 -0400 -+++ linux-2.6.38.7/mm/page_alloc.c 2011-05-22 23:06:04.000000000 -0400 -@@ -644,6 +644,10 @@ static bool free_pages_prepare(struct pa +diff --git a/mm/page_alloc.c b/mm/page_alloc.c +index 493b522..59cbc22 100644 +--- a/mm/page_alloc.c ++++ b/mm/page_alloc.c +@@ -644,6 +644,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order) int i; int bad = 0; @@ -65208,7 +66518,7 @@ diff -urNp linux-2.6.38.7/mm/page_alloc.c linux-2.6.38.7/mm/page_alloc.c trace_mm_page_free_direct(page, order); kmemcheck_free_shadow(page, order); -@@ -659,6 +663,12 @@ static bool free_pages_prepare(struct pa +@@ -659,6 +663,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order) debug_check_no_obj_freed(page_address(page), PAGE_SIZE << order); } @@ -65221,7 +66531,7 @@ diff -urNp linux-2.6.38.7/mm/page_alloc.c linux-2.6.38.7/mm/page_alloc.c arch_free_page(page, order); kernel_map_pages(page, 1 << order, 0); -@@ -773,8 +783,10 @@ static int prep_new_page(struct page *pa +@@ -773,8 +783,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags) arch_alloc_page(page, order); kernel_map_pages(page, 1 << order, 1); @@ -65241,10 +66551,11 @@ diff -urNp linux-2.6.38.7/mm/page_alloc.c linux-2.6.38.7/mm/page_alloc.c for_each_populated_zone(zone) { show_node(zone); printk("%s per-cpu:\n", zone->name); -diff -urNp linux-2.6.38.7/mm/percpu.c linux-2.6.38.7/mm/percpu.c ---- linux-2.6.38.7/mm/percpu.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/percpu.c 2011-04-28 19:34:15.000000000 -0400 -@@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu +diff --git a/mm/percpu.c b/mm/percpu.c +index 3f93001..d4fb612 100644 +--- a/mm/percpu.c ++++ b/mm/percpu.c +@@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu __read_mostly; static unsigned int pcpu_last_unit_cpu __read_mostly; /* the address of the first chunk which starts with the kernel static area */ @@ -65253,10 +66564,11 @@ diff -urNp linux-2.6.38.7/mm/percpu.c linux-2.6.38.7/mm/percpu.c EXPORT_SYMBOL_GPL(pcpu_base_addr); static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ -diff -urNp linux-2.6.38.7/mm/rmap.c linux-2.6.38.7/mm/rmap.c ---- linux-2.6.38.7/mm/rmap.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/rmap.c 2011-04-28 19:34:15.000000000 -0400 -@@ -117,6 +117,10 @@ int anon_vma_prepare(struct vm_area_stru +diff --git a/mm/rmap.c b/mm/rmap.c +index 941bf82..b7e2e07 100644 +--- a/mm/rmap.c ++++ b/mm/rmap.c +@@ -117,6 +117,10 @@ int anon_vma_prepare(struct vm_area_struct *vma) struct anon_vma *anon_vma = vma->anon_vma; struct anon_vma_chain *avc; @@ -65267,7 +66579,7 @@ diff -urNp linux-2.6.38.7/mm/rmap.c linux-2.6.38.7/mm/rmap.c might_sleep(); if (unlikely(!anon_vma)) { struct mm_struct *mm = vma->vm_mm; -@@ -126,6 +130,12 @@ int anon_vma_prepare(struct vm_area_stru +@@ -126,6 +130,12 @@ int anon_vma_prepare(struct vm_area_struct *vma) if (!avc) goto out_enomem; @@ -65280,7 +66592,7 @@ diff -urNp linux-2.6.38.7/mm/rmap.c linux-2.6.38.7/mm/rmap.c anon_vma = find_mergeable_anon_vma(vma); allocated = NULL; if (!anon_vma) { -@@ -144,6 +154,21 @@ int anon_vma_prepare(struct vm_area_stru +@@ -144,6 +154,21 @@ int anon_vma_prepare(struct vm_area_struct *vma) /* page_table_lock to protect against threads */ spin_lock(&mm->page_table_lock); if (likely(!vma->anon_vma)) { @@ -65302,7 +66614,7 @@ diff -urNp linux-2.6.38.7/mm/rmap.c linux-2.6.38.7/mm/rmap.c vma->anon_vma = anon_vma; avc->anon_vma = anon_vma; avc->vma = vma; -@@ -157,12 +182,24 @@ int anon_vma_prepare(struct vm_area_stru +@@ -157,12 +182,24 @@ int anon_vma_prepare(struct vm_area_struct *vma) if (unlikely(allocated)) anon_vma_free(allocated); @@ -65327,7 +66639,7 @@ diff -urNp linux-2.6.38.7/mm/rmap.c linux-2.6.38.7/mm/rmap.c anon_vma_chain_free(avc); out_enomem: return -ENOMEM; -@@ -189,7 +226,7 @@ static void anon_vma_chain_link(struct v +@@ -189,7 +226,7 @@ static void anon_vma_chain_link(struct vm_area_struct *vma, * Attach the anon_vmas from src to dst. * Returns 0 on success, -ENOMEM on failure. */ @@ -65336,7 +66648,7 @@ diff -urNp linux-2.6.38.7/mm/rmap.c linux-2.6.38.7/mm/rmap.c { struct anon_vma_chain *avc, *pavc; -@@ -211,7 +248,7 @@ int anon_vma_clone(struct vm_area_struct +@@ -211,7 +248,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src) * the corresponding VMA in the parent process is attached to. * Returns 0 on success, non-zero on failure. */ @@ -65345,9 +66657,10 @@ diff -urNp linux-2.6.38.7/mm/rmap.c linux-2.6.38.7/mm/rmap.c { struct anon_vma_chain *avc; struct anon_vma *anon_vma; -diff -urNp linux-2.6.38.7/mm/shmem.c linux-2.6.38.7/mm/shmem.c ---- linux-2.6.38.7/mm/shmem.c 2011-05-22 23:05:20.000000000 -0400 -+++ linux-2.6.38.7/mm/shmem.c 2011-05-22 23:06:04.000000000 -0400 +diff --git a/mm/shmem.c b/mm/shmem.c +index 91dd9c3..46d35e3 100644 +--- a/mm/shmem.c ++++ b/mm/shmem.c @@ -31,7 +31,7 @@ #include <linux/percpu_counter.h> #include <linux/swap.h> @@ -65357,7 +66670,7 @@ diff -urNp linux-2.6.38.7/mm/shmem.c linux-2.6.38.7/mm/shmem.c #ifdef CONFIG_SHMEM /* -@@ -1088,6 +1088,8 @@ static int shmem_writepage(struct page * +@@ -1088,6 +1088,8 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc) goto unlock; } entry = shmem_swp_entry(info, index, NULL); @@ -65366,7 +66679,7 @@ diff -urNp linux-2.6.38.7/mm/shmem.c linux-2.6.38.7/mm/shmem.c if (entry->val) { /* * The more uptodate page coming down from a stacked -@@ -1160,6 +1162,8 @@ static struct page *shmem_swapin(swp_ent +@@ -1160,6 +1162,8 @@ static struct page *shmem_swapin(swp_entry_t entry, gfp_t gfp, struct vm_area_struct pvma; struct page *page; @@ -65375,7 +66688,7 @@ diff -urNp linux-2.6.38.7/mm/shmem.c linux-2.6.38.7/mm/shmem.c spol = mpol_cond_copy(&mpol, mpol_shared_policy_lookup(&info->policy, idx)); -@@ -2015,7 +2019,7 @@ static int shmem_symlink(struct inode *d +@@ -2015,7 +2019,7 @@ static int shmem_symlink(struct inode *dir, struct dentry *dentry, const char *s info = SHMEM_I(inode); inode->i_size = len-1; @@ -65384,7 +66697,7 @@ diff -urNp linux-2.6.38.7/mm/shmem.c linux-2.6.38.7/mm/shmem.c /* do it inline */ memcpy(info, symname, len); inode->i_op = &shmem_symlink_inline_operations; -@@ -2361,8 +2365,7 @@ int shmem_fill_super(struct super_block +@@ -2361,8 +2365,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent) int err = -ENOMEM; /* Round up to L1_CACHE_BYTES to resist false sharing */ @@ -65394,9 +66707,10 @@ diff -urNp linux-2.6.38.7/mm/shmem.c linux-2.6.38.7/mm/shmem.c if (!sbinfo) return -ENOMEM; -diff -urNp linux-2.6.38.7/mm/slab.c linux-2.6.38.7/mm/slab.c ---- linux-2.6.38.7/mm/slab.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.7/mm/slab.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/mm/slab.c b/mm/slab.c +index 4c6e2e3..36a17c9 100644 +--- a/mm/slab.c ++++ b/mm/slab.c @@ -150,7 +150,7 @@ /* Legal flag mask for kmem_cache_create(). */ @@ -65424,7 +66738,7 @@ diff -urNp linux-2.6.38.7/mm/slab.c linux-2.6.38.7/mm/slab.c #define CACHE_CACHE 0 #define SIZE_AC MAX_NUMNODES #define SIZE_L3 (2 * MAX_NUMNODES) -@@ -385,10 +385,10 @@ static void kmem_list3_init(struct kmem_ +@@ -385,10 +385,10 @@ static void kmem_list3_init(struct kmem_list3 *parent) if ((x)->max_freeable < i) \ (x)->max_freeable = i; \ } while (0) @@ -65439,7 +66753,7 @@ diff -urNp linux-2.6.38.7/mm/slab.c linux-2.6.38.7/mm/slab.c #else #define STATS_INC_ACTIVE(x) do { } while (0) #define STATS_DEC_ACTIVE(x) do { } while (0) -@@ -534,7 +534,7 @@ static inline void *index_to_obj(struct +@@ -534,7 +534,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab, * reciprocal_divide(offset, cache->reciprocal_buffer_size) */ static inline unsigned int obj_to_index(const struct kmem_cache *cache, @@ -65484,7 +66798,7 @@ diff -urNp linux-2.6.38.7/mm/slab.c linux-2.6.38.7/mm/slab.c NULL); } #ifdef CONFIG_ZONE_DMA -@@ -4275,10 +4275,10 @@ static int s_show(struct seq_file *m, vo +@@ -4275,10 +4275,10 @@ static int s_show(struct seq_file *m, void *p) } /* cpu stats */ { @@ -65499,7 +66813,7 @@ diff -urNp linux-2.6.38.7/mm/slab.c linux-2.6.38.7/mm/slab.c seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu", allochit, allocmiss, freehit, freemiss); -@@ -4535,15 +4535,66 @@ static const struct file_operations proc +@@ -4535,15 +4535,66 @@ static const struct file_operations proc_slabstats_operations = { static int __init slab_proc_init(void) { @@ -65568,9 +66882,10 @@ diff -urNp linux-2.6.38.7/mm/slab.c linux-2.6.38.7/mm/slab.c /** * ksize - get the actual amount of memory allocated for a given object * @objp: Pointer to the object -diff -urNp linux-2.6.38.7/mm/slob.c linux-2.6.38.7/mm/slob.c ---- linux-2.6.38.7/mm/slob.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/slob.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/mm/slob.c b/mm/slob.c +index 3588eaa..a160c7d 100644 +--- a/mm/slob.c ++++ b/mm/slob.c @@ -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 @@ -65607,7 +66922,7 @@ diff -urNp linux-2.6.38.7/mm/slob.c linux-2.6.38.7/mm/slob.c } static inline void set_slob_page(struct slob_page *sp) -@@ -150,7 +152,7 @@ static inline void clear_slob_page(struc +@@ -150,7 +152,7 @@ static inline void clear_slob_page(struct slob_page *sp) static inline struct slob_page *slob_page(const void *addr) { @@ -65616,7 +66931,7 @@ diff -urNp linux-2.6.38.7/mm/slob.c linux-2.6.38.7/mm/slob.c } /* -@@ -210,7 +212,7 @@ static void set_slob(slob_t *s, slobidx_ +@@ -210,7 +212,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next) /* * Return the size of a slob block. */ @@ -65643,7 +66958,7 @@ diff -urNp linux-2.6.38.7/mm/slob.c linux-2.6.38.7/mm/slob.c { return !((unsigned long)slob_next(s) & ~PAGE_MASK); } -@@ -254,6 +256,7 @@ static void *slob_new_pages(gfp_t gfp, i +@@ -254,6 +256,7 @@ static void *slob_new_pages(gfp_t gfp, int order, int node) if (!page) return NULL; @@ -65651,7 +66966,7 @@ diff -urNp linux-2.6.38.7/mm/slob.c linux-2.6.38.7/mm/slob.c return page_address(page); } -@@ -370,11 +373,11 @@ static void *slob_alloc(size_t size, gfp +@@ -370,11 +373,11 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node) if (!b) return NULL; sp = slob_page(b); @@ -65677,7 +66992,7 @@ diff -urNp linux-2.6.38.7/mm/slob.c linux-2.6.38.7/mm/slob.c void *ret; lockdep_trace_alloc(gfp); -@@ -492,7 +494,10 @@ void *__kmalloc_node(size_t size, gfp_t +@@ -492,7 +494,10 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node) if (!m) return NULL; @@ -65689,7 +67004,7 @@ diff -urNp linux-2.6.38.7/mm/slob.c linux-2.6.38.7/mm/slob.c ret = (void *)m + align; trace_kmalloc_node(_RET_IP_, ret, -@@ -504,9 +509,9 @@ void *__kmalloc_node(size_t size, gfp_t +@@ -504,9 +509,9 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node) gfp |= __GFP_COMP; ret = slob_new_pages(gfp, order, node); if (ret) { @@ -65702,7 +67017,7 @@ diff -urNp linux-2.6.38.7/mm/slob.c linux-2.6.38.7/mm/slob.c } trace_kmalloc_node(_RET_IP_, ret, -@@ -516,6 +521,13 @@ void *__kmalloc_node(size_t size, gfp_t +@@ -516,6 +521,13 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node) kmemleak_alloc(ret, size, 1, gfp); return ret; } @@ -65815,7 +67130,7 @@ diff -urNp linux-2.6.38.7/mm/slob.c linux-2.6.38.7/mm/slob.c } EXPORT_SYMBOL(ksize); -@@ -608,17 +688,25 @@ void *kmem_cache_alloc_node(struct kmem_ +@@ -608,17 +688,25 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node) { void *b; @@ -65860,7 +67175,7 @@ diff -urNp linux-2.6.38.7/mm/slob.c linux-2.6.38.7/mm/slob.c } static void kmem_rcu_free(struct rcu_head *head) -@@ -646,14 +740,23 @@ static void kmem_rcu_free(struct rcu_hea +@@ -646,14 +740,23 @@ static void kmem_rcu_free(struct rcu_head *head) void kmem_cache_free(struct kmem_cache *c, void *b) { @@ -65887,10 +67202,11 @@ diff -urNp linux-2.6.38.7/mm/slob.c linux-2.6.38.7/mm/slob.c } trace_kmem_cache_free(_RET_IP_, b); -diff -urNp linux-2.6.38.7/mm/slub.c linux-2.6.38.7/mm/slub.c ---- linux-2.6.38.7/mm/slub.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/slub.c 2011-04-28 19:34:15.000000000 -0400 -@@ -390,7 +390,7 @@ static void print_track(const char *s, s +diff --git a/mm/slub.c b/mm/slub.c +index e15aa7f..f795625 100644 +--- a/mm/slub.c ++++ b/mm/slub.c +@@ -390,7 +390,7 @@ static void print_track(const char *s, struct track *t) if (!t->addr) return; @@ -65899,7 +67215,7 @@ diff -urNp linux-2.6.38.7/mm/slub.c linux-2.6.38.7/mm/slub.c s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid); } -@@ -1927,6 +1927,8 @@ void kmem_cache_free(struct kmem_cache * +@@ -1927,6 +1927,8 @@ void kmem_cache_free(struct kmem_cache *s, void *x) page = virt_to_head_page(x); @@ -65917,7 +67233,7 @@ diff -urNp linux-2.6.38.7/mm/slub.c linux-2.6.38.7/mm/slub.c /* * Calculate the order of allocation given an slab object size. -@@ -2370,7 +2372,7 @@ static int kmem_cache_open(struct kmem_c +@@ -2370,7 +2372,7 @@ static int kmem_cache_open(struct kmem_cache *s, * list to avoid pounding the page allocator excessively. */ set_min_partial(s, ilog2(s->size)); @@ -65926,7 +67242,7 @@ diff -urNp linux-2.6.38.7/mm/slub.c linux-2.6.38.7/mm/slub.c #ifdef CONFIG_NUMA s->remote_node_defrag_ratio = 1000; #endif -@@ -2482,8 +2484,7 @@ static inline int kmem_cache_close(struc +@@ -2482,8 +2484,7 @@ static inline int kmem_cache_close(struct kmem_cache *s) void kmem_cache_destroy(struct kmem_cache *s) { down_write(&slub_lock); @@ -65936,7 +67252,7 @@ diff -urNp linux-2.6.38.7/mm/slub.c linux-2.6.38.7/mm/slub.c list_del(&s->list); if (kmem_cache_close(s)) { printk(KERN_ERR "SLUB %s: %s called for cache that " -@@ -2693,6 +2694,46 @@ void *__kmalloc_node(size_t size, gfp_t +@@ -2693,6 +2694,46 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node) EXPORT_SYMBOL(__kmalloc_node); #endif @@ -65983,7 +67299,7 @@ diff -urNp linux-2.6.38.7/mm/slub.c linux-2.6.38.7/mm/slub.c size_t ksize(const void *object) { struct page *page; -@@ -2958,7 +2999,7 @@ static void __init kmem_cache_bootstrap_ +@@ -2958,7 +2999,7 @@ static void __init kmem_cache_bootstrap_fixup(struct kmem_cache *s) int node; list_add(&s->list, &slab_caches); @@ -66013,7 +67329,7 @@ diff -urNp linux-2.6.38.7/mm/slub.c linux-2.6.38.7/mm/slub.c caches++; } -@@ -3153,7 +3194,7 @@ static int slab_unmergeable(struct kmem_ +@@ -3153,7 +3194,7 @@ static int slab_unmergeable(struct kmem_cache *s) /* * We may have set a slab to be unmergeable during bootstrap. */ @@ -66022,7 +67338,7 @@ diff -urNp linux-2.6.38.7/mm/slub.c linux-2.6.38.7/mm/slub.c return 1; return 0; -@@ -3212,7 +3253,7 @@ struct kmem_cache *kmem_cache_create(con +@@ -3212,7 +3253,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, down_write(&slub_lock); s = find_mergeable(size, align, flags, name, ctor); if (s) { @@ -66031,7 +67347,7 @@ diff -urNp linux-2.6.38.7/mm/slub.c linux-2.6.38.7/mm/slub.c /* * Adjust the object sizes so that we clear * the complete object on kzalloc. -@@ -3221,7 +3262,7 @@ struct kmem_cache *kmem_cache_create(con +@@ -3221,7 +3262,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *))); if (sysfs_slab_alias(s, name)) { @@ -66049,7 +67365,7 @@ diff -urNp linux-2.6.38.7/mm/slub.c linux-2.6.38.7/mm/slub.c } SLAB_ATTR_RO(aliases); -@@ -4691,7 +4732,13 @@ static const struct file_operations proc +@@ -4691,7 +4732,13 @@ static const struct file_operations proc_slabinfo_operations = { static int __init slab_proc_init(void) { @@ -66064,9 +67380,10 @@ diff -urNp linux-2.6.38.7/mm/slub.c linux-2.6.38.7/mm/slub.c return 0; } module_init(slab_proc_init); -diff -urNp linux-2.6.38.7/mm/swapfile.c linux-2.6.38.7/mm/swapfile.c ---- linux-2.6.38.7/mm/swapfile.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.7/mm/swapfile.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/mm/swapfile.c b/mm/swapfile.c +index 6d6d28c..512ad97 100644 +--- a/mm/swapfile.c ++++ b/mm/swapfile.c @@ -61,7 +61,7 @@ static DEFINE_MUTEX(swapon_mutex); static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait); @@ -66076,7 +67393,7 @@ diff -urNp linux-2.6.38.7/mm/swapfile.c linux-2.6.38.7/mm/swapfile.c static inline unsigned char swap_count(unsigned char ent) { -@@ -1687,7 +1687,7 @@ SYSCALL_DEFINE1(swapoff, const char __us +@@ -1687,7 +1687,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile) } filp_close(swap_file, NULL); err = 0; @@ -66085,7 +67402,7 @@ diff -urNp linux-2.6.38.7/mm/swapfile.c linux-2.6.38.7/mm/swapfile.c wake_up_interruptible(&proc_poll_wait); out_dput: -@@ -1708,8 +1708,8 @@ static unsigned swaps_poll(struct file * +@@ -1708,8 +1708,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait) poll_wait(file, &proc_poll_wait, wait); @@ -66096,7 +67413,7 @@ diff -urNp linux-2.6.38.7/mm/swapfile.c linux-2.6.38.7/mm/swapfile.c return POLLIN | POLLRDNORM | POLLERR | POLLPRI; } -@@ -1815,7 +1815,7 @@ static int swaps_open(struct inode *inod +@@ -1815,7 +1815,7 @@ static int swaps_open(struct inode *inode, struct file *file) } s->seq.private = s; @@ -66105,7 +67422,7 @@ diff -urNp linux-2.6.38.7/mm/swapfile.c linux-2.6.38.7/mm/swapfile.c return ret; } -@@ -2131,7 +2131,7 @@ SYSCALL_DEFINE2(swapon, const char __use +@@ -2131,7 +2131,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) swap_info[prev]->next = type; spin_unlock(&swap_lock); mutex_unlock(&swapon_mutex); @@ -66114,9 +67431,10 @@ diff -urNp linux-2.6.38.7/mm/swapfile.c linux-2.6.38.7/mm/swapfile.c wake_up_interruptible(&proc_poll_wait); error = 0; -diff -urNp linux-2.6.38.7/mm/util.c linux-2.6.38.7/mm/util.c ---- linux-2.6.38.7/mm/util.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/util.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/mm/util.c b/mm/util.c +index f126975..cdbe913 100644 +--- a/mm/util.c ++++ b/mm/util.c @@ -219,6 +219,12 @@ EXPORT_SYMBOL(strndup_user); void arch_pick_mmap_layout(struct mm_struct *mm) { @@ -66130,10 +67448,11 @@ diff -urNp linux-2.6.38.7/mm/util.c linux-2.6.38.7/mm/util.c mm->get_unmapped_area = arch_get_unmapped_area; mm->unmap_area = arch_unmap_area; } -diff -urNp linux-2.6.38.7/mm/vmalloc.c linux-2.6.38.7/mm/vmalloc.c ---- linux-2.6.38.7/mm/vmalloc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/vmalloc.c 2011-04-28 19:34:15.000000000 -0400 -@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, +diff --git a/mm/vmalloc.c b/mm/vmalloc.c +index f9b1667..243b8aa 100644 +--- a/mm/vmalloc.c ++++ b/mm/vmalloc.c +@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end) pte = pte_offset_kernel(pmd, addr); do { @@ -66155,7 +67474,7 @@ diff -urNp linux-2.6.38.7/mm/vmalloc.c linux-2.6.38.7/mm/vmalloc.c } while (pte++, addr += PAGE_SIZE, addr != end); } -@@ -91,6 +102,7 @@ static int vmap_pte_range(pmd_t *pmd, un +@@ -91,6 +102,7 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, pgprot_t prot, struct page **pages, int *nr) { pte_t *pte; @@ -66163,7 +67482,7 @@ diff -urNp linux-2.6.38.7/mm/vmalloc.c linux-2.6.38.7/mm/vmalloc.c /* * nr is a running index into the array which helps higher level -@@ -100,17 +112,30 @@ static int vmap_pte_range(pmd_t *pmd, un +@@ -100,17 +112,30 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr, pte = pte_alloc_kernel(pmd, addr); if (!pte) return -ENOMEM; @@ -66199,7 +67518,7 @@ diff -urNp linux-2.6.38.7/mm/vmalloc.c linux-2.6.38.7/mm/vmalloc.c } static int vmap_pmd_range(pud_t *pud, unsigned long addr, -@@ -191,11 +216,20 @@ int is_vmalloc_or_module_addr(const void +@@ -191,11 +216,20 @@ int is_vmalloc_or_module_addr(const void *x) * and fall back on vmalloc() if that fails. Others * just put it in the vmalloc space. */ @@ -66221,7 +67540,7 @@ diff -urNp linux-2.6.38.7/mm/vmalloc.c linux-2.6.38.7/mm/vmalloc.c return is_vmalloc_addr(x); } -@@ -216,8 +250,14 @@ struct page *vmalloc_to_page(const void +@@ -216,8 +250,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr) if (!pgd_none(*pgd)) { pud_t *pud = pud_offset(pgd, addr); @@ -66236,7 +67555,7 @@ diff -urNp linux-2.6.38.7/mm/vmalloc.c linux-2.6.38.7/mm/vmalloc.c if (!pmd_none(*pmd)) { pte_t *ptep, pte; -@@ -1244,6 +1284,16 @@ static struct vm_struct *__get_vm_area_n +@@ -1244,6 +1284,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size, struct vm_struct *area; BUG_ON(in_interrupt()); @@ -66253,7 +67572,7 @@ diff -urNp linux-2.6.38.7/mm/vmalloc.c linux-2.6.38.7/mm/vmalloc.c if (flags & VM_IOREMAP) { int bit = fls(size); -@@ -1462,6 +1512,11 @@ void *vmap(struct page **pages, unsigned +@@ -1462,6 +1512,11 @@ void *vmap(struct page **pages, unsigned int count, if (count > totalram_pages) return NULL; @@ -66265,7 +67584,7 @@ diff -urNp linux-2.6.38.7/mm/vmalloc.c linux-2.6.38.7/mm/vmalloc.c area = get_vm_area_caller((count << PAGE_SHIFT), flags, __builtin_return_address(0)); if (!area) -@@ -1558,6 +1613,13 @@ void *__vmalloc_node_range(unsigned long +@@ -1558,6 +1613,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, if (!size || (size >> PAGE_SHIFT) > totalram_pages) return NULL; @@ -66279,7 +67598,7 @@ diff -urNp linux-2.6.38.7/mm/vmalloc.c linux-2.6.38.7/mm/vmalloc.c area = __get_vm_area_node(size, align, VM_ALLOC, start, end, node, gfp_mask, caller); -@@ -1597,6 +1659,7 @@ static void *__vmalloc_node(unsigned lon +@@ -1597,6 +1659,7 @@ static void *__vmalloc_node(unsigned long size, unsigned long align, gfp_mask, prot, node, caller); } @@ -66287,7 +67606,7 @@ diff -urNp linux-2.6.38.7/mm/vmalloc.c linux-2.6.38.7/mm/vmalloc.c void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) { return __vmalloc_node(size, 1, gfp_mask, prot, -1, -@@ -1620,6 +1683,7 @@ static inline void *__vmalloc_node_flags +@@ -1620,6 +1683,7 @@ static inline void *__vmalloc_node_flags(unsigned long size, * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -66356,7 +67675,7 @@ diff -urNp linux-2.6.38.7/mm/vmalloc.c linux-2.6.38.7/mm/vmalloc.c void *vmalloc_32_user(unsigned long size) { struct vm_struct *area; -@@ -2018,6 +2088,8 @@ int remap_vmalloc_range(struct vm_area_s +@@ -2018,6 +2088,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr, unsigned long uaddr = vma->vm_start; unsigned long usize = vma->vm_end - vma->vm_start; @@ -66365,9 +67684,10 @@ diff -urNp linux-2.6.38.7/mm/vmalloc.c linux-2.6.38.7/mm/vmalloc.c if ((PAGE_SIZE-1) & (unsigned long)addr) return -EINVAL; -diff -urNp linux-2.6.38.7/mm/vmstat.c linux-2.6.38.7/mm/vmstat.c ---- linux-2.6.38.7/mm/vmstat.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/mm/vmstat.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/mm/vmstat.c b/mm/vmstat.c +index 0c3b504..a4fafe6 100644 +--- a/mm/vmstat.c ++++ b/mm/vmstat.c @@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu) * * vm_stat contains the global counters @@ -66420,10 +67740,11 @@ diff -urNp linux-2.6.38.7/mm/vmstat.c linux-2.6.38.7/mm/vmstat.c #endif return 0; } -diff -urNp linux-2.6.38.7/net/8021q/vlan.c linux-2.6.38.7/net/8021q/vlan.c ---- linux-2.6.38.7/net/8021q/vlan.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/8021q/vlan.c 2011-04-28 19:34:15.000000000 -0400 -@@ -589,8 +589,7 @@ static int vlan_ioctl_handler(struct net +diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c +index 8a7de0f..3f394d8 100644 +--- a/net/8021q/vlan.c ++++ b/net/8021q/vlan.c +@@ -592,8 +592,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg) err = -EPERM; if (!capable(CAP_NET_ADMIN)) break; @@ -66433,10 +67754,11 @@ diff -urNp linux-2.6.38.7/net/8021q/vlan.c linux-2.6.38.7/net/8021q/vlan.c struct vlan_net *vn; vn = net_generic(net, vlan_net_id); -diff -urNp linux-2.6.38.7/net/atm/atm_misc.c linux-2.6.38.7/net/atm/atm_misc.c ---- linux-2.6.38.7/net/atm/atm_misc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/atm/atm_misc.c 2011-04-28 19:34:15.000000000 -0400 -@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int +diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c +index fc63526..7777a58 100644 +--- a/net/atm/atm_misc.c ++++ b/net/atm/atm_misc.c +@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize) if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) return 1; atm_return(vcc, truesize); @@ -66445,7 +67767,7 @@ diff -urNp linux-2.6.38.7/net/atm/atm_misc.c linux-2.6.38.7/net/atm/atm_misc.c return 0; } EXPORT_SYMBOL(atm_charge); -@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct +@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size, } } atm_return(vcc, guess); @@ -66472,10 +67794,11 @@ diff -urNp linux-2.6.38.7/net/atm/atm_misc.c linux-2.6.38.7/net/atm/atm_misc.c __SONET_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.38.7/net/atm/mpoa_caches.c linux-2.6.38.7/net/atm/mpoa_caches.c ---- linux-2.6.38.7/net/atm/mpoa_caches.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/atm/mpoa_caches.c 2011-05-16 21:47:09.000000000 -0400 -@@ -255,6 +255,8 @@ static void check_resolving_entries(stru +diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c +index d1b2d9a..7cc2219 100644 +--- a/net/atm/mpoa_caches.c ++++ b/net/atm/mpoa_caches.c +@@ -255,6 +255,8 @@ static void check_resolving_entries(struct mpoa_client *client) struct timeval now; struct k_message msg; @@ -66484,10 +67807,11 @@ diff -urNp linux-2.6.38.7/net/atm/mpoa_caches.c linux-2.6.38.7/net/atm/mpoa_cach do_gettimeofday(&now); read_lock_bh(&client->ingress_lock); -diff -urNp linux-2.6.38.7/net/atm/proc.c linux-2.6.38.7/net/atm/proc.c ---- linux-2.6.38.7/net/atm/proc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/atm/proc.c 2011-04-28 19:34:15.000000000 -0400 -@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s +diff --git a/net/atm/proc.c b/net/atm/proc.c +index f85da077..f0fa716 100644 +--- a/net/atm/proc.c ++++ b/net/atm/proc.c +@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal, const struct k_atm_aal_stats *stats) { seq_printf(seq, "%s ( %d %d %d %d %d )", aal, @@ -66500,7 +67824,7 @@ diff -urNp linux-2.6.38.7/net/atm/proc.c linux-2.6.38.7/net/atm/proc.c } static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) -@@ -191,7 +191,12 @@ static void vcc_info(struct seq_file *se +@@ -191,7 +191,12 @@ static void vcc_info(struct seq_file *seq, struct atm_vcc *vcc) { struct sock *sk = sk_atm(vcc); @@ -66513,7 +67837,7 @@ diff -urNp linux-2.6.38.7/net/atm/proc.c linux-2.6.38.7/net/atm/proc.c if (!vcc->dev) seq_printf(seq, "Unassigned "); else -@@ -218,7 +223,11 @@ static void svc_info(struct seq_file *se +@@ -218,7 +223,11 @@ static void svc_info(struct seq_file *seq, struct atm_vcc *vcc) { if (!vcc->dev) seq_printf(seq, sizeof(void *) == 4 ? @@ -66525,9 +67849,10 @@ diff -urNp linux-2.6.38.7/net/atm/proc.c linux-2.6.38.7/net/atm/proc.c else seq_printf(seq, "%3d %3d %5d ", vcc->dev->number, vcc->vpi, vcc->vci); -diff -urNp linux-2.6.38.7/net/atm/resources.c linux-2.6.38.7/net/atm/resources.c ---- linux-2.6.38.7/net/atm/resources.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/atm/resources.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/net/atm/resources.c b/net/atm/resources.c +index 23f45ce..c748f1a 100644 +--- a/net/atm/resources.c ++++ b/net/atm/resources.c @@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister); static void copy_aal_stats(struct k_atm_aal_stats *from, struct atm_aal_stats *to) @@ -66537,7 +67862,7 @@ diff -urNp linux-2.6.38.7/net/atm/resources.c linux-2.6.38.7/net/atm/resources.c __AAL_STAT_ITEMS #undef __HANDLE_ITEM } -@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_ +@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from, static void subtract_aal_stats(struct k_atm_aal_stats *from, struct atm_aal_stats *to) { @@ -66546,10 +67871,11 @@ diff -urNp linux-2.6.38.7/net/atm/resources.c linux-2.6.38.7/net/atm/resources.c __AAL_STAT_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.38.7/net/batman-adv/hard-interface.c linux-2.6.38.7/net/batman-adv/hard-interface.c ---- linux-2.6.38.7/net/batman-adv/hard-interface.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/batman-adv/hard-interface.c 2011-04-28 19:57:25.000000000 -0400 -@@ -325,8 +325,8 @@ int hardif_enable_interface(struct batma +diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c +index 4f95777..0006f66 100644 +--- a/net/batman-adv/hard-interface.c ++++ b/net/batman-adv/hard-interface.c +@@ -325,8 +325,8 @@ int hardif_enable_interface(struct batman_if *batman_if, char *iface_name) kref_get(&batman_if->refcount); dev_add_pack(&batman_if->batman_adv_ptype); @@ -66560,10 +67886,11 @@ diff -urNp linux-2.6.38.7/net/batman-adv/hard-interface.c linux-2.6.38.7/net/bat bat_info(batman_if->soft_iface, "Adding interface: %s\n", batman_if->net_dev->name); -diff -urNp linux-2.6.38.7/net/batman-adv/routing.c linux-2.6.38.7/net/batman-adv/routing.c ---- linux-2.6.38.7/net/batman-adv/routing.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/batman-adv/routing.c 2011-04-28 19:57:25.000000000 -0400 -@@ -569,7 +569,7 @@ void receive_bat_packet(struct ethhdr *e +diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c +index 8828edd..b5cfd66 100644 +--- a/net/batman-adv/routing.c ++++ b/net/batman-adv/routing.c +@@ -569,7 +569,7 @@ void receive_bat_packet(struct ethhdr *ethhdr, return; /* could be changed by schedule_own_packet() */ @@ -66572,10 +67899,11 @@ diff -urNp linux-2.6.38.7/net/batman-adv/routing.c linux-2.6.38.7/net/batman-adv has_directlink_flag = (batman_packet->flags & DIRECTLINK ? 1 : 0); -diff -urNp linux-2.6.38.7/net/batman-adv/send.c linux-2.6.38.7/net/batman-adv/send.c ---- linux-2.6.38.7/net/batman-adv/send.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/batman-adv/send.c 2011-04-28 19:57:25.000000000 -0400 -@@ -277,7 +277,7 @@ void schedule_own_packet(struct batman_i +diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c +index b89b9f7..f37626e 100644 +--- a/net/batman-adv/send.c ++++ b/net/batman-adv/send.c +@@ -277,7 +277,7 @@ void schedule_own_packet(struct batman_if *batman_if) /* change sequence number to network order */ batman_packet->seqno = @@ -66584,7 +67912,7 @@ diff -urNp linux-2.6.38.7/net/batman-adv/send.c linux-2.6.38.7/net/batman-adv/se if (vis_server == VIS_TYPE_SERVER_SYNC) batman_packet->flags |= VIS_SERVER; -@@ -291,7 +291,7 @@ void schedule_own_packet(struct batman_i +@@ -291,7 +291,7 @@ void schedule_own_packet(struct batman_if *batman_if) else batman_packet->gw_flags = 0; @@ -66593,10 +67921,11 @@ diff -urNp linux-2.6.38.7/net/batman-adv/send.c linux-2.6.38.7/net/batman-adv/se slide_own_bcast_window(batman_if); send_time = own_send_time(bat_priv); -diff -urNp linux-2.6.38.7/net/batman-adv/soft-interface.c linux-2.6.38.7/net/batman-adv/soft-interface.c ---- linux-2.6.38.7/net/batman-adv/soft-interface.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/batman-adv/soft-interface.c 2011-04-28 19:57:25.000000000 -0400 -@@ -410,7 +410,7 @@ int interface_tx(struct sk_buff *skb, st +diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c +index e89ede1..1230f68 100644 +--- a/net/batman-adv/soft-interface.c ++++ b/net/batman-adv/soft-interface.c +@@ -410,7 +410,7 @@ int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) /* set broadcast sequence number */ bcast_packet->seqno = @@ -66605,7 +67934,7 @@ diff -urNp linux-2.6.38.7/net/batman-adv/soft-interface.c linux-2.6.38.7/net/bat add_bcast_packet_to_list(bat_priv, skb); -@@ -603,7 +603,7 @@ struct net_device *softif_create(char *n +@@ -603,7 +603,7 @@ struct net_device *softif_create(char *name) atomic_set(&bat_priv->batman_queue_left, BATMAN_QUEUE_LEN); atomic_set(&bat_priv->mesh_state, MESH_INACTIVE); @@ -66614,9 +67943,10 @@ diff -urNp linux-2.6.38.7/net/batman-adv/soft-interface.c linux-2.6.38.7/net/bat atomic_set(&bat_priv->hna_local_changed, 0); bat_priv->primary_if = NULL; -diff -urNp linux-2.6.38.7/net/batman-adv/types.h linux-2.6.38.7/net/batman-adv/types.h ---- linux-2.6.38.7/net/batman-adv/types.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/batman-adv/types.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h +index bf3f6f5..328ca43 100644 +--- a/net/batman-adv/types.h ++++ b/net/batman-adv/types.h @@ -38,8 +38,8 @@ struct batman_if { int16_t if_num; char if_status; @@ -66637,10 +67967,11 @@ diff -urNp linux-2.6.38.7/net/batman-adv/types.h linux-2.6.38.7/net/batman-adv/t atomic_t bcast_queue_left; atomic_t batman_queue_left; char num_ifaces; -diff -urNp linux-2.6.38.7/net/batman-adv/unicast.c linux-2.6.38.7/net/batman-adv/unicast.c ---- linux-2.6.38.7/net/batman-adv/unicast.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/batman-adv/unicast.c 2011-04-28 19:57:25.000000000 -0400 -@@ -261,9 +261,9 @@ int frag_send_skb(struct sk_buff *skb, s +diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c +index d1a6113..f722823 100644 +--- a/net/batman-adv/unicast.c ++++ b/net/batman-adv/unicast.c +@@ -261,9 +261,9 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv, frag1->flags |= UNI_FRAG_HEAD; frag2->flags &= ~UNI_FRAG_HEAD; @@ -66652,10 +67983,11 @@ diff -urNp linux-2.6.38.7/net/batman-adv/unicast.c linux-2.6.38.7/net/batman-adv &batman_if->frag_seqno)); send_skb_packet(skb, batman_if, dstaddr); -diff -urNp linux-2.6.38.7/net/bridge/br_multicast.c linux-2.6.38.7/net/bridge/br_multicast.c ---- linux-2.6.38.7/net/bridge/br_multicast.c 2011-04-22 19:20:59.000000000 -0400 -+++ linux-2.6.38.7/net/bridge/br_multicast.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1482,7 +1482,7 @@ static int br_multicast_ipv6_rcv(struct +diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c +index f61eb2e..51cd08f 100644 +--- a/net/bridge/br_multicast.c ++++ b/net/bridge/br_multicast.c +@@ -1482,7 +1482,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br, nexthdr = ip6h->nexthdr; offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr); @@ -66664,10 +67996,11 @@ diff -urNp linux-2.6.38.7/net/bridge/br_multicast.c linux-2.6.38.7/net/bridge/br return 0; /* Okay, we found ICMPv6 header */ -diff -urNp linux-2.6.38.7/net/bridge/netfilter/ebtables.c linux-2.6.38.7/net/bridge/netfilter/ebtables.c ---- linux-2.6.38.7/net/bridge/netfilter/ebtables.c 2011-04-18 17:27:18.000000000 -0400 -+++ linux-2.6.38.7/net/bridge/netfilter/ebtables.c 2011-05-16 21:47:08.000000000 -0400 -@@ -1512,7 +1512,7 @@ static int do_ebt_get_ctl(struct sock *s +diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c +index 47acf4a..11272ea 100644 +--- a/net/bridge/netfilter/ebtables.c ++++ b/net/bridge/netfilter/ebtables.c +@@ -1512,7 +1512,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) tmp.valid_hooks = t->table->valid_hooks; } mutex_unlock(&ebt_mutex); @@ -66676,7 +68009,7 @@ diff -urNp linux-2.6.38.7/net/bridge/netfilter/ebtables.c linux-2.6.38.7/net/bri BUGPRINT("c2u Didn't work\n"); ret = -EFAULT; break; -@@ -1779,6 +1779,8 @@ static int compat_copy_everything_to_use +@@ -1779,6 +1779,8 @@ static int compat_copy_everything_to_user(struct ebt_table *t, int ret; void __user *pos; @@ -66685,9 +68018,10 @@ diff -urNp linux-2.6.38.7/net/bridge/netfilter/ebtables.c linux-2.6.38.7/net/bri memset(&tinfo, 0, sizeof(tinfo)); if (cmd == EBT_SO_GET_ENTRIES) { -diff -urNp linux-2.6.38.7/net/caif/caif_socket.c linux-2.6.38.7/net/caif/caif_socket.c ---- linux-2.6.38.7/net/caif/caif_socket.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/caif/caif_socket.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c +index 8184c03..a1f9b1e 100644 +--- a/net/caif/caif_socket.c ++++ b/net/caif/caif_socket.c @@ -48,18 +48,19 @@ static struct dentry *debugfsdir; #ifdef CONFIG_DEBUG_FS struct debug_fs_counter { @@ -66717,7 +68051,7 @@ diff -urNp linux-2.6.38.7/net/caif/caif_socket.c linux-2.6.38.7/net/caif/caif_so #define dbfs_atomic_dec(v) atomic_dec(v) #else #define dbfs_atomic_inc(v) -@@ -159,7 +160,7 @@ static int caif_queue_rcv_skb(struct soc +@@ -159,7 +160,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) atomic_read(&cf_sk->sk.sk_rmem_alloc), sk_rcvbuf_lowwater(cf_sk)); set_rx_flow_off(cf_sk); @@ -66726,7 +68060,7 @@ diff -urNp linux-2.6.38.7/net/caif/caif_socket.c linux-2.6.38.7/net/caif/caif_so caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ); } -@@ -169,7 +170,7 @@ static int caif_queue_rcv_skb(struct soc +@@ -169,7 +170,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) if (!sk_rmem_schedule(sk, skb->truesize) && rx_flow_is_on(cf_sk)) { set_rx_flow_off(cf_sk); pr_debug("sending flow OFF due to rmem_schedule\n"); @@ -66735,7 +68069,7 @@ diff -urNp linux-2.6.38.7/net/caif/caif_socket.c linux-2.6.38.7/net/caif/caif_so caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ); } skb->dev = NULL; -@@ -218,21 +219,21 @@ static void caif_ctrl_cb(struct cflayer +@@ -218,21 +219,21 @@ static void caif_ctrl_cb(struct cflayer *layr, switch (flow) { case CAIF_CTRLCMD_FLOW_ON_IND: /* OK from modem to start sending again */ @@ -66760,7 +68094,7 @@ diff -urNp linux-2.6.38.7/net/caif/caif_socket.c linux-2.6.38.7/net/caif/caif_so cf_sk->sk.sk_state = CAIF_CONNECTED; set_tx_flow_on(cf_sk); cf_sk->sk.sk_state_change(&cf_sk->sk); -@@ -247,7 +248,7 @@ static void caif_ctrl_cb(struct cflayer +@@ -247,7 +248,7 @@ static void caif_ctrl_cb(struct cflayer *layr, case CAIF_CTRLCMD_INIT_FAIL_RSP: /* Connect request failed */ @@ -66769,7 +68103,7 @@ diff -urNp linux-2.6.38.7/net/caif/caif_socket.c linux-2.6.38.7/net/caif/caif_so cf_sk->sk.sk_err = ECONNREFUSED; cf_sk->sk.sk_state = CAIF_DISCONNECTED; cf_sk->sk.sk_shutdown = SHUTDOWN_MASK; -@@ -261,7 +262,7 @@ static void caif_ctrl_cb(struct cflayer +@@ -261,7 +262,7 @@ static void caif_ctrl_cb(struct cflayer *layr, case CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND: /* Modem has closed this connection, or device is down. */ @@ -66778,7 +68112,7 @@ diff -urNp linux-2.6.38.7/net/caif/caif_socket.c linux-2.6.38.7/net/caif/caif_so cf_sk->sk.sk_shutdown = SHUTDOWN_MASK; cf_sk->sk.sk_err = ECONNRESET; set_rx_flow_on(cf_sk); -@@ -281,7 +282,7 @@ static void caif_check_flow_release(stru +@@ -281,7 +282,7 @@ static void caif_check_flow_release(struct sock *sk) return; if (atomic_read(&sk->sk_rmem_alloc) <= sk_rcvbuf_lowwater(cf_sk)) { @@ -66787,7 +68121,7 @@ diff -urNp linux-2.6.38.7/net/caif/caif_socket.c linux-2.6.38.7/net/caif/caif_so set_rx_flow_on(cf_sk); caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_ON_REQ); } -@@ -864,7 +865,7 @@ static int caif_connect(struct socket *s +@@ -864,7 +865,7 @@ static int caif_connect(struct socket *sock, struct sockaddr *uaddr, /*ifindex = id of the interface.*/ cf_sk->conn_req.ifindex = cf_sk->sk.sk_bound_dev_if; @@ -66796,7 +68130,7 @@ diff -urNp linux-2.6.38.7/net/caif/caif_socket.c linux-2.6.38.7/net/caif/caif_so cf_sk->layer.receive = caif_sktrecv_cb; err = caif_connect_client(&cf_sk->conn_req, &cf_sk->layer, &ifindex, &headroom, &tailroom); -@@ -952,7 +953,7 @@ static int caif_release(struct socket *s +@@ -952,7 +953,7 @@ static int caif_release(struct socket *sock) spin_unlock(&sk->sk_receive_queue.lock); sock->sk = NULL; @@ -66805,9 +68139,10 @@ diff -urNp linux-2.6.38.7/net/caif/caif_socket.c linux-2.6.38.7/net/caif/caif_so if (cf_sk->debugfs_socket_dir != NULL) debugfs_remove_recursive(cf_sk->debugfs_socket_dir); -diff -urNp linux-2.6.38.7/net/caif/cfctrl.c linux-2.6.38.7/net/caif/cfctrl.c ---- linux-2.6.38.7/net/caif/cfctrl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/caif/cfctrl.c 2011-05-16 21:47:08.000000000 -0400 +diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c +index 3cd8f97..da4fdfe 100644 +--- a/net/caif/cfctrl.c ++++ b/net/caif/cfctrl.c @@ -9,6 +9,7 @@ #include <linux/stddef.h> #include <linux/spinlock.h> @@ -66827,7 +68162,7 @@ diff -urNp linux-2.6.38.7/net/caif/cfctrl.c linux-2.6.38.7/net/caif/cfctrl.c this->serv.layer.receive = cfctrl_recv; sprintf(this->serv.layer.name, "ctrl"); this->serv.layer.ctrlcmd = cfctrl_ctrlcmd; -@@ -116,8 +117,8 @@ void cfctrl_insert_req(struct cfctrl *ct +@@ -116,8 +117,8 @@ void cfctrl_insert_req(struct cfctrl *ctrl, struct cfctrl_request_info *req) { spin_lock(&ctrl->info_list_lock); @@ -66838,7 +68173,7 @@ diff -urNp linux-2.6.38.7/net/caif/cfctrl.c linux-2.6.38.7/net/caif/cfctrl.c list_add_tail(&req->list, &ctrl->list); spin_unlock(&ctrl->info_list_lock); } -@@ -136,7 +137,7 @@ struct cfctrl_request_info *cfctrl_remov +@@ -136,7 +137,7 @@ struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl, if (p != first) pr_warn("Requests are not received in order\n"); @@ -66847,7 +68182,7 @@ diff -urNp linux-2.6.38.7/net/caif/cfctrl.c linux-2.6.38.7/net/caif/cfctrl.c p->sequence_no); list_del(&p->list); goto out; -@@ -385,6 +386,7 @@ static int cfctrl_recv(struct cflayer *l +@@ -385,6 +386,7 @@ static int cfctrl_recv(struct cflayer *layer, struct cfpkt *pkt) struct cfctrl *cfctrl = container_obj(layer); struct cfctrl_request_info rsp, *req; @@ -66855,10 +68190,11 @@ diff -urNp linux-2.6.38.7/net/caif/cfctrl.c linux-2.6.38.7/net/caif/cfctrl.c cfpkt_extr_head(pkt, &cmdrsp, 1); cmd = cmdrsp & CFCTRL_CMD_MASK; -diff -urNp linux-2.6.38.7/net/can/bcm.c linux-2.6.38.7/net/can/bcm.c ---- linux-2.6.38.7/net/can/bcm.c 2011-05-10 22:06:29.000000000 -0400 -+++ linux-2.6.38.7/net/can/bcm.c 2011-05-10 22:09:01.000000000 -0400 -@@ -165,9 +165,15 @@ static int bcm_proc_show(struct seq_file +diff --git a/net/can/bcm.c b/net/can/bcm.c +index 63779ab..74d6c5d 100644 +--- a/net/can/bcm.c ++++ b/net/can/bcm.c +@@ -165,9 +165,15 @@ static int bcm_proc_show(struct seq_file *m, void *v) struct bcm_sock *bo = bcm_sk(sk); struct bcm_op *op; @@ -66874,10 +68210,11 @@ diff -urNp linux-2.6.38.7/net/can/bcm.c linux-2.6.38.7/net/can/bcm.c seq_printf(m, " / dropped %lu", bo->dropped_usr_msgs); seq_printf(m, " / bound %s", bcm_proc_getifname(ifname, bo->ifindex)); seq_printf(m, " <<<\n"); -diff -urNp linux-2.6.38.7/net/core/datagram.c linux-2.6.38.7/net/core/datagram.c ---- linux-2.6.38.7/net/core/datagram.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/core/datagram.c 2011-04-28 19:57:25.000000000 -0400 -@@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, s +diff --git a/net/core/datagram.c b/net/core/datagram.c +index 18ac112..fe95ed9 100644 +--- a/net/core/datagram.c ++++ b/net/core/datagram.c +@@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags) } kfree_skb(skb); @@ -66886,10 +68223,11 @@ diff -urNp linux-2.6.38.7/net/core/datagram.c linux-2.6.38.7/net/core/datagram.c sk_mem_reclaim_partial(sk); return err; -diff -urNp linux-2.6.38.7/net/core/dev.c linux-2.6.38.7/net/core/dev.c ---- linux-2.6.38.7/net/core/dev.c 2011-05-22 23:05:21.000000000 -0400 -+++ linux-2.6.38.7/net/core/dev.c 2011-05-22 23:06:04.000000000 -0400 -@@ -1124,10 +1124,14 @@ void dev_load(struct net *net, const cha +diff --git a/net/core/dev.c b/net/core/dev.c +index 2bb4aa68..1ae6cf5 100644 +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -1124,10 +1124,14 @@ void dev_load(struct net *net, const char *name) if (no_module && capable(CAP_NET_ADMIN)) no_module = request_module("netdev-%s", name); if (no_module && capable(CAP_SYS_MODULE)) { @@ -66913,7 +68251,7 @@ diff -urNp linux-2.6.38.7/net/core/dev.c linux-2.6.38.7/net/core/dev.c { struct softnet_data *sd = &__get_cpu_var(softnet_data); -@@ -3699,7 +3703,7 @@ void netif_napi_del(struct napi_struct * +@@ -3699,7 +3703,7 @@ void netif_napi_del(struct napi_struct *napi) } EXPORT_SYMBOL(netif_napi_del); @@ -66922,9 +68260,10 @@ diff -urNp linux-2.6.38.7/net/core/dev.c linux-2.6.38.7/net/core/dev.c { struct softnet_data *sd = &__get_cpu_var(softnet_data); unsigned long time_limit = jiffies + 2; -diff -urNp linux-2.6.38.7/net/core/flow.c linux-2.6.38.7/net/core/flow.c ---- linux-2.6.38.7/net/core/flow.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/core/flow.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/net/core/flow.c b/net/core/flow.c +index 127c8a7..7815384 100644 +--- a/net/core/flow.c ++++ b/net/core/flow.c @@ -60,7 +60,7 @@ struct flow_cache { struct timer_list rnd_timer; }; @@ -66934,7 +68273,7 @@ diff -urNp linux-2.6.38.7/net/core/flow.c linux-2.6.38.7/net/core/flow.c EXPORT_SYMBOL(flow_cache_genid); static struct flow_cache flow_cache_global; static struct kmem_cache *flow_cachep __read_mostly; -@@ -85,7 +85,7 @@ static void flow_cache_new_hashrnd(unsig +@@ -85,7 +85,7 @@ static void flow_cache_new_hashrnd(unsigned long arg) static int flow_entry_valid(struct flow_cache_entry *fle) { @@ -66943,7 +68282,7 @@ diff -urNp linux-2.6.38.7/net/core/flow.c linux-2.6.38.7/net/core/flow.c return 0; if (fle->object && !fle->object->ops->check(fle->object)) return 0; -@@ -253,7 +253,7 @@ flow_cache_lookup(struct net *net, struc +@@ -253,7 +253,7 @@ flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]); fcp->hash_count++; } @@ -66961,10 +68300,11 @@ diff -urNp linux-2.6.38.7/net/core/flow.c linux-2.6.38.7/net/core/flow.c if (!IS_ERR(flo)) fle->object = flo; else -diff -urNp linux-2.6.38.7/net/core/skbuff.c linux-2.6.38.7/net/core/skbuff.c ---- linux-2.6.38.7/net/core/skbuff.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/core/skbuff.c 2011-05-16 21:47:09.000000000 -0400 -@@ -1543,6 +1543,8 @@ int skb_splice_bits(struct sk_buff *skb, +diff --git a/net/core/skbuff.c b/net/core/skbuff.c +index e9f92489..55d1a69 100644 +--- a/net/core/skbuff.c ++++ b/net/core/skbuff.c +@@ -1543,6 +1543,8 @@ int skb_splice_bits(struct sk_buff *skb, unsigned int offset, struct sock *sk = skb->sk; int ret = 0; @@ -66973,10 +68313,11 @@ diff -urNp linux-2.6.38.7/net/core/skbuff.c linux-2.6.38.7/net/core/skbuff.c if (splice_grow_spd(pipe, &spd)) return -ENOMEM; -diff -urNp linux-2.6.38.7/net/core/sock.c linux-2.6.38.7/net/core/sock.c ---- linux-2.6.38.7/net/core/sock.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/core/sock.c 2011-04-28 19:57:25.000000000 -0400 -@@ -291,7 +291,7 @@ int sock_queue_rcv_skb(struct sock *sk, +diff --git a/net/core/sock.c b/net/core/sock.c +index 7dfed79..fa3c089 100644 +--- a/net/core/sock.c ++++ b/net/core/sock.c +@@ -291,7 +291,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) */ if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >= (unsigned)sk->sk_rcvbuf) { @@ -66985,7 +68326,7 @@ diff -urNp linux-2.6.38.7/net/core/sock.c linux-2.6.38.7/net/core/sock.c return -ENOMEM; } -@@ -300,7 +300,7 @@ int sock_queue_rcv_skb(struct sock *sk, +@@ -300,7 +300,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) return err; if (!sk_rmem_schedule(sk, skb->truesize)) { @@ -66994,7 +68335,7 @@ diff -urNp linux-2.6.38.7/net/core/sock.c linux-2.6.38.7/net/core/sock.c return -ENOBUFS; } -@@ -320,7 +320,7 @@ int sock_queue_rcv_skb(struct sock *sk, +@@ -320,7 +320,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) skb_dst_force(skb); spin_lock_irqsave(&list->lock, flags); @@ -67003,7 +68344,7 @@ diff -urNp linux-2.6.38.7/net/core/sock.c linux-2.6.38.7/net/core/sock.c __skb_queue_tail(list, skb); spin_unlock_irqrestore(&list->lock, flags); -@@ -340,7 +340,7 @@ int sk_receive_skb(struct sock *sk, stru +@@ -340,7 +340,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested) skb->dev = NULL; if (sk_rcvqueues_full(sk, skb)) { @@ -67012,7 +68353,7 @@ diff -urNp linux-2.6.38.7/net/core/sock.c linux-2.6.38.7/net/core/sock.c goto discard_and_relse; } if (nested) -@@ -358,7 +358,7 @@ int sk_receive_skb(struct sock *sk, stru +@@ -358,7 +358,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested) mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_); } else if (sk_add_backlog(sk, skb)) { bh_unlock_sock(sk); @@ -67021,7 +68362,7 @@ diff -urNp linux-2.6.38.7/net/core/sock.c linux-2.6.38.7/net/core/sock.c goto discard_and_relse; } -@@ -934,7 +934,7 @@ int sock_getsockopt(struct socket *sock, +@@ -934,7 +934,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname, return -ENOTCONN; if (lv < len) return -EINVAL; @@ -67030,7 +68371,7 @@ diff -urNp linux-2.6.38.7/net/core/sock.c linux-2.6.38.7/net/core/sock.c return -EFAULT; goto lenout; } -@@ -967,7 +967,7 @@ int sock_getsockopt(struct socket *sock, +@@ -967,7 +967,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname, if (len > lv) len = lv; @@ -67039,7 +68380,7 @@ diff -urNp linux-2.6.38.7/net/core/sock.c linux-2.6.38.7/net/core/sock.c return -EFAULT; lenout: if (put_user(len, optlen)) -@@ -2023,7 +2023,7 @@ void sock_init_data(struct socket *sock, +@@ -2023,7 +2023,7 @@ void sock_init_data(struct socket *sock, struct sock *sk) */ smp_wmb(); atomic_set(&sk->sk_refcnt, 1); @@ -67048,10 +68389,11 @@ diff -urNp linux-2.6.38.7/net/core/sock.c linux-2.6.38.7/net/core/sock.c } EXPORT_SYMBOL(sock_init_data); -diff -urNp linux-2.6.38.7/net/decnet/sysctl_net_decnet.c linux-2.6.38.7/net/decnet/sysctl_net_decnet.c ---- linux-2.6.38.7/net/decnet/sysctl_net_decnet.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/decnet/sysctl_net_decnet.c 2011-04-28 19:34:15.000000000 -0400 -@@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_t +diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c +index 28f8b5e..2e2c4f4 100644 +--- a/net/decnet/sysctl_net_decnet.c ++++ b/net/decnet/sysctl_net_decnet.c +@@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_table *table, int write, if (len > *lenp) len = *lenp; @@ -67060,7 +68402,7 @@ diff -urNp linux-2.6.38.7/net/decnet/sysctl_net_decnet.c linux-2.6.38.7/net/decn return -EFAULT; *lenp = len; -@@ -236,7 +236,7 @@ static int dn_def_dev_handler(ctl_table +@@ -236,7 +236,7 @@ static int dn_def_dev_handler(ctl_table *table, int write, if (len > *lenp) len = *lenp; @@ -67069,9 +68411,10 @@ diff -urNp linux-2.6.38.7/net/decnet/sysctl_net_decnet.c linux-2.6.38.7/net/decn return -EFAULT; *lenp = len; -diff -urNp linux-2.6.38.7/net/econet/Kconfig linux-2.6.38.7/net/econet/Kconfig ---- linux-2.6.38.7/net/econet/Kconfig 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/econet/Kconfig 2011-04-28 19:34:15.000000000 -0400 +diff --git a/net/econet/Kconfig b/net/econet/Kconfig +index 39a2d29..f39c0fe 100644 +--- a/net/econet/Kconfig ++++ b/net/econet/Kconfig @@ -4,7 +4,7 @@ config ECONET @@ -67081,10 +68424,11 @@ diff -urNp linux-2.6.38.7/net/econet/Kconfig linux-2.6.38.7/net/econet/Kconfig ---help--- Econet is a fairly old and slow networking protocol mainly used by Acorn computers to access file and print servers. It uses native -diff -urNp linux-2.6.38.7/net/ipv4/inet_diag.c linux-2.6.38.7/net/ipv4/inet_diag.c ---- linux-2.6.38.7/net/ipv4/inet_diag.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/ipv4/inet_diag.c 2011-04-28 19:34:15.000000000 -0400 -@@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc +diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c +index 2ada171..e74e680 100644 +--- a/net/ipv4/inet_diag.c ++++ b/net/ipv4/inet_diag.c +@@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct sock *sk, r->idiag_retrans = 0; r->id.idiag_if = sk->sk_bound_dev_if; @@ -67099,7 +68443,7 @@ diff -urNp linux-2.6.38.7/net/ipv4/inet_diag.c linux-2.6.38.7/net/ipv4/inet_diag r->id.idiag_sport = inet->inet_sport; r->id.idiag_dport = inet->inet_dport; -@@ -201,8 +207,15 @@ static int inet_twsk_diag_fill(struct in +@@ -201,8 +207,15 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw, r->idiag_family = tw->tw_family; r->idiag_retrans = 0; r->id.idiag_if = tw->tw_bound_dev_if; @@ -67115,7 +68459,7 @@ diff -urNp linux-2.6.38.7/net/ipv4/inet_diag.c linux-2.6.38.7/net/ipv4/inet_diag r->id.idiag_sport = tw->tw_sport; r->id.idiag_dport = tw->tw_dport; r->id.idiag_src[0] = tw->tw_rcv_saddr; -@@ -285,12 +298,14 @@ static int inet_diag_get_exact(struct sk +@@ -285,12 +298,14 @@ static int inet_diag_get_exact(struct sk_buff *in_skb, if (sk == NULL) goto unlock; @@ -67130,7 +68474,7 @@ diff -urNp linux-2.6.38.7/net/ipv4/inet_diag.c linux-2.6.38.7/net/ipv4/inet_diag err = -ENOMEM; rep = alloc_skb(NLMSG_SPACE((sizeof(struct inet_diag_msg) + -@@ -582,8 +597,14 @@ static int inet_diag_fill_req(struct sk_ +@@ -582,8 +597,14 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk, r->idiag_retrans = req->retrans; r->id.idiag_if = sk->sk_bound_dev_if; @@ -67145,9 +68489,10 @@ diff -urNp linux-2.6.38.7/net/ipv4/inet_diag.c linux-2.6.38.7/net/ipv4/inet_diag tmo = req->expires - jiffies; if (tmo < 0) -diff -urNp linux-2.6.38.7/net/ipv4/inet_hashtables.c linux-2.6.38.7/net/ipv4/inet_hashtables.c ---- linux-2.6.38.7/net/ipv4/inet_hashtables.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/ipv4/inet_hashtables.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c +index 3c0369a..f0d4292 100644 +--- a/net/ipv4/inet_hashtables.c ++++ b/net/ipv4/inet_hashtables.c @@ -18,11 +18,14 @@ #include <linux/sched.h> #include <linux/slab.h> @@ -67172,10 +68517,11 @@ diff -urNp linux-2.6.38.7/net/ipv4/inet_hashtables.c linux-2.6.38.7/net/ipv4/ine if (tw) { inet_twsk_deschedule(tw, death_row); while (twrefcnt) { -diff -urNp linux-2.6.38.7/net/ipv4/inetpeer.c linux-2.6.38.7/net/ipv4/inetpeer.c ---- linux-2.6.38.7/net/ipv4/inetpeer.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/ipv4/inetpeer.c 2011-05-16 21:47:08.000000000 -0400 -@@ -478,6 +478,8 @@ struct inet_peer *inet_getpeer(struct in +diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c +index 14af1b4..bf5f8c3 100644 +--- a/net/ipv4/inetpeer.c ++++ b/net/ipv4/inetpeer.c +@@ -478,6 +478,8 @@ struct inet_peer *inet_getpeer(struct inetpeer_addr *daddr, int create) struct inet_peer_base *base = family_to_base(daddr->family); struct inet_peer *p; @@ -67184,7 +68530,7 @@ diff -urNp linux-2.6.38.7/net/ipv4/inetpeer.c linux-2.6.38.7/net/ipv4/inetpeer.c /* Look up for the address quickly, lockless. * Because of a concurrent writer, we might not find an existing entry. */ -@@ -509,8 +511,8 @@ struct inet_peer *inet_getpeer(struct in +@@ -509,8 +511,8 @@ struct inet_peer *inet_getpeer(struct inetpeer_addr *daddr, int create) if (p) { p->daddr = *daddr; atomic_set(&p->refcnt, 1); @@ -67195,10 +68541,11 @@ diff -urNp linux-2.6.38.7/net/ipv4/inetpeer.c linux-2.6.38.7/net/ipv4/inetpeer.c p->tcp_ts_stamp = 0; INIT_LIST_HEAD(&p->unused); -diff -urNp linux-2.6.38.7/net/ipv4/ip_fragment.c linux-2.6.38.7/net/ipv4/ip_fragment.c ---- linux-2.6.38.7/net/ipv4/ip_fragment.c 2011-05-22 23:05:21.000000000 -0400 -+++ linux-2.6.38.7/net/ipv4/ip_fragment.c 2011-05-22 23:06:04.000000000 -0400 -@@ -297,7 +297,7 @@ static inline int ip_frag_too_far(struct +diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c +index b1d282f..b58b669 100644 +--- a/net/ipv4/ip_fragment.c ++++ b/net/ipv4/ip_fragment.c +@@ -297,7 +297,7 @@ static inline int ip_frag_too_far(struct ipq *qp) return 0; start = qp->rid; @@ -67207,10 +68554,11 @@ diff -urNp linux-2.6.38.7/net/ipv4/ip_fragment.c linux-2.6.38.7/net/ipv4/ip_frag qp->rid = end; rc = qp->q.fragments && (end - start) > max; -diff -urNp linux-2.6.38.7/net/ipv4/ip_sockglue.c linux-2.6.38.7/net/ipv4/ip_sockglue.c ---- linux-2.6.38.7/net/ipv4/ip_sockglue.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/ipv4/ip_sockglue.c 2011-05-16 21:47:09.000000000 -0400 -@@ -1064,6 +1064,8 @@ static int do_ip_getsockopt(struct sock +diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c +index 3948c86..b93dee5 100644 +--- a/net/ipv4/ip_sockglue.c ++++ b/net/ipv4/ip_sockglue.c +@@ -1064,6 +1064,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname, int val; int len; @@ -67219,10 +68567,11 @@ diff -urNp linux-2.6.38.7/net/ipv4/ip_sockglue.c linux-2.6.38.7/net/ipv4/ip_sock if (level != SOL_IP) return -EOPNOTSUPP; -diff -urNp linux-2.6.38.7/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.38.7/net/ipv4/netfilter/nf_nat_snmp_basic.c ---- linux-2.6.38.7/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-04-28 19:34:15.000000000 -0400 -@@ -398,7 +398,7 @@ static unsigned char asn1_octets_decode( +diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c +index ee5f419..89f117d 100644 +--- a/net/ipv4/netfilter/nf_nat_snmp_basic.c ++++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c +@@ -398,7 +398,7 @@ static unsigned char asn1_octets_decode(struct asn1_ctx *ctx, *len = 0; @@ -67231,10 +68580,11 @@ diff -urNp linux-2.6.38.7/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.38.7/ if (*octets == NULL) { if (net_ratelimit()) pr_notice("OOM in bsalg (%d)\n", __LINE__); -diff -urNp linux-2.6.38.7/net/ipv4/raw.c linux-2.6.38.7/net/ipv4/raw.c ---- linux-2.6.38.7/net/ipv4/raw.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/ipv4/raw.c 2011-05-04 18:00:09.000000000 -0400 -@@ -302,7 +302,7 @@ static int raw_rcv_skb(struct sock * sk, +diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c +index 6390ba2..b561dc4 100644 +--- a/net/ipv4/raw.c ++++ b/net/ipv4/raw.c +@@ -302,7 +302,7 @@ static int raw_rcv_skb(struct sock * sk, struct sk_buff * skb) int raw_rcv(struct sock *sk, struct sk_buff *skb) { if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) { @@ -67264,7 +68614,7 @@ diff -urNp linux-2.6.38.7/net/ipv4/raw.c linux-2.6.38.7/net/ipv4/raw.c int len, ret = -EFAULT; if (get_user(len, optlen)) -@@ -743,8 +747,9 @@ static int raw_geticmpfilter(struct sock +@@ -743,8 +747,9 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o if (len > sizeof(struct icmp_filter)) len = sizeof(struct icmp_filter); ret = -EFAULT; @@ -67275,7 +68625,7 @@ diff -urNp linux-2.6.38.7/net/ipv4/raw.c linux-2.6.38.7/net/ipv4/raw.c goto out; ret = 0; out: return ret; -@@ -972,7 +977,13 @@ static void raw_sock_seq_show(struct seq +@@ -972,7 +977,13 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i) sk_wmem_alloc_get(sp), sk_rmem_alloc_get(sp), 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp), @@ -67290,10 +68640,11 @@ diff -urNp linux-2.6.38.7/net/ipv4/raw.c linux-2.6.38.7/net/ipv4/raw.c } static int raw_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-2.6.38.7/net/ipv4/route.c linux-2.6.38.7/net/ipv4/route.c ---- linux-2.6.38.7/net/ipv4/route.c 2011-04-22 19:20:59.000000000 -0400 -+++ linux-2.6.38.7/net/ipv4/route.c 2011-04-28 19:57:25.000000000 -0400 -@@ -270,7 +270,7 @@ static inline unsigned int rt_hash(__be3 +diff --git a/net/ipv4/route.c b/net/ipv4/route.c +index fabfe81..667c31b 100644 +--- a/net/ipv4/route.c ++++ b/net/ipv4/route.c +@@ -270,7 +270,7 @@ static inline unsigned int rt_hash(__be32 daddr, __be32 saddr, int idx, static inline int rt_genid(struct net *net) { @@ -67302,7 +68653,7 @@ diff -urNp linux-2.6.38.7/net/ipv4/route.c linux-2.6.38.7/net/ipv4/route.c } #ifdef CONFIG_PROC_FS -@@ -895,7 +895,7 @@ static void rt_cache_invalidate(struct n +@@ -895,7 +895,7 @@ static void rt_cache_invalidate(struct net *net) unsigned char shuffle; get_random_bytes(&shuffle, sizeof(shuffle)); @@ -67320,10 +68671,11 @@ diff -urNp linux-2.6.38.7/net/ipv4/route.c linux-2.6.38.7/net/ipv4/route.c if (rt->peer->tcp_ts_stamp) { ts = rt->peer->tcp_ts; tsage = get_seconds() - rt->peer->tcp_ts_stamp; -diff -urNp linux-2.6.38.7/net/ipv4/tcp.c linux-2.6.38.7/net/ipv4/tcp.c ---- linux-2.6.38.7/net/ipv4/tcp.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/ipv4/tcp.c 2011-05-16 21:47:09.000000000 -0400 -@@ -2121,6 +2121,8 @@ static int do_tcp_setsockopt(struct sock +diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c +index 6c11eec..6e50fa7 100644 +--- a/net/ipv4/tcp.c ++++ b/net/ipv4/tcp.c +@@ -2121,6 +2121,8 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int val; int err = 0; @@ -67332,7 +68684,7 @@ diff -urNp linux-2.6.38.7/net/ipv4/tcp.c linux-2.6.38.7/net/ipv4/tcp.c /* These are data/string values, all the others are ints */ switch (optname) { case TCP_CONGESTION: { -@@ -2500,6 +2502,8 @@ static int do_tcp_getsockopt(struct sock +@@ -2500,6 +2502,8 @@ static int do_tcp_getsockopt(struct sock *sk, int level, struct tcp_sock *tp = tcp_sk(sk); int val, len; @@ -67341,9 +68693,10 @@ diff -urNp linux-2.6.38.7/net/ipv4/tcp.c linux-2.6.38.7/net/ipv4/tcp.c if (get_user(len, optlen)) return -EFAULT; -diff -urNp linux-2.6.38.7/net/ipv4/tcp_ipv4.c linux-2.6.38.7/net/ipv4/tcp_ipv4.c ---- linux-2.6.38.7/net/ipv4/tcp_ipv4.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/ipv4/tcp_ipv4.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c +index 02f583b..a47bcb8 100644 +--- a/net/ipv4/tcp_ipv4.c ++++ b/net/ipv4/tcp_ipv4.c @@ -86,6 +86,9 @@ int sysctl_tcp_tw_reuse __read_mostly; int sysctl_tcp_low_latency __read_mostly; EXPORT_SYMBOL(sysctl_tcp_low_latency); @@ -67354,7 +68707,7 @@ diff -urNp linux-2.6.38.7/net/ipv4/tcp_ipv4.c linux-2.6.38.7/net/ipv4/tcp_ipv4.c #ifdef CONFIG_TCP_MD5SIG static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk, -@@ -1593,6 +1596,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc +@@ -1593,6 +1596,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) return 0; reset: @@ -67398,7 +68751,7 @@ diff -urNp linux-2.6.38.7/net/ipv4/tcp_ipv4.c linux-2.6.38.7/net/ipv4/tcp_ipv4.c tcp_v4_send_reset(NULL, skb); } -@@ -2373,7 +2390,11 @@ static void get_openreq4(struct sock *sk +@@ -2373,7 +2390,11 @@ static void get_openreq4(struct sock *sk, struct request_sock *req, 0, /* non standard timer */ 0, /* open_requests have no inode */ atomic_read(&sk->sk_refcnt), @@ -67410,7 +68763,7 @@ diff -urNp linux-2.6.38.7/net/ipv4/tcp_ipv4.c linux-2.6.38.7/net/ipv4/tcp_ipv4.c len); } -@@ -2423,7 +2444,12 @@ static void get_tcp4_sock(struct sock *s +@@ -2423,7 +2444,12 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len) sock_i_uid(sk), icsk->icsk_probes_out, sock_i_ino(sk), @@ -67424,7 +68777,7 @@ diff -urNp linux-2.6.38.7/net/ipv4/tcp_ipv4.c linux-2.6.38.7/net/ipv4/tcp_ipv4.c jiffies_to_clock_t(icsk->icsk_rto), jiffies_to_clock_t(icsk->icsk_ack.ato), (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong, -@@ -2451,7 +2477,13 @@ static void get_timewait4_sock(struct in +@@ -2451,7 +2477,13 @@ static void get_timewait4_sock(struct inet_timewait_sock *tw, " %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %p%n", i, src, srcp, dest, destp, tw->tw_substate, 0, 0, 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0, @@ -67439,9 +68792,10 @@ diff -urNp linux-2.6.38.7/net/ipv4/tcp_ipv4.c linux-2.6.38.7/net/ipv4/tcp_ipv4.c } #define TMPSZ 150 -diff -urNp linux-2.6.38.7/net/ipv4/tcp_minisocks.c linux-2.6.38.7/net/ipv4/tcp_minisocks.c ---- linux-2.6.38.7/net/ipv4/tcp_minisocks.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/ipv4/tcp_minisocks.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c +index 80b1f80..9501f25 100644 +--- a/net/ipv4/tcp_minisocks.c ++++ b/net/ipv4/tcp_minisocks.c @@ -27,6 +27,10 @@ #include <net/inet_common.h> #include <net/xfrm.h> @@ -67464,10 +68818,11 @@ diff -urNp linux-2.6.38.7/net/ipv4/tcp_minisocks.c linux-2.6.38.7/net/ipv4/tcp_m if (!(flg & TCP_FLAG_RST)) req->rsk_ops->send_reset(sk, skb); -diff -urNp linux-2.6.38.7/net/ipv4/tcp_output.c linux-2.6.38.7/net/ipv4/tcp_output.c ---- linux-2.6.38.7/net/ipv4/tcp_output.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/ipv4/tcp_output.c 2011-05-16 21:47:09.000000000 -0400 -@@ -2420,6 +2420,8 @@ struct sk_buff *tcp_make_synack(struct s +diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c +index 8b0d016..a35e4b4 100644 +--- a/net/ipv4/tcp_output.c ++++ b/net/ipv4/tcp_output.c +@@ -2421,6 +2421,8 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst, int mss; int s_data_desired = 0; @@ -67476,10 +68831,11 @@ diff -urNp linux-2.6.38.7/net/ipv4/tcp_output.c linux-2.6.38.7/net/ipv4/tcp_outp if (cvp != NULL && cvp->s_data_constant && cvp->s_data_desired) s_data_desired = cvp->s_data_desired; skb = sock_wmalloc(sk, MAX_TCP_HEADER + 15 + s_data_desired, 1, GFP_ATOMIC); -diff -urNp linux-2.6.38.7/net/ipv4/tcp_probe.c linux-2.6.38.7/net/ipv4/tcp_probe.c ---- linux-2.6.38.7/net/ipv4/tcp_probe.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/ipv4/tcp_probe.c 2011-04-28 19:34:15.000000000 -0400 -@@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file +diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c +index 85ee7eb..53277ab 100644 +--- a/net/ipv4/tcp_probe.c ++++ b/net/ipv4/tcp_probe.c +@@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf, if (cnt + width >= len) break; @@ -67488,9 +68844,10 @@ diff -urNp linux-2.6.38.7/net/ipv4/tcp_probe.c linux-2.6.38.7/net/ipv4/tcp_probe return -EFAULT; cnt += width; } -diff -urNp linux-2.6.38.7/net/ipv4/tcp_timer.c linux-2.6.38.7/net/ipv4/tcp_timer.c ---- linux-2.6.38.7/net/ipv4/tcp_timer.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/ipv4/tcp_timer.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c +index 74a6aa0..c66db06 100644 +--- a/net/ipv4/tcp_timer.c ++++ b/net/ipv4/tcp_timer.c @@ -22,6 +22,10 @@ #include <linux/gfp.h> #include <net/tcp.h> @@ -67502,7 +68859,7 @@ diff -urNp linux-2.6.38.7/net/ipv4/tcp_timer.c linux-2.6.38.7/net/ipv4/tcp_timer int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES; int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES; int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME; -@@ -199,6 +203,13 @@ static int tcp_write_timeout(struct sock +@@ -199,6 +203,13 @@ static int tcp_write_timeout(struct sock *sk) } } @@ -67516,9 +68873,10 @@ diff -urNp linux-2.6.38.7/net/ipv4/tcp_timer.c linux-2.6.38.7/net/ipv4/tcp_timer if (retransmits_timed_out(sk, retry_until, syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) { /* Has it gone just too far? */ -diff -urNp linux-2.6.38.7/net/ipv4/udp.c linux-2.6.38.7/net/ipv4/udp.c ---- linux-2.6.38.7/net/ipv4/udp.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/ipv4/udp.c 2011-04-28 20:09:30.000000000 -0400 +diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c +index 8157b17..49c8ef3 100644 +--- a/net/ipv4/udp.c ++++ b/net/ipv4/udp.c @@ -86,6 +86,7 @@ #include <linux/types.h> #include <linux/fcntl.h> @@ -67548,7 +68906,7 @@ diff -urNp linux-2.6.38.7/net/ipv4/udp.c linux-2.6.38.7/net/ipv4/udp.c /* * This routine is called by the ICMP module when it gets some * sort of error condition. If err < 0 then the socket should -@@ -832,9 +840,18 @@ int udp_sendmsg(struct kiocb *iocb, stru +@@ -832,9 +840,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, dport = usin->sin_port; if (dport == 0) return -EINVAL; @@ -67567,7 +68925,7 @@ diff -urNp linux-2.6.38.7/net/ipv4/udp.c linux-2.6.38.7/net/ipv4/udp.c daddr = inet->inet_daddr; dport = inet->inet_dport; /* Open fast path for connected socket. -@@ -1053,7 +1070,7 @@ static unsigned int first_packet_length( +@@ -1053,7 +1070,7 @@ static unsigned int first_packet_length(struct sock *sk) udp_lib_checksum_complete(skb)) { UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, IS_UDPLITE(sk)); @@ -67587,7 +68945,7 @@ diff -urNp linux-2.6.38.7/net/ipv4/udp.c linux-2.6.38.7/net/ipv4/udp.c ulen = skb->len - sizeof(struct udphdr); if (len > ulen) len = ulen; -@@ -1435,7 +1456,7 @@ int udp_queue_rcv_skb(struct sock *sk, s +@@ -1435,7 +1456,7 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) drop: UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite); @@ -67596,7 +68954,7 @@ diff -urNp linux-2.6.38.7/net/ipv4/udp.c linux-2.6.38.7/net/ipv4/udp.c kfree_skb(skb); return -1; } -@@ -1454,7 +1475,7 @@ static void flush_stack(struct sock **st +@@ -1454,7 +1475,7 @@ static void flush_stack(struct sock **stack, unsigned int count, skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC); if (!skb1) { @@ -67605,7 +68963,7 @@ diff -urNp linux-2.6.38.7/net/ipv4/udp.c linux-2.6.38.7/net/ipv4/udp.c UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS, IS_UDPLITE(sk)); UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, -@@ -1623,6 +1644,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, +@@ -1623,6 +1644,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, goto csum_error; UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE); @@ -67615,7 +68973,7 @@ diff -urNp linux-2.6.38.7/net/ipv4/udp.c linux-2.6.38.7/net/ipv4/udp.c icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); /* -@@ -2050,8 +2074,13 @@ static void udp4_format_sock(struct sock +@@ -2050,8 +2074,13 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f, sk_wmem_alloc_get(sp), sk_rmem_alloc_get(sp), 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp), @@ -67631,10 +68989,11 @@ diff -urNp linux-2.6.38.7/net/ipv4/udp.c linux-2.6.38.7/net/ipv4/udp.c } int udp4_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-2.6.38.7/net/ipv6/inet6_connection_sock.c linux-2.6.38.7/net/ipv6/inet6_connection_sock.c ---- linux-2.6.38.7/net/ipv6/inet6_connection_sock.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/ipv6/inet6_connection_sock.c 2011-04-28 19:57:25.000000000 -0400 -@@ -183,7 +183,7 @@ void __inet6_csk_dst_store(struct sock * +diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c +index e46305d..3e5a6cb 100644 +--- a/net/ipv6/inet6_connection_sock.c ++++ b/net/ipv6/inet6_connection_sock.c +@@ -183,7 +183,7 @@ void __inet6_csk_dst_store(struct sock *sk, struct dst_entry *dst, #ifdef CONFIG_XFRM { struct rt6_info *rt = (struct rt6_info *)dst; @@ -67643,7 +69002,7 @@ diff -urNp linux-2.6.38.7/net/ipv6/inet6_connection_sock.c linux-2.6.38.7/net/ip } #endif } -@@ -198,7 +198,7 @@ struct dst_entry *__inet6_csk_dst_check( +@@ -198,7 +198,7 @@ struct dst_entry *__inet6_csk_dst_check(struct sock *sk, u32 cookie) #ifdef CONFIG_XFRM if (dst) { struct rt6_info *rt = (struct rt6_info *)dst; @@ -67652,9 +69011,10 @@ diff -urNp linux-2.6.38.7/net/ipv6/inet6_connection_sock.c linux-2.6.38.7/net/ip __sk_dst_reset(sk); dst = NULL; } -diff -urNp linux-2.6.38.7/net/ipv6/inet6_hashtables.c linux-2.6.38.7/net/ipv6/inet6_hashtables.c ---- linux-2.6.38.7/net/ipv6/inet6_hashtables.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/ipv6/inet6_hashtables.c 2011-05-11 18:35:16.000000000 -0400 +diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c +index 633a6c2..b531972 100644 +--- a/net/ipv6/inet6_hashtables.c ++++ b/net/ipv6/inet6_hashtables.c @@ -124,7 +124,7 @@ out: } EXPORT_SYMBOL(__inet6_lookup_established); @@ -67664,10 +69024,11 @@ diff -urNp linux-2.6.38.7/net/ipv6/inet6_hashtables.c linux-2.6.38.7/net/ipv6/in const unsigned short hnum, const struct in6_addr *daddr, const int dif) -diff -urNp linux-2.6.38.7/net/ipv6/ipv6_sockglue.c linux-2.6.38.7/net/ipv6/ipv6_sockglue.c ---- linux-2.6.38.7/net/ipv6/ipv6_sockglue.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/ipv6/ipv6_sockglue.c 2011-05-16 21:47:09.000000000 -0400 -@@ -129,6 +129,8 @@ static int do_ipv6_setsockopt(struct soc +diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c +index d1770e0..4d7e68e 100644 +--- a/net/ipv6/ipv6_sockglue.c ++++ b/net/ipv6/ipv6_sockglue.c +@@ -129,6 +129,8 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, int val, valbool; int retv = -ENOPROTOOPT; @@ -67676,7 +69037,7 @@ diff -urNp linux-2.6.38.7/net/ipv6/ipv6_sockglue.c linux-2.6.38.7/net/ipv6/ipv6_ if (optval == NULL) val=0; else { -@@ -919,6 +921,8 @@ static int do_ipv6_getsockopt(struct soc +@@ -919,6 +921,8 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname, int len; int val; @@ -67685,10 +69046,11 @@ diff -urNp linux-2.6.38.7/net/ipv6/ipv6_sockglue.c linux-2.6.38.7/net/ipv6/ipv6_ if (ip6_mroute_opt(optname)) return ip6_mroute_getsockopt(sk, optname, optval, optlen); -diff -urNp linux-2.6.38.7/net/ipv6/raw.c linux-2.6.38.7/net/ipv6/raw.c ---- linux-2.6.38.7/net/ipv6/raw.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/ipv6/raw.c 2011-05-16 21:47:08.000000000 -0400 -@@ -376,7 +376,7 @@ static inline int rawv6_rcv_skb(struct s +diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c +index c5b0915..ad59e5b 100644 +--- a/net/ipv6/raw.c ++++ b/net/ipv6/raw.c +@@ -376,7 +376,7 @@ static inline int rawv6_rcv_skb(struct sock * sk, struct sk_buff * skb) { if ((raw6_sk(sk)->checksum || rcu_dereference_raw(sk->sk_filter)) && skb_checksum_complete(skb)) { @@ -67697,7 +69059,7 @@ diff -urNp linux-2.6.38.7/net/ipv6/raw.c linux-2.6.38.7/net/ipv6/raw.c kfree_skb(skb); return NET_RX_DROP; } -@@ -403,7 +403,7 @@ int rawv6_rcv(struct sock *sk, struct sk +@@ -403,7 +403,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb) struct raw6_sock *rp = raw6_sk(sk); if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) { @@ -67706,7 +69068,7 @@ diff -urNp linux-2.6.38.7/net/ipv6/raw.c linux-2.6.38.7/net/ipv6/raw.c kfree_skb(skb); return NET_RX_DROP; } -@@ -427,7 +427,7 @@ int rawv6_rcv(struct sock *sk, struct sk +@@ -427,7 +427,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb) if (inet->hdrincl) { if (skb_checksum_complete(skb)) { @@ -67724,7 +69086,7 @@ diff -urNp linux-2.6.38.7/net/ipv6/raw.c linux-2.6.38.7/net/ipv6/raw.c struct flowi *fl, struct dst_entry **dstp, unsigned int flags) { -@@ -743,6 +743,8 @@ static int rawv6_sendmsg(struct kiocb *i +@@ -743,6 +743,8 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk, u16 proto; int err; @@ -67750,7 +69112,7 @@ diff -urNp linux-2.6.38.7/net/ipv6/raw.c linux-2.6.38.7/net/ipv6/raw.c return 0; default: return -ENOPROTOOPT; -@@ -936,6 +941,7 @@ static int rawv6_seticmpfilter(struct so +@@ -936,6 +941,7 @@ static int rawv6_seticmpfilter(struct sock *sk, int level, int optname, static int rawv6_geticmpfilter(struct sock *sk, int level, int optname, char __user *optval, int __user *optlen) { @@ -67758,7 +69120,7 @@ diff -urNp linux-2.6.38.7/net/ipv6/raw.c linux-2.6.38.7/net/ipv6/raw.c int len; switch (optname) { -@@ -948,7 +954,8 @@ static int rawv6_geticmpfilter(struct so +@@ -948,7 +954,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname, len = sizeof(struct icmp6_filter); if (put_user(len, optlen)) return -EFAULT; @@ -67768,7 +69130,7 @@ diff -urNp linux-2.6.38.7/net/ipv6/raw.c linux-2.6.38.7/net/ipv6/raw.c return -EFAULT; return 0; default: -@@ -1262,7 +1269,13 @@ static void raw6_sock_seq_show(struct se +@@ -1262,7 +1269,13 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i) 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp), @@ -67783,10 +69145,11 @@ diff -urNp linux-2.6.38.7/net/ipv6/raw.c linux-2.6.38.7/net/ipv6/raw.c } static int raw6_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-2.6.38.7/net/ipv6/tcp_ipv6.c linux-2.6.38.7/net/ipv6/tcp_ipv6.c ---- linux-2.6.38.7/net/ipv6/tcp_ipv6.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/ipv6/tcp_ipv6.c 2011-04-28 19:34:15.000000000 -0400 -@@ -92,6 +92,10 @@ static struct tcp_md5sig_key *tcp_v6_md5 +diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c +index 20aa95e..00c2670 100644 +--- a/net/ipv6/tcp_ipv6.c ++++ b/net/ipv6/tcp_ipv6.c +@@ -92,6 +92,10 @@ static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(struct sock *sk, } #endif @@ -67797,7 +69160,7 @@ diff -urNp linux-2.6.38.7/net/ipv6/tcp_ipv6.c linux-2.6.38.7/net/ipv6/tcp_ipv6.c static void tcp_v6_hash(struct sock *sk) { if (sk->sk_state != TCP_CLOSE) { -@@ -1676,6 +1680,9 @@ static int tcp_v6_do_rcv(struct sock *sk +@@ -1676,6 +1680,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) return 0; reset: @@ -67807,7 +69170,7 @@ diff -urNp linux-2.6.38.7/net/ipv6/tcp_ipv6.c linux-2.6.38.7/net/ipv6/tcp_ipv6.c tcp_v6_send_reset(sk, skb); discard: if (opt_skb) -@@ -1755,12 +1762,20 @@ static int tcp_v6_rcv(struct sk_buff *sk +@@ -1755,12 +1762,20 @@ static int tcp_v6_rcv(struct sk_buff *skb) TCP_SKB_CB(skb)->sacked = 0; sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest); @@ -67841,7 +69204,7 @@ diff -urNp linux-2.6.38.7/net/ipv6/tcp_ipv6.c linux-2.6.38.7/net/ipv6/tcp_ipv6.c tcp_v6_send_reset(NULL, skb); } -@@ -2068,7 +2087,13 @@ static void get_openreq6(struct seq_file +@@ -2068,7 +2087,13 @@ static void get_openreq6(struct seq_file *seq, uid, 0, /* non standard timer */ 0, /* open_requests have no inode */ @@ -67856,7 +69219,7 @@ diff -urNp linux-2.6.38.7/net/ipv6/tcp_ipv6.c linux-2.6.38.7/net/ipv6/tcp_ipv6.c } static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) -@@ -2118,7 +2143,12 @@ static void get_tcp6_sock(struct seq_fil +@@ -2118,7 +2143,12 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) sock_i_uid(sp), icsk->icsk_probes_out, sock_i_ino(sp), @@ -67870,7 +69233,7 @@ diff -urNp linux-2.6.38.7/net/ipv6/tcp_ipv6.c linux-2.6.38.7/net/ipv6/tcp_ipv6.c jiffies_to_clock_t(icsk->icsk_rto), jiffies_to_clock_t(icsk->icsk_ack.ato), (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong, -@@ -2153,7 +2183,13 @@ static void get_timewait6_sock(struct se +@@ -2153,7 +2183,13 @@ static void get_timewait6_sock(struct seq_file *seq, dest->s6_addr32[2], dest->s6_addr32[3], destp, tw->tw_substate, 0, 0, 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0, @@ -67885,9 +69248,10 @@ diff -urNp linux-2.6.38.7/net/ipv6/tcp_ipv6.c linux-2.6.38.7/net/ipv6/tcp_ipv6.c } static int tcp6_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-2.6.38.7/net/ipv6/udp.c linux-2.6.38.7/net/ipv6/udp.c ---- linux-2.6.38.7/net/ipv6/udp.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/ipv6/udp.c 2011-04-28 20:09:04.000000000 -0400 +diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c +index 6703f8b..0278fbd 100644 +--- a/net/ipv6/udp.c ++++ b/net/ipv6/udp.c @@ -50,6 +50,10 @@ #include <linux/seq_file.h> #include "udp_impl.h" @@ -67899,7 +69263,7 @@ diff -urNp linux-2.6.38.7/net/ipv6/udp.c linux-2.6.38.7/net/ipv6/udp.c int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2) { const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr; -@@ -542,7 +546,7 @@ int udpv6_queue_rcv_skb(struct sock * sk +@@ -542,7 +546,7 @@ int udpv6_queue_rcv_skb(struct sock * sk, struct sk_buff *skb) return 0; drop: @@ -67908,7 +69272,7 @@ diff -urNp linux-2.6.38.7/net/ipv6/udp.c linux-2.6.38.7/net/ipv6/udp.c drop_no_sk_drops_inc: UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite); kfree_skb(skb); -@@ -618,7 +622,7 @@ static void flush_stack(struct sock **st +@@ -618,7 +622,7 @@ static void flush_stack(struct sock **stack, unsigned int count, continue; } drop: @@ -67917,7 +69281,7 @@ diff -urNp linux-2.6.38.7/net/ipv6/udp.c linux-2.6.38.7/net/ipv6/udp.c UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS, IS_UDPLITE(sk)); UDP6_INC_STATS_BH(sock_net(sk), -@@ -773,6 +777,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, +@@ -773,6 +777,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE); @@ -67927,7 +69291,7 @@ diff -urNp linux-2.6.38.7/net/ipv6/udp.c linux-2.6.38.7/net/ipv6/udp.c icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0); kfree_skb(skb); -@@ -789,7 +796,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, +@@ -789,7 +796,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, if (!sock_owned_by_user(sk)) udpv6_queue_rcv_skb(sk, skb); else if (sk_add_backlog(sk, skb)) { @@ -67936,7 +69300,7 @@ diff -urNp linux-2.6.38.7/net/ipv6/udp.c linux-2.6.38.7/net/ipv6/udp.c bh_unlock_sock(sk); sock_put(sk); goto discard; -@@ -1407,8 +1414,13 @@ static void udp6_sock_seq_show(struct se +@@ -1407,8 +1414,13 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp), @@ -67952,10 +69316,11 @@ diff -urNp linux-2.6.38.7/net/ipv6/udp.c linux-2.6.38.7/net/ipv6/udp.c } int udp6_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-2.6.38.7/net/irda/ircomm/ircomm_tty.c linux-2.6.38.7/net/irda/ircomm/ircomm_tty.c ---- linux-2.6.38.7/net/irda/ircomm/ircomm_tty.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/irda/ircomm/ircomm_tty.c 2011-04-28 19:34:15.000000000 -0400 -@@ -281,16 +281,16 @@ static int ircomm_tty_block_til_ready(st +diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c +index a39cca8..7601f54 100644 +--- a/net/irda/ircomm/ircomm_tty.c ++++ b/net/irda/ircomm/ircomm_tty.c +@@ -281,16 +281,16 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self, add_wait_queue(&self->open_wait, &wait); IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n", @@ -67975,7 +69340,7 @@ diff -urNp linux-2.6.38.7/net/irda/ircomm/ircomm_tty.c linux-2.6.38.7/net/irda/i while (1) { if (tty->termios->c_cflag & CBAUD) { -@@ -330,7 +330,7 @@ static int ircomm_tty_block_til_ready(st +@@ -330,7 +330,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self, } IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n", @@ -67984,7 +69349,7 @@ diff -urNp linux-2.6.38.7/net/irda/ircomm/ircomm_tty.c linux-2.6.38.7/net/irda/i schedule(); } -@@ -341,13 +341,13 @@ static int ircomm_tty_block_til_ready(st +@@ -341,13 +341,13 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self, if (extra_count) { /* ++ is not atomic, so this should be protected - Jean II */ spin_lock_irqsave(&self->spinlock, flags); @@ -68001,7 +69366,7 @@ diff -urNp linux-2.6.38.7/net/irda/ircomm/ircomm_tty.c linux-2.6.38.7/net/irda/i if (!retval) self->flags |= ASYNC_NORMAL_ACTIVE; -@@ -416,14 +416,14 @@ static int ircomm_tty_open(struct tty_st +@@ -416,14 +416,14 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp) } /* ++ is not atomic, so this should be protected - Jean II */ spin_lock_irqsave(&self->spinlock, flags); @@ -68018,7 +69383,7 @@ diff -urNp linux-2.6.38.7/net/irda/ircomm/ircomm_tty.c linux-2.6.38.7/net/irda/i /* Not really used by us, but lets do it anyway */ self->tty->low_latency = (self->flags & ASYNC_LOW_LATENCY) ? 1 : 0; -@@ -509,7 +509,7 @@ static void ircomm_tty_close(struct tty_ +@@ -509,7 +509,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp) return; } @@ -68027,7 +69392,7 @@ diff -urNp linux-2.6.38.7/net/irda/ircomm/ircomm_tty.c linux-2.6.38.7/net/irda/i /* * Uh, oh. tty->count is 1, which means that the tty * structure will be freed. state->count should always -@@ -519,16 +519,16 @@ static void ircomm_tty_close(struct tty_ +@@ -519,16 +519,16 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp) */ IRDA_DEBUG(0, "%s(), bad serial port count; " "tty->count is 1, state->count is %d\n", __func__ , @@ -68050,7 +69415,7 @@ diff -urNp linux-2.6.38.7/net/irda/ircomm/ircomm_tty.c linux-2.6.38.7/net/irda/i spin_unlock_irqrestore(&self->spinlock, flags); IRDA_DEBUG(0, "%s(), open count > 0\n", __func__ ); -@@ -560,7 +560,7 @@ static void ircomm_tty_close(struct tty_ +@@ -560,7 +560,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp) tty->closing = 0; self->tty = NULL; @@ -68059,7 +69424,7 @@ diff -urNp linux-2.6.38.7/net/irda/ircomm/ircomm_tty.c linux-2.6.38.7/net/irda/i if (self->close_delay) schedule_timeout_interruptible(self->close_delay); wake_up_interruptible(&self->open_wait); -@@ -1012,7 +1012,7 @@ static void ircomm_tty_hangup(struct tty +@@ -1012,7 +1012,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty) spin_lock_irqsave(&self->spinlock, flags); self->flags &= ~ASYNC_NORMAL_ACTIVE; self->tty = NULL; @@ -68068,7 +69433,7 @@ diff -urNp linux-2.6.38.7/net/irda/ircomm/ircomm_tty.c linux-2.6.38.7/net/irda/i spin_unlock_irqrestore(&self->spinlock, flags); wake_up_interruptible(&self->open_wait); -@@ -1364,7 +1364,7 @@ static void ircomm_tty_line_info(struct +@@ -1364,7 +1364,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m) seq_putc(m, '\n'); seq_printf(m, "Role: %s\n", self->client ? "client" : "server"); @@ -68077,10 +69442,11 @@ diff -urNp linux-2.6.38.7/net/irda/ircomm/ircomm_tty.c linux-2.6.38.7/net/irda/i seq_printf(m, "Max data size: %d\n", self->max_data_size); seq_printf(m, "Max header size: %d\n", self->max_header_size); -diff -urNp linux-2.6.38.7/net/iucv/af_iucv.c linux-2.6.38.7/net/iucv/af_iucv.c ---- linux-2.6.38.7/net/iucv/af_iucv.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/iucv/af_iucv.c 2011-04-28 19:57:25.000000000 -0400 -@@ -653,10 +653,10 @@ static int iucv_sock_autobind(struct soc +diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c +index 9637e45..53cdc8e 100644 +--- a/net/iucv/af_iucv.c ++++ b/net/iucv/af_iucv.c +@@ -653,10 +653,10 @@ static int iucv_sock_autobind(struct sock *sk) write_lock_bh(&iucv_sk_list.lock); @@ -68093,10 +69459,11 @@ diff -urNp linux-2.6.38.7/net/iucv/af_iucv.c linux-2.6.38.7/net/iucv/af_iucv.c } write_unlock_bh(&iucv_sk_list.lock); -diff -urNp linux-2.6.38.7/net/key/af_key.c linux-2.6.38.7/net/key/af_key.c ---- linux-2.6.38.7/net/key/af_key.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/key/af_key.c 2011-05-16 21:47:08.000000000 -0400 -@@ -2470,6 +2470,8 @@ static int pfkey_migrate(struct sock *sk +diff --git a/net/key/af_key.c b/net/key/af_key.c +index d87c22d..f38e373 100644 +--- a/net/key/af_key.c ++++ b/net/key/af_key.c +@@ -2470,6 +2470,8 @@ static int pfkey_migrate(struct sock *sk, struct sk_buff *skb, struct xfrm_migrate m[XFRM_MAX_DEPTH]; struct xfrm_kmaddress k; @@ -68105,7 +69472,7 @@ diff -urNp linux-2.6.38.7/net/key/af_key.c linux-2.6.38.7/net/key/af_key.c if (!present_and_same_family(ext_hdrs[SADB_EXT_ADDRESS_SRC - 1], ext_hdrs[SADB_EXT_ADDRESS_DST - 1]) || !ext_hdrs[SADB_X_EXT_POLICY - 1]) { -@@ -3003,10 +3005,10 @@ static int pfkey_send_policy_notify(stru +@@ -3003,10 +3005,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, struct km_e static u32 get_acqseq(void) { u32 res; @@ -68118,7 +69485,7 @@ diff -urNp linux-2.6.38.7/net/key/af_key.c linux-2.6.38.7/net/key/af_key.c } while (!res); return res; } -@@ -3644,7 +3646,11 @@ static int pfkey_seq_show(struct seq_fil +@@ -3644,7 +3646,11 @@ static int pfkey_seq_show(struct seq_file *f, void *v) seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n"); else seq_printf(f ,"%p %-6d %-6u %-6u %-6u %-6lu\n", @@ -68130,10 +69497,11 @@ diff -urNp linux-2.6.38.7/net/key/af_key.c linux-2.6.38.7/net/key/af_key.c atomic_read(&s->sk_refcnt), sk_rmem_alloc_get(s), sk_wmem_alloc_get(s), -diff -urNp linux-2.6.38.7/net/mac80211/cfg.c linux-2.6.38.7/net/mac80211/cfg.c ---- linux-2.6.38.7/net/mac80211/cfg.c 2011-05-10 22:06:29.000000000 -0400 -+++ linux-2.6.38.7/net/mac80211/cfg.c 2011-05-10 22:09:03.000000000 -0400 -@@ -1941,7 +1941,7 @@ static int ieee80211_get_antenna(struct +diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c +index c35dcf7..419613c 100644 +--- a/net/mac80211/cfg.c ++++ b/net/mac80211/cfg.c +@@ -1943,7 +1943,7 @@ static int ieee80211_get_antenna(struct wiphy *wiphy, u32 *tx_ant, u32 *rx_ant) return drv_get_antenna(local, tx_ant, rx_ant); } @@ -68142,9 +69510,10 @@ diff -urNp linux-2.6.38.7/net/mac80211/cfg.c linux-2.6.38.7/net/mac80211/cfg.c .add_virtual_intf = ieee80211_add_iface, .del_virtual_intf = ieee80211_del_iface, .change_virtual_intf = ieee80211_change_iface, -diff -urNp linux-2.6.38.7/net/mac80211/cfg.h linux-2.6.38.7/net/mac80211/cfg.h ---- linux-2.6.38.7/net/mac80211/cfg.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/mac80211/cfg.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/net/mac80211/cfg.h b/net/mac80211/cfg.h +index 7d7879f..2d51f62 100644 +--- a/net/mac80211/cfg.h ++++ b/net/mac80211/cfg.h @@ -4,6 +4,6 @@ #ifndef __CFG_H #define __CFG_H @@ -68153,10 +69522,11 @@ diff -urNp linux-2.6.38.7/net/mac80211/cfg.h linux-2.6.38.7/net/mac80211/cfg.h +extern const struct cfg80211_ops mac80211_config_ops; #endif /* __CFG_H */ -diff -urNp linux-2.6.38.7/net/mac80211/debugfs_sta.c linux-2.6.38.7/net/mac80211/debugfs_sta.c ---- linux-2.6.38.7/net/mac80211/debugfs_sta.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/mac80211/debugfs_sta.c 2011-05-16 21:47:09.000000000 -0400 -@@ -115,6 +115,8 @@ static ssize_t sta_agg_status_read(struc +diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c +index c04a139..87e581f 100644 +--- a/net/mac80211/debugfs_sta.c ++++ b/net/mac80211/debugfs_sta.c +@@ -115,6 +115,8 @@ static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf, struct tid_ampdu_rx *tid_rx; struct tid_ampdu_tx *tid_tx; @@ -68165,7 +69535,7 @@ diff -urNp linux-2.6.38.7/net/mac80211/debugfs_sta.c linux-2.6.38.7/net/mac80211 rcu_read_lock(); p += scnprintf(p, sizeof(buf) + buf - p, "next dialog_token: %#02x\n", -@@ -215,6 +217,8 @@ static ssize_t sta_ht_capa_read(struct f +@@ -215,6 +217,8 @@ static ssize_t sta_ht_capa_read(struct file *file, char __user *userbuf, struct sta_info *sta = file->private_data; struct ieee80211_sta_ht_cap *htc = &sta->sta.ht_cap; @@ -68174,9 +69544,10 @@ diff -urNp linux-2.6.38.7/net/mac80211/debugfs_sta.c linux-2.6.38.7/net/mac80211 p += scnprintf(p, sizeof(buf) + buf - p, "ht %ssupported\n", htc->ht_supported ? "" : "not "); if (htc->ht_supported) { -diff -urNp linux-2.6.38.7/net/mac80211/ieee80211_i.h linux-2.6.38.7/net/mac80211/ieee80211_i.h ---- linux-2.6.38.7/net/mac80211/ieee80211_i.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/mac80211/ieee80211_i.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h +index 533fd32..fcc918e 100644 +--- a/net/mac80211/ieee80211_i.h ++++ b/net/mac80211/ieee80211_i.h @@ -27,6 +27,7 @@ #include <net/ieee80211_radiotap.h> #include <net/cfg80211.h> @@ -68194,10 +69565,11 @@ diff -urNp linux-2.6.38.7/net/mac80211/ieee80211_i.h linux-2.6.38.7/net/mac80211 int monitors, cooked_mntrs; /* number of interfaces with corresponding FIF_ flags */ int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll, -diff -urNp linux-2.6.38.7/net/mac80211/iface.c linux-2.6.38.7/net/mac80211/iface.c ---- linux-2.6.38.7/net/mac80211/iface.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/mac80211/iface.c 2011-04-28 19:34:15.000000000 -0400 -@@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_ +diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c +index 7a10a8d..09d23d2 100644 +--- a/net/mac80211/iface.c ++++ b/net/mac80211/iface.c +@@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up) break; } @@ -68206,7 +69578,7 @@ diff -urNp linux-2.6.38.7/net/mac80211/iface.c linux-2.6.38.7/net/mac80211/iface res = drv_start(local); if (res) goto err_del_bss; -@@ -235,7 +235,7 @@ static int ieee80211_do_open(struct net_ +@@ -235,7 +235,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up) memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN); if (!is_valid_ether_addr(dev->dev_addr)) { @@ -68215,7 +69587,7 @@ diff -urNp linux-2.6.38.7/net/mac80211/iface.c linux-2.6.38.7/net/mac80211/iface drv_stop(local); return -EADDRNOTAVAIL; } -@@ -327,7 +327,7 @@ static int ieee80211_do_open(struct net_ +@@ -327,7 +327,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up) mutex_unlock(&local->mtx); if (coming_up) @@ -68224,7 +69596,7 @@ diff -urNp linux-2.6.38.7/net/mac80211/iface.c linux-2.6.38.7/net/mac80211/iface if (hw_reconf_flags) { ieee80211_hw_config(local, hw_reconf_flags); -@@ -347,7 +347,7 @@ static int ieee80211_do_open(struct net_ +@@ -347,7 +347,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up) err_del_interface: drv_remove_interface(local, &sdata->vif); err_stop: @@ -68233,7 +69605,7 @@ diff -urNp linux-2.6.38.7/net/mac80211/iface.c linux-2.6.38.7/net/mac80211/iface drv_stop(local); err_del_bss: sdata->bss = NULL; -@@ -473,7 +473,7 @@ static void ieee80211_do_stop(struct iee +@@ -473,7 +473,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, } if (going_down) @@ -68242,7 +69614,7 @@ diff -urNp linux-2.6.38.7/net/mac80211/iface.c linux-2.6.38.7/net/mac80211/iface switch (sdata->vif.type) { case NL80211_IFTYPE_AP_VLAN: -@@ -532,7 +532,7 @@ static void ieee80211_do_stop(struct iee +@@ -532,7 +532,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, ieee80211_recalc_ps(local, -1); @@ -68251,10 +69623,11 @@ diff -urNp linux-2.6.38.7/net/mac80211/iface.c linux-2.6.38.7/net/mac80211/iface if (local->ops->napi_poll) napi_disable(&local->napi); ieee80211_clear_tx_pending(local); -diff -urNp linux-2.6.38.7/net/mac80211/main.c linux-2.6.38.7/net/mac80211/main.c ---- linux-2.6.38.7/net/mac80211/main.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/mac80211/main.c 2011-04-28 19:34:15.000000000 -0400 -@@ -161,7 +161,7 @@ int ieee80211_hw_config(struct ieee80211 +diff --git a/net/mac80211/main.c b/net/mac80211/main.c +index a46ff06..b677f83 100644 +--- a/net/mac80211/main.c ++++ b/net/mac80211/main.c +@@ -161,7 +161,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed) local->hw.conf.power_level = power; } @@ -68263,10 +69636,11 @@ diff -urNp linux-2.6.38.7/net/mac80211/main.c linux-2.6.38.7/net/mac80211/main.c ret = drv_config(local, changed); /* * Goal: -diff -urNp linux-2.6.38.7/net/mac80211/mlme.c linux-2.6.38.7/net/mac80211/mlme.c ---- linux-2.6.38.7/net/mac80211/mlme.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/mac80211/mlme.c 2011-05-16 21:47:09.000000000 -0400 -@@ -1356,6 +1356,8 @@ static bool ieee80211_assoc_success(stru +diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c +index c9ceb4d..f0cb515 100644 +--- a/net/mac80211/mlme.c ++++ b/net/mac80211/mlme.c +@@ -1356,6 +1356,8 @@ static bool ieee80211_assoc_success(struct ieee80211_work *wk, bool have_higher_than_11mbit = false; u16 ap_ht_cap_flags; @@ -68275,10 +69649,11 @@ diff -urNp linux-2.6.38.7/net/mac80211/mlme.c linux-2.6.38.7/net/mac80211/mlme.c /* AssocResp and ReassocResp have identical structure */ aid = le16_to_cpu(mgmt->u.assoc_resp.aid); -diff -urNp linux-2.6.38.7/net/mac80211/pm.c linux-2.6.38.7/net/mac80211/pm.c ---- linux-2.6.38.7/net/mac80211/pm.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/mac80211/pm.c 2011-04-28 19:34:15.000000000 -0400 -@@ -95,7 +95,7 @@ int __ieee80211_suspend(struct ieee80211 +diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c +index e373551..54f546c 100644 +--- a/net/mac80211/pm.c ++++ b/net/mac80211/pm.c +@@ -95,7 +95,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw) } /* stop hardware - this must stop RX */ @@ -68287,10 +69662,11 @@ diff -urNp linux-2.6.38.7/net/mac80211/pm.c linux-2.6.38.7/net/mac80211/pm.c ieee80211_stop_device(local); local->suspended = true; -diff -urNp linux-2.6.38.7/net/mac80211/rate.c linux-2.6.38.7/net/mac80211/rate.c ---- linux-2.6.38.7/net/mac80211/rate.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/mac80211/rate.c 2011-04-28 19:34:15.000000000 -0400 -@@ -371,7 +371,7 @@ int ieee80211_init_rate_ctrl_alg(struct +diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c +index 3d5a2cb..b17ad48 100644 +--- a/net/mac80211/rate.c ++++ b/net/mac80211/rate.c +@@ -371,7 +371,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local, ASSERT_RTNL(); @@ -68299,10 +69675,11 @@ diff -urNp linux-2.6.38.7/net/mac80211/rate.c linux-2.6.38.7/net/mac80211/rate.c return -EBUSY; if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) { -diff -urNp linux-2.6.38.7/net/mac80211/rc80211_pid_debugfs.c linux-2.6.38.7/net/mac80211/rc80211_pid_debugfs.c ---- linux-2.6.38.7/net/mac80211/rc80211_pid_debugfs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/mac80211/rc80211_pid_debugfs.c 2011-04-28 19:34:15.000000000 -0400 -@@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r +diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c +index 4851e9e..d860e05 100644 +--- a/net/mac80211/rc80211_pid_debugfs.c ++++ b/net/mac80211/rc80211_pid_debugfs.c +@@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf, spin_unlock_irqrestore(&events->lock, status); @@ -68311,10 +69688,11 @@ diff -urNp linux-2.6.38.7/net/mac80211/rc80211_pid_debugfs.c linux-2.6.38.7/net/ return -EFAULT; return p; -diff -urNp linux-2.6.38.7/net/mac80211/tx.c linux-2.6.38.7/net/mac80211/tx.c ---- linux-2.6.38.7/net/mac80211/tx.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/mac80211/tx.c 2011-04-28 19:34:15.000000000 -0400 -@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct +diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c +index b0beaa5..306533b 100644 +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, int group_addr, return cpu_to_le16(dur); } @@ -68323,10 +69701,11 @@ diff -urNp linux-2.6.38.7/net/mac80211/tx.c linux-2.6.38.7/net/mac80211/tx.c struct net_device *dev) { return local == wdev_priv(dev->ieee80211_ptr); -diff -urNp linux-2.6.38.7/net/mac80211/util.c linux-2.6.38.7/net/mac80211/util.c ---- linux-2.6.38.7/net/mac80211/util.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/mac80211/util.c 2011-04-28 19:34:15.000000000 -0400 -@@ -1135,7 +1135,7 @@ int ieee80211_reconfig(struct ieee80211_ +diff --git a/net/mac80211/util.c b/net/mac80211/util.c +index d036597..f296574 100644 +--- a/net/mac80211/util.c ++++ b/net/mac80211/util.c +@@ -1135,7 +1135,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) local->resuming = true; /* restart hardware */ @@ -68335,10 +69714,44 @@ diff -urNp linux-2.6.38.7/net/mac80211/util.c linux-2.6.38.7/net/mac80211/util.c /* * Upon resume hardware can sometimes be goofy due to * various platform / driver / bus issues, so restarting -diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_app.c linux-2.6.38.7/net/netfilter/ipvs/ip_vs_app.c ---- linux-2.6.38.7/net/netfilter/ipvs/ip_vs_app.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/netfilter/ipvs/ip_vs_app.c 2011-05-17 19:31:43.000000000 -0400 -@@ -565,7 +565,7 @@ static const struct file_operations ip_v +diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig +index 1534f2b..6ca818c 100644 +--- a/net/netfilter/Kconfig ++++ b/net/netfilter/Kconfig +@@ -709,6 +709,16 @@ config NETFILTER_XT_MATCH_ESP + + To compile it as a module, choose M here. If unsure, say N. + ++config NETFILTER_XT_MATCH_GRADM ++ tristate '"gradm" match support' ++ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED ++ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC ++ ---help--- ++ The gradm match allows to match on grsecurity RBAC being enabled. ++ It is useful when iptables rules are applied early on bootup to ++ prevent connections to the machine (except from a trusted host) ++ while the RBAC system is disabled. ++ + config NETFILTER_XT_MATCH_HASHLIMIT + tristate '"hashlimit" match support' + depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n) +diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile +index 441050f..41e04ce 100644 +--- a/net/netfilter/Makefile ++++ b/net/netfilter/Makefile +@@ -74,6 +74,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CPU) += xt_cpu.o + obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o + obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o + obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o ++obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o + obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o + obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o + obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o +diff --git a/net/netfilter/ipvs/ip_vs_app.c b/net/netfilter/ipvs/ip_vs_app.c +index a475ede..7262415 100644 +--- a/net/netfilter/ipvs/ip_vs_app.c ++++ b/net/netfilter/ipvs/ip_vs_app.c +@@ -565,7 +565,7 @@ static const struct file_operations ip_vs_app_fops = { .open = ip_vs_app_open, .read = seq_read, .llseek = seq_lseek, @@ -68347,10 +69760,11 @@ diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_app.c linux-2.6.38.7/net/netf }; #endif -diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.38.7/net/netfilter/ipvs/ip_vs_conn.c ---- linux-2.6.38.7/net/netfilter/ipvs/ip_vs_conn.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/netfilter/ipvs/ip_vs_conn.c 2011-05-17 19:31:43.000000000 -0400 -@@ -553,7 +553,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, s +diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c +index e9adecd..bce37c0 100644 +--- a/net/netfilter/ipvs/ip_vs_conn.c ++++ b/net/netfilter/ipvs/ip_vs_conn.c +@@ -553,7 +553,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest) /* Increase the refcnt counter of the dest */ atomic_inc(&dest->refcnt); @@ -68359,7 +69773,7 @@ diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.38.7/net/net if (cp->protocol != IPPROTO_UDP) conn_flags &= ~IP_VS_CONN_F_ONE_PACKET; /* Bind with the destination and its corresponding transmitter */ -@@ -840,7 +840,7 @@ ip_vs_conn_new(const struct ip_vs_conn_p +@@ -840,7 +840,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, atomic_set(&cp->refcnt, 1); atomic_set(&cp->n_control, 0); @@ -68368,7 +69782,7 @@ diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.38.7/net/net atomic_inc(&ip_vs_conn_count); if (flags & IP_VS_CONN_F_NO_CPORT) -@@ -1012,7 +1012,7 @@ static const struct file_operations ip_v +@@ -1012,7 +1012,7 @@ static const struct file_operations ip_vs_conn_fops = { .open = ip_vs_conn_open, .read = seq_read, .llseek = seq_lseek, @@ -68377,7 +69791,7 @@ diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.38.7/net/net }; static const char *ip_vs_origin_name(unsigned flags) -@@ -1075,7 +1075,7 @@ static const struct file_operations ip_v +@@ -1075,7 +1075,7 @@ static const struct file_operations ip_vs_conn_sync_fops = { .open = ip_vs_conn_sync_open, .read = seq_read, .llseek = seq_lseek, @@ -68386,7 +69800,7 @@ diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.38.7/net/net }; #endif -@@ -1102,7 +1102,7 @@ static inline int todrop_entry(struct ip +@@ -1102,7 +1102,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp) /* Don't drop the entry if its number of incoming packets is not located in [0, 8] */ @@ -68395,10 +69809,11 @@ diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.38.7/net/net if (i > 8 || i < 0) return 0; if (!todrop_rate[i]) return 0; -diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_core.c linux-2.6.38.7/net/netfilter/ipvs/ip_vs_core.c ---- linux-2.6.38.7/net/netfilter/ipvs/ip_vs_core.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/netfilter/ipvs/ip_vs_core.c 2011-04-28 19:57:25.000000000 -0400 -@@ -504,7 +504,7 @@ int ip_vs_leave(struct ip_vs_service *sv +diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c +index b4e51e9..8970f65 100644 +--- a/net/netfilter/ipvs/ip_vs_core.c ++++ b/net/netfilter/ipvs/ip_vs_core.c +@@ -504,7 +504,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, ret = cp->packet_xmit(skb, cp, pp); /* do not touch skb anymore */ @@ -68407,7 +69822,7 @@ diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_core.c linux-2.6.38.7/net/net ip_vs_conn_put(cp); return ret; } -@@ -1536,7 +1536,7 @@ ip_vs_in(unsigned int hooknum, struct sk +@@ -1536,7 +1536,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af) * Sync connection if it is about to close to * encorage the standby servers to update the connections timeout */ @@ -68416,10 +69831,11 @@ diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_core.c linux-2.6.38.7/net/net if (af == AF_INET && (ip_vs_sync_state & IP_VS_STATE_MASTER) && cp->protocol == IPPROTO_SCTP) { if ((cp->state == IP_VS_SCTP_S_ESTABLISHED && -diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.38.7/net/netfilter/ipvs/ip_vs_ctl.c ---- linux-2.6.38.7/net/netfilter/ipvs/ip_vs_ctl.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/netfilter/ipvs/ip_vs_ctl.c 2011-05-17 19:31:43.000000000 -0400 -@@ -787,7 +787,7 @@ __ip_vs_update_dest(struct ip_vs_service +diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c +index ba98e13..5ddc91b 100644 +--- a/net/netfilter/ipvs/ip_vs_ctl.c ++++ b/net/netfilter/ipvs/ip_vs_ctl.c +@@ -787,7 +787,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest, ip_vs_rs_hash(dest); write_unlock_bh(&__ip_vs_rs_lock); } @@ -68428,7 +69844,7 @@ diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.38.7/net/netf /* bind the service */ if (!dest->svc) { -@@ -1905,7 +1905,7 @@ static int ip_vs_info_seq_show(struct se +@@ -1905,7 +1905,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v) " %-7s %-6d %-10d %-10d\n", &dest->addr.in6, ntohs(dest->port), @@ -68437,7 +69853,7 @@ diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.38.7/net/netf atomic_read(&dest->weight), atomic_read(&dest->activeconns), atomic_read(&dest->inactconns)); -@@ -1916,7 +1916,7 @@ static int ip_vs_info_seq_show(struct se +@@ -1916,7 +1916,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v) "%-7s %-6d %-10d %-10d\n", ntohl(dest->addr.ip), ntohs(dest->port), @@ -68446,7 +69862,7 @@ diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.38.7/net/netf atomic_read(&dest->weight), atomic_read(&dest->activeconns), atomic_read(&dest->inactconns)); -@@ -1944,7 +1944,7 @@ static const struct file_operations ip_v +@@ -1944,7 +1944,7 @@ static const struct file_operations ip_vs_info_fops = { .open = ip_vs_info_open, .read = seq_read, .llseek = seq_lseek, @@ -68455,7 +69871,7 @@ diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.38.7/net/netf }; #endif -@@ -1993,7 +1993,7 @@ static const struct file_operations ip_v +@@ -1993,7 +1993,7 @@ static const struct file_operations ip_vs_stats_fops = { .open = ip_vs_stats_seq_open, .read = seq_read, .llseek = seq_lseek, @@ -68464,7 +69880,7 @@ diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.38.7/net/netf }; #endif -@@ -2315,7 +2315,7 @@ __ip_vs_get_dest_entries(const struct ip +@@ -2315,7 +2315,7 @@ __ip_vs_get_dest_entries(const struct ip_vs_get_dests *get, entry.addr = dest->addr.ip; entry.port = dest->port; @@ -68473,7 +69889,7 @@ diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.38.7/net/netf entry.weight = atomic_read(&dest->weight); entry.u_threshold = dest->u_threshold; entry.l_threshold = dest->l_threshold; -@@ -2376,6 +2376,8 @@ do_ip_vs_get_ctl(struct sock *sk, int cm +@@ -2376,6 +2376,8 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) int ret = 0; unsigned int copylen; @@ -68482,7 +69898,7 @@ diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.38.7/net/netf if (!capable(CAP_NET_ADMIN)) return -EPERM; -@@ -2831,7 +2833,7 @@ static int ip_vs_genl_fill_dest(struct s +@@ -2831,7 +2833,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest) NLA_PUT_U16(skb, IPVS_DEST_ATTR_PORT, dest->port); NLA_PUT_U32(skb, IPVS_DEST_ATTR_FWD_METHOD, @@ -68491,10 +69907,11 @@ diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.38.7/net/netf NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight)); NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold); NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold); -diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.38.7/net/netfilter/ipvs/ip_vs_sync.c ---- linux-2.6.38.7/net/netfilter/ipvs/ip_vs_sync.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/netfilter/ipvs/ip_vs_sync.c 2011-04-28 19:57:25.000000000 -0400 -@@ -460,7 +460,7 @@ static void ip_vs_process_message(const +diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c +index ab85aed..6959e16 100644 +--- a/net/netfilter/ipvs/ip_vs_sync.c ++++ b/net/netfilter/ipvs/ip_vs_sync.c +@@ -460,7 +460,7 @@ static void ip_vs_process_message(const char *buffer, const size_t buflen) if (opt) memcpy(&cp->in_seq, opt, sizeof(*opt)); @@ -68503,10 +69920,11 @@ diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.38.7/net/net cp->state = state; cp->old_state = cp->state; /* -diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.38.7/net/netfilter/ipvs/ip_vs_xmit.c ---- linux-2.6.38.7/net/netfilter/ipvs/ip_vs_xmit.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/netfilter/ipvs/ip_vs_xmit.c 2011-04-28 19:57:25.000000000 -0400 -@@ -1116,7 +1116,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str +diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c +index 5325a3f..09efa24 100644 +--- a/net/netfilter/ipvs/ip_vs_xmit.c ++++ b/net/netfilter/ipvs/ip_vs_xmit.c +@@ -1116,7 +1116,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp, else rc = NF_ACCEPT; /* do not touch skb anymore */ @@ -68515,7 +69933,7 @@ diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.38.7/net/net goto out; } -@@ -1230,7 +1230,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, +@@ -1230,7 +1230,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp, else rc = NF_ACCEPT; /* do not touch skb anymore */ @@ -68524,41 +69942,11 @@ diff -urNp linux-2.6.38.7/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.38.7/net/net goto out; } -diff -urNp linux-2.6.38.7/net/netfilter/Kconfig linux-2.6.38.7/net/netfilter/Kconfig ---- linux-2.6.38.7/net/netfilter/Kconfig 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/netfilter/Kconfig 2011-04-28 19:34:15.000000000 -0400 -@@ -709,6 +709,16 @@ config NETFILTER_XT_MATCH_ESP - - To compile it as a module, choose M here. If unsure, say N. - -+config NETFILTER_XT_MATCH_GRADM -+ tristate '"gradm" match support' -+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED -+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC -+ ---help--- -+ The gradm match allows to match on grsecurity RBAC being enabled. -+ It is useful when iptables rules are applied early on bootup to -+ prevent connections to the machine (except from a trusted host) -+ while the RBAC system is disabled. -+ - config NETFILTER_XT_MATCH_HASHLIMIT - tristate '"hashlimit" match support' - depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n) -diff -urNp linux-2.6.38.7/net/netfilter/Makefile linux-2.6.38.7/net/netfilter/Makefile ---- linux-2.6.38.7/net/netfilter/Makefile 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/netfilter/Makefile 2011-04-28 19:34:15.000000000 -0400 -@@ -74,6 +74,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CPU) += - obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o - obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o - obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o -+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o - obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o - obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o - obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o -diff -urNp linux-2.6.38.7/net/netfilter/nf_conntrack_netlink.c linux-2.6.38.7/net/netfilter/nf_conntrack_netlink.c ---- linux-2.6.38.7/net/netfilter/nf_conntrack_netlink.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/netfilter/nf_conntrack_netlink.c 2011-04-28 19:34:15.000000000 -0400 -@@ -761,7 +761,7 @@ static const struct nla_policy tuple_nla +diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c +index eead9db..7ee80e3 100644 +--- a/net/netfilter/nf_conntrack_netlink.c ++++ b/net/netfilter/nf_conntrack_netlink.c +@@ -761,7 +761,7 @@ static const struct nla_policy tuple_nla_policy[CTA_TUPLE_MAX+1] = { static int ctnetlink_parse_tuple(const struct nlattr * const cda[], struct nf_conntrack_tuple *tuple, @@ -68567,9 +69955,10 @@ diff -urNp linux-2.6.38.7/net/netfilter/nf_conntrack_netlink.c linux-2.6.38.7/ne { struct nlattr *tb[CTA_TUPLE_MAX+1]; int err; -diff -urNp linux-2.6.38.7/net/netfilter/nfnetlink_log.c linux-2.6.38.7/net/netfilter/nfnetlink_log.c ---- linux-2.6.38.7/net/netfilter/nfnetlink_log.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/netfilter/nfnetlink_log.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c +index 6a1572b..559396e 100644 +--- a/net/netfilter/nfnetlink_log.c ++++ b/net/netfilter/nfnetlink_log.c @@ -70,7 +70,7 @@ struct nfulnl_instance { }; @@ -68579,7 +69968,7 @@ diff -urNp linux-2.6.38.7/net/netfilter/nfnetlink_log.c linux-2.6.38.7/net/netfi #define INSTANCE_BUCKETS 16 static struct hlist_head instance_table[INSTANCE_BUCKETS]; -@@ -507,7 +507,7 @@ __build_packet_message(struct nfulnl_ins +@@ -507,7 +507,7 @@ __build_packet_message(struct nfulnl_instance *inst, /* global sequence number */ if (inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) NLA_PUT_BE32(inst->skb, NFULA_SEQ_GLOBAL, @@ -68588,9 +69977,10 @@ diff -urNp linux-2.6.38.7/net/netfilter/nfnetlink_log.c linux-2.6.38.7/net/netfi if (data_len) { struct nlattr *nla; -diff -urNp linux-2.6.38.7/net/netfilter/nfnetlink_queue.c linux-2.6.38.7/net/netfilter/nfnetlink_queue.c ---- linux-2.6.38.7/net/netfilter/nfnetlink_queue.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/netfilter/nfnetlink_queue.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c +index 68e67d1..c9531d6 100644 +--- a/net/netfilter/nfnetlink_queue.c ++++ b/net/netfilter/nfnetlink_queue.c @@ -58,7 +58,7 @@ struct nfqnl_instance { */ spinlock_t lock; @@ -68600,7 +69990,7 @@ diff -urNp linux-2.6.38.7/net/netfilter/nfnetlink_queue.c linux-2.6.38.7/net/net struct list_head queue_list; /* packets in queue */ }; -@@ -272,7 +272,7 @@ nfqnl_build_packet_message(struct nfqnl_ +@@ -272,7 +272,7 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue, nfmsg->version = NFNETLINK_V0; nfmsg->res_id = htons(queue->queue_num); @@ -68609,7 +69999,7 @@ diff -urNp linux-2.6.38.7/net/netfilter/nfnetlink_queue.c linux-2.6.38.7/net/net pmsg.packet_id = htonl(entry->id); pmsg.hw_protocol = entskb->protocol; pmsg.hook = entry->hook; -@@ -863,7 +863,7 @@ static int seq_show(struct seq_file *s, +@@ -863,7 +863,7 @@ static int seq_show(struct seq_file *s, void *v) inst->peer_pid, inst->queue_total, inst->copy_mode, inst->copy_range, inst->queue_dropped, inst->queue_user_dropped, @@ -68618,9 +70008,11 @@ diff -urNp linux-2.6.38.7/net/netfilter/nfnetlink_queue.c linux-2.6.38.7/net/net } static const struct seq_operations nfqnl_seq_ops = { -diff -urNp linux-2.6.38.7/net/netfilter/xt_gradm.c linux-2.6.38.7/net/netfilter/xt_gradm.c ---- linux-2.6.38.7/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.38.7/net/netfilter/xt_gradm.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c +new file mode 100644 +index 0000000..6905327 +--- /dev/null ++++ b/net/netfilter/xt_gradm.c @@ -0,0 +1,51 @@ +/* + * gradm match for netfilter @@ -68673,9 +70065,10 @@ diff -urNp linux-2.6.38.7/net/netfilter/xt_gradm.c linux-2.6.38.7/net/netfilter/ +MODULE_LICENSE("GPL"); +MODULE_ALIAS("ipt_gradm"); +MODULE_ALIAS("ip6t_gradm"); -diff -urNp linux-2.6.38.7/net/netfilter/xt_statistic.c linux-2.6.38.7/net/netfilter/xt_statistic.c ---- linux-2.6.38.7/net/netfilter/xt_statistic.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/netfilter/xt_statistic.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/net/netfilter/xt_statistic.c b/net/netfilter/xt_statistic.c +index 42ecb71..8d687c0 100644 +--- a/net/netfilter/xt_statistic.c ++++ b/net/netfilter/xt_statistic.c @@ -18,7 +18,7 @@ #include <linux/netfilter/x_tables.h> @@ -68685,7 +70078,7 @@ diff -urNp linux-2.6.38.7/net/netfilter/xt_statistic.c linux-2.6.38.7/net/netfil } ____cacheline_aligned_in_smp; MODULE_LICENSE("GPL"); -@@ -41,9 +41,9 @@ statistic_mt(const struct sk_buff *skb, +@@ -41,9 +41,9 @@ statistic_mt(const struct sk_buff *skb, struct xt_action_param *par) break; case XT_STATISTIC_MODE_NTH: do { @@ -68697,7 +70090,7 @@ diff -urNp linux-2.6.38.7/net/netfilter/xt_statistic.c linux-2.6.38.7/net/netfil if (nval == 0) ret = !ret; break; -@@ -63,7 +63,7 @@ static int statistic_mt_check(const stru +@@ -63,7 +63,7 @@ static int statistic_mt_check(const struct xt_mtchk_param *par) info->master = kzalloc(sizeof(*info->master), GFP_KERNEL); if (info->master == NULL) return -ENOMEM; @@ -68706,10 +70099,11 @@ diff -urNp linux-2.6.38.7/net/netfilter/xt_statistic.c linux-2.6.38.7/net/netfil return 0; } -diff -urNp linux-2.6.38.7/net/netlink/af_netlink.c linux-2.6.38.7/net/netlink/af_netlink.c ---- linux-2.6.38.7/net/netlink/af_netlink.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/netlink/af_netlink.c 2011-04-28 19:57:25.000000000 -0400 -@@ -742,7 +742,7 @@ static void netlink_overrun(struct sock +diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c +index 1f92459..30166e5 100644 +--- a/net/netlink/af_netlink.c ++++ b/net/netlink/af_netlink.c +@@ -742,7 +742,7 @@ static void netlink_overrun(struct sock *sk) sk->sk_error_report(sk); } } @@ -68718,7 +70112,7 @@ diff -urNp linux-2.6.38.7/net/netlink/af_netlink.c linux-2.6.38.7/net/netlink/af } static struct sock *netlink_getsockbypid(struct sock *ssk, u32 pid) -@@ -2001,15 +2001,23 @@ static int netlink_seq_show(struct seq_f +@@ -2001,15 +2001,23 @@ static int netlink_seq_show(struct seq_file *seq, void *v) struct netlink_sock *nlk = nlk_sk(s); seq_printf(seq, "%p %-3d %-6d %08x %-8d %-8d %p %-8d %-8d %-8lu\n", @@ -68743,10 +70137,11 @@ diff -urNp linux-2.6.38.7/net/netlink/af_netlink.c linux-2.6.38.7/net/netlink/af sock_i_ino(s) ); -diff -urNp linux-2.6.38.7/net/netrom/af_netrom.c linux-2.6.38.7/net/netrom/af_netrom.c ---- linux-2.6.38.7/net/netrom/af_netrom.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/netrom/af_netrom.c 2011-04-28 19:34:15.000000000 -0400 -@@ -840,6 +840,7 @@ static int nr_getname(struct socket *soc +diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c +index 06cb027..6faef38 100644 +--- a/net/netrom/af_netrom.c ++++ b/net/netrom/af_netrom.c +@@ -840,6 +840,7 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr, struct sock *sk = sock->sk; struct nr_sock *nr = nr_sk(sk); @@ -68754,7 +70149,7 @@ diff -urNp linux-2.6.38.7/net/netrom/af_netrom.c linux-2.6.38.7/net/netrom/af_ne lock_sock(sk); if (peer != 0) { if (sk->sk_state != TCP_ESTABLISHED) { -@@ -854,7 +855,6 @@ static int nr_getname(struct socket *soc +@@ -854,7 +855,6 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr, *uaddr_len = sizeof(struct full_sockaddr_ax25); } else { sax->fsa_ax25.sax25_family = AF_NETROM; @@ -68762,10 +70157,11 @@ diff -urNp linux-2.6.38.7/net/netrom/af_netrom.c linux-2.6.38.7/net/netrom/af_ne sax->fsa_ax25.sax25_call = nr->source_addr; *uaddr_len = sizeof(struct sockaddr_ax25); } -diff -urNp linux-2.6.38.7/net/packet/af_packet.c linux-2.6.38.7/net/packet/af_packet.c ---- linux-2.6.38.7/net/packet/af_packet.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/packet/af_packet.c 2011-04-28 19:57:25.000000000 -0400 -@@ -635,14 +635,14 @@ static int packet_rcv(struct sk_buff *sk +diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c +index 91cb1d7..3cf89a4 100644 +--- a/net/packet/af_packet.c ++++ b/net/packet/af_packet.c +@@ -635,14 +635,14 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, spin_lock(&sk->sk_receive_queue.lock); po->stats.tp_packets++; @@ -68782,7 +70178,7 @@ diff -urNp linux-2.6.38.7/net/packet/af_packet.c linux-2.6.38.7/net/packet/af_pa drop_n_restore: if (skb_head != skb->data && skb_shared(skb)) { -@@ -2134,7 +2134,7 @@ static int packet_getsockopt(struct sock +@@ -2134,7 +2134,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, case PACKET_HDRLEN: if (len > sizeof(int)) len = sizeof(int); @@ -68791,7 +70187,7 @@ diff -urNp linux-2.6.38.7/net/packet/af_packet.c linux-2.6.38.7/net/packet/af_pa return -EFAULT; switch (val) { case TPACKET_V1: -@@ -2172,7 +2172,7 @@ static int packet_getsockopt(struct sock +@@ -2172,7 +2172,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, if (put_user(len, optlen)) return -EFAULT; @@ -68800,7 +70196,7 @@ diff -urNp linux-2.6.38.7/net/packet/af_packet.c linux-2.6.38.7/net/packet/af_pa return -EFAULT; return 0; } -@@ -2684,7 +2684,11 @@ static int packet_seq_show(struct seq_fi +@@ -2684,7 +2684,11 @@ static int packet_seq_show(struct seq_file *seq, void *v) seq_printf(seq, "%p %-6d %-4d %04x %-5d %1d %-6u %-6u %-6lu\n", @@ -68812,10 +70208,11 @@ diff -urNp linux-2.6.38.7/net/packet/af_packet.c linux-2.6.38.7/net/packet/af_pa atomic_read(&s->sk_refcnt), s->sk_type, ntohs(po->num), -diff -urNp linux-2.6.38.7/net/phonet/af_phonet.c linux-2.6.38.7/net/phonet/af_phonet.c ---- linux-2.6.38.7/net/phonet/af_phonet.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/phonet/af_phonet.c 2011-04-28 19:34:15.000000000 -0400 -@@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr +diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c +index 1072b2c..97301fb 100644 +--- a/net/phonet/af_phonet.c ++++ b/net/phonet/af_phonet.c +@@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_proto_get(unsigned int protocol) { struct phonet_protocol *pp; @@ -68824,7 +70221,7 @@ diff -urNp linux-2.6.38.7/net/phonet/af_phonet.c linux-2.6.38.7/net/phonet/af_ph return NULL; rcu_read_lock(); -@@ -463,7 +463,7 @@ int __init_or_module phonet_proto_regist +@@ -463,7 +463,7 @@ int __init_or_module phonet_proto_register(unsigned int protocol, { int err = 0; @@ -68833,10 +70230,11 @@ diff -urNp linux-2.6.38.7/net/phonet/af_phonet.c linux-2.6.38.7/net/phonet/af_ph return -EINVAL; err = proto_register(pp->prot, 1); -diff -urNp linux-2.6.38.7/net/phonet/pep.c linux-2.6.38.7/net/phonet/pep.c ---- linux-2.6.38.7/net/phonet/pep.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/phonet/pep.c 2011-04-28 19:57:25.000000000 -0400 -@@ -592,7 +592,7 @@ static int pipe_do_rcv(struct sock *sk, +diff --git a/net/phonet/pep.c b/net/phonet/pep.c +index 3e60f2e..feb0690 100644 +--- a/net/phonet/pep.c ++++ b/net/phonet/pep.c +@@ -592,7 +592,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb) case PNS_PEP_CTRL_REQ: if (skb_queue_len(&pn->ctrlreq_queue) >= PNPIPE_CTRLREQ_MAX) { @@ -68845,7 +70243,7 @@ diff -urNp linux-2.6.38.7/net/phonet/pep.c linux-2.6.38.7/net/phonet/pep.c break; } __skb_pull(skb, 4); -@@ -612,7 +612,7 @@ static int pipe_do_rcv(struct sock *sk, +@@ -612,7 +612,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb) } if (pn->rx_credits == 0) { @@ -68854,10 +70252,11 @@ diff -urNp linux-2.6.38.7/net/phonet/pep.c linux-2.6.38.7/net/phonet/pep.c err = -ENOBUFS; break; } -diff -urNp linux-2.6.38.7/net/phonet/socket.c linux-2.6.38.7/net/phonet/socket.c ---- linux-2.6.38.7/net/phonet/socket.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/phonet/socket.c 2011-04-28 20:09:57.000000000 -0400 -@@ -637,8 +637,13 @@ static int pn_sock_seq_show(struct seq_f +diff --git a/net/phonet/socket.c b/net/phonet/socket.c +index 25f746d..fdeef84 100644 +--- a/net/phonet/socket.c ++++ b/net/phonet/socket.c +@@ -637,8 +637,13 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v) sk->sk_state, sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk), sock_i_uid(sk), sock_i_ino(sk), @@ -68873,9 +70272,10 @@ diff -urNp linux-2.6.38.7/net/phonet/socket.c linux-2.6.38.7/net/phonet/socket.c } seq_printf(seq, "%*s\n", 127 - len, ""); return 0; -diff -urNp linux-2.6.38.7/net/rds/cong.c linux-2.6.38.7/net/rds/cong.c ---- linux-2.6.38.7/net/rds/cong.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rds/cong.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/net/rds/cong.c b/net/rds/cong.c +index 75ea686..1ed2c26 100644 +--- a/net/rds/cong.c ++++ b/net/rds/cong.c @@ -78,7 +78,7 @@ * finds that the saved generation number is smaller than the global generation * number, it wakes up the process. @@ -68885,7 +70285,7 @@ diff -urNp linux-2.6.38.7/net/rds/cong.c linux-2.6.38.7/net/rds/cong.c /* * Congestion monitoring -@@ -233,7 +233,7 @@ void rds_cong_map_updated(struct rds_con +@@ -233,7 +233,7 @@ void rds_cong_map_updated(struct rds_cong_map *map, uint64_t portmask) rdsdebug("waking map %p for %pI4\n", map, &map->m_addr); rds_stats_inc(s_cong_update_received); @@ -68903,21 +70303,10 @@ diff -urNp linux-2.6.38.7/net/rds/cong.c linux-2.6.38.7/net/rds/cong.c if (likely(*recent == gen)) return 0; -diff -urNp linux-2.6.38.7/net/rds/ib_cm.c linux-2.6.38.7/net/rds/ib_cm.c ---- linux-2.6.38.7/net/rds/ib_cm.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rds/ib_cm.c 2011-05-11 18:35:16.000000000 -0400 -@@ -720,7 +720,7 @@ void rds_ib_conn_shutdown(struct rds_con - /* Clear the ACK state */ - clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags); - #ifdef KERNEL_HAS_ATOMIC64 -- atomic64_set(&ic->i_ack_next, 0); -+ atomic64_set_unchecked(&ic->i_ack_next, 0); - #else - ic->i_ack_next = 0; - #endif -diff -urNp linux-2.6.38.7/net/rds/ib.h linux-2.6.38.7/net/rds/ib.h ---- linux-2.6.38.7/net/rds/ib.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rds/ib.h 2011-05-11 18:35:16.000000000 -0400 +diff --git a/net/rds/ib.h b/net/rds/ib.h +index e34ad03..97b8eb3 100644 +--- a/net/rds/ib.h ++++ b/net/rds/ib.h @@ -127,7 +127,7 @@ struct rds_ib_connection { /* sending acks */ unsigned long i_ack_flags; @@ -68927,10 +70316,24 @@ diff -urNp linux-2.6.38.7/net/rds/ib.h linux-2.6.38.7/net/rds/ib.h #else spinlock_t i_ack_lock; /* protect i_ack_next */ u64 i_ack_next; /* next ACK to send */ -diff -urNp linux-2.6.38.7/net/rds/ib_recv.c linux-2.6.38.7/net/rds/ib_recv.c ---- linux-2.6.38.7/net/rds/ib_recv.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rds/ib_recv.c 2011-05-11 18:35:16.000000000 -0400 -@@ -592,7 +592,7 @@ static u64 rds_ib_get_ack(struct rds_ib_ +diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c +index ee369d2..2106660 100644 +--- a/net/rds/ib_cm.c ++++ b/net/rds/ib_cm.c +@@ -720,7 +720,7 @@ void rds_ib_conn_shutdown(struct rds_connection *conn) + /* Clear the ACK state */ + clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags); + #ifdef KERNEL_HAS_ATOMIC64 +- atomic64_set(&ic->i_ack_next, 0); ++ atomic64_set_unchecked(&ic->i_ack_next, 0); + #else + ic->i_ack_next = 0; + #endif +diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c +index e29e0ca..fa3a6a3 100644 +--- a/net/rds/ib_recv.c ++++ b/net/rds/ib_recv.c +@@ -592,7 +592,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic) static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq, int ack_required) { @@ -68939,7 +70342,7 @@ diff -urNp linux-2.6.38.7/net/rds/ib_recv.c linux-2.6.38.7/net/rds/ib_recv.c if (ack_required) { smp_mb__before_clear_bit(); set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags); -@@ -604,7 +604,7 @@ static u64 rds_ib_get_ack(struct rds_ib_ +@@ -604,7 +604,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic) clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags); smp_mb__after_clear_bit(); @@ -68948,21 +70351,10 @@ diff -urNp linux-2.6.38.7/net/rds/ib_recv.c linux-2.6.38.7/net/rds/ib_recv.c } #endif -diff -urNp linux-2.6.38.7/net/rds/iw_cm.c linux-2.6.38.7/net/rds/iw_cm.c ---- linux-2.6.38.7/net/rds/iw_cm.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rds/iw_cm.c 2011-05-11 18:35:16.000000000 -0400 -@@ -664,7 +664,7 @@ void rds_iw_conn_shutdown(struct rds_con - /* Clear the ACK state */ - clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags); - #ifdef KERNEL_HAS_ATOMIC64 -- atomic64_set(&ic->i_ack_next, 0); -+ atomic64_set_unchecked(&ic->i_ack_next, 0); - #else - ic->i_ack_next = 0; - #endif -diff -urNp linux-2.6.38.7/net/rds/iw.h linux-2.6.38.7/net/rds/iw.h ---- linux-2.6.38.7/net/rds/iw.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rds/iw.h 2011-05-11 18:35:16.000000000 -0400 +diff --git a/net/rds/iw.h b/net/rds/iw.h +index 9015192..39f60c0 100644 +--- a/net/rds/iw.h ++++ b/net/rds/iw.h @@ -133,7 +133,7 @@ struct rds_iw_connection { /* sending acks */ unsigned long i_ack_flags; @@ -68972,10 +70364,24 @@ diff -urNp linux-2.6.38.7/net/rds/iw.h linux-2.6.38.7/net/rds/iw.h #else spinlock_t i_ack_lock; /* protect i_ack_next */ u64 i_ack_next; /* next ACK to send */ -diff -urNp linux-2.6.38.7/net/rds/iw_rdma.c linux-2.6.38.7/net/rds/iw_rdma.c ---- linux-2.6.38.7/net/rds/iw_rdma.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rds/iw_rdma.c 2011-05-16 21:47:09.000000000 -0400 -@@ -182,6 +182,8 @@ int rds_iw_update_cm_id(struct rds_iw_de +diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c +index 712cf2d..d863875 100644 +--- a/net/rds/iw_cm.c ++++ b/net/rds/iw_cm.c +@@ -664,7 +664,7 @@ void rds_iw_conn_shutdown(struct rds_connection *conn) + /* Clear the ACK state */ + clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags); + #ifdef KERNEL_HAS_ATOMIC64 +- atomic64_set(&ic->i_ack_next, 0); ++ atomic64_set_unchecked(&ic->i_ack_next, 0); + #else + ic->i_ack_next = 0; + #endif +diff --git a/net/rds/iw_rdma.c b/net/rds/iw_rdma.c +index 59509e9..4314c64 100644 +--- a/net/rds/iw_rdma.c ++++ b/net/rds/iw_rdma.c +@@ -182,6 +182,8 @@ int rds_iw_update_cm_id(struct rds_iw_device *rds_iwdev, struct rdma_cm_id *cm_i struct rdma_cm_id *pcm_id; int rc; @@ -68984,10 +70390,11 @@ diff -urNp linux-2.6.38.7/net/rds/iw_rdma.c linux-2.6.38.7/net/rds/iw_rdma.c src_addr = (struct sockaddr_in *)&cm_id->route.addr.src_addr; dst_addr = (struct sockaddr_in *)&cm_id->route.addr.dst_addr; -diff -urNp linux-2.6.38.7/net/rds/iw_recv.c linux-2.6.38.7/net/rds/iw_recv.c ---- linux-2.6.38.7/net/rds/iw_recv.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rds/iw_recv.c 2011-05-11 18:35:16.000000000 -0400 -@@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_ +diff --git a/net/rds/iw_recv.c b/net/rds/iw_recv.c +index 5e57347..3916042 100644 +--- a/net/rds/iw_recv.c ++++ b/net/rds/iw_recv.c +@@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic) static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq, int ack_required) { @@ -68996,7 +70403,7 @@ diff -urNp linux-2.6.38.7/net/rds/iw_recv.c linux-2.6.38.7/net/rds/iw_recv.c if (ack_required) { smp_mb__before_clear_bit(); set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags); -@@ -439,7 +439,7 @@ static u64 rds_iw_get_ack(struct rds_iw_ +@@ -439,7 +439,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic) clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags); smp_mb__after_clear_bit(); @@ -69005,10 +70412,11 @@ diff -urNp linux-2.6.38.7/net/rds/iw_recv.c linux-2.6.38.7/net/rds/iw_recv.c } #endif -diff -urNp linux-2.6.38.7/net/rxrpc/af_rxrpc.c linux-2.6.38.7/net/rxrpc/af_rxrpc.c ---- linux-2.6.38.7/net/rxrpc/af_rxrpc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rxrpc/af_rxrpc.c 2011-04-28 19:57:25.000000000 -0400 -@@ -39,7 +39,7 @@ static const struct proto_ops rxrpc_rpc_ +diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c +index 74c064c..fdec26f 100644 +--- a/net/rxrpc/af_rxrpc.c ++++ b/net/rxrpc/af_rxrpc.c +@@ -39,7 +39,7 @@ static const struct proto_ops rxrpc_rpc_ops; __be32 rxrpc_epoch; /* current debugging ID */ @@ -69017,10 +70425,11 @@ diff -urNp linux-2.6.38.7/net/rxrpc/af_rxrpc.c linux-2.6.38.7/net/rxrpc/af_rxrpc /* count of skbs currently in use */ atomic_t rxrpc_n_skbs; -diff -urNp linux-2.6.38.7/net/rxrpc/ar-ack.c linux-2.6.38.7/net/rxrpc/ar-ack.c ---- linux-2.6.38.7/net/rxrpc/ar-ack.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rxrpc/ar-ack.c 2011-05-16 21:47:08.000000000 -0400 -@@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_ca +diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c +index b6ffe4e..d3f7619 100644 +--- a/net/rxrpc/ar-ack.c ++++ b/net/rxrpc/ar-ack.c +@@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_call *call) _enter("{%d,%d,%d,%d},", call->acks_hard, call->acks_unacked, @@ -69029,7 +70438,7 @@ diff -urNp linux-2.6.38.7/net/rxrpc/ar-ack.c linux-2.6.38.7/net/rxrpc/ar-ack.c CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz)); stop = 0; -@@ -199,7 +199,7 @@ static void rxrpc_resend(struct rxrpc_ca +@@ -199,7 +199,7 @@ static void rxrpc_resend(struct rxrpc_call *call) /* each Tx packet has a new serial number */ sp->hdr.serial = @@ -69038,7 +70447,7 @@ diff -urNp linux-2.6.38.7/net/rxrpc/ar-ack.c linux-2.6.38.7/net/rxrpc/ar-ack.c hdr = (struct rxrpc_header *) txb->head; hdr->serial = sp->hdr.serial; -@@ -405,7 +405,7 @@ static void rxrpc_rotate_tx_window(struc +@@ -405,7 +405,7 @@ static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard) */ static void rxrpc_clear_tx_window(struct rxrpc_call *call) { @@ -69056,7 +70465,7 @@ diff -urNp linux-2.6.38.7/net/rxrpc/ar-ack.c linux-2.6.38.7/net/rxrpc/ar-ack.c _proto("Rx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }", latest, -@@ -844,6 +844,8 @@ void rxrpc_process_call(struct work_stru +@@ -844,6 +844,8 @@ void rxrpc_process_call(struct work_struct *work) u32 abort_code = RX_PROTOCOL_ERROR; u8 *acks = NULL; @@ -69065,7 +70474,7 @@ diff -urNp linux-2.6.38.7/net/rxrpc/ar-ack.c linux-2.6.38.7/net/rxrpc/ar-ack.c //printk("\n--------------------\n"); _enter("{%d,%s,%lx} [%lu]", call->debug_id, rxrpc_call_states[call->state], call->events, -@@ -1163,7 +1165,7 @@ void rxrpc_process_call(struct work_stru +@@ -1163,7 +1165,7 @@ void rxrpc_process_call(struct work_struct *work) goto maybe_reschedule; send_ACK_with_skew: @@ -69092,10 +70501,11 @@ diff -urNp linux-2.6.38.7/net/rxrpc/ar-ack.c linux-2.6.38.7/net/rxrpc/ar-ack.c _proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial)); send_message_2: -diff -urNp linux-2.6.38.7/net/rxrpc/ar-call.c linux-2.6.38.7/net/rxrpc/ar-call.c ---- linux-2.6.38.7/net/rxrpc/ar-call.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rxrpc/ar-call.c 2011-04-28 19:57:25.000000000 -0400 -@@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_ca +diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c +index bf656c2..48f9d27 100644 +--- a/net/rxrpc/ar-call.c ++++ b/net/rxrpc/ar-call.c +@@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_call(gfp_t gfp) spin_lock_init(&call->lock); rwlock_init(&call->state_lock); atomic_set(&call->usage, 1); @@ -69104,10 +70514,11 @@ diff -urNp linux-2.6.38.7/net/rxrpc/ar-call.c linux-2.6.38.7/net/rxrpc/ar-call.c call->state = RXRPC_CALL_CLIENT_SEND_REQUEST; memset(&call->sock_node, 0xed, sizeof(call->sock_node)); -diff -urNp linux-2.6.38.7/net/rxrpc/ar-connection.c linux-2.6.38.7/net/rxrpc/ar-connection.c ---- linux-2.6.38.7/net/rxrpc/ar-connection.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rxrpc/ar-connection.c 2011-04-28 19:57:25.000000000 -0400 -@@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_al +diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c +index 4106ca9..a338d7a 100644 +--- a/net/rxrpc/ar-connection.c ++++ b/net/rxrpc/ar-connection.c +@@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_alloc_connection(gfp_t gfp) rwlock_init(&conn->lock); spin_lock_init(&conn->state_lock); atomic_set(&conn->usage, 1); @@ -69116,10 +70527,11 @@ diff -urNp linux-2.6.38.7/net/rxrpc/ar-connection.c linux-2.6.38.7/net/rxrpc/ar- conn->avail_calls = RXRPC_MAXCALLS; conn->size_align = 4; conn->header_size = sizeof(struct rxrpc_header); -diff -urNp linux-2.6.38.7/net/rxrpc/ar-connevent.c linux-2.6.38.7/net/rxrpc/ar-connevent.c ---- linux-2.6.38.7/net/rxrpc/ar-connevent.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rxrpc/ar-connevent.c 2011-04-28 19:57:25.000000000 -0400 -@@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct +diff --git a/net/rxrpc/ar-connevent.c b/net/rxrpc/ar-connevent.c +index 0505cdc..f0748ce 100644 +--- a/net/rxrpc/ar-connevent.c ++++ b/net/rxrpc/ar-connevent.c +@@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct rxrpc_connection *conn, len = iov[0].iov_len + iov[1].iov_len; @@ -69128,10 +70540,11 @@ diff -urNp linux-2.6.38.7/net/rxrpc/ar-connevent.c linux-2.6.38.7/net/rxrpc/ar-c _proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code); ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len); -diff -urNp linux-2.6.38.7/net/rxrpc/ar-input.c linux-2.6.38.7/net/rxrpc/ar-input.c ---- linux-2.6.38.7/net/rxrpc/ar-input.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rxrpc/ar-input.c 2011-04-28 19:57:25.000000000 -0400 -@@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rx +diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c +index 1a2b0633..e8d1382 100644 +--- a/net/rxrpc/ar-input.c ++++ b/net/rxrpc/ar-input.c +@@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rxrpc_call *call, struct sk_buff *skb) /* track the latest serial number on this connection for ACK packet * information */ serial = ntohl(sp->hdr.serial); @@ -69143,9 +70556,10 @@ diff -urNp linux-2.6.38.7/net/rxrpc/ar-input.c linux-2.6.38.7/net/rxrpc/ar-input serial); /* request ACK generation for any ACK or DATA packet that requests -diff -urNp linux-2.6.38.7/net/rxrpc/ar-internal.h linux-2.6.38.7/net/rxrpc/ar-internal.h ---- linux-2.6.38.7/net/rxrpc/ar-internal.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rxrpc/ar-internal.h 2011-04-28 19:57:25.000000000 -0400 +diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h +index 8e22bd3..f66d1c0 100644 +--- a/net/rxrpc/ar-internal.h ++++ b/net/rxrpc/ar-internal.h @@ -272,8 +272,8 @@ struct rxrpc_connection { int error; /* error code for local abort */ int debug_id; /* debug ID for printks */ @@ -69166,7 +70580,7 @@ diff -urNp linux-2.6.38.7/net/rxrpc/ar-internal.h linux-2.6.38.7/net/rxrpc/ar-in u32 abort_code; /* local/remote abort code */ enum { /* current state of call */ RXRPC_CALL_CLIENT_SEND_REQUEST, /* - client sending request phase */ -@@ -420,7 +420,7 @@ static inline void rxrpc_abort_call(stru +@@ -420,7 +420,7 @@ static inline void rxrpc_abort_call(struct rxrpc_call *call, u32 abort_code) */ extern atomic_t rxrpc_n_skbs; extern __be32 rxrpc_epoch; @@ -69175,10 +70589,11 @@ diff -urNp linux-2.6.38.7/net/rxrpc/ar-internal.h linux-2.6.38.7/net/rxrpc/ar-in extern struct workqueue_struct *rxrpc_workqueue; /* -diff -urNp linux-2.6.38.7/net/rxrpc/ar-local.c linux-2.6.38.7/net/rxrpc/ar-local.c ---- linux-2.6.38.7/net/rxrpc/ar-local.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rxrpc/ar-local.c 2011-04-28 19:57:25.000000000 -0400 -@@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(st +diff --git a/net/rxrpc/ar-local.c b/net/rxrpc/ar-local.c +index 87f7135..74d3703 100644 +--- a/net/rxrpc/ar-local.c ++++ b/net/rxrpc/ar-local.c +@@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(struct sockaddr_rxrpc *srx) spin_lock_init(&local->lock); rwlock_init(&local->services_lock); atomic_set(&local->usage, 1); @@ -69187,10 +70602,11 @@ diff -urNp linux-2.6.38.7/net/rxrpc/ar-local.c linux-2.6.38.7/net/rxrpc/ar-local memcpy(&local->srx, srx, sizeof(*srx)); } -diff -urNp linux-2.6.38.7/net/rxrpc/ar-output.c linux-2.6.38.7/net/rxrpc/ar-output.c ---- linux-2.6.38.7/net/rxrpc/ar-output.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rxrpc/ar-output.c 2011-04-28 19:57:25.000000000 -0400 -@@ -681,9 +681,9 @@ static int rxrpc_send_data(struct kiocb +diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c +index 5f22e26..e5bd20f 100644 +--- a/net/rxrpc/ar-output.c ++++ b/net/rxrpc/ar-output.c +@@ -681,9 +681,9 @@ static int rxrpc_send_data(struct kiocb *iocb, sp->hdr.cid = call->cid; sp->hdr.callNumber = call->call_id; sp->hdr.seq = @@ -69202,10 +70618,11 @@ diff -urNp linux-2.6.38.7/net/rxrpc/ar-output.c linux-2.6.38.7/net/rxrpc/ar-outp sp->hdr.type = RXRPC_PACKET_TYPE_DATA; sp->hdr.userStatus = 0; sp->hdr.securityIndex = conn->security_ix; -diff -urNp linux-2.6.38.7/net/rxrpc/ar-peer.c linux-2.6.38.7/net/rxrpc/ar-peer.c ---- linux-2.6.38.7/net/rxrpc/ar-peer.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rxrpc/ar-peer.c 2011-04-28 19:57:25.000000000 -0400 -@@ -87,7 +87,7 @@ static struct rxrpc_peer *rxrpc_alloc_pe +diff --git a/net/rxrpc/ar-peer.c b/net/rxrpc/ar-peer.c +index a53fb25..88e6088 100644 +--- a/net/rxrpc/ar-peer.c ++++ b/net/rxrpc/ar-peer.c +@@ -87,7 +87,7 @@ static struct rxrpc_peer *rxrpc_alloc_peer(struct sockaddr_rxrpc *srx, INIT_LIST_HEAD(&peer->error_targets); spin_lock_init(&peer->lock); atomic_set(&peer->usage, 1); @@ -69214,10 +70631,11 @@ diff -urNp linux-2.6.38.7/net/rxrpc/ar-peer.c linux-2.6.38.7/net/rxrpc/ar-peer.c memcpy(&peer->srx, srx, sizeof(*srx)); rxrpc_assess_MTU_size(peer); -diff -urNp linux-2.6.38.7/net/rxrpc/ar-proc.c linux-2.6.38.7/net/rxrpc/ar-proc.c ---- linux-2.6.38.7/net/rxrpc/ar-proc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rxrpc/ar-proc.c 2011-04-28 19:57:25.000000000 -0400 -@@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(str +diff --git a/net/rxrpc/ar-proc.c b/net/rxrpc/ar-proc.c +index 38047f7..9f48511 100644 +--- a/net/rxrpc/ar-proc.c ++++ b/net/rxrpc/ar-proc.c +@@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(struct seq_file *seq, void *v) atomic_read(&conn->usage), rxrpc_conn_states[conn->state], key_serial(conn->key), @@ -69228,10 +70646,11 @@ diff -urNp linux-2.6.38.7/net/rxrpc/ar-proc.c linux-2.6.38.7/net/rxrpc/ar-proc.c return 0; } -diff -urNp linux-2.6.38.7/net/rxrpc/ar-transport.c linux-2.6.38.7/net/rxrpc/ar-transport.c ---- linux-2.6.38.7/net/rxrpc/ar-transport.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rxrpc/ar-transport.c 2011-04-28 19:57:25.000000000 -0400 -@@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_all +diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c +index 5e0226f..1ff5b8d 100644 +--- a/net/rxrpc/ar-transport.c ++++ b/net/rxrpc/ar-transport.c +@@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_alloc_transport(struct rxrpc_local *local, spin_lock_init(&trans->client_lock); rwlock_init(&trans->conn_lock); atomic_set(&trans->usage, 1); @@ -69240,10 +70659,11 @@ diff -urNp linux-2.6.38.7/net/rxrpc/ar-transport.c linux-2.6.38.7/net/rxrpc/ar-t if (peer->srx.transport.family == AF_INET) { switch (peer->srx.transport_type) { -diff -urNp linux-2.6.38.7/net/rxrpc/rxkad.c linux-2.6.38.7/net/rxrpc/rxkad.c ---- linux-2.6.38.7/net/rxrpc/rxkad.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/rxrpc/rxkad.c 2011-05-16 21:47:08.000000000 -0400 -@@ -211,6 +211,8 @@ static int rxkad_secure_packet_encrypt(c +diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c +index 7635107..5000b71 100644 +--- a/net/rxrpc/rxkad.c ++++ b/net/rxrpc/rxkad.c +@@ -211,6 +211,8 @@ static int rxkad_secure_packet_encrypt(const struct rxrpc_call *call, u16 check; int nsg; @@ -69252,7 +70672,7 @@ diff -urNp linux-2.6.38.7/net/rxrpc/rxkad.c linux-2.6.38.7/net/rxrpc/rxkad.c sp = rxrpc_skb(skb); _enter(""); -@@ -338,6 +340,8 @@ static int rxkad_verify_packet_auth(cons +@@ -338,6 +340,8 @@ static int rxkad_verify_packet_auth(const struct rxrpc_call *call, u16 check; int nsg; @@ -69261,7 +70681,7 @@ diff -urNp linux-2.6.38.7/net/rxrpc/rxkad.c linux-2.6.38.7/net/rxrpc/rxkad.c _enter(""); sp = rxrpc_skb(skb); -@@ -610,7 +614,7 @@ static int rxkad_issue_challenge(struct +@@ -610,7 +614,7 @@ static int rxkad_issue_challenge(struct rxrpc_connection *conn) len = iov[0].iov_len + iov[1].iov_len; @@ -69270,7 +70690,7 @@ diff -urNp linux-2.6.38.7/net/rxrpc/rxkad.c linux-2.6.38.7/net/rxrpc/rxkad.c _proto("Tx CHALLENGE %%%u", ntohl(hdr.serial)); ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len); -@@ -660,7 +664,7 @@ static int rxkad_send_response(struct rx +@@ -660,7 +664,7 @@ static int rxkad_send_response(struct rxrpc_connection *conn, len = iov[0].iov_len + iov[1].iov_len + iov[2].iov_len; @@ -69279,10 +70699,11 @@ diff -urNp linux-2.6.38.7/net/rxrpc/rxkad.c linux-2.6.38.7/net/rxrpc/rxkad.c _proto("Tx RESPONSE %%%u", ntohl(hdr->serial)); ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len); -diff -urNp linux-2.6.38.7/net/sctp/proc.c linux-2.6.38.7/net/sctp/proc.c ---- linux-2.6.38.7/net/sctp/proc.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/sctp/proc.c 2011-04-28 19:34:15.000000000 -0400 -@@ -212,7 +212,12 @@ static int sctp_eps_seq_show(struct seq_ +diff --git a/net/sctp/proc.c b/net/sctp/proc.c +index 61aacfb..9a2e19c 100644 +--- a/net/sctp/proc.c ++++ b/net/sctp/proc.c +@@ -212,7 +212,12 @@ static int sctp_eps_seq_show(struct seq_file *seq, void *v) sctp_for_each_hentry(epb, node, &head->chain) { ep = sctp_ep(epb); sk = epb->sk; @@ -69296,7 +70717,7 @@ diff -urNp linux-2.6.38.7/net/sctp/proc.c linux-2.6.38.7/net/sctp/proc.c sctp_sk(sk)->type, sk->sk_state, hash, epb->bind_addr.port, sock_i_uid(sk), sock_i_ino(sk)); -@@ -318,7 +323,12 @@ static int sctp_assocs_seq_show(struct s +@@ -318,7 +323,12 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v) seq_printf(seq, "%8p %8p %-3d %-3d %-2d %-4d " "%4d %8d %8d %7d %5lu %-5d %5d ", @@ -69310,10 +70731,11 @@ diff -urNp linux-2.6.38.7/net/sctp/proc.c linux-2.6.38.7/net/sctp/proc.c assoc->state, hash, assoc->assoc_id, assoc->sndbuf_used, -diff -urNp linux-2.6.38.7/net/sctp/socket.c linux-2.6.38.7/net/sctp/socket.c ---- linux-2.6.38.7/net/sctp/socket.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/sctp/socket.c 2011-04-28 19:34:15.000000000 -0400 -@@ -4435,7 +4435,7 @@ static int sctp_getsockopt_peer_addrs(st +diff --git a/net/sctp/socket.c b/net/sctp/socket.c +index 8e02550..b172396 100644 +--- a/net/sctp/socket.c ++++ b/net/sctp/socket.c +@@ -4435,7 +4435,7 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len, addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len; if (space_left < addrlen) return -ENOMEM; @@ -69322,9 +70744,10 @@ diff -urNp linux-2.6.38.7/net/sctp/socket.c linux-2.6.38.7/net/sctp/socket.c return -EFAULT; to += addrlen; cnt++; -diff -urNp linux-2.6.38.7/net/socket.c linux-2.6.38.7/net/socket.c ---- linux-2.6.38.7/net/socket.c 2011-04-18 17:27:16.000000000 -0400 -+++ linux-2.6.38.7/net/socket.c 2011-05-16 21:47:09.000000000 -0400 +diff --git a/net/socket.c b/net/socket.c +index 1204afd..50656a0 100644 +--- a/net/socket.c ++++ b/net/socket.c @@ -88,6 +88,7 @@ #include <linux/nsproxy.h> #include <linux/magic.h> @@ -69342,7 +70765,7 @@ diff -urNp linux-2.6.38.7/net/socket.c linux-2.6.38.7/net/socket.c static int sock_no_open(struct inode *irrelevant, struct file *dontcare); static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t pos); -@@ -326,7 +329,7 @@ static struct dentry *sockfs_mount(struc +@@ -326,7 +329,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type, &sockfs_dentry_operations, SOCKFS_MAGIC); } @@ -69351,7 +70774,7 @@ diff -urNp linux-2.6.38.7/net/socket.c linux-2.6.38.7/net/socket.c static struct file_system_type sock_fs_type = { .name = "sockfs", -@@ -1174,6 +1177,8 @@ int __sock_create(struct net *net, int f +@@ -1174,6 +1177,8 @@ int __sock_create(struct net *net, int family, int type, int protocol, return -EAFNOSUPPORT; if (type < 0 || type >= SOCK_MAX) return -EINVAL; @@ -69360,7 +70783,7 @@ diff -urNp linux-2.6.38.7/net/socket.c linux-2.6.38.7/net/socket.c /* Compatibility. -@@ -1306,6 +1311,16 @@ SYSCALL_DEFINE3(socket, int, family, int +@@ -1306,6 +1311,16 @@ SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol) if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK)) flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK; @@ -69377,7 +70800,7 @@ diff -urNp linux-2.6.38.7/net/socket.c linux-2.6.38.7/net/socket.c retval = sock_create(family, type, protocol, &sock); if (retval < 0) goto out; -@@ -1418,6 +1433,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct so +@@ -1418,6 +1433,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen) if (sock) { err = move_addr_to_kernel(umyaddr, addrlen, (struct sockaddr *)&address); if (err >= 0) { @@ -69392,7 +70815,7 @@ diff -urNp linux-2.6.38.7/net/socket.c linux-2.6.38.7/net/socket.c err = security_socket_bind(sock, (struct sockaddr *)&address, addrlen); -@@ -1426,6 +1449,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct so +@@ -1426,6 +1449,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen) (struct sockaddr *) &address, addrlen); } @@ -69400,7 +70823,7 @@ diff -urNp linux-2.6.38.7/net/socket.c linux-2.6.38.7/net/socket.c fput_light(sock->file, fput_needed); } return err; -@@ -1449,10 +1473,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, ba +@@ -1449,10 +1473,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog) if ((unsigned)backlog > somaxconn) backlog = somaxconn; @@ -69421,7 +70844,7 @@ diff -urNp linux-2.6.38.7/net/socket.c linux-2.6.38.7/net/socket.c fput_light(sock->file, fput_needed); } return err; -@@ -1496,6 +1530,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct +@@ -1496,6 +1530,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr, newsock->type = sock->type; newsock->ops = sock->ops; @@ -69440,7 +70863,7 @@ diff -urNp linux-2.6.38.7/net/socket.c linux-2.6.38.7/net/socket.c /* * We don't need try_module_get here, as the listening socket (sock) * has the protocol module (sock->ops->owner) held. -@@ -1534,6 +1580,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct +@@ -1534,6 +1580,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr, fd_install(newfd, newfile); err = newfd; @@ -69449,7 +70872,7 @@ diff -urNp linux-2.6.38.7/net/socket.c linux-2.6.38.7/net/socket.c out_put: fput_light(sock->file, fput_needed); out: -@@ -1566,6 +1614,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct +@@ -1566,6 +1614,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr, int, addrlen) { struct socket *sock; @@ -69457,7 +70880,7 @@ diff -urNp linux-2.6.38.7/net/socket.c linux-2.6.38.7/net/socket.c struct sockaddr_storage address; int err, fput_needed; -@@ -1576,6 +1625,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct +@@ -1576,6 +1625,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr, if (err < 0) goto out_put; @@ -69475,7 +70898,7 @@ diff -urNp linux-2.6.38.7/net/socket.c linux-2.6.38.7/net/socket.c err = security_socket_connect(sock, (struct sockaddr *)&address, addrlen); if (err) -@@ -1877,6 +1937,8 @@ SYSCALL_DEFINE3(sendmsg, int, fd, struct +@@ -1877,6 +1937,8 @@ SYSCALL_DEFINE3(sendmsg, int, fd, struct msghdr __user *, msg, unsigned, flags) int err, ctl_len, iov_size, total_len; int fput_needed; @@ -69484,10 +70907,11 @@ diff -urNp linux-2.6.38.7/net/socket.c linux-2.6.38.7/net/socket.c err = -EFAULT; if (MSG_CMSG_COMPAT & flags) { if (get_compat_msghdr(&msg_sys, msg_compat)) -diff -urNp linux-2.6.38.7/net/sunrpc/sched.c linux-2.6.38.7/net/sunrpc/sched.c ---- linux-2.6.38.7/net/sunrpc/sched.c 2011-04-18 17:27:14.000000000 -0400 -+++ linux-2.6.38.7/net/sunrpc/sched.c 2011-04-28 19:34:15.000000000 -0400 -@@ -234,9 +234,9 @@ static int rpc_wait_bit_killable(void *w +diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c +index 17c3e3a..9402eb2 100644 +--- a/net/sunrpc/sched.c ++++ b/net/sunrpc/sched.c +@@ -234,9 +234,9 @@ static int rpc_wait_bit_killable(void *word) #ifdef RPC_DEBUG static void rpc_task_set_debuginfo(struct rpc_task *task) { @@ -69499,10 +70923,11 @@ diff -urNp linux-2.6.38.7/net/sunrpc/sched.c linux-2.6.38.7/net/sunrpc/sched.c } #else static inline void rpc_task_set_debuginfo(struct rpc_task *task) -diff -urNp linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma.c ---- linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma.c 2011-04-28 19:57:25.000000000 -0400 -@@ -61,15 +61,15 @@ unsigned int svcrdma_max_req_size = RPCR +diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c +index 09af4fa..77110a9 100644 +--- a/net/sunrpc/xprtrdma/svc_rdma.c ++++ b/net/sunrpc/xprtrdma/svc_rdma.c +@@ -61,15 +61,15 @@ unsigned int svcrdma_max_req_size = RPCRDMA_MAX_REQ_SIZE; static unsigned int min_max_inline = 4096; static unsigned int max_max_inline = 65536; @@ -69527,7 +70952,7 @@ diff -urNp linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.38.7/net/sunr /* Temporary NFS request map and context caches */ struct kmem_cache *svc_rdma_map_cachep; -@@ -109,7 +109,7 @@ static int read_reset_stat(ctl_table *ta +@@ -109,7 +109,7 @@ static int read_reset_stat(ctl_table *table, int write, len -= *ppos; if (len > *lenp) len = *lenp; @@ -69536,7 +70961,7 @@ diff -urNp linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.38.7/net/sunr return -EFAULT; *lenp = len; *ppos += len; -@@ -150,63 +150,63 @@ static ctl_table svcrdma_parm_table[] = +@@ -150,63 +150,63 @@ static ctl_table svcrdma_parm_table[] = { { .procname = "rdma_stat_read", .data = &rdma_stat_read, @@ -69609,9 +71034,10 @@ diff -urNp linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.38.7/net/sunr .mode = 0644, .proc_handler = read_reset_stat, }, -diff -urNp linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c ---- linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +index df67211..c354b13 100644 +--- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c ++++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c @@ -499,7 +499,7 @@ next_sge: svc_rdma_put_context(ctxt, 0); goto out; @@ -69621,7 +71047,7 @@ diff -urNp linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.38.7 if (read_wr.num_sge < chl_map->ch[ch_no].count) { chl_map->ch[ch_no].count -= read_wr.num_sge; -@@ -609,7 +609,7 @@ int svc_rdma_recvfrom(struct svc_rqst *r +@@ -609,7 +609,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp) dto_q); list_del_init(&ctxt->dto_q); } else { @@ -69630,7 +71056,7 @@ diff -urNp linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.38.7 clear_bit(XPT_DATA, &xprt->xpt_flags); ctxt = NULL; } -@@ -629,7 +629,7 @@ int svc_rdma_recvfrom(struct svc_rqst *r +@@ -629,7 +629,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp) dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p, status=%d\n", ctxt, rdma_xprt, rqstp, ctxt->wc_status); BUG_ON(ctxt->wc_status != IB_WC_SUCCESS); @@ -69639,10 +71065,11 @@ diff -urNp linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.38.7 /* Build up the XDR from the receive buffers. */ rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len); -diff -urNp linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_sendto.c ---- linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-04-28 19:57:25.000000000 -0400 -@@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdm +diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c +index 249a835..fb2794b 100644 +--- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c ++++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c +@@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdma *xprt, struct svc_rqst *rqstp, write_wr.wr.rdma.remote_addr = to; /* Post It */ @@ -69651,10 +71078,11 @@ diff -urNp linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.6.38.7/n if (svc_rdma_send(xprt, &write_wr)) goto err; return 0; -diff -urNp linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_transport.c ---- linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-04-28 19:57:25.000000000 -0400 -@@ -298,7 +298,7 @@ static void rq_cq_reap(struct svcxprt_rd +diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c +index 1a10dcd..61e6853 100644 +--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c ++++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c +@@ -298,7 +298,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt) return; ib_req_notify_cq(xprt->sc_rq_cq, IB_CQ_NEXT_COMP); @@ -69663,7 +71091,7 @@ diff -urNp linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.38. while ((ret = ib_poll_cq(xprt->sc_rq_cq, 1, &wc)) > 0) { ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id; -@@ -320,7 +320,7 @@ static void rq_cq_reap(struct svcxprt_rd +@@ -320,7 +320,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt) } if (ctxt) @@ -69672,7 +71100,7 @@ diff -urNp linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.38. set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags); /* -@@ -392,7 +392,7 @@ static void sq_cq_reap(struct svcxprt_rd +@@ -392,7 +392,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt) return; ib_req_notify_cq(xprt->sc_sq_cq, IB_CQ_NEXT_COMP); @@ -69681,7 +71109,7 @@ diff -urNp linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.38. while ((ret = ib_poll_cq(cq, 1, &wc)) > 0) { if (wc.status != IB_WC_SUCCESS) /* Close the transport */ -@@ -410,7 +410,7 @@ static void sq_cq_reap(struct svcxprt_rd +@@ -410,7 +410,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt) } if (ctxt) @@ -69690,7 +71118,7 @@ diff -urNp linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.38. } static void sq_comp_handler(struct ib_cq *cq, void *cq_context) -@@ -1271,7 +1271,7 @@ int svc_rdma_send(struct svcxprt_rdma *x +@@ -1271,7 +1271,7 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr) spin_lock_bh(&xprt->sc_lock); if (xprt->sc_sq_depth < atomic_read(&xprt->sc_sq_count) + wr_count) { spin_unlock_bh(&xprt->sc_lock); @@ -69699,10 +71127,11 @@ diff -urNp linux-2.6.38.7/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.38. /* See if we can opportunistically reap SQ WR to make room */ sq_cq_reap(xprt); -diff -urNp linux-2.6.38.7/net/sysctl_net.c linux-2.6.38.7/net/sysctl_net.c ---- linux-2.6.38.7/net/sysctl_net.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/sysctl_net.c 2011-04-28 19:34:15.000000000 -0400 -@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct +diff --git a/net/sysctl_net.c b/net/sysctl_net.c +index ca84212..3aa338f 100644 +--- a/net/sysctl_net.c ++++ b/net/sysctl_net.c +@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ctl_table_root *root, struct ctl_table *table) { /* Allow network administrator to have same access as root. */ @@ -69711,10 +71140,11 @@ diff -urNp linux-2.6.38.7/net/sysctl_net.c linux-2.6.38.7/net/sysctl_net.c int mode = (table->mode >> 6) & 7; return (mode << 6) | (mode << 3) | mode; } -diff -urNp linux-2.6.38.7/net/unix/af_unix.c linux-2.6.38.7/net/unix/af_unix.c ---- linux-2.6.38.7/net/unix/af_unix.c 2011-05-10 22:06:29.000000000 -0400 -+++ linux-2.6.38.7/net/unix/af_unix.c 2011-05-10 22:09:03.000000000 -0400 -@@ -767,6 +767,12 @@ static struct sock *unix_find_other(stru +diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c +index 7a79ad0..5715351 100644 +--- a/net/unix/af_unix.c ++++ b/net/unix/af_unix.c +@@ -767,6 +767,12 @@ static struct sock *unix_find_other(struct net *net, err = -ECONNREFUSED; if (!S_ISSOCK(inode->i_mode)) goto put_fail; @@ -69727,7 +71157,7 @@ diff -urNp linux-2.6.38.7/net/unix/af_unix.c linux-2.6.38.7/net/unix/af_unix.c u = unix_find_socket_byinode(inode); if (!u) goto put_fail; -@@ -787,6 +793,13 @@ static struct sock *unix_find_other(stru +@@ -787,6 +793,13 @@ static struct sock *unix_find_other(struct net *net, if (u) { struct dentry *dentry; dentry = unix_sk(u)->dentry; @@ -69741,7 +71171,7 @@ diff -urNp linux-2.6.38.7/net/unix/af_unix.c linux-2.6.38.7/net/unix/af_unix.c if (dentry) touch_atime(unix_sk(u)->mnt, dentry); } else -@@ -872,11 +885,18 @@ static int unix_bind(struct socket *sock +@@ -872,11 +885,18 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) err = security_path_mknod(&nd.path, dentry, mode, 0); if (err) goto out_mknod_drop_write; @@ -69772,7 +71202,7 @@ diff -urNp linux-2.6.38.7/net/unix/af_unix.c linux-2.6.38.7/net/unix/af_unix.c list = &unix_socket_table[addr->hash]; } else { list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; -@@ -2249,7 +2274,11 @@ static int unix_seq_show(struct seq_file +@@ -2249,7 +2274,11 @@ static int unix_seq_show(struct seq_file *seq, void *v) unix_state_lock(s); seq_printf(seq, "%p: %08X %08X %08X %04X %02X %5lu", @@ -69784,10 +71214,11 @@ diff -urNp linux-2.6.38.7/net/unix/af_unix.c linux-2.6.38.7/net/unix/af_unix.c atomic_read(&s->sk_refcnt), 0, s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0, -diff -urNp linux-2.6.38.7/net/wireless/wext-core.c linux-2.6.38.7/net/wireless/wext-core.c ---- linux-2.6.38.7/net/wireless/wext-core.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/wireless/wext-core.c 2011-04-28 19:34:15.000000000 -0400 -@@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struc +diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c +index fdbc23c..212d53e 100644 +--- a/net/wireless/wext-core.c ++++ b/net/wireless/wext-core.c +@@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd, */ /* Support for very large requests */ @@ -69797,7 +71228,7 @@ diff -urNp linux-2.6.38.7/net/wireless/wext-core.c linux-2.6.38.7/net/wireless/w /* Allow userspace to GET more than max so * we can support any size GET requests. * There is still a limit : -ENOMEM. -@@ -784,22 +783,6 @@ static int ioctl_standard_iw_point(struc +@@ -784,22 +783,6 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd, } } @@ -69820,10 +71251,11 @@ diff -urNp linux-2.6.38.7/net/wireless/wext-core.c linux-2.6.38.7/net/wireless/w err = handler(dev, info, (union iwreq_data *) iwp, extra); iwp->length += essid_compat; -diff -urNp linux-2.6.38.7/net/xfrm/xfrm_policy.c linux-2.6.38.7/net/xfrm/xfrm_policy.c ---- linux-2.6.38.7/net/xfrm/xfrm_policy.c 2011-04-22 19:20:59.000000000 -0400 -+++ linux-2.6.38.7/net/xfrm/xfrm_policy.c 2011-04-28 19:57:25.000000000 -0400 -@@ -296,7 +296,7 @@ static void xfrm_policy_kill(struct xfrm +diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c +index 8da2741..5cb452e 100644 +--- a/net/xfrm/xfrm_policy.c ++++ b/net/xfrm/xfrm_policy.c +@@ -296,7 +296,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy) { policy->walk.dead = 1; @@ -69832,7 +71264,7 @@ diff -urNp linux-2.6.38.7/net/xfrm/xfrm_policy.c linux-2.6.38.7/net/xfrm/xfrm_po if (del_timer(&policy->timer)) xfrm_pol_put(policy); -@@ -575,7 +575,7 @@ int xfrm_policy_insert(int dir, struct x +@@ -575,7 +575,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl) hlist_add_head(&policy->bydst, chain); xfrm_pol_hold(policy); net->xfrm.policy_count[dir]++; @@ -69850,7 +71282,7 @@ diff -urNp linux-2.6.38.7/net/xfrm/xfrm_policy.c linux-2.6.38.7/net/xfrm/xfrm_po xfrm_dst_alloc_copy(void **target, void *src, int size) { if (!*target) { -@@ -1519,7 +1519,7 @@ xfrm_dst_alloc_copy(void **target, void +@@ -1519,7 +1519,7 @@ xfrm_dst_alloc_copy(void **target, void *src, int size) return 0; } @@ -69859,7 +71291,7 @@ diff -urNp linux-2.6.38.7/net/xfrm/xfrm_policy.c linux-2.6.38.7/net/xfrm/xfrm_po xfrm_dst_update_parent(struct dst_entry *dst, struct xfrm_selector *sel) { #ifdef CONFIG_XFRM_SUB_POLICY -@@ -1531,7 +1531,7 @@ xfrm_dst_update_parent(struct dst_entry +@@ -1531,7 +1531,7 @@ xfrm_dst_update_parent(struct dst_entry *dst, struct xfrm_selector *sel) #endif } @@ -69868,7 +71300,7 @@ diff -urNp linux-2.6.38.7/net/xfrm/xfrm_policy.c linux-2.6.38.7/net/xfrm/xfrm_po xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl) { #ifdef CONFIG_XFRM_SUB_POLICY -@@ -1625,7 +1625,7 @@ xfrm_resolve_and_create_bundle(struct xf +@@ -1625,7 +1625,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols, xdst->num_pols = num_pols; memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols); @@ -69877,7 +71309,7 @@ diff -urNp linux-2.6.38.7/net/xfrm/xfrm_policy.c linux-2.6.38.7/net/xfrm/xfrm_po return xdst; } -@@ -2319,7 +2319,7 @@ static int xfrm_bundle_ok(struct xfrm_po +@@ -2319,7 +2319,7 @@ static int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *first, if (xdst->xfrm_genid != dst->xfrm->genid) return 0; if (xdst->num_pols > 0 && @@ -69886,7 +71318,7 @@ diff -urNp linux-2.6.38.7/net/xfrm/xfrm_policy.c linux-2.6.38.7/net/xfrm/xfrm_po return 0; if (strict && fl && -@@ -2852,7 +2852,7 @@ static int xfrm_policy_migrate(struct xf +@@ -2852,7 +2852,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol, sizeof(pol->xfrm_vec[i].saddr)); pol->xfrm_vec[i].encap_family = mp->new_family; /* flush bundles */ @@ -69895,10 +71327,11 @@ diff -urNp linux-2.6.38.7/net/xfrm/xfrm_policy.c linux-2.6.38.7/net/xfrm/xfrm_po } } -diff -urNp linux-2.6.38.7/net/xfrm/xfrm_user.c linux-2.6.38.7/net/xfrm/xfrm_user.c ---- linux-2.6.38.7/net/xfrm/xfrm_user.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/net/xfrm/xfrm_user.c 2011-05-16 21:47:09.000000000 -0400 -@@ -1309,6 +1309,8 @@ static int copy_to_user_tmpl(struct xfrm +diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c +index 6129196..586deee 100644 +--- a/net/xfrm/xfrm_user.c ++++ b/net/xfrm/xfrm_user.c +@@ -1309,6 +1309,8 @@ static int copy_to_user_tmpl(struct xfrm_policy *xp, struct sk_buff *skb) struct xfrm_user_tmpl vec[XFRM_MAX_DEPTH]; int i; @@ -69907,7 +71340,7 @@ diff -urNp linux-2.6.38.7/net/xfrm/xfrm_user.c linux-2.6.38.7/net/xfrm/xfrm_user if (xp->xfrm_nr == 0) return 0; -@@ -1957,6 +1959,8 @@ static int xfrm_do_migrate(struct sk_buf +@@ -1957,6 +1959,8 @@ static int xfrm_do_migrate(struct sk_buff *skb, struct nlmsghdr *nlh, int err; int n = 0; @@ -69916,10 +71349,11 @@ diff -urNp linux-2.6.38.7/net/xfrm/xfrm_user.c linux-2.6.38.7/net/xfrm/xfrm_user if (attrs[XFRMA_MIGRATE] == NULL) return -EINVAL; -diff -urNp linux-2.6.38.7/scripts/basic/fixdep.c linux-2.6.38.7/scripts/basic/fixdep.c ---- linux-2.6.38.7/scripts/basic/fixdep.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/scripts/basic/fixdep.c 2011-04-28 19:34:15.000000000 -0400 -@@ -235,9 +235,9 @@ static void use_config(const char *m, in +diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c +index 291228e..8557cf6 100644 +--- a/scripts/basic/fixdep.c ++++ b/scripts/basic/fixdep.c +@@ -235,9 +235,9 @@ static void use_config(const char *m, int slen) static void parse_config_file(const char *map, size_t len) { @@ -69940,10 +71374,11 @@ diff -urNp linux-2.6.38.7/scripts/basic/fixdep.c linux-2.6.38.7/scripts/basic/fi if (*p != INT_CONF) { fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", -diff -urNp linux-2.6.38.7/scripts/mod/file2alias.c linux-2.6.38.7/scripts/mod/file2alias.c ---- linux-2.6.38.7/scripts/mod/file2alias.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/scripts/mod/file2alias.c 2011-04-28 19:34:15.000000000 -0400 -@@ -72,7 +72,7 @@ static void device_id_check(const char * +diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c +index 88f3f07..9089a1b 100644 +--- a/scripts/mod/file2alias.c ++++ b/scripts/mod/file2alias.c +@@ -72,7 +72,7 @@ static void device_id_check(const char *modname, const char *device_id, unsigned long size, unsigned long id_size, void *symval) { @@ -69952,7 +71387,7 @@ diff -urNp linux-2.6.38.7/scripts/mod/file2alias.c linux-2.6.38.7/scripts/mod/fi if (size % id_size || size < id_size) { if (cross_build != 0) -@@ -102,7 +102,7 @@ static void device_id_check(const char * +@@ -102,7 +102,7 @@ static void device_id_check(const char *modname, const char *device_id, /* USB is special because the bcdDevice can be matched against a numeric range */ /* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipN" */ static void do_usb_entry(struct usb_device_id *id, @@ -69961,7 +71396,7 @@ diff -urNp linux-2.6.38.7/scripts/mod/file2alias.c linux-2.6.38.7/scripts/mod/fi unsigned char range_lo, unsigned char range_hi, unsigned char max, struct module *mod) { -@@ -437,7 +437,7 @@ static void do_pnp_device_entry(void *sy +@@ -437,7 +437,7 @@ static void do_pnp_device_entry(void *symval, unsigned long size, for (i = 0; i < count; i++) { const char *id = (char *)devs[i].id; char acpi_id[sizeof(devs[0].id)]; @@ -69970,7 +71405,7 @@ diff -urNp linux-2.6.38.7/scripts/mod/file2alias.c linux-2.6.38.7/scripts/mod/fi buf_printf(&mod->dev_table_buf, "MODULE_ALIAS(\"pnp:d%s*\");\n", id); -@@ -467,7 +467,7 @@ static void do_pnp_card_entries(void *sy +@@ -467,7 +467,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size, for (j = 0; j < PNP_MAX_DEVICES; j++) { const char *id = (char *)card->devs[j].id; @@ -69979,7 +71414,7 @@ diff -urNp linux-2.6.38.7/scripts/mod/file2alias.c linux-2.6.38.7/scripts/mod/fi int dup = 0; if (!id[0]) -@@ -493,7 +493,7 @@ static void do_pnp_card_entries(void *sy +@@ -493,7 +493,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size, /* add an individual alias for every device entry */ if (!dup) { char acpi_id[sizeof(card->devs[0].id)]; @@ -69988,7 +71423,7 @@ diff -urNp linux-2.6.38.7/scripts/mod/file2alias.c linux-2.6.38.7/scripts/mod/fi buf_printf(&mod->dev_table_buf, "MODULE_ALIAS(\"pnp:d%s*\");\n", id); -@@ -768,7 +768,7 @@ static void dmi_ascii_filter(char *d, co +@@ -768,7 +768,7 @@ static void dmi_ascii_filter(char *d, const char *s) static int do_dmi_entry(const char *filename, struct dmi_system_id *id, char *alias) { @@ -69997,9 +71432,10 @@ diff -urNp linux-2.6.38.7/scripts/mod/file2alias.c linux-2.6.38.7/scripts/mod/fi sprintf(alias, "dmi*"); -diff -urNp linux-2.6.38.7/scripts/mod/modpost.c linux-2.6.38.7/scripts/mod/modpost.c ---- linux-2.6.38.7/scripts/mod/modpost.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/scripts/mod/modpost.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c +index e8fba95..0accc17 100644 +--- a/scripts/mod/modpost.c ++++ b/scripts/mod/modpost.c @@ -896,6 +896,7 @@ enum mismatch { ANY_INIT_TO_ANY_EXIT, ANY_EXIT_TO_ANY_INIT, @@ -70008,7 +71444,7 @@ diff -urNp linux-2.6.38.7/scripts/mod/modpost.c linux-2.6.38.7/scripts/mod/modpo }; struct sectioncheck { -@@ -1004,6 +1005,12 @@ const struct sectioncheck sectioncheck[] +@@ -1004,6 +1005,12 @@ const struct sectioncheck sectioncheck[] = { .tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL }, .mismatch = EXPORT_TO_INIT_EXIT, .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL }, @@ -70021,7 +71457,7 @@ diff -urNp linux-2.6.38.7/scripts/mod/modpost.c linux-2.6.38.7/scripts/mod/modpo } }; -@@ -1126,10 +1133,10 @@ static Elf_Sym *find_elf_symbol(struct e +@@ -1126,10 +1133,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr, continue; if (ELF_ST_TYPE(sym->st_info) == STT_SECTION) continue; @@ -70034,7 +71470,7 @@ diff -urNp linux-2.6.38.7/scripts/mod/modpost.c linux-2.6.38.7/scripts/mod/modpo if (d < 0) d = addr - sym->st_value; if (d < distance) { -@@ -1401,6 +1408,14 @@ static void report_sec_mismatch(const ch +@@ -1401,6 +1408,14 @@ static void report_sec_mismatch(const char *modname, tosym, prl_to, prl_to, tosym); free(prl_to); break; @@ -70049,7 +71485,7 @@ diff -urNp linux-2.6.38.7/scripts/mod/modpost.c linux-2.6.38.7/scripts/mod/modpo } fprintf(stderr, "\n"); } -@@ -1724,7 +1739,7 @@ void __attribute__((format(printf, 2, 3) +@@ -1724,7 +1739,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf, va_end(ap); } @@ -70058,7 +71494,7 @@ diff -urNp linux-2.6.38.7/scripts/mod/modpost.c linux-2.6.38.7/scripts/mod/modpo { if (buf->size - buf->pos < len) { buf->size += len + SZ; -@@ -1936,7 +1951,7 @@ static void write_if_changed(struct buff +@@ -1936,7 +1951,7 @@ static void write_if_changed(struct buffer *b, const char *fname) if (fstat(fileno(file), &st) < 0) goto close_write; @@ -70067,10 +71503,11 @@ diff -urNp linux-2.6.38.7/scripts/mod/modpost.c linux-2.6.38.7/scripts/mod/modpo goto close_write; tmp = NOFAIL(malloc(b->pos)); -diff -urNp linux-2.6.38.7/scripts/mod/modpost.h linux-2.6.38.7/scripts/mod/modpost.h ---- linux-2.6.38.7/scripts/mod/modpost.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/scripts/mod/modpost.h 2011-04-28 19:34:15.000000000 -0400 -@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e +diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h +index 0388cfc..68ca013 100644 +--- a/scripts/mod/modpost.h ++++ b/scripts/mod/modpost.h +@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *expr); struct buffer { char *p; @@ -70089,10 +71526,11 @@ diff -urNp linux-2.6.38.7/scripts/mod/modpost.h linux-2.6.38.7/scripts/mod/modpo struct module { struct module *next; -diff -urNp linux-2.6.38.7/scripts/mod/sumversion.c linux-2.6.38.7/scripts/mod/sumversion.c ---- linux-2.6.38.7/scripts/mod/sumversion.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/scripts/mod/sumversion.c 2011-04-28 19:34:15.000000000 -0400 -@@ -470,7 +470,7 @@ static void write_version(const char *fi +diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c +index 9dfcd6d..099068e 100644 +--- a/scripts/mod/sumversion.c ++++ b/scripts/mod/sumversion.c +@@ -470,7 +470,7 @@ static void write_version(const char *filename, const char *sum, goto out; } @@ -70101,9 +71539,10 @@ diff -urNp linux-2.6.38.7/scripts/mod/sumversion.c linux-2.6.38.7/scripts/mod/su warn("writing sum in %s failed: %s\n", filename, strerror(errno)); goto out; -diff -urNp linux-2.6.38.7/scripts/pnmtologo.c linux-2.6.38.7/scripts/pnmtologo.c ---- linux-2.6.38.7/scripts/pnmtologo.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/scripts/pnmtologo.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c +index 5c11312..72742b5 100644 +--- a/scripts/pnmtologo.c ++++ b/scripts/pnmtologo.c @@ -237,14 +237,14 @@ static void write_header(void) fprintf(out, " * Linux logo %s\n", logoname); fputs(" */\n\n", out); @@ -70130,111 +71569,10 @@ diff -urNp linux-2.6.38.7/scripts/pnmtologo.c linux-2.6.38.7/scripts/pnmtologo.c logoname); write_hex_cnt = 0; for (i = 0; i < logo_clutsize; i++) { -diff -urNp linux-2.6.38.7/security/apparmor/lsm.c linux-2.6.38.7/security/apparmor/lsm.c ---- linux-2.6.38.7/security/apparmor/lsm.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/security/apparmor/lsm.c 2011-04-28 19:34:15.000000000 -0400 -@@ -619,7 +619,7 @@ static int apparmor_task_setrlimit(struc - return error; - } - --static struct security_operations apparmor_ops = { -+static struct security_operations apparmor_ops __read_only = { - .name = "apparmor", - - .ptrace_access_check = apparmor_ptrace_access_check, -diff -urNp linux-2.6.38.7/security/commoncap.c linux-2.6.38.7/security/commoncap.c ---- linux-2.6.38.7/security/commoncap.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/security/commoncap.c 2011-04-28 19:34:15.000000000 -0400 -@@ -27,6 +27,7 @@ - #include <linux/sched.h> - #include <linux/prctl.h> - #include <linux/securebits.h> -+#include <net/sock.h> - - /* - * If a non-root user executes a setuid-root binary in -@@ -50,9 +51,11 @@ static void warn_setuid_and_fcaps_mixed( - } - } - -+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; - } - -@@ -534,6 +537,9 @@ int cap_bprm_secureexec(struct linux_bin - { - const struct cred *cred = current_cred(); - -+ if (gr_acl_enable_at_secure()) -+ return 1; -+ - if (cred->uid != 0) { - if (bprm->cap_effective) - return 1; -diff -urNp linux-2.6.38.7/security/integrity/ima/ima_api.c linux-2.6.38.7/security/integrity/ima/ima_api.c ---- linux-2.6.38.7/security/integrity/ima/ima_api.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/security/integrity/ima/ima_api.c 2011-04-28 19:34:15.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.38.7/security/integrity/ima/ima_fs.c linux-2.6.38.7/security/integrity/ima/ima_fs.c ---- linux-2.6.38.7/security/integrity/ima/ima_fs.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/security/integrity/ima/ima_fs.c 2011-04-28 19:34:15.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.38.7/security/integrity/ima/ima.h linux-2.6.38.7/security/integrity/ima/ima.h ---- linux-2.6.38.7/security/integrity/ima/ima.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/security/integrity/ima/ima.h 2011-04-28 19:34:15.000000000 -0400 -@@ -85,8 +85,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.38.7/security/integrity/ima/ima_queue.c linux-2.6.38.7/security/integrity/ima/ima_queue.c ---- linux-2.6.38.7/security/integrity/ima/ima_queue.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/security/integrity/ima/ima_queue.c 2011-04-28 19:34:15.000000000 -0400 -@@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct i - INIT_LIST_HEAD(&qe->later); - list_add_tail_rcu(&qe->later, &ima_measurements); - -- 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.38.7/security/Kconfig linux-2.6.38.7/security/Kconfig ---- linux-2.6.38.7/security/Kconfig 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/security/Kconfig 2011-04-30 19:58:48.000000000 -0400 +diff --git a/security/Kconfig b/security/Kconfig +index 95accd4..c9d4b56 100644 +--- a/security/Kconfig ++++ b/security/Kconfig @@ -4,6 +4,548 @@ menu "Security options" @@ -70793,10 +72131,119 @@ diff -urNp linux-2.6.38.7/security/Kconfig linux-2.6.38.7/security/Kconfig help This is the portion of low virtual memory which should be protected from userspace allocation. Keeping a user from writing to low pages -diff -urNp linux-2.6.38.7/security/keys/keyring.c linux-2.6.38.7/security/keys/keyring.c ---- linux-2.6.38.7/security/keys/keyring.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/security/keys/keyring.c 2011-04-28 19:34:15.000000000 -0400 -@@ -213,15 +213,15 @@ static long keyring_read(const struct ke +diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c +index e2e902f..03f2b69 100644 +--- a/security/apparmor/lsm.c ++++ b/security/apparmor/lsm.c +@@ -620,7 +620,7 @@ static int apparmor_task_setrlimit(struct task_struct *task, + return error; + } + +-static struct security_operations apparmor_ops = { ++static struct security_operations apparmor_ops __read_only = { + .name = "apparmor", + + .ptrace_access_check = apparmor_ptrace_access_check, +diff --git a/security/commoncap.c b/security/commoncap.c +index 64c2ed9..bfd68b4 100644 +--- a/security/commoncap.c ++++ b/security/commoncap.c +@@ -27,6 +27,7 @@ + #include <linux/sched.h> + #include <linux/prctl.h> + #include <linux/securebits.h> ++#include <net/sock.h> + + /* + * If a non-root user executes a setuid-root binary in +@@ -50,9 +51,11 @@ static void warn_setuid_and_fcaps_mixed(const char *fname) + } + } + ++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; + } + +@@ -534,6 +537,9 @@ int cap_bprm_secureexec(struct linux_binprm *bprm) + { + const struct cred *cred = current_cred(); + ++ if (gr_acl_enable_at_secure()) ++ return 1; ++ + if (cred->uid != 0) { + if (bprm->cap_effective) + return 1; +diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h +index ac79032..fb00506 100644 +--- a/security/integrity/ima/ima.h ++++ b/security/integrity/ima/ima.h +@@ -85,8 +85,8 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename, + 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 --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c +index d3963de..5eafb77 100644 +--- a/security/integrity/ima/ima_api.c ++++ b/security/integrity/ima/ima_api.c +@@ -75,7 +75,7 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename, + 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 --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c +index ef21b96..d53e674 100644 +--- a/security/integrity/ima/ima_fs.c ++++ b/security/integrity/ima/ima_fs.c +@@ -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 --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c +index 8e28f04..d5951b1 100644 +--- a/security/integrity/ima/ima_queue.c ++++ b/security/integrity/ima/ima_queue.c +@@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct ima_template_entry *entry) + 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 --git a/security/keys/keyring.c b/security/keys/keyring.c +index 5620f08..329e634 100644 +--- a/security/keys/keyring.c ++++ b/security/keys/keyring.c +@@ -213,15 +213,15 @@ static long keyring_read(const struct key *keyring, ret = -EFAULT; for (loop = 0; loop < klist->nkeys; loop++) { @@ -70815,10 +72262,11 @@ diff -urNp linux-2.6.38.7/security/keys/keyring.c linux-2.6.38.7/security/keys/k goto error; buflen -= tmp; -diff -urNp linux-2.6.38.7/security/min_addr.c linux-2.6.38.7/security/min_addr.c ---- linux-2.6.38.7/security/min_addr.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/security/min_addr.c 2011-04-28 19:34:15.000000000 -0400 -@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG +diff --git a/security/min_addr.c b/security/min_addr.c +index f728728..6457a0c 100644 +--- a/security/min_addr.c ++++ b/security/min_addr.c +@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR; */ static void update_mmap_min_addr(void) { @@ -70834,10 +72282,11 @@ diff -urNp linux-2.6.38.7/security/min_addr.c linux-2.6.38.7/security/min_addr.c } /* -diff -urNp linux-2.6.38.7/security/security.c linux-2.6.38.7/security/security.c ---- linux-2.6.38.7/security/security.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/security/security.c 2011-04-28 19:34:15.000000000 -0400 -@@ -25,8 +25,8 @@ static __initdata char chosen_lsm[SECURI +diff --git a/security/security.c b/security/security.c +index 7b7308a..541c5a8 100644 +--- a/security/security.c ++++ b/security/security.c +@@ -25,8 +25,8 @@ static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] = /* things that live in capability.c */ extern void __init security_fixup_ops(struct security_operations *ops); @@ -70858,9 +72307,10 @@ diff -urNp linux-2.6.38.7/security/security.c linux-2.6.38.7/security/security.c } /* Save user chosen LSM */ -diff -urNp linux-2.6.38.7/security/selinux/hooks.c linux-2.6.38.7/security/selinux/hooks.c ---- linux-2.6.38.7/security/selinux/hooks.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/security/selinux/hooks.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c +index c8d6992..9737f71 100644 +--- a/security/selinux/hooks.c ++++ b/security/selinux/hooks.c @@ -90,7 +90,6 @@ #define NUM_SEL_MNT_OPTS 5 @@ -70869,7 +72319,7 @@ diff -urNp linux-2.6.38.7/security/selinux/hooks.c linux-2.6.38.7/security/selin /* SECMARK reference count */ atomic_t selinux_secmark_refcount = ATOMIC_INIT(0); -@@ -5395,7 +5394,7 @@ static int selinux_key_getsecurity(struc +@@ -5395,7 +5394,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer) #endif @@ -70878,10 +72328,11 @@ diff -urNp linux-2.6.38.7/security/selinux/hooks.c linux-2.6.38.7/security/selin .name = "selinux", .ptrace_access_check = selinux_ptrace_access_check, -diff -urNp linux-2.6.38.7/security/selinux/include/xfrm.h linux-2.6.38.7/security/selinux/include/xfrm.h ---- linux-2.6.38.7/security/selinux/include/xfrm.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/security/selinux/include/xfrm.h 2011-05-18 20:23:44.000000000 -0400 -@@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct s +diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h +index 13128f9..c23c736 100644 +--- a/security/selinux/include/xfrm.h ++++ b/security/selinux/include/xfrm.h +@@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, int ckall); static inline void selinux_xfrm_notify_policyload(void) { @@ -70890,10 +72341,11 @@ diff -urNp linux-2.6.38.7/security/selinux/include/xfrm.h linux-2.6.38.7/securit } #else static inline int selinux_xfrm_enabled(void) -diff -urNp linux-2.6.38.7/security/selinux/ss/services.c linux-2.6.38.7/security/selinux/ss/services.c ---- linux-2.6.38.7/security/selinux/ss/services.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/security/selinux/ss/services.c 2011-05-16 21:47:09.000000000 -0400 -@@ -1769,6 +1769,8 @@ int security_load_policy(void *data, siz +diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c +index a03cfaf..9105fd6 100644 +--- a/security/selinux/ss/services.c ++++ b/security/selinux/ss/services.c +@@ -1769,6 +1769,8 @@ int security_load_policy(void *data, size_t len) int rc = 0; struct policy_file file = { data, len }, *fp = &file; @@ -70902,10 +72354,11 @@ diff -urNp linux-2.6.38.7/security/selinux/ss/services.c linux-2.6.38.7/security if (!ss_initialized) { avtab_cache_init(); rc = policydb_read(&policydb, fp); -diff -urNp linux-2.6.38.7/security/smack/smack_lsm.c linux-2.6.38.7/security/smack/smack_lsm.c ---- linux-2.6.38.7/security/smack/smack_lsm.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/security/smack/smack_lsm.c 2011-04-28 19:34:15.000000000 -0400 -@@ -3179,7 +3179,7 @@ static int smack_inode_getsecctx(struct +diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c +index 533bf32..bc19c16 100644 +--- a/security/smack/smack_lsm.c ++++ b/security/smack/smack_lsm.c +@@ -3179,7 +3179,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen) return 0; } @@ -70914,10 +72367,11 @@ diff -urNp linux-2.6.38.7/security/smack/smack_lsm.c linux-2.6.38.7/security/sma .name = "smack", .ptrace_access_check = smack_ptrace_access_check, -diff -urNp linux-2.6.38.7/security/tomoyo/tomoyo.c linux-2.6.38.7/security/tomoyo/tomoyo.c ---- linux-2.6.38.7/security/tomoyo/tomoyo.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/security/tomoyo/tomoyo.c 2011-04-28 19:34:15.000000000 -0400 -@@ -240,7 +240,7 @@ static int tomoyo_sb_pivotroot(struct pa +diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c +index 95d3f95..1786602 100644 +--- a/security/tomoyo/tomoyo.c ++++ b/security/tomoyo/tomoyo.c +@@ -240,7 +240,7 @@ static int tomoyo_sb_pivotroot(struct path *old_path, struct path *new_path) * tomoyo_security_ops is a "struct security_operations" which is used for * registering TOMOYO. */ @@ -70926,9 +72380,10 @@ diff -urNp linux-2.6.38.7/security/tomoyo/tomoyo.c linux-2.6.38.7/security/tomoy .name = "tomoyo", .cred_alloc_blank = tomoyo_cred_alloc_blank, .cred_prepare = tomoyo_cred_prepare, -diff -urNp linux-2.6.38.7/sound/aoa/codecs/onyx.c linux-2.6.38.7/sound/aoa/codecs/onyx.c ---- linux-2.6.38.7/sound/aoa/codecs/onyx.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/sound/aoa/codecs/onyx.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c +index 3687a6c..652565e 100644 +--- a/sound/aoa/codecs/onyx.c ++++ b/sound/aoa/codecs/onyx.c @@ -54,7 +54,7 @@ struct onyx { spdif_locked:1, analog_locked:1, @@ -70938,7 +72393,7 @@ diff -urNp linux-2.6.38.7/sound/aoa/codecs/onyx.c linux-2.6.38.7/sound/aoa/codec struct codec_info *codec_info; /* mutex serializes concurrent access to the device -@@ -753,7 +753,7 @@ static int onyx_open(struct codec_info_i +@@ -753,7 +753,7 @@ static int onyx_open(struct codec_info_item *cii, struct onyx *onyx = cii->codec_data; mutex_lock(&onyx->mutex); @@ -70947,7 +72402,7 @@ diff -urNp linux-2.6.38.7/sound/aoa/codecs/onyx.c linux-2.6.38.7/sound/aoa/codec mutex_unlock(&onyx->mutex); return 0; -@@ -765,8 +765,7 @@ static int onyx_close(struct codec_info_ +@@ -765,8 +765,7 @@ static int onyx_close(struct codec_info_item *cii, struct onyx *onyx = cii->codec_data; mutex_lock(&onyx->mutex); @@ -70957,9 +72412,10 @@ diff -urNp linux-2.6.38.7/sound/aoa/codecs/onyx.c linux-2.6.38.7/sound/aoa/codec onyx->spdif_locked = onyx->analog_locked = 0; mutex_unlock(&onyx->mutex); -diff -urNp linux-2.6.38.7/sound/aoa/codecs/onyx.h linux-2.6.38.7/sound/aoa/codecs/onyx.h ---- linux-2.6.38.7/sound/aoa/codecs/onyx.h 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/sound/aoa/codecs/onyx.h 2011-04-28 19:34:15.000000000 -0400 +diff --git a/sound/aoa/codecs/onyx.h b/sound/aoa/codecs/onyx.h +index ffd2025..df062c9 100644 +--- a/sound/aoa/codecs/onyx.h ++++ b/sound/aoa/codecs/onyx.h @@ -11,6 +11,7 @@ #include <linux/i2c.h> #include <asm/pmac_low_i2c.h> @@ -70968,9 +72424,10 @@ diff -urNp linux-2.6.38.7/sound/aoa/codecs/onyx.h linux-2.6.38.7/sound/aoa/codec /* PCM3052 register definitions */ -diff -urNp linux-2.6.38.7/sound/drivers/mts64.c linux-2.6.38.7/sound/drivers/mts64.c ---- linux-2.6.38.7/sound/drivers/mts64.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/sound/drivers/mts64.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c +index 8539ab0..be8a121 100644 +--- a/sound/drivers/mts64.c ++++ b/sound/drivers/mts64.c @@ -28,6 +28,7 @@ #include <sound/initval.h> #include <sound/rawmidi.h> @@ -70988,7 +72445,7 @@ diff -urNp linux-2.6.38.7/sound/drivers/mts64.c linux-2.6.38.7/sound/drivers/mts int current_midi_output_port; int current_midi_input_port; u8 mode[MTS64_NUM_INPUT_PORTS]; -@@ -696,7 +697,7 @@ static int snd_mts64_rawmidi_open(struct +@@ -696,7 +697,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream) { struct mts64 *mts = substream->rmidi->private_data; @@ -70997,7 +72454,7 @@ diff -urNp linux-2.6.38.7/sound/drivers/mts64.c linux-2.6.38.7/sound/drivers/mts /* We don't need a spinlock here, because this is just called if the device has not been opened before. So there aren't any IRQs from the device */ -@@ -704,7 +705,7 @@ static int snd_mts64_rawmidi_open(struct +@@ -704,7 +705,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream) msleep(50); } @@ -71006,7 +72463,7 @@ diff -urNp linux-2.6.38.7/sound/drivers/mts64.c linux-2.6.38.7/sound/drivers/mts return 0; } -@@ -714,8 +715,7 @@ static int snd_mts64_rawmidi_close(struc +@@ -714,8 +715,7 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream) struct mts64 *mts = substream->rmidi->private_data; unsigned long flags; @@ -71016,7 +72473,7 @@ diff -urNp linux-2.6.38.7/sound/drivers/mts64.c linux-2.6.38.7/sound/drivers/mts /* We need the spinlock_irqsave here because we can still have IRQs at this point */ spin_lock_irqsave(&mts->lock, flags); -@@ -724,8 +724,8 @@ static int snd_mts64_rawmidi_close(struc +@@ -724,8 +724,8 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream) msleep(500); @@ -71027,9 +72484,10 @@ diff -urNp linux-2.6.38.7/sound/drivers/mts64.c linux-2.6.38.7/sound/drivers/mts return 0; } -diff -urNp linux-2.6.38.7/sound/drivers/portman2x4.c linux-2.6.38.7/sound/drivers/portman2x4.c ---- linux-2.6.38.7/sound/drivers/portman2x4.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/sound/drivers/portman2x4.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c +index f2b0ba2..429efc5 100644 +--- a/sound/drivers/portman2x4.c ++++ b/sound/drivers/portman2x4.c @@ -47,6 +47,7 @@ #include <sound/initval.h> #include <sound/rawmidi.h> @@ -71047,9 +72505,10 @@ diff -urNp linux-2.6.38.7/sound/drivers/portman2x4.c linux-2.6.38.7/sound/driver int mode[PORTMAN_NUM_INPUT_PORTS]; struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; }; -diff -urNp linux-2.6.38.7/sound/oss/sb_audio.c linux-2.6.38.7/sound/oss/sb_audio.c ---- linux-2.6.38.7/sound/oss/sb_audio.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/sound/oss/sb_audio.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c +index 733b014..56ce96f 100644 +--- a/sound/oss/sb_audio.c ++++ b/sound/oss/sb_audio.c @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, buf16 = (signed short *)(localbuf + localoffs); while (c) @@ -71059,9 +72518,10 @@ diff -urNp linux-2.6.38.7/sound/oss/sb_audio.c linux-2.6.38.7/sound/oss/sb_audio if (copy_from_user(lbuf8, userbuf+useroffs + p, locallen)) -diff -urNp linux-2.6.38.7/sound/oss/swarm_cs4297a.c linux-2.6.38.7/sound/oss/swarm_cs4297a.c ---- linux-2.6.38.7/sound/oss/swarm_cs4297a.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/sound/oss/swarm_cs4297a.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c +index 44357d8..370f0c5 100644 +--- a/sound/oss/swarm_cs4297a.c ++++ b/sound/oss/swarm_cs4297a.c @@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void) { struct cs4297a_state *s; @@ -71096,9 +72556,10 @@ diff -urNp linux-2.6.38.7/sound/oss/swarm_cs4297a.c linux-2.6.38.7/sound/oss/swa list_add(&s->list, &cs4297a_devs); -diff -urNp linux-2.6.38.7/sound/pci/intel8x0m.c linux-2.6.38.7/sound/pci/intel8x0m.c ---- linux-2.6.38.7/sound/pci/intel8x0m.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/sound/pci/intel8x0m.c 2011-04-28 19:34:15.000000000 -0400 +diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c +index 13cec1e..2bfae48 100644 +--- a/sound/pci/intel8x0m.c ++++ b/sound/pci/intel8x0m.c @@ -1264,7 +1264,7 @@ static struct shortname_table { { 0x5455, "ALi M5455" }, { 0x746d, "AMD AMD8111" }, @@ -71108,10 +72569,11 @@ diff -urNp linux-2.6.38.7/sound/pci/intel8x0m.c linux-2.6.38.7/sound/pci/intel8x }; static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, -diff -urNp linux-2.6.38.7/sound/pci/ymfpci/ymfpci_main.c linux-2.6.38.7/sound/pci/ymfpci/ymfpci_main.c ---- linux-2.6.38.7/sound/pci/ymfpci/ymfpci_main.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/sound/pci/ymfpci/ymfpci_main.c 2011-04-28 19:57:25.000000000 -0400 -@@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct sn +diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c +index c94c051..be0abd1 100644 +--- a/sound/pci/ymfpci/ymfpci_main.c ++++ b/sound/pci/ymfpci/ymfpci_main.c +@@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct snd_ymfpci *chip) if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0) break; } @@ -71122,7 +72584,7 @@ diff -urNp linux-2.6.38.7/sound/pci/ymfpci/ymfpci_main.c linux-2.6.38.7/sound/pc wake_up(&chip->interrupt_sleep); } __end: -@@ -787,7 +787,7 @@ static void snd_ymfpci_irq_wait(struct s +@@ -787,7 +787,7 @@ static void snd_ymfpci_irq_wait(struct snd_ymfpci *chip) continue; init_waitqueue_entry(&wait, current); add_wait_queue(&chip->interrupt_sleep, &wait); @@ -71131,7 +72593,7 @@ diff -urNp linux-2.6.38.7/sound/pci/ymfpci/ymfpci_main.c linux-2.6.38.7/sound/pc schedule_timeout_uninterruptible(msecs_to_jiffies(50)); remove_wait_queue(&chip->interrupt_sleep, &wait); } -@@ -825,8 +825,8 @@ static irqreturn_t snd_ymfpci_interrupt( +@@ -825,8 +825,8 @@ static irqreturn_t snd_ymfpci_interrupt(int irq, void *dev_id) snd_ymfpci_writel(chip, YDSXGR_MODE, mode); spin_unlock(&chip->reg_lock); @@ -71142,7 +72604,7 @@ diff -urNp linux-2.6.38.7/sound/pci/ymfpci/ymfpci_main.c linux-2.6.38.7/sound/pc wake_up(&chip->interrupt_sleep); } } -@@ -2363,7 +2363,7 @@ int __devinit snd_ymfpci_create(struct s +@@ -2363,7 +2363,7 @@ int __devinit snd_ymfpci_create(struct snd_card *card, spin_lock_init(&chip->reg_lock); spin_lock_init(&chip->voice_lock); init_waitqueue_head(&chip->interrupt_sleep); @@ -71151,10 +72613,11 @@ diff -urNp linux-2.6.38.7/sound/pci/ymfpci/ymfpci_main.c linux-2.6.38.7/sound/pc chip->card = card; chip->pci = pci; chip->irq = -1; -diff -urNp linux-2.6.38.7/usr/gen_init_cpio.c linux-2.6.38.7/usr/gen_init_cpio.c ---- linux-2.6.38.7/usr/gen_init_cpio.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/usr/gen_init_cpio.c 2011-04-28 19:34:15.000000000 -0400 -@@ -305,7 +305,7 @@ static int cpio_mkfile(const char *name, +diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c +index 7f06884..0b6f3ed 100644 +--- a/usr/gen_init_cpio.c ++++ b/usr/gen_init_cpio.c +@@ -305,7 +305,7 @@ static int cpio_mkfile(const char *name, const char *location, int retval; int rc = -1; int namesize; @@ -71163,7 +72626,7 @@ diff -urNp linux-2.6.38.7/usr/gen_init_cpio.c linux-2.6.38.7/usr/gen_init_cpio.c mode |= S_IFREG; -@@ -394,9 +394,10 @@ static char *cpio_replace_env(char *new_ +@@ -394,9 +394,10 @@ static char *cpio_replace_env(char *new_location) *env_var = *expanded = '\0'; strncat(env_var, start + 2, end - start - 2); strncat(expanded, new_location, start - new_location); @@ -71176,9 +72639,10 @@ diff -urNp linux-2.6.38.7/usr/gen_init_cpio.c linux-2.6.38.7/usr/gen_init_cpio.c } else break; } -diff -urNp linux-2.6.38.7/virt/kvm/kvm_main.c linux-2.6.38.7/virt/kvm/kvm_main.c ---- linux-2.6.38.7/virt/kvm/kvm_main.c 2011-03-14 21:20:32.000000000 -0400 -+++ linux-2.6.38.7/virt/kvm/kvm_main.c 2011-04-28 19:57:25.000000000 -0400 +diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c +index f29abeb..7c69874 100644 +--- a/virt/kvm/kvm_main.c ++++ b/virt/kvm/kvm_main.c @@ -74,7 +74,7 @@ LIST_HEAD(vm_list); static cpumask_var_t cpus_hardware_enabled; @@ -71188,7 +72652,7 @@ diff -urNp linux-2.6.38.7/virt/kvm/kvm_main.c linux-2.6.38.7/virt/kvm/kvm_main.c struct kmem_cache *kvm_vcpu_cache; EXPORT_SYMBOL_GPL(kvm_vcpu_cache); -@@ -1521,7 +1521,7 @@ static int kvm_vcpu_release(struct inode +@@ -1521,7 +1521,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp) return 0; } @@ -71197,7 +72661,7 @@ diff -urNp linux-2.6.38.7/virt/kvm/kvm_main.c linux-2.6.38.7/virt/kvm/kvm_main.c .release = kvm_vcpu_release, .unlocked_ioctl = kvm_vcpu_ioctl, .compat_ioctl = kvm_vcpu_ioctl, -@@ -1990,7 +1990,7 @@ static int kvm_vm_mmap(struct file *file +@@ -1990,7 +1990,7 @@ static int kvm_vm_mmap(struct file *file, struct vm_area_struct *vma) return 0; } @@ -71215,7 +72679,7 @@ diff -urNp linux-2.6.38.7/virt/kvm/kvm_main.c linux-2.6.38.7/virt/kvm/kvm_main.c .unlocked_ioctl = kvm_dev_ioctl, .compat_ioctl = kvm_dev_ioctl, .llseek = noop_llseek, -@@ -2114,7 +2114,7 @@ static void hardware_enable_nolock(void +@@ -2114,7 +2114,7 @@ static void hardware_enable_nolock(void *junk) if (r) { cpumask_clear_cpu(cpu, cpus_hardware_enabled); @@ -71237,7 +72701,7 @@ diff -urNp linux-2.6.38.7/virt/kvm/kvm_main.c linux-2.6.38.7/virt/kvm/kvm_main.c hardware_disable_all_nolock(); r = -EBUSY; } -@@ -2443,7 +2443,7 @@ static void kvm_sched_out(struct preempt +@@ -2443,7 +2443,7 @@ static void kvm_sched_out(struct preempt_notifier *pn, kvm_arch_vcpu_put(vcpu); } @@ -71246,7 +72710,7 @@ diff -urNp linux-2.6.38.7/virt/kvm/kvm_main.c linux-2.6.38.7/virt/kvm/kvm_main.c struct module *module) { int r; -@@ -2514,7 +2514,7 @@ int kvm_init(void *opaque, unsigned vcpu +@@ -2514,7 +2514,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, if (!vcpu_align) vcpu_align = __alignof__(struct kvm_vcpu); kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align, |