-diff -urNp linux-3.1.1/arch/alpha/include/asm/elf.h linux-3.1.1/arch/alpha/include/asm/elf.h
---- linux-3.1.1/arch/alpha/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/alpha/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/alpha/include/asm/elf.h linux-3.1.3/arch/alpha/include/asm/elf.h
+--- linux-3.1.3/arch/alpha/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/alpha/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
@@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
/* $0 is set by ld.so to a pointer to a function which might be
registered using atexit. This provides a mean for the dynamic
linker to call DT_FINI functions for shared libraries that have
-diff -urNp linux-3.1.1/arch/alpha/include/asm/pgtable.h linux-3.1.1/arch/alpha/include/asm/pgtable.h
---- linux-3.1.1/arch/alpha/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/alpha/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/alpha/include/asm/pgtable.h linux-3.1.3/arch/alpha/include/asm/pgtable.h
+--- linux-3.1.3/arch/alpha/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/alpha/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
@@ -101,6 +101,17 @@ struct vm_area_struct;
#define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
#define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
#define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
#define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff -urNp linux-3.1.1/arch/alpha/kernel/module.c linux-3.1.1/arch/alpha/kernel/module.c
---- linux-3.1.1/arch/alpha/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/alpha/kernel/module.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/alpha/kernel/module.c linux-3.1.3/arch/alpha/kernel/module.c
+--- linux-3.1.3/arch/alpha/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/alpha/kernel/module.c 2011-11-16 18:39:07.000000000 -0500
@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
/* The small sections were sorted to the end of the segment.
got = sechdrs[me->arch.gotsecindex].sh_addr;
for (i = 0; i < n; i++) {
-diff -urNp linux-3.1.1/arch/alpha/kernel/osf_sys.c linux-3.1.1/arch/alpha/kernel/osf_sys.c
---- linux-3.1.1/arch/alpha/kernel/osf_sys.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/alpha/kernel/osf_sys.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/alpha/kernel/osf_sys.c linux-3.1.3/arch/alpha/kernel/osf_sys.c
+--- linux-3.1.3/arch/alpha/kernel/osf_sys.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/alpha/kernel/osf_sys.c 2011-11-16 18:39:07.000000000 -0500
@@ -1147,7 +1147,7 @@ arch_get_unmapped_area_1(unsigned long a
/* At this point: (!vma || addr < vma->vm_end). */
if (limit - len < addr)
if (addr != (unsigned long) -ENOMEM)
return addr;
-diff -urNp linux-3.1.1/arch/alpha/mm/fault.c linux-3.1.1/arch/alpha/mm/fault.c
---- linux-3.1.1/arch/alpha/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/alpha/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/alpha/mm/fault.c linux-3.1.3/arch/alpha/mm/fault.c
+--- linux-3.1.3/arch/alpha/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/alpha/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
__reload_thread(pcb);
}
} else if (!cause) {
/* Allow reads even for write-only mappings */
if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-3.1.1/arch/arm/include/asm/elf.h linux-3.1.1/arch/arm/include/asm/elf.h
---- linux-3.1.1/arch/arm/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/arm/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/arm/include/asm/elf.h linux-3.1.3/arch/arm/include/asm/elf.h
+--- linux-3.1.3/arch/arm/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/arm/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
@@ -116,7 +116,14 @@ int dump_task_regs(struct task_struct *t
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
extern int vectors_user_mapping(void);
#define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES
-diff -urNp linux-3.1.1/arch/arm/include/asm/kmap_types.h linux-3.1.1/arch/arm/include/asm/kmap_types.h
---- linux-3.1.1/arch/arm/include/asm/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/arm/include/asm/kmap_types.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/arm/include/asm/kmap_types.h linux-3.1.3/arch/arm/include/asm/kmap_types.h
+--- linux-3.1.3/arch/arm/include/asm/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/arm/include/asm/kmap_types.h 2011-11-16 18:39:07.000000000 -0500
@@ -21,6 +21,7 @@ enum km_type {
KM_L1_CACHE,
KM_L2_CACHE,
KM_TYPE_NR
};
-diff -urNp linux-3.1.1/arch/arm/include/asm/uaccess.h linux-3.1.1/arch/arm/include/asm/uaccess.h
---- linux-3.1.1/arch/arm/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/arm/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/arm/include/asm/uaccess.h linux-3.1.3/arch/arm/include/asm/uaccess.h
+--- linux-3.1.3/arch/arm/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/arm/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
@@ -22,6 +22,8 @@
#define VERIFY_READ 0
#define VERIFY_WRITE 1
if (access_ok(VERIFY_WRITE, to, n))
n = __copy_to_user(to, from, n);
return n;
-diff -urNp linux-3.1.1/arch/arm/kernel/armksyms.c linux-3.1.1/arch/arm/kernel/armksyms.c
---- linux-3.1.1/arch/arm/kernel/armksyms.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/arm/kernel/armksyms.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/arm/kernel/armksyms.c linux-3.1.3/arch/arm/kernel/armksyms.c
+--- linux-3.1.3/arch/arm/kernel/armksyms.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/arm/kernel/armksyms.c 2011-11-16 18:39:07.000000000 -0500
@@ -98,8 +98,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
#ifdef CONFIG_MMU
EXPORT_SYMBOL(copy_page);
EXPORT_SYMBOL(__clear_user);
EXPORT_SYMBOL(__get_user_1);
-diff -urNp linux-3.1.1/arch/arm/kernel/process.c linux-3.1.1/arch/arm/kernel/process.c
---- linux-3.1.1/arch/arm/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/arm/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/arm/kernel/process.c linux-3.1.3/arch/arm/kernel/process.c
+--- linux-3.1.3/arch/arm/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/arm/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
@@ -28,7 +28,6 @@
#include <linux/tick.h>
#include <linux/utsname.h>
#ifdef CONFIG_MMU
/*
* The vectors page is always readable from user space for the
-diff -urNp linux-3.1.1/arch/arm/kernel/traps.c linux-3.1.1/arch/arm/kernel/traps.c
---- linux-3.1.1/arch/arm/kernel/traps.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/arm/kernel/traps.c 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/arm/kernel/traps.c linux-3.1.3/arch/arm/kernel/traps.c
+--- linux-3.1.3/arch/arm/kernel/traps.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/arm/kernel/traps.c 2011-11-16 18:40:08.000000000 -0500
@@ -257,6 +257,8 @@ static int __die(const char *str, int er
static DEFINE_SPINLOCK(die_lock);
if (ret != NOTIFY_STOP)
do_exit(SIGSEGV);
}
-diff -urNp linux-3.1.1/arch/arm/lib/copy_from_user.S linux-3.1.1/arch/arm/lib/copy_from_user.S
---- linux-3.1.1/arch/arm/lib/copy_from_user.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/arm/lib/copy_from_user.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/arm/lib/copy_from_user.S linux-3.1.3/arch/arm/lib/copy_from_user.S
+--- linux-3.1.3/arch/arm/lib/copy_from_user.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/arm/lib/copy_from_user.S 2011-11-16 18:39:07.000000000 -0500
@@ -16,7 +16,7 @@
/*
* Prototype:
.pushsection .fixup,"ax"
.align 0
-diff -urNp linux-3.1.1/arch/arm/lib/copy_to_user.S linux-3.1.1/arch/arm/lib/copy_to_user.S
---- linux-3.1.1/arch/arm/lib/copy_to_user.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/arm/lib/copy_to_user.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/arm/lib/copy_to_user.S linux-3.1.3/arch/arm/lib/copy_to_user.S
+--- linux-3.1.3/arch/arm/lib/copy_to_user.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/arm/lib/copy_to_user.S 2011-11-16 18:39:07.000000000 -0500
@@ -16,7 +16,7 @@
/*
* Prototype:
ENDPROC(__copy_to_user_std)
.pushsection .fixup,"ax"
-diff -urNp linux-3.1.1/arch/arm/lib/uaccess.S linux-3.1.1/arch/arm/lib/uaccess.S
---- linux-3.1.1/arch/arm/lib/uaccess.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/arm/lib/uaccess.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/arm/lib/uaccess.S linux-3.1.3/arch/arm/lib/uaccess.S
+--- linux-3.1.3/arch/arm/lib/uaccess.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/arm/lib/uaccess.S 2011-11-16 18:39:07.000000000 -0500
@@ -20,7 +20,7 @@
#define PAGE_SHIFT 12
.pushsection .fixup,"ax"
.align 0
-diff -urNp linux-3.1.1/arch/arm/lib/uaccess_with_memcpy.c linux-3.1.1/arch/arm/lib/uaccess_with_memcpy.c
---- linux-3.1.1/arch/arm/lib/uaccess_with_memcpy.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/arm/lib/uaccess_with_memcpy.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/arm/lib/uaccess_with_memcpy.c linux-3.1.3/arch/arm/lib/uaccess_with_memcpy.c
+--- linux-3.1.3/arch/arm/lib/uaccess_with_memcpy.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/arm/lib/uaccess_with_memcpy.c 2011-11-16 18:39:07.000000000 -0500
@@ -103,7 +103,7 @@ out:
}
{
/*
* This test is stubbed out of the main function above to keep
-diff -urNp linux-3.1.1/arch/arm/mach-ux500/mbox-db5500.c linux-3.1.1/arch/arm/mach-ux500/mbox-db5500.c
---- linux-3.1.1/arch/arm/mach-ux500/mbox-db5500.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/arm/mach-ux500/mbox-db5500.c 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/arm/mach-ux500/mbox-db5500.c linux-3.1.3/arch/arm/mach-ux500/mbox-db5500.c
+--- linux-3.1.3/arch/arm/mach-ux500/mbox-db5500.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/arm/mach-ux500/mbox-db5500.c 2011-11-16 18:40:08.000000000 -0500
@@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev
return sprintf(buf, "0x%X\n", mbox_value);
}
static int mbox_show(struct seq_file *s, void *data)
{
-diff -urNp linux-3.1.1/arch/arm/mm/fault.c linux-3.1.1/arch/arm/mm/fault.c
---- linux-3.1.1/arch/arm/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/arm/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/arm/mm/fault.c linux-3.1.3/arch/arm/mm/fault.c
+--- linux-3.1.3/arch/arm/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/arm/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
@@ -182,6 +182,13 @@ __do_user_fault(struct task_struct *tsk,
}
#endif
/*
* First Level Translation Fault Handler
*
-diff -urNp linux-3.1.1/arch/arm/mm/mmap.c linux-3.1.1/arch/arm/mm/mmap.c
---- linux-3.1.1/arch/arm/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/arm/mm/mmap.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/arm/mm/mmap.c linux-3.1.3/arch/arm/mm/mmap.c
+--- linux-3.1.3/arch/arm/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/arm/mm/mmap.c 2011-11-16 18:39:07.000000000 -0500
@@ -65,6 +65,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
/*
* Remember the place where we stopped the search:
*/
-diff -urNp linux-3.1.1/arch/avr32/include/asm/elf.h linux-3.1.1/arch/avr32/include/asm/elf.h
---- linux-3.1.1/arch/avr32/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/avr32/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/avr32/include/asm/elf.h linux-3.1.3/arch/avr32/include/asm/elf.h
+--- linux-3.1.3/arch/avr32/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/avr32/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpreg
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
/* This yields a mask that user programs can use to figure out what
instruction set this CPU supports. This could be done in user space,
-diff -urNp linux-3.1.1/arch/avr32/include/asm/kmap_types.h linux-3.1.1/arch/avr32/include/asm/kmap_types.h
---- linux-3.1.1/arch/avr32/include/asm/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/avr32/include/asm/kmap_types.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/avr32/include/asm/kmap_types.h linux-3.1.3/arch/avr32/include/asm/kmap_types.h
+--- linux-3.1.3/arch/avr32/include/asm/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/avr32/include/asm/kmap_types.h 2011-11-16 18:39:07.000000000 -0500
@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
D(11) KM_IRQ1,
D(12) KM_SOFTIRQ0,
};
#undef D
-diff -urNp linux-3.1.1/arch/avr32/mm/fault.c linux-3.1.1/arch/avr32/mm/fault.c
---- linux-3.1.1/arch/avr32/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/avr32/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/avr32/mm/fault.c linux-3.1.3/arch/avr32/mm/fault.c
+--- linux-3.1.3/arch/avr32/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/avr32/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
int exception_trace = 1;
if (exception_trace && printk_ratelimit())
printk("%s%s[%d]: segfault at %08lx pc %08lx "
"sp %08lx ecr %lu\n",
-diff -urNp linux-3.1.1/arch/frv/include/asm/kmap_types.h linux-3.1.1/arch/frv/include/asm/kmap_types.h
---- linux-3.1.1/arch/frv/include/asm/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/frv/include/asm/kmap_types.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/frv/include/asm/kmap_types.h linux-3.1.3/arch/frv/include/asm/kmap_types.h
+--- linux-3.1.3/arch/frv/include/asm/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/frv/include/asm/kmap_types.h 2011-11-16 18:39:07.000000000 -0500
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
KM_TYPE_NR
};
-diff -urNp linux-3.1.1/arch/frv/mm/elf-fdpic.c linux-3.1.1/arch/frv/mm/elf-fdpic.c
---- linux-3.1.1/arch/frv/mm/elf-fdpic.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/frv/mm/elf-fdpic.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/frv/mm/elf-fdpic.c linux-3.1.3/arch/frv/mm/elf-fdpic.c
+--- linux-3.1.3/arch/frv/mm/elf-fdpic.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/frv/mm/elf-fdpic.c 2011-11-16 18:39:07.000000000 -0500
@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
if (addr) {
addr = PAGE_ALIGN(addr);
goto success;
addr = vma->vm_end;
}
-diff -urNp linux-3.1.1/arch/ia64/include/asm/elf.h linux-3.1.1/arch/ia64/include/asm/elf.h
---- linux-3.1.1/arch/ia64/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/ia64/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/ia64/include/asm/elf.h linux-3.1.3/arch/ia64/include/asm/elf.h
+--- linux-3.1.3/arch/ia64/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/ia64/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
@@ -42,6 +42,13 @@
*/
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
#define PT_IA_64_UNWIND 0x70000001
/* IA-64 relocations: */
-diff -urNp linux-3.1.1/arch/ia64/include/asm/pgtable.h linux-3.1.1/arch/ia64/include/asm/pgtable.h
---- linux-3.1.1/arch/ia64/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/ia64/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/ia64/include/asm/pgtable.h linux-3.1.3/arch/ia64/include/asm/pgtable.h
+--- linux-3.1.3/arch/ia64/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/ia64/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
@@ -12,7 +12,7 @@
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
#define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
#define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
#define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
-diff -urNp linux-3.1.1/arch/ia64/include/asm/spinlock.h linux-3.1.1/arch/ia64/include/asm/spinlock.h
---- linux-3.1.1/arch/ia64/include/asm/spinlock.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/ia64/include/asm/spinlock.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/ia64/include/asm/spinlock.h linux-3.1.3/arch/ia64/include/asm/spinlock.h
+--- linux-3.1.3/arch/ia64/include/asm/spinlock.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/ia64/include/asm/spinlock.h 2011-11-16 18:39:07.000000000 -0500
@@ -72,7 +72,7 @@ static __always_inline void __ticket_spi
unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
}
static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
-diff -urNp linux-3.1.1/arch/ia64/include/asm/uaccess.h linux-3.1.1/arch/ia64/include/asm/uaccess.h
---- linux-3.1.1/arch/ia64/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/ia64/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/ia64/include/asm/uaccess.h linux-3.1.3/arch/ia64/include/asm/uaccess.h
+--- linux-3.1.3/arch/ia64/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/ia64/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
const void *__cu_from = (from); \
long __cu_len = (n); \
__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
__cu_len; \
})
-diff -urNp linux-3.1.1/arch/ia64/kernel/module.c linux-3.1.1/arch/ia64/kernel/module.c
---- linux-3.1.1/arch/ia64/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/ia64/kernel/module.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/ia64/kernel/module.c linux-3.1.3/arch/ia64/kernel/module.c
+--- linux-3.1.3/arch/ia64/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/ia64/kernel/module.c 2011-11-16 18:39:07.000000000 -0500
@@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
void
module_free (struct module *mod, void *module_region)
mod->arch.gp = gp;
DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
}
-diff -urNp linux-3.1.1/arch/ia64/kernel/sys_ia64.c linux-3.1.1/arch/ia64/kernel/sys_ia64.c
---- linux-3.1.1/arch/ia64/kernel/sys_ia64.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/ia64/kernel/sys_ia64.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/ia64/kernel/sys_ia64.c linux-3.1.3/arch/ia64/kernel/sys_ia64.c
+--- linux-3.1.3/arch/ia64/kernel/sys_ia64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/ia64/kernel/sys_ia64.c 2011-11-16 18:39:07.000000000 -0500
@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
if (REGION_NUMBER(addr) == RGN_HPAGE)
addr = 0;
/* Remember the address where we stopped this search: */
mm->free_area_cache = addr + len;
return addr;
-diff -urNp linux-3.1.1/arch/ia64/kernel/vmlinux.lds.S linux-3.1.1/arch/ia64/kernel/vmlinux.lds.S
---- linux-3.1.1/arch/ia64/kernel/vmlinux.lds.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/ia64/kernel/vmlinux.lds.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/ia64/kernel/vmlinux.lds.S linux-3.1.3/arch/ia64/kernel/vmlinux.lds.S
+--- linux-3.1.3/arch/ia64/kernel/vmlinux.lds.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/ia64/kernel/vmlinux.lds.S 2011-11-16 18:39:07.000000000 -0500
@@ -199,7 +199,7 @@ SECTIONS {
/* Per-cpu data: */
. = ALIGN(PERCPU_PAGE_SIZE);
/*
* ensure percpu data fits
* into percpu page size
-diff -urNp linux-3.1.1/arch/ia64/mm/fault.c linux-3.1.1/arch/ia64/mm/fault.c
---- linux-3.1.1/arch/ia64/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/ia64/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/ia64/mm/fault.c linux-3.1.3/arch/ia64/mm/fault.c
+--- linux-3.1.3/arch/ia64/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/ia64/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
@@ -73,6 +73,23 @@ mapped_kernel_page_is_present (unsigned
return pte_present(pte);
}
/*
* If for any reason at all we couldn't handle the fault, make
* sure we exit gracefully rather than endlessly redo the
-diff -urNp linux-3.1.1/arch/ia64/mm/hugetlbpage.c linux-3.1.1/arch/ia64/mm/hugetlbpage.c
---- linux-3.1.1/arch/ia64/mm/hugetlbpage.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/ia64/mm/hugetlbpage.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/ia64/mm/hugetlbpage.c linux-3.1.3/arch/ia64/mm/hugetlbpage.c
+--- linux-3.1.3/arch/ia64/mm/hugetlbpage.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/ia64/mm/hugetlbpage.c 2011-11-16 18:39:07.000000000 -0500
@@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(
/* At this point: (!vmm || addr < vmm->vm_end). */
if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
return addr;
addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
}
-diff -urNp linux-3.1.1/arch/ia64/mm/init.c linux-3.1.1/arch/ia64/mm/init.c
---- linux-3.1.1/arch/ia64/mm/init.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/ia64/mm/init.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/ia64/mm/init.c linux-3.1.3/arch/ia64/mm/init.c
+--- linux-3.1.3/arch/ia64/mm/init.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/ia64/mm/init.c 2011-11-16 18:39:07.000000000 -0500
@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
vma->vm_end = vma->vm_start + PAGE_SIZE;
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
down_write(¤t->mm->mmap_sem);
if (insert_vm_struct(current->mm, vma)) {
-diff -urNp linux-3.1.1/arch/m32r/lib/usercopy.c linux-3.1.1/arch/m32r/lib/usercopy.c
---- linux-3.1.1/arch/m32r/lib/usercopy.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/m32r/lib/usercopy.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/m32r/lib/usercopy.c linux-3.1.3/arch/m32r/lib/usercopy.c
+--- linux-3.1.3/arch/m32r/lib/usercopy.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/m32r/lib/usercopy.c 2011-11-16 18:39:07.000000000 -0500
@@ -14,6 +14,9 @@
unsigned long
__generic_copy_to_user(void __user *to, const void *from, unsigned long n)
prefetchw(to);
if (access_ok(VERIFY_READ, from, n))
__copy_user_zeroing(to,from,n);
-diff -urNp linux-3.1.1/arch/mips/include/asm/elf.h linux-3.1.1/arch/mips/include/asm/elf.h
---- linux-3.1.1/arch/mips/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/mips/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/mips/include/asm/elf.h linux-3.1.3/arch/mips/include/asm/elf.h
+--- linux-3.1.3/arch/mips/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/mips/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
@@ -372,13 +372,16 @@ extern const char *__elf_platform;
#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
#endif
-#define arch_randomize_brk arch_randomize_brk
-
#endif /* _ASM_ELF_H */
-diff -urNp linux-3.1.1/arch/mips/include/asm/page.h linux-3.1.1/arch/mips/include/asm/page.h
---- linux-3.1.1/arch/mips/include/asm/page.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/mips/include/asm/page.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/mips/include/asm/page.h linux-3.1.3/arch/mips/include/asm/page.h
+--- linux-3.1.3/arch/mips/include/asm/page.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/mips/include/asm/page.h 2011-11-16 18:39:07.000000000 -0500
@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
#ifdef CONFIG_CPU_MIPS32
typedef struct { unsigned long pte_low, pte_high; } pte_t;
#else
typedef struct { unsigned long long pte; } pte_t;
#define pte_val(x) ((x).pte)
-diff -urNp linux-3.1.1/arch/mips/include/asm/system.h linux-3.1.1/arch/mips/include/asm/system.h
---- linux-3.1.1/arch/mips/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/mips/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/mips/include/asm/system.h linux-3.1.3/arch/mips/include/asm/system.h
+--- linux-3.1.3/arch/mips/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/mips/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
*/
#define __ARCH_WANT_UNLOCKED_CTXSW
+#define arch_align_stack(x) ((x) & ~0xfUL)
#endif /* _ASM_SYSTEM_H */
-diff -urNp linux-3.1.1/arch/mips/kernel/binfmt_elfn32.c linux-3.1.1/arch/mips/kernel/binfmt_elfn32.c
---- linux-3.1.1/arch/mips/kernel/binfmt_elfn32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/mips/kernel/binfmt_elfn32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/mips/kernel/binfmt_elfn32.c linux-3.1.3/arch/mips/kernel/binfmt_elfn32.c
+--- linux-3.1.3/arch/mips/kernel/binfmt_elfn32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/mips/kernel/binfmt_elfn32.c 2011-11-16 18:39:07.000000000 -0500
@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#undef ELF_ET_DYN_BASE
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
#include <asm/processor.h>
#include <linux/module.h>
#include <linux/elfcore.h>
-diff -urNp linux-3.1.1/arch/mips/kernel/binfmt_elfo32.c linux-3.1.1/arch/mips/kernel/binfmt_elfo32.c
---- linux-3.1.1/arch/mips/kernel/binfmt_elfo32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/mips/kernel/binfmt_elfo32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/mips/kernel/binfmt_elfo32.c linux-3.1.3/arch/mips/kernel/binfmt_elfo32.c
+--- linux-3.1.3/arch/mips/kernel/binfmt_elfo32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/mips/kernel/binfmt_elfo32.c 2011-11-16 18:39:07.000000000 -0500
@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#undef ELF_ET_DYN_BASE
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
#include <asm/processor.h>
/*
-diff -urNp linux-3.1.1/arch/mips/kernel/process.c linux-3.1.1/arch/mips/kernel/process.c
---- linux-3.1.1/arch/mips/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/mips/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/mips/kernel/process.c linux-3.1.3/arch/mips/kernel/process.c
+--- linux-3.1.3/arch/mips/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/mips/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
@@ -481,15 +481,3 @@ unsigned long get_wchan(struct task_stru
out:
return pc;
-
- return sp & ALMASK;
-}
-diff -urNp linux-3.1.1/arch/mips/mm/fault.c linux-3.1.1/arch/mips/mm/fault.c
---- linux-3.1.1/arch/mips/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/mips/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/mips/mm/fault.c linux-3.1.3/arch/mips/mm/fault.c
+--- linux-3.1.3/arch/mips/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/mips/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
@@ -28,6 +28,23 @@
#include <asm/highmem.h> /* For VMALLOC_END */
#include <linux/kdebug.h>
/*
* This routine handles page faults. It determines the address,
* and the problem, and then passes it off to one of the appropriate
-diff -urNp linux-3.1.1/arch/mips/mm/mmap.c linux-3.1.1/arch/mips/mm/mmap.c
---- linux-3.1.1/arch/mips/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/mips/mm/mmap.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/mips/mm/mmap.c linux-3.1.3/arch/mips/mm/mmap.c
+--- linux-3.1.3/arch/mips/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/mips/mm/mmap.c 2011-11-16 18:39:07.000000000 -0500
@@ -95,6 +95,11 @@ static unsigned long arch_get_unmapped_a
do_color_align = 1;
-
- return ret;
-}
-diff -urNp linux-3.1.1/arch/parisc/include/asm/elf.h linux-3.1.1/arch/parisc/include/asm/elf.h
---- linux-3.1.1/arch/parisc/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/parisc/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/parisc/include/asm/elf.h linux-3.1.3/arch/parisc/include/asm/elf.h
+--- linux-3.1.3/arch/parisc/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/parisc/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration..
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
/* This yields a mask that user programs can use to figure out what
instruction set this CPU supports. This could be done in user space,
but it's not easy, and we've already done it here. */
-diff -urNp linux-3.1.1/arch/parisc/include/asm/pgtable.h linux-3.1.1/arch/parisc/include/asm/pgtable.h
---- linux-3.1.1/arch/parisc/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/parisc/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/parisc/include/asm/pgtable.h linux-3.1.3/arch/parisc/include/asm/pgtable.h
+--- linux-3.1.3/arch/parisc/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/parisc/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
@@ -210,6 +210,17 @@ struct vm_area_struct;
#define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
#define PAGE_COPY PAGE_EXECREAD
#define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
#define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
#define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
-diff -urNp linux-3.1.1/arch/parisc/kernel/module.c linux-3.1.1/arch/parisc/kernel/module.c
---- linux-3.1.1/arch/parisc/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/parisc/kernel/module.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/parisc/kernel/module.c linux-3.1.3/arch/parisc/kernel/module.c
+--- linux-3.1.3/arch/parisc/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/parisc/kernel/module.c 2011-11-16 18:39:07.000000000 -0500
@@ -98,16 +98,38 @@
/* three functions to determine where in the module core
DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
me->arch.unwind_section, table, end, gp);
-diff -urNp linux-3.1.1/arch/parisc/kernel/sys_parisc.c linux-3.1.1/arch/parisc/kernel/sys_parisc.c
---- linux-3.1.1/arch/parisc/kernel/sys_parisc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/parisc/kernel/sys_parisc.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/parisc/kernel/sys_parisc.c linux-3.1.3/arch/parisc/kernel/sys_parisc.c
+--- linux-3.1.3/arch/parisc/kernel/sys_parisc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/parisc/kernel/sys_parisc.c 2011-11-16 18:39:07.000000000 -0500
@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u
/* At this point: (!vma || addr < vma->vm_end). */
if (TASK_SIZE - len < addr)
if (filp) {
addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-3.1.1/arch/parisc/kernel/traps.c linux-3.1.1/arch/parisc/kernel/traps.c
---- linux-3.1.1/arch/parisc/kernel/traps.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/parisc/kernel/traps.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/parisc/kernel/traps.c linux-3.1.3/arch/parisc/kernel/traps.c
+--- linux-3.1.3/arch/parisc/kernel/traps.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/parisc/kernel/traps.c 2011-11-16 18:39:07.000000000 -0500
@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
down_read(¤t->mm->mmap_sem);
fault_address = regs->iaoq[0];
fault_space = regs->iasq[0];
-diff -urNp linux-3.1.1/arch/parisc/mm/fault.c linux-3.1.1/arch/parisc/mm/fault.c
---- linux-3.1.1/arch/parisc/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/parisc/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/parisc/mm/fault.c linux-3.1.3/arch/parisc/mm/fault.c
+--- linux-3.1.3/arch/parisc/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/parisc/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
@@ -15,6 +15,7 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
/*
* If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-3.1.1/arch/powerpc/include/asm/elf.h linux-3.1.1/arch/powerpc/include/asm/elf.h
---- linux-3.1.1/arch/powerpc/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/include/asm/elf.h linux-3.1.3/arch/powerpc/include/asm/elf.h
+--- linux-3.1.3/arch/powerpc/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
@@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
#endif /* __KERNEL__ */
/*
-diff -urNp linux-3.1.1/arch/powerpc/include/asm/kmap_types.h linux-3.1.1/arch/powerpc/include/asm/kmap_types.h
---- linux-3.1.1/arch/powerpc/include/asm/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/include/asm/kmap_types.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/include/asm/kmap_types.h linux-3.1.3/arch/powerpc/include/asm/kmap_types.h
+--- linux-3.1.3/arch/powerpc/include/asm/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/include/asm/kmap_types.h 2011-11-16 18:39:07.000000000 -0500
@@ -27,6 +27,7 @@ enum km_type {
KM_PPC_SYNC_PAGE,
KM_PPC_SYNC_ICACHE,
KM_TYPE_NR
};
-diff -urNp linux-3.1.1/arch/powerpc/include/asm/mman.h linux-3.1.1/arch/powerpc/include/asm/mman.h
---- linux-3.1.1/arch/powerpc/include/asm/mman.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/include/asm/mman.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/include/asm/mman.h linux-3.1.3/arch/powerpc/include/asm/mman.h
+--- linux-3.1.3/arch/powerpc/include/asm/mman.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/include/asm/mman.h 2011-11-16 18:39:07.000000000 -0500
@@ -44,7 +44,7 @@ static inline unsigned long arch_calc_vm
}
#define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
{
return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
}
-diff -urNp linux-3.1.1/arch/powerpc/include/asm/page_64.h linux-3.1.1/arch/powerpc/include/asm/page_64.h
---- linux-3.1.1/arch/powerpc/include/asm/page_64.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/include/asm/page_64.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/include/asm/page_64.h linux-3.1.3/arch/powerpc/include/asm/page_64.h
+--- linux-3.1.3/arch/powerpc/include/asm/page_64.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/include/asm/page_64.h 2011-11-16 18:39:07.000000000 -0500
@@ -155,15 +155,18 @@ do { \
* stack by default, so in the absence of a PT_GNU_STACK program header
* we turn execute permission off.
#include <asm-generic/getorder.h>
-diff -urNp linux-3.1.1/arch/powerpc/include/asm/page.h linux-3.1.1/arch/powerpc/include/asm/page.h
---- linux-3.1.1/arch/powerpc/include/asm/page.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/include/asm/page.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/include/asm/page.h linux-3.1.3/arch/powerpc/include/asm/page.h
+--- linux-3.1.3/arch/powerpc/include/asm/page.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/include/asm/page.h 2011-11-16 18:39:07.000000000 -0500
@@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr;
* and needs to be executable. This means the whole heap ends
* up being executable.
#ifndef __ASSEMBLY__
#undef STRICT_MM_TYPECHECKS
-diff -urNp linux-3.1.1/arch/powerpc/include/asm/pgtable.h linux-3.1.1/arch/powerpc/include/asm/pgtable.h
---- linux-3.1.1/arch/powerpc/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/include/asm/pgtable.h linux-3.1.3/arch/powerpc/include/asm/pgtable.h
+--- linux-3.1.3/arch/powerpc/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
@@ -2,6 +2,7 @@
#define _ASM_POWERPC_PGTABLE_H
#ifdef __KERNEL__
#ifndef __ASSEMBLY__
#include <asm/processor.h> /* For TASK_SIZE */
#include <asm/mmu.h>
-diff -urNp linux-3.1.1/arch/powerpc/include/asm/pte-hash32.h linux-3.1.1/arch/powerpc/include/asm/pte-hash32.h
---- linux-3.1.1/arch/powerpc/include/asm/pte-hash32.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/include/asm/pte-hash32.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/include/asm/pte-hash32.h linux-3.1.3/arch/powerpc/include/asm/pte-hash32.h
+--- linux-3.1.3/arch/powerpc/include/asm/pte-hash32.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/include/asm/pte-hash32.h 2011-11-16 18:39:07.000000000 -0500
@@ -21,6 +21,7 @@
#define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
#define _PAGE_USER 0x004 /* usermode access allowed */
#define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
#define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
#define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
-diff -urNp linux-3.1.1/arch/powerpc/include/asm/reg.h linux-3.1.1/arch/powerpc/include/asm/reg.h
---- linux-3.1.1/arch/powerpc/include/asm/reg.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/include/asm/reg.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/include/asm/reg.h linux-3.1.3/arch/powerpc/include/asm/reg.h
+--- linux-3.1.3/arch/powerpc/include/asm/reg.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/include/asm/reg.h 2011-11-16 18:39:07.000000000 -0500
@@ -212,6 +212,7 @@
#define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
#define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
#define DSISR_PROTFAULT 0x08000000 /* protection fault */
#define DSISR_ISSTORE 0x02000000 /* access was a store */
#define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
-diff -urNp linux-3.1.1/arch/powerpc/include/asm/system.h linux-3.1.1/arch/powerpc/include/asm/system.h
---- linux-3.1.1/arch/powerpc/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/include/asm/system.h linux-3.1.3/arch/powerpc/include/asm/system.h
+--- linux-3.1.3/arch/powerpc/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
@@ -530,7 +530,7 @@ __cmpxchg_local(volatile void *ptr, unsi
#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
#endif
/* Used in very early kernel initialization. */
extern unsigned long reloc_offset(void);
-diff -urNp linux-3.1.1/arch/powerpc/include/asm/uaccess.h linux-3.1.1/arch/powerpc/include/asm/uaccess.h
---- linux-3.1.1/arch/powerpc/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/include/asm/uaccess.h linux-3.1.3/arch/powerpc/include/asm/uaccess.h
+--- linux-3.1.3/arch/powerpc/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
@@ -13,6 +13,8 @@
#define VERIFY_READ 0
#define VERIFY_WRITE 1
extern unsigned long __clear_user(void __user *addr, unsigned long size);
static inline unsigned long clear_user(void __user *addr, unsigned long size)
-diff -urNp linux-3.1.1/arch/powerpc/kernel/exceptions-64e.S linux-3.1.1/arch/powerpc/kernel/exceptions-64e.S
---- linux-3.1.1/arch/powerpc/kernel/exceptions-64e.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/kernel/exceptions-64e.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/kernel/exceptions-64e.S linux-3.1.3/arch/powerpc/kernel/exceptions-64e.S
+--- linux-3.1.3/arch/powerpc/kernel/exceptions-64e.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/kernel/exceptions-64e.S 2011-11-16 18:39:07.000000000 -0500
@@ -587,6 +587,7 @@ storage_fault_common:
std r14,_DAR(r1)
std r15,_DSISR(r1)
addi r3,r1,STACK_FRAME_OVERHEAD
ld r4,_DAR(r1)
bl .bad_page_fault
-diff -urNp linux-3.1.1/arch/powerpc/kernel/exceptions-64s.S linux-3.1.1/arch/powerpc/kernel/exceptions-64s.S
---- linux-3.1.1/arch/powerpc/kernel/exceptions-64s.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/kernel/exceptions-64s.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/kernel/exceptions-64s.S linux-3.1.3/arch/powerpc/kernel/exceptions-64s.S
+--- linux-3.1.3/arch/powerpc/kernel/exceptions-64s.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/kernel/exceptions-64s.S 2011-11-16 18:39:07.000000000 -0500
@@ -1014,10 +1014,10 @@ handle_page_fault:
11: ld r4,_DAR(r1)
ld r5,_DSISR(r1)
mr r5,r3
addi r3,r1,STACK_FRAME_OVERHEAD
lwz r4,_DAR(r1)
-diff -urNp linux-3.1.1/arch/powerpc/kernel/module_32.c linux-3.1.1/arch/powerpc/kernel/module_32.c
---- linux-3.1.1/arch/powerpc/kernel/module_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/kernel/module_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/kernel/module_32.c linux-3.1.3/arch/powerpc/kernel/module_32.c
+--- linux-3.1.3/arch/powerpc/kernel/module_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/kernel/module_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
me->arch.core_plt_section = i;
}
/* Find this entry, or if that fails, the next avail. entry */
while (entry->jump[0]) {
-diff -urNp linux-3.1.1/arch/powerpc/kernel/process.c linux-3.1.1/arch/powerpc/kernel/process.c
---- linux-3.1.1/arch/powerpc/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/kernel/process.c 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/kernel/process.c linux-3.1.3/arch/powerpc/kernel/process.c
+--- linux-3.1.3/arch/powerpc/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/kernel/process.c 2011-11-16 18:40:08.000000000 -0500
@@ -682,8 +682,8 @@ void show_regs(struct pt_regs * regs)
* Lookup NIP late so we have the best change of getting the
* above info out without failing
-
- return ret;
-}
-diff -urNp linux-3.1.1/arch/powerpc/kernel/signal_32.c linux-3.1.1/arch/powerpc/kernel/signal_32.c
---- linux-3.1.1/arch/powerpc/kernel/signal_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/kernel/signal_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/kernel/signal_32.c linux-3.1.3/arch/powerpc/kernel/signal_32.c
+--- linux-3.1.3/arch/powerpc/kernel/signal_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/kernel/signal_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -859,7 +859,7 @@ int handle_rt_signal32(unsigned long sig
/* Save user registers on the stack */
frame = &rt_sf->uc.uc_mcontext;
if (save_user_regs(regs, frame, 0, 1))
goto badframe;
regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
-diff -urNp linux-3.1.1/arch/powerpc/kernel/signal_64.c linux-3.1.1/arch/powerpc/kernel/signal_64.c
---- linux-3.1.1/arch/powerpc/kernel/signal_64.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/kernel/signal_64.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/kernel/signal_64.c linux-3.1.3/arch/powerpc/kernel/signal_64.c
+--- linux-3.1.3/arch/powerpc/kernel/signal_64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/kernel/signal_64.c 2011-11-16 18:39:07.000000000 -0500
@@ -430,7 +430,7 @@ int handle_rt_signal64(int signr, struct
current->thread.fpscr.val = 0;
regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
} else {
err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
-diff -urNp linux-3.1.1/arch/powerpc/kernel/traps.c linux-3.1.1/arch/powerpc/kernel/traps.c
---- linux-3.1.1/arch/powerpc/kernel/traps.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/kernel/traps.c 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/kernel/traps.c linux-3.1.3/arch/powerpc/kernel/traps.c
+--- linux-3.1.3/arch/powerpc/kernel/traps.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/kernel/traps.c 2011-11-16 18:40:08.000000000 -0500
@@ -98,6 +98,8 @@ static void pmac_backlight_unblank(void)
static inline void pmac_backlight_unblank(void) { }
#endif
oops_exit();
do_exit(err);
-diff -urNp linux-3.1.1/arch/powerpc/kernel/vdso.c linux-3.1.1/arch/powerpc/kernel/vdso.c
---- linux-3.1.1/arch/powerpc/kernel/vdso.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/kernel/vdso.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/kernel/vdso.c linux-3.1.3/arch/powerpc/kernel/vdso.c
+--- linux-3.1.3/arch/powerpc/kernel/vdso.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/kernel/vdso.c 2011-11-16 18:39:07.000000000 -0500
@@ -36,6 +36,7 @@
#include <asm/firmware.h>
#include <asm/vdso.h>
if (IS_ERR_VALUE(vdso_base)) {
rc = vdso_base;
goto fail_mmapsem;
-diff -urNp linux-3.1.1/arch/powerpc/lib/usercopy_64.c linux-3.1.1/arch/powerpc/lib/usercopy_64.c
---- linux-3.1.1/arch/powerpc/lib/usercopy_64.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/lib/usercopy_64.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/lib/usercopy_64.c linux-3.1.3/arch/powerpc/lib/usercopy_64.c
+--- linux-3.1.3/arch/powerpc/lib/usercopy_64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/lib/usercopy_64.c 2011-11-16 18:39:07.000000000 -0500
@@ -9,22 +9,6 @@
#include <linux/module.h>
#include <asm/uaccess.h>
-EXPORT_SYMBOL(copy_to_user);
EXPORT_SYMBOL(copy_in_user);
-diff -urNp linux-3.1.1/arch/powerpc/mm/fault.c linux-3.1.1/arch/powerpc/mm/fault.c
---- linux-3.1.1/arch/powerpc/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/mm/fault.c linux-3.1.3/arch/powerpc/mm/fault.c
+--- linux-3.1.3/arch/powerpc/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
@@ -32,6 +32,10 @@
#include <linux/perf_event.h>
#include <linux/magic.h>
_exception(SIGSEGV, regs, code, address);
return 0;
}
-diff -urNp linux-3.1.1/arch/powerpc/mm/mmap_64.c linux-3.1.1/arch/powerpc/mm/mmap_64.c
---- linux-3.1.1/arch/powerpc/mm/mmap_64.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/mm/mmap_64.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/mm/mmap_64.c linux-3.1.3/arch/powerpc/mm/mmap_64.c
+--- linux-3.1.3/arch/powerpc/mm/mmap_64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/mm/mmap_64.c 2011-11-16 18:39:07.000000000 -0500
@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-3.1.1/arch/powerpc/mm/slice.c linux-3.1.1/arch/powerpc/mm/slice.c
---- linux-3.1.1/arch/powerpc/mm/slice.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/powerpc/mm/slice.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/powerpc/mm/slice.c linux-3.1.3/arch/powerpc/mm/slice.c
+--- linux-3.1.3/arch/powerpc/mm/slice.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/powerpc/mm/slice.c 2011-11-16 18:39:07.000000000 -0500
@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
if ((mm->task_size - len) < addr)
return 0;
/* If hint, make sure it matches our alignment restrictions */
if (!fixed && addr) {
addr = _ALIGN_UP(addr, 1ul << pshift);
-diff -urNp linux-3.1.1/arch/s390/include/asm/elf.h linux-3.1.1/arch/s390/include/asm/elf.h
---- linux-3.1.1/arch/s390/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/s390/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/s390/include/asm/elf.h linux-3.1.3/arch/s390/include/asm/elf.h
+--- linux-3.1.3/arch/s390/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/s390/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
@@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
-#define arch_randomize_brk arch_randomize_brk
-
#endif
-diff -urNp linux-3.1.1/arch/s390/include/asm/system.h linux-3.1.1/arch/s390/include/asm/system.h
---- linux-3.1.1/arch/s390/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/s390/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/s390/include/asm/system.h linux-3.1.3/arch/s390/include/asm/system.h
+--- linux-3.1.3/arch/s390/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/s390/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
@@ -256,7 +256,7 @@ extern void (*_machine_restart)(char *co
extern void (*_machine_halt)(void);
extern void (*_machine_power_off)(void);
static inline int tprot(unsigned long addr)
{
-diff -urNp linux-3.1.1/arch/s390/include/asm/uaccess.h linux-3.1.1/arch/s390/include/asm/uaccess.h
---- linux-3.1.1/arch/s390/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/s390/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/s390/include/asm/uaccess.h linux-3.1.3/arch/s390/include/asm/uaccess.h
+--- linux-3.1.3/arch/s390/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/s390/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
@@ -235,6 +235,10 @@ static inline unsigned long __must_check
copy_to_user(void __user *to, const void *from, unsigned long n)
{
if (unlikely(sz != -1 && sz < n)) {
copy_from_user_overflow();
return n;
-diff -urNp linux-3.1.1/arch/s390/kernel/module.c linux-3.1.1/arch/s390/kernel/module.c
---- linux-3.1.1/arch/s390/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/s390/kernel/module.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/s390/kernel/module.c linux-3.1.3/arch/s390/kernel/module.c
+--- linux-3.1.3/arch/s390/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/s390/kernel/module.c 2011-11-16 18:39:07.000000000 -0500
@@ -161,11 +161,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
/* Increase core size by size of got & plt and set start
rela->r_addend - loc;
if (r_type == R_390_GOTPC)
*(unsigned int *) loc = val;
-diff -urNp linux-3.1.1/arch/s390/kernel/process.c linux-3.1.1/arch/s390/kernel/process.c
---- linux-3.1.1/arch/s390/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/s390/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/s390/kernel/process.c linux-3.1.3/arch/s390/kernel/process.c
+--- linux-3.1.3/arch/s390/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/s390/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
@@ -319,39 +319,3 @@ unsigned long get_wchan(struct task_stru
}
return 0;
- return base;
- return ret;
-}
-diff -urNp linux-3.1.1/arch/s390/kernel/setup.c linux-3.1.1/arch/s390/kernel/setup.c
---- linux-3.1.1/arch/s390/kernel/setup.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/s390/kernel/setup.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/s390/kernel/setup.c linux-3.1.3/arch/s390/kernel/setup.c
+--- linux-3.1.3/arch/s390/kernel/setup.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/s390/kernel/setup.c 2011-11-16 18:39:07.000000000 -0500
@@ -271,7 +271,7 @@ static int __init early_parse_mem(char *
}
early_param("mem", early_parse_mem);
EXPORT_SYMBOL_GPL(user_mode);
static int set_amode_and_uaccess(unsigned long user_amode,
-diff -urNp linux-3.1.1/arch/s390/mm/mmap.c linux-3.1.1/arch/s390/mm/mmap.c
---- linux-3.1.1/arch/s390/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/s390/mm/mmap.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/s390/mm/mmap.c linux-3.1.3/arch/s390/mm/mmap.c
+--- linux-3.1.3/arch/s390/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/s390/mm/mmap.c 2011-11-16 18:39:07.000000000 -0500
@@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
mm->get_unmapped_area = s390_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-3.1.1/arch/score/include/asm/system.h linux-3.1.1/arch/score/include/asm/system.h
---- linux-3.1.1/arch/score/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/score/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/score/include/asm/system.h linux-3.1.3/arch/score/include/asm/system.h
+--- linux-3.1.3/arch/score/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/score/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
@@ -17,7 +17,7 @@ do { \
#define finish_arch_switch(prev) do {} while (0)
#define mb() barrier()
#define rmb() barrier()
-diff -urNp linux-3.1.1/arch/score/kernel/process.c linux-3.1.1/arch/score/kernel/process.c
---- linux-3.1.1/arch/score/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/score/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/score/kernel/process.c linux-3.1.3/arch/score/kernel/process.c
+--- linux-3.1.3/arch/score/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/score/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
return task_pt_regs(task)->cp0_epc;
-{
- return sp;
-}
-diff -urNp linux-3.1.1/arch/sh/mm/mmap.c linux-3.1.1/arch/sh/mm/mmap.c
---- linux-3.1.1/arch/sh/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sh/mm/mmap.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sh/mm/mmap.c linux-3.1.3/arch/sh/mm/mmap.c
+--- linux-3.1.3/arch/sh/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sh/mm/mmap.c 2011-11-16 18:39:07.000000000 -0500
@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
addr = PAGE_ALIGN(addr);
bottomup:
/*
-diff -urNp linux-3.1.1/arch/sparc/include/asm/atomic_64.h linux-3.1.1/arch/sparc/include/asm/atomic_64.h
---- linux-3.1.1/arch/sparc/include/asm/atomic_64.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/include/asm/atomic_64.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/include/asm/atomic_64.h linux-3.1.3/arch/sparc/include/asm/atomic_64.h
+--- linux-3.1.3/arch/sparc/include/asm/atomic_64.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/include/asm/atomic_64.h 2011-11-16 18:39:07.000000000 -0500
@@ -14,18 +14,40 @@
#define ATOMIC64_INIT(i) { (i) }
}
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-3.1.1/arch/sparc/include/asm/cache.h linux-3.1.1/arch/sparc/include/asm/cache.h
---- linux-3.1.1/arch/sparc/include/asm/cache.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/include/asm/cache.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/include/asm/cache.h linux-3.1.3/arch/sparc/include/asm/cache.h
+--- linux-3.1.3/arch/sparc/include/asm/cache.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/include/asm/cache.h 2011-11-16 18:39:07.000000000 -0500
@@ -10,7 +10,7 @@
#define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
#ifdef CONFIG_SPARC32
#define SMP_CACHE_BYTES_SHIFT 5
-diff -urNp linux-3.1.1/arch/sparc/include/asm/elf_32.h linux-3.1.1/arch/sparc/include/asm/elf_32.h
---- linux-3.1.1/arch/sparc/include/asm/elf_32.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/include/asm/elf_32.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/include/asm/elf_32.h linux-3.1.3/arch/sparc/include/asm/elf_32.h
+--- linux-3.1.3/arch/sparc/include/asm/elf_32.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/include/asm/elf_32.h 2011-11-16 18:39:07.000000000 -0500
@@ -114,6 +114,13 @@ typedef struct {
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
/* This yields a mask that user programs can use to figure out what
instruction set this cpu supports. This can NOT be done in userspace
on Sparc. */
-diff -urNp linux-3.1.1/arch/sparc/include/asm/elf_64.h linux-3.1.1/arch/sparc/include/asm/elf_64.h
---- linux-3.1.1/arch/sparc/include/asm/elf_64.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/include/asm/elf_64.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/include/asm/elf_64.h linux-3.1.3/arch/sparc/include/asm/elf_64.h
+--- linux-3.1.3/arch/sparc/include/asm/elf_64.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/include/asm/elf_64.h 2011-11-16 18:39:07.000000000 -0500
@@ -180,6 +180,13 @@ typedef struct {
#define ELF_ET_DYN_BASE 0x0000010000000000UL
#define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
extern unsigned long sparc64_elf_hwcap;
#define ELF_HWCAP sparc64_elf_hwcap
-diff -urNp linux-3.1.1/arch/sparc/include/asm/pgtable_32.h linux-3.1.1/arch/sparc/include/asm/pgtable_32.h
---- linux-3.1.1/arch/sparc/include/asm/pgtable_32.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/include/asm/pgtable_32.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/include/asm/pgtable_32.h linux-3.1.3/arch/sparc/include/asm/pgtable_32.h
+--- linux-3.1.3/arch/sparc/include/asm/pgtable_32.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/include/asm/pgtable_32.h 2011-11-16 18:39:07.000000000 -0500
@@ -45,6 +45,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
BTFIXUPDEF_INT(page_none)
BTFIXUPDEF_INT(page_copy)
extern unsigned long page_kernel;
#ifdef MODULE
-diff -urNp linux-3.1.1/arch/sparc/include/asm/pgtsrmmu.h linux-3.1.1/arch/sparc/include/asm/pgtsrmmu.h
---- linux-3.1.1/arch/sparc/include/asm/pgtsrmmu.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/include/asm/pgtsrmmu.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/include/asm/pgtsrmmu.h linux-3.1.3/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-3.1.3/arch/sparc/include/asm/pgtsrmmu.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/include/asm/pgtsrmmu.h 2011-11-16 18:39:07.000000000 -0500
@@ -115,6 +115,13 @@
SRMMU_EXEC | SRMMU_REF)
#define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
#define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
SRMMU_DIRTY | SRMMU_REF)
-diff -urNp linux-3.1.1/arch/sparc/include/asm/spinlock_64.h linux-3.1.1/arch/sparc/include/asm/spinlock_64.h
---- linux-3.1.1/arch/sparc/include/asm/spinlock_64.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/include/asm/spinlock_64.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/include/asm/spinlock_64.h linux-3.1.3/arch/sparc/include/asm/spinlock_64.h
+--- linux-3.1.3/arch/sparc/include/asm/spinlock_64.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/include/asm/spinlock_64.h 2011-11-16 18:39:07.000000000 -0500
@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(
/* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
{
unsigned long mask, tmp1, tmp2, result;
-diff -urNp linux-3.1.1/arch/sparc/include/asm/thread_info_32.h linux-3.1.1/arch/sparc/include/asm/thread_info_32.h
---- linux-3.1.1/arch/sparc/include/asm/thread_info_32.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/include/asm/thread_info_32.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/include/asm/thread_info_32.h linux-3.1.3/arch/sparc/include/asm/thread_info_32.h
+--- linux-3.1.3/arch/sparc/include/asm/thread_info_32.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/include/asm/thread_info_32.h 2011-11-16 18:39:07.000000000 -0500
@@ -50,6 +50,8 @@ struct thread_info {
unsigned long w_saved;
};
/*
-diff -urNp linux-3.1.1/arch/sparc/include/asm/thread_info_64.h linux-3.1.1/arch/sparc/include/asm/thread_info_64.h
---- linux-3.1.1/arch/sparc/include/asm/thread_info_64.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/include/asm/thread_info_64.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/include/asm/thread_info_64.h linux-3.1.3/arch/sparc/include/asm/thread_info_64.h
+--- linux-3.1.3/arch/sparc/include/asm/thread_info_64.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/include/asm/thread_info_64.h 2011-11-16 18:39:07.000000000 -0500
@@ -63,6 +63,8 @@ struct thread_info {
struct pt_regs *kern_una_regs;
unsigned int kern_una_insn;
unsigned long fpregs[0] __attribute__ ((aligned(64)));
};
-diff -urNp linux-3.1.1/arch/sparc/include/asm/uaccess_32.h linux-3.1.1/arch/sparc/include/asm/uaccess_32.h
---- linux-3.1.1/arch/sparc/include/asm/uaccess_32.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/include/asm/uaccess_32.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/include/asm/uaccess_32.h linux-3.1.3/arch/sparc/include/asm/uaccess_32.h
+--- linux-3.1.3/arch/sparc/include/asm/uaccess_32.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/include/asm/uaccess_32.h 2011-11-16 18:39:07.000000000 -0500
@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
return __copy_user((__force void __user *) to, from, n);
}
-diff -urNp linux-3.1.1/arch/sparc/include/asm/uaccess_64.h linux-3.1.1/arch/sparc/include/asm/uaccess_64.h
---- linux-3.1.1/arch/sparc/include/asm/uaccess_64.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/include/asm/uaccess_64.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/include/asm/uaccess_64.h linux-3.1.3/arch/sparc/include/asm/uaccess_64.h
+--- linux-3.1.3/arch/sparc/include/asm/uaccess_64.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/include/asm/uaccess_64.h 2011-11-16 18:39:07.000000000 -0500
@@ -10,6 +10,7 @@
#include <linux/compiler.h>
#include <linux/string.h>
if (unlikely(ret))
ret = copy_to_user_fixup(to, from, size);
return ret;
-diff -urNp linux-3.1.1/arch/sparc/include/asm/uaccess.h linux-3.1.1/arch/sparc/include/asm/uaccess.h
---- linux-3.1.1/arch/sparc/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/include/asm/uaccess.h linux-3.1.3/arch/sparc/include/asm/uaccess.h
+--- linux-3.1.3/arch/sparc/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
@@ -1,5 +1,13 @@
#ifndef ___ASM_SPARC_UACCESS_H
#define ___ASM_SPARC_UACCESS_H
#if defined(__sparc__) && defined(__arch64__)
#include <asm/uaccess_64.h>
#else
-diff -urNp linux-3.1.1/arch/sparc/kernel/Makefile linux-3.1.1/arch/sparc/kernel/Makefile
---- linux-3.1.1/arch/sparc/kernel/Makefile 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/kernel/Makefile 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/kernel/Makefile linux-3.1.3/arch/sparc/kernel/Makefile
+--- linux-3.1.3/arch/sparc/kernel/Makefile 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/kernel/Makefile 2011-11-16 18:39:07.000000000 -0500
@@ -3,7 +3,7 @@
#
extra-y := head_$(BITS).o
extra-y += init_task.o
-diff -urNp linux-3.1.1/arch/sparc/kernel/process_32.c linux-3.1.1/arch/sparc/kernel/process_32.c
---- linux-3.1.1/arch/sparc/kernel/process_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/kernel/process_32.c 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/kernel/process_32.c linux-3.1.3/arch/sparc/kernel/process_32.c
+--- linux-3.1.3/arch/sparc/kernel/process_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/kernel/process_32.c 2011-11-16 18:40:08.000000000 -0500
@@ -204,7 +204,7 @@ void __show_backtrace(unsigned long fp)
rw->ins[4], rw->ins[5],
rw->ins[6],
fp = rw->ins[6];
} while (++count < 16);
printk("\n");
-diff -urNp linux-3.1.1/arch/sparc/kernel/process_64.c linux-3.1.1/arch/sparc/kernel/process_64.c
---- linux-3.1.1/arch/sparc/kernel/process_64.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/kernel/process_64.c 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/kernel/process_64.c linux-3.1.3/arch/sparc/kernel/process_64.c
+--- linux-3.1.3/arch/sparc/kernel/process_64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/kernel/process_64.c 2011-11-16 18:40:08.000000000 -0500
@@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg
printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
(void *) gp->tpc,
(void *) gp->o7,
(void *) gp->i7,
-diff -urNp linux-3.1.1/arch/sparc/kernel/sys_sparc_32.c linux-3.1.1/arch/sparc/kernel/sys_sparc_32.c
---- linux-3.1.1/arch/sparc/kernel/sys_sparc_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/kernel/sys_sparc_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/kernel/sys_sparc_32.c linux-3.1.3/arch/sparc/kernel/sys_sparc_32.c
+--- linux-3.1.3/arch/sparc/kernel/sys_sparc_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/kernel/sys_sparc_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str
if (ARCH_SUN4C && len > 0x20000000)
return -ENOMEM;
return addr;
addr = vmm->vm_end;
if (flags & MAP_SHARED)
-diff -urNp linux-3.1.1/arch/sparc/kernel/sys_sparc_64.c linux-3.1.1/arch/sparc/kernel/sys_sparc_64.c
---- linux-3.1.1/arch/sparc/kernel/sys_sparc_64.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/kernel/sys_sparc_64.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/kernel/sys_sparc_64.c linux-3.1.3/arch/sparc/kernel/sys_sparc_64.c
+--- linux-3.1.3/arch/sparc/kernel/sys_sparc_64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/kernel/sys_sparc_64.c 2011-11-16 18:39:07.000000000 -0500
@@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str
/* We do not accept a shared mapping if it would violate
* cache aliasing constraints.
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-3.1.1/arch/sparc/kernel/traps_32.c linux-3.1.1/arch/sparc/kernel/traps_32.c
---- linux-3.1.1/arch/sparc/kernel/traps_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/kernel/traps_32.c 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/kernel/traps_32.c linux-3.1.3/arch/sparc/kernel/traps_32.c
+--- linux-3.1.3/arch/sparc/kernel/traps_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/kernel/traps_32.c 2011-11-16 18:40:08.000000000 -0500
@@ -44,6 +44,8 @@ static void instruction_dump(unsigned lo
#define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
#define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
do_exit(SIGSEGV);
}
-diff -urNp linux-3.1.1/arch/sparc/kernel/traps_64.c linux-3.1.1/arch/sparc/kernel/traps_64.c
---- linux-3.1.1/arch/sparc/kernel/traps_64.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/kernel/traps_64.c 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/kernel/traps_64.c linux-3.1.3/arch/sparc/kernel/traps_64.c
+--- linux-3.1.3/arch/sparc/kernel/traps_64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/kernel/traps_64.c 2011-11-16 18:40:08.000000000 -0500
@@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_
i + 1,
p->trapstack[i].tstate, p->trapstack[i].tpc,
do_exit(SIGSEGV);
}
EXPORT_SYMBOL(die_if_kernel);
-diff -urNp linux-3.1.1/arch/sparc/kernel/unaligned_64.c linux-3.1.1/arch/sparc/kernel/unaligned_64.c
---- linux-3.1.1/arch/sparc/kernel/unaligned_64.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/kernel/unaligned_64.c 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/kernel/unaligned_64.c linux-3.1.3/arch/sparc/kernel/unaligned_64.c
+--- linux-3.1.3/arch/sparc/kernel/unaligned_64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/kernel/unaligned_64.c 2011-11-16 18:40:08.000000000 -0500
@@ -279,7 +279,7 @@ static void log_unaligned(struct pt_regs
static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
regs->tpc, (void *) regs->tpc);
}
}
-diff -urNp linux-3.1.1/arch/sparc/lib/atomic_64.S linux-3.1.1/arch/sparc/lib/atomic_64.S
---- linux-3.1.1/arch/sparc/lib/atomic_64.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/lib/atomic_64.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/lib/atomic_64.S linux-3.1.3/arch/sparc/lib/atomic_64.S
+--- linux-3.1.3/arch/sparc/lib/atomic_64.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/lib/atomic_64.S 2011-11-16 18:39:07.000000000 -0500
@@ -18,7 +18,12 @@
atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
casx [%o1], %g1, %g7
cmp %g1, %g7
bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
-diff -urNp linux-3.1.1/arch/sparc/lib/ksyms.c linux-3.1.1/arch/sparc/lib/ksyms.c
---- linux-3.1.1/arch/sparc/lib/ksyms.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/lib/ksyms.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/lib/ksyms.c linux-3.1.3/arch/sparc/lib/ksyms.c
+--- linux-3.1.3/arch/sparc/lib/ksyms.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/lib/ksyms.c 2011-11-16 18:39:07.000000000 -0500
@@ -142,12 +142,18 @@ EXPORT_SYMBOL(__downgrade_write);
/* Atomic counter implementation. */
EXPORT_SYMBOL(atomic64_sub_ret);
/* Atomic bit operations. */
-diff -urNp linux-3.1.1/arch/sparc/lib/Makefile linux-3.1.1/arch/sparc/lib/Makefile
---- linux-3.1.1/arch/sparc/lib/Makefile 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/lib/Makefile 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/lib/Makefile linux-3.1.3/arch/sparc/lib/Makefile
+--- linux-3.1.3/arch/sparc/lib/Makefile 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/lib/Makefile 2011-11-16 18:39:07.000000000 -0500
@@ -2,7 +2,7 @@
#
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-3.1.1/arch/sparc/Makefile linux-3.1.1/arch/sparc/Makefile
---- linux-3.1.1/arch/sparc/Makefile 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/Makefile 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/Makefile linux-3.1.3/arch/sparc/Makefile
+--- linux-3.1.3/arch/sparc/Makefile 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/Makefile 2011-11-16 18:40:08.000000000 -0500
@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
# Export what is needed by arch/sparc/boot/Makefile
export VMLINUX_INIT VMLINUX_MAIN
VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
VMLINUX_MAIN += $(drivers-y) $(net-y)
-diff -urNp linux-3.1.1/arch/sparc/mm/fault_32.c linux-3.1.1/arch/sparc/mm/fault_32.c
---- linux-3.1.1/arch/sparc/mm/fault_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/mm/fault_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/mm/fault_32.c linux-3.1.3/arch/sparc/mm/fault_32.c
+--- linux-3.1.3/arch/sparc/mm/fault_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/mm/fault_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -22,6 +22,9 @@
#include <linux/interrupt.h>
#include <linux/module.h>
/* Allow reads even for write-only mappings */
if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
goto bad_area;
-diff -urNp linux-3.1.1/arch/sparc/mm/fault_64.c linux-3.1.1/arch/sparc/mm/fault_64.c
---- linux-3.1.1/arch/sparc/mm/fault_64.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/mm/fault_64.c 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/mm/fault_64.c linux-3.1.3/arch/sparc/mm/fault_64.c
+--- linux-3.1.3/arch/sparc/mm/fault_64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/mm/fault_64.c 2011-11-16 18:40:08.000000000 -0500
@@ -21,6 +21,9 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
/* Pure DTLB misses do not tell us whether the fault causing
* load/store/atomic was a write or not, it only says that there
* was no match. So in such a case we (carefully) read the
-diff -urNp linux-3.1.1/arch/sparc/mm/hugetlbpage.c linux-3.1.1/arch/sparc/mm/hugetlbpage.c
---- linux-3.1.1/arch/sparc/mm/hugetlbpage.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/mm/hugetlbpage.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/mm/hugetlbpage.c linux-3.1.3/arch/sparc/mm/hugetlbpage.c
+--- linux-3.1.3/arch/sparc/mm/hugetlbpage.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/mm/hugetlbpage.c 2011-11-16 18:39:07.000000000 -0500
@@ -68,7 +68,7 @@ full_search:
}
return -ENOMEM;
return addr;
}
if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-3.1.1/arch/sparc/mm/init_32.c linux-3.1.1/arch/sparc/mm/init_32.c
---- linux-3.1.1/arch/sparc/mm/init_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/mm/init_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/mm/init_32.c linux-3.1.3/arch/sparc/mm/init_32.c
+--- linux-3.1.3/arch/sparc/mm/init_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/mm/init_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -316,6 +316,9 @@ extern void device_scan(void);
pgprot_t PAGE_SHARED __read_mostly;
EXPORT_SYMBOL(PAGE_SHARED);
protection_map[12] = PAGE_READONLY;
protection_map[13] = PAGE_READONLY;
protection_map[14] = PAGE_SHARED;
-diff -urNp linux-3.1.1/arch/sparc/mm/Makefile linux-3.1.1/arch/sparc/mm/Makefile
---- linux-3.1.1/arch/sparc/mm/Makefile 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/mm/Makefile 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/mm/Makefile linux-3.1.3/arch/sparc/mm/Makefile
+--- linux-3.1.3/arch/sparc/mm/Makefile 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/mm/Makefile 2011-11-16 18:39:07.000000000 -0500
@@ -2,7 +2,7 @@
#
obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
obj-y += fault_$(BITS).o
-diff -urNp linux-3.1.1/arch/sparc/mm/srmmu.c linux-3.1.1/arch/sparc/mm/srmmu.c
---- linux-3.1.1/arch/sparc/mm/srmmu.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/sparc/mm/srmmu.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/sparc/mm/srmmu.c linux-3.1.3/arch/sparc/mm/srmmu.c
+--- linux-3.1.3/arch/sparc/mm/srmmu.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/sparc/mm/srmmu.c 2011-11-16 18:39:07.000000000 -0500
@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
-diff -urNp linux-3.1.1/arch/um/include/asm/kmap_types.h linux-3.1.1/arch/um/include/asm/kmap_types.h
---- linux-3.1.1/arch/um/include/asm/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/um/include/asm/kmap_types.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/um/include/asm/kmap_types.h linux-3.1.3/arch/um/include/asm/kmap_types.h
+--- linux-3.1.3/arch/um/include/asm/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/um/include/asm/kmap_types.h 2011-11-16 18:39:07.000000000 -0500
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
KM_TYPE_NR
};
-diff -urNp linux-3.1.1/arch/um/include/asm/page.h linux-3.1.1/arch/um/include/asm/page.h
---- linux-3.1.1/arch/um/include/asm/page.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/um/include/asm/page.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/um/include/asm/page.h linux-3.1.3/arch/um/include/asm/page.h
+--- linux-3.1.3/arch/um/include/asm/page.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/um/include/asm/page.h 2011-11-16 18:39:07.000000000 -0500
@@ -14,6 +14,9 @@
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
#ifndef __ASSEMBLY__
struct page;
-diff -urNp linux-3.1.1/arch/um/kernel/process.c linux-3.1.1/arch/um/kernel/process.c
---- linux-3.1.1/arch/um/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/um/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/um/kernel/process.c linux-3.1.3/arch/um/kernel/process.c
+--- linux-3.1.3/arch/um/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/um/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
@@ -404,22 +404,6 @@ int singlestepping(void * t)
return 2;
}
unsigned long get_wchan(struct task_struct *p)
{
unsigned long stack_page, sp, ip;
-diff -urNp linux-3.1.1/arch/um/Makefile linux-3.1.1/arch/um/Makefile
---- linux-3.1.1/arch/um/Makefile 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/um/Makefile 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/um/Makefile linux-3.1.3/arch/um/Makefile
+--- linux-3.1.3/arch/um/Makefile 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/um/Makefile 2011-11-16 18:39:07.000000000 -0500
@@ -49,6 +49,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINE
$(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
$(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64
include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)
#This will adjust *FLAGS accordingly to the platform.
-diff -urNp linux-3.1.1/arch/um/sys-i386/shared/sysdep/system.h linux-3.1.1/arch/um/sys-i386/shared/sysdep/system.h
---- linux-3.1.1/arch/um/sys-i386/shared/sysdep/system.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/um/sys-i386/shared/sysdep/system.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/um/sys-i386/shared/sysdep/system.h linux-3.1.3/arch/um/sys-i386/shared/sysdep/system.h
+--- linux-3.1.3/arch/um/sys-i386/shared/sysdep/system.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/um/sys-i386/shared/sysdep/system.h 2011-11-16 18:39:07.000000000 -0500
@@ -17,7 +17,7 @@
# define AT_VECTOR_SIZE_ARCH 1
#endif
void default_idle(void);
-diff -urNp linux-3.1.1/arch/um/sys-i386/syscalls.c linux-3.1.1/arch/um/sys-i386/syscalls.c
---- linux-3.1.1/arch/um/sys-i386/syscalls.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/um/sys-i386/syscalls.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/um/sys-i386/syscalls.c linux-3.1.3/arch/um/sys-i386/syscalls.c
+--- linux-3.1.3/arch/um/sys-i386/syscalls.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/um/sys-i386/syscalls.c 2011-11-16 18:39:07.000000000 -0500
@@ -11,6 +11,21 @@
#include "asm/uaccess.h"
#include "asm/unistd.h"
/*
* The prototype on i386 is:
*
-diff -urNp linux-3.1.1/arch/um/sys-x86_64/shared/sysdep/system.h linux-3.1.1/arch/um/sys-x86_64/shared/sysdep/system.h
---- linux-3.1.1/arch/um/sys-x86_64/shared/sysdep/system.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/um/sys-x86_64/shared/sysdep/system.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/um/sys-x86_64/shared/sysdep/system.h linux-3.1.3/arch/um/sys-x86_64/shared/sysdep/system.h
+--- linux-3.1.3/arch/um/sys-x86_64/shared/sysdep/system.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/um/sys-x86_64/shared/sysdep/system.h 2011-11-16 18:39:07.000000000 -0500
@@ -17,7 +17,7 @@
# define AT_VECTOR_SIZE_ARCH 1
#endif
void default_idle(void);
-diff -urNp linux-3.1.1/arch/x86/boot/bitops.h linux-3.1.1/arch/x86/boot/bitops.h
---- linux-3.1.1/arch/x86/boot/bitops.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/boot/bitops.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/boot/bitops.h linux-3.1.3/arch/x86/boot/bitops.h
+--- linux-3.1.3/arch/x86/boot/bitops.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/boot/bitops.h 2011-11-16 18:39:07.000000000 -0500
@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
u8 v;
const u32 *p = (const u32 *)addr;
}
#endif /* BOOT_BITOPS_H */
-diff -urNp linux-3.1.1/arch/x86/boot/boot.h linux-3.1.1/arch/x86/boot/boot.h
---- linux-3.1.1/arch/x86/boot/boot.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/boot/boot.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/boot/boot.h linux-3.1.3/arch/x86/boot/boot.h
+--- linux-3.1.3/arch/x86/boot/boot.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/boot/boot.h 2011-11-16 18:39:07.000000000 -0500
@@ -85,7 +85,7 @@ static inline void io_delay(void)
static inline u16 ds(void)
{
: "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
return diff;
}
-diff -urNp linux-3.1.1/arch/x86/boot/compressed/head_32.S linux-3.1.1/arch/x86/boot/compressed/head_32.S
---- linux-3.1.1/arch/x86/boot/compressed/head_32.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/boot/compressed/head_32.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/boot/compressed/head_32.S linux-3.1.3/arch/x86/boot/compressed/head_32.S
+--- linux-3.1.3/arch/x86/boot/compressed/head_32.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/boot/compressed/head_32.S 2011-11-16 18:39:07.000000000 -0500
@@ -76,7 +76,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
jmp 1b
2:
-diff -urNp linux-3.1.1/arch/x86/boot/compressed/head_64.S linux-3.1.1/arch/x86/boot/compressed/head_64.S
---- linux-3.1.1/arch/x86/boot/compressed/head_64.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/boot/compressed/head_64.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/boot/compressed/head_64.S linux-3.1.3/arch/x86/boot/compressed/head_64.S
+--- linux-3.1.3/arch/x86/boot/compressed/head_64.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/boot/compressed/head_64.S 2011-11-16 18:39:07.000000000 -0500
@@ -91,7 +91,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
#endif
/* Target address to relocate to for decompression */
-diff -urNp linux-3.1.1/arch/x86/boot/compressed/Makefile linux-3.1.1/arch/x86/boot/compressed/Makefile
---- linux-3.1.1/arch/x86/boot/compressed/Makefile 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/boot/compressed/Makefile 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/boot/compressed/Makefile linux-3.1.3/arch/x86/boot/compressed/Makefile
+--- linux-3.1.3/arch/x86/boot/compressed/Makefile 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/boot/compressed/Makefile 2011-11-16 18:39:07.000000000 -0500
@@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=smal
KBUILD_CFLAGS += $(cflags-y)
KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
GCOV_PROFILE := n
-diff -urNp linux-3.1.1/arch/x86/boot/compressed/misc.c linux-3.1.1/arch/x86/boot/compressed/misc.c
---- linux-3.1.1/arch/x86/boot/compressed/misc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/boot/compressed/misc.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/boot/compressed/misc.c linux-3.1.3/arch/x86/boot/compressed/misc.c
+--- linux-3.1.3/arch/x86/boot/compressed/misc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/boot/compressed/misc.c 2011-11-16 18:39:07.000000000 -0500
@@ -310,7 +310,7 @@ static void parse_elf(void *output)
case PT_LOAD:
#ifdef CONFIG_RELOCATABLE
error("Wrong destination address");
#endif
-diff -urNp linux-3.1.1/arch/x86/boot/compressed/relocs.c linux-3.1.1/arch/x86/boot/compressed/relocs.c
---- linux-3.1.1/arch/x86/boot/compressed/relocs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/boot/compressed/relocs.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/boot/compressed/relocs.c linux-3.1.3/arch/x86/boot/compressed/relocs.c
+--- linux-3.1.3/arch/x86/boot/compressed/relocs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/boot/compressed/relocs.c 2011-11-16 18:39:07.000000000 -0500
@@ -13,8 +13,11 @@
static void die(char *fmt, ...);
read_shdrs(fp);
read_strtabs(fp);
read_symtabs(fp);
-diff -urNp linux-3.1.1/arch/x86/boot/cpucheck.c linux-3.1.1/arch/x86/boot/cpucheck.c
---- linux-3.1.1/arch/x86/boot/cpucheck.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/boot/cpucheck.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/boot/cpucheck.c linux-3.1.3/arch/x86/boot/cpucheck.c
+--- linux-3.1.3/arch/x86/boot/cpucheck.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/boot/cpucheck.c 2011-11-16 18:39:07.000000000 -0500
@@ -74,7 +74,7 @@ static int has_fpu(void)
u16 fcw = -1, fsw = -1;
u32 cr0;
err = check_flags();
}
-diff -urNp linux-3.1.1/arch/x86/boot/header.S linux-3.1.1/arch/x86/boot/header.S
---- linux-3.1.1/arch/x86/boot/header.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/boot/header.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/boot/header.S linux-3.1.3/arch/x86/boot/header.S
+--- linux-3.1.3/arch/x86/boot/header.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/boot/header.S 2011-11-16 18:39:07.000000000 -0500
@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
# single linked list of
# struct setup_data
#define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
#define VO_INIT_SIZE (VO__end - VO__text)
-diff -urNp linux-3.1.1/arch/x86/boot/Makefile linux-3.1.1/arch/x86/boot/Makefile
---- linux-3.1.1/arch/x86/boot/Makefile 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/boot/Makefile 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/boot/Makefile linux-3.1.3/arch/x86/boot/Makefile
+--- linux-3.1.3/arch/x86/boot/Makefile 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/boot/Makefile 2011-11-16 18:39:07.000000000 -0500
@@ -63,6 +63,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os
$(call cc-option, -fno-stack-protector) \
$(call cc-option, -mpreferred-stack-boundary=2)
KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
GCOV_PROFILE := n
-diff -urNp linux-3.1.1/arch/x86/boot/memory.c linux-3.1.1/arch/x86/boot/memory.c
---- linux-3.1.1/arch/x86/boot/memory.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/boot/memory.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/boot/memory.c linux-3.1.3/arch/x86/boot/memory.c
+--- linux-3.1.3/arch/x86/boot/memory.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/boot/memory.c 2011-11-16 18:39:07.000000000 -0500
@@ -19,7 +19,7 @@
static int detect_memory_e820(void)
struct biosregs ireg, oreg;
struct e820entry *desc = boot_params.e820_map;
static struct e820entry buf; /* static so it is zeroed */
-diff -urNp linux-3.1.1/arch/x86/boot/video.c linux-3.1.1/arch/x86/boot/video.c
---- linux-3.1.1/arch/x86/boot/video.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/boot/video.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/boot/video.c linux-3.1.3/arch/x86/boot/video.c
+--- linux-3.1.3/arch/x86/boot/video.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/boot/video.c 2011-11-16 18:39:07.000000000 -0500
@@ -96,7 +96,7 @@ static void store_mode_params(void)
static unsigned int get_entry(void)
{
int key;
unsigned int v;
-diff -urNp linux-3.1.1/arch/x86/boot/video-vesa.c linux-3.1.1/arch/x86/boot/video-vesa.c
---- linux-3.1.1/arch/x86/boot/video-vesa.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/boot/video-vesa.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/boot/video-vesa.c linux-3.1.3/arch/x86/boot/video-vesa.c
+--- linux-3.1.3/arch/x86/boot/video-vesa.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/boot/video-vesa.c 2011-11-16 18:39:07.000000000 -0500
@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
boot_params.screen_info.vesapm_seg = oreg.es;
}
/*
-diff -urNp linux-3.1.1/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.1.1/arch/x86/crypto/aes-x86_64-asm_64.S
---- linux-3.1.1/arch/x86/crypto/aes-x86_64-asm_64.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/crypto/aes-x86_64-asm_64.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.1.3/arch/x86/crypto/aes-x86_64-asm_64.S
+--- linux-3.1.3/arch/x86/crypto/aes-x86_64-asm_64.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/crypto/aes-x86_64-asm_64.S 2011-11-16 18:39:07.000000000 -0500
@@ -8,6 +8,8 @@
* including this sentence is retained in full.
*/
#define epilogue(r1,r2,r3,r4,r5,r6,r7,r8,r9) \
movq r1,r2; \
movq r3,r4; \
-diff -urNp linux-3.1.1/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.1.1/arch/x86/crypto/salsa20-x86_64-asm_64.S
---- linux-3.1.1/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.1.3/arch/x86/crypto/salsa20-x86_64-asm_64.S
+--- linux-3.1.3/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-11-16 18:39:07.000000000 -0500
@@ -1,3 +1,5 @@
+#include <asm/alternative-asm.h>
+
mov %rsi,%rdx
+ pax_force_retaddr
ret
-diff -urNp linux-3.1.1/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.1.1/arch/x86/crypto/twofish-x86_64-asm_64.S
---- linux-3.1.1/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.1.3/arch/x86/crypto/twofish-x86_64-asm_64.S
+--- linux-3.1.3/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-11-16 18:39:07.000000000 -0500
@@ -21,6 +21,7 @@
.text
movq $1,%rax
+ pax_force_retaddr
ret
-diff -urNp linux-3.1.1/arch/x86/ia32/ia32_aout.c linux-3.1.1/arch/x86/ia32/ia32_aout.c
---- linux-3.1.1/arch/x86/ia32/ia32_aout.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/ia32/ia32_aout.c 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/ia32/ia32_aout.c linux-3.1.3/arch/x86/ia32/ia32_aout.c
+--- linux-3.1.3/arch/x86/ia32/ia32_aout.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/ia32/ia32_aout.c 2011-11-16 18:40:08.000000000 -0500
@@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st
unsigned long dump_start, dump_size;
struct user32 dump;
fs = get_fs();
set_fs(KERNEL_DS);
has_dumped = 1;
-diff -urNp linux-3.1.1/arch/x86/ia32/ia32entry.S linux-3.1.1/arch/x86/ia32/ia32entry.S
---- linux-3.1.1/arch/x86/ia32/ia32entry.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/ia32/ia32entry.S 2011-11-17 18:27:57.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/ia32/ia32entry.S linux-3.1.3/arch/x86/ia32/ia32entry.S
+--- linux-3.1.3/arch/x86/ia32/ia32entry.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/ia32/ia32entry.S 2011-11-17 18:27:57.000000000 -0500
@@ -13,7 +13,9 @@
#include <asm/thread_info.h>
#include <asm/segment.h>
ret
CFI_ENDPROC
-diff -urNp linux-3.1.1/arch/x86/ia32/ia32_signal.c linux-3.1.1/arch/x86/ia32/ia32_signal.c
---- linux-3.1.1/arch/x86/ia32/ia32_signal.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/ia32/ia32_signal.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/ia32/ia32_signal.c linux-3.1.3/arch/x86/ia32/ia32_signal.c
+--- linux-3.1.3/arch/x86/ia32/ia32_signal.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/ia32/ia32_signal.c 2011-11-16 18:39:07.000000000 -0500
@@ -169,7 +169,7 @@ asmlinkage long sys32_sigaltstack(const
}
seg = get_fs();
} put_user_catch(err);
if (err)
-diff -urNp linux-3.1.1/arch/x86/ia32/sys_ia32.c linux-3.1.1/arch/x86/ia32/sys_ia32.c
---- linux-3.1.1/arch/x86/ia32/sys_ia32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/ia32/sys_ia32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/ia32/sys_ia32.c linux-3.1.3/arch/x86/ia32/sys_ia32.c
+--- linux-3.1.3/arch/x86/ia32/sys_ia32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/ia32/sys_ia32.c 2011-11-16 18:39:07.000000000 -0500
@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsign
*/
static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
count);
set_fs(old_fs);
-diff -urNp linux-3.1.1/arch/x86/include/asm/alternative-asm.h linux-3.1.1/arch/x86/include/asm/alternative-asm.h
---- linux-3.1.1/arch/x86/include/asm/alternative-asm.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/alternative-asm.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/alternative-asm.h linux-3.1.3/arch/x86/include/asm/alternative-asm.h
+--- linux-3.1.3/arch/x86/include/asm/alternative-asm.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/alternative-asm.h 2011-11-16 18:39:07.000000000 -0500
@@ -15,6 +15,20 @@
.endm
#endif
.macro altinstruction_entry orig alt feature orig_len alt_len
.long \orig - .
.long \alt - .
-diff -urNp linux-3.1.1/arch/x86/include/asm/alternative.h linux-3.1.1/arch/x86/include/asm/alternative.h
---- linux-3.1.1/arch/x86/include/asm/alternative.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/alternative.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/alternative.h linux-3.1.3/arch/x86/include/asm/alternative.h
+--- linux-3.1.3/arch/x86/include/asm/alternative.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/alternative.h 2011-11-16 18:39:07.000000000 -0500
@@ -89,7 +89,7 @@ static inline int alternatives_text_rese
".section .discard,\"aw\",@progbits\n" \
" .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \
"663:\n\t" newinstr "\n664:\n" /* replacement */ \
".previous"
-diff -urNp linux-3.1.1/arch/x86/include/asm/apic.h linux-3.1.1/arch/x86/include/asm/apic.h
---- linux-3.1.1/arch/x86/include/asm/apic.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/apic.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/apic.h linux-3.1.3/arch/x86/include/asm/apic.h
+--- linux-3.1.3/arch/x86/include/asm/apic.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/apic.h 2011-11-16 18:39:07.000000000 -0500
@@ -45,7 +45,7 @@ static inline void generic_apic_probe(vo
#ifdef CONFIG_X86_LOCAL_APIC
extern int local_apic_timer_c2_ok;
extern int disable_apic;
-diff -urNp linux-3.1.1/arch/x86/include/asm/apm.h linux-3.1.1/arch/x86/include/asm/apm.h
---- linux-3.1.1/arch/x86/include/asm/apm.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/apm.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/apm.h linux-3.1.3/arch/x86/include/asm/apm.h
+--- linux-3.1.3/arch/x86/include/asm/apm.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/apm.h 2011-11-16 18:39:07.000000000 -0500
@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
__asm__ __volatile__(APM_DO_ZERO_SEGS
"pushl %%edi\n\t"
"setc %%bl\n\t"
"popl %%ebp\n\t"
"popl %%edi\n\t"
-diff -urNp linux-3.1.1/arch/x86/include/asm/atomic64_32.h linux-3.1.1/arch/x86/include/asm/atomic64_32.h
---- linux-3.1.1/arch/x86/include/asm/atomic64_32.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/atomic64_32.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/atomic64_32.h linux-3.1.3/arch/x86/include/asm/atomic64_32.h
+--- linux-3.1.3/arch/x86/include/asm/atomic64_32.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/atomic64_32.h 2011-11-16 18:39:07.000000000 -0500
@@ -12,6 +12,14 @@ typedef struct {
u64 __aligned(8) counter;
} atomic64_t;
* atomic64_sub - subtract the atomic64 variable
* @i: integer value to subtract
* @v: pointer to type atomic64_t
-diff -urNp linux-3.1.1/arch/x86/include/asm/atomic64_64.h linux-3.1.1/arch/x86/include/asm/atomic64_64.h
---- linux-3.1.1/arch/x86/include/asm/atomic64_64.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/atomic64_64.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/atomic64_64.h linux-3.1.3/arch/x86/include/asm/atomic64_64.h
+--- linux-3.1.3/arch/x86/include/asm/atomic64_64.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/atomic64_64.h 2011-11-16 18:39:07.000000000 -0500
@@ -18,7 +18,19 @@
*/
static inline long atomic64_read(const atomic64_t *v)
}
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-3.1.1/arch/x86/include/asm/atomic.h linux-3.1.1/arch/x86/include/asm/atomic.h
---- linux-3.1.1/arch/x86/include/asm/atomic.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/atomic.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/atomic.h linux-3.1.3/arch/x86/include/asm/atomic.h
+--- linux-3.1.3/arch/x86/include/asm/atomic.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/atomic.h 2011-11-16 18:39:07.000000000 -0500
@@ -22,7 +22,18 @@
*/
static inline int atomic_read(const atomic_t *v)
/*
* atomic_dec_if_positive - decrement by 1 if old value positive
-diff -urNp linux-3.1.1/arch/x86/include/asm/bitops.h linux-3.1.1/arch/x86/include/asm/bitops.h
---- linux-3.1.1/arch/x86/include/asm/bitops.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/bitops.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/bitops.h linux-3.1.3/arch/x86/include/asm/bitops.h
+--- linux-3.1.3/arch/x86/include/asm/bitops.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/bitops.h 2011-11-16 18:39:07.000000000 -0500
@@ -38,7 +38,7 @@
* a mask operation on a byte.
*/
#define CONST_MASK(nr) (1 << ((nr) & 7))
/**
-diff -urNp linux-3.1.1/arch/x86/include/asm/boot.h linux-3.1.1/arch/x86/include/asm/boot.h
---- linux-3.1.1/arch/x86/include/asm/boot.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/boot.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/boot.h linux-3.1.3/arch/x86/include/asm/boot.h
+--- linux-3.1.3/arch/x86/include/asm/boot.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/boot.h 2011-11-16 18:39:07.000000000 -0500
@@ -11,10 +11,15 @@
#include <asm/pgtable_types.h>
/* Minimum kernel alignment, as a power of two */
#ifdef CONFIG_X86_64
#define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
-diff -urNp linux-3.1.1/arch/x86/include/asm/cacheflush.h linux-3.1.1/arch/x86/include/asm/cacheflush.h
---- linux-3.1.1/arch/x86/include/asm/cacheflush.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/cacheflush.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/cacheflush.h linux-3.1.3/arch/x86/include/asm/cacheflush.h
+--- linux-3.1.3/arch/x86/include/asm/cacheflush.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/cacheflush.h 2011-11-16 18:39:07.000000000 -0500
@@ -26,7 +26,7 @@ static inline unsigned long get_page_mem
unsigned long pg_flags = pg->flags & _PGMT_MASK;
else if (pg_flags == _PGMT_WC)
return _PAGE_CACHE_WC;
else if (pg_flags == _PGMT_UC_MINUS)
-diff -urNp linux-3.1.1/arch/x86/include/asm/cache.h linux-3.1.1/arch/x86/include/asm/cache.h
---- linux-3.1.1/arch/x86/include/asm/cache.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/cache.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/cache.h linux-3.1.3/arch/x86/include/asm/cache.h
+--- linux-3.1.3/arch/x86/include/asm/cache.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/cache.h 2011-11-16 18:39:07.000000000 -0500
@@ -5,12 +5,13 @@
/* L1 cache line size */
#ifdef CONFIG_X86_VSMP
#ifdef CONFIG_SMP
-diff -urNp linux-3.1.1/arch/x86/include/asm/checksum_32.h linux-3.1.1/arch/x86/include/asm/checksum_32.h
---- linux-3.1.1/arch/x86/include/asm/checksum_32.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/checksum_32.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/checksum_32.h linux-3.1.3/arch/x86/include/asm/checksum_32.h
+--- linux-3.1.3/arch/x86/include/asm/checksum_32.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/checksum_32.h 2011-11-16 18:39:07.000000000 -0500
@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
int len, __wsum sum,
int *src_err_ptr, int *dst_err_ptr);
len, sum, NULL, err_ptr);
if (len)
-diff -urNp linux-3.1.1/arch/x86/include/asm/cpufeature.h linux-3.1.1/arch/x86/include/asm/cpufeature.h
---- linux-3.1.1/arch/x86/include/asm/cpufeature.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/cpufeature.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/cpufeature.h linux-3.1.3/arch/x86/include/asm/cpufeature.h
+--- linux-3.1.3/arch/x86/include/asm/cpufeature.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/cpufeature.h 2011-11-16 18:39:07.000000000 -0500
@@ -358,7 +358,7 @@ static __always_inline __pure bool __sta
".section .discard,\"aw\",@progbits\n"
" .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
"3: movb $1,%0\n"
"4:\n"
".previous\n"
-diff -urNp linux-3.1.1/arch/x86/include/asm/desc_defs.h linux-3.1.1/arch/x86/include/asm/desc_defs.h
---- linux-3.1.1/arch/x86/include/asm/desc_defs.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/desc_defs.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/desc_defs.h linux-3.1.3/arch/x86/include/asm/desc_defs.h
+--- linux-3.1.3/arch/x86/include/asm/desc_defs.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/desc_defs.h 2011-11-16 18:39:07.000000000 -0500
@@ -31,6 +31,12 @@ struct desc_struct {
unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
};
} __attribute__((packed));
-diff -urNp linux-3.1.1/arch/x86/include/asm/desc.h linux-3.1.1/arch/x86/include/asm/desc.h
---- linux-3.1.1/arch/x86/include/asm/desc.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/desc.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/desc.h linux-3.1.3/arch/x86/include/asm/desc.h
+--- linux-3.1.3/arch/x86/include/asm/desc.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/desc.h 2011-11-16 18:39:07.000000000 -0500
@@ -4,6 +4,7 @@
#include <asm/desc_defs.h>
#include <asm/ldt.h>
+#endif
+
#endif /* _ASM_X86_DESC_H */
-diff -urNp linux-3.1.1/arch/x86/include/asm/e820.h linux-3.1.1/arch/x86/include/asm/e820.h
---- linux-3.1.1/arch/x86/include/asm/e820.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/e820.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/e820.h linux-3.1.3/arch/x86/include/asm/e820.h
+--- linux-3.1.3/arch/x86/include/asm/e820.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/e820.h 2011-11-16 18:39:07.000000000 -0500
@@ -69,7 +69,7 @@ struct e820map {
#define ISA_START_ADDRESS 0xa0000
#define ISA_END_ADDRESS 0x100000
#define BIOS_END 0x00100000
#define BIOS_ROM_BASE 0xffe00000
-diff -urNp linux-3.1.1/arch/x86/include/asm/elf.h linux-3.1.1/arch/x86/include/asm/elf.h
---- linux-3.1.1/arch/x86/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/elf.h linux-3.1.3/arch/x86/include/asm/elf.h
+--- linux-3.1.3/arch/x86/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
@@ -237,7 +237,25 @@ extern int force_personality32;
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
-#define arch_randomize_brk arch_randomize_brk
-
#endif /* _ASM_X86_ELF_H */
-diff -urNp linux-3.1.1/arch/x86/include/asm/emergency-restart.h linux-3.1.1/arch/x86/include/asm/emergency-restart.h
---- linux-3.1.1/arch/x86/include/asm/emergency-restart.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/emergency-restart.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/emergency-restart.h linux-3.1.3/arch/x86/include/asm/emergency-restart.h
+--- linux-3.1.3/arch/x86/include/asm/emergency-restart.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/emergency-restart.h 2011-11-16 18:39:07.000000000 -0500
@@ -15,6 +15,6 @@ enum reboot_type {
extern enum reboot_type reboot_type;
+extern void machine_emergency_restart(void) __noreturn;
#endif /* _ASM_X86_EMERGENCY_RESTART_H */
-diff -urNp linux-3.1.1/arch/x86/include/asm/futex.h linux-3.1.1/arch/x86/include/asm/futex.h
---- linux-3.1.1/arch/x86/include/asm/futex.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/futex.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/futex.h linux-3.1.3/arch/x86/include/asm/futex.h
+--- linux-3.1.3/arch/x86/include/asm/futex.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/futex.h 2011-11-16 18:39:07.000000000 -0500
@@ -12,16 +12,18 @@
#include <asm/system.h>
: "i" (-EFAULT), "r" (newval), "1" (oldval)
: "memory"
);
-diff -urNp linux-3.1.1/arch/x86/include/asm/hw_irq.h linux-3.1.1/arch/x86/include/asm/hw_irq.h
---- linux-3.1.1/arch/x86/include/asm/hw_irq.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/hw_irq.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/hw_irq.h linux-3.1.3/arch/x86/include/asm/hw_irq.h
+--- linux-3.1.3/arch/x86/include/asm/hw_irq.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/hw_irq.h 2011-11-16 18:39:07.000000000 -0500
@@ -136,8 +136,8 @@ extern void setup_ioapic_dest(void);
extern void enable_IO_APIC(void);
/* EISA */
extern void eisa_set_level_irq(unsigned int irq);
-diff -urNp linux-3.1.1/arch/x86/include/asm/i387.h linux-3.1.1/arch/x86/include/asm/i387.h
---- linux-3.1.1/arch/x86/include/asm/i387.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/i387.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/i387.h linux-3.1.3/arch/x86/include/asm/i387.h
+--- linux-3.1.3/arch/x86/include/asm/i387.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/i387.h 2011-11-16 18:39:07.000000000 -0500
@@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc
{
int err;
else
clts();
}
-diff -urNp linux-3.1.1/arch/x86/include/asm/io.h linux-3.1.1/arch/x86/include/asm/io.h
---- linux-3.1.1/arch/x86/include/asm/io.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/io.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/io.h linux-3.1.3/arch/x86/include/asm/io.h
+--- linux-3.1.3/arch/x86/include/asm/io.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/io.h 2011-11-16 18:39:07.000000000 -0500
@@ -194,6 +194,17 @@ extern void set_iounmap_nonlazy(void);
#include <linux/vmalloc.h>
/*
* Convert a virtual cached pointer to an uncached pointer
*/
-diff -urNp linux-3.1.1/arch/x86/include/asm/irqflags.h linux-3.1.1/arch/x86/include/asm/irqflags.h
---- linux-3.1.1/arch/x86/include/asm/irqflags.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/irqflags.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/irqflags.h linux-3.1.3/arch/x86/include/asm/irqflags.h
+--- linux-3.1.3/arch/x86/include/asm/irqflags.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/irqflags.h 2011-11-16 18:39:07.000000000 -0500
@@ -141,6 +141,11 @@ static inline notrace unsigned long arch
sti; \
sysexit
#else
#define INTERRUPT_RETURN iret
#define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
-diff -urNp linux-3.1.1/arch/x86/include/asm/kprobes.h linux-3.1.1/arch/x86/include/asm/kprobes.h
---- linux-3.1.1/arch/x86/include/asm/kprobes.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/kprobes.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/kprobes.h linux-3.1.3/arch/x86/include/asm/kprobes.h
+--- linux-3.1.3/arch/x86/include/asm/kprobes.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/kprobes.h 2011-11-16 18:39:07.000000000 -0500
@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
#define RELATIVEJUMP_SIZE 5
#define RELATIVECALL_OPCODE 0xe8
#define flush_insn_slot(p) do { } while (0)
-diff -urNp linux-3.1.1/arch/x86/include/asm/kvm_host.h linux-3.1.1/arch/x86/include/asm/kvm_host.h
---- linux-3.1.1/arch/x86/include/asm/kvm_host.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/kvm_host.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/kvm_host.h linux-3.1.3/arch/x86/include/asm/kvm_host.h
+--- linux-3.1.3/arch/x86/include/asm/kvm_host.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/kvm_host.h 2011-11-16 18:39:07.000000000 -0500
@@ -456,7 +456,7 @@ struct kvm_arch {
unsigned int n_requested_mmu_pages;
unsigned int n_max_mmu_pages;
struct kvm_arch_async_pf {
u32 token;
-diff -urNp linux-3.1.1/arch/x86/include/asm/local.h linux-3.1.1/arch/x86/include/asm/local.h
---- linux-3.1.1/arch/x86/include/asm/local.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/local.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/local.h linux-3.1.3/arch/x86/include/asm/local.h
+--- linux-3.1.3/arch/x86/include/asm/local.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/local.h 2011-11-16 18:39:07.000000000 -0500
@@ -18,26 +18,58 @@ typedef struct {
static inline void local_inc(local_t *l)
: "+r" (i), "+m" (l->a.counter)
: : "memory");
return i + __i;
-diff -urNp linux-3.1.1/arch/x86/include/asm/mman.h linux-3.1.1/arch/x86/include/asm/mman.h
---- linux-3.1.1/arch/x86/include/asm/mman.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/mman.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/mman.h linux-3.1.3/arch/x86/include/asm/mman.h
+--- linux-3.1.3/arch/x86/include/asm/mman.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/mman.h 2011-11-16 18:39:07.000000000 -0500
@@ -5,4 +5,14 @@
#include <asm-generic/mman.h>
+#endif
+
#endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-3.1.1/arch/x86/include/asm/mmu_context.h linux-3.1.1/arch/x86/include/asm/mmu_context.h
---- linux-3.1.1/arch/x86/include/asm/mmu_context.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/mmu_context.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/mmu_context.h linux-3.1.3/arch/x86/include/asm/mmu_context.h
+--- linux-3.1.3/arch/x86/include/asm/mmu_context.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/mmu_context.h 2011-11-16 18:39:07.000000000 -0500
@@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *m
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
}
#define activate_mm(prev, next) \
-diff -urNp linux-3.1.1/arch/x86/include/asm/mmu.h linux-3.1.1/arch/x86/include/asm/mmu.h
---- linux-3.1.1/arch/x86/include/asm/mmu.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/mmu.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/mmu.h linux-3.1.3/arch/x86/include/asm/mmu.h
+--- linux-3.1.3/arch/x86/include/asm/mmu.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/mmu.h 2011-11-16 18:39:07.000000000 -0500
@@ -9,7 +9,7 @@
* we put the segment information here.
*/
} mm_context_t;
#ifdef CONFIG_SMP
-diff -urNp linux-3.1.1/arch/x86/include/asm/module.h linux-3.1.1/arch/x86/include/asm/module.h
---- linux-3.1.1/arch/x86/include/asm/module.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/module.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/module.h linux-3.1.3/arch/x86/include/asm/module.h
+--- linux-3.1.3/arch/x86/include/asm/module.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/module.h 2011-11-16 18:39:07.000000000 -0500
@@ -5,6 +5,7 @@
#ifdef CONFIG_X86_64
+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
+
#endif /* _ASM_X86_MODULE_H */
-diff -urNp linux-3.1.1/arch/x86/include/asm/page_64_types.h linux-3.1.1/arch/x86/include/asm/page_64_types.h
---- linux-3.1.1/arch/x86/include/asm/page_64_types.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/page_64_types.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/page_64_types.h linux-3.1.3/arch/x86/include/asm/page_64_types.h
+--- linux-3.1.3/arch/x86/include/asm/page_64_types.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/page_64_types.h 2011-11-16 18:39:07.000000000 -0500
@@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
/* duplicated to the one in bootmem.h */
extern unsigned long __phys_addr(unsigned long);
#define __phys_reloc_hide(x) (x)
-diff -urNp linux-3.1.1/arch/x86/include/asm/paravirt.h linux-3.1.1/arch/x86/include/asm/paravirt.h
---- linux-3.1.1/arch/x86/include/asm/paravirt.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/paravirt.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/paravirt.h linux-3.1.3/arch/x86/include/asm/paravirt.h
+--- linux-3.1.3/arch/x86/include/asm/paravirt.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/paravirt.h 2011-11-16 18:39:07.000000000 -0500
@@ -667,6 +667,18 @@ static inline void set_pgd(pgd_t *pgdp,
val);
}
#endif /* CONFIG_X86_32 */
#endif /* __ASSEMBLY__ */
-diff -urNp linux-3.1.1/arch/x86/include/asm/paravirt_types.h linux-3.1.1/arch/x86/include/asm/paravirt_types.h
---- linux-3.1.1/arch/x86/include/asm/paravirt_types.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/paravirt_types.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/paravirt_types.h linux-3.1.3/arch/x86/include/asm/paravirt_types.h
+--- linux-3.1.3/arch/x86/include/asm/paravirt_types.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/paravirt_types.h 2011-11-16 18:39:07.000000000 -0500
@@ -84,20 +84,20 @@ struct pv_init_ops {
*/
unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
/* This contains all the paravirt structures: we get a convenient
* number for each function using the offset which we use to indicate
-diff -urNp linux-3.1.1/arch/x86/include/asm/pgalloc.h linux-3.1.1/arch/x86/include/asm/pgalloc.h
---- linux-3.1.1/arch/x86/include/asm/pgalloc.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/pgalloc.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/pgalloc.h linux-3.1.3/arch/x86/include/asm/pgalloc.h
+--- linux-3.1.3/arch/x86/include/asm/pgalloc.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/pgalloc.h 2011-11-16 18:39:07.000000000 -0500
@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
pmd_t *pmd, pte_t *pte)
{
set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
}
-diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable-2level.h linux-3.1.1/arch/x86/include/asm/pgtable-2level.h
---- linux-3.1.1/arch/x86/include/asm/pgtable-2level.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/pgtable-2level.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable-2level.h linux-3.1.3/arch/x86/include/asm/pgtable-2level.h
+--- linux-3.1.3/arch/x86/include/asm/pgtable-2level.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/pgtable-2level.h 2011-11-16 18:39:07.000000000 -0500
@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
}
static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable_32.h linux-3.1.1/arch/x86/include/asm/pgtable_32.h
---- linux-3.1.1/arch/x86/include/asm/pgtable_32.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/pgtable_32.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable_32.h linux-3.1.3/arch/x86/include/asm/pgtable_32.h
+--- linux-3.1.3/arch/x86/include/asm/pgtable_32.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/pgtable_32.h 2011-11-16 18:39:07.000000000 -0500
@@ -25,9 +25,6 @@
struct mm_struct;
struct vm_area_struct;
/*
* kern_addr_valid() is (1) for FLATMEM and (0) for
* SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable_32_types.h linux-3.1.1/arch/x86/include/asm/pgtable_32_types.h
---- linux-3.1.1/arch/x86/include/asm/pgtable_32_types.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/pgtable_32_types.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable_32_types.h linux-3.1.3/arch/x86/include/asm/pgtable_32_types.h
+--- linux-3.1.3/arch/x86/include/asm/pgtable_32_types.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/pgtable_32_types.h 2011-11-16 18:39:07.000000000 -0500
@@ -8,7 +8,7 @@
*/
#ifdef CONFIG_X86_PAE
#define MODULES_VADDR VMALLOC_START
#define MODULES_END VMALLOC_END
#define MODULES_LEN (MODULES_VADDR - MODULES_END)
-diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable-3level.h linux-3.1.1/arch/x86/include/asm/pgtable-3level.h
---- linux-3.1.1/arch/x86/include/asm/pgtable-3level.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/pgtable-3level.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable-3level.h linux-3.1.3/arch/x86/include/asm/pgtable-3level.h
+--- linux-3.1.3/arch/x86/include/asm/pgtable-3level.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/pgtable-3level.h 2011-11-16 18:39:07.000000000 -0500
@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
}
/*
-diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable_64.h linux-3.1.1/arch/x86/include/asm/pgtable_64.h
---- linux-3.1.1/arch/x86/include/asm/pgtable_64.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/pgtable_64.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable_64.h linux-3.1.3/arch/x86/include/asm/pgtable_64.h
+--- linux-3.1.3/arch/x86/include/asm/pgtable_64.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/pgtable_64.h 2011-11-16 18:39:07.000000000 -0500
@@ -16,10 +16,13 @@
extern pud_t level3_kernel_pgt[512];
*pgdp = pgd;
}
-diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable_64_types.h linux-3.1.1/arch/x86/include/asm/pgtable_64_types.h
---- linux-3.1.1/arch/x86/include/asm/pgtable_64_types.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/pgtable_64_types.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable_64_types.h linux-3.1.3/arch/x86/include/asm/pgtable_64_types.h
+--- linux-3.1.3/arch/x86/include/asm/pgtable_64_types.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/pgtable_64_types.h 2011-11-16 18:39:07.000000000 -0500
@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
#define MODULES_VADDR _AC(0xffffffffa0000000, UL)
#define MODULES_END _AC(0xffffffffff000000, UL)
+#define ktva_ktla(addr) (addr)
#endif /* _ASM_X86_PGTABLE_64_DEFS_H */
-diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable.h linux-3.1.1/arch/x86/include/asm/pgtable.h
---- linux-3.1.1/arch/x86/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable.h linux-3.1.3/arch/x86/include/asm/pgtable.h
+--- linux-3.1.3/arch/x86/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
@@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm
#ifndef __PAGETABLE_PUD_FOLDED
#include <asm-generic/pgtable.h>
#endif /* __ASSEMBLY__ */
-diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable_types.h linux-3.1.1/arch/x86/include/asm/pgtable_types.h
---- linux-3.1.1/arch/x86/include/asm/pgtable_types.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/pgtable_types.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable_types.h linux-3.1.3/arch/x86/include/asm/pgtable_types.h
+--- linux-3.1.3/arch/x86/include/asm/pgtable_types.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/pgtable_types.h 2011-11-16 18:39:07.000000000 -0500
@@ -16,13 +16,12 @@
#define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
#define _PAGE_BIT_PAT 7 /* on 4KB pages */
#define pgprot_writecombine pgprot_writecombine
extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff -urNp linux-3.1.1/arch/x86/include/asm/processor.h linux-3.1.1/arch/x86/include/asm/processor.h
---- linux-3.1.1/arch/x86/include/asm/processor.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/processor.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/processor.h linux-3.1.3/arch/x86/include/asm/processor.h
+--- linux-3.1.3/arch/x86/include/asm/processor.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/processor.h 2011-11-16 18:39:07.000000000 -0500
@@ -266,7 +266,7 @@ struct tss_struct {
} ____cacheline_aligned;
#define KSTK_EIP(task) (task_pt_regs(task)->ip)
/* Get/set a process' ability to use the timestamp counter instruction */
-diff -urNp linux-3.1.1/arch/x86/include/asm/ptrace.h linux-3.1.1/arch/x86/include/asm/ptrace.h
---- linux-3.1.1/arch/x86/include/asm/ptrace.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/ptrace.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/ptrace.h linux-3.1.3/arch/x86/include/asm/ptrace.h
+--- linux-3.1.3/arch/x86/include/asm/ptrace.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/ptrace.h 2011-11-16 18:39:07.000000000 -0500
@@ -156,28 +156,29 @@ static inline unsigned long regs_return_
}
#endif
}
#endif
-diff -urNp linux-3.1.1/arch/x86/include/asm/reboot.h linux-3.1.1/arch/x86/include/asm/reboot.h
---- linux-3.1.1/arch/x86/include/asm/reboot.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/reboot.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/reboot.h linux-3.1.3/arch/x86/include/asm/reboot.h
+--- linux-3.1.3/arch/x86/include/asm/reboot.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/reboot.h 2011-11-16 18:39:07.000000000 -0500
@@ -6,19 +6,19 @@
struct pt_regs;
/* These must match dispatch_table in reboot_32.S */
#define MRR_BIOS 0
#define MRR_APM 1
-diff -urNp linux-3.1.1/arch/x86/include/asm/rwsem.h linux-3.1.1/arch/x86/include/asm/rwsem.h
---- linux-3.1.1/arch/x86/include/asm/rwsem.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/rwsem.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/rwsem.h linux-3.1.3/arch/x86/include/asm/rwsem.h
+--- linux-3.1.3/arch/x86/include/asm/rwsem.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/rwsem.h 2011-11-16 18:39:07.000000000 -0500
@@ -64,6 +64,14 @@ static inline void __down_read(struct rw
{
asm volatile("# beginning down_read\n\t"
: "+r" (tmp), "+m" (sem->count)
: : "memory");
-diff -urNp linux-3.1.1/arch/x86/include/asm/segment.h linux-3.1.1/arch/x86/include/asm/segment.h
---- linux-3.1.1/arch/x86/include/asm/segment.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/segment.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/segment.h linux-3.1.3/arch/x86/include/asm/segment.h
+--- linux-3.1.3/arch/x86/include/asm/segment.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/segment.h 2011-11-16 18:39:07.000000000 -0500
@@ -64,10 +64,15 @@
* 26 - ESPFIX small SS
* 27 - per-cpu [ offset to per-cpu data area ]
#define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
#define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
#define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
-diff -urNp linux-3.1.1/arch/x86/include/asm/smp.h linux-3.1.1/arch/x86/include/asm/smp.h
---- linux-3.1.1/arch/x86/include/asm/smp.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/smp.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/smp.h linux-3.1.3/arch/x86/include/asm/smp.h
+--- linux-3.1.3/arch/x86/include/asm/smp.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/smp.h 2011-11-16 18:39:07.000000000 -0500
@@ -36,7 +36,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_
/* cpus sharing the last level cache: */
DECLARE_PER_CPU(cpumask_var_t, cpu_llc_shared_map);
#define safe_smp_processor_id() smp_processor_id()
#endif
-diff -urNp linux-3.1.1/arch/x86/include/asm/spinlock.h linux-3.1.1/arch/x86/include/asm/spinlock.h
---- linux-3.1.1/arch/x86/include/asm/spinlock.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/spinlock.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/spinlock.h linux-3.1.3/arch/x86/include/asm/spinlock.h
+--- linux-3.1.3/arch/x86/include/asm/spinlock.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/spinlock.h 2011-11-16 18:39:07.000000000 -0500
@@ -248,6 +248,14 @@ static inline int arch_write_can_lock(ar
static inline void arch_read_lock(arch_rwlock_t *rw)
{
: "+m" (rw->write) : "i" (RW_LOCK_BIAS) : "memory");
}
-diff -urNp linux-3.1.1/arch/x86/include/asm/stackprotector.h linux-3.1.1/arch/x86/include/asm/stackprotector.h
---- linux-3.1.1/arch/x86/include/asm/stackprotector.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/stackprotector.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/stackprotector.h linux-3.1.3/arch/x86/include/asm/stackprotector.h
+--- linux-3.1.3/arch/x86/include/asm/stackprotector.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/stackprotector.h 2011-11-16 18:39:07.000000000 -0500
@@ -48,7 +48,7 @@
* head_32 for boot CPU and setup_per_cpu_areas() for others.
*/
asm volatile ("mov %0, %%gs" : : "r" (0));
#endif
}
-diff -urNp linux-3.1.1/arch/x86/include/asm/stacktrace.h linux-3.1.1/arch/x86/include/asm/stacktrace.h
---- linux-3.1.1/arch/x86/include/asm/stacktrace.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/stacktrace.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/stacktrace.h linux-3.1.3/arch/x86/include/asm/stacktrace.h
+--- linux-3.1.3/arch/x86/include/asm/stacktrace.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/stacktrace.h 2011-11-16 18:39:07.000000000 -0500
@@ -11,28 +11,20 @@
extern int kstack_depth_to_print;
};
void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
-diff -urNp linux-3.1.1/arch/x86/include/asm/sys_ia32.h linux-3.1.1/arch/x86/include/asm/sys_ia32.h
---- linux-3.1.1/arch/x86/include/asm/sys_ia32.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/sys_ia32.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/sys_ia32.h linux-3.1.3/arch/x86/include/asm/sys_ia32.h
+--- linux-3.1.3/arch/x86/include/asm/sys_ia32.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/sys_ia32.h 2011-11-16 18:39:07.000000000 -0500
@@ -40,7 +40,7 @@ asmlinkage long sys32_rt_sigprocmask(int
compat_sigset_t __user *, unsigned int);
asmlinkage long sys32_alarm(unsigned int);
asmlinkage long sys32_sysfs(int, u32, u32);
asmlinkage long sys32_sched_rr_get_interval(compat_pid_t,
-diff -urNp linux-3.1.1/arch/x86/include/asm/system.h linux-3.1.1/arch/x86/include/asm/system.h
---- linux-3.1.1/arch/x86/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/system.h linux-3.1.3/arch/x86/include/asm/system.h
+--- linux-3.1.3/arch/x86/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
@@ -129,7 +129,7 @@ do { \
"call __switch_to\n\t" \
"movq "__percpu_arg([current_task])",%%rsi\n\t" \
/*
* Force strict CPU ordering.
-diff -urNp linux-3.1.1/arch/x86/include/asm/thread_info.h linux-3.1.1/arch/x86/include/asm/thread_info.h
---- linux-3.1.1/arch/x86/include/asm/thread_info.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/thread_info.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/thread_info.h linux-3.1.3/arch/x86/include/asm/thread_info.h
+--- linux-3.1.3/arch/x86/include/asm/thread_info.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/thread_info.h 2011-11-16 18:39:07.000000000 -0500
@@ -10,6 +10,7 @@
#include <linux/compiler.h>
#include <asm/page.h>
+
#endif
#endif /* _ASM_X86_THREAD_INFO_H */
-diff -urNp linux-3.1.1/arch/x86/include/asm/uaccess_32.h linux-3.1.1/arch/x86/include/asm/uaccess_32.h
---- linux-3.1.1/arch/x86/include/asm/uaccess_32.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/uaccess_32.h 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/uaccess_32.h linux-3.1.3/arch/x86/include/asm/uaccess_32.h
+--- linux-3.1.3/arch/x86/include/asm/uaccess_32.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/uaccess_32.h 2011-11-16 18:40:08.000000000 -0500
@@ -43,6 +43,11 @@ unsigned long __must_check __copy_from_u
static __always_inline unsigned long __must_check
__copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
return n;
}
-diff -urNp linux-3.1.1/arch/x86/include/asm/uaccess_64.h linux-3.1.1/arch/x86/include/asm/uaccess_64.h
---- linux-3.1.1/arch/x86/include/asm/uaccess_64.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/uaccess_64.h 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/uaccess_64.h linux-3.1.3/arch/x86/include/asm/uaccess_64.h
+--- linux-3.1.3/arch/x86/include/asm/uaccess_64.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/uaccess_64.h 2011-11-16 18:40:08.000000000 -0500
@@ -10,6 +10,9 @@
#include <asm/alternative.h>
#include <asm/cpufeature.h>
+copy_user_handle_tail(char __user *to, char __user *from, unsigned len, unsigned zerorest);
#endif /* _ASM_X86_UACCESS_64_H */
-diff -urNp linux-3.1.1/arch/x86/include/asm/uaccess.h linux-3.1.1/arch/x86/include/asm/uaccess.h
---- linux-3.1.1/arch/x86/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/uaccess.h linux-3.1.3/arch/x86/include/asm/uaccess.h
+--- linux-3.1.3/arch/x86/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
@@ -7,12 +7,15 @@
#include <linux/compiler.h>
#include <linux/thread_info.h>
} while (0)
#ifdef CONFIG_X86_WP_WORKS_OK
-diff -urNp linux-3.1.1/arch/x86/include/asm/vdso.h linux-3.1.1/arch/x86/include/asm/vdso.h
---- linux-3.1.1/arch/x86/include/asm/vdso.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/vdso.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/vdso.h linux-3.1.3/arch/x86/include/asm/vdso.h
+--- linux-3.1.3/arch/x86/include/asm/vdso.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/vdso.h 2011-11-16 18:39:07.000000000 -0500
@@ -11,7 +11,7 @@ extern const char VDSO32_PRELINK[];
#define VDSO32_SYMBOL(base, name) \
({ \
})
#endif
-diff -urNp linux-3.1.1/arch/x86/include/asm/x86_init.h linux-3.1.1/arch/x86/include/asm/x86_init.h
---- linux-3.1.1/arch/x86/include/asm/x86_init.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/x86_init.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/x86_init.h linux-3.1.3/arch/x86/include/asm/x86_init.h
+--- linux-3.1.3/arch/x86/include/asm/x86_init.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/x86_init.h 2011-11-16 18:39:07.000000000 -0500
@@ -28,7 +28,7 @@ struct x86_init_mpparse {
void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
void (*find_smp_config)(void);
extern struct x86_init_ops x86_init;
extern struct x86_cpuinit_ops x86_cpuinit;
-diff -urNp linux-3.1.1/arch/x86/include/asm/xsave.h linux-3.1.1/arch/x86/include/asm/xsave.h
---- linux-3.1.1/arch/x86/include/asm/xsave.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/include/asm/xsave.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/include/asm/xsave.h linux-3.1.3/arch/x86/include/asm/xsave.h
+--- linux-3.1.3/arch/x86/include/asm/xsave.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/include/asm/xsave.h 2011-11-16 18:39:07.000000000 -0500
@@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav
{
int err;
__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
"2:\n"
".section .fixup,\"ax\"\n"
-diff -urNp linux-3.1.1/arch/x86/Kconfig linux-3.1.1/arch/x86/Kconfig
---- linux-3.1.1/arch/x86/Kconfig 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/Kconfig 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/Kconfig linux-3.1.3/arch/x86/Kconfig
+--- linux-3.1.3/arch/x86/Kconfig 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/Kconfig 2011-11-16 18:40:08.000000000 -0500
@@ -236,7 +236,7 @@ config X86_HT
config X86_32_LAZY_GS
---help---
Map the 32-bit VDSO to the predictable old-style address too.
-diff -urNp linux-3.1.1/arch/x86/Kconfig.cpu linux-3.1.1/arch/x86/Kconfig.cpu
---- linux-3.1.1/arch/x86/Kconfig.cpu 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/Kconfig.cpu 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/Kconfig.cpu linux-3.1.3/arch/x86/Kconfig.cpu
+--- linux-3.1.3/arch/x86/Kconfig.cpu 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/Kconfig.cpu 2011-11-16 18:39:07.000000000 -0500
@@ -341,7 +341,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
config X86_MINIMUM_CPU_FAMILY
int
-diff -urNp linux-3.1.1/arch/x86/Kconfig.debug linux-3.1.1/arch/x86/Kconfig.debug
---- linux-3.1.1/arch/x86/Kconfig.debug 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/Kconfig.debug 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/Kconfig.debug linux-3.1.3/arch/x86/Kconfig.debug
+--- linux-3.1.3/arch/x86/Kconfig.debug 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/Kconfig.debug 2011-11-16 18:39:07.000000000 -0500
@@ -81,7 +81,7 @@ config X86_PTDUMP
config DEBUG_RODATA
bool "Write protect kernel read-only data structures"
---help---
This option helps catch unintended modifications to loadable
kernel module's text and read-only data. It also prevents execution
-diff -urNp linux-3.1.1/arch/x86/kernel/acpi/realmode/Makefile linux-3.1.1/arch/x86/kernel/acpi/realmode/Makefile
---- linux-3.1.1/arch/x86/kernel/acpi/realmode/Makefile 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/acpi/realmode/Makefile 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/acpi/realmode/Makefile linux-3.1.3/arch/x86/kernel/acpi/realmode/Makefile
+--- linux-3.1.3/arch/x86/kernel/acpi/realmode/Makefile 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/acpi/realmode/Makefile 2011-11-16 18:39:07.000000000 -0500
@@ -41,6 +41,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os
$(call cc-option, -fno-stack-protector) \
$(call cc-option, -mpreferred-stack-boundary=2)
KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
GCOV_PROFILE := n
-diff -urNp linux-3.1.1/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.1.1/arch/x86/kernel/acpi/realmode/wakeup.S
---- linux-3.1.1/arch/x86/kernel/acpi/realmode/wakeup.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/acpi/realmode/wakeup.S 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.1.3/arch/x86/kernel/acpi/realmode/wakeup.S
+--- linux-3.1.3/arch/x86/kernel/acpi/realmode/wakeup.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/acpi/realmode/wakeup.S 2011-11-16 18:40:08.000000000 -0500
@@ -108,6 +108,9 @@ wakeup_code:
/* Do any other stuff... */
#else
pushw $0
pushw trampoline_segment
-diff -urNp linux-3.1.1/arch/x86/kernel/acpi/sleep.c linux-3.1.1/arch/x86/kernel/acpi/sleep.c
---- linux-3.1.1/arch/x86/kernel/acpi/sleep.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/acpi/sleep.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/acpi/sleep.c linux-3.1.3/arch/x86/kernel/acpi/sleep.c
+--- linux-3.1.3/arch/x86/kernel/acpi/sleep.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/acpi/sleep.c 2011-11-16 18:39:07.000000000 -0500
@@ -94,8 +94,12 @@ int acpi_suspend_lowlevel(void)
header->trampoline_segment = trampoline_address() >> 4;
#ifdef CONFIG_SMP
initial_gs = per_cpu_offset(smp_processor_id());
#endif
initial_code = (unsigned long)wakeup_long64;
-diff -urNp linux-3.1.1/arch/x86/kernel/acpi/wakeup_32.S linux-3.1.1/arch/x86/kernel/acpi/wakeup_32.S
---- linux-3.1.1/arch/x86/kernel/acpi/wakeup_32.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/acpi/wakeup_32.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/acpi/wakeup_32.S linux-3.1.3/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-3.1.3/arch/x86/kernel/acpi/wakeup_32.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/acpi/wakeup_32.S 2011-11-16 18:39:07.000000000 -0500
@@ -30,13 +30,11 @@ wakeup_pmode_return:
# and restore the stack ... but you need gdt for this to work
movl saved_context_esp, %esp
bogus_magic:
jmp bogus_magic
-diff -urNp linux-3.1.1/arch/x86/kernel/alternative.c linux-3.1.1/arch/x86/kernel/alternative.c
---- linux-3.1.1/arch/x86/kernel/alternative.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/alternative.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/alternative.c linux-3.1.3/arch/x86/kernel/alternative.c
+--- linux-3.1.3/arch/x86/kernel/alternative.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/alternative.c 2011-11-16 18:39:07.000000000 -0500
@@ -276,6 +276,13 @@ void __init_or_module apply_alternatives
*/
for (a = start; a < end; a++) {
return addr;
}
-diff -urNp linux-3.1.1/arch/x86/kernel/apic/apic.c linux-3.1.1/arch/x86/kernel/apic/apic.c
---- linux-3.1.1/arch/x86/kernel/apic/apic.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/apic/apic.c 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/apic/apic.c linux-3.1.3/arch/x86/kernel/apic/apic.c
+--- linux-3.1.3/arch/x86/kernel/apic/apic.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/apic/apic.c 2011-11-16 18:40:08.000000000 -0500
@@ -174,7 +174,7 @@ int first_system_vector = 0xfe;
/*
* Debug level, exported for io_apic.c
bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid);
bitmap_zero(clustermap, NUM_APIC_CLUSTERS);
-diff -urNp linux-3.1.1/arch/x86/kernel/apic/io_apic.c linux-3.1.1/arch/x86/kernel/apic/io_apic.c
---- linux-3.1.1/arch/x86/kernel/apic/io_apic.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/apic/io_apic.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/apic/io_apic.c linux-3.1.3/arch/x86/kernel/apic/io_apic.c
+--- linux-3.1.3/arch/x86/kernel/apic/io_apic.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/apic/io_apic.c 2011-11-16 18:39:07.000000000 -0500
@@ -1028,7 +1028,7 @@ int IO_APIC_get_PCI_irq_vector(int bus,
}
EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
eoi_ioapic_irq(irq, cfg);
}
-diff -urNp linux-3.1.1/arch/x86/kernel/apm_32.c linux-3.1.1/arch/x86/kernel/apm_32.c
---- linux-3.1.1/arch/x86/kernel/apm_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/apm_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/apm_32.c linux-3.1.3/arch/x86/kernel/apm_32.c
+--- linux-3.1.3/arch/x86/kernel/apm_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/apm_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -413,7 +413,7 @@ static DEFINE_MUTEX(apm_mutex);
* This is for buggy BIOS's that refer to (real mode) segment 0x40
* even though they are called in protected mode.
proc_create("apm", 0, NULL, &apm_file_ops);
-diff -urNp linux-3.1.1/arch/x86/kernel/asm-offsets_64.c linux-3.1.1/arch/x86/kernel/asm-offsets_64.c
---- linux-3.1.1/arch/x86/kernel/asm-offsets_64.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/asm-offsets_64.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/asm-offsets_64.c linux-3.1.3/arch/x86/kernel/asm-offsets_64.c
+--- linux-3.1.3/arch/x86/kernel/asm-offsets_64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/asm-offsets_64.c 2011-11-16 18:39:07.000000000 -0500
@@ -69,6 +69,7 @@ int main(void)
BLANK();
#undef ENTRY
OFFSET(TSS_ist, tss_struct, x86_tss.ist);
BLANK();
-diff -urNp linux-3.1.1/arch/x86/kernel/asm-offsets.c linux-3.1.1/arch/x86/kernel/asm-offsets.c
---- linux-3.1.1/arch/x86/kernel/asm-offsets.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/asm-offsets.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/asm-offsets.c linux-3.1.3/arch/x86/kernel/asm-offsets.c
+--- linux-3.1.3/arch/x86/kernel/asm-offsets.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/asm-offsets.c 2011-11-16 18:39:07.000000000 -0500
@@ -33,6 +33,8 @@ void common(void) {
OFFSET(TI_status, thread_info, status);
OFFSET(TI_addr_limit, thread_info, addr_limit);
#ifdef CONFIG_XEN
BLANK();
OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
-diff -urNp linux-3.1.1/arch/x86/kernel/cpu/amd.c linux-3.1.1/arch/x86/kernel/cpu/amd.c
---- linux-3.1.1/arch/x86/kernel/cpu/amd.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/cpu/amd.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/cpu/amd.c linux-3.1.3/arch/x86/kernel/cpu/amd.c
+--- linux-3.1.3/arch/x86/kernel/cpu/amd.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/cpu/amd.c 2011-11-16 18:39:07.000000000 -0500
@@ -647,7 +647,7 @@ static unsigned int __cpuinit amd_size_c
unsigned int size)
{
/* Duron Rev A0 */
if (c->x86_model == 3 && c->x86_mask == 0)
size = 64;
-diff -urNp linux-3.1.1/arch/x86/kernel/cpu/common.c linux-3.1.1/arch/x86/kernel/cpu/common.c
---- linux-3.1.1/arch/x86/kernel/cpu/common.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/cpu/common.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/cpu/common.c linux-3.1.3/arch/x86/kernel/cpu/common.c
+--- linux-3.1.3/arch/x86/kernel/cpu/common.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/cpu/common.c 2011-11-16 18:39:07.000000000 -0500
@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
struct thread_struct *thread = &curr->thread;
if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-3.1.1/arch/x86/kernel/cpu/intel.c linux-3.1.1/arch/x86/kernel/cpu/intel.c
---- linux-3.1.1/arch/x86/kernel/cpu/intel.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/cpu/intel.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/cpu/intel.c linux-3.1.3/arch/x86/kernel/cpu/intel.c
+--- linux-3.1.3/arch/x86/kernel/cpu/intel.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/cpu/intel.c 2011-11-16 18:39:07.000000000 -0500
@@ -172,7 +172,7 @@ static void __cpuinit trap_init_f00f_bug
* Update the IDT descriptor and reload the IDT so that
* it uses the read-only mapped virtual address.
load_idt(&idt_descr);
}
#endif
-diff -urNp linux-3.1.1/arch/x86/kernel/cpu/Makefile linux-3.1.1/arch/x86/kernel/cpu/Makefile
---- linux-3.1.1/arch/x86/kernel/cpu/Makefile 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/cpu/Makefile 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/cpu/Makefile linux-3.1.3/arch/x86/kernel/cpu/Makefile
+--- linux-3.1.3/arch/x86/kernel/cpu/Makefile 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/cpu/Makefile 2011-11-16 18:39:07.000000000 -0500
@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
CFLAGS_REMOVE_perf_event.o = -pg
endif
obj-y := intel_cacheinfo.o scattered.o topology.o
obj-y += proc.o capflags.o powerflags.o common.o
obj-y += vmware.o hypervisor.o sched.o mshyperv.o
-diff -urNp linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce.c linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce.c linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce.c 2011-11-16 18:39:07.000000000 -0500
@@ -42,6 +42,7 @@
#include <asm/processor.h>
#include <asm/mce.h>
atomic_set(&mce_executing, 0);
atomic_set(&mce_callin, 0);
atomic_set(&global_nwo, 0);
-diff -urNp linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce-inject.c
---- linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce-inject.c
+--- linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-11-16 18:39:07.000000000 -0500
@@ -215,7 +215,9 @@ static int inject_init(void)
if (!alloc_cpumask_var(&mce_inject_cpumask, GFP_KERNEL))
return -ENOMEM;
register_die_notifier(&mce_raise_nb);
return 0;
}
-diff -urNp linux-3.1.1/arch/x86/kernel/cpu/mtrr/main.c linux-3.1.1/arch/x86/kernel/cpu/mtrr/main.c
---- linux-3.1.1/arch/x86/kernel/cpu/mtrr/main.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/cpu/mtrr/main.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/cpu/mtrr/main.c linux-3.1.3/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-3.1.3/arch/x86/kernel/cpu/mtrr/main.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/cpu/mtrr/main.c 2011-11-16 18:39:07.000000000 -0500
@@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
u64 size_or_mask, size_and_mask;
static bool mtrr_aps_delayed_init;
const struct mtrr_ops *mtrr_if;
-diff -urNp linux-3.1.1/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.1.1/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-3.1.1/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.1.3/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-3.1.3/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-11-16 18:39:07.000000000 -0500
@@ -25,7 +25,7 @@ struct mtrr_ops {
int (*validate_add_page)(unsigned long base, unsigned long size,
unsigned int type);
extern int generic_get_free_region(unsigned long base, unsigned long size,
int replace_reg);
-diff -urNp linux-3.1.1/arch/x86/kernel/cpu/perf_event.c linux-3.1.1/arch/x86/kernel/cpu/perf_event.c
---- linux-3.1.1/arch/x86/kernel/cpu/perf_event.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/cpu/perf_event.c 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/cpu/perf_event.c linux-3.1.3/arch/x86/kernel/cpu/perf_event.c
+--- linux-3.1.3/arch/x86/kernel/cpu/perf_event.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/cpu/perf_event.c 2011-11-16 18:40:08.000000000 -0500
@@ -795,6 +795,8 @@ static int x86_schedule_events(struct cp
int i, j, w, wmax, num = 0;
struct hw_perf_event *hwc;
}
}
-diff -urNp linux-3.1.1/arch/x86/kernel/crash.c linux-3.1.1/arch/x86/kernel/crash.c
---- linux-3.1.1/arch/x86/kernel/crash.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/crash.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/crash.c linux-3.1.3/arch/x86/kernel/crash.c
+--- linux-3.1.3/arch/x86/kernel/crash.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/crash.c 2011-11-16 18:39:07.000000000 -0500
@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu,
regs = args->regs;
crash_fixup_ss_esp(&fixed_regs, regs);
regs = &fixed_regs;
}
-diff -urNp linux-3.1.1/arch/x86/kernel/doublefault_32.c linux-3.1.1/arch/x86/kernel/doublefault_32.c
---- linux-3.1.1/arch/x86/kernel/doublefault_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/doublefault_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/doublefault_32.c linux-3.1.3/arch/x86/kernel/doublefault_32.c
+--- linux-3.1.3/arch/x86/kernel/doublefault_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/doublefault_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -11,7 +11,7 @@
#define DOUBLEFAULT_STACKSIZE (1024)
.fs = __KERNEL_PERCPU,
.__cr3 = __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-3.1.1/arch/x86/kernel/dumpstack_32.c linux-3.1.1/arch/x86/kernel/dumpstack_32.c
---- linux-3.1.1/arch/x86/kernel/dumpstack_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/dumpstack_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/dumpstack_32.c linux-3.1.3/arch/x86/kernel/dumpstack_32.c
+--- linux-3.1.3/arch/x86/kernel/dumpstack_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/dumpstack_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task
bp = stack_frame(task, regs);
+}
+EXPORT_SYMBOL(pax_check_alloca);
+#endif
-diff -urNp linux-3.1.1/arch/x86/kernel/dumpstack_64.c linux-3.1.1/arch/x86/kernel/dumpstack_64.c
---- linux-3.1.1/arch/x86/kernel/dumpstack_64.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/dumpstack_64.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/dumpstack_64.c linux-3.1.3/arch/x86/kernel/dumpstack_64.c
+--- linux-3.1.3/arch/x86/kernel/dumpstack_64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/dumpstack_64.c 2011-11-16 18:39:07.000000000 -0500
@@ -119,9 +119,9 @@ void dump_trace(struct task_struct *task
unsigned long *irq_stack_end =
(unsigned long *)per_cpu(irq_stack_ptr, cpu);
+}
+EXPORT_SYMBOL(pax_check_alloca);
+#endif
-diff -urNp linux-3.1.1/arch/x86/kernel/dumpstack.c linux-3.1.1/arch/x86/kernel/dumpstack.c
---- linux-3.1.1/arch/x86/kernel/dumpstack.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/dumpstack.c 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/dumpstack.c linux-3.1.3/arch/x86/kernel/dumpstack.c
+--- linux-3.1.3/arch/x86/kernel/dumpstack.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/dumpstack.c 2011-11-16 18:40:08.000000000 -0500
@@ -2,6 +2,9 @@
* Copyright (C) 1991, 1992 Linus Torvalds
* Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
report_bug(regs->ip, regs);
if (__die(str, regs, err))
-diff -urNp linux-3.1.1/arch/x86/kernel/early_printk.c linux-3.1.1/arch/x86/kernel/early_printk.c
---- linux-3.1.1/arch/x86/kernel/early_printk.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/early_printk.c 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/early_printk.c linux-3.1.3/arch/x86/kernel/early_printk.c
+--- linux-3.1.3/arch/x86/kernel/early_printk.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/early_printk.c 2011-11-16 18:40:08.000000000 -0500
@@ -7,6 +7,7 @@
#include <linux/pci_regs.h>
#include <linux/pci_ids.h>
va_start(ap, fmt);
n = vscnprintf(buf, sizeof(buf), fmt, ap);
early_console->write(early_console, buf, n);
-diff -urNp linux-3.1.1/arch/x86/kernel/entry_32.S linux-3.1.1/arch/x86/kernel/entry_32.S
---- linux-3.1.1/arch/x86/kernel/entry_32.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/entry_32.S 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/entry_32.S linux-3.1.3/arch/x86/kernel/entry_32.S
+--- linux-3.1.3/arch/x86/kernel/entry_32.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/entry_32.S 2011-11-16 18:40:08.000000000 -0500
@@ -186,13 +186,146 @@
/*CFI_REL_OFFSET gs, PT_GS*/
.endm
#endif
/*
-diff -urNp linux-3.1.1/arch/x86/kernel/entry_64.S linux-3.1.1/arch/x86/kernel/entry_64.S
---- linux-3.1.1/arch/x86/kernel/entry_64.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/entry_64.S 2011-11-17 18:28:56.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/entry_64.S
+--- linux-3.1.3/arch/x86/kernel/entry_64.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/entry_64.S 2011-11-17 18:28:56.000000000 -0500
@@ -55,6 +55,8 @@
#include <asm/paravirt.h>
#include <asm/ftrace.h>
/*
* End of kprobes section
-diff -urNp linux-3.1.1/arch/x86/kernel/ftrace.c linux-3.1.1/arch/x86/kernel/ftrace.c
---- linux-3.1.1/arch/x86/kernel/ftrace.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/ftrace.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/ftrace.c linux-3.1.3/arch/x86/kernel/ftrace.c
+--- linux-3.1.3/arch/x86/kernel/ftrace.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/ftrace.c 2011-11-16 18:39:07.000000000 -0500
@@ -126,7 +126,7 @@ static void *mod_code_ip; /* holds the
static const void *mod_code_newcode; /* holds the text to write to the IP */
if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
return -EFAULT;
-diff -urNp linux-3.1.1/arch/x86/kernel/head32.c linux-3.1.1/arch/x86/kernel/head32.c
---- linux-3.1.1/arch/x86/kernel/head32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/head32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/head32.c linux-3.1.3/arch/x86/kernel/head32.c
+--- linux-3.1.3/arch/x86/kernel/head32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/head32.c 2011-11-16 18:39:07.000000000 -0500
@@ -19,6 +19,7 @@
#include <asm/io_apic.h>
#include <asm/bios_ebda.h>
#ifdef CONFIG_BLK_DEV_INITRD
/* Reserve INITRD */
-diff -urNp linux-3.1.1/arch/x86/kernel/head_32.S linux-3.1.1/arch/x86/kernel/head_32.S
---- linux-3.1.1/arch/x86/kernel/head_32.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/head_32.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/head_32.S linux-3.1.3/arch/x86/kernel/head_32.S
+--- linux-3.1.3/arch/x86/kernel/head_32.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/head_32.S 2011-11-16 18:39:07.000000000 -0500
@@ -25,6 +25,12 @@
/* Physical address */
#define pa(X) ((X) - __PAGE_OFFSET)
+ /* Be sure this is zeroed to avoid false validations in Xen */
+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
+ .endr
-diff -urNp linux-3.1.1/arch/x86/kernel/head_64.S linux-3.1.1/arch/x86/kernel/head_64.S
---- linux-3.1.1/arch/x86/kernel/head_64.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/head_64.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/head_64.S linux-3.1.3/arch/x86/kernel/head_64.S
+--- linux-3.1.3/arch/x86/kernel/head_64.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/head_64.S 2011-11-16 18:39:07.000000000 -0500
@@ -19,6 +19,7 @@
#include <asm/cache.h>
#include <asm/processor-flags.h>
__PAGE_ALIGNED_BSS
.align PAGE_SIZE
-diff -urNp linux-3.1.1/arch/x86/kernel/i386_ksyms_32.c linux-3.1.1/arch/x86/kernel/i386_ksyms_32.c
---- linux-3.1.1/arch/x86/kernel/i386_ksyms_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/i386_ksyms_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/i386_ksyms_32.c linux-3.1.3/arch/x86/kernel/i386_ksyms_32.c
+--- linux-3.1.3/arch/x86/kernel/i386_ksyms_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/i386_ksyms_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
EXPORT_SYMBOL(cmpxchg8b_emu);
#endif
+#ifdef CONFIG_PAX_KERNEXEC
+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
+#endif
-diff -urNp linux-3.1.1/arch/x86/kernel/i8259.c linux-3.1.1/arch/x86/kernel/i8259.c
---- linux-3.1.1/arch/x86/kernel/i8259.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/i8259.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/i8259.c linux-3.1.3/arch/x86/kernel/i8259.c
+--- linux-3.1.3/arch/x86/kernel/i8259.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/i8259.c 2011-11-16 18:39:07.000000000 -0500
@@ -210,7 +210,7 @@ spurious_8259A_irq:
"spurious 8259A interrupt: IRQ%d.\n", irq);
spurious_irq_mask |= irqmask;
/*
* Theoretically we do not have to handle this IRQ,
* but in Linux this does not cause problems and is
-diff -urNp linux-3.1.1/arch/x86/kernel/init_task.c linux-3.1.1/arch/x86/kernel/init_task.c
---- linux-3.1.1/arch/x86/kernel/init_task.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/init_task.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/init_task.c linux-3.1.3/arch/x86/kernel/init_task.c
+--- linux-3.1.3/arch/x86/kernel/init_task.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/init_task.c 2011-11-16 18:39:07.000000000 -0500
@@ -20,8 +20,7 @@ static struct sighand_struct init_sighan
* way process stacks are handled. This is done by having a special
* "init_task" linker map entry..
-
+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
+EXPORT_SYMBOL(init_tss);
-diff -urNp linux-3.1.1/arch/x86/kernel/ioport.c linux-3.1.1/arch/x86/kernel/ioport.c
---- linux-3.1.1/arch/x86/kernel/ioport.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/ioport.c 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/ioport.c linux-3.1.3/arch/x86/kernel/ioport.c
+--- linux-3.1.3/arch/x86/kernel/ioport.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/ioport.c 2011-11-16 18:40:08.000000000 -0500
@@ -6,6 +6,7 @@
#include <linux/sched.h>
#include <linux/kernel.h>
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
}
-diff -urNp linux-3.1.1/arch/x86/kernel/irq_32.c linux-3.1.1/arch/x86/kernel/irq_32.c
---- linux-3.1.1/arch/x86/kernel/irq_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/irq_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/irq_32.c linux-3.1.3/arch/x86/kernel/irq_32.c
+--- linux-3.1.3/arch/x86/kernel/irq_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/irq_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -36,7 +36,7 @@ static int check_stack_overflow(void)
__asm__ __volatile__("andl %%esp,%0" :
"=r" (sp) : "0" (THREAD_SIZE - 1));
/*
* Shouldn't happen, we returned above if in_interrupt():
*/
-diff -urNp linux-3.1.1/arch/x86/kernel/irq.c linux-3.1.1/arch/x86/kernel/irq.c
---- linux-3.1.1/arch/x86/kernel/irq.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/irq.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/irq.c linux-3.1.3/arch/x86/kernel/irq.c
+--- linux-3.1.3/arch/x86/kernel/irq.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/irq.c 2011-11-16 18:39:07.000000000 -0500
@@ -17,7 +17,7 @@
#include <asm/mce.h>
#include <asm/hw_irq.h>
#endif
return sum;
}
-diff -urNp linux-3.1.1/arch/x86/kernel/kgdb.c linux-3.1.1/arch/x86/kernel/kgdb.c
---- linux-3.1.1/arch/x86/kernel/kgdb.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/kgdb.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/kgdb.c linux-3.1.3/arch/x86/kernel/kgdb.c
+--- linux-3.1.3/arch/x86/kernel/kgdb.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/kgdb.c 2011-11-16 18:39:07.000000000 -0500
@@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem,
#ifdef CONFIG_X86_32
switch (regno) {
if (user_mode(regs))
return single_step_cont(regs, args);
break;
-diff -urNp linux-3.1.1/arch/x86/kernel/kprobes.c linux-3.1.1/arch/x86/kernel/kprobes.c
---- linux-3.1.1/arch/x86/kernel/kprobes.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/kprobes.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/kprobes.c linux-3.1.3/arch/x86/kernel/kprobes.c
+--- linux-3.1.3/arch/x86/kernel/kprobes.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/kprobes.c 2011-11-16 18:39:07.000000000 -0500
@@ -117,8 +117,11 @@ static void __kprobes __synthesize_relat
} __attribute__((packed)) *insn;
RELATIVE_ADDR_SIZE);
insn_buf[0] = RELATIVEJUMP_OPCODE;
-diff -urNp linux-3.1.1/arch/x86/kernel/kvm.c linux-3.1.1/arch/x86/kernel/kvm.c
---- linux-3.1.1/arch/x86/kernel/kvm.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/kvm.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/kvm.c linux-3.1.3/arch/x86/kernel/kvm.c
+--- linux-3.1.3/arch/x86/kernel/kvm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/kvm.c 2011-11-16 18:39:07.000000000 -0500
@@ -437,6 +437,7 @@ static void __init paravirt_ops_setup(vo
pv_mmu_ops.set_pud = kvm_set_pud;
#if PAGETABLE_LEVELS == 4
#endif
#endif
pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;
-diff -urNp linux-3.1.1/arch/x86/kernel/ldt.c linux-3.1.1/arch/x86/kernel/ldt.c
---- linux-3.1.1/arch/x86/kernel/ldt.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/ldt.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/ldt.c linux-3.1.3/arch/x86/kernel/ldt.c
+--- linux-3.1.3/arch/x86/kernel/ldt.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/ldt.c 2011-11-16 18:39:07.000000000 -0500
@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i
if (reload) {
#ifdef CONFIG_SMP
fill_ldt(&ldt, &ldt_info);
if (oldmode)
ldt.avl = 0;
-diff -urNp linux-3.1.1/arch/x86/kernel/machine_kexec_32.c linux-3.1.1/arch/x86/kernel/machine_kexec_32.c
---- linux-3.1.1/arch/x86/kernel/machine_kexec_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/machine_kexec_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/machine_kexec_32.c linux-3.1.3/arch/x86/kernel/machine_kexec_32.c
+--- linux-3.1.3/arch/x86/kernel/machine_kexec_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/machine_kexec_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -27,7 +27,7 @@
#include <asm/cacheflush.h>
#include <asm/debugreg.h>
relocate_kernel_ptr = control_page;
page_list[PA_CONTROL_PAGE] = __pa(control_page);
-diff -urNp linux-3.1.1/arch/x86/kernel/microcode_intel.c linux-3.1.1/arch/x86/kernel/microcode_intel.c
---- linux-3.1.1/arch/x86/kernel/microcode_intel.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/microcode_intel.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/microcode_intel.c linux-3.1.3/arch/x86/kernel/microcode_intel.c
+--- linux-3.1.3/arch/x86/kernel/microcode_intel.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/microcode_intel.c 2011-11-16 18:39:07.000000000 -0500
@@ -440,13 +440,13 @@ static enum ucode_state request_microcod
static int get_ucode_user(void *to, const void *from, size_t n)
}
static void microcode_fini_cpu(int cpu)
-diff -urNp linux-3.1.1/arch/x86/kernel/module.c linux-3.1.1/arch/x86/kernel/module.c
---- linux-3.1.1/arch/x86/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/module.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/module.c linux-3.1.3/arch/x86/kernel/module.c
+--- linux-3.1.3/arch/x86/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/module.c 2011-11-16 18:39:07.000000000 -0500
@@ -36,15 +36,60 @@
#define DEBUGP(fmt...)
#endif
#if 0
if ((s64)val != *(s32 *)loc)
goto overflow;
-diff -urNp linux-3.1.1/arch/x86/kernel/paravirt.c linux-3.1.1/arch/x86/kernel/paravirt.c
---- linux-3.1.1/arch/x86/kernel/paravirt.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/paravirt.c 2011-11-17 18:29:42.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/paravirt.c linux-3.1.3/arch/x86/kernel/paravirt.c
+--- linux-3.1.3/arch/x86/kernel/paravirt.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/paravirt.c 2011-11-17 18:29:42.000000000 -0500
@@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
{
return x;
};
EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-3.1.1/arch/x86/kernel/paravirt-spinlocks.c linux-3.1.1/arch/x86/kernel/paravirt-spinlocks.c
---- linux-3.1.1/arch/x86/kernel/paravirt-spinlocks.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/paravirt-spinlocks.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/paravirt-spinlocks.c linux-3.1.3/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-3.1.3/arch/x86/kernel/paravirt-spinlocks.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/paravirt-spinlocks.c 2011-11-16 18:39:07.000000000 -0500
@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t
arch_spin_lock(lock);
}
#ifdef CONFIG_SMP
.spin_is_locked = __ticket_spin_is_locked,
.spin_is_contended = __ticket_spin_is_contended,
-diff -urNp linux-3.1.1/arch/x86/kernel/pci-iommu_table.c linux-3.1.1/arch/x86/kernel/pci-iommu_table.c
---- linux-3.1.1/arch/x86/kernel/pci-iommu_table.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/pci-iommu_table.c 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/pci-iommu_table.c linux-3.1.3/arch/x86/kernel/pci-iommu_table.c
+--- linux-3.1.3/arch/x86/kernel/pci-iommu_table.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/pci-iommu_table.c 2011-11-16 18:40:08.000000000 -0500
@@ -2,7 +2,7 @@
#include <asm/iommu_table.h>
#include <linux/string.h>
/* Simple cyclic dependency checker. */
for (p = start; p < finish; p++) {
q = find_dependents_of(start, finish, p);
-diff -urNp linux-3.1.1/arch/x86/kernel/process_32.c linux-3.1.1/arch/x86/kernel/process_32.c
---- linux-3.1.1/arch/x86/kernel/process_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/process_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/process_32.c linux-3.1.3/arch/x86/kernel/process_32.c
+--- linux-3.1.3/arch/x86/kernel/process_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/process_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -66,6 +66,7 @@ asmlinkage void ret_from_fork(void) __as
unsigned long thread_saved_pc(struct task_struct *tsk)
{
return 0;
}
-
-diff -urNp linux-3.1.1/arch/x86/kernel/process_64.c linux-3.1.1/arch/x86/kernel/process_64.c
---- linux-3.1.1/arch/x86/kernel/process_64.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/process_64.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/process_64.c linux-3.1.3/arch/x86/kernel/process_64.c
+--- linux-3.1.3/arch/x86/kernel/process_64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/process_64.c 2011-11-16 18:39:07.000000000 -0500
@@ -88,7 +88,7 @@ static void __exit_idle(void)
void exit_idle(void)
{
return 0;
ip = *(u64 *)(fp+8);
if (!in_sched_functions(ip))
-diff -urNp linux-3.1.1/arch/x86/kernel/process.c linux-3.1.1/arch/x86/kernel/process.c
---- linux-3.1.1/arch/x86/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/process.c linux-3.1.3/arch/x86/kernel/process.c
+--- linux-3.1.3/arch/x86/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
@@ -48,16 +48,33 @@ void free_thread_xstate(struct task_stru
void free_thread_info(struct thread_info *ti)
+#endif
+}
+#endif
-diff -urNp linux-3.1.1/arch/x86/kernel/ptrace.c linux-3.1.1/arch/x86/kernel/ptrace.c
---- linux-3.1.1/arch/x86/kernel/ptrace.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/ptrace.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/ptrace.c linux-3.1.3/arch/x86/kernel/ptrace.c
+--- linux-3.1.3/arch/x86/kernel/ptrace.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/ptrace.c 2011-11-16 18:39:07.000000000 -0500
@@ -822,7 +822,7 @@ long arch_ptrace(struct task_struct *chi
unsigned long addr, unsigned long data)
{
}
void user_single_step_siginfo(struct task_struct *tsk,
-diff -urNp linux-3.1.1/arch/x86/kernel/pvclock.c linux-3.1.1/arch/x86/kernel/pvclock.c
---- linux-3.1.1/arch/x86/kernel/pvclock.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/pvclock.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/pvclock.c linux-3.1.3/arch/x86/kernel/pvclock.c
+--- linux-3.1.3/arch/x86/kernel/pvclock.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/pvclock.c 2011-11-16 18:39:07.000000000 -0500
@@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvc
return pv_tsc_khz;
}
} while (unlikely(last != ret));
return ret;
-diff -urNp linux-3.1.1/arch/x86/kernel/reboot.c linux-3.1.1/arch/x86/kernel/reboot.c
---- linux-3.1.1/arch/x86/kernel/reboot.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/reboot.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/reboot.c linux-3.1.3/arch/x86/kernel/reboot.c
+--- linux-3.1.3/arch/x86/kernel/reboot.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/reboot.c 2011-11-16 18:39:07.000000000 -0500
@@ -35,7 +35,7 @@ void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);
}
struct machine_ops machine_ops = {
-diff -urNp linux-3.1.1/arch/x86/kernel/setup.c linux-3.1.1/arch/x86/kernel/setup.c
---- linux-3.1.1/arch/x86/kernel/setup.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/setup.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/setup.c linux-3.1.3/arch/x86/kernel/setup.c
+--- linux-3.1.3/arch/x86/kernel/setup.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/setup.c 2011-11-16 18:39:07.000000000 -0500
@@ -447,7 +447,7 @@ static void __init parse_setup_data(void
switch (data->type) {
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-3.1.1/arch/x86/kernel/setup_percpu.c linux-3.1.1/arch/x86/kernel/setup_percpu.c
---- linux-3.1.1/arch/x86/kernel/setup_percpu.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/setup_percpu.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/setup_percpu.c linux-3.1.3/arch/x86/kernel/setup_percpu.c
+--- linux-3.1.3/arch/x86/kernel/setup_percpu.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/setup_percpu.c 2011-11-16 18:39:07.000000000 -0500
@@ -21,19 +21,17 @@
#include <asm/cpu.h>
#include <asm/stackprotector.h>
/*
* Up to this point, the boot CPU has been using .init.data
* area. Reload any changed state for the boot CPU.
-diff -urNp linux-3.1.1/arch/x86/kernel/signal.c linux-3.1.1/arch/x86/kernel/signal.c
---- linux-3.1.1/arch/x86/kernel/signal.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/signal.c 2011-11-16 19:39:49.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/signal.c linux-3.1.3/arch/x86/kernel/signal.c
+--- linux-3.1.3/arch/x86/kernel/signal.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/signal.c 2011-11-16 19:39:49.000000000 -0500
@@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsi
* Align the stack pointer according to the i386 ABI,
* i.e. so that on function entry ((sp + 4) & 15) == 0.
return;
signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-diff -urNp linux-3.1.1/arch/x86/kernel/smpboot.c linux-3.1.1/arch/x86/kernel/smpboot.c
---- linux-3.1.1/arch/x86/kernel/smpboot.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/smpboot.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/smpboot.c linux-3.1.3/arch/x86/kernel/smpboot.c
+--- linux-3.1.3/arch/x86/kernel/smpboot.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/smpboot.c 2011-11-16 18:39:07.000000000 -0500
@@ -709,17 +709,20 @@ static int __cpuinit do_boot_cpu(int api
set_idle_for_cpu(cpu, c_idle.idle);
do_rest:
err = do_boot_cpu(apicid, cpu);
if (err) {
pr_debug("do_boot_cpu failed %d\n", err);
-diff -urNp linux-3.1.1/arch/x86/kernel/step.c linux-3.1.1/arch/x86/kernel/step.c
---- linux-3.1.1/arch/x86/kernel/step.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/step.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/step.c linux-3.1.3/arch/x86/kernel/step.c
+--- linux-3.1.3/arch/x86/kernel/step.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/step.c 2011-11-16 18:39:07.000000000 -0500
@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
struct desc_struct *desc;
unsigned long base;
copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
for (i = 0; i < copied; i++) {
switch (opcode[i]) {
-diff -urNp linux-3.1.1/arch/x86/kernel/syscall_table_32.S linux-3.1.1/arch/x86/kernel/syscall_table_32.S
---- linux-3.1.1/arch/x86/kernel/syscall_table_32.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/syscall_table_32.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/syscall_table_32.S linux-3.1.3/arch/x86/kernel/syscall_table_32.S
+--- linux-3.1.3/arch/x86/kernel/syscall_table_32.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/syscall_table_32.S 2011-11-16 18:39:07.000000000 -0500
@@ -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-3.1.1/arch/x86/kernel/sys_i386_32.c linux-3.1.1/arch/x86/kernel/sys_i386_32.c
---- linux-3.1.1/arch/x86/kernel/sys_i386_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/sys_i386_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/sys_i386_32.c linux-3.1.3/arch/x86/kernel/sys_i386_32.c
+--- linux-3.1.3/arch/x86/kernel/sys_i386_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/sys_i386_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -24,17 +24,224 @@
#include <asm/syscalls.h>
+
+ return addr;
}
-diff -urNp linux-3.1.1/arch/x86/kernel/sys_x86_64.c linux-3.1.1/arch/x86/kernel/sys_x86_64.c
---- linux-3.1.1/arch/x86/kernel/sys_x86_64.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/sys_x86_64.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/sys_x86_64.c linux-3.1.3/arch/x86/kernel/sys_x86_64.c
+--- linux-3.1.3/arch/x86/kernel/sys_x86_64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/sys_x86_64.c 2011-11-16 18:39:07.000000000 -0500
@@ -32,8 +32,8 @@ out:
return error;
}
mm->cached_hole_size = ~0UL;
return addr;
-diff -urNp linux-3.1.1/arch/x86/kernel/tboot.c linux-3.1.1/arch/x86/kernel/tboot.c
---- linux-3.1.1/arch/x86/kernel/tboot.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/tboot.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/tboot.c linux-3.1.3/arch/x86/kernel/tboot.c
+--- linux-3.1.3/arch/x86/kernel/tboot.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/tboot.c 2011-11-16 18:39:07.000000000 -0500
@@ -218,7 +218,7 @@ static int tboot_setup_sleep(void)
void tboot_shutdown(u32 shutdown_type)
register_hotcpu_notifier(&tboot_cpu_notifier);
return 0;
}
-diff -urNp linux-3.1.1/arch/x86/kernel/time.c linux-3.1.1/arch/x86/kernel/time.c
---- linux-3.1.1/arch/x86/kernel/time.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/time.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/time.c linux-3.1.3/arch/x86/kernel/time.c
+--- linux-3.1.3/arch/x86/kernel/time.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/time.c 2011-11-16 18:39:07.000000000 -0500
@@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs
{
unsigned long pc = instruction_pointer(regs);
}
return pc;
}
-diff -urNp linux-3.1.1/arch/x86/kernel/tls.c linux-3.1.1/arch/x86/kernel/tls.c
---- linux-3.1.1/arch/x86/kernel/tls.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/tls.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/tls.c linux-3.1.3/arch/x86/kernel/tls.c
+--- linux-3.1.3/arch/x86/kernel/tls.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/tls.c 2011-11-16 18:39:07.000000000 -0500
@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
return -EINVAL;
set_tls_desc(p, idx, &info, 1);
return 0;
-diff -urNp linux-3.1.1/arch/x86/kernel/trampoline_32.S linux-3.1.1/arch/x86/kernel/trampoline_32.S
---- linux-3.1.1/arch/x86/kernel/trampoline_32.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/trampoline_32.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/trampoline_32.S linux-3.1.3/arch/x86/kernel/trampoline_32.S
+--- linux-3.1.3/arch/x86/kernel/trampoline_32.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/trampoline_32.S 2011-11-16 18:39:07.000000000 -0500
@@ -32,6 +32,12 @@
#include <asm/segment.h>
#include <asm/page_types.h>
# These need to be in the same 64K segment as the above;
# hence we don't use the boot_gdt_descr defined in head.S
-diff -urNp linux-3.1.1/arch/x86/kernel/trampoline_64.S linux-3.1.1/arch/x86/kernel/trampoline_64.S
---- linux-3.1.1/arch/x86/kernel/trampoline_64.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/trampoline_64.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/trampoline_64.S linux-3.1.3/arch/x86/kernel/trampoline_64.S
+--- linux-3.1.3/arch/x86/kernel/trampoline_64.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/trampoline_64.S 2011-11-16 18:39:07.000000000 -0500
@@ -90,7 +90,7 @@ startup_32:
movl $__KERNEL_DS, %eax # Initialize the %ds segment register
movl %eax, %ds
.long tgdt - r_base
.short 0
.quad 0x00cf9b000000ffff # __KERNEL32_CS
-diff -urNp linux-3.1.1/arch/x86/kernel/traps.c linux-3.1.1/arch/x86/kernel/traps.c
---- linux-3.1.1/arch/x86/kernel/traps.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/traps.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/traps.c linux-3.1.3/arch/x86/kernel/traps.c
+--- linux-3.1.3/arch/x86/kernel/traps.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/traps.c 2011-11-16 18:39:07.000000000 -0500
@@ -70,12 +70,6 @@ asmlinkage int system_call(void);
/* Do we ignore FPU interrupts ? */
if (!tsk_used_math(tsk)) {
local_irq_enable();
-diff -urNp linux-3.1.1/arch/x86/kernel/verify_cpu.S linux-3.1.1/arch/x86/kernel/verify_cpu.S
---- linux-3.1.1/arch/x86/kernel/verify_cpu.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/verify_cpu.S 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/verify_cpu.S linux-3.1.3/arch/x86/kernel/verify_cpu.S
+--- linux-3.1.3/arch/x86/kernel/verify_cpu.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/verify_cpu.S 2011-11-16 18:40:08.000000000 -0500
@@ -20,6 +20,7 @@
* arch/x86/boot/compressed/head_64.S: Boot cpu verification
* arch/x86/kernel/trampoline_64.S: secondary processor verification
*
* verify_cpu, returns the status of longmode and SSE in register %eax.
* 0: Success 1: Failure
-diff -urNp linux-3.1.1/arch/x86/kernel/vm86_32.c linux-3.1.1/arch/x86/kernel/vm86_32.c
---- linux-3.1.1/arch/x86/kernel/vm86_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/vm86_32.c 2011-11-16 18:40:08.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/vm86_32.c linux-3.1.3/arch/x86/kernel/vm86_32.c
+--- linux-3.1.3/arch/x86/kernel/vm86_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/vm86_32.c 2011-11-16 18:40:08.000000000 -0500
@@ -41,6 +41,7 @@
#include <linux/ptrace.h>
#include <linux/audit.h>
if (get_user(segoffs, intr_ptr))
goto cannot_handle;
if ((segoffs >> 16) == BIOSSEG)
-diff -urNp linux-3.1.1/arch/x86/kernel/vmlinux.lds.S linux-3.1.1/arch/x86/kernel/vmlinux.lds.S
---- linux-3.1.1/arch/x86/kernel/vmlinux.lds.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/vmlinux.lds.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/vmlinux.lds.S linux-3.1.3/arch/x86/kernel/vmlinux.lds.S
+--- linux-3.1.3/arch/x86/kernel/vmlinux.lds.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/vmlinux.lds.S 2011-11-16 18:39:07.000000000 -0500
@@ -26,6 +26,13 @@
#include <asm/page_types.h>
#include <asm/cache.h>
"kernel image bigger than KERNEL_IMAGE_SIZE");
#ifdef CONFIG_SMP
-diff -urNp linux-3.1.1/arch/x86/kernel/vsyscall_64.c linux-3.1.1/arch/x86/kernel/vsyscall_64.c
---- linux-3.1.1/arch/x86/kernel/vsyscall_64.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/vsyscall_64.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/vsyscall_64.c linux-3.1.3/arch/x86/kernel/vsyscall_64.c
+--- linux-3.1.3/arch/x86/kernel/vsyscall_64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/vsyscall_64.c 2011-11-16 18:39:07.000000000 -0500
@@ -56,15 +56,13 @@ DEFINE_VVAR(struct vsyscall_gtod_data, v
.lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
};
BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_FIRST_PAGE) !=
(unsigned long)VSYSCALL_START);
-diff -urNp linux-3.1.1/arch/x86/kernel/x8664_ksyms_64.c linux-3.1.1/arch/x86/kernel/x8664_ksyms_64.c
---- linux-3.1.1/arch/x86/kernel/x8664_ksyms_64.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/x8664_ksyms_64.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/x8664_ksyms_64.c linux-3.1.3/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-3.1.3/arch/x86/kernel/x8664_ksyms_64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/x8664_ksyms_64.c 2011-11-16 18:39:07.000000000 -0500
@@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
EXPORT_SYMBOL(copy_user_generic_string);
EXPORT_SYMBOL(copy_user_generic_unrolled);
EXPORT_SYMBOL(copy_page);
EXPORT_SYMBOL(clear_page);
-diff -urNp linux-3.1.1/arch/x86/kernel/xsave.c linux-3.1.1/arch/x86/kernel/xsave.c
---- linux-3.1.1/arch/x86/kernel/xsave.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kernel/xsave.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kernel/xsave.c linux-3.1.3/arch/x86/kernel/xsave.c
+--- linux-3.1.3/arch/x86/kernel/xsave.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kernel/xsave.c 2011-11-16 18:39:07.000000000 -0500
@@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_
fx_sw_user->xstate_size > fx_sw_user->extended_size)
return -EINVAL;
buf);
if (unlikely(err)) {
/*
-diff -urNp linux-3.1.1/arch/x86/kvm/emulate.c linux-3.1.1/arch/x86/kvm/emulate.c
---- linux-3.1.1/arch/x86/kvm/emulate.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kvm/emulate.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kvm/emulate.c linux-3.1.3/arch/x86/kvm/emulate.c
+--- linux-3.1.3/arch/x86/kvm/emulate.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kvm/emulate.c 2011-11-16 18:39:07.000000000 -0500
@@ -96,7 +96,7 @@
#define Src2ImmByte (2<<29)
#define Src2One (3<<29)
switch ((_dst).bytes) { \
case 1: \
____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \
-diff -urNp linux-3.1.1/arch/x86/kvm/lapic.c linux-3.1.1/arch/x86/kvm/lapic.c
---- linux-3.1.1/arch/x86/kvm/lapic.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kvm/lapic.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kvm/lapic.c linux-3.1.3/arch/x86/kvm/lapic.c
+--- linux-3.1.3/arch/x86/kvm/lapic.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kvm/lapic.c 2011-11-16 18:39:07.000000000 -0500
@@ -53,7 +53,7 @@
#define APIC_BUS_CYCLE_NS 1
#define APIC_LVT_NUM 6
/* 14 is the version for Xeon and Pentium 8.4.8*/
-diff -urNp linux-3.1.1/arch/x86/kvm/mmu.c linux-3.1.1/arch/x86/kvm/mmu.c
---- linux-3.1.1/arch/x86/kvm/mmu.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kvm/mmu.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kvm/mmu.c linux-3.1.3/arch/x86/kvm/mmu.c
+--- linux-3.1.3/arch/x86/kvm/mmu.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kvm/mmu.c 2011-11-16 18:39:07.000000000 -0500
@@ -3552,7 +3552,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes);
gentry = 0;
kvm_mmu_free_some_pages(vcpu);
++vcpu->kvm->stat.mmu_pte_write;
-diff -urNp linux-3.1.1/arch/x86/kvm/paging_tmpl.h linux-3.1.1/arch/x86/kvm/paging_tmpl.h
---- linux-3.1.1/arch/x86/kvm/paging_tmpl.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kvm/paging_tmpl.h 2011-11-16 19:40:44.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kvm/paging_tmpl.h linux-3.1.3/arch/x86/kvm/paging_tmpl.h
+--- linux-3.1.3/arch/x86/kvm/paging_tmpl.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kvm/paging_tmpl.h 2011-11-16 19:40:44.000000000 -0500
@@ -197,7 +197,7 @@ retry_walk:
if (unlikely(kvm_is_error_hva(host_addr)))
goto error;
spin_unlock(&vcpu->kvm->mmu_lock);
-diff -urNp linux-3.1.1/arch/x86/kvm/svm.c linux-3.1.1/arch/x86/kvm/svm.c
---- linux-3.1.1/arch/x86/kvm/svm.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kvm/svm.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kvm/svm.c linux-3.1.3/arch/x86/kvm/svm.c
+--- linux-3.1.3/arch/x86/kvm/svm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kvm/svm.c 2011-11-16 18:39:07.000000000 -0500
@@ -3381,7 +3381,11 @@ static void reload_tss(struct kvm_vcpu *
int cpu = raw_smp_processor_id();
reload_tss(vcpu);
local_irq_disable();
-diff -urNp linux-3.1.1/arch/x86/kvm/vmx.c linux-3.1.1/arch/x86/kvm/vmx.c
---- linux-3.1.1/arch/x86/kvm/vmx.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kvm/vmx.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kvm/vmx.c linux-3.1.3/arch/x86/kvm/vmx.c
+--- linux-3.1.3/arch/x86/kvm/vmx.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kvm/vmx.c 2011-11-16 18:39:07.000000000 -0500
@@ -1251,7 +1251,11 @@ static void reload_tss(void)
struct desc_struct *descs;
vmx->loaded_vmcs->launched = 1;
vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
-diff -urNp linux-3.1.1/arch/x86/kvm/x86.c linux-3.1.1/arch/x86/kvm/x86.c
---- linux-3.1.1/arch/x86/kvm/x86.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/kvm/x86.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/kvm/x86.c linux-3.1.3/arch/x86/kvm/x86.c
+--- linux-3.1.3/arch/x86/kvm/x86.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/kvm/x86.c 2011-11-16 18:39:07.000000000 -0500
@@ -1334,8 +1334,8 @@ static int xen_hvm_config(struct kvm_vcp
{
struct kvm *kvm = vcpu->kvm;
{
int r;
struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
-diff -urNp linux-3.1.1/arch/x86/lguest/boot.c linux-3.1.1/arch/x86/lguest/boot.c
---- linux-3.1.1/arch/x86/lguest/boot.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lguest/boot.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lguest/boot.c linux-3.1.3/arch/x86/lguest/boot.c
+--- linux-3.1.3/arch/x86/lguest/boot.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lguest/boot.c 2011-11-16 18:39:07.000000000 -0500
@@ -1184,9 +1184,10 @@ static __init int early_put_chars(u32 vt
* Rebooting also tells the Host we're finished, but the RESTART flag tells the
* Launcher to reboot us.
}
/*G:050
-diff -urNp linux-3.1.1/arch/x86/lib/atomic64_32.c linux-3.1.1/arch/x86/lib/atomic64_32.c
---- linux-3.1.1/arch/x86/lib/atomic64_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/atomic64_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/atomic64_32.c linux-3.1.3/arch/x86/lib/atomic64_32.c
+--- linux-3.1.3/arch/x86/lib/atomic64_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/atomic64_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -8,18 +8,30 @@
long long atomic64_read_cx8(long long, const atomic64_t *v);
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-3.1.1/arch/x86/lib/atomic64_386_32.S linux-3.1.1/arch/x86/lib/atomic64_386_32.S
---- linux-3.1.1/arch/x86/lib/atomic64_386_32.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/atomic64_386_32.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/atomic64_386_32.S linux-3.1.3/arch/x86/lib/atomic64_386_32.S
+--- linux-3.1.3/arch/x86/lib/atomic64_386_32.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/atomic64_386_32.S 2011-11-16 18:39:07.000000000 -0500
@@ -48,6 +48,10 @@ BEGIN(read)
movl (v), %eax
movl 4(v), %edx
js 1f
movl %eax, (v)
movl %edx, 4(v)
-diff -urNp linux-3.1.1/arch/x86/lib/atomic64_cx8_32.S linux-3.1.1/arch/x86/lib/atomic64_cx8_32.S
---- linux-3.1.1/arch/x86/lib/atomic64_cx8_32.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/atomic64_cx8_32.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/atomic64_cx8_32.S linux-3.1.3/arch/x86/lib/atomic64_cx8_32.S
+--- linux-3.1.3/arch/x86/lib/atomic64_cx8_32.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/atomic64_cx8_32.S 2011-11-16 18:39:07.000000000 -0500
@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
CFI_STARTPROC
ret
4:
testl %edx, %edx
-diff -urNp linux-3.1.1/arch/x86/lib/checksum_32.S linux-3.1.1/arch/x86/lib/checksum_32.S
---- linux-3.1.1/arch/x86/lib/checksum_32.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/checksum_32.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/checksum_32.S linux-3.1.3/arch/x86/lib/checksum_32.S
+--- linux-3.1.3/arch/x86/lib/checksum_32.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/checksum_32.S 2011-11-16 18:39:07.000000000 -0500
@@ -28,7 +28,8 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
#undef ROUND
#undef ROUND1
-diff -urNp linux-3.1.1/arch/x86/lib/clear_page_64.S linux-3.1.1/arch/x86/lib/clear_page_64.S
---- linux-3.1.1/arch/x86/lib/clear_page_64.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/clear_page_64.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/clear_page_64.S linux-3.1.3/arch/x86/lib/clear_page_64.S
+--- linux-3.1.3/arch/x86/lib/clear_page_64.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/clear_page_64.S 2011-11-16 18:39:07.000000000 -0500
@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
movl $4096/8,%ecx
xorl %eax,%eax
1: .byte 0xeb /* jmp <disp8> */
.byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
2: .byte 0xeb /* jmp <disp8> */
-diff -urNp linux-3.1.1/arch/x86/lib/cmpxchg16b_emu.S linux-3.1.1/arch/x86/lib/cmpxchg16b_emu.S
---- linux-3.1.1/arch/x86/lib/cmpxchg16b_emu.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/cmpxchg16b_emu.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/cmpxchg16b_emu.S linux-3.1.3/arch/x86/lib/cmpxchg16b_emu.S
+--- linux-3.1.3/arch/x86/lib/cmpxchg16b_emu.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/cmpxchg16b_emu.S 2011-11-16 18:39:07.000000000 -0500
@@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
popf
ret
CFI_ENDPROC
-diff -urNp linux-3.1.1/arch/x86/lib/copy_page_64.S linux-3.1.1/arch/x86/lib/copy_page_64.S
---- linux-3.1.1/arch/x86/lib/copy_page_64.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/copy_page_64.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/copy_page_64.S linux-3.1.3/arch/x86/lib/copy_page_64.S
+--- linux-3.1.3/arch/x86/lib/copy_page_64.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/copy_page_64.S 2011-11-16 18:39:07.000000000 -0500
@@ -9,6 +9,7 @@ copy_page_c:
CFI_STARTPROC
movl $4096/8,%ecx
1: .byte 0xeb /* jmp <disp8> */
.byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
2:
-diff -urNp linux-3.1.1/arch/x86/lib/copy_user_64.S linux-3.1.1/arch/x86/lib/copy_user_64.S
---- linux-3.1.1/arch/x86/lib/copy_user_64.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/copy_user_64.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/copy_user_64.S linux-3.1.3/arch/x86/lib/copy_user_64.S
+--- linux-3.1.3/arch/x86/lib/copy_user_64.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/copy_user_64.S 2011-11-16 18:39:07.000000000 -0500
@@ -16,6 +16,7 @@
#include <asm/thread_info.h>
#include <asm/cpufeature.h>
ret
.section .fixup,"ax"
-diff -urNp linux-3.1.1/arch/x86/lib/copy_user_nocache_64.S linux-3.1.1/arch/x86/lib/copy_user_nocache_64.S
---- linux-3.1.1/arch/x86/lib/copy_user_nocache_64.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/copy_user_nocache_64.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/copy_user_nocache_64.S linux-3.1.3/arch/x86/lib/copy_user_nocache_64.S
+--- linux-3.1.3/arch/x86/lib/copy_user_nocache_64.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/copy_user_nocache_64.S 2011-11-16 18:39:07.000000000 -0500
@@ -8,12 +8,14 @@
#include <linux/linkage.h>
ret
.section .fixup,"ax"
-diff -urNp linux-3.1.1/arch/x86/lib/csum-copy_64.S linux-3.1.1/arch/x86/lib/csum-copy_64.S
---- linux-3.1.1/arch/x86/lib/csum-copy_64.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/csum-copy_64.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/csum-copy_64.S linux-3.1.3/arch/x86/lib/csum-copy_64.S
+--- linux-3.1.3/arch/x86/lib/csum-copy_64.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/csum-copy_64.S 2011-11-16 18:39:07.000000000 -0500
@@ -8,6 +8,7 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
ret
CFI_RESTORE_STATE
-diff -urNp linux-3.1.1/arch/x86/lib/csum-wrappers_64.c linux-3.1.1/arch/x86/lib/csum-wrappers_64.c
---- linux-3.1.1/arch/x86/lib/csum-wrappers_64.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/csum-wrappers_64.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/csum-wrappers_64.c linux-3.1.3/arch/x86/lib/csum-wrappers_64.c
+--- linux-3.1.3/arch/x86/lib/csum-wrappers_64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/csum-wrappers_64.c 2011-11-16 18:39:07.000000000 -0500
@@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void _
len -= 2;
}
len, isum, NULL, errp);
}
EXPORT_SYMBOL(csum_partial_copy_to_user);
-diff -urNp linux-3.1.1/arch/x86/lib/getuser.S linux-3.1.1/arch/x86/lib/getuser.S
---- linux-3.1.1/arch/x86/lib/getuser.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/getuser.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/getuser.S linux-3.1.3/arch/x86/lib/getuser.S
+--- linux-3.1.3/arch/x86/lib/getuser.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/getuser.S 2011-11-16 18:39:07.000000000 -0500
@@ -33,15 +33,38 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
ret
CFI_ENDPROC
END(bad_get_user)
-diff -urNp linux-3.1.1/arch/x86/lib/insn.c linux-3.1.1/arch/x86/lib/insn.c
---- linux-3.1.1/arch/x86/lib/insn.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/insn.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/insn.c linux-3.1.3/arch/x86/lib/insn.c
+--- linux-3.1.3/arch/x86/lib/insn.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/insn.c 2011-11-16 18:39:07.000000000 -0500
@@ -21,6 +21,11 @@
#include <linux/string.h>
#include <asm/inat.h>
insn->x86_64 = x86_64 ? 1 : 0;
insn->opnd_bytes = 4;
if (x86_64)
-diff -urNp linux-3.1.1/arch/x86/lib/iomap_copy_64.S linux-3.1.1/arch/x86/lib/iomap_copy_64.S
---- linux-3.1.1/arch/x86/lib/iomap_copy_64.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/iomap_copy_64.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/iomap_copy_64.S linux-3.1.3/arch/x86/lib/iomap_copy_64.S
+--- linux-3.1.3/arch/x86/lib/iomap_copy_64.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/iomap_copy_64.S 2011-11-16 18:39:07.000000000 -0500
@@ -17,6 +17,7 @@
#include <linux/linkage.h>
ret
CFI_ENDPROC
ENDPROC(__iowrite32_copy)
-diff -urNp linux-3.1.1/arch/x86/lib/memcpy_64.S linux-3.1.1/arch/x86/lib/memcpy_64.S
---- linux-3.1.1/arch/x86/lib/memcpy_64.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/memcpy_64.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/memcpy_64.S linux-3.1.3/arch/x86/lib/memcpy_64.S
+--- linux-3.1.3/arch/x86/lib/memcpy_64.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/memcpy_64.S 2011-11-16 18:39:07.000000000 -0500
@@ -34,6 +34,7 @@
rep movsq
movl %edx, %ecx
retq
CFI_ENDPROC
ENDPROC(memcpy)
-diff -urNp linux-3.1.1/arch/x86/lib/memmove_64.S linux-3.1.1/arch/x86/lib/memmove_64.S
---- linux-3.1.1/arch/x86/lib/memmove_64.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/memmove_64.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/memmove_64.S linux-3.1.3/arch/x86/lib/memmove_64.S
+--- linux-3.1.3/arch/x86/lib/memmove_64.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/memmove_64.S 2011-11-16 18:39:07.000000000 -0500
@@ -202,6 +202,7 @@ ENTRY(memmove)
movb (%rsi), %r11b
movb %r11b, (%rdi)
retq
.Lmemmove_end_forward_efs:
.previous
-diff -urNp linux-3.1.1/arch/x86/lib/memset_64.S linux-3.1.1/arch/x86/lib/memset_64.S
---- linux-3.1.1/arch/x86/lib/memset_64.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/memset_64.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/memset_64.S linux-3.1.3/arch/x86/lib/memset_64.S
+--- linux-3.1.3/arch/x86/lib/memset_64.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/memset_64.S 2011-11-16 18:39:07.000000000 -0500
@@ -31,6 +31,7 @@
movl %r8d,%ecx
rep stosb
ret
CFI_RESTORE_STATE
-diff -urNp linux-3.1.1/arch/x86/lib/mmx_32.c linux-3.1.1/arch/x86/lib/mmx_32.c
---- linux-3.1.1/arch/x86/lib/mmx_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/mmx_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/mmx_32.c linux-3.1.3/arch/x86/lib/mmx_32.c
+--- linux-3.1.3/arch/x86/lib/mmx_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/mmx_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
{
void *p;
from += 64;
to += 64;
-diff -urNp linux-3.1.1/arch/x86/lib/msr-reg.S linux-3.1.1/arch/x86/lib/msr-reg.S
---- linux-3.1.1/arch/x86/lib/msr-reg.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/msr-reg.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/msr-reg.S linux-3.1.3/arch/x86/lib/msr-reg.S
+--- linux-3.1.3/arch/x86/lib/msr-reg.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/msr-reg.S 2011-11-16 18:39:07.000000000 -0500
@@ -3,6 +3,7 @@
#include <asm/dwarf2.h>
#include <asm/asm.h>
ret
3:
CFI_RESTORE_STATE
-diff -urNp linux-3.1.1/arch/x86/lib/putuser.S linux-3.1.1/arch/x86/lib/putuser.S
---- linux-3.1.1/arch/x86/lib/putuser.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/putuser.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/putuser.S linux-3.1.3/arch/x86/lib/putuser.S
+--- linux-3.1.3/arch/x86/lib/putuser.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/putuser.S 2011-11-16 18:39:07.000000000 -0500
@@ -15,7 +15,9 @@
#include <asm/thread_info.h>
#include <asm/errno.h>
#endif
xor %eax,%eax
EXIT
-diff -urNp linux-3.1.1/arch/x86/lib/rwlock.S linux-3.1.1/arch/x86/lib/rwlock.S
---- linux-3.1.1/arch/x86/lib/rwlock.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/rwlock.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/rwlock.S linux-3.1.3/arch/x86/lib/rwlock.S
+--- linux-3.1.3/arch/x86/lib/rwlock.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/rwlock.S 2011-11-16 18:39:07.000000000 -0500
@@ -23,6 +23,7 @@ ENTRY(__write_lock_failed)
WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
jnz 0b
ret
CFI_ENDPROC
END(__read_lock_failed)
-diff -urNp linux-3.1.1/arch/x86/lib/rwsem.S linux-3.1.1/arch/x86/lib/rwsem.S
---- linux-3.1.1/arch/x86/lib/rwsem.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/rwsem.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/rwsem.S linux-3.1.3/arch/x86/lib/rwsem.S
+--- linux-3.1.3/arch/x86/lib/rwsem.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/rwsem.S 2011-11-16 18:39:07.000000000 -0500
@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
__ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
CFI_RESTORE __ASM_REG(dx)
ret
CFI_ENDPROC
ENDPROC(call_rwsem_downgrade_wake)
-diff -urNp linux-3.1.1/arch/x86/lib/thunk_64.S linux-3.1.1/arch/x86/lib/thunk_64.S
---- linux-3.1.1/arch/x86/lib/thunk_64.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/thunk_64.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/thunk_64.S linux-3.1.3/arch/x86/lib/thunk_64.S
+--- linux-3.1.3/arch/x86/lib/thunk_64.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/thunk_64.S 2011-11-16 18:39:07.000000000 -0500
@@ -8,6 +8,7 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
+ pax_force_retaddr
ret
CFI_ENDPROC
-diff -urNp linux-3.1.1/arch/x86/lib/usercopy_32.c linux-3.1.1/arch/x86/lib/usercopy_32.c
---- linux-3.1.1/arch/x86/lib/usercopy_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/usercopy_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/usercopy_32.c linux-3.1.3/arch/x86/lib/usercopy_32.c
+--- linux-3.1.3/arch/x86/lib/usercopy_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/usercopy_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -43,7 +43,7 @@ do { \
__asm__ __volatile__( \
" testl %1,%1\n" \
+}
+EXPORT_SYMBOL(set_fs);
+#endif
-diff -urNp linux-3.1.1/arch/x86/lib/usercopy_64.c linux-3.1.1/arch/x86/lib/usercopy_64.c
---- linux-3.1.1/arch/x86/lib/usercopy_64.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/lib/usercopy_64.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/lib/usercopy_64.c linux-3.1.3/arch/x86/lib/usercopy_64.c
+--- linux-3.1.3/arch/x86/lib/usercopy_64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/lib/usercopy_64.c 2011-11-16 18:39:07.000000000 -0500
@@ -42,6 +42,12 @@ long
__strncpy_from_user(char *dst, const char __user *src, long count)
{
{
char c;
unsigned zero_len;
-diff -urNp linux-3.1.1/arch/x86/Makefile linux-3.1.1/arch/x86/Makefile
---- linux-3.1.1/arch/x86/Makefile 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/Makefile 2011-11-17 18:30:30.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/Makefile linux-3.1.3/arch/x86/Makefile
+--- linux-3.1.3/arch/x86/Makefile 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/Makefile 2011-11-17 18:30:30.000000000 -0500
@@ -46,6 +46,7 @@ else
UTS_MACHINE := x86_64
CHECKFLAGS += -D__x86_64__ -m64
+
+archprepare:
+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff -urNp linux-3.1.1/arch/x86/mm/extable.c linux-3.1.1/arch/x86/mm/extable.c
---- linux-3.1.1/arch/x86/mm/extable.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/extable.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/extable.c linux-3.1.3/arch/x86/mm/extable.c
+--- linux-3.1.3/arch/x86/mm/extable.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/extable.c 2011-11-16 18:39:07.000000000 -0500
@@ -8,7 +8,7 @@ int fixup_exception(struct pt_regs *regs
const struct exception_table_entry *fixup;
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-3.1.1/arch/x86/mm/fault.c linux-3.1.1/arch/x86/mm/fault.c
---- linux-3.1.1/arch/x86/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/fault.c 2011-11-16 20:43:50.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/fault.c linux-3.1.3/arch/x86/mm/fault.c
+--- linux-3.1.3/arch/x86/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/fault.c 2011-11-16 20:43:50.000000000 -0500
@@ -13,11 +13,18 @@
#include <linux/perf_event.h> /* perf_sw_event */
#include <linux/hugetlb.h> /* hstate_index_to_shift */
+
+ return ret ? -EFAULT : 0;
+}
-diff -urNp linux-3.1.1/arch/x86/mm/gup.c linux-3.1.1/arch/x86/mm/gup.c
---- linux-3.1.1/arch/x86/mm/gup.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/gup.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/gup.c linux-3.1.3/arch/x86/mm/gup.c
+--- linux-3.1.3/arch/x86/mm/gup.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/gup.c 2011-11-16 18:39:07.000000000 -0500
@@ -253,7 +253,7 @@ int __get_user_pages_fast(unsigned long
addr = start;
len = (unsigned long) nr_pages << PAGE_SHIFT;
(void __user *)start, len)))
return 0;
-diff -urNp linux-3.1.1/arch/x86/mm/highmem_32.c linux-3.1.1/arch/x86/mm/highmem_32.c
---- linux-3.1.1/arch/x86/mm/highmem_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/highmem_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/highmem_32.c linux-3.1.3/arch/x86/mm/highmem_32.c
+--- linux-3.1.3/arch/x86/mm/highmem_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/highmem_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page
idx = type + KM_TYPE_NR*smp_processor_id();
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
return (void *)vaddr;
}
-diff -urNp linux-3.1.1/arch/x86/mm/hugetlbpage.c linux-3.1.1/arch/x86/mm/hugetlbpage.c
---- linux-3.1.1/arch/x86/mm/hugetlbpage.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/hugetlbpage.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/hugetlbpage.c linux-3.1.3/arch/x86/mm/hugetlbpage.c
+--- linux-3.1.3/arch/x86/mm/hugetlbpage.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/hugetlbpage.c 2011-11-16 18:39:07.000000000 -0500
@@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
return addr;
}
if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-3.1.1/arch/x86/mm/init_32.c linux-3.1.1/arch/x86/mm/init_32.c
---- linux-3.1.1/arch/x86/mm/init_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/init_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/init_32.c linux-3.1.3/arch/x86/mm/init_32.c
+--- linux-3.1.3/arch/x86/mm/init_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/init_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -74,36 +74,6 @@ static __init void *alloc_low_page(void)
}
set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
printk(KERN_INFO "Write protecting the kernel text: %luk\n",
size >> 10);
-diff -urNp linux-3.1.1/arch/x86/mm/init_64.c linux-3.1.1/arch/x86/mm/init_64.c
---- linux-3.1.1/arch/x86/mm/init_64.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/init_64.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/init_64.c linux-3.1.3/arch/x86/mm/init_64.c
+--- linux-3.1.3/arch/x86/mm/init_64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/init_64.c 2011-11-16 18:39:07.000000000 -0500
@@ -75,7 +75,7 @@ early_param("gbpages", parse_direct_gbpa
* around without checking the pgd every time.
*/
return "[vdso]";
if (vma == &gate_vma)
return "[vsyscall]";
-diff -urNp linux-3.1.1/arch/x86/mm/init.c linux-3.1.1/arch/x86/mm/init.c
---- linux-3.1.1/arch/x86/mm/init.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/init.c 2011-11-17 18:31:28.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/init.c linux-3.1.3/arch/x86/mm/init.c
+--- linux-3.1.3/arch/x86/mm/init.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/init.c 2011-11-17 18:31:28.000000000 -0500
@@ -31,7 +31,7 @@ int direct_gbpages
static void __init find_early_table_space(unsigned long end, int use_pse,
int use_gbpages)
free_init_pages("unused kernel memory",
(unsigned long)(&__init_begin),
(unsigned long)(&__init_end));
-diff -urNp linux-3.1.1/arch/x86/mm/iomap_32.c linux-3.1.1/arch/x86/mm/iomap_32.c
---- linux-3.1.1/arch/x86/mm/iomap_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/iomap_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/iomap_32.c linux-3.1.3/arch/x86/mm/iomap_32.c
+--- linux-3.1.3/arch/x86/mm/iomap_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/iomap_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long
type = kmap_atomic_idx_push();
idx = type + KM_TYPE_NR * smp_processor_id();
arch_flush_lazy_mmu_mode();
return (void *)vaddr;
-diff -urNp linux-3.1.1/arch/x86/mm/ioremap.c linux-3.1.1/arch/x86/mm/ioremap.c
---- linux-3.1.1/arch/x86/mm/ioremap.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/ioremap.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/ioremap.c linux-3.1.3/arch/x86/mm/ioremap.c
+--- linux-3.1.3/arch/x86/mm/ioremap.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/ioremap.c 2011-11-16 18:39:07.000000000 -0500
@@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(re
for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
int is_ram = page_is_ram(pfn);
/*
* The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-3.1.1/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.1.1/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-3.1.1/arch/x86/mm/kmemcheck/kmemcheck.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/kmemcheck/kmemcheck.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.1.3/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-3.1.3/arch/x86/mm/kmemcheck/kmemcheck.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/kmemcheck/kmemcheck.c 2011-11-16 18:39:07.000000000 -0500
@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
* memory (e.g. tracked pages)? For now, we need this to avoid
* invoking kmemcheck for PnP BIOS calls.
return false;
pte = kmemcheck_pte_lookup(address);
-diff -urNp linux-3.1.1/arch/x86/mm/mmap.c linux-3.1.1/arch/x86/mm/mmap.c
---- linux-3.1.1/arch/x86/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/mmap.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/mmap.c linux-3.1.3/arch/x86/mm/mmap.c
+--- linux-3.1.3/arch/x86/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/mmap.c 2011-11-16 18:39:07.000000000 -0500
@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
* Leave an at least ~128 MB hole with possible stack randomization.
*/
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-3.1.1/arch/x86/mm/mmio-mod.c linux-3.1.1/arch/x86/mm/mmio-mod.c
---- linux-3.1.1/arch/x86/mm/mmio-mod.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/mmio-mod.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/mmio-mod.c linux-3.1.3/arch/x86/mm/mmio-mod.c
+--- linux-3.1.3/arch/x86/mm/mmio-mod.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/mmio-mod.c 2011-11-16 18:39:07.000000000 -0500
@@ -195,7 +195,7 @@ static void pre(struct kmmio_probe *p, s
break;
default:
};
map.map_id = trace->id;
-diff -urNp linux-3.1.1/arch/x86/mm/pageattr.c linux-3.1.1/arch/x86/mm/pageattr.c
---- linux-3.1.1/arch/x86/mm/pageattr.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/pageattr.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/pageattr.c linux-3.1.3/arch/x86/mm/pageattr.c
+--- linux-3.1.3/arch/x86/mm/pageattr.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/pageattr.c 2011-11-16 18:39:07.000000000 -0500
@@ -261,7 +261,7 @@ static inline pgprot_t static_protection
*/
#ifdef CONFIG_PCI_BIOS
}
static int
-diff -urNp linux-3.1.1/arch/x86/mm/pageattr-test.c linux-3.1.1/arch/x86/mm/pageattr-test.c
---- linux-3.1.1/arch/x86/mm/pageattr-test.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/pageattr-test.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/pageattr-test.c linux-3.1.3/arch/x86/mm/pageattr-test.c
+--- linux-3.1.3/arch/x86/mm/pageattr-test.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/pageattr-test.c 2011-11-16 18:39:07.000000000 -0500
@@ -36,7 +36,7 @@ enum {
static int pte_testbit(pte_t pte)
}
struct split_state {
-diff -urNp linux-3.1.1/arch/x86/mm/pat.c linux-3.1.1/arch/x86/mm/pat.c
---- linux-3.1.1/arch/x86/mm/pat.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/pat.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/pat.c linux-3.1.3/arch/x86/mm/pat.c
+--- linux-3.1.3/arch/x86/mm/pat.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/pat.c 2011-11-16 18:39:07.000000000 -0500
@@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
if (!entry) {
cattr_name(want_flags),
(unsigned long long)paddr,
(unsigned long long)(paddr + size),
-diff -urNp linux-3.1.1/arch/x86/mm/pf_in.c linux-3.1.1/arch/x86/mm/pf_in.c
---- linux-3.1.1/arch/x86/mm/pf_in.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/pf_in.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/pf_in.c linux-3.1.3/arch/x86/mm/pf_in.c
+--- linux-3.1.3/arch/x86/mm/pf_in.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/pf_in.c 2011-11-16 18:39:07.000000000 -0500
@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned l
int i;
enum reason_type rv = OTHERS;
p += skip_prefix(p, &prf);
p += get_opcode(p, &opcode);
for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
-diff -urNp linux-3.1.1/arch/x86/mm/pgtable_32.c linux-3.1.1/arch/x86/mm/pgtable_32.c
---- linux-3.1.1/arch/x86/mm/pgtable_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/pgtable_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/pgtable_32.c linux-3.1.3/arch/x86/mm/pgtable_32.c
+--- linux-3.1.3/arch/x86/mm/pgtable_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/pgtable_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr,
return;
}
/*
* It's enough to flush this one mapping.
-diff -urNp linux-3.1.1/arch/x86/mm/pgtable.c linux-3.1.1/arch/x86/mm/pgtable.c
---- linux-3.1.1/arch/x86/mm/pgtable.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/pgtable.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/pgtable.c linux-3.1.3/arch/x86/mm/pgtable.c
+--- linux-3.1.3/arch/x86/mm/pgtable.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/pgtable.c 2011-11-16 18:39:07.000000000 -0500
@@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *p
list_del(&page->lru);
}
pgd_dtor(pgd);
paravirt_pgd_free(mm, pgd);
free_page((unsigned long)pgd);
-diff -urNp linux-3.1.1/arch/x86/mm/setup_nx.c linux-3.1.1/arch/x86/mm/setup_nx.c
---- linux-3.1.1/arch/x86/mm/setup_nx.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/setup_nx.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/setup_nx.c linux-3.1.3/arch/x86/mm/setup_nx.c
+--- linux-3.1.3/arch/x86/mm/setup_nx.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/setup_nx.c 2011-11-16 18:39:07.000000000 -0500
@@ -5,8 +5,10 @@
#include <asm/pgtable.h>
#include <asm/proto.h>
__supported_pte_mask &= ~_PAGE_NX;
}
-diff -urNp linux-3.1.1/arch/x86/mm/tlb.c linux-3.1.1/arch/x86/mm/tlb.c
---- linux-3.1.1/arch/x86/mm/tlb.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/mm/tlb.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/mm/tlb.c linux-3.1.3/arch/x86/mm/tlb.c
+--- linux-3.1.3/arch/x86/mm/tlb.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/mm/tlb.c 2011-11-16 18:39:07.000000000 -0500
@@ -65,7 +65,11 @@ void leave_mm(int cpu)
BUG();
cpumask_clear_cpu(cpu,
}
EXPORT_SYMBOL_GPL(leave_mm);
-diff -urNp linux-3.1.1/arch/x86/net/bpf_jit_comp.c linux-3.1.1/arch/x86/net/bpf_jit_comp.c
---- linux-3.1.1/arch/x86/net/bpf_jit_comp.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/net/bpf_jit_comp.c 2011-11-16 18:39:07.000000000 -0500
-@@ -589,7 +589,9 @@ cond_branch: f_offset = addrs[i + filt
- module_free(NULL, image);
- return;
+diff -urNp linux-3.1.3/arch/x86/net/bpf_jit_comp.c linux-3.1.3/arch/x86/net/bpf_jit_comp.c
+--- linux-3.1.3/arch/x86/net/bpf_jit_comp.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/net/bpf_jit_comp.c 2011-11-20 19:21:53.000000000 -0500
+@@ -117,6 +117,10 @@ static inline void bpf_flush_icache(void
+ set_fs(old_fs);
+ }
+
++struct bpf_jit_work {
++ struct work_struct work;
++ void *image;
++};
+
+ void bpf_jit_compile(struct sk_filter *fp)
+ {
+@@ -141,6 +145,10 @@ void bpf_jit_compile(struct sk_filter *f
+ if (addrs == NULL)
+ return;
+
++ fp->work = kmalloc(sizeof(*fp->work), GFP_KERNEL);
++ if (!fp->work)
++ goto out;
++
+ /* Before first pass, make a rough estimation of addrs[]
+ * each bpf instruction is translated to less than 64 bytes
+ */
+@@ -585,11 +593,12 @@ cond_branch: f_offset = addrs[i + filt
+ if (image) {
+ if (unlikely(proglen + ilen > oldproglen)) {
+ pr_err("bpb_jit_compile fatal error\n");
+- kfree(addrs);
+- module_free(NULL, image);
+- return;
++ module_free_exec(NULL, image);
++ goto out;
}
+ pax_open_kernel();
memcpy(image + proglen, temp, ilen);
}
proglen += ilen;
addrs[i] = proglen;
-@@ -609,7 +611,7 @@ cond_branch: f_offset = addrs[i + filt
+@@ -609,7 +618,7 @@ cond_branch: f_offset = addrs[i + filt
break;
}
if (proglen == oldproglen) {
proglen,
sizeof(struct work_struct)));
if (!image)
-diff -urNp linux-3.1.1/arch/x86/net/bpf_jit.S linux-3.1.1/arch/x86/net/bpf_jit.S
---- linux-3.1.1/arch/x86/net/bpf_jit.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/net/bpf_jit.S 2011-11-16 18:39:07.000000000 -0500
+@@ -631,24 +640,27 @@ cond_branch: f_offset = addrs[i + filt
+ fp->bpf_func = (void *)image;
+ }
+ out:
++ kfree(fp->work);
+ kfree(addrs);
+ return;
+ }
+
+ static void jit_free_defer(struct work_struct *arg)
+ {
+- module_free(NULL, arg);
++ module_free_exec(NULL, ((struct bpf_jit_work*)arg)->image);
++ kfree(arg);
+ }
+
+ /* run from softirq, we must use a work_struct to call
+- * module_free() from process context
++ * module_free_exec() from process context
+ */
+ void bpf_jit_free(struct sk_filter *fp)
+ {
+ if (fp->bpf_func != sk_run_filter) {
+- struct work_struct *work = (struct work_struct *)fp->bpf_func;
++ struct work_struct *work = &fp->work->work;
+
+ INIT_WORK(work, jit_free_defer);
++ fp->work->image = fp->bpf_func;
+ schedule_work(work);
+ }
+ }
+diff -urNp linux-3.1.3/arch/x86/net/bpf_jit.S linux-3.1.3/arch/x86/net/bpf_jit.S
+--- linux-3.1.3/arch/x86/net/bpf_jit.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/net/bpf_jit.S 2011-11-16 18:39:07.000000000 -0500
@@ -9,6 +9,7 @@
*/
#include <linux/linkage.h>
xchg %eax,%ebx
+ pax_force_retaddr
ret
-diff -urNp linux-3.1.1/arch/x86/oprofile/backtrace.c linux-3.1.1/arch/x86/oprofile/backtrace.c
---- linux-3.1.1/arch/x86/oprofile/backtrace.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/oprofile/backtrace.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/oprofile/backtrace.c linux-3.1.3/arch/x86/oprofile/backtrace.c
+--- linux-3.1.3/arch/x86/oprofile/backtrace.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/oprofile/backtrace.c 2011-11-16 18:39:07.000000000 -0500
@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_fram
struct stack_frame_ia32 *fp;
unsigned long bytes;
unsigned long stack = kernel_stack_pointer(regs);
if (depth)
dump_trace(NULL, regs, (unsigned long *)stack, 0,
-diff -urNp linux-3.1.1/arch/x86/pci/mrst.c linux-3.1.1/arch/x86/pci/mrst.c
---- linux-3.1.1/arch/x86/pci/mrst.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/pci/mrst.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/pci/mrst.c linux-3.1.3/arch/x86/pci/mrst.c
+--- linux-3.1.3/arch/x86/pci/mrst.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/pci/mrst.c 2011-11-16 18:39:07.000000000 -0500
@@ -234,7 +234,9 @@ int __init pci_mrst_init(void)
printk(KERN_INFO "Moorestown platform detected, using MRST PCI ops\n");
pci_mmcfg_late_init();
/* Continue with standard init */
return 1;
}
-diff -urNp linux-3.1.1/arch/x86/pci/pcbios.c linux-3.1.1/arch/x86/pci/pcbios.c
---- linux-3.1.1/arch/x86/pci/pcbios.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/pci/pcbios.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/pci/pcbios.c linux-3.1.3/arch/x86/pci/pcbios.c
+--- linux-3.1.3/arch/x86/pci/pcbios.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/pci/pcbios.c 2011-11-16 18:39:07.000000000 -0500
@@ -79,50 +79,93 @@ union bios32 {
static struct {
unsigned long address;
return !(ret & 0xff00);
}
EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff -urNp linux-3.1.1/arch/x86/platform/efi/efi_32.c linux-3.1.1/arch/x86/platform/efi/efi_32.c
---- linux-3.1.1/arch/x86/platform/efi/efi_32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/platform/efi/efi_32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/platform/efi/efi_32.c linux-3.1.3/arch/x86/platform/efi/efi_32.c
+--- linux-3.1.3/arch/x86/platform/efi/efi_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/platform/efi/efi_32.c 2011-11-16 18:39:07.000000000 -0500
@@ -38,70 +38,56 @@
*/
/*
* After the lock is released, the original page table is restored.
-diff -urNp linux-3.1.1/arch/x86/platform/efi/efi_stub_32.S linux-3.1.1/arch/x86/platform/efi/efi_stub_32.S
---- linux-3.1.1/arch/x86/platform/efi/efi_stub_32.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/platform/efi/efi_stub_32.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/platform/efi/efi_stub_32.S linux-3.1.3/arch/x86/platform/efi/efi_stub_32.S
+--- linux-3.1.3/arch/x86/platform/efi/efi_stub_32.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/platform/efi/efi_stub_32.S 2011-11-16 18:39:07.000000000 -0500
@@ -6,7 +6,9 @@
*/
saved_return_addr:
.long 0
efi_rt_function_ptr:
-diff -urNp linux-3.1.1/arch/x86/platform/efi/efi_stub_64.S linux-3.1.1/arch/x86/platform/efi/efi_stub_64.S
---- linux-3.1.1/arch/x86/platform/efi/efi_stub_64.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/platform/efi/efi_stub_64.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/platform/efi/efi_stub_64.S linux-3.1.3/arch/x86/platform/efi/efi_stub_64.S
+--- linux-3.1.3/arch/x86/platform/efi/efi_stub_64.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/platform/efi/efi_stub_64.S 2011-11-16 18:39:07.000000000 -0500
@@ -7,6 +7,7 @@
*/
+ pax_force_retaddr
ret
ENDPROC(efi_call6)
-diff -urNp linux-3.1.1/arch/x86/platform/mrst/mrst.c linux-3.1.1/arch/x86/platform/mrst/mrst.c
---- linux-3.1.1/arch/x86/platform/mrst/mrst.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/platform/mrst/mrst.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/platform/mrst/mrst.c linux-3.1.3/arch/x86/platform/mrst/mrst.c
+--- linux-3.1.3/arch/x86/platform/mrst/mrst.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/platform/mrst/mrst.c 2011-11-16 18:39:07.000000000 -0500
@@ -239,14 +239,16 @@ static int mrst_i8042_detect(void)
}
}
/*
-diff -urNp linux-3.1.1/arch/x86/platform/uv/tlb_uv.c linux-3.1.1/arch/x86/platform/uv/tlb_uv.c
---- linux-3.1.1/arch/x86/platform/uv/tlb_uv.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/platform/uv/tlb_uv.c 2011-11-16 19:39:11.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/platform/uv/tlb_uv.c linux-3.1.3/arch/x86/platform/uv/tlb_uv.c
+--- linux-3.1.3/arch/x86/platform/uv/tlb_uv.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/platform/uv/tlb_uv.c 2011-11-16 19:39:11.000000000 -0500
@@ -377,6 +377,8 @@ static void reset_with_ipi(struct pnmask
struct bau_control *smaster = bcp->socket_master;
struct reset_args reset_args;
reset_args.sender = sender;
cpus_clear(*mask);
/* find a single cpu for each uvhub in this distribution mask */
-diff -urNp linux-3.1.1/arch/x86/power/cpu.c linux-3.1.1/arch/x86/power/cpu.c
---- linux-3.1.1/arch/x86/power/cpu.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/power/cpu.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/power/cpu.c linux-3.1.3/arch/x86/power/cpu.c
+--- linux-3.1.3/arch/x86/power/cpu.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/power/cpu.c 2011-11-16 18:39:07.000000000 -0500
@@ -130,7 +130,7 @@ static void do_fpu_end(void)
static void fix_processor_context(void)
{
syscall_init(); /* This sets MSR_*STAR and related */
#endif
-diff -urNp linux-3.1.1/arch/x86/vdso/Makefile linux-3.1.1/arch/x86/vdso/Makefile
---- linux-3.1.1/arch/x86/vdso/Makefile 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/vdso/Makefile 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/vdso/Makefile linux-3.1.3/arch/x86/vdso/Makefile
+--- linux-3.1.3/arch/x86/vdso/Makefile 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/vdso/Makefile 2011-11-16 18:39:07.000000000 -0500
@@ -137,7 +137,7 @@ quiet_cmd_vdso = VDSO $@
-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
GCOV_PROFILE := n
#
-diff -urNp linux-3.1.1/arch/x86/vdso/vdso32-setup.c linux-3.1.1/arch/x86/vdso/vdso32-setup.c
---- linux-3.1.1/arch/x86/vdso/vdso32-setup.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/vdso/vdso32-setup.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/vdso/vdso32-setup.c linux-3.1.3/arch/x86/vdso/vdso32-setup.c
+--- linux-3.1.3/arch/x86/vdso/vdso32-setup.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/vdso/vdso32-setup.c 2011-11-16 18:39:07.000000000 -0500
@@ -25,6 +25,7 @@
#include <asm/tlbflush.h>
#include <asm/vdso.h>
return &gate_vma;
return NULL;
}
-diff -urNp linux-3.1.1/arch/x86/vdso/vma.c linux-3.1.1/arch/x86/vdso/vma.c
---- linux-3.1.1/arch/x86/vdso/vma.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/vdso/vma.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/vdso/vma.c linux-3.1.3/arch/x86/vdso/vma.c
+--- linux-3.1.3/arch/x86/vdso/vma.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/vdso/vma.c 2011-11-16 18:39:07.000000000 -0500
@@ -16,8 +16,6 @@
#include <asm/vdso.h>
#include <asm/page.h>
- return 0;
-}
-__setup("vdso=", vdso_setup);
-diff -urNp linux-3.1.1/arch/x86/xen/enlighten.c linux-3.1.1/arch/x86/xen/enlighten.c
---- linux-3.1.1/arch/x86/xen/enlighten.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/xen/enlighten.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/xen/enlighten.c linux-3.1.3/arch/x86/xen/enlighten.c
+--- linux-3.1.3/arch/x86/xen/enlighten.c 2011-11-26 19:57:27.000000000 -0500
++++ linux-3.1.3/arch/x86/xen/enlighten.c 2011-11-26 19:58:40.000000000 -0500
@@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
struct shared_info xen_dummy_shared_info;
xen_smp_init();
#ifdef CONFIG_ACPI_NUMA
-diff -urNp linux-3.1.1/arch/x86/xen/mmu.c linux-3.1.1/arch/x86/xen/mmu.c
---- linux-3.1.1/arch/x86/xen/mmu.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/xen/mmu.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/xen/mmu.c linux-3.1.3/arch/x86/xen/mmu.c
+--- linux-3.1.3/arch/x86/xen/mmu.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/xen/mmu.c 2011-11-16 18:39:07.000000000 -0500
@@ -1768,6 +1768,8 @@ pgd_t * __init xen_setup_kernel_pagetabl
convert_pfn_mfn(init_level4_pgt);
convert_pfn_mfn(level3_ident_pgt);
.alloc_pud = xen_alloc_pmd_init,
.release_pud = xen_release_pmd_init,
-diff -urNp linux-3.1.1/arch/x86/xen/smp.c linux-3.1.1/arch/x86/xen/smp.c
---- linux-3.1.1/arch/x86/xen/smp.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/xen/smp.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/xen/smp.c linux-3.1.3/arch/x86/xen/smp.c
+--- linux-3.1.3/arch/x86/xen/smp.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/xen/smp.c 2011-11-16 18:39:07.000000000 -0500
@@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_
{
BUG_ON(smp_processor_id() != 0);
#endif
xen_setup_runstate_info(cpu);
xen_setup_timer(cpu);
-diff -urNp linux-3.1.1/arch/x86/xen/xen-asm_32.S linux-3.1.1/arch/x86/xen/xen-asm_32.S
---- linux-3.1.1/arch/x86/xen/xen-asm_32.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/xen/xen-asm_32.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/xen/xen-asm_32.S linux-3.1.3/arch/x86/xen/xen-asm_32.S
+--- linux-3.1.3/arch/x86/xen/xen-asm_32.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/xen/xen-asm_32.S 2011-11-16 18:39:07.000000000 -0500
@@ -83,14 +83,14 @@ ENTRY(xen_iret)
ESP_OFFSET=4 # bytes pushed onto stack
#else
movl xen_vcpu, %eax
#endif
-diff -urNp linux-3.1.1/arch/x86/xen/xen-head.S linux-3.1.1/arch/x86/xen/xen-head.S
---- linux-3.1.1/arch/x86/xen/xen-head.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/xen/xen-head.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/xen/xen-head.S linux-3.1.3/arch/x86/xen/xen-head.S
+--- linux-3.1.3/arch/x86/xen/xen-head.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/xen/xen-head.S 2011-11-16 18:39:07.000000000 -0500
@@ -19,6 +19,17 @@ ENTRY(startup_xen)
#ifdef CONFIG_X86_32
mov %esi,xen_start_info
#else
mov %rsi,xen_start_info
mov $init_thread_union+THREAD_SIZE,%rsp
-diff -urNp linux-3.1.1/arch/x86/xen/xen-ops.h linux-3.1.1/arch/x86/xen/xen-ops.h
---- linux-3.1.1/arch/x86/xen/xen-ops.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/arch/x86/xen/xen-ops.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/arch/x86/xen/xen-ops.h linux-3.1.3/arch/x86/xen/xen-ops.h
+--- linux-3.1.3/arch/x86/xen/xen-ops.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/arch/x86/xen/xen-ops.h 2011-11-16 18:39:07.000000000 -0500
@@ -10,8 +10,6 @@
extern const char xen_hypervisor_callback[];
extern const char xen_failsafe_callback[];
struct trap_info;
void xen_copy_trap_info(struct trap_info *traps);
-diff -urNp linux-3.1.1/block/blk-iopoll.c linux-3.1.1/block/blk-iopoll.c
---- linux-3.1.1/block/blk-iopoll.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/block/blk-iopoll.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/block/blk-iopoll.c linux-3.1.3/block/blk-iopoll.c
+--- linux-3.1.3/block/blk-iopoll.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/block/blk-iopoll.c 2011-11-16 18:39:07.000000000 -0500
@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
}
EXPORT_SYMBOL(blk_iopoll_complete);
{
struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
int rearm = 0, budget = blk_iopoll_budget;
-diff -urNp linux-3.1.1/block/blk-map.c linux-3.1.1/block/blk-map.c
---- linux-3.1.1/block/blk-map.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/block/blk-map.c 2011-11-16 18:39:07.000000000 -0500
-@@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue
+diff -urNp linux-3.1.3/block/blk-map.c linux-3.1.3/block/blk-map.c
+--- linux-3.1.3/block/blk-map.c 2011-11-26 19:57:27.000000000 -0500
++++ linux-3.1.3/block/blk-map.c 2011-11-26 19:58:40.000000000 -0500
+@@ -302,7 +302,7 @@ int blk_rq_map_kern(struct request_queue
if (!len || !kbuf)
return -EINVAL;
if (do_copy)
bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
else
-diff -urNp linux-3.1.1/block/blk-softirq.c linux-3.1.1/block/blk-softirq.c
---- linux-3.1.1/block/blk-softirq.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/block/blk-softirq.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/block/blk-softirq.c linux-3.1.3/block/blk-softirq.c
+--- linux-3.1.3/block/blk-softirq.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/block/blk-softirq.c 2011-11-16 18:39:07.000000000 -0500
@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,
* Softirq action handler - move entries to local list and loop over them
* while passing them to the queue registered handler.
{
struct list_head *cpu_list, local_list;
-diff -urNp linux-3.1.1/block/bsg.c linux-3.1.1/block/bsg.c
---- linux-3.1.1/block/bsg.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/block/bsg.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/block/bsg.c linux-3.1.3/block/bsg.c
+--- linux-3.1.3/block/bsg.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/block/bsg.c 2011-11-16 18:39:07.000000000 -0500
@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct r
struct sg_io_v4 *hdr, struct bsg_device *bd,
fmode_t has_write_perm)
if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
if (blk_verify_command(rq->cmd, has_write_perm))
return -EPERM;
-diff -urNp linux-3.1.1/block/compat_ioctl.c linux-3.1.1/block/compat_ioctl.c
---- linux-3.1.1/block/compat_ioctl.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/block/compat_ioctl.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/block/compat_ioctl.c linux-3.1.3/block/compat_ioctl.c
+--- linux-3.1.3/block/compat_ioctl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/block/compat_ioctl.c 2011-11-16 18:39:07.000000000 -0500
@@ -340,7 +340,7 @@ static int compat_fd_ioctl(struct block_
err |= __get_user(f->spec1, &uf->spec1);
err |= __get_user(f->fmt_gap, &uf->fmt_gap);
if (err) {
err = -EFAULT;
goto out;
-diff -urNp linux-3.1.1/block/scsi_ioctl.c linux-3.1.1/block/scsi_ioctl.c
---- linux-3.1.1/block/scsi_ioctl.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/block/scsi_ioctl.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/block/scsi_ioctl.c linux-3.1.3/block/scsi_ioctl.c
+--- linux-3.1.3/block/scsi_ioctl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/block/scsi_ioctl.c 2011-11-16 18:39:07.000000000 -0500
@@ -222,8 +222,20 @@ EXPORT_SYMBOL(blk_verify_command);
static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
struct sg_io_hdr *hdr, fmode_t mode)
if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
goto error;
-diff -urNp linux-3.1.1/crypto/cryptd.c linux-3.1.1/crypto/cryptd.c
---- linux-3.1.1/crypto/cryptd.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/crypto/cryptd.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/crypto/cryptd.c linux-3.1.3/crypto/cryptd.c
+--- linux-3.1.3/crypto/cryptd.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/crypto/cryptd.c 2011-11-16 18:39:07.000000000 -0500
@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
struct cryptd_blkcipher_request_ctx {
static void cryptd_queue_worker(struct work_struct *work);
-diff -urNp linux-3.1.1/crypto/serpent.c linux-3.1.1/crypto/serpent.c
---- linux-3.1.1/crypto/serpent.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/crypto/serpent.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/crypto/serpent.c linux-3.1.3/crypto/serpent.c
+--- linux-3.1.3/crypto/serpent.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/crypto/serpent.c 2011-11-16 18:40:10.000000000 -0500
@@ -224,6 +224,8 @@ static int serpent_setkey(struct crypto_
u32 r0,r1,r2,r3,r4;
int i;
/* Copy key, add padding */
for (i = 0; i < keylen; ++i)
-diff -urNp linux-3.1.1/Documentation/dontdiff linux-3.1.1/Documentation/dontdiff
---- linux-3.1.1/Documentation/dontdiff 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/Documentation/dontdiff 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/Documentation/dontdiff linux-3.1.3/Documentation/dontdiff
+--- linux-3.1.3/Documentation/dontdiff 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/Documentation/dontdiff 2011-11-16 18:39:07.000000000 -0500
@@ -5,6 +5,7 @@
*.cis
*.cpio
zconf.hash.c
+zconf.lex.c
zoffset.h
-diff -urNp linux-3.1.1/Documentation/kernel-parameters.txt linux-3.1.1/Documentation/kernel-parameters.txt
---- linux-3.1.1/Documentation/kernel-parameters.txt 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/Documentation/kernel-parameters.txt 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/Documentation/kernel-parameters.txt linux-3.1.3/Documentation/kernel-parameters.txt
+--- linux-3.1.3/Documentation/kernel-parameters.txt 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/Documentation/kernel-parameters.txt 2011-11-16 18:39:07.000000000 -0500
@@ -1898,6 +1898,13 @@ bytes respectively. Such letter suffixes
the specified number of seconds. This is to be used if
your oopses keep scrolling off the screen.
pcbit= [HW,ISDN]
pcd. [PARIDE]
-diff -urNp linux-3.1.1/drivers/acpi/apei/cper.c linux-3.1.1/drivers/acpi/apei/cper.c
---- linux-3.1.1/drivers/acpi/apei/cper.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/acpi/apei/cper.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/acpi/apei/cper.c linux-3.1.3/drivers/acpi/apei/cper.c
+--- linux-3.1.3/drivers/acpi/apei/cper.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/acpi/apei/cper.c 2011-11-16 18:39:07.000000000 -0500
@@ -38,12 +38,12 @@
*/
u64 cper_next_record_id(void)
}
EXPORT_SYMBOL_GPL(cper_next_record_id);
-diff -urNp linux-3.1.1/drivers/acpi/ec_sys.c linux-3.1.1/drivers/acpi/ec_sys.c
---- linux-3.1.1/drivers/acpi/ec_sys.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/acpi/ec_sys.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/acpi/ec_sys.c linux-3.1.3/drivers/acpi/ec_sys.c
+--- linux-3.1.3/drivers/acpi/ec_sys.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/acpi/ec_sys.c 2011-11-16 18:39:07.000000000 -0500
@@ -11,6 +11,7 @@
#include <linux/kernel.h>
#include <linux/acpi.h>
err = ec_write(*off, byte_write);
if (err)
return err;
-diff -urNp linux-3.1.1/drivers/acpi/proc.c linux-3.1.1/drivers/acpi/proc.c
---- linux-3.1.1/drivers/acpi/proc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/acpi/proc.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/acpi/proc.c linux-3.1.3/drivers/acpi/proc.c
+--- linux-3.1.3/drivers/acpi/proc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/acpi/proc.c 2011-11-16 18:39:07.000000000 -0500
@@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct f
size_t count, loff_t * ppos)
{
if (device_can_wakeup(&dev->dev)) {
bool enable = !device_may_wakeup(&dev->dev);
device_set_wakeup_enable(&dev->dev, enable);
-diff -urNp linux-3.1.1/drivers/acpi/processor_driver.c linux-3.1.1/drivers/acpi/processor_driver.c
---- linux-3.1.1/drivers/acpi/processor_driver.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/acpi/processor_driver.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/acpi/processor_driver.c linux-3.1.3/drivers/acpi/processor_driver.c
+--- linux-3.1.3/drivers/acpi/processor_driver.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/acpi/processor_driver.c 2011-11-16 18:39:07.000000000 -0500
@@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add(
return 0;
#endif
/*
* Buggy BIOS check
-diff -urNp linux-3.1.1/drivers/ata/libata-core.c linux-3.1.1/drivers/ata/libata-core.c
---- linux-3.1.1/drivers/ata/libata-core.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ata/libata-core.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ata/libata-core.c linux-3.1.3/drivers/ata/libata-core.c
+--- linux-3.1.3/drivers/ata/libata-core.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ata/libata-core.c 2011-11-16 18:39:07.000000000 -0500
@@ -4733,7 +4733,7 @@ void ata_qc_free(struct ata_queued_cmd *
struct ata_port *ap;
unsigned int tag;
spin_unlock(&lock);
}
-diff -urNp linux-3.1.1/drivers/ata/libata-eh.c linux-3.1.1/drivers/ata/libata-eh.c
---- linux-3.1.1/drivers/ata/libata-eh.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ata/libata-eh.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ata/libata-eh.c linux-3.1.3/drivers/ata/libata-eh.c
+--- linux-3.1.3/drivers/ata/libata-eh.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ata/libata-eh.c 2011-11-16 18:40:10.000000000 -0500
@@ -2515,6 +2515,8 @@ void ata_eh_report(struct ata_port *ap)
{
struct ata_link *link;
ata_for_each_link(link, ap, HOST_FIRST)
ata_eh_link_report(link);
}
-diff -urNp linux-3.1.1/drivers/ata/pata_arasan_cf.c linux-3.1.1/drivers/ata/pata_arasan_cf.c
---- linux-3.1.1/drivers/ata/pata_arasan_cf.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ata/pata_arasan_cf.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ata/pata_arasan_cf.c linux-3.1.3/drivers/ata/pata_arasan_cf.c
+--- linux-3.1.3/drivers/ata/pata_arasan_cf.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ata/pata_arasan_cf.c 2011-11-16 18:39:07.000000000 -0500
@@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(str
/* Handle platform specific quirks */
if (pdata->quirk) {
ap->pio_mask = 0;
}
if (pdata->quirk & CF_BROKEN_MWDMA)
-diff -urNp linux-3.1.1/drivers/atm/adummy.c linux-3.1.1/drivers/atm/adummy.c
---- linux-3.1.1/drivers/atm/adummy.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/atm/adummy.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/atm/adummy.c linux-3.1.3/drivers/atm/adummy.c
+--- linux-3.1.3/drivers/atm/adummy.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/atm/adummy.c 2011-11-16 18:39:07.000000000 -0500
@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct
vcc->pop(vcc, skb);
else
return 0;
}
-diff -urNp linux-3.1.1/drivers/atm/ambassador.c linux-3.1.1/drivers/atm/ambassador.c
---- linux-3.1.1/drivers/atm/ambassador.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/atm/ambassador.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/atm/ambassador.c linux-3.1.3/drivers/atm/ambassador.c
+--- linux-3.1.3/drivers/atm/ambassador.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/atm/ambassador.c 2011-11-16 18:39:07.000000000 -0500
@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev,
PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
return -ENOMEM; // ?
}
-diff -urNp linux-3.1.1/drivers/atm/atmtcp.c linux-3.1.1/drivers/atm/atmtcp.c
---- linux-3.1.1/drivers/atm/atmtcp.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/atm/atmtcp.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/atm/atmtcp.c linux-3.1.3/drivers/atm/atmtcp.c
+--- linux-3.1.3/drivers/atm/atmtcp.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/atm/atmtcp.c 2011-11-16 18:39:07.000000000 -0500
@@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb(skb);
done:
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb(skb);
-diff -urNp linux-3.1.1/drivers/atm/eni.c linux-3.1.1/drivers/atm/eni.c
---- linux-3.1.1/drivers/atm/eni.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/atm/eni.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/atm/eni.c linux-3.1.3/drivers/atm/eni.c
+--- linux-3.1.3/drivers/atm/eni.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/atm/eni.c 2011-11-16 18:39:07.000000000 -0500
@@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
vcc->dev->number);
"MMF", "SMF", "MMF", "03?", /* 0- 3 */
"UTP", "05?", "06?", "07?", /* 4- 7 */
"TAXI","09?", "10?", "11?", /* 8-11 */
-diff -urNp linux-3.1.1/drivers/atm/firestream.c linux-3.1.1/drivers/atm/firestream.c
---- linux-3.1.1/drivers/atm/firestream.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/atm/firestream.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/atm/firestream.c linux-3.1.3/drivers/atm/firestream.c
+--- linux-3.1.3/drivers/atm/firestream.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/atm/firestream.c 2011-11-16 18:39:07.000000000 -0500
@@ -750,7 +750,7 @@ static void process_txdone_queue (struct
}
}
break;
default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
-diff -urNp linux-3.1.1/drivers/atm/fore200e.c linux-3.1.1/drivers/atm/fore200e.c
---- linux-3.1.1/drivers/atm/fore200e.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/atm/fore200e.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/atm/fore200e.c linux-3.1.3/drivers/atm/fore200e.c
+--- linux-3.1.3/drivers/atm/fore200e.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/atm/fore200e.c 2011-11-16 18:39:07.000000000 -0500
@@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200
#endif
/* check error condition */
fore200e->tx_sat++;
DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
-diff -urNp linux-3.1.1/drivers/atm/he.c linux-3.1.1/drivers/atm/he.c
---- linux-3.1.1/drivers/atm/he.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/atm/he.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/atm/he.c linux-3.1.3/drivers/atm/he.c
+--- linux-3.1.3/drivers/atm/he.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/atm/he.c 2011-11-16 18:39:07.000000000 -0500
@@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i
if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
return 0;
}
-diff -urNp linux-3.1.1/drivers/atm/horizon.c linux-3.1.1/drivers/atm/horizon.c
---- linux-3.1.1/drivers/atm/horizon.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/atm/horizon.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/atm/horizon.c linux-3.1.3/drivers/atm/horizon.c
+--- linux-3.1.3/drivers/atm/horizon.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/atm/horizon.c 2011-11-16 18:39:07.000000000 -0500
@@ -1035,7 +1035,7 @@ static void rx_schedule (hrz_dev * dev,
{
struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
// free the skb
hrz_kfree_skb (skb);
-diff -urNp linux-3.1.1/drivers/atm/idt77252.c linux-3.1.1/drivers/atm/idt77252.c
---- linux-3.1.1/drivers/atm/idt77252.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/atm/idt77252.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/atm/idt77252.c linux-3.1.3/drivers/atm/idt77252.c
+--- linux-3.1.3/drivers/atm/idt77252.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/atm/idt77252.c 2011-11-16 18:39:07.000000000 -0500
@@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, str
else
dev_kfree_skb(skb);
return -ENOMEM;
}
atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
-diff -urNp linux-3.1.1/drivers/atm/iphase.c linux-3.1.1/drivers/atm/iphase.c
---- linux-3.1.1/drivers/atm/iphase.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/atm/iphase.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/atm/iphase.c linux-3.1.3/drivers/atm/iphase.c
+--- linux-3.1.3/drivers/atm/iphase.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/atm/iphase.c 2011-11-16 18:39:07.000000000 -0500
@@ -1121,7 +1121,7 @@ static int rx_pkt(struct atm_dev *dev)
status = (u_short) (buf_desc_ptr->desc_mode);
if (status & (RX_CER | RX_PTE | RX_OFL))
if (iavcc->vc_desc_cnt > 10) {
vcc->tx_quota = vcc->tx_quota * 3 / 4;
printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
-diff -urNp linux-3.1.1/drivers/atm/lanai.c linux-3.1.1/drivers/atm/lanai.c
---- linux-3.1.1/drivers/atm/lanai.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/atm/lanai.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/atm/lanai.c linux-3.1.3/drivers/atm/lanai.c
+--- linux-3.1.3/drivers/atm/lanai.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/atm/lanai.c 2011-11-16 18:39:07.000000000 -0500
@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct l
vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
lanai_endtx(lanai, lvcc);
lvcc->stats.x.aal5.service_rxcrc++;
lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
-diff -urNp linux-3.1.1/drivers/atm/nicstar.c linux-3.1.1/drivers/atm/nicstar.c
---- linux-3.1.1/drivers/atm/nicstar.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/atm/nicstar.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/atm/nicstar.c linux-3.1.3/drivers/atm/nicstar.c
+--- linux-3.1.3/drivers/atm/nicstar.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/atm/nicstar.c 2011-11-16 18:39:07.000000000 -0500
@@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc,
if ((vc = (vc_map *) vcc->dev_data) == NULL) {
printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
}
}
-diff -urNp linux-3.1.1/drivers/atm/solos-pci.c linux-3.1.1/drivers/atm/solos-pci.c
---- linux-3.1.1/drivers/atm/solos-pci.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/atm/solos-pci.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/atm/solos-pci.c linux-3.1.3/drivers/atm/solos-pci.c
+--- linux-3.1.3/drivers/atm/solos-pci.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/atm/solos-pci.c 2011-11-16 18:40:10.000000000 -0500
@@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg)
}
atm_charge(vcc, skb->truesize);
solos_pop(vcc, oldskb);
} else
dev_kfree_skb_irq(oldskb);
-diff -urNp linux-3.1.1/drivers/atm/suni.c linux-3.1.1/drivers/atm/suni.c
---- linux-3.1.1/drivers/atm/suni.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/atm/suni.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/atm/suni.c linux-3.1.3/drivers/atm/suni.c
+--- linux-3.1.3/drivers/atm/suni.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/atm/suni.c 2011-11-16 18:39:07.000000000 -0500
@@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
static void suni_hz(unsigned long from_timer)
-diff -urNp linux-3.1.1/drivers/atm/uPD98402.c linux-3.1.1/drivers/atm/uPD98402.c
---- linux-3.1.1/drivers/atm/uPD98402.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/atm/uPD98402.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/atm/uPD98402.c linux-3.1.3/drivers/atm/uPD98402.c
+--- linux-3.1.3/drivers/atm/uPD98402.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/atm/uPD98402.c 2011-11-16 18:39:07.000000000 -0500
@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d
struct sonet_stats tmp;
int error = 0;
return 0;
}
-diff -urNp linux-3.1.1/drivers/atm/zatm.c linux-3.1.1/drivers/atm/zatm.c
---- linux-3.1.1/drivers/atm/zatm.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/atm/zatm.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/atm/zatm.c linux-3.1.3/drivers/atm/zatm.c
+--- linux-3.1.3/drivers/atm/zatm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/atm/zatm.c 2011-11-16 18:39:07.000000000 -0500
@@ -460,7 +460,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
}
if (!size) {
wake_up(&zatm_vcc->tx_wait);
}
-diff -urNp linux-3.1.1/drivers/base/devtmpfs.c linux-3.1.1/drivers/base/devtmpfs.c
---- linux-3.1.1/drivers/base/devtmpfs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/base/devtmpfs.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/base/devtmpfs.c linux-3.1.3/drivers/base/devtmpfs.c
+--- linux-3.1.3/drivers/base/devtmpfs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/base/devtmpfs.c 2011-11-16 18:39:07.000000000 -0500
@@ -368,7 +368,7 @@ int devtmpfs_mount(const char *mntdir)
if (!thread)
return 0;
if (err)
printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
else
-diff -urNp linux-3.1.1/drivers/base/power/wakeup.c linux-3.1.1/drivers/base/power/wakeup.c
---- linux-3.1.1/drivers/base/power/wakeup.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/base/power/wakeup.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/base/power/wakeup.c linux-3.1.3/drivers/base/power/wakeup.c
+--- linux-3.1.3/drivers/base/power/wakeup.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/base/power/wakeup.c 2011-11-16 18:39:07.000000000 -0500
@@ -29,14 +29,14 @@ bool events_check_enabled;
* They need to be modified together atomically, so it's better to use one
* atomic variable to hold them both.
}
/**
-diff -urNp linux-3.1.1/drivers/block/cciss.c linux-3.1.1/drivers/block/cciss.c
---- linux-3.1.1/drivers/block/cciss.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/block/cciss.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/block/cciss.c linux-3.1.3/drivers/block/cciss.c
+--- linux-3.1.3/drivers/block/cciss.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/block/cciss.c 2011-11-16 18:40:10.000000000 -0500
@@ -1179,6 +1179,8 @@ static int cciss_ioctl32_passthru(struct
int err;
u32 cp;
free_irq(h->intr[PERF_MODE_INT], h);
}
-diff -urNp linux-3.1.1/drivers/block/cciss.h linux-3.1.1/drivers/block/cciss.h
---- linux-3.1.1/drivers/block/cciss.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/block/cciss.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/block/cciss.h linux-3.1.3/drivers/block/cciss.h
+--- linux-3.1.3/drivers/block/cciss.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/block/cciss.h 2011-11-16 18:39:07.000000000 -0500
@@ -100,7 +100,7 @@ struct ctlr_info
/* information about each logical volume */
drive_info_struct *drv[CISS_MAX_LUN];
/* queue and queue Info */
struct list_head reqQ;
-diff -urNp linux-3.1.1/drivers/block/cpqarray.c linux-3.1.1/drivers/block/cpqarray.c
---- linux-3.1.1/drivers/block/cpqarray.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/block/cpqarray.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/block/cpqarray.c linux-3.1.3/drivers/block/cpqarray.c
+--- linux-3.1.3/drivers/block/cpqarray.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/block/cpqarray.c 2011-11-16 18:40:10.000000000 -0500
@@ -404,7 +404,7 @@ static int __devinit cpqarray_register_c
if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
goto Enomem4;
if (done == 0) {
udelay(10); /* a short fixed delay */
} else
-diff -urNp linux-3.1.1/drivers/block/cpqarray.h linux-3.1.1/drivers/block/cpqarray.h
---- linux-3.1.1/drivers/block/cpqarray.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/block/cpqarray.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/block/cpqarray.h linux-3.1.3/drivers/block/cpqarray.h
+--- linux-3.1.3/drivers/block/cpqarray.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/block/cpqarray.h 2011-11-16 18:39:07.000000000 -0500
@@ -99,7 +99,7 @@ struct ctlr_info {
drv_info_t drv[NWD];
struct proc_dir_entry *proc;
cmdlist_t *reqQ;
cmdlist_t *cmpQ;
-diff -urNp linux-3.1.1/drivers/block/DAC960.c linux-3.1.1/drivers/block/DAC960.c
---- linux-3.1.1/drivers/block/DAC960.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/block/DAC960.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/block/DAC960.c linux-3.1.3/drivers/block/DAC960.c
+--- linux-3.1.3/drivers/block/DAC960.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/block/DAC960.c 2011-11-16 18:40:10.000000000 -0500
@@ -1980,6 +1980,8 @@ static bool DAC960_V1_ReadDeviceConfigur
unsigned long flags;
int Channel, TargetID;
if (!init_dma_loaf(Controller->PCIDevice, &local_dma,
DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) +
sizeof(DAC960_SCSI_Inquiry_T) +
-diff -urNp linux-3.1.1/drivers/block/drbd/drbd_int.h linux-3.1.1/drivers/block/drbd/drbd_int.h
---- linux-3.1.1/drivers/block/drbd/drbd_int.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/block/drbd/drbd_int.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/block/drbd/drbd_int.h linux-3.1.3/drivers/block/drbd/drbd_int.h
+--- linux-3.1.3/drivers/block/drbd/drbd_int.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/block/drbd/drbd_int.h 2011-11-16 18:39:07.000000000 -0500
@@ -737,7 +737,7 @@ struct drbd_request;
struct drbd_epoch {
struct list_head list;
}
void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo);
-diff -urNp linux-3.1.1/drivers/block/drbd/drbd_main.c linux-3.1.1/drivers/block/drbd/drbd_main.c
---- linux-3.1.1/drivers/block/drbd/drbd_main.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/block/drbd/drbd_main.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/block/drbd/drbd_main.c linux-3.1.3/drivers/block/drbd/drbd_main.c
+--- linux-3.1.3/drivers/block/drbd/drbd_main.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/block/drbd/drbd_main.c 2011-11-16 18:39:07.000000000 -0500
@@ -2397,7 +2397,7 @@ static int _drbd_send_ack(struct drbd_co
p.sector = sector;
p.block_id = block_id;
mdev->al_writ_cnt =
mdev->bm_writ_cnt =
mdev->read_cnt =
-diff -urNp linux-3.1.1/drivers/block/drbd/drbd_nl.c linux-3.1.1/drivers/block/drbd/drbd_nl.c
---- linux-3.1.1/drivers/block/drbd/drbd_nl.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/block/drbd/drbd_nl.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/block/drbd/drbd_nl.c linux-3.1.3/drivers/block/drbd/drbd_nl.c
+--- linux-3.1.3/drivers/block/drbd/drbd_nl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/block/drbd/drbd_nl.c 2011-11-16 18:39:07.000000000 -0500
@@ -2359,7 +2359,7 @@ static void drbd_connector_callback(stru
module_put(THIS_MODULE);
}
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-3.1.1/drivers/block/drbd/drbd_receiver.c linux-3.1.1/drivers/block/drbd/drbd_receiver.c
---- linux-3.1.1/drivers/block/drbd/drbd_receiver.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/block/drbd/drbd_receiver.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/block/drbd/drbd_receiver.c linux-3.1.3/drivers/block/drbd/drbd_receiver.c
+--- linux-3.1.3/drivers/block/drbd/drbd_receiver.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/block/drbd/drbd_receiver.c 2011-11-16 18:39:07.000000000 -0500
@@ -894,7 +894,7 @@ retry:
sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
D_ASSERT(list_empty(&mdev->current_epoch->list));
}
-diff -urNp linux-3.1.1/drivers/block/loop.c linux-3.1.1/drivers/block/loop.c
---- linux-3.1.1/drivers/block/loop.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/block/loop.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/block/loop.c linux-3.1.3/drivers/block/loop.c
+--- linux-3.1.3/drivers/block/loop.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/block/loop.c 2011-11-16 18:39:07.000000000 -0500
@@ -283,7 +283,7 @@ static int __do_lo_send_write(struct fil
mm_segment_t old_fs = get_fs();
set_fs(old_fs);
if (likely(bw == len))
return 0;
-diff -urNp linux-3.1.1/drivers/block/nbd.c linux-3.1.1/drivers/block/nbd.c
---- linux-3.1.1/drivers/block/nbd.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/block/nbd.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/block/nbd.c linux-3.1.3/drivers/block/nbd.c
+--- linux-3.1.3/drivers/block/nbd.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/block/nbd.c 2011-11-16 18:40:10.000000000 -0500
@@ -157,6 +157,8 @@ static int sock_xmit(struct nbd_device *
struct kvec iov;
sigset_t blocked, oldset;
switch (cmd) {
case NBD_DISCONNECT: {
struct request sreq;
-diff -urNp linux-3.1.1/drivers/char/agp/frontend.c linux-3.1.1/drivers/char/agp/frontend.c
---- linux-3.1.1/drivers/char/agp/frontend.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/char/agp/frontend.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/char/agp/frontend.c linux-3.1.3/drivers/char/agp/frontend.c
+--- linux-3.1.3/drivers/char/agp/frontend.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/char/agp/frontend.c 2011-11-16 18:39:07.000000000 -0500
@@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct ag
if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
return -EFAULT;
return -EFAULT;
client = agp_find_client_by_pid(reserve.pid);
-diff -urNp linux-3.1.1/drivers/char/briq_panel.c linux-3.1.1/drivers/char/briq_panel.c
---- linux-3.1.1/drivers/char/briq_panel.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/char/briq_panel.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/char/briq_panel.c linux-3.1.3/drivers/char/briq_panel.c
+--- linux-3.1.3/drivers/char/briq_panel.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/char/briq_panel.c 2011-11-16 18:40:10.000000000 -0500
@@ -9,6 +9,7 @@
#include <linux/types.h>
#include <linux/errno.h>
return len;
}
-diff -urNp linux-3.1.1/drivers/char/genrtc.c linux-3.1.1/drivers/char/genrtc.c
---- linux-3.1.1/drivers/char/genrtc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/char/genrtc.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/char/genrtc.c linux-3.1.3/drivers/char/genrtc.c
+--- linux-3.1.3/drivers/char/genrtc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/char/genrtc.c 2011-11-16 18:40:10.000000000 -0500
@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *fi
switch (cmd) {
if (get_rtc_pll(&pll))
return -EINVAL;
else
-diff -urNp linux-3.1.1/drivers/char/hpet.c linux-3.1.1/drivers/char/hpet.c
---- linux-3.1.1/drivers/char/hpet.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/char/hpet.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/char/hpet.c linux-3.1.3/drivers/char/hpet.c
+--- linux-3.1.3/drivers/char/hpet.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/char/hpet.c 2011-11-16 18:39:07.000000000 -0500
@@ -572,7 +572,7 @@ static inline unsigned long hpet_time_di
}
struct hpet_info *info)
{
struct hpet_timer __iomem *timer;
-diff -urNp linux-3.1.1/drivers/char/ipmi/ipmi_msghandler.c linux-3.1.1/drivers/char/ipmi/ipmi_msghandler.c
---- linux-3.1.1/drivers/char/ipmi/ipmi_msghandler.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/char/ipmi/ipmi_msghandler.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/char/ipmi/ipmi_msghandler.c linux-3.1.3/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-3.1.3/drivers/char/ipmi/ipmi_msghandler.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/char/ipmi/ipmi_msghandler.c 2011-11-16 18:40:10.000000000 -0500
@@ -415,7 +415,7 @@ struct ipmi_smi {
struct proc_dir_entry *proc_dir;
char proc_dir_name[10];
si = (struct ipmi_system_interface_addr *) &addr;
si->addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
si->channel = IPMI_BMC_CHANNEL;
-diff -urNp linux-3.1.1/drivers/char/ipmi/ipmi_si_intf.c linux-3.1.1/drivers/char/ipmi/ipmi_si_intf.c
---- linux-3.1.1/drivers/char/ipmi/ipmi_si_intf.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/char/ipmi/ipmi_si_intf.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/char/ipmi/ipmi_si_intf.c linux-3.1.3/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-3.1.3/drivers/char/ipmi/ipmi_si_intf.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/char/ipmi/ipmi_si_intf.c 2011-11-16 18:39:07.000000000 -0500
@@ -277,7 +277,7 @@ struct smi_info {
unsigned char slave_addr;
new_smi->interrupt_disabled = 1;
atomic_set(&new_smi->stop_operation, 0);
-diff -urNp linux-3.1.1/drivers/char/Kconfig linux-3.1.1/drivers/char/Kconfig
---- linux-3.1.1/drivers/char/Kconfig 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/char/Kconfig 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/char/Kconfig linux-3.1.3/drivers/char/Kconfig
+--- linux-3.1.3/drivers/char/Kconfig 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/char/Kconfig 2011-11-16 18:40:10.000000000 -0500
@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
config DEVKMEM
default y
source "drivers/s390/char/Kconfig"
-diff -urNp linux-3.1.1/drivers/char/mbcs.c linux-3.1.1/drivers/char/mbcs.c
---- linux-3.1.1/drivers/char/mbcs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/char/mbcs.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/char/mbcs.c linux-3.1.3/drivers/char/mbcs.c
+--- linux-3.1.3/drivers/char/mbcs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/char/mbcs.c 2011-11-16 18:39:07.000000000 -0500
@@ -800,7 +800,7 @@ static int mbcs_remove(struct cx_dev *de
return 0;
}
{
.part_num = MBCS_PART_NUM,
.mfg_num = MBCS_MFG_NUM,
-diff -urNp linux-3.1.1/drivers/char/mem.c linux-3.1.1/drivers/char/mem.c
---- linux-3.1.1/drivers/char/mem.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/char/mem.c 2011-11-17 18:31:56.000000000 -0500
+diff -urNp linux-3.1.3/drivers/char/mem.c linux-3.1.3/drivers/char/mem.c
+--- linux-3.1.3/drivers/char/mem.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/char/mem.c 2011-11-17 18:31:56.000000000 -0500
@@ -18,6 +18,7 @@
#include <linux/raw.h>
#include <linux/tty.h>
};
static int memory_open(struct inode *inode, struct file *filp)
-diff -urNp linux-3.1.1/drivers/char/nvram.c linux-3.1.1/drivers/char/nvram.c
---- linux-3.1.1/drivers/char/nvram.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/char/nvram.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/char/nvram.c linux-3.1.3/drivers/char/nvram.c
+--- linux-3.1.3/drivers/char/nvram.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/char/nvram.c 2011-11-16 18:39:07.000000000 -0500
@@ -248,7 +248,7 @@ static ssize_t nvram_read(struct file *f
spin_unlock_irq(&rtc_lock);
return -EFAULT;
*ppos = i;
-diff -urNp linux-3.1.1/drivers/char/random.c linux-3.1.1/drivers/char/random.c
---- linux-3.1.1/drivers/char/random.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/char/random.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/char/random.c linux-3.1.3/drivers/char/random.c
+--- linux-3.1.3/drivers/char/random.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/char/random.c 2011-11-16 18:40:10.000000000 -0500
@@ -261,8 +261,13 @@
/*
* Configuration information
static int max_write_thresh = INPUT_POOL_WORDS * 32;
static char sysctl_bootid[16];
-diff -urNp linux-3.1.1/drivers/char/sonypi.c linux-3.1.1/drivers/char/sonypi.c
---- linux-3.1.1/drivers/char/sonypi.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/char/sonypi.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/char/sonypi.c linux-3.1.3/drivers/char/sonypi.c
+--- linux-3.1.3/drivers/char/sonypi.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/char/sonypi.c 2011-11-16 18:39:07.000000000 -0500
@@ -55,6 +55,7 @@
#include <asm/uaccess.h>
#include <asm/io.h>
mutex_unlock(&sonypi_device.lock);
return 0;
-diff -urNp linux-3.1.1/drivers/char/tpm/tpm_bios.c linux-3.1.1/drivers/char/tpm/tpm_bios.c
---- linux-3.1.1/drivers/char/tpm/tpm_bios.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/char/tpm/tpm_bios.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/char/tpm/tpm_bios.c linux-3.1.3/drivers/char/tpm/tpm_bios.c
+--- linux-3.1.3/drivers/char/tpm/tpm_bios.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/char/tpm/tpm_bios.c 2011-11-16 18:39:07.000000000 -0500
@@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start
event = addr;
acpi_os_unmap_memory(virt, len);
return 0;
-diff -urNp linux-3.1.1/drivers/char/tpm/tpm.c linux-3.1.1/drivers/char/tpm/tpm.c
---- linux-3.1.1/drivers/char/tpm/tpm.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/char/tpm/tpm.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/char/tpm/tpm.c linux-3.1.3/drivers/char/tpm/tpm.c
+--- linux-3.1.3/drivers/char/tpm/tpm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/char/tpm/tpm.c 2011-11-16 18:40:10.000000000 -0500
@@ -414,7 +414,7 @@ static ssize_t tpm_transmit(struct tpm_c
chip->vendor.req_complete_val)
goto out_recv;
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-3.1.1/drivers/char/virtio_console.c linux-3.1.1/drivers/char/virtio_console.c
---- linux-3.1.1/drivers/char/virtio_console.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/char/virtio_console.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/char/virtio_console.c linux-3.1.3/drivers/char/virtio_console.c
+--- linux-3.1.3/drivers/char/virtio_console.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/char/virtio_console.c 2011-11-16 18:39:07.000000000 -0500
@@ -555,7 +555,7 @@ static ssize_t fill_readbuf(struct port
if (to_user) {
ssize_t ret;
}
static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,
-diff -urNp linux-3.1.1/drivers/crypto/hifn_795x.c linux-3.1.1/drivers/crypto/hifn_795x.c
---- linux-3.1.1/drivers/crypto/hifn_795x.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/crypto/hifn_795x.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/crypto/hifn_795x.c linux-3.1.3/drivers/crypto/hifn_795x.c
+--- linux-3.1.3/drivers/crypto/hifn_795x.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/crypto/hifn_795x.c 2011-11-16 18:40:10.000000000 -0500
@@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device
0xCA, 0x34, 0x2B, 0x2E};
struct scatterlist sg;
memset(src, 0, sizeof(src));
memset(ctx.key, 0, sizeof(ctx.key));
-diff -urNp linux-3.1.1/drivers/crypto/padlock-aes.c linux-3.1.1/drivers/crypto/padlock-aes.c
---- linux-3.1.1/drivers/crypto/padlock-aes.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/crypto/padlock-aes.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/crypto/padlock-aes.c linux-3.1.3/drivers/crypto/padlock-aes.c
+--- linux-3.1.3/drivers/crypto/padlock-aes.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/crypto/padlock-aes.c 2011-11-16 18:40:10.000000000 -0500
@@ -109,6 +109,8 @@ static int aes_set_key(struct crypto_tfm
struct crypto_aes_ctx gen_aes;
int cpu;
if (key_len % 8) {
*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
return -EINVAL;
-diff -urNp linux-3.1.1/drivers/edac/amd64_edac.c linux-3.1.1/drivers/edac/amd64_edac.c
---- linux-3.1.1/drivers/edac/amd64_edac.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/edac/amd64_edac.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/edac/amd64_edac.c linux-3.1.3/drivers/edac/amd64_edac.c
+--- linux-3.1.3/drivers/edac/amd64_edac.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/edac/amd64_edac.c 2011-11-16 18:39:07.000000000 -0500
@@ -2670,7 +2670,7 @@ static void __devexit amd64_remove_one_i
* PCI core identifies what devices are on a system during boot, and then
* inquiry this table to see if this driver is for a given device found.
{
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_K8_NB_MEMCTL,
-diff -urNp linux-3.1.1/drivers/edac/amd76x_edac.c linux-3.1.1/drivers/edac/amd76x_edac.c
---- linux-3.1.1/drivers/edac/amd76x_edac.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/edac/amd76x_edac.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/edac/amd76x_edac.c linux-3.1.3/drivers/edac/amd76x_edac.c
+--- linux-3.1.3/drivers/edac/amd76x_edac.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/edac/amd76x_edac.c 2011-11-16 18:39:07.000000000 -0500
@@ -321,7 +321,7 @@ static void __devexit amd76x_remove_one(
edac_mc_free(mci);
}
{
PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
AMD762},
-diff -urNp linux-3.1.1/drivers/edac/e752x_edac.c linux-3.1.1/drivers/edac/e752x_edac.c
---- linux-3.1.1/drivers/edac/e752x_edac.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/edac/e752x_edac.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/edac/e752x_edac.c linux-3.1.3/drivers/edac/e752x_edac.c
+--- linux-3.1.3/drivers/edac/e752x_edac.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/edac/e752x_edac.c 2011-11-16 18:39:07.000000000 -0500
@@ -1380,7 +1380,7 @@ static void __devexit e752x_remove_one(s
edac_mc_free(mci);
}
{
PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
E7520},
-diff -urNp linux-3.1.1/drivers/edac/e7xxx_edac.c linux-3.1.1/drivers/edac/e7xxx_edac.c
---- linux-3.1.1/drivers/edac/e7xxx_edac.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/edac/e7xxx_edac.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/edac/e7xxx_edac.c linux-3.1.3/drivers/edac/e7xxx_edac.c
+--- linux-3.1.3/drivers/edac/e7xxx_edac.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/edac/e7xxx_edac.c 2011-11-16 18:39:07.000000000 -0500
@@ -525,7 +525,7 @@ static void __devexit e7xxx_remove_one(s
edac_mc_free(mci);
}
{
PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
E7205},
-diff -urNp linux-3.1.1/drivers/edac/edac_pci_sysfs.c linux-3.1.1/drivers/edac/edac_pci_sysfs.c
---- linux-3.1.1/drivers/edac/edac_pci_sysfs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/edac/edac_pci_sysfs.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/edac/edac_pci_sysfs.c linux-3.1.3/drivers/edac/edac_pci_sysfs.c
+--- linux-3.1.3/drivers/edac/edac_pci_sysfs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/edac/edac_pci_sysfs.c 2011-11-16 18:39:07.000000000 -0500
@@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log
static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
static int edac_pci_poll_msec = 1000; /* one second workq period */
panic("EDAC: PCI Parity Error");
}
}
-diff -urNp linux-3.1.1/drivers/edac/i3000_edac.c linux-3.1.1/drivers/edac/i3000_edac.c
---- linux-3.1.1/drivers/edac/i3000_edac.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/edac/i3000_edac.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/edac/i3000_edac.c linux-3.1.3/drivers/edac/i3000_edac.c
+--- linux-3.1.3/drivers/edac/i3000_edac.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/edac/i3000_edac.c 2011-11-16 18:39:07.000000000 -0500
@@ -470,7 +470,7 @@ static void __devexit i3000_remove_one(s
edac_mc_free(mci);
}
{
PCI_VEND_DEV(INTEL, 3000_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
I3000},
-diff -urNp linux-3.1.1/drivers/edac/i3200_edac.c linux-3.1.1/drivers/edac/i3200_edac.c
---- linux-3.1.1/drivers/edac/i3200_edac.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/edac/i3200_edac.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/edac/i3200_edac.c linux-3.1.3/drivers/edac/i3200_edac.c
+--- linux-3.1.3/drivers/edac/i3200_edac.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/edac/i3200_edac.c 2011-11-16 18:39:07.000000000 -0500
@@ -456,7 +456,7 @@ static void __devexit i3200_remove_one(s
edac_mc_free(mci);
}
{
PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
I3200},
-diff -urNp linux-3.1.1/drivers/edac/i5000_edac.c linux-3.1.1/drivers/edac/i5000_edac.c
---- linux-3.1.1/drivers/edac/i5000_edac.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/edac/i5000_edac.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/edac/i5000_edac.c linux-3.1.3/drivers/edac/i5000_edac.c
+--- linux-3.1.3/drivers/edac/i5000_edac.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/edac/i5000_edac.c 2011-11-16 18:39:07.000000000 -0500
@@ -1516,7 +1516,7 @@ static void __devexit i5000_remove_one(s
*
* The "E500P" device is the first device supported.
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000_DEV16),
.driver_data = I5000P},
-diff -urNp linux-3.1.1/drivers/edac/i5100_edac.c linux-3.1.1/drivers/edac/i5100_edac.c
---- linux-3.1.1/drivers/edac/i5100_edac.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/edac/i5100_edac.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/edac/i5100_edac.c linux-3.1.3/drivers/edac/i5100_edac.c
+--- linux-3.1.3/drivers/edac/i5100_edac.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/edac/i5100_edac.c 2011-11-16 18:39:07.000000000 -0500
@@ -1051,7 +1051,7 @@ static void __devexit i5100_remove_one(s
edac_mc_free(mci);
}
/* Device 16, Function 0, Channel 0 Memory Map, Error Flag/Mask, ... */
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5100_16) },
{ 0, }
-diff -urNp linux-3.1.1/drivers/edac/i5400_edac.c linux-3.1.1/drivers/edac/i5400_edac.c
---- linux-3.1.1/drivers/edac/i5400_edac.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/edac/i5400_edac.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/edac/i5400_edac.c linux-3.1.3/drivers/edac/i5400_edac.c
+--- linux-3.1.3/drivers/edac/i5400_edac.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/edac/i5400_edac.c 2011-11-16 18:39:07.000000000 -0500
@@ -1383,7 +1383,7 @@ static void __devexit i5400_remove_one(s
*
* The "E500P" device is the first device supported.
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR)},
{0,} /* 0 terminated list. */
};
-diff -urNp linux-3.1.1/drivers/edac/i7300_edac.c linux-3.1.1/drivers/edac/i7300_edac.c
---- linux-3.1.1/drivers/edac/i7300_edac.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/edac/i7300_edac.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/edac/i7300_edac.c linux-3.1.3/drivers/edac/i7300_edac.c
+--- linux-3.1.3/drivers/edac/i7300_edac.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/edac/i7300_edac.c 2011-11-16 18:39:07.000000000 -0500
@@ -1191,7 +1191,7 @@ static void __devexit i7300_remove_one(s
*
* Has only 8086:360c PCI ID
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I7300_MCH_ERR)},
{0,} /* 0 terminated list. */
};
-diff -urNp linux-3.1.1/drivers/edac/i7core_edac.c linux-3.1.1/drivers/edac/i7core_edac.c
---- linux-3.1.1/drivers/edac/i7core_edac.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/edac/i7core_edac.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/edac/i7core_edac.c linux-3.1.3/drivers/edac/i7core_edac.c
+--- linux-3.1.3/drivers/edac/i7core_edac.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/edac/i7core_edac.c 2011-11-16 18:39:07.000000000 -0500
@@ -359,7 +359,7 @@ static const struct pci_id_table pci_dev
/*
* pci_device_id table for which devices we are looking for
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_X58_HUB_MGMT)},
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNNFIELD_QPI_LINK0)},
{0,} /* 0 terminated list. */
-diff -urNp linux-3.1.1/drivers/edac/i82443bxgx_edac.c linux-3.1.1/drivers/edac/i82443bxgx_edac.c
---- linux-3.1.1/drivers/edac/i82443bxgx_edac.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/edac/i82443bxgx_edac.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/edac/i82443bxgx_edac.c linux-3.1.3/drivers/edac/i82443bxgx_edac.c
+--- linux-3.1.3/drivers/edac/i82443bxgx_edac.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/edac/i82443bxgx_edac.c 2011-11-16 18:39:07.000000000 -0500
@@ -380,7 +380,7 @@ static void __devexit i82443bxgx_edacmc_
EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_remove_one);
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_0)},
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2)},
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0)},
-diff -urNp linux-3.1.1/drivers/edac/i82860_edac.c linux-3.1.1/drivers/edac/i82860_edac.c
---- linux-3.1.1/drivers/edac/i82860_edac.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/edac/i82860_edac.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/edac/i82860_edac.c linux-3.1.3/drivers/edac/i82860_edac.c
+--- linux-3.1.3/drivers/edac/i82860_edac.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/edac/i82860_edac.c 2011-11-16 18:39:07.000000000 -0500
@@ -270,7 +270,7 @@ static void __devexit i82860_remove_one(
edac_mc_free(mci);
}
{
PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
I82860},
-diff -urNp linux-3.1.1/drivers/edac/i82875p_edac.c linux-3.1.1/drivers/edac/i82875p_edac.c
---- linux-3.1.1/drivers/edac/i82875p_edac.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/edac/i82875p_edac.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/edac/i82875p_edac.c linux-3.1.3/drivers/edac/i82875p_edac.c
+--- linux-3.1.3/drivers/edac/i82875p_edac.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/edac/i82875p_edac.c 2011-11-16 18:39:07.000000000 -0500
@@ -511,7 +511,7 @@ static void __devexit i82875p_remove_one
edac_mc_free(mci);
}
{
PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
I82875P},
-diff -urNp linux-3.1.1/drivers/edac/i82975x_edac.c linux-3.1.1/drivers/edac/i82975x_edac.c
---- linux-3.1.1/drivers/edac/i82975x_edac.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/edac/i82975x_edac.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/edac/i82975x_edac.c linux-3.1.3/drivers/edac/i82975x_edac.c
+--- linux-3.1.3/drivers/edac/i82975x_edac.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/edac/i82975x_edac.c 2011-11-16 18:39:07.000000000 -0500
@@ -604,7 +604,7 @@ static void __devexit i82975x_remove_one
edac_mc_free(mci);
}
{
PCI_VEND_DEV(INTEL, 82975_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
I82975X
-diff -urNp linux-3.1.1/drivers/edac/mce_amd.h linux-3.1.1/drivers/edac/mce_amd.h
---- linux-3.1.1/drivers/edac/mce_amd.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/edac/mce_amd.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/edac/mce_amd.h linux-3.1.3/drivers/edac/mce_amd.h
+--- linux-3.1.3/drivers/edac/mce_amd.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/edac/mce_amd.h 2011-11-16 18:39:07.000000000 -0500
@@ -83,7 +83,7 @@ struct amd_decoder_ops {
bool (*dc_mce)(u16, u8);
bool (*ic_mce)(u16, u8);
void amd_report_gart_errors(bool);
void amd_register_ecc_decoder(void (*f)(int, struct mce *, u32));
-diff -urNp linux-3.1.1/drivers/edac/r82600_edac.c linux-3.1.1/drivers/edac/r82600_edac.c
---- linux-3.1.1/drivers/edac/r82600_edac.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/edac/r82600_edac.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/edac/r82600_edac.c linux-3.1.3/drivers/edac/r82600_edac.c
+--- linux-3.1.3/drivers/edac/r82600_edac.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/edac/r82600_edac.c 2011-11-16 18:39:07.000000000 -0500
@@ -373,7 +373,7 @@ static void __devexit r82600_remove_one(
edac_mc_free(mci);
}
{
PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID)
},
-diff -urNp linux-3.1.1/drivers/edac/x38_edac.c linux-3.1.1/drivers/edac/x38_edac.c
---- linux-3.1.1/drivers/edac/x38_edac.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/edac/x38_edac.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/edac/x38_edac.c linux-3.1.3/drivers/edac/x38_edac.c
+--- linux-3.1.3/drivers/edac/x38_edac.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/edac/x38_edac.c 2011-11-16 18:39:07.000000000 -0500
@@ -440,7 +440,7 @@ static void __devexit x38_remove_one(str
edac_mc_free(mci);
}
{
PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
X38},
-diff -urNp linux-3.1.1/drivers/firewire/core-card.c linux-3.1.1/drivers/firewire/core-card.c
---- linux-3.1.1/drivers/firewire/core-card.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/firewire/core-card.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/firewire/core-card.c linux-3.1.3/drivers/firewire/core-card.c
+--- linux-3.1.3/drivers/firewire/core-card.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/firewire/core-card.c 2011-11-16 18:39:07.000000000 -0500
@@ -657,7 +657,7 @@ void fw_card_release(struct kref *kref)
void fw_core_remove_card(struct fw_card *card)
card->driver->update_phy_reg(card, 4,
PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
-diff -urNp linux-3.1.1/drivers/firewire/core-cdev.c linux-3.1.1/drivers/firewire/core-cdev.c
---- linux-3.1.1/drivers/firewire/core-cdev.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/firewire/core-cdev.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/firewire/core-cdev.c linux-3.1.3/drivers/firewire/core-cdev.c
+--- linux-3.1.3/drivers/firewire/core-cdev.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/firewire/core-cdev.c 2011-11-16 18:39:07.000000000 -0500
@@ -1331,8 +1331,7 @@ static int init_iso_resource(struct clie
int ret;
return -EINVAL;
r = kmalloc(sizeof(*r), GFP_KERNEL);
-diff -urNp linux-3.1.1/drivers/firewire/core.h linux-3.1.1/drivers/firewire/core.h
---- linux-3.1.1/drivers/firewire/core.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/firewire/core.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/firewire/core.h linux-3.1.3/drivers/firewire/core.h
+--- linux-3.1.3/drivers/firewire/core.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/firewire/core.h 2011-11-16 18:39:07.000000000 -0500
@@ -101,6 +101,7 @@ struct fw_card_driver {
int (*stop_iso)(struct fw_iso_context *ctx);
void fw_card_initialize(struct fw_card *card,
const struct fw_card_driver *driver, struct device *device);
-diff -urNp linux-3.1.1/drivers/firewire/core-transaction.c linux-3.1.1/drivers/firewire/core-transaction.c
---- linux-3.1.1/drivers/firewire/core-transaction.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/firewire/core-transaction.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/firewire/core-transaction.c linux-3.1.3/drivers/firewire/core-transaction.c
+--- linux-3.1.3/drivers/firewire/core-transaction.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/firewire/core-transaction.c 2011-11-16 18:40:10.000000000 -0500
@@ -37,6 +37,7 @@
#include <linux/timer.h>
#include <linux/types.h>
init_timer_on_stack(&t.split_timeout_timer);
init_completion(&d.done);
d.payload = payload;
-diff -urNp linux-3.1.1/drivers/firmware/dmi_scan.c linux-3.1.1/drivers/firmware/dmi_scan.c
---- linux-3.1.1/drivers/firmware/dmi_scan.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/firmware/dmi_scan.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/firmware/dmi_scan.c linux-3.1.3/drivers/firmware/dmi_scan.c
+--- linux-3.1.3/drivers/firmware/dmi_scan.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/firmware/dmi_scan.c 2011-11-16 18:39:07.000000000 -0500
@@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
}
}
iounmap(buf);
return 0;
-diff -urNp linux-3.1.1/drivers/gpio/gpio-vr41xx.c linux-3.1.1/drivers/gpio/gpio-vr41xx.c
---- linux-3.1.1/drivers/gpio/gpio-vr41xx.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpio/gpio-vr41xx.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpio/gpio-vr41xx.c linux-3.1.3/drivers/gpio/gpio-vr41xx.c
+--- linux-3.1.3/drivers/gpio/gpio-vr41xx.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpio/gpio-vr41xx.c 2011-11-16 18:39:07.000000000 -0500
@@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
maskl, pendl, maskh, pendh);
return -EINVAL;
}
-diff -urNp linux-3.1.1/drivers/gpu/drm/drm_crtc.c linux-3.1.1/drivers/gpu/drm/drm_crtc.c
---- linux-3.1.1/drivers/gpu/drm/drm_crtc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/drm_crtc.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/drm_crtc.c linux-3.1.3/drivers/gpu/drm/drm_crtc.c
+--- linux-3.1.3/drivers/gpu/drm/drm_crtc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/drm_crtc.c 2011-11-16 18:39:07.000000000 -0500
@@ -1374,7 +1374,7 @@ int drm_mode_getconnector(struct drm_dev
*/
if ((out_resp->count_modes >= mode_count) && mode_count) {
if (copy_to_user(blob_ptr, blob->data, blob->length)){
ret = -EFAULT;
goto done;
-diff -urNp linux-3.1.1/drivers/gpu/drm/drm_crtc_helper.c linux-3.1.1/drivers/gpu/drm/drm_crtc_helper.c
---- linux-3.1.1/drivers/gpu/drm/drm_crtc_helper.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/drm_crtc_helper.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/drm_crtc_helper.c linux-3.1.3/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-3.1.3/drivers/gpu/drm/drm_crtc_helper.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/drm_crtc_helper.c 2011-11-16 18:40:10.000000000 -0500
@@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d
struct drm_crtc *tmp;
int crtc_mask = 1;
crtc->enabled = drm_helper_crtc_in_use(crtc);
if (!crtc->enabled)
return true;
-diff -urNp linux-3.1.1/drivers/gpu/drm/drm_drv.c linux-3.1.1/drivers/gpu/drm/drm_drv.c
---- linux-3.1.1/drivers/gpu/drm/drm_drv.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/drm_drv.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/drm_drv.c linux-3.1.3/drivers/gpu/drm/drm_drv.c
+--- linux-3.1.3/drivers/gpu/drm/drm_drv.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/drm_drv.c 2011-11-16 18:39:07.000000000 -0500
@@ -307,7 +307,7 @@ module_exit(drm_core_exit);
/**
* Copy and IOCTL return string to user space
++file_priv->ioctl_count;
DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
-diff -urNp linux-3.1.1/drivers/gpu/drm/drm_fops.c linux-3.1.1/drivers/gpu/drm/drm_fops.c
---- linux-3.1.1/drivers/gpu/drm/drm_fops.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/drm_fops.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/drm_fops.c linux-3.1.3/drivers/gpu/drm/drm_fops.c
+--- linux-3.1.3/drivers/gpu/drm/drm_fops.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/drm_fops.c 2011-11-16 18:39:07.000000000 -0500
@@ -70,7 +70,7 @@ static int drm_setup(struct drm_device *
}
if (atomic_read(&dev->ioctl_count)) {
DRM_ERROR("Device busy: %d\n",
atomic_read(&dev->ioctl_count));
-diff -urNp linux-3.1.1/drivers/gpu/drm/drm_global.c linux-3.1.1/drivers/gpu/drm/drm_global.c
---- linux-3.1.1/drivers/gpu/drm/drm_global.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/drm_global.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/drm_global.c linux-3.1.3/drivers/gpu/drm/drm_global.c
+--- linux-3.1.3/drivers/gpu/drm/drm_global.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/drm_global.c 2011-11-16 18:39:07.000000000 -0500
@@ -36,7 +36,7 @@
struct drm_global_item {
struct mutex mutex;
ref->release(ref);
item->object = NULL;
}
-diff -urNp linux-3.1.1/drivers/gpu/drm/drm_info.c linux-3.1.1/drivers/gpu/drm/drm_info.c
---- linux-3.1.1/drivers/gpu/drm/drm_info.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/drm_info.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/drm_info.c linux-3.1.3/drivers/gpu/drm/drm_info.c
+--- linux-3.1.3/drivers/gpu/drm/drm_info.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/drm_info.c 2011-11-16 18:40:10.000000000 -0500
@@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void
struct drm_local_map *map;
struct drm_map_list *r_list;
#if defined(__i386__)
pgprot = pgprot_val(vma->vm_page_prot);
-diff -urNp linux-3.1.1/drivers/gpu/drm/drm_ioc32.c linux-3.1.1/drivers/gpu/drm/drm_ioc32.c
---- linux-3.1.1/drivers/gpu/drm/drm_ioc32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/drm_ioc32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/drm_ioc32.c linux-3.1.3/drivers/gpu/drm/drm_ioc32.c
+--- linux-3.1.3/drivers/gpu/drm/drm_ioc32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/drm_ioc32.c 2011-11-16 18:39:07.000000000 -0500
@@ -455,7 +455,7 @@ static int compat_drm_infobufs(struct fi
request = compat_alloc_user_space(nbytes);
if (!access_ok(VERIFY_WRITE, request, nbytes))
if (__put_user(count, &request->count)
|| __put_user(list, &request->list))
-diff -urNp linux-3.1.1/drivers/gpu/drm/drm_ioctl.c linux-3.1.1/drivers/gpu/drm/drm_ioctl.c
---- linux-3.1.1/drivers/gpu/drm/drm_ioctl.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/drm_ioctl.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/drm_ioctl.c linux-3.1.3/drivers/gpu/drm/drm_ioctl.c
+--- linux-3.1.3/drivers/gpu/drm/drm_ioctl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/drm_ioctl.c 2011-11-16 18:39:07.000000000 -0500
@@ -256,7 +256,7 @@ int drm_getstats(struct drm_device *dev,
stats->data[i].value =
(file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
stats->data[i].type = dev->types[i];
}
-diff -urNp linux-3.1.1/drivers/gpu/drm/drm_lock.c linux-3.1.1/drivers/gpu/drm/drm_lock.c
---- linux-3.1.1/drivers/gpu/drm/drm_lock.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/drm_lock.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/drm_lock.c linux-3.1.3/drivers/gpu/drm/drm_lock.c
+--- linux-3.1.3/drivers/gpu/drm/drm_lock.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/drm_lock.c 2011-11-16 18:39:07.000000000 -0500
@@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, voi
if (drm_lock_take(&master->lock, lock->context)) {
master->lock.file_priv = file_priv;
if (drm_lock_free(&master->lock, lock->context)) {
/* FIXME: Should really bail out here. */
-diff -urNp linux-3.1.1/drivers/gpu/drm/i810/i810_dma.c linux-3.1.1/drivers/gpu/drm/i810/i810_dma.c
---- linux-3.1.1/drivers/gpu/drm/i810/i810_dma.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/i810/i810_dma.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/i810/i810_dma.c linux-3.1.3/drivers/gpu/drm/i810/i810_dma.c
+--- linux-3.1.3/drivers/gpu/drm/i810/i810_dma.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/i810/i810_dma.c 2011-11-16 18:39:07.000000000 -0500
@@ -950,8 +950,8 @@ static int i810_dma_vertex(struct drm_de
dma->buflist[vertex->idx],
vertex->discard, vertex->used);
sarea_priv->last_enqueue = dev_priv->counter - 1;
sarea_priv->last_dispatch = (int)hw_status[5];
-diff -urNp linux-3.1.1/drivers/gpu/drm/i810/i810_drv.h linux-3.1.1/drivers/gpu/drm/i810/i810_drv.h
---- linux-3.1.1/drivers/gpu/drm/i810/i810_drv.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/i810/i810_drv.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/i810/i810_drv.h linux-3.1.3/drivers/gpu/drm/i810/i810_drv.h
+--- linux-3.1.3/drivers/gpu/drm/i810/i810_drv.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/i810/i810_drv.h 2011-11-16 18:39:07.000000000 -0500
@@ -108,8 +108,8 @@ typedef struct drm_i810_private {
int page_flipping;
int front_offset;
} drm_i810_private_t;
-diff -urNp linux-3.1.1/drivers/gpu/drm/i915/i915_debugfs.c linux-3.1.1/drivers/gpu/drm/i915/i915_debugfs.c
---- linux-3.1.1/drivers/gpu/drm/i915/i915_debugfs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/i915/i915_debugfs.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/i915/i915_debugfs.c linux-3.1.3/drivers/gpu/drm/i915/i915_debugfs.c
+--- linux-3.1.3/drivers/gpu/drm/i915/i915_debugfs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/i915/i915_debugfs.c 2011-11-16 18:39:07.000000000 -0500
@@ -497,7 +497,7 @@ static int i915_interrupt_info(struct se
I915_READ(GTIMR));
}
mutex_unlock(&dev->struct_mutex);
-diff -urNp linux-3.1.1/drivers/gpu/drm/i915/i915_dma.c linux-3.1.1/drivers/gpu/drm/i915/i915_dma.c
---- linux-3.1.1/drivers/gpu/drm/i915/i915_dma.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/i915/i915_dma.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/i915/i915_dma.c linux-3.1.3/drivers/gpu/drm/i915/i915_dma.c
+--- linux-3.1.3/drivers/gpu/drm/i915/i915_dma.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/i915/i915_dma.c 2011-11-16 18:39:07.000000000 -0500
@@ -1171,7 +1171,7 @@ static bool i915_switcheroo_can_switch(s
bool can_switch;
spin_unlock(&dev->count_lock);
return can_switch;
}
-diff -urNp linux-3.1.1/drivers/gpu/drm/i915/i915_drv.h linux-3.1.1/drivers/gpu/drm/i915/i915_drv.h
---- linux-3.1.1/drivers/gpu/drm/i915/i915_drv.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/i915/i915_drv.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/i915/i915_drv.h linux-3.1.3/drivers/gpu/drm/i915/i915_drv.h
+--- linux-3.1.3/drivers/gpu/drm/i915/i915_drv.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/i915/i915_drv.h 2011-11-16 18:39:07.000000000 -0500
@@ -222,7 +222,7 @@ struct drm_i915_display_funcs {
/* render clock increase/decrease */
/* display clock increase/decrease */
{
return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
}
-diff -urNp linux-3.1.1/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.1.1/drivers/gpu/drm/i915/i915_gem_execbuffer.c
---- linux-3.1.1/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.1.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+--- linux-3.1.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-11-16 18:39:07.000000000 -0500
@@ -188,7 +188,7 @@ i915_gem_object_set_to_gpu_domain(struct
i915_gem_clflush_object(obj);
/* The actual obj->write_domain will be updated with
* pending_write_domain after we emit the accumulated flush for all
-diff -urNp linux-3.1.1/drivers/gpu/drm/i915/i915_irq.c linux-3.1.1/drivers/gpu/drm/i915/i915_irq.c
---- linux-3.1.1/drivers/gpu/drm/i915/i915_irq.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/i915/i915_irq.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/i915/i915_irq.c linux-3.1.3/drivers/gpu/drm/i915/i915_irq.c
+--- linux-3.1.3/drivers/gpu/drm/i915/i915_irq.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/i915/i915_irq.c 2011-11-16 18:39:07.000000000 -0500
@@ -475,7 +475,7 @@ static irqreturn_t ivybridge_irq_handler
u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir;
struct drm_i915_master_private *master_priv;
INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
INIT_WORK(&dev_priv->error_work, i915_error_work_func);
-diff -urNp linux-3.1.1/drivers/gpu/drm/i915/intel_display.c linux-3.1.1/drivers/gpu/drm/i915/intel_display.c
---- linux-3.1.1/drivers/gpu/drm/i915/intel_display.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/i915/intel_display.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/i915/intel_display.c linux-3.1.3/drivers/gpu/drm/i915/intel_display.c
+--- linux-3.1.3/drivers/gpu/drm/i915/intel_display.c 2011-11-26 19:57:29.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/i915/intel_display.c 2011-11-26 20:00:43.000000000 -0500
@@ -2205,7 +2205,7 @@ intel_pipe_set_base(struct drm_crtc *crt
wait_event(dev_priv->pending_flip_queue,
/* Big Hammer, we also need to ensure that any pending
* MI_WAIT_FOR_EVENT inside a user batch buffer on the
-@@ -2824,7 +2824,7 @@ static void intel_crtc_wait_for_pending_
+@@ -2826,7 +2826,7 @@ static void intel_crtc_wait_for_pending_
obj = to_intel_framebuffer(crtc->fb)->obj;
dev_priv = crtc->dev->dev_private;
wait_event(dev_priv->pending_flip_queue,
}
static bool intel_crtc_driving_pch(struct drm_crtc *crtc)
-@@ -6644,7 +6644,7 @@ static void do_intel_finish_page_flip(st
+@@ -6676,7 +6676,7 @@ static void do_intel_finish_page_flip(st
atomic_clear_mask(1 << intel_crtc->plane,
&obj->pending_flip.counter);
wake_up(&dev_priv->pending_flip_queue);
schedule_work(&work->work);
-@@ -6933,7 +6933,7 @@ static int intel_crtc_page_flip(struct d
+@@ -6965,7 +6965,7 @@ static int intel_crtc_page_flip(struct d
/* Block clients from rendering to the new back buffer until
* the flip occurs and the object is no longer visible.
*/
ret = dev_priv->display.queue_flip(dev, crtc, fb, obj);
if (ret)
-@@ -6947,7 +6947,7 @@ static int intel_crtc_page_flip(struct d
+@@ -6979,7 +6979,7 @@ static int intel_crtc_page_flip(struct d
return 0;
cleanup_pending:
cleanup_objs:
drm_gem_object_unreference(&work->old_fb_obj->base);
drm_gem_object_unreference(&obj->base);
-diff -urNp linux-3.1.1/drivers/gpu/drm/mga/mga_drv.h linux-3.1.1/drivers/gpu/drm/mga/mga_drv.h
---- linux-3.1.1/drivers/gpu/drm/mga/mga_drv.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/mga/mga_drv.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/mga/mga_drv.h linux-3.1.3/drivers/gpu/drm/mga/mga_drv.h
+--- linux-3.1.3/drivers/gpu/drm/mga/mga_drv.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/mga/mga_drv.h 2011-11-16 18:39:07.000000000 -0500
@@ -120,9 +120,9 @@ typedef struct drm_mga_private {
u32 clear_cmd;
u32 maccess;
u32 next_fence_to_post;
unsigned int fb_cpp;
-diff -urNp linux-3.1.1/drivers/gpu/drm/mga/mga_irq.c linux-3.1.1/drivers/gpu/drm/mga/mga_irq.c
---- linux-3.1.1/drivers/gpu/drm/mga/mga_irq.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/mga/mga_irq.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/mga/mga_irq.c linux-3.1.3/drivers/gpu/drm/mga/mga_irq.c
+--- linux-3.1.3/drivers/gpu/drm/mga/mga_irq.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/mga/mga_irq.c 2011-11-16 18:39:07.000000000 -0500
@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de
if (crtc != 0)
return 0;
- *sequence) <= (1 << 23)));
*sequence = cur_fence;
-diff -urNp linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_bios.c
---- linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_bios.c
+--- linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-11-16 18:39:07.000000000 -0500
@@ -201,7 +201,7 @@ struct methods {
const char desc[8];
void (*loadbios)(struct drm_device *, uint8_t *);
#define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
-diff -urNp linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_drv.h
---- linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_drv.h
+--- linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-11-16 18:39:07.000000000 -0500
@@ -238,7 +238,7 @@ struct nouveau_channel {
struct list_head pending;
uint32_t sequence;
} ttm;
struct {
-diff -urNp linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_fence.c
---- linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_fence.c
+--- linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-11-26 19:57:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-11-26 20:00:06.000000000 -0500
@@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_chan
if (USE_REFCNT(dev))
sequence = nvchan_rd32(chan, 0x48);
if (chan->fence.sequence_ack == sequence)
goto out;
-@@ -541,7 +541,7 @@ nouveau_fence_channel_init(struct nouvea
+@@ -539,7 +539,7 @@ nouveau_fence_channel_init(struct nouvea
+ return ret;
+ }
- INIT_LIST_HEAD(&chan->fence.pending);
- spin_lock_init(&chan->fence.lock);
- atomic_set(&chan->fence.last_sequence_irq, 0);
+ atomic_set_unchecked(&chan->fence.last_sequence_irq, 0);
return 0;
}
-diff -urNp linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_gem.c
---- linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_gem.c
+--- linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-11-16 18:39:07.000000000 -0500
@@ -314,7 +314,7 @@ validate_init(struct nouveau_channel *ch
int trycnt = 0;
int ret, i;
retry:
if (++trycnt > 100000) {
NV_ERROR(dev, "%s failed and gave up.\n", __func__);
-diff -urNp linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_state.c
---- linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_state.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_state.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_state.c
+--- linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_state.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_state.c 2011-11-16 18:39:07.000000000 -0500
@@ -496,7 +496,7 @@ static bool nouveau_switcheroo_can_switc
bool can_switch;
spin_unlock(&dev->count_lock);
return can_switch;
}
-diff -urNp linux-3.1.1/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.1.1/drivers/gpu/drm/nouveau/nv04_graph.c
---- linux-3.1.1/drivers/gpu/drm/nouveau/nv04_graph.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/nouveau/nv04_graph.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.1.3/drivers/gpu/drm/nouveau/nv04_graph.c
+--- linux-3.1.3/drivers/gpu/drm/nouveau/nv04_graph.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/nouveau/nv04_graph.c 2011-11-16 18:39:07.000000000 -0500
@@ -554,7 +554,7 @@ static int
nv04_graph_mthd_set_ref(struct nouveau_channel *chan,
u32 class, u32 mthd, u32 data)
return 0;
}
-diff -urNp linux-3.1.1/drivers/gpu/drm/r128/r128_cce.c linux-3.1.1/drivers/gpu/drm/r128/r128_cce.c
---- linux-3.1.1/drivers/gpu/drm/r128/r128_cce.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/r128/r128_cce.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/r128/r128_cce.c linux-3.1.3/drivers/gpu/drm/r128/r128_cce.c
+--- linux-3.1.3/drivers/gpu/drm/r128/r128_cce.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/r128/r128_cce.c 2011-11-16 18:39:07.000000000 -0500
@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d
/* GH: Simple idle check.
/* We don't support anything other than bus-mastering ring mode,
* but the ring can be in either AGP or PCI space for the ring
-diff -urNp linux-3.1.1/drivers/gpu/drm/r128/r128_drv.h linux-3.1.1/drivers/gpu/drm/r128/r128_drv.h
---- linux-3.1.1/drivers/gpu/drm/r128/r128_drv.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/r128/r128_drv.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/r128/r128_drv.h linux-3.1.3/drivers/gpu/drm/r128/r128_drv.h
+--- linux-3.1.3/drivers/gpu/drm/r128/r128_drv.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/r128/r128_drv.h 2011-11-16 18:39:07.000000000 -0500
@@ -90,14 +90,14 @@ typedef struct drm_r128_private {
int is_pci;
unsigned long cce_buffers_offset;
u32 color_fmt;
unsigned int front_offset;
-diff -urNp linux-3.1.1/drivers/gpu/drm/r128/r128_irq.c linux-3.1.1/drivers/gpu/drm/r128/r128_irq.c
---- linux-3.1.1/drivers/gpu/drm/r128/r128_irq.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/r128/r128_irq.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/r128/r128_irq.c linux-3.1.3/drivers/gpu/drm/r128/r128_irq.c
+--- linux-3.1.3/drivers/gpu/drm/r128/r128_irq.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/r128/r128_irq.c 2011-11-16 18:39:07.000000000 -0500
@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d
if (crtc != 0)
return 0;
drm_handle_vblank(dev, 0);
return IRQ_HANDLED;
}
-diff -urNp linux-3.1.1/drivers/gpu/drm/r128/r128_state.c linux-3.1.1/drivers/gpu/drm/r128/r128_state.c
---- linux-3.1.1/drivers/gpu/drm/r128/r128_state.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/r128/r128_state.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/r128/r128_state.c linux-3.1.3/drivers/gpu/drm/r128/r128_state.c
+--- linux-3.1.3/drivers/gpu/drm/r128/r128_state.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/r128/r128_state.c 2011-11-16 18:39:07.000000000 -0500
@@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_priv
static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
}
#endif
-diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/atom.c linux-3.1.1/drivers/gpu/drm/radeon/atom.c
---- linux-3.1.1/drivers/gpu/drm/radeon/atom.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/radeon/atom.c 2011-11-16 19:09:42.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/atom.c linux-3.1.3/drivers/gpu/drm/radeon/atom.c
+--- linux-3.1.3/drivers/gpu/drm/radeon/atom.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/radeon/atom.c 2011-11-16 19:09:42.000000000 -0500
@@ -1254,6 +1254,8 @@ struct atom_context *atom_parse(struct c
char name[512];
int i;
if (!ctx)
return NULL;
-diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/mkregtable.c linux-3.1.1/drivers/gpu/drm/radeon/mkregtable.c
---- linux-3.1.1/drivers/gpu/drm/radeon/mkregtable.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/radeon/mkregtable.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/mkregtable.c linux-3.1.3/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-3.1.3/drivers/gpu/drm/radeon/mkregtable.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/radeon/mkregtable.c 2011-11-16 18:39:07.000000000 -0500
@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
regex_t mask_rex;
regmatch_t match[4];
if (regcomp
(&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_atombios.c
---- linux-3.1.1/drivers/gpu/drm/radeon/radeon_atombios.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_atombios.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.1.3/drivers/gpu/drm/radeon/radeon_atombios.c
+--- linux-3.1.3/drivers/gpu/drm/radeon/radeon_atombios.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/radeon/radeon_atombios.c 2011-11-16 18:40:10.000000000 -0500
@@ -545,6 +545,8 @@ bool radeon_get_atom_connector_info_from
struct radeon_gpio_rec gpio;
struct radeon_hpd hpd;
if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset))
return false;
-diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_device.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_device.c
---- linux-3.1.1/drivers/gpu/drm/radeon/radeon_device.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_device.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_device.c linux-3.1.3/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-3.1.3/drivers/gpu/drm/radeon/radeon_device.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/radeon/radeon_device.c 2011-11-16 18:39:07.000000000 -0500
@@ -684,7 +684,7 @@ static bool radeon_switcheroo_can_switch
bool can_switch;
spin_unlock(&dev->count_lock);
return can_switch;
}
-diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_display.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_display.c
---- linux-3.1.1/drivers/gpu/drm/radeon/radeon_display.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_display.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_display.c linux-3.1.3/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-3.1.3/drivers/gpu/drm/radeon/radeon_display.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/radeon/radeon_display.c 2011-11-16 18:40:10.000000000 -0500
@@ -925,6 +925,8 @@ void radeon_compute_pll_legacy(struct ra
uint32_t post_div;
u32 pll_out_min, pll_out_max;
DRM_DEBUG_KMS("PLL freq %llu %u %u\n", freq, pll->min_ref_div, pll->max_ref_div);
freq = freq * 1000;
-diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_drv.h linux-3.1.1/drivers/gpu/drm/radeon/radeon_drv.h
---- linux-3.1.1/drivers/gpu/drm/radeon/radeon_drv.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_drv.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_drv.h linux-3.1.3/drivers/gpu/drm/radeon/radeon_drv.h
+--- linux-3.1.3/drivers/gpu/drm/radeon/radeon_drv.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/radeon/radeon_drv.h 2011-11-16 18:39:07.000000000 -0500
@@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
/* SW interrupt */
int vblank_crtc;
uint32_t irq_enable_reg;
uint32_t r500_disp_irq_reg;
-diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_fence.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_fence.c
---- linux-3.1.1/drivers/gpu/drm/radeon/radeon_fence.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_fence.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_fence.c linux-3.1.3/drivers/gpu/drm/radeon/radeon_fence.c
+--- linux-3.1.3/drivers/gpu/drm/radeon/radeon_fence.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/radeon/radeon_fence.c 2011-11-16 18:39:07.000000000 -0500
@@ -78,7 +78,7 @@ int radeon_fence_emit(struct radeon_devi
write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
return 0;
INIT_LIST_HEAD(&rdev->fence_drv.created);
INIT_LIST_HEAD(&rdev->fence_drv.emited);
INIT_LIST_HEAD(&rdev->fence_drv.signaled);
-diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon.h linux-3.1.1/drivers/gpu/drm/radeon/radeon.h
---- linux-3.1.1/drivers/gpu/drm/radeon/radeon.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/radeon/radeon.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon.h linux-3.1.3/drivers/gpu/drm/radeon/radeon.h
+--- linux-3.1.3/drivers/gpu/drm/radeon/radeon.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/radeon/radeon.h 2011-11-16 18:39:07.000000000 -0500
@@ -192,7 +192,7 @@ extern int sumo_get_temp(struct radeon_d
*/
struct radeon_fence_driver {
/*
* Asic structures
-diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_ioc32.c
---- linux-3.1.1/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.1.3/drivers/gpu/drm/radeon/radeon_ioc32.c
+--- linux-3.1.3/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-11-16 18:39:07.000000000 -0500
@@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(str
request = compat_alloc_user_space(sizeof(*request));
if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
&request->value))
return -EFAULT;
-diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_irq.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_irq.c
---- linux-3.1.1/drivers/gpu/drm/radeon/radeon_irq.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_irq.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_irq.c linux-3.1.3/drivers/gpu/drm/radeon/radeon_irq.c
+--- linux-3.1.3/drivers/gpu/drm/radeon/radeon_irq.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/radeon/radeon_irq.c 2011-11-16 18:39:07.000000000 -0500
@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de
unsigned int ret;
RING_LOCALS;
DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
dev->max_vblank_count = 0x001fffff;
-diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_state.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_state.c
---- linux-3.1.1/drivers/gpu/drm/radeon/radeon_state.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_state.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_state.c linux-3.1.3/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-3.1.3/drivers/gpu/drm/radeon/radeon_state.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/radeon/radeon_state.c 2011-11-16 18:39:07.000000000 -0500
@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_de
if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
-diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-3.1.1/drivers/gpu/drm/radeon/radeon_ttm.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_ttm.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.1.3/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-3.1.3/drivers/gpu/drm/radeon/radeon_ttm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/radeon/radeon_ttm.c 2011-11-16 18:39:07.000000000 -0500
@@ -672,8 +672,10 @@ int radeon_mmap(struct file *filp, struc
}
if (unlikely(ttm_vm_ops == NULL)) {
}
vma->vm_ops = &radeon_ttm_vm_ops;
return 0;
-diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/rs690.c linux-3.1.1/drivers/gpu/drm/radeon/rs690.c
---- linux-3.1.1/drivers/gpu/drm/radeon/rs690.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/radeon/rs690.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/rs690.c linux-3.1.3/drivers/gpu/drm/radeon/rs690.c
+--- linux-3.1.3/drivers/gpu/drm/radeon/rs690.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/radeon/rs690.c 2011-11-16 18:39:07.000000000 -0500
@@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct
if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
rdev->pm.sideport_bandwidth.full)
} else {
if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
rdev->pm.k8_bandwidth.full)
-diff -urNp linux-3.1.1/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.1.1/drivers/gpu/drm/ttm/ttm_page_alloc.c
---- linux-3.1.1/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.1.3/drivers/gpu/drm/ttm/ttm_page_alloc.c
+--- linux-3.1.3/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-11-16 18:39:07.000000000 -0500
@@ -398,9 +398,9 @@ static int ttm_pool_get_num_unused_pages
static int ttm_pool_mm_shrink(struct shrinker *shrink,
struct shrink_control *sc)
struct ttm_page_pool *pool;
int shrink_pages = sc->nr_to_scan;
-diff -urNp linux-3.1.1/drivers/gpu/drm/via/via_drv.h linux-3.1.1/drivers/gpu/drm/via/via_drv.h
---- linux-3.1.1/drivers/gpu/drm/via/via_drv.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/via/via_drv.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/via/via_drv.h linux-3.1.3/drivers/gpu/drm/via/via_drv.h
+--- linux-3.1.3/drivers/gpu/drm/via/via_drv.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/via/via_drv.h 2011-11-16 18:39:07.000000000 -0500
@@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
typedef uint32_t maskarray_t[5];
drm_via_state_t hc_state;
char pci_buf[VIA_PCI_BUF_SIZE];
const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
-diff -urNp linux-3.1.1/drivers/gpu/drm/via/via_irq.c linux-3.1.1/drivers/gpu/drm/via/via_irq.c
---- linux-3.1.1/drivers/gpu/drm/via/via_irq.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/via/via_irq.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/via/via_irq.c linux-3.1.3/drivers/gpu/drm/via/via_irq.c
+--- linux-3.1.3/drivers/gpu/drm/via/via_irq.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/via/via_irq.c 2011-11-16 18:39:07.000000000 -0500
@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de
if (crtc != 0)
return 0;
irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
case VIA_IRQ_ABSOLUTE:
break;
-diff -urNp linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
---- linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+--- linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-11-16 18:39:07.000000000 -0500
@@ -240,7 +240,7 @@ struct vmw_private {
* Fencing and IRQs.
*/
wait_queue_head_t fence_queue;
wait_queue_head_t fifo_queue;
atomic_t fence_queue_waiters;
-diff -urNp linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
---- linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+--- linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 2011-11-16 18:39:07.000000000 -0500
@@ -610,7 +610,7 @@ int vmw_execbuf_ioctl(struct drm_device
struct drm_vmw_fence_rep fence_rep;
struct drm_vmw_fence_rep __user *user_fence_rep;
void *cmd;
uint32_t sequence;
struct vmw_sw_context *sw_context = &dev_priv->ctx;
-diff -urNp linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
---- linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+--- linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-11-16 18:39:07.000000000 -0500
@@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev
while (!vmw_lag_lt(queue, us)) {
spin_lock(&queue->lock);
else {
fence = list_first_entry(&queue->head,
struct vmw_fence, head);
-diff -urNp linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
---- linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+--- linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-11-16 18:39:07.000000000 -0500
@@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *de
(unsigned int) min,
(unsigned int) fifo->capabilities);
} while (*sequence == 0);
if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
-diff -urNp linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
---- linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
+--- linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-11-16 18:39:07.000000000 -0500
@@ -100,7 +100,7 @@ bool vmw_fence_signaled(struct vmw_priva
* emitted. Then the fence is stale and signaled.
*/
ret = 0;
for (;;) {
-diff -urNp linux-3.1.1/drivers/hid/hid-core.c linux-3.1.1/drivers/hid/hid-core.c
---- linux-3.1.1/drivers/hid/hid-core.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/hid/hid-core.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/hid/hid-core.c linux-3.1.3/drivers/hid/hid-core.c
+--- linux-3.1.3/drivers/hid/hid-core.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/hid/hid-core.c 2011-11-16 18:39:07.000000000 -0500
@@ -1951,7 +1951,7 @@ static bool hid_ignore(struct hid_device
int hid_add_device(struct hid_device *hdev)
hid_debug_register(hdev, dev_name(&hdev->dev));
ret = device_add(&hdev->dev);
-diff -urNp linux-3.1.1/drivers/hid/usbhid/hiddev.c linux-3.1.1/drivers/hid/usbhid/hiddev.c
---- linux-3.1.1/drivers/hid/usbhid/hiddev.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/hid/usbhid/hiddev.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/hid/usbhid/hiddev.c linux-3.1.3/drivers/hid/usbhid/hiddev.c
+--- linux-3.1.3/drivers/hid/usbhid/hiddev.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/hid/usbhid/hiddev.c 2011-11-16 18:39:07.000000000 -0500
@@ -624,7 +624,7 @@ static long hiddev_ioctl(struct file *fi
break;
break;
for (i = 0; i < hid->maxcollection; i++)
-diff -urNp linux-3.1.1/drivers/hwmon/acpi_power_meter.c linux-3.1.1/drivers/hwmon/acpi_power_meter.c
---- linux-3.1.1/drivers/hwmon/acpi_power_meter.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/hwmon/acpi_power_meter.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/hwmon/acpi_power_meter.c linux-3.1.3/drivers/hwmon/acpi_power_meter.c
+--- linux-3.1.3/drivers/hwmon/acpi_power_meter.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/hwmon/acpi_power_meter.c 2011-11-16 18:39:07.000000000 -0500
@@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d
return res;
mutex_lock(&resource->lock);
resource->trip[attr->index - 7] = temp;
-diff -urNp linux-3.1.1/drivers/hwmon/sht15.c linux-3.1.1/drivers/hwmon/sht15.c
---- linux-3.1.1/drivers/hwmon/sht15.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/hwmon/sht15.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/hwmon/sht15.c linux-3.1.3/drivers/hwmon/sht15.c
+--- linux-3.1.3/drivers/hwmon/sht15.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/hwmon/sht15.c 2011-11-16 18:39:07.000000000 -0500
@@ -166,7 +166,7 @@ struct sht15_data {
int supply_uV;
bool supply_uV_valid;
return;
}
-diff -urNp linux-3.1.1/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.1.1/drivers/i2c/busses/i2c-amd756-s4882.c
---- linux-3.1.1/drivers/i2c/busses/i2c-amd756-s4882.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/i2c/busses/i2c-amd756-s4882.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.1.3/drivers/i2c/busses/i2c-amd756-s4882.c
+--- linux-3.1.3/drivers/i2c/busses/i2c-amd756-s4882.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/i2c/busses/i2c-amd756-s4882.c 2011-11-16 18:39:07.000000000 -0500
@@ -43,7 +43,7 @@
extern struct i2c_adapter amd756_smbus;
/* Wrapper access functions for multiplexed SMBus */
static DEFINE_MUTEX(amd756_lock);
-diff -urNp linux-3.1.1/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.1.1/drivers/i2c/busses/i2c-nforce2-s4985.c
---- linux-3.1.1/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.1.3/drivers/i2c/busses/i2c-nforce2-s4985.c
+--- linux-3.1.3/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-11-16 18:39:07.000000000 -0500
@@ -41,7 +41,7 @@
extern struct i2c_adapter *nforce2_smbus;
/* Wrapper access functions for multiplexed SMBus */
static DEFINE_MUTEX(nforce2_lock);
-diff -urNp linux-3.1.1/drivers/i2c/i2c-mux.c linux-3.1.1/drivers/i2c/i2c-mux.c
---- linux-3.1.1/drivers/i2c/i2c-mux.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/i2c/i2c-mux.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/i2c/i2c-mux.c linux-3.1.3/drivers/i2c/i2c-mux.c
+--- linux-3.1.3/drivers/i2c/i2c-mux.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/i2c/i2c-mux.c 2011-11-16 18:39:07.000000000 -0500
@@ -28,7 +28,7 @@
/* multiplexer per channel data */
struct i2c_mux_priv {
struct i2c_adapter *parent;
void *mux_dev; /* the mux chip/device */
-diff -urNp linux-3.1.1/drivers/ide/aec62xx.c linux-3.1.1/drivers/ide/aec62xx.c
---- linux-3.1.1/drivers/ide/aec62xx.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/aec62xx.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/aec62xx.c linux-3.1.3/drivers/ide/aec62xx.c
+--- linux-3.1.3/drivers/ide/aec62xx.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/aec62xx.c 2011-11-16 18:39:07.000000000 -0500
@@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_
.cable_detect = atp86x_cable_detect,
};
{ /* 0: AEC6210 */
.name = DRV_NAME,
.init_chipset = init_chipset_aec62xx,
-diff -urNp linux-3.1.1/drivers/ide/alim15x3.c linux-3.1.1/drivers/ide/alim15x3.c
---- linux-3.1.1/drivers/ide/alim15x3.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/alim15x3.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/alim15x3.c linux-3.1.3/drivers/ide/alim15x3.c
+--- linux-3.1.3/drivers/ide/alim15x3.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/alim15x3.c 2011-11-16 18:39:07.000000000 -0500
@@ -512,7 +512,7 @@ static const struct ide_dma_ops ali_dma_
.dma_sff_read_status = ide_dma_sff_read_status,
};
.name = DRV_NAME,
.init_chipset = init_chipset_ali15x3,
.init_hwif = init_hwif_ali15x3,
-diff -urNp linux-3.1.1/drivers/ide/amd74xx.c linux-3.1.1/drivers/ide/amd74xx.c
---- linux-3.1.1/drivers/ide/amd74xx.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/amd74xx.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/amd74xx.c linux-3.1.3/drivers/ide/amd74xx.c
+--- linux-3.1.3/drivers/ide/amd74xx.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/amd74xx.c 2011-11-16 18:39:07.000000000 -0500
@@ -223,7 +223,7 @@ static const struct ide_port_ops amd_por
.udma_mask = udma, \
}
/* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2),
/* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),
/* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
-diff -urNp linux-3.1.1/drivers/ide/atiixp.c linux-3.1.1/drivers/ide/atiixp.c
---- linux-3.1.1/drivers/ide/atiixp.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/atiixp.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/atiixp.c linux-3.1.3/drivers/ide/atiixp.c
+--- linux-3.1.3/drivers/ide/atiixp.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/atiixp.c 2011-11-16 18:39:07.000000000 -0500
@@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_
.cable_detect = atiixp_cable_detect,
};
{ /* 0: IXP200/300/400/700 */
.name = DRV_NAME,
.enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
-diff -urNp linux-3.1.1/drivers/ide/cmd64x.c linux-3.1.1/drivers/ide/cmd64x.c
---- linux-3.1.1/drivers/ide/cmd64x.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/cmd64x.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/cmd64x.c linux-3.1.3/drivers/ide/cmd64x.c
+--- linux-3.1.3/drivers/ide/cmd64x.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/cmd64x.c 2011-11-16 18:39:07.000000000 -0500
@@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_r
.dma_sff_read_status = ide_dma_sff_read_status,
};
{ /* 0: CMD643 */
.name = DRV_NAME,
.init_chipset = init_chipset_cmd64x,
-diff -urNp linux-3.1.1/drivers/ide/cs5520.c linux-3.1.1/drivers/ide/cs5520.c
---- linux-3.1.1/drivers/ide/cs5520.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/cs5520.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/cs5520.c linux-3.1.3/drivers/ide/cs5520.c
+--- linux-3.1.3/drivers/ide/cs5520.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/cs5520.c 2011-11-16 18:39:07.000000000 -0500
@@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_
.set_dma_mode = cs5520_set_dma_mode,
};
.name = DRV_NAME,
.enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },
.port_ops = &cs5520_port_ops,
-diff -urNp linux-3.1.1/drivers/ide/cs5530.c linux-3.1.1/drivers/ide/cs5530.c
---- linux-3.1.1/drivers/ide/cs5530.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/cs5530.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/cs5530.c linux-3.1.3/drivers/ide/cs5530.c
+--- linux-3.1.3/drivers/ide/cs5530.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/cs5530.c 2011-11-16 18:39:07.000000000 -0500
@@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_
.udma_filter = cs5530_udma_filter,
};
.name = DRV_NAME,
.init_chipset = init_chipset_cs5530,
.init_hwif = init_hwif_cs5530,
-diff -urNp linux-3.1.1/drivers/ide/cs5535.c linux-3.1.1/drivers/ide/cs5535.c
---- linux-3.1.1/drivers/ide/cs5535.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/cs5535.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/cs5535.c linux-3.1.3/drivers/ide/cs5535.c
+--- linux-3.1.3/drivers/ide/cs5535.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/cs5535.c 2011-11-16 18:39:07.000000000 -0500
@@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_
.cable_detect = cs5535_cable_detect,
};
.name = DRV_NAME,
.port_ops = &cs5535_port_ops,
.host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
-diff -urNp linux-3.1.1/drivers/ide/cy82c693.c linux-3.1.1/drivers/ide/cy82c693.c
---- linux-3.1.1/drivers/ide/cy82c693.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/cy82c693.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/cy82c693.c linux-3.1.3/drivers/ide/cy82c693.c
+--- linux-3.1.3/drivers/ide/cy82c693.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/cy82c693.c 2011-11-16 18:39:07.000000000 -0500
@@ -163,7 +163,7 @@ static const struct ide_port_ops cy82c69
.set_dma_mode = cy82c693_set_dma_mode,
};
.name = DRV_NAME,
.init_iops = init_iops_cy82c693,
.port_ops = &cy82c693_port_ops,
-diff -urNp linux-3.1.1/drivers/ide/hpt366.c linux-3.1.1/drivers/ide/hpt366.c
---- linux-3.1.1/drivers/ide/hpt366.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/hpt366.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/hpt366.c linux-3.1.3/drivers/ide/hpt366.c
+--- linux-3.1.3/drivers/ide/hpt366.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/hpt366.c 2011-11-16 18:39:07.000000000 -0500
@@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings
}
};
{ /* 0: HPT36x */
.name = DRV_NAME,
.init_chipset = init_chipset_hpt366,
-diff -urNp linux-3.1.1/drivers/ide/ide-cd.c linux-3.1.1/drivers/ide/ide-cd.c
---- linux-3.1.1/drivers/ide/ide-cd.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/ide-cd.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/ide-cd.c linux-3.1.3/drivers/ide/ide-cd.c
+--- linux-3.1.3/drivers/ide/ide-cd.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/ide-cd.c 2011-11-16 18:39:07.000000000 -0500
@@ -769,7 +769,7 @@ static void cdrom_do_block_pc(ide_drive_
alignment = queue_dma_alignment(q) | q->dma_pad_mask;
if ((unsigned long)buf & alignment
drive->dma = 0;
}
}
-diff -urNp linux-3.1.1/drivers/ide/ide-floppy.c linux-3.1.1/drivers/ide/ide-floppy.c
---- linux-3.1.1/drivers/ide/ide-floppy.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/ide-floppy.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/ide-floppy.c linux-3.1.3/drivers/ide/ide-floppy.c
+--- linux-3.1.3/drivers/ide/ide-floppy.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/ide-floppy.c 2011-11-16 18:40:10.000000000 -0500
@@ -379,6 +379,8 @@ static int ide_floppy_get_capacity(ide_d
u8 pc_buf[256], header_len, desc_cnt;
int i, rc = 1, blocks, length;
ide_debug_log(IDE_DBG_FUNC, "enter");
drive->bios_cyl = 0;
-diff -urNp linux-3.1.1/drivers/ide/ide-pci-generic.c linux-3.1.1/drivers/ide/ide-pci-generic.c
---- linux-3.1.1/drivers/ide/ide-pci-generic.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/ide-pci-generic.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/ide-pci-generic.c linux-3.1.3/drivers/ide/ide-pci-generic.c
+--- linux-3.1.3/drivers/ide/ide-pci-generic.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/ide-pci-generic.c 2011-11-16 18:39:07.000000000 -0500
@@ -53,7 +53,7 @@ static const struct ide_port_ops netcell
.udma_mask = ATA_UDMA6, \
}
/* 0: Unknown */
DECLARE_GENERIC_PCI_DEV(0),
-diff -urNp linux-3.1.1/drivers/ide/it8172.c linux-3.1.1/drivers/ide/it8172.c
---- linux-3.1.1/drivers/ide/it8172.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/it8172.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/it8172.c linux-3.1.3/drivers/ide/it8172.c
+--- linux-3.1.3/drivers/ide/it8172.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/it8172.c 2011-11-16 18:39:07.000000000 -0500
@@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_
.set_dma_mode = it8172_set_dma_mode,
};
.name = DRV_NAME,
.port_ops = &it8172_port_ops,
.enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
-diff -urNp linux-3.1.1/drivers/ide/it8213.c linux-3.1.1/drivers/ide/it8213.c
---- linux-3.1.1/drivers/ide/it8213.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/it8213.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/it8213.c linux-3.1.3/drivers/ide/it8213.c
+--- linux-3.1.3/drivers/ide/it8213.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/it8213.c 2011-11-16 18:39:07.000000000 -0500
@@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_
.cable_detect = it8213_cable_detect,
};
.name = DRV_NAME,
.enablebits = { {0x41, 0x80, 0x80} },
.port_ops = &it8213_port_ops,
-diff -urNp linux-3.1.1/drivers/ide/it821x.c linux-3.1.1/drivers/ide/it821x.c
---- linux-3.1.1/drivers/ide/it821x.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/it821x.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/it821x.c linux-3.1.3/drivers/ide/it821x.c
+--- linux-3.1.3/drivers/ide/it821x.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/it821x.c 2011-11-16 18:39:07.000000000 -0500
@@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_
.cable_detect = it821x_cable_detect,
};
.name = DRV_NAME,
.init_chipset = init_chipset_it821x,
.init_hwif = init_hwif_it821x,
-diff -urNp linux-3.1.1/drivers/ide/jmicron.c linux-3.1.1/drivers/ide/jmicron.c
---- linux-3.1.1/drivers/ide/jmicron.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/jmicron.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/jmicron.c linux-3.1.3/drivers/ide/jmicron.c
+--- linux-3.1.3/drivers/ide/jmicron.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/jmicron.c 2011-11-16 18:39:07.000000000 -0500
@@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron
.cable_detect = jmicron_cable_detect,
};
.name = DRV_NAME,
.enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
.port_ops = &jmicron_port_ops,
-diff -urNp linux-3.1.1/drivers/ide/ns87415.c linux-3.1.1/drivers/ide/ns87415.c
---- linux-3.1.1/drivers/ide/ns87415.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/ns87415.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/ns87415.c linux-3.1.3/drivers/ide/ns87415.c
+--- linux-3.1.3/drivers/ide/ns87415.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/ns87415.c 2011-11-16 18:39:07.000000000 -0500
@@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_
.dma_sff_read_status = superio_dma_sff_read_status,
};
.name = DRV_NAME,
.init_hwif = init_hwif_ns87415,
.tp_ops = &ns87415_tp_ops,
-diff -urNp linux-3.1.1/drivers/ide/opti621.c linux-3.1.1/drivers/ide/opti621.c
---- linux-3.1.1/drivers/ide/opti621.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/opti621.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/opti621.c linux-3.1.3/drivers/ide/opti621.c
+--- linux-3.1.3/drivers/ide/opti621.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/opti621.c 2011-11-16 18:39:07.000000000 -0500
@@ -131,7 +131,7 @@ static const struct ide_port_ops opti621
.set_pio_mode = opti621_set_pio_mode,
};
.name = DRV_NAME,
.enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
.port_ops = &opti621_port_ops,
-diff -urNp linux-3.1.1/drivers/ide/pdc202xx_new.c linux-3.1.1/drivers/ide/pdc202xx_new.c
---- linux-3.1.1/drivers/ide/pdc202xx_new.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/pdc202xx_new.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/pdc202xx_new.c linux-3.1.3/drivers/ide/pdc202xx_new.c
+--- linux-3.1.3/drivers/ide/pdc202xx_new.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/pdc202xx_new.c 2011-11-16 18:39:07.000000000 -0500
@@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_
.udma_mask = udma, \
}
/* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5),
/* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6),
};
-diff -urNp linux-3.1.1/drivers/ide/pdc202xx_old.c linux-3.1.1/drivers/ide/pdc202xx_old.c
---- linux-3.1.1/drivers/ide/pdc202xx_old.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/pdc202xx_old.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/pdc202xx_old.c linux-3.1.3/drivers/ide/pdc202xx_old.c
+--- linux-3.1.3/drivers/ide/pdc202xx_old.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/pdc202xx_old.c 2011-11-16 18:39:07.000000000 -0500
@@ -270,7 +270,7 @@ static const struct ide_dma_ops pdc2026x
.max_sectors = sectors, \
}
{ /* 0: PDC20246 */
.name = DRV_NAME,
.init_chipset = init_chipset_pdc202xx,
-diff -urNp linux-3.1.1/drivers/ide/piix.c linux-3.1.1/drivers/ide/piix.c
---- linux-3.1.1/drivers/ide/piix.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/piix.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/piix.c linux-3.1.3/drivers/ide/piix.c
+--- linux-3.1.3/drivers/ide/piix.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/piix.c 2011-11-16 18:39:07.000000000 -0500
@@ -344,7 +344,7 @@ static const struct ide_port_ops ich_por
.udma_mask = udma, \
}
/* 0: MPIIX */
{ /*
* MPIIX actually has only a single IDE channel mapped to
-diff -urNp linux-3.1.1/drivers/ide/rz1000.c linux-3.1.1/drivers/ide/rz1000.c
---- linux-3.1.1/drivers/ide/rz1000.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/rz1000.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/rz1000.c linux-3.1.3/drivers/ide/rz1000.c
+--- linux-3.1.3/drivers/ide/rz1000.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/rz1000.c 2011-11-16 18:39:07.000000000 -0500
@@ -38,7 +38,7 @@ static int __devinit rz1000_disable_read
}
}
.name = DRV_NAME,
.host_flags = IDE_HFLAG_NO_DMA,
};
-diff -urNp linux-3.1.1/drivers/ide/sc1200.c linux-3.1.1/drivers/ide/sc1200.c
---- linux-3.1.1/drivers/ide/sc1200.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/sc1200.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/sc1200.c linux-3.1.3/drivers/ide/sc1200.c
+--- linux-3.1.3/drivers/ide/sc1200.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/sc1200.c 2011-11-16 18:39:07.000000000 -0500
@@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_d
.dma_sff_read_status = ide_dma_sff_read_status,
};
.name = DRV_NAME,
.port_ops = &sc1200_port_ops,
.dma_ops = &sc1200_dma_ops,
-diff -urNp linux-3.1.1/drivers/ide/scc_pata.c linux-3.1.1/drivers/ide/scc_pata.c
---- linux-3.1.1/drivers/ide/scc_pata.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/scc_pata.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/scc_pata.c linux-3.1.3/drivers/ide/scc_pata.c
+--- linux-3.1.3/drivers/ide/scc_pata.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/scc_pata.c 2011-11-16 18:39:07.000000000 -0500
@@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_
.dma_sff_read_status = scc_dma_sff_read_status,
};
.name = "sccIDE",
.init_iops = init_iops_scc,
.init_dma = scc_init_dma,
-diff -urNp linux-3.1.1/drivers/ide/serverworks.c linux-3.1.1/drivers/ide/serverworks.c
---- linux-3.1.1/drivers/ide/serverworks.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/serverworks.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/serverworks.c linux-3.1.3/drivers/ide/serverworks.c
+--- linux-3.1.3/drivers/ide/serverworks.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/serverworks.c 2011-11-16 18:39:07.000000000 -0500
@@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_p
.cable_detect = svwks_cable_detect,
};
{ /* 0: OSB4 */
.name = DRV_NAME,
.init_chipset = init_chipset_svwks,
-diff -urNp linux-3.1.1/drivers/ide/setup-pci.c linux-3.1.1/drivers/ide/setup-pci.c
---- linux-3.1.1/drivers/ide/setup-pci.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/setup-pci.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/setup-pci.c linux-3.1.3/drivers/ide/setup-pci.c
+--- linux-3.1.3/drivers/ide/setup-pci.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/setup-pci.c 2011-11-16 18:40:10.000000000 -0500
@@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev
int ret, i, n_ports = dev2 ? 4 : 2;
struct ide_hw hw[4], *hws[] = { NULL, NULL, NULL, NULL };
for (i = 0; i < n_ports / 2; i++) {
ret = ide_setup_pci_controller(pdev[i], d, !i);
if (ret < 0)
-diff -urNp linux-3.1.1/drivers/ide/siimage.c linux-3.1.1/drivers/ide/siimage.c
---- linux-3.1.1/drivers/ide/siimage.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/siimage.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/siimage.c linux-3.1.3/drivers/ide/siimage.c
+--- linux-3.1.3/drivers/ide/siimage.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/siimage.c 2011-11-16 18:39:07.000000000 -0500
@@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_
.udma_mask = ATA_UDMA6, \
}
/* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops),
/* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops)
};
-diff -urNp linux-3.1.1/drivers/ide/sis5513.c linux-3.1.1/drivers/ide/sis5513.c
---- linux-3.1.1/drivers/ide/sis5513.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/sis5513.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/sis5513.c linux-3.1.3/drivers/ide/sis5513.c
+--- linux-3.1.3/drivers/ide/sis5513.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/sis5513.c 2011-11-16 18:39:07.000000000 -0500
@@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata
.cable_detect = sis_cable_detect,
};
.name = DRV_NAME,
.init_chipset = init_chipset_sis5513,
.enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
-diff -urNp linux-3.1.1/drivers/ide/sl82c105.c linux-3.1.1/drivers/ide/sl82c105.c
---- linux-3.1.1/drivers/ide/sl82c105.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/sl82c105.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/sl82c105.c linux-3.1.3/drivers/ide/sl82c105.c
+--- linux-3.1.3/drivers/ide/sl82c105.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/sl82c105.c 2011-11-16 18:39:07.000000000 -0500
@@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105
.dma_sff_read_status = ide_dma_sff_read_status,
};
.name = DRV_NAME,
.init_chipset = init_chipset_sl82c105,
.enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
-diff -urNp linux-3.1.1/drivers/ide/slc90e66.c linux-3.1.1/drivers/ide/slc90e66.c
---- linux-3.1.1/drivers/ide/slc90e66.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/slc90e66.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/slc90e66.c linux-3.1.3/drivers/ide/slc90e66.c
+--- linux-3.1.3/drivers/ide/slc90e66.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/slc90e66.c 2011-11-16 18:39:07.000000000 -0500
@@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e6
.cable_detect = slc90e66_cable_detect,
};
.name = DRV_NAME,
.enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} },
.port_ops = &slc90e66_port_ops,
-diff -urNp linux-3.1.1/drivers/ide/tc86c001.c linux-3.1.1/drivers/ide/tc86c001.c
---- linux-3.1.1/drivers/ide/tc86c001.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/tc86c001.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/tc86c001.c linux-3.1.3/drivers/ide/tc86c001.c
+--- linux-3.1.3/drivers/ide/tc86c001.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/tc86c001.c 2011-11-16 18:39:07.000000000 -0500
@@ -191,7 +191,7 @@ static const struct ide_dma_ops tc86c001
.dma_sff_read_status = ide_dma_sff_read_status,
};
.name = DRV_NAME,
.init_hwif = init_hwif_tc86c001,
.port_ops = &tc86c001_port_ops,
-diff -urNp linux-3.1.1/drivers/ide/triflex.c linux-3.1.1/drivers/ide/triflex.c
---- linux-3.1.1/drivers/ide/triflex.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/triflex.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/triflex.c linux-3.1.3/drivers/ide/triflex.c
+--- linux-3.1.3/drivers/ide/triflex.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/triflex.c 2011-11-16 18:39:07.000000000 -0500
@@ -92,7 +92,7 @@ static const struct ide_port_ops triflex
.set_dma_mode = triflex_set_mode,
};
.name = DRV_NAME,
.enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
.port_ops = &triflex_port_ops,
-diff -urNp linux-3.1.1/drivers/ide/trm290.c linux-3.1.1/drivers/ide/trm290.c
---- linux-3.1.1/drivers/ide/trm290.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/trm290.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/trm290.c linux-3.1.3/drivers/ide/trm290.c
+--- linux-3.1.3/drivers/ide/trm290.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/trm290.c 2011-11-16 18:39:07.000000000 -0500
@@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops
.dma_check = trm290_dma_check,
};
.name = DRV_NAME,
.init_hwif = init_hwif_trm290,
.tp_ops = &trm290_tp_ops,
-diff -urNp linux-3.1.1/drivers/ide/via82cxxx.c linux-3.1.1/drivers/ide/via82cxxx.c
---- linux-3.1.1/drivers/ide/via82cxxx.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/ide/via82cxxx.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/ide/via82cxxx.c linux-3.1.3/drivers/ide/via82cxxx.c
+--- linux-3.1.3/drivers/ide/via82cxxx.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/ide/via82cxxx.c 2011-11-16 18:39:07.000000000 -0500
@@ -403,7 +403,7 @@ static const struct ide_port_ops via_por
.cable_detect = via82cxxx_cable_detect,
};
.name = DRV_NAME,
.init_chipset = init_chipset_via82cxxx,
.enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
-diff -urNp linux-3.1.1/drivers/infiniband/core/cm.c linux-3.1.1/drivers/infiniband/core/cm.c
---- linux-3.1.1/drivers/infiniband/core/cm.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/infiniband/core/cm.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/infiniband/core/cm.c linux-3.1.3/drivers/infiniband/core/cm.c
+--- linux-3.1.3/drivers/infiniband/core/cm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/infiniband/core/cm.c 2011-11-16 18:39:07.000000000 -0500
@@ -113,7 +113,7 @@ static char const counter_group_names[CM
struct cm_counter_group {
}
static const struct sysfs_ops cm_counter_ops = {
-diff -urNp linux-3.1.1/drivers/infiniband/core/fmr_pool.c linux-3.1.1/drivers/infiniband/core/fmr_pool.c
---- linux-3.1.1/drivers/infiniband/core/fmr_pool.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/infiniband/core/fmr_pool.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/infiniband/core/fmr_pool.c linux-3.1.3/drivers/infiniband/core/fmr_pool.c
+--- linux-3.1.3/drivers/infiniband/core/fmr_pool.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/infiniband/core/fmr_pool.c 2011-11-16 18:39:07.000000000 -0500
@@ -97,8 +97,8 @@ struct ib_fmr_pool {
struct task_struct *thread;
wake_up_process(pool->thread);
}
}
-diff -urNp linux-3.1.1/drivers/infiniband/hw/cxgb4/mem.c linux-3.1.1/drivers/infiniband/hw/cxgb4/mem.c
---- linux-3.1.1/drivers/infiniband/hw/cxgb4/mem.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/infiniband/hw/cxgb4/mem.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/infiniband/hw/cxgb4/mem.c linux-3.1.3/drivers/infiniband/hw/cxgb4/mem.c
+--- linux-3.1.3/drivers/infiniband/hw/cxgb4/mem.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/infiniband/hw/cxgb4/mem.c 2011-11-16 18:39:07.000000000 -0500
@@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_r
int err;
struct fw_ri_tpte tpt;
}
PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
__func__, stag_state, type, pdid, stag_idx);
-diff -urNp linux-3.1.1/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.1.1/drivers/infiniband/hw/ipath/ipath_fs.c
---- linux-3.1.1/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.1.3/drivers/infiniband/hw/ipath/ipath_fs.c
+--- linux-3.1.3/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-16 18:40:10.000000000 -0500
@@ -113,6 +113,8 @@ static ssize_t atomic_counters_read(stru
struct infinipath_counters counters;
struct ipath_devdata *dd;
dd = file->f_path.dentry->d_inode->i_private;
dd->ipath_f_read_counters(dd, &counters);
-diff -urNp linux-3.1.1/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.1.1/drivers/infiniband/hw/ipath/ipath_rc.c
---- linux-3.1.1/drivers/infiniband/hw/ipath/ipath_rc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/infiniband/hw/ipath/ipath_rc.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.1.3/drivers/infiniband/hw/ipath/ipath_rc.c
+--- linux-3.1.3/drivers/infiniband/hw/ipath/ipath_rc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/infiniband/hw/ipath/ipath_rc.c 2011-11-16 18:39:07.000000000 -0500
@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *de
struct ib_atomic_eth *ateth;
struct ipath_ack_entry *e;
(u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
be64_to_cpu(ateth->compare_data),
sdata);
-diff -urNp linux-3.1.1/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.1.1/drivers/infiniband/hw/ipath/ipath_ruc.c
---- linux-3.1.1/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.1.3/drivers/infiniband/hw/ipath/ipath_ruc.c
+--- linux-3.1.3/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-11-16 18:39:07.000000000 -0500
@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ip
unsigned long flags;
struct ib_wc wc;
(u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
sdata, wqe->wr.wr.atomic.swap);
goto send_comp;
-diff -urNp linux-3.1.1/drivers/infiniband/hw/nes/nes.c linux-3.1.1/drivers/infiniband/hw/nes/nes.c
---- linux-3.1.1/drivers/infiniband/hw/nes/nes.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/infiniband/hw/nes/nes.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/infiniband/hw/nes/nes.c linux-3.1.3/drivers/infiniband/hw/nes/nes.c
+--- linux-3.1.3/drivers/infiniband/hw/nes/nes.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/infiniband/hw/nes/nes.c 2011-11-16 18:39:07.000000000 -0500
@@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi
LIST_HEAD(nes_adapter_list);
static LIST_HEAD(nes_dev_list);
/* Free the control structures */
-diff -urNp linux-3.1.1/drivers/infiniband/hw/nes/nes_cm.c linux-3.1.1/drivers/infiniband/hw/nes/nes_cm.c
---- linux-3.1.1/drivers/infiniband/hw/nes/nes_cm.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/infiniband/hw/nes/nes_cm.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/infiniband/hw/nes/nes_cm.c linux-3.1.3/drivers/infiniband/hw/nes/nes_cm.c
+--- linux-3.1.3/drivers/infiniband/hw/nes/nes_cm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/infiniband/hw/nes/nes_cm.c 2011-11-16 18:39:07.000000000 -0500
@@ -68,14 +68,14 @@ u32 cm_packets_dropped;
u32 cm_packets_retrans;
u32 cm_packets_created;
nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
cm_node, cm_id, jiffies);
-diff -urNp linux-3.1.1/drivers/infiniband/hw/nes/nes.h linux-3.1.1/drivers/infiniband/hw/nes/nes.h
---- linux-3.1.1/drivers/infiniband/hw/nes/nes.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/infiniband/hw/nes/nes.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/infiniband/hw/nes/nes.h linux-3.1.3/drivers/infiniband/hw/nes/nes.h
+--- linux-3.1.3/drivers/infiniband/hw/nes/nes.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/infiniband/hw/nes/nes.h 2011-11-16 18:39:07.000000000 -0500
@@ -175,17 +175,17 @@ extern unsigned int nes_debug_level;
extern unsigned int wqm_quanta;
extern struct list_head nes_adapter_list;
extern u32 int_mod_timer_init;
extern u32 int_mod_cq_depth_256;
-diff -urNp linux-3.1.1/drivers/infiniband/hw/nes/nes_nic.c linux-3.1.1/drivers/infiniband/hw/nes/nes_nic.c
---- linux-3.1.1/drivers/infiniband/hw/nes/nes_nic.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/infiniband/hw/nes/nes_nic.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/infiniband/hw/nes/nes_nic.c linux-3.1.3/drivers/infiniband/hw/nes/nes_nic.c
+--- linux-3.1.3/drivers/infiniband/hw/nes/nes_nic.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/infiniband/hw/nes/nes_nic.c 2011-11-16 18:39:07.000000000 -0500
@@ -1274,31 +1274,31 @@ static void nes_netdev_get_ethtool_stats
target_stat_values[++index] = mh_detected;
target_stat_values[++index] = mh_pauses_sent;
target_stat_values[++index] = nesadapter->free_4kpbl;
target_stat_values[++index] = nesadapter->free_256pbl;
target_stat_values[++index] = int_mod_timer_init;
-diff -urNp linux-3.1.1/drivers/infiniband/hw/nes/nes_verbs.c linux-3.1.1/drivers/infiniband/hw/nes/nes_verbs.c
---- linux-3.1.1/drivers/infiniband/hw/nes/nes_verbs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/infiniband/hw/nes/nes_verbs.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/infiniband/hw/nes/nes_verbs.c linux-3.1.3/drivers/infiniband/hw/nes/nes_verbs.c
+--- linux-3.1.3/drivers/infiniband/hw/nes/nes_verbs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/infiniband/hw/nes/nes_verbs.c 2011-11-16 18:39:07.000000000 -0500
@@ -46,9 +46,9 @@
#include <rdma/ib_umem.h>
nesqp->destroyed = 1;
/* Blow away the connection if it exists. */
-diff -urNp linux-3.1.1/drivers/infiniband/hw/qib/qib.h linux-3.1.1/drivers/infiniband/hw/qib/qib.h
---- linux-3.1.1/drivers/infiniband/hw/qib/qib.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/infiniband/hw/qib/qib.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/infiniband/hw/qib/qib.h linux-3.1.3/drivers/infiniband/hw/qib/qib.h
+--- linux-3.1.3/drivers/infiniband/hw/qib/qib.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/infiniband/hw/qib/qib.h 2011-11-16 18:39:07.000000000 -0500
@@ -51,6 +51,7 @@
#include <linux/completion.h>
#include <linux/kref.h>
#include "qib_common.h"
#include "qib_verbs.h"
-diff -urNp linux-3.1.1/drivers/input/gameport/gameport.c linux-3.1.1/drivers/input/gameport/gameport.c
---- linux-3.1.1/drivers/input/gameport/gameport.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/input/gameport/gameport.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/input/gameport/gameport.c linux-3.1.3/drivers/input/gameport/gameport.c
+--- linux-3.1.3/drivers/input/gameport/gameport.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/input/gameport/gameport.c 2011-11-16 18:39:07.000000000 -0500
@@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys);
*/
static void gameport_init_port(struct gameport *gameport)
gameport->dev.bus = &gameport_bus;
gameport->dev.release = gameport_release_port;
if (gameport->parent)
-diff -urNp linux-3.1.1/drivers/input/input.c linux-3.1.1/drivers/input/input.c
---- linux-3.1.1/drivers/input/input.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/input/input.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/input/input.c linux-3.1.3/drivers/input/input.c
+--- linux-3.1.3/drivers/input/input.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/input/input.c 2011-11-16 18:39:07.000000000 -0500
@@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struc
*/
int input_register_device(struct input_dev *dev)
error = device_add(&dev->dev);
if (error)
-diff -urNp linux-3.1.1/drivers/input/joystick/sidewinder.c linux-3.1.1/drivers/input/joystick/sidewinder.c
---- linux-3.1.1/drivers/input/joystick/sidewinder.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/input/joystick/sidewinder.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/input/joystick/sidewinder.c linux-3.1.3/drivers/input/joystick/sidewinder.c
+--- linux-3.1.3/drivers/input/joystick/sidewinder.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/input/joystick/sidewinder.c 2011-11-16 18:40:10.000000000 -0500
@@ -30,6 +30,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
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-3.1.1/drivers/input/joystick/xpad.c linux-3.1.1/drivers/input/joystick/xpad.c
---- linux-3.1.1/drivers/input/joystick/xpad.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/input/joystick/xpad.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/input/joystick/xpad.c linux-3.1.3/drivers/input/joystick/xpad.c
+--- linux-3.1.3/drivers/input/joystick/xpad.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/input/joystick/xpad.c 2011-11-16 18:39:07.000000000 -0500
@@ -710,7 +710,7 @@ static void xpad_led_set(struct led_clas
static int xpad_led_probe(struct usb_xpad *xpad)
snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
led->xpad = xpad;
-diff -urNp linux-3.1.1/drivers/input/mousedev.c linux-3.1.1/drivers/input/mousedev.c
---- linux-3.1.1/drivers/input/mousedev.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/input/mousedev.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/input/mousedev.c linux-3.1.3/drivers/input/mousedev.c
+--- linux-3.1.3/drivers/input/mousedev.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/input/mousedev.c 2011-11-16 18:39:07.000000000 -0500
@@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file
spin_unlock_irq(&client->packet_lock);
return -EFAULT;
return count;
-diff -urNp linux-3.1.1/drivers/input/serio/serio.c linux-3.1.1/drivers/input/serio/serio.c
---- linux-3.1.1/drivers/input/serio/serio.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/input/serio/serio.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/input/serio/serio.c linux-3.1.3/drivers/input/serio/serio.c
+--- linux-3.1.3/drivers/input/serio/serio.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/input/serio/serio.c 2011-11-16 18:39:07.000000000 -0500
@@ -497,7 +497,7 @@ static void serio_release_port(struct de
*/
static void serio_init_port(struct serio *serio)
serio->dev.bus = &serio_bus;
serio->dev.release = serio_release_port;
serio->dev.groups = serio_device_attr_groups;
-diff -urNp linux-3.1.1/drivers/isdn/capi/capi.c linux-3.1.1/drivers/isdn/capi/capi.c
---- linux-3.1.1/drivers/isdn/capi/capi.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/isdn/capi/capi.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/isdn/capi/capi.c linux-3.1.3/drivers/isdn/capi/capi.c
+--- linux-3.1.3/drivers/isdn/capi/capi.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/isdn/capi/capi.c 2011-11-16 18:39:07.000000000 -0500
@@ -83,8 +83,8 @@ struct capiminor {
struct capi20_appl *ap;
capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
capimsg_setu16(skb->data, 16, len); /* Data length */
-diff -urNp linux-3.1.1/drivers/isdn/gigaset/common.c linux-3.1.1/drivers/isdn/gigaset/common.c
---- linux-3.1.1/drivers/isdn/gigaset/common.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/isdn/gigaset/common.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/isdn/gigaset/common.c linux-3.1.3/drivers/isdn/gigaset/common.c
+--- linux-3.1.3/drivers/isdn/gigaset/common.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/isdn/gigaset/common.c 2011-11-16 18:39:07.000000000 -0500
@@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct
cs->commands_pending = 0;
cs->cur_at_seq = 0;
cs->dev = NULL;
cs->tty = NULL;
cs->tty_dev = NULL;
-diff -urNp linux-3.1.1/drivers/isdn/gigaset/gigaset.h linux-3.1.1/drivers/isdn/gigaset/gigaset.h
---- linux-3.1.1/drivers/isdn/gigaset/gigaset.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/isdn/gigaset/gigaset.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/isdn/gigaset/gigaset.h linux-3.1.3/drivers/isdn/gigaset/gigaset.h
+--- linux-3.1.3/drivers/isdn/gigaset/gigaset.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/isdn/gigaset/gigaset.h 2011-11-16 18:39:07.000000000 -0500
@@ -35,6 +35,7 @@
#include <linux/tty_driver.h>
#include <linux/list.h>
struct tty_struct *tty;
struct tasklet_struct if_wake_tasklet;
unsigned control_state;
-diff -urNp linux-3.1.1/drivers/isdn/gigaset/interface.c linux-3.1.1/drivers/isdn/gigaset/interface.c
---- linux-3.1.1/drivers/isdn/gigaset/interface.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/isdn/gigaset/interface.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/isdn/gigaset/interface.c linux-3.1.3/drivers/isdn/gigaset/interface.c
+--- linux-3.1.3/drivers/isdn/gigaset/interface.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/isdn/gigaset/interface.c 2011-11-16 18:39:07.000000000 -0500
@@ -162,9 +162,7 @@ static int if_open(struct tty_struct *tt
}
tty->driver_data = cs;
dev_warn(cs->dev, "%s: device not opened\n", __func__);
goto out;
}
-diff -urNp linux-3.1.1/drivers/isdn/hardware/avm/b1.c linux-3.1.1/drivers/isdn/hardware/avm/b1.c
---- linux-3.1.1/drivers/isdn/hardware/avm/b1.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/isdn/hardware/avm/b1.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/isdn/hardware/avm/b1.c linux-3.1.3/drivers/isdn/hardware/avm/b1.c
+--- linux-3.1.3/drivers/isdn/hardware/avm/b1.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/isdn/hardware/avm/b1.c 2011-11-16 18:39:07.000000000 -0500
@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo
}
if (left) {
return -EFAULT;
} else {
memcpy(buf, dp, left);
-diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/capidtmf.c linux-3.1.1/drivers/isdn/hardware/eicon/capidtmf.c
---- linux-3.1.1/drivers/isdn/hardware/eicon/capidtmf.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/isdn/hardware/eicon/capidtmf.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/capidtmf.c linux-3.1.3/drivers/isdn/hardware/eicon/capidtmf.c
+--- linux-3.1.3/drivers/isdn/hardware/eicon/capidtmf.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/isdn/hardware/eicon/capidtmf.c 2011-11-16 18:40:10.000000000 -0500
@@ -498,6 +498,7 @@ void capidtmf_recv_block (t_capidtmf_sta
byte goertzel_result_buffer[CAPIDTMF_RECV_TOTAL_FREQUENCY_COUNT];
short windowed_sample_buffer[CAPIDTMF_RECV_WINDOWED_SAMPLES];
if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE)
{
-diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/capifunc.c linux-3.1.1/drivers/isdn/hardware/eicon/capifunc.c
---- linux-3.1.1/drivers/isdn/hardware/eicon/capifunc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/isdn/hardware/eicon/capifunc.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/capifunc.c linux-3.1.3/drivers/isdn/hardware/eicon/capifunc.c
+--- linux-3.1.3/drivers/isdn/hardware/eicon/capifunc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/isdn/hardware/eicon/capifunc.c 2011-11-16 18:40:10.000000000 -0500
@@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void)
IDI_SYNC_REQ req;
DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/diddfunc.c linux-3.1.1/drivers/isdn/hardware/eicon/diddfunc.c
---- linux-3.1.1/drivers/isdn/hardware/eicon/diddfunc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/isdn/hardware/eicon/diddfunc.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/diddfunc.c linux-3.1.3/drivers/isdn/hardware/eicon/diddfunc.c
+--- linux-3.1.3/drivers/isdn/hardware/eicon/diddfunc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/isdn/hardware/eicon/diddfunc.c 2011-11-16 18:40:10.000000000 -0500
@@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_di
IDI_SYNC_REQ req;
DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/divasfunc.c linux-3.1.1/drivers/isdn/hardware/eicon/divasfunc.c
---- linux-3.1.1/drivers/isdn/hardware/eicon/divasfunc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/isdn/hardware/eicon/divasfunc.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/divasfunc.c linux-3.1.3/drivers/isdn/hardware/eicon/divasfunc.c
+--- linux-3.1.3/drivers/isdn/hardware/eicon/divasfunc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/isdn/hardware/eicon/divasfunc.c 2011-11-16 18:40:10.000000000 -0500
@@ -160,6 +160,8 @@ static int DIVA_INIT_FUNCTION connect_di
IDI_SYNC_REQ req;
DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/divasync.h linux-3.1.1/drivers/isdn/hardware/eicon/divasync.h
---- linux-3.1.1/drivers/isdn/hardware/eicon/divasync.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/isdn/hardware/eicon/divasync.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/divasync.h linux-3.1.3/drivers/isdn/hardware/eicon/divasync.h
+--- linux-3.1.3/drivers/isdn/hardware/eicon/divasync.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/isdn/hardware/eicon/divasync.h 2011-11-16 18:39:07.000000000 -0500
@@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
} diva_didd_add_adapter_t;
typedef struct _diva_didd_remove_adapter {
typedef struct _diva_didd_read_adapter_array {
void * buffer;
dword length;
-diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/idifunc.c linux-3.1.1/drivers/isdn/hardware/eicon/idifunc.c
---- linux-3.1.1/drivers/isdn/hardware/eicon/idifunc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/isdn/hardware/eicon/idifunc.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/idifunc.c linux-3.1.3/drivers/isdn/hardware/eicon/idifunc.c
+--- linux-3.1.3/drivers/isdn/hardware/eicon/idifunc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/isdn/hardware/eicon/idifunc.c 2011-11-16 18:40:10.000000000 -0500
@@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_di
IDI_SYNC_REQ req;
DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/message.c linux-3.1.1/drivers/isdn/hardware/eicon/message.c
---- linux-3.1.1/drivers/isdn/hardware/eicon/message.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/isdn/hardware/eicon/message.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/message.c linux-3.1.3/drivers/isdn/hardware/eicon/message.c
+--- linux-3.1.3/drivers/isdn/hardware/eicon/message.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/isdn/hardware/eicon/message.c 2011-11-16 18:40:10.000000000 -0500
@@ -4886,6 +4886,8 @@ static void sig_ind(PLCI *plci)
dword d;
word w;
set_group_ind_mask (plci); /* all APPLs within this inc. call are allowed to dial in */
if(!a->group_optimization_enabled)
-diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/mntfunc.c linux-3.1.1/drivers/isdn/hardware/eicon/mntfunc.c
---- linux-3.1.1/drivers/isdn/hardware/eicon/mntfunc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/isdn/hardware/eicon/mntfunc.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/mntfunc.c linux-3.1.3/drivers/isdn/hardware/eicon/mntfunc.c
+--- linux-3.1.3/drivers/isdn/hardware/eicon/mntfunc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/isdn/hardware/eicon/mntfunc.c 2011-11-16 18:40:10.000000000 -0500
@@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_di
IDI_SYNC_REQ req;
DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.1.1/drivers/isdn/hardware/eicon/xdi_adapter.h
---- linux-3.1.1/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.1.3/drivers/isdn/hardware/eicon/xdi_adapter.h
+--- linux-3.1.3/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-11-16 18:39:07.000000000 -0500
@@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
typedef struct _diva_os_idi_adapter_interface {
diva_init_card_proc_t cleanup_adapter_proc;
typedef struct _diva_os_xdi_adapter {
struct list_head link;
-diff -urNp linux-3.1.1/drivers/isdn/i4l/isdn_common.c linux-3.1.1/drivers/isdn/i4l/isdn_common.c
---- linux-3.1.1/drivers/isdn/i4l/isdn_common.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/isdn/i4l/isdn_common.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/isdn/i4l/isdn_common.c linux-3.1.3/drivers/isdn/i4l/isdn_common.c
+--- linux-3.1.3/drivers/isdn/i4l/isdn_common.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/isdn/i4l/isdn_common.c 2011-11-16 18:40:10.000000000 -0500
@@ -1286,6 +1286,8 @@ isdn_ioctl(struct file *file, uint cmd,
} iocpar;
void __user *argp = (void __user *)arg;
#define name iocpar.name
#define bname iocpar.bname
#define iocts iocpar.iocts
-diff -urNp linux-3.1.1/drivers/isdn/icn/icn.c linux-3.1.1/drivers/isdn/icn/icn.c
---- linux-3.1.1/drivers/isdn/icn/icn.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/isdn/icn/icn.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/isdn/icn/icn.c linux-3.1.3/drivers/isdn/icn/icn.c
+--- linux-3.1.3/drivers/isdn/icn/icn.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/isdn/icn/icn.c 2011-11-16 18:39:07.000000000 -0500
@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len
if (count > len)
count = len;
return -EFAULT;
} else
memcpy(msg, buf, count);
-diff -urNp linux-3.1.1/drivers/lguest/core.c linux-3.1.1/drivers/lguest/core.c
---- linux-3.1.1/drivers/lguest/core.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/lguest/core.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/lguest/core.c linux-3.1.3/drivers/lguest/core.c
+--- linux-3.1.3/drivers/lguest/core.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/lguest/core.c 2011-11-16 18:39:07.000000000 -0500
@@ -92,9 +92,17 @@ static __init int map_switcher(void)
* it's worked so far. The end address needs +1 because __get_vm_area
* allocates an extra guard page, so we need space for that.
end_switcher_text - start_switcher_text);
printk(KERN_INFO "lguest: mapped switcher at %p\n",
-diff -urNp linux-3.1.1/drivers/lguest/x86/core.c linux-3.1.1/drivers/lguest/x86/core.c
---- linux-3.1.1/drivers/lguest/x86/core.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/lguest/x86/core.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/lguest/x86/core.c linux-3.1.3/drivers/lguest/x86/core.c
+--- linux-3.1.3/drivers/lguest/x86/core.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/lguest/x86/core.c 2011-11-16 18:39:07.000000000 -0500
@@ -59,7 +59,7 @@ static struct {
/* Offset from where switcher.S was compiled to where we've copied it */
static unsigned long switcher_offset(void)
lguest_entry.segment = LGUEST_CS;
/*
-diff -urNp linux-3.1.1/drivers/lguest/x86/switcher_32.S linux-3.1.1/drivers/lguest/x86/switcher_32.S
---- linux-3.1.1/drivers/lguest/x86/switcher_32.S 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/lguest/x86/switcher_32.S 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/lguest/x86/switcher_32.S linux-3.1.3/drivers/lguest/x86/switcher_32.S
+--- linux-3.1.3/drivers/lguest/x86/switcher_32.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/lguest/x86/switcher_32.S 2011-11-16 18:39:07.000000000 -0500
@@ -87,6 +87,7 @@
#include <asm/page.h>
#include <asm/segment.h>
// Every interrupt can come to us here
// But we must truly tell each apart.
-diff -urNp linux-3.1.1/drivers/macintosh/macio_asic.c linux-3.1.1/drivers/macintosh/macio_asic.c
---- linux-3.1.1/drivers/macintosh/macio_asic.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/macintosh/macio_asic.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/macintosh/macio_asic.c linux-3.1.3/drivers/macintosh/macio_asic.c
+--- linux-3.1.3/drivers/macintosh/macio_asic.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/macintosh/macio_asic.c 2011-11-16 18:39:07.000000000 -0500
@@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(s
* MacIO is matched against any Apple ID, it's probe() function
* will then decide wether it applies or not
.vendor = PCI_VENDOR_ID_APPLE,
.device = PCI_ANY_ID,
.subvendor = PCI_ANY_ID,
-diff -urNp linux-3.1.1/drivers/md/dm.c linux-3.1.1/drivers/md/dm.c
---- linux-3.1.1/drivers/md/dm.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/md/dm.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/md/dm.c linux-3.1.3/drivers/md/dm.c
+--- linux-3.1.3/drivers/md/dm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/md/dm.c 2011-11-16 18:39:07.000000000 -0500
@@ -165,9 +165,9 @@ struct mapped_device {
/*
* Event handling.
}
void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
-diff -urNp linux-3.1.1/drivers/md/dm-ioctl.c linux-3.1.1/drivers/md/dm-ioctl.c
---- linux-3.1.1/drivers/md/dm-ioctl.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/md/dm-ioctl.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/md/dm-ioctl.c linux-3.1.3/drivers/md/dm-ioctl.c
+--- linux-3.1.3/drivers/md/dm-ioctl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/md/dm-ioctl.c 2011-11-16 18:39:07.000000000 -0500
@@ -1578,7 +1578,7 @@ static int validate_params(uint cmd, str
cmd == DM_LIST_VERSIONS_CMD)
return 0;
if (!*param->name) {
DMWARN("name not supplied when creating device");
return -EINVAL;
-diff -urNp linux-3.1.1/drivers/md/dm-raid1.c linux-3.1.1/drivers/md/dm-raid1.c
---- linux-3.1.1/drivers/md/dm-raid1.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/md/dm-raid1.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/md/dm-raid1.c linux-3.1.3/drivers/md/dm-raid1.c
+--- linux-3.1.3/drivers/md/dm-raid1.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/md/dm-raid1.c 2011-11-16 18:39:07.000000000 -0500
@@ -40,7 +40,7 @@ enum dm_raid1_error {
struct mirror {
return 'A';
return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
-diff -urNp linux-3.1.1/drivers/md/dm-stripe.c linux-3.1.1/drivers/md/dm-stripe.c
---- linux-3.1.1/drivers/md/dm-stripe.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/md/dm-stripe.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/md/dm-stripe.c linux-3.1.3/drivers/md/dm-stripe.c
+--- linux-3.1.3/drivers/md/dm-stripe.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/md/dm-stripe.c 2011-11-16 18:39:07.000000000 -0500
@@ -20,7 +20,7 @@ struct stripe {
struct dm_dev *dev;
sector_t physical_start;
DM_IO_ERROR_THRESHOLD)
schedule_work(&sc->trigger_event);
}
-diff -urNp linux-3.1.1/drivers/md/dm-table.c linux-3.1.1/drivers/md/dm-table.c
---- linux-3.1.1/drivers/md/dm-table.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/md/dm-table.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/md/dm-table.c linux-3.1.3/drivers/md/dm-table.c
+--- linux-3.1.3/drivers/md/dm-table.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/md/dm-table.c 2011-11-16 18:39:07.000000000 -0500
@@ -389,7 +389,7 @@ static int device_area_is_invalid(struct
if (!dev_size)
return 0;
DMWARN("%s: %s too small for target: "
"start=%llu, len=%llu, dev_size=%llu",
dm_device_name(ti->table->md), bdevname(bdev, b),
-diff -urNp linux-3.1.1/drivers/md/md.c linux-3.1.1/drivers/md/md.c
---- linux-3.1.1/drivers/md/md.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/md/md.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/md/md.c linux-3.1.3/drivers/md/md.c
+--- linux-3.1.3/drivers/md/md.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/md/md.c 2011-11-16 18:39:07.000000000 -0500
@@ -280,10 +280,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
* start build, activate spare
*/
/* 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-3.1.1/drivers/md/md.h linux-3.1.1/drivers/md/md.h
---- linux-3.1.1/drivers/md/md.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/md/md.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/md/md.h linux-3.1.3/drivers/md/md.h
+--- linux-3.1.3/drivers/md/md.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/md/md.h 2011-11-16 18:39:07.000000000 -0500
@@ -124,13 +124,13 @@ struct mdk_rdev_s
* only maintained for arrays that
* support hot removal
}
struct mdk_personality
-diff -urNp linux-3.1.1/drivers/md/raid10.c linux-3.1.1/drivers/md/raid10.c
---- linux-3.1.1/drivers/md/raid10.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/md/raid10.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/md/raid10.c linux-3.1.3/drivers/md/raid10.c
+--- linux-3.1.3/drivers/md/raid10.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/md/raid10.c 2011-11-16 18:39:07.000000000 -0500
@@ -1423,7 +1423,7 @@ static void end_sync_read(struct bio *bi
/* The write handler will notice the lack of
* R10BIO_Uptodate and record any errors etc
}
rdev_dec_pending(rdev, mddev);
-diff -urNp linux-3.1.1/drivers/md/raid1.c linux-3.1.1/drivers/md/raid1.c
---- linux-3.1.1/drivers/md/raid1.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/md/raid1.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/md/raid1.c linux-3.1.3/drivers/md/raid1.c
+--- linux-3.1.3/drivers/md/raid1.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/md/raid1.c 2011-11-16 18:39:07.000000000 -0500
@@ -1541,7 +1541,7 @@ static int fix_sync_read_error(r1bio_t *
if (r1_sync_page_io(rdev, sect, s,
bio->bi_io_vec[idx].bv_page,
printk(KERN_INFO
"md/raid1:%s: read error corrected "
"(%d sectors at %llu on %s)\n",
-diff -urNp linux-3.1.1/drivers/md/raid5.c linux-3.1.1/drivers/md/raid5.c
---- linux-3.1.1/drivers/md/raid5.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/md/raid5.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/md/raid5.c linux-3.1.3/drivers/md/raid5.c
+--- linux-3.1.3/drivers/md/raid5.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/md/raid5.c 2011-11-16 18:40:10.000000000 -0500
@@ -1616,19 +1616,19 @@ static void raid5_end_read_request(struc
(unsigned long long)(sh->sector
+ rdev->data_offset),
chunk_offset = sector_div(new_sector, sectors_per_chunk);
stripe = new_sector;
-diff -urNp linux-3.1.1/drivers/media/common/saa7146_hlp.c linux-3.1.1/drivers/media/common/saa7146_hlp.c
---- linux-3.1.1/drivers/media/common/saa7146_hlp.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/common/saa7146_hlp.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/common/saa7146_hlp.c linux-3.1.3/drivers/media/common/saa7146_hlp.c
+--- linux-3.1.3/drivers/media/common/saa7146_hlp.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/common/saa7146_hlp.c 2011-11-16 18:40:10.000000000 -0500
@@ -353,6 +353,8 @@ static void calculate_clipping_registers
int x[32], y[32], w[32], h[32];
/* clear out memory */
memset(&line_list[0], 0x00, sizeof(u32)*32);
memset(&pixel_list[0], 0x00, sizeof(u32)*32);
-diff -urNp linux-3.1.1/drivers/media/dvb/ddbridge/ddbridge-core.c linux-3.1.1/drivers/media/dvb/ddbridge/ddbridge-core.c
---- linux-3.1.1/drivers/media/dvb/ddbridge/ddbridge-core.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/dvb/ddbridge/ddbridge-core.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/dvb/ddbridge/ddbridge-core.c linux-3.1.3/drivers/media/dvb/ddbridge/ddbridge-core.c
+--- linux-3.1.3/drivers/media/dvb/ddbridge/ddbridge-core.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/dvb/ddbridge/ddbridge-core.c 2011-11-16 18:39:07.000000000 -0500
@@ -1675,7 +1675,7 @@ static struct ddb_info ddb_v6 = {
.subvendor = _subvend, .subdevice = _subdev, \
.driver_data = (unsigned long)&_driverdata }
DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus),
DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus),
DDB_ID(DDVID, 0x0003, DDVID, 0x0002, ddb_octopus_le),
-diff -urNp linux-3.1.1/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.1.1/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
---- linux-3.1.1/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.1.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+--- linux-3.1.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-11-16 18:40:10.000000000 -0500
@@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(stru
u8 buf[HOST_LINK_BUF_SIZE];
int i;
dprintk("%s\n", __func__);
/* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */
-diff -urNp linux-3.1.1/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.1.1/drivers/media/dvb/dvb-core/dvb_demux.h
---- linux-3.1.1/drivers/media/dvb/dvb-core/dvb_demux.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/dvb/dvb-core/dvb_demux.h 2011-11-17 18:34:32.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.1.3/drivers/media/dvb/dvb-core/dvb_demux.h
+--- linux-3.1.3/drivers/media/dvb/dvb-core/dvb_demux.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/dvb/dvb-core/dvb_demux.h 2011-11-17 18:34:32.000000000 -0500
@@ -73,7 +73,7 @@ struct dvb_demux_feed {
union {
dmx_ts_cb ts;
struct dvb_demux *demux;
void *priv;
-diff -urNp linux-3.1.1/drivers/media/dvb/dvb-core/dvbdev.c linux-3.1.1/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-3.1.1/drivers/media/dvb/dvb-core/dvbdev.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/dvb/dvb-core/dvbdev.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/dvb/dvb-core/dvbdev.c linux-3.1.3/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-3.1.3/drivers/media/dvb/dvb-core/dvbdev.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/dvb/dvb-core/dvbdev.c 2011-11-16 18:39:07.000000000 -0500
@@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapt
const struct dvb_device *template, void *priv, int type)
{
struct device *clsdev;
int minor;
int id;
-diff -urNp linux-3.1.1/drivers/media/dvb/dvb-usb/cxusb.c linux-3.1.1/drivers/media/dvb/dvb-usb/cxusb.c
---- linux-3.1.1/drivers/media/dvb/dvb-usb/cxusb.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/dvb/dvb-usb/cxusb.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/dvb/dvb-usb/cxusb.c linux-3.1.3/drivers/media/dvb/dvb-usb/cxusb.c
+--- linux-3.1.3/drivers/media/dvb/dvb-usb/cxusb.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/dvb/dvb-usb/cxusb.c 2011-11-16 18:39:07.000000000 -0500
@@ -1059,7 +1059,7 @@ static struct dib0070_config dib7070p_di
struct dib0700_adapter_state {
int (*set_param_save) (struct dvb_frontend *,
static int dib7070_set_param_override(struct dvb_frontend *fe,
struct dvb_frontend_parameters *fep)
-diff -urNp linux-3.1.1/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.1.1/drivers/media/dvb/dvb-usb/dib0700_core.c
---- linux-3.1.1/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.1.3/drivers/media/dvb/dvb-usb/dib0700_core.c
+--- linux-3.1.3/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-11-16 18:40:10.000000000 -0500
@@ -478,6 +478,8 @@ int dib0700_download_firmware(struct usb
if (!buf)
return -ENOMEM;
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-3.1.1/drivers/media/dvb/dvb-usb/dw2102.c linux-3.1.1/drivers/media/dvb/dvb-usb/dw2102.c
---- linux-3.1.1/drivers/media/dvb/dvb-usb/dw2102.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/dvb/dvb-usb/dw2102.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/dvb/dvb-usb/dw2102.c linux-3.1.3/drivers/media/dvb/dvb-usb/dw2102.c
+--- linux-3.1.3/drivers/media/dvb/dvb-usb/dw2102.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/dvb/dvb-usb/dw2102.c 2011-11-16 18:39:07.000000000 -0500
@@ -95,7 +95,7 @@ struct su3000_state {
struct s6x0_state {
/* debug */
static int dvb_usb_dw2102_debug;
-diff -urNp linux-3.1.1/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.1.1/drivers/media/dvb/dvb-usb/lmedm04.c
---- linux-3.1.1/drivers/media/dvb/dvb-usb/lmedm04.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/dvb/dvb-usb/lmedm04.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.1.3/drivers/media/dvb/dvb-usb/lmedm04.c
+--- linux-3.1.3/drivers/media/dvb/dvb-usb/lmedm04.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/dvb/dvb-usb/lmedm04.c 2011-11-16 18:40:10.000000000 -0500
@@ -742,6 +742,7 @@ static int lme2510_download_firmware(str
usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
0x06, 0x80, 0x0200, 0x00, data, 0x0109, 1000);
data[0] = 0x0a;
len_in = 1;
info("FRM Firmware Cold Reset");
-diff -urNp linux-3.1.1/drivers/media/dvb/frontends/dib3000.h linux-3.1.1/drivers/media/dvb/frontends/dib3000.h
---- linux-3.1.1/drivers/media/dvb/frontends/dib3000.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/dvb/frontends/dib3000.h 2011-11-17 18:38:05.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/dvb/frontends/dib3000.h linux-3.1.3/drivers/media/dvb/frontends/dib3000.h
+--- linux-3.1.3/drivers/media/dvb/frontends/dib3000.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/dvb/frontends/dib3000.h 2011-11-17 18:38:05.000000000 -0500
@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
#if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
-diff -urNp linux-3.1.1/drivers/media/dvb/frontends/mb86a16.c linux-3.1.1/drivers/media/dvb/frontends/mb86a16.c
---- linux-3.1.1/drivers/media/dvb/frontends/mb86a16.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/dvb/frontends/mb86a16.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/dvb/frontends/mb86a16.c linux-3.1.3/drivers/media/dvb/frontends/mb86a16.c
+--- linux-3.1.3/drivers/media/dvb/frontends/mb86a16.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/dvb/frontends/mb86a16.c 2011-11-16 18:40:10.000000000 -0500
@@ -1060,6 +1060,8 @@ static int mb86a16_set_fe(struct mb86a16
int ret = -1;
int sync;
dprintk(verbose, MB86A16_INFO, 1, "freq=%d Mhz, symbrt=%d Ksps", state->frequency, state->srate);
fcp = 3000;
-diff -urNp linux-3.1.1/drivers/media/dvb/frontends/or51211.c linux-3.1.1/drivers/media/dvb/frontends/or51211.c
---- linux-3.1.1/drivers/media/dvb/frontends/or51211.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/dvb/frontends/or51211.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/dvb/frontends/or51211.c linux-3.1.3/drivers/media/dvb/frontends/or51211.c
+--- linux-3.1.3/drivers/media/dvb/frontends/or51211.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/dvb/frontends/or51211.c 2011-11-16 18:40:10.000000000 -0500
@@ -113,6 +113,8 @@ static int or51211_load_firmware (struct
u8 tudata[585];
int i;
dprintk("Firmware is %zd bytes\n",fw->size);
/* Get eprom data */
-diff -urNp linux-3.1.1/drivers/media/dvb/ngene/ngene-cards.c linux-3.1.1/drivers/media/dvb/ngene/ngene-cards.c
---- linux-3.1.1/drivers/media/dvb/ngene/ngene-cards.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/dvb/ngene/ngene-cards.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/dvb/ngene/ngene-cards.c linux-3.1.3/drivers/media/dvb/ngene/ngene-cards.c
+--- linux-3.1.3/drivers/media/dvb/ngene/ngene-cards.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/dvb/ngene/ngene-cards.c 2011-11-16 18:39:07.000000000 -0500
@@ -477,7 +477,7 @@ static struct ngene_info ngene_info_m780
/****************************************************************************/
NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2),
NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2),
NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
-diff -urNp linux-3.1.1/drivers/media/radio/radio-cadet.c linux-3.1.1/drivers/media/radio/radio-cadet.c
---- linux-3.1.1/drivers/media/radio/radio-cadet.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/radio/radio-cadet.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/radio/radio-cadet.c linux-3.1.3/drivers/media/radio/radio-cadet.c
+--- linux-3.1.3/drivers/media/radio/radio-cadet.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/radio/radio-cadet.c 2011-11-16 18:39:07.000000000 -0500
@@ -326,6 +326,8 @@ static ssize_t cadet_read(struct file *f
unsigned char readbuf[RDS_BUFFER];
int i = 0;
mutex_lock(&dev->lock);
if (dev->rdsstat == 0) {
dev->rdsstat = 1;
-diff -urNp linux-3.1.1/drivers/media/video/au0828/au0828.h linux-3.1.1/drivers/media/video/au0828/au0828.h
---- linux-3.1.1/drivers/media/video/au0828/au0828.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/video/au0828/au0828.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/video/au0828/au0828.h linux-3.1.3/drivers/media/video/au0828/au0828.h
+--- linux-3.1.3/drivers/media/video/au0828/au0828.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/video/au0828/au0828.h 2011-11-16 18:39:07.000000000 -0500
@@ -191,7 +191,7 @@ struct au0828_dev {
/* I2C */
struct i2c_client i2c_client;
u32 i2c_rc;
-diff -urNp linux-3.1.1/drivers/media/video/cx18/cx18-driver.c linux-3.1.1/drivers/media/video/cx18/cx18-driver.c
---- linux-3.1.1/drivers/media/video/cx18/cx18-driver.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/video/cx18/cx18-driver.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/video/cx18/cx18-driver.c linux-3.1.3/drivers/media/video/cx18/cx18-driver.c
+--- linux-3.1.3/drivers/media/video/cx18/cx18-driver.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/video/cx18/cx18-driver.c 2011-11-16 18:40:10.000000000 -0500
@@ -327,6 +327,8 @@ void cx18_read_eeprom(struct cx18 *cx, s
struct i2c_client c;
u8 eedata[256];
memset(&c, 0, sizeof(c));
strlcpy(c.name, "cx18 tveeprom tmp", sizeof(c.name));
c.adapter = &cx->i2c_adap[0];
-diff -urNp linux-3.1.1/drivers/media/video/cx23885/cx23885-input.c linux-3.1.1/drivers/media/video/cx23885/cx23885-input.c
---- linux-3.1.1/drivers/media/video/cx23885/cx23885-input.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/video/cx23885/cx23885-input.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/video/cx23885/cx23885-input.c linux-3.1.3/drivers/media/video/cx23885/cx23885-input.c
+--- linux-3.1.3/drivers/media/video/cx23885/cx23885-input.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/video/cx23885/cx23885-input.c 2011-11-16 18:40:10.000000000 -0500
@@ -53,6 +53,8 @@ static void cx23885_input_process_measur
bool handle = false;
struct ir_raw_event ir_core_event[64];
do {
num = 0;
v4l2_subdev_call(dev->sd_ir, ir, rx_read, (u8 *) ir_core_event,
-diff -urNp linux-3.1.1/drivers/media/video/cx88/cx88-alsa.c linux-3.1.1/drivers/media/video/cx88/cx88-alsa.c
---- linux-3.1.1/drivers/media/video/cx88/cx88-alsa.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/video/cx88/cx88-alsa.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/video/cx88/cx88-alsa.c linux-3.1.3/drivers/media/video/cx88/cx88-alsa.c
+--- linux-3.1.3/drivers/media/video/cx88/cx88-alsa.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/video/cx88/cx88-alsa.c 2011-11-16 18:39:07.000000000 -0500
@@ -766,7 +766,7 @@ static struct snd_kcontrol_new snd_cx88_
* Only boards with eeprom and byte 1 at eeprom=1 have it
*/
{0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
{0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
{0, }
-diff -urNp linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
---- linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.1.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
+--- linux-3.1.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-11-16 18:40:10.000000000 -0500
@@ -120,6 +120,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw
u8 *eeprom;
struct tveeprom tvdata;
memset(&tvdata,0,sizeof(tvdata));
eeprom = pvr2_eeprom_fetch(hdw);
-diff -urNp linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
---- linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h linux-3.1.3/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+--- linux-3.1.3/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h 2011-11-16 18:39:07.000000000 -0500
@@ -196,7 +196,7 @@ struct pvr2_hdw {
/* I2C stuff */
pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT];
int i2c_cx25840_hack_state;
int i2c_linked;
-diff -urNp linux-3.1.1/drivers/media/video/saa7134/saa6752hs.c linux-3.1.1/drivers/media/video/saa7134/saa6752hs.c
---- linux-3.1.1/drivers/media/video/saa7134/saa6752hs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/video/saa7134/saa6752hs.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/video/saa7134/saa6752hs.c linux-3.1.3/drivers/media/video/saa7134/saa6752hs.c
+--- linux-3.1.3/drivers/media/video/saa7134/saa6752hs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/video/saa7134/saa6752hs.c 2011-11-16 18:40:10.000000000 -0500
@@ -682,6 +682,8 @@ static int saa6752hs_init(struct v4l2_su
unsigned char localPAT[256];
unsigned char localPMT[256];
/* Set video format - must be done first as it resets other settings */
set_reg8(client, 0x41, h->video_format);
-diff -urNp linux-3.1.1/drivers/media/video/saa7164/saa7164-cmd.c linux-3.1.1/drivers/media/video/saa7164/saa7164-cmd.c
---- linux-3.1.1/drivers/media/video/saa7164/saa7164-cmd.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/video/saa7164/saa7164-cmd.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/video/saa7164/saa7164-cmd.c linux-3.1.3/drivers/media/video/saa7164/saa7164-cmd.c
+--- linux-3.1.3/drivers/media/video/saa7164/saa7164-cmd.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/video/saa7164/saa7164-cmd.c 2011-11-16 18:40:10.000000000 -0500
@@ -88,6 +88,8 @@ int saa7164_irq_dequeue(struct saa7164_d
u8 tmp[512];
dprintk(DBGLVL_CMD, "%s()\n", __func__);
while (loop) {
struct tmComResInfo tRsp = { 0, 0, 0, 0, 0, 0 };
-diff -urNp linux-3.1.1/drivers/media/video/timblogiw.c linux-3.1.1/drivers/media/video/timblogiw.c
---- linux-3.1.1/drivers/media/video/timblogiw.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/video/timblogiw.c 2011-11-17 18:36:32.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/video/timblogiw.c linux-3.1.3/drivers/media/video/timblogiw.c
+--- linux-3.1.3/drivers/media/video/timblogiw.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/video/timblogiw.c 2011-11-17 18:36:32.000000000 -0500
@@ -744,7 +744,7 @@ static int timblogiw_mmap(struct file *f
/* Platform device functions */
.owner = THIS_MODULE,
.open = timblogiw_open,
.release = timblogiw_close,
-diff -urNp linux-3.1.1/drivers/media/video/usbvision/usbvision-core.c linux-3.1.1/drivers/media/video/usbvision/usbvision-core.c
---- linux-3.1.1/drivers/media/video/usbvision/usbvision-core.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/video/usbvision/usbvision-core.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/video/usbvision/usbvision-core.c linux-3.1.3/drivers/media/video/usbvision/usbvision-core.c
+--- linux-3.1.3/drivers/media/video/usbvision/usbvision-core.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/video/usbvision/usbvision-core.c 2011-11-16 18:40:10.000000000 -0500
@@ -707,6 +707,8 @@ static enum parse_state usbvision_parse_
unsigned char rv, gv, bv;
static unsigned char *Y, *U, *V;
frame = usbvision->cur_frame;
image_size = frame->frmwidth * frame->frmheight;
if ((frame->v4l2_format.format == V4L2_PIX_FMT_YUV422P) ||
-diff -urNp linux-3.1.1/drivers/media/video/videobuf-dma-sg.c linux-3.1.1/drivers/media/video/videobuf-dma-sg.c
---- linux-3.1.1/drivers/media/video/videobuf-dma-sg.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/media/video/videobuf-dma-sg.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/media/video/videobuf-dma-sg.c linux-3.1.3/drivers/media/video/videobuf-dma-sg.c
+--- linux-3.1.3/drivers/media/video/videobuf-dma-sg.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/media/video/videobuf-dma-sg.c 2011-11-16 18:40:10.000000000 -0500
@@ -607,6 +607,8 @@ void *videobuf_sg_alloc(size_t size)
{
struct videobuf_queue q;
/* Required to make generic handler to call __videobuf_alloc */
q.int_ops = &sg_ops;
-diff -urNp linux-3.1.1/drivers/message/fusion/mptbase.c linux-3.1.1/drivers/message/fusion/mptbase.c
---- linux-3.1.1/drivers/message/fusion/mptbase.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/message/fusion/mptbase.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/message/fusion/mptbase.c linux-3.1.3/drivers/message/fusion/mptbase.c
+--- linux-3.1.3/drivers/message/fusion/mptbase.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/message/fusion/mptbase.c 2011-11-16 18:40:10.000000000 -0500
@@ -6681,8 +6681,13 @@ static int mpt_iocinfo_proc_show(struct
seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
/*
* Rounding UP to nearest 4-kB boundary here...
*/
-diff -urNp linux-3.1.1/drivers/message/fusion/mptsas.c linux-3.1.1/drivers/message/fusion/mptsas.c
---- linux-3.1.1/drivers/message/fusion/mptsas.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/message/fusion/mptsas.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/message/fusion/mptsas.c linux-3.1.3/drivers/message/fusion/mptsas.c
+--- linux-3.1.3/drivers/message/fusion/mptsas.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/message/fusion/mptsas.c 2011-11-16 18:39:07.000000000 -0500
@@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin
return 0;
}
static inline struct sas_port *
mptsas_get_port(struct mptsas_phyinfo *phy_info)
{
-diff -urNp linux-3.1.1/drivers/message/fusion/mptscsih.c linux-3.1.1/drivers/message/fusion/mptscsih.c
---- linux-3.1.1/drivers/message/fusion/mptscsih.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/message/fusion/mptscsih.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/message/fusion/mptscsih.c linux-3.1.3/drivers/message/fusion/mptscsih.c
+--- linux-3.1.3/drivers/message/fusion/mptscsih.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/message/fusion/mptscsih.c 2011-11-16 18:39:07.000000000 -0500
@@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost)
h = shost_priv(SChost);
return h->info_kbuf;
}
-diff -urNp linux-3.1.1/drivers/message/i2o/i2o_config.c linux-3.1.1/drivers/message/i2o/i2o_config.c
---- linux-3.1.1/drivers/message/i2o/i2o_config.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/message/i2o/i2o_config.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/message/i2o/i2o_config.c linux-3.1.3/drivers/message/i2o/i2o_config.c
+--- linux-3.1.3/drivers/message/i2o/i2o_config.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/message/i2o/i2o_config.c 2011-11-16 18:40:10.000000000 -0500
@@ -781,6 +781,8 @@ static int i2o_cfg_passthru(unsigned lon
struct i2o_message *msg;
unsigned int iop;
if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg))
return -EFAULT;
-diff -urNp linux-3.1.1/drivers/message/i2o/i2o_proc.c linux-3.1.1/drivers/message/i2o/i2o_proc.c
---- linux-3.1.1/drivers/message/i2o/i2o_proc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/message/i2o/i2o_proc.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/message/i2o/i2o_proc.c linux-3.1.3/drivers/message/i2o/i2o_proc.c
+--- linux-3.1.3/drivers/message/i2o/i2o_proc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/message/i2o/i2o_proc.c 2011-11-16 18:39:07.000000000 -0500
@@ -255,13 +255,6 @@ static char *scsi_devices[] = {
"Array Controller Device"
};
return 0;
}
-diff -urNp linux-3.1.1/drivers/message/i2o/iop.c linux-3.1.1/drivers/message/i2o/iop.c
---- linux-3.1.1/drivers/message/i2o/iop.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/message/i2o/iop.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/message/i2o/iop.c linux-3.1.3/drivers/message/i2o/iop.c
+--- linux-3.1.3/drivers/message/i2o/iop.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/message/i2o/iop.c 2011-11-16 18:39:07.000000000 -0500
@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro
spin_lock_irqsave(&c->context_list_lock, flags);
INIT_LIST_HEAD(&c->context_list);
#endif
-diff -urNp linux-3.1.1/drivers/mfd/ab3100-core.c linux-3.1.1/drivers/mfd/ab3100-core.c
---- linux-3.1.1/drivers/mfd/ab3100-core.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/mfd/ab3100-core.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/mfd/ab3100-core.c linux-3.1.3/drivers/mfd/ab3100-core.c
+--- linux-3.1.3/drivers/mfd/ab3100-core.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/mfd/ab3100-core.c 2011-11-16 18:39:07.000000000 -0500
@@ -809,7 +809,7 @@ struct ab_family_id {
char *name;
};
/* AB3100 */
{
.id = 0xc0,
-diff -urNp linux-3.1.1/drivers/mfd/abx500-core.c linux-3.1.1/drivers/mfd/abx500-core.c
---- linux-3.1.1/drivers/mfd/abx500-core.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/mfd/abx500-core.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/mfd/abx500-core.c linux-3.1.3/drivers/mfd/abx500-core.c
+--- linux-3.1.3/drivers/mfd/abx500-core.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/mfd/abx500-core.c 2011-11-16 18:39:07.000000000 -0500
@@ -14,7 +14,7 @@ static LIST_HEAD(abx500_list);
struct abx500_device_entry {
struct device *dev;
};
-diff -urNp linux-3.1.1/drivers/mfd/janz-cmodio.c linux-3.1.1/drivers/mfd/janz-cmodio.c
---- linux-3.1.1/drivers/mfd/janz-cmodio.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/mfd/janz-cmodio.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/mfd/janz-cmodio.c linux-3.1.3/drivers/mfd/janz-cmodio.c
+--- linux-3.1.3/drivers/mfd/janz-cmodio.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/mfd/janz-cmodio.c 2011-11-16 18:39:07.000000000 -0500
@@ -13,6 +13,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/interrupt.h>
-diff -urNp linux-3.1.1/drivers/mfd/wm8350-i2c.c linux-3.1.1/drivers/mfd/wm8350-i2c.c
---- linux-3.1.1/drivers/mfd/wm8350-i2c.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/mfd/wm8350-i2c.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/mfd/wm8350-i2c.c linux-3.1.3/drivers/mfd/wm8350-i2c.c
+--- linux-3.1.3/drivers/mfd/wm8350-i2c.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/mfd/wm8350-i2c.c 2011-11-16 18:40:10.000000000 -0500
@@ -44,6 +44,8 @@ static int wm8350_i2c_write_device(struc
u8 msg[(WM8350_MAX_REGISTER << 1) + 1];
int ret;
if (bytes > ((WM8350_MAX_REGISTER << 1) + 1))
return -EINVAL;
-diff -urNp linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.c
---- linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.1.3/drivers/misc/lis3lv02d/lis3lv02d.c
+--- linux-3.1.3/drivers/misc/lis3lv02d/lis3lv02d.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/misc/lis3lv02d/lis3lv02d.c 2011-11-16 18:39:07.000000000 -0500
@@ -437,7 +437,7 @@ static irqreturn_t lis302dl_interrupt(in
* the lid is closed. This leads to interrupts as soon as a little move
* is done.
return POLLIN | POLLRDNORM;
return 0;
}
-diff -urNp linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.h
---- linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.1.3/drivers/misc/lis3lv02d/lis3lv02d.h
+--- linux-3.1.3/drivers/misc/lis3lv02d/lis3lv02d.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/misc/lis3lv02d/lis3lv02d.h 2011-11-16 18:39:07.000000000 -0500
@@ -265,7 +265,7 @@ struct lis3lv02d {
struct input_polled_dev *idev; /* input device */
struct platform_device *pdev; /* platform device */
union axis_conversion ac; /* hw -> logical axis */
int mapped_btns[3];
-diff -urNp linux-3.1.1/drivers/misc/sgi-gru/gruhandles.c linux-3.1.1/drivers/misc/sgi-gru/gruhandles.c
---- linux-3.1.1/drivers/misc/sgi-gru/gruhandles.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/misc/sgi-gru/gruhandles.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/misc/sgi-gru/gruhandles.c linux-3.1.3/drivers/misc/sgi-gru/gruhandles.c
+--- linux-3.1.3/drivers/misc/sgi-gru/gruhandles.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/misc/sgi-gru/gruhandles.c 2011-11-16 18:39:07.000000000 -0500
@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op
unsigned long nsec;
if (mcs_op_statistics[op].max < nsec)
mcs_op_statistics[op].max = nsec;
}
-diff -urNp linux-3.1.1/drivers/misc/sgi-gru/gruprocfs.c linux-3.1.1/drivers/misc/sgi-gru/gruprocfs.c
---- linux-3.1.1/drivers/misc/sgi-gru/gruprocfs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/misc/sgi-gru/gruprocfs.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/misc/sgi-gru/gruprocfs.c linux-3.1.3/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-3.1.3/drivers/misc/sgi-gru/gruprocfs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/misc/sgi-gru/gruprocfs.c 2011-11-16 18:39:07.000000000 -0500
@@ -32,9 +32,9 @@
#define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
max = mcs_op_statistics[op].max;
seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
count ? total / count : 0, max);
-diff -urNp linux-3.1.1/drivers/misc/sgi-gru/grutables.h linux-3.1.1/drivers/misc/sgi-gru/grutables.h
---- linux-3.1.1/drivers/misc/sgi-gru/grutables.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/misc/sgi-gru/grutables.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/misc/sgi-gru/grutables.h linux-3.1.3/drivers/misc/sgi-gru/grutables.h
+--- linux-3.1.3/drivers/misc/sgi-gru/grutables.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/misc/sgi-gru/grutables.h 2011-11-16 18:39:07.000000000 -0500
@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
* GRU statistics.
*/
} while (0)
#ifdef CONFIG_SGI_GRU_DEBUG
-diff -urNp linux-3.1.1/drivers/misc/sgi-xp/xpc.h linux-3.1.1/drivers/misc/sgi-xp/xpc.h
---- linux-3.1.1/drivers/misc/sgi-xp/xpc.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/misc/sgi-xp/xpc.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/misc/sgi-xp/xpc.h linux-3.1.3/drivers/misc/sgi-xp/xpc.h
+--- linux-3.1.3/drivers/misc/sgi-xp/xpc.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/misc/sgi-xp/xpc.h 2011-11-16 18:39:07.000000000 -0500
@@ -835,6 +835,7 @@ struct xpc_arch_operations {
void (*received_payload) (struct xpc_channel *, void *);
void (*notify_senders_of_disconnect) (struct xpc_channel *);
extern int xpc_disengage_timelimit;
extern int xpc_disengage_timedout;
extern int xpc_activate_IRQ_rcvd;
-diff -urNp linux-3.1.1/drivers/misc/sgi-xp/xpc_main.c linux-3.1.1/drivers/misc/sgi-xp/xpc_main.c
---- linux-3.1.1/drivers/misc/sgi-xp/xpc_main.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/misc/sgi-xp/xpc_main.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/misc/sgi-xp/xpc_main.c linux-3.1.3/drivers/misc/sgi-xp/xpc_main.c
+--- linux-3.1.3/drivers/misc/sgi-xp/xpc_main.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/misc/sgi-xp/xpc_main.c 2011-11-16 18:39:07.000000000 -0500
@@ -162,7 +162,7 @@ static struct notifier_block xpc_die_not
.notifier_call = xpc_system_die,
};
/*
* Timer function to enforce the timelimit on the partition disengage.
-diff -urNp linux-3.1.1/drivers/misc/sgi-xp/xp.h linux-3.1.1/drivers/misc/sgi-xp/xp.h
---- linux-3.1.1/drivers/misc/sgi-xp/xp.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/misc/sgi-xp/xp.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/misc/sgi-xp/xp.h linux-3.1.3/drivers/misc/sgi-xp/xp.h
+--- linux-3.1.3/drivers/misc/sgi-xp/xp.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/misc/sgi-xp/xp.h 2011-11-16 18:39:07.000000000 -0500
@@ -289,7 +289,7 @@ struct xpc_interface {
xpc_notify_func, void *);
void (*received) (short, int, void *);
extern struct xpc_interface xpc_interface;
-diff -urNp linux-3.1.1/drivers/mmc/host/sdhci-pci.c linux-3.1.1/drivers/mmc/host/sdhci-pci.c
---- linux-3.1.1/drivers/mmc/host/sdhci-pci.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/mmc/host/sdhci-pci.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/mmc/host/sdhci-pci.c linux-3.1.3/drivers/mmc/host/sdhci-pci.c
+--- linux-3.1.3/drivers/mmc/host/sdhci-pci.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/mmc/host/sdhci-pci.c 2011-11-16 18:39:07.000000000 -0500
@@ -542,7 +542,7 @@ static const struct sdhci_pci_fixes sdhc
.probe = via_probe,
};
{
.vendor = PCI_VENDOR_ID_RICOH,
.device = PCI_DEVICE_ID_RICOH_R5C822,
-diff -urNp linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0001.c
---- linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0001.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0001.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.1.3/drivers/mtd/chips/cfi_cmdset_0001.c
+--- linux-3.1.3/drivers/mtd/chips/cfi_cmdset_0001.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/mtd/chips/cfi_cmdset_0001.c 2011-11-16 18:40:10.000000000 -0500
@@ -757,6 +757,8 @@ static int chip_ready (struct map_info *
struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
unsigned long timeo = jiffies + HZ;
adr += chip->start;
retry:
-diff -urNp linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0020.c
---- linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0020.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0020.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.1.3/drivers/mtd/chips/cfi_cmdset_0020.c
+--- linux-3.1.3/drivers/mtd/chips/cfi_cmdset_0020.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/mtd/chips/cfi_cmdset_0020.c 2011-11-16 18:40:10.000000000 -0500
@@ -255,6 +255,8 @@ static inline int do_read_onechip(struct
unsigned long cmd_addr;
struct cfi_private *cfi = map->fldrv_priv;
adr += chip->start;
/* Let's determine this according to the interleave only once */
-diff -urNp linux-3.1.1/drivers/mtd/devices/doc2000.c linux-3.1.1/drivers/mtd/devices/doc2000.c
---- linux-3.1.1/drivers/mtd/devices/doc2000.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/mtd/devices/doc2000.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/mtd/devices/doc2000.c linux-3.1.3/drivers/mtd/devices/doc2000.c
+--- linux-3.1.3/drivers/mtd/devices/doc2000.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/mtd/devices/doc2000.c 2011-11-16 18:39:07.000000000 -0500
@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
/* The ECC will not be calculated correctly if less than 512 is written */
printk(KERN_WARNING
"ECC needs a full sector write (adr: %lx size %lx)\n",
(long) to, (long) len);
-diff -urNp linux-3.1.1/drivers/mtd/devices/doc2001.c linux-3.1.1/drivers/mtd/devices/doc2001.c
---- linux-3.1.1/drivers/mtd/devices/doc2001.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/mtd/devices/doc2001.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/mtd/devices/doc2001.c linux-3.1.3/drivers/mtd/devices/doc2001.c
+--- linux-3.1.3/drivers/mtd/devices/doc2001.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/mtd/devices/doc2001.c 2011-11-16 18:39:07.000000000 -0500
@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
struct Nand *mychip = &this->chips[from >> (this->chipshift)];
return -EINVAL;
/* Don't allow a single read to cross a 512-byte block boundary */
-diff -urNp linux-3.1.1/drivers/mtd/ftl.c linux-3.1.1/drivers/mtd/ftl.c
---- linux-3.1.1/drivers/mtd/ftl.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/mtd/ftl.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/mtd/ftl.c linux-3.1.3/drivers/mtd/ftl.c
+--- linux-3.1.3/drivers/mtd/ftl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/mtd/ftl.c 2011-11-16 18:40:10.000000000 -0500
@@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t *
loff_t offset;
uint16_t srcunitswap = cpu_to_le16(srcunit);
eun = &part->EUNInfo[srcunit];
xfer = &part->XferInfo[xferunit];
DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n",
-diff -urNp linux-3.1.1/drivers/mtd/inftlcore.c linux-3.1.1/drivers/mtd/inftlcore.c
---- linux-3.1.1/drivers/mtd/inftlcore.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/mtd/inftlcore.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/mtd/inftlcore.c linux-3.1.3/drivers/mtd/inftlcore.c
+--- linux-3.1.3/drivers/mtd/inftlcore.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/mtd/inftlcore.c 2011-11-16 18:40:10.000000000 -0500
@@ -259,6 +259,8 @@ static u16 INFTL_foldchain(struct INFTLr
struct inftl_oob oob;
size_t retlen;
DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d,"
"pending=%d)\n", inftl, thisVUC, pendingblock);
-diff -urNp linux-3.1.1/drivers/mtd/inftlmount.c linux-3.1.1/drivers/mtd/inftlmount.c
---- linux-3.1.1/drivers/mtd/inftlmount.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/mtd/inftlmount.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/mtd/inftlmount.c linux-3.1.3/drivers/mtd/inftlmount.c
+--- linux-3.1.3/drivers/mtd/inftlmount.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/mtd/inftlmount.c 2011-11-16 18:40:10.000000000 -0500
@@ -53,6 +53,8 @@ static int find_boot_record(struct INFTL
struct INFTLPartition *ip;
size_t retlen;
DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=%p)\n", inftl);
/*
-diff -urNp linux-3.1.1/drivers/mtd/lpddr/qinfo_probe.c linux-3.1.1/drivers/mtd/lpddr/qinfo_probe.c
---- linux-3.1.1/drivers/mtd/lpddr/qinfo_probe.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/mtd/lpddr/qinfo_probe.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/mtd/lpddr/qinfo_probe.c linux-3.1.3/drivers/mtd/lpddr/qinfo_probe.c
+--- linux-3.1.3/drivers/mtd/lpddr/qinfo_probe.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/mtd/lpddr/qinfo_probe.c 2011-11-16 18:40:10.000000000 -0500
@@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map
{
map_word pfow_val[4];
/* 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-3.1.1/drivers/mtd/mtdchar.c linux-3.1.1/drivers/mtd/mtdchar.c
---- linux-3.1.1/drivers/mtd/mtdchar.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/mtd/mtdchar.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/mtd/mtdchar.c linux-3.1.3/drivers/mtd/mtdchar.c
+--- linux-3.1.3/drivers/mtd/mtdchar.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/mtd/mtdchar.c 2011-11-16 18:40:10.000000000 -0500
@@ -554,6 +554,8 @@ static int mtd_ioctl(struct file *file,
u_long size;
struct mtd_info_user info;
DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n");
size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;
-diff -urNp linux-3.1.1/drivers/mtd/nand/denali.c linux-3.1.1/drivers/mtd/nand/denali.c
---- linux-3.1.1/drivers/mtd/nand/denali.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/mtd/nand/denali.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/mtd/nand/denali.c linux-3.1.3/drivers/mtd/nand/denali.c
+--- linux-3.1.3/drivers/mtd/nand/denali.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/mtd/nand/denali.c 2011-11-16 18:39:07.000000000 -0500
@@ -26,6 +26,7 @@
#include <linux/pci.h>
#include <linux/mtd/mtd.h>
#include "denali.h"
-diff -urNp linux-3.1.1/drivers/mtd/nftlcore.c linux-3.1.1/drivers/mtd/nftlcore.c
---- linux-3.1.1/drivers/mtd/nftlcore.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/mtd/nftlcore.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/mtd/nftlcore.c linux-3.1.3/drivers/mtd/nftlcore.c
+--- linux-3.1.3/drivers/mtd/nftlcore.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/mtd/nftlcore.c 2011-11-16 18:40:10.000000000 -0500
@@ -264,6 +264,8 @@ static u16 NFTL_foldchain (struct NFTLre
int inplace = 1;
size_t retlen;
memset(BlockMap, 0xff, sizeof(BlockMap));
memset(BlockFreeFound, 0, sizeof(BlockFreeFound));
-diff -urNp linux-3.1.1/drivers/mtd/nftlmount.c linux-3.1.1/drivers/mtd/nftlmount.c
---- linux-3.1.1/drivers/mtd/nftlmount.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/mtd/nftlmount.c 2011-11-16 18:40:10.000000000 -0500
+diff -urNp linux-3.1.3/drivers/mtd/nftlmount.c linux-3.1.3/drivers/mtd/nftlmount.c
+--- linux-3.1.3/drivers/mtd/nftlmount.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/mtd/nftlmount.c 2011-11-16 18:40:10.000000000 -0500
@@ -24,6 +24,7 @@
#include <asm/errno.h>
#include <linux/delay.h>
/* 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-3.1.1/drivers/mtd/ubi/build.c linux-3.1.1/drivers/mtd/ubi/build.c
---- linux-3.1.1/drivers/mtd/ubi/build.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/mtd/ubi/build.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/mtd/ubi/build.c linux-3.1.3/drivers/mtd/ubi/build.c
+--- linux-3.1.3/drivers/mtd/ubi/build.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/mtd/ubi/build.c 2011-11-16 18:39:07.000000000 -0500
@@ -1311,7 +1311,7 @@ module_exit(ubi_exit);
static int __init bytes_str_to_int(const char *str)
{
}
/**
-diff -urNp linux-3.1.1/drivers/net/atlx/atl2.c linux-3.1.1/drivers/net/atlx/atl2.c
---- linux-3.1.1/drivers/net/atlx/atl2.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/atlx/atl2.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/atlx/atl2.c linux-3.1.3/drivers/net/atlx/atl2.c
+--- linux-3.1.3/drivers/net/atlx/atl2.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/atlx/atl2.c 2011-11-16 18:39:07.000000000 -0500
@@ -2857,7 +2857,7 @@ static void atl2_force_ps(struct atl2_hw
*/
MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \
MODULE_PARM_DESC(X, desc);
#else
-diff -urNp linux-3.1.1/drivers/net/bna/bfa_ioc_ct.c linux-3.1.1/drivers/net/bna/bfa_ioc_ct.c
---- linux-3.1.1/drivers/net/bna/bfa_ioc_ct.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/bna/bfa_ioc_ct.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/bna/bfa_ioc_ct.c linux-3.1.3/drivers/net/bna/bfa_ioc_ct.c
+--- linux-3.1.3/drivers/net/bna/bfa_ioc_ct.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/bna/bfa_ioc_ct.c 2011-11-16 18:39:07.000000000 -0500
@@ -48,7 +48,21 @@ static void bfa_ioc_ct_sync_ack(struct b
static bool bfa_ioc_ct_sync_complete(struct bfa_ioc *ioc);
static enum bfa_status bfa_ioc_ct_pll_init(void __iomem *rb, bool fcmode);
ioc->ioc_hwif = &nw_hwif_ct;
}
-diff -urNp linux-3.1.1/drivers/net/bna/bnad.c linux-3.1.1/drivers/net/bna/bnad.c
---- linux-3.1.1/drivers/net/bna/bnad.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/bna/bnad.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/bna/bnad.c linux-3.1.3/drivers/net/bna/bnad.c
+--- linux-3.1.3/drivers/net/bna/bnad.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/bna/bnad.c 2011-11-16 18:39:07.000000000 -0500
@@ -1673,7 +1673,14 @@ bnad_setup_tx(struct bnad *bnad, uint tx
struct bna_intr_info *intr_info =
&res_info[BNA_TX_RES_INTR_T_TXCMPL].res_u.intr_info;
/* Get BNA's resource requirement for one Rx object */
spin_lock_irqsave(&bnad->bna_lock, flags);
bna_rx_res_req(rx_config, res_info);
-diff -urNp linux-3.1.1/drivers/net/bnx2.c linux-3.1.1/drivers/net/bnx2.c
---- linux-3.1.1/drivers/net/bnx2.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/bnx2.c 2011-11-16 18:40:11.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/bnx2.c linux-3.1.3/drivers/net/bnx2.c
+--- linux-3.1.3/drivers/net/bnx2.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/bnx2.c 2011-11-16 18:40:11.000000000 -0500
@@ -5877,6 +5877,8 @@ bnx2_test_nvram(struct bnx2 *bp)
int rc = 0;
u32 magic, csum;
if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0)
goto test_nvram_done;
-diff -urNp linux-3.1.1/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.1.1/drivers/net/bnx2x/bnx2x_ethtool.c
---- linux-3.1.1/drivers/net/bnx2x/bnx2x_ethtool.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/bnx2x/bnx2x_ethtool.c 2011-11-16 18:40:11.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.1.3/drivers/net/bnx2x/bnx2x_ethtool.c
+--- linux-3.1.3/drivers/net/bnx2x/bnx2x_ethtool.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/bnx2x/bnx2x_ethtool.c 2011-11-16 18:40:11.000000000 -0500
@@ -1943,6 +1943,8 @@ static int bnx2x_test_nvram(struct bnx2x
int i, rc;
u32 magic, crc;
if (BP_NOMCP(bp))
return 0;
-diff -urNp linux-3.1.1/drivers/net/bnx2x/bnx2x_sp.h linux-3.1.1/drivers/net/bnx2x/bnx2x_sp.h
---- linux-3.1.1/drivers/net/bnx2x/bnx2x_sp.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/bnx2x/bnx2x_sp.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/bnx2x/bnx2x_sp.h linux-3.1.3/drivers/net/bnx2x/bnx2x_sp.h
+--- linux-3.1.3/drivers/net/bnx2x/bnx2x_sp.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/bnx2x/bnx2x_sp.h 2011-11-16 18:39:07.000000000 -0500
@@ -449,7 +449,7 @@ struct bnx2x_rx_mode_obj {
int (*wait_comp)(struct bnx2x *bp,
/********************** Set multicast group ***********************************/
-diff -urNp linux-3.1.1/drivers/net/cxgb3/l2t.h linux-3.1.1/drivers/net/cxgb3/l2t.h
---- linux-3.1.1/drivers/net/cxgb3/l2t.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/cxgb3/l2t.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/cxgb3/l2t.h linux-3.1.3/drivers/net/cxgb3/l2t.h
+--- linux-3.1.3/drivers/net/cxgb3/l2t.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/cxgb3/l2t.h 2011-11-16 18:39:07.000000000 -0500
@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)
*/
struct l2t_skb_cb {
#define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
-diff -urNp linux-3.1.1/drivers/net/cxgb4/cxgb4_main.c linux-3.1.1/drivers/net/cxgb4/cxgb4_main.c
---- linux-3.1.1/drivers/net/cxgb4/cxgb4_main.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/cxgb4/cxgb4_main.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/cxgb4/cxgb4_main.c linux-3.1.3/drivers/net/cxgb4/cxgb4_main.c
+--- linux-3.1.3/drivers/net/cxgb4/cxgb4_main.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/cxgb4/cxgb4_main.c 2011-11-16 18:40:22.000000000 -0500
@@ -3396,6 +3396,8 @@ static int __devinit enable_msix(struct
unsigned int nchan = adap->params.nports;
struct msix_entry entries[MAX_INGQ + 1];
for (i = 0; i < ARRAY_SIZE(entries); ++i)
entries[i].entry = i;
-diff -urNp linux-3.1.1/drivers/net/cxgb4/t4_hw.c linux-3.1.1/drivers/net/cxgb4/t4_hw.c
---- linux-3.1.1/drivers/net/cxgb4/t4_hw.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/cxgb4/t4_hw.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/cxgb4/t4_hw.c linux-3.1.3/drivers/net/cxgb4/t4_hw.c
+--- linux-3.1.3/drivers/net/cxgb4/t4_hw.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/cxgb4/t4_hw.c 2011-11-16 18:40:22.000000000 -0500
@@ -362,6 +362,8 @@ static int get_vpd_params(struct adapter
u8 vpd[VPD_LEN], csum;
unsigned int vpdr_len, kw_offset, id_len;
ret = pci_read_vpd(adapter->pdev, VPD_BASE, sizeof(vpd), vpd);
if (ret < 0)
return ret;
-diff -urNp linux-3.1.1/drivers/net/e1000e/82571.c linux-3.1.1/drivers/net/e1000e/82571.c
---- linux-3.1.1/drivers/net/e1000e/82571.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/e1000e/82571.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/e1000e/82571.c linux-3.1.3/drivers/net/e1000e/82571.c
+--- linux-3.1.3/drivers/net/e1000e/82571.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/e1000e/82571.c 2011-11-16 18:39:07.000000000 -0500
@@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(s
{
struct e1000_hw *hw = &adapter->hw;
u32 swsm = 0;
u32 swsm2 = 0;
bool force_clear_smbi = false;
-diff -urNp linux-3.1.1/drivers/net/e1000e/es2lan.c linux-3.1.1/drivers/net/e1000e/es2lan.c
---- linux-3.1.1/drivers/net/e1000e/es2lan.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/e1000e/es2lan.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/e1000e/es2lan.c linux-3.1.3/drivers/net/e1000e/es2lan.c
+--- linux-3.1.3/drivers/net/e1000e/es2lan.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/e1000e/es2lan.c 2011-11-16 18:39:07.000000000 -0500
@@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es
{
struct e1000_hw *hw = &adapter->hw;
/* Set media type */
switch (adapter->pdev->device) {
-diff -urNp linux-3.1.1/drivers/net/e1000e/hw.h linux-3.1.1/drivers/net/e1000e/hw.h
---- linux-3.1.1/drivers/net/e1000e/hw.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/e1000e/hw.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/e1000e/hw.h linux-3.1.3/drivers/net/e1000e/hw.h
+--- linux-3.1.3/drivers/net/e1000e/hw.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/e1000e/hw.h 2011-11-16 18:39:07.000000000 -0500
@@ -778,6 +778,7 @@ struct e1000_mac_operations {
void (*write_vfta)(struct e1000_hw *, u32, u32);
s32 (*read_mac_addr)(struct e1000_hw *);
enum e1000_nvm_type type;
enum e1000_nvm_override override;
-diff -urNp linux-3.1.1/drivers/net/fealnx.c linux-3.1.1/drivers/net/fealnx.c
---- linux-3.1.1/drivers/net/fealnx.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/fealnx.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/fealnx.c linux-3.1.3/drivers/net/fealnx.c
+--- linux-3.1.3/drivers/net/fealnx.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/fealnx.c 2011-11-16 18:39:07.000000000 -0500
@@ -150,7 +150,7 @@ struct chip_info {
int flags;
};
{ "100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
{ "100/10M Ethernet PCI Adapter", HAS_CHIP_XCVR },
{ "1000/100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
-diff -urNp linux-3.1.1/drivers/net/hamradio/6pack.c linux-3.1.1/drivers/net/hamradio/6pack.c
---- linux-3.1.1/drivers/net/hamradio/6pack.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/hamradio/6pack.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/hamradio/6pack.c linux-3.1.3/drivers/net/hamradio/6pack.c
+--- linux-3.1.3/drivers/net/hamradio/6pack.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/hamradio/6pack.c 2011-11-16 18:40:22.000000000 -0500
@@ -463,6 +463,8 @@ static void sixpack_receive_buf(struct t
unsigned char buf[512];
int count1;
if (!count)
return;
-diff -urNp linux-3.1.1/drivers/net/igb/e1000_hw.h linux-3.1.1/drivers/net/igb/e1000_hw.h
---- linux-3.1.1/drivers/net/igb/e1000_hw.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/igb/e1000_hw.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/igb/e1000_hw.h linux-3.1.3/drivers/net/igb/e1000_hw.h
+--- linux-3.1.3/drivers/net/igb/e1000_hw.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/igb/e1000_hw.h 2011-11-16 18:39:07.000000000 -0500
@@ -314,6 +314,7 @@ struct e1000_mac_operations {
s32 (*read_mac_addr)(struct e1000_hw *);
s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
struct e1000_mbx_stats stats;
u32 timeout;
u32 usec_delay;
-diff -urNp linux-3.1.1/drivers/net/igbvf/vf.h linux-3.1.1/drivers/net/igbvf/vf.h
---- linux-3.1.1/drivers/net/igbvf/vf.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/igbvf/vf.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/igbvf/vf.h linux-3.1.3/drivers/net/igbvf/vf.h
+--- linux-3.1.3/drivers/net/igbvf/vf.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/igbvf/vf.h 2011-11-16 18:39:07.000000000 -0500
@@ -189,9 +189,10 @@ struct e1000_mac_operations {
s32 (*read_mac_addr)(struct e1000_hw *);
s32 (*set_vfta)(struct e1000_hw *, u16, bool);
struct e1000_mbx_stats stats;
u32 timeout;
u32 usec_delay;
-diff -urNp linux-3.1.1/drivers/net/ixgb/ixgb_main.c linux-3.1.1/drivers/net/ixgb/ixgb_main.c
---- linux-3.1.1/drivers/net/ixgb/ixgb_main.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/ixgb/ixgb_main.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/ixgb/ixgb_main.c linux-3.1.3/drivers/net/ixgb/ixgb_main.c
+--- linux-3.1.3/drivers/net/ixgb/ixgb_main.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/ixgb/ixgb_main.c 2011-11-16 18:40:22.000000000 -0500
@@ -1070,6 +1070,8 @@ ixgb_set_multi(struct net_device *netdev
u32 rctl;
int i;
/* Check for Promiscuous and All Multicast modes */
rctl = IXGB_READ_REG(hw, RCTL);
-diff -urNp linux-3.1.1/drivers/net/ixgb/ixgb_param.c linux-3.1.1/drivers/net/ixgb/ixgb_param.c
---- linux-3.1.1/drivers/net/ixgb/ixgb_param.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/ixgb/ixgb_param.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/ixgb/ixgb_param.c linux-3.1.3/drivers/net/ixgb/ixgb_param.c
+--- linux-3.1.3/drivers/net/ixgb/ixgb_param.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/ixgb/ixgb_param.c 2011-11-16 18:40:22.000000000 -0500
@@ -261,6 +261,9 @@ void __devinit
ixgb_check_options(struct ixgb_adapter *adapter)
{
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-3.1.1/drivers/net/ixgbe/ixgbe_type.h linux-3.1.1/drivers/net/ixgbe/ixgbe_type.h
---- linux-3.1.1/drivers/net/ixgbe/ixgbe_type.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/ixgbe/ixgbe_type.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/ixgbe/ixgbe_type.h linux-3.1.3/drivers/net/ixgbe/ixgbe_type.h
+--- linux-3.1.3/drivers/net/ixgbe/ixgbe_type.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/ixgbe/ixgbe_type.h 2011-11-16 18:39:07.000000000 -0500
@@ -2642,6 +2642,7 @@ struct ixgbe_eeprom_operations {
s32 (*update_checksum)(struct ixgbe_hw *);
u16 (*calc_checksum)(struct ixgbe_hw *);
struct ixgbe_mbx_stats stats;
u32 timeout;
u32 usec_delay;
-diff -urNp linux-3.1.1/drivers/net/ixgbevf/vf.h linux-3.1.1/drivers/net/ixgbevf/vf.h
---- linux-3.1.1/drivers/net/ixgbevf/vf.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/ixgbevf/vf.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/ixgbevf/vf.h linux-3.1.3/drivers/net/ixgbevf/vf.h
+--- linux-3.1.3/drivers/net/ixgbevf/vf.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/ixgbevf/vf.h 2011-11-16 18:39:07.000000000 -0500
@@ -70,6 +70,7 @@ struct ixgbe_mac_operations {
s32 (*clear_vfta)(struct ixgbe_hw *);
s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
struct ixgbe_mbx_stats stats;
u32 timeout;
u32 udelay;
-diff -urNp linux-3.1.1/drivers/net/ksz884x.c linux-3.1.1/drivers/net/ksz884x.c
---- linux-3.1.1/drivers/net/ksz884x.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/ksz884x.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/ksz884x.c linux-3.1.3/drivers/net/ksz884x.c
+--- linux-3.1.3/drivers/net/ksz884x.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/ksz884x.c 2011-11-16 18:40:22.000000000 -0500
@@ -6533,6 +6533,8 @@ static void netdev_get_ethtool_stats(str
int rc;
u64 counter[TOTAL_PORT_COUNTER_NUM];
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-3.1.1/drivers/net/mlx4/main.c linux-3.1.1/drivers/net/mlx4/main.c
---- linux-3.1.1/drivers/net/mlx4/main.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/mlx4/main.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/mlx4/main.c linux-3.1.3/drivers/net/mlx4/main.c
+--- linux-3.1.3/drivers/net/mlx4/main.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/mlx4/main.c 2011-11-16 18:40:22.000000000 -0500
@@ -40,6 +40,7 @@
#include <linux/dma-mapping.h>
#include <linux/slab.h>
err = mlx4_QUERY_FW(dev);
if (err) {
if (err == -EACCES)
-diff -urNp linux-3.1.1/drivers/net/niu.c linux-3.1.1/drivers/net/niu.c
---- linux-3.1.1/drivers/net/niu.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/niu.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/niu.c linux-3.1.3/drivers/net/niu.c
+--- linux-3.1.3/drivers/net/niu.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/niu.c 2011-11-16 18:40:22.000000000 -0500
@@ -9061,6 +9061,8 @@ static void __devinit niu_try_msix(struc
int i, num_irqs, err;
u8 first_ldg;
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-3.1.1/drivers/net/pcnet32.c linux-3.1.1/drivers/net/pcnet32.c
---- linux-3.1.1/drivers/net/pcnet32.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/pcnet32.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/pcnet32.c linux-3.1.3/drivers/net/pcnet32.c
+--- linux-3.1.3/drivers/net/pcnet32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/pcnet32.c 2011-11-16 18:39:07.000000000 -0500
@@ -270,7 +270,7 @@ struct pcnet32_private {
struct sk_buff **rx_skbuff;
dma_addr_t *tx_dma_addr;
}
} else {
netif_info(lp, link, dev, "link up\n");
-diff -urNp linux-3.1.1/drivers/net/ppp_generic.c linux-3.1.1/drivers/net/ppp_generic.c
---- linux-3.1.1/drivers/net/ppp_generic.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/ppp_generic.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/ppp_generic.c linux-3.1.3/drivers/net/ppp_generic.c
+--- linux-3.1.3/drivers/net/ppp_generic.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/ppp_generic.c 2011-11-16 18:39:07.000000000 -0500
@@ -987,7 +987,6 @@ ppp_net_ioctl(struct net_device *dev, st
void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
struct ppp_stats stats;
break;
err = 0;
break;
-diff -urNp linux-3.1.1/drivers/net/r8169.c linux-3.1.1/drivers/net/r8169.c
---- linux-3.1.1/drivers/net/r8169.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/r8169.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/r8169.c linux-3.1.3/drivers/net/r8169.c
+--- linux-3.1.3/drivers/net/r8169.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/r8169.c 2011-11-16 18:39:07.000000000 -0500
@@ -663,12 +663,12 @@ struct rtl8169_private {
struct mdio_ops {
void (*write)(void __iomem *, int, int);
int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
int (*get_settings)(struct net_device *, struct ethtool_cmd *);
-diff -urNp linux-3.1.1/drivers/net/sis190.c linux-3.1.1/drivers/net/sis190.c
---- linux-3.1.1/drivers/net/sis190.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/sis190.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/sis190.c linux-3.1.3/drivers/net/sis190.c
+--- linux-3.1.3/drivers/net/sis190.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/sis190.c 2011-11-16 18:39:07.000000000 -0500
@@ -1624,7 +1624,7 @@ static int __devinit sis190_get_mac_addr
static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
struct net_device *dev)
struct sis190_private *tp = netdev_priv(dev);
struct pci_dev *isa_bridge;
u8 reg, tmp8;
-diff -urNp linux-3.1.1/drivers/net/sundance.c linux-3.1.1/drivers/net/sundance.c
---- linux-3.1.1/drivers/net/sundance.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/sundance.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/sundance.c linux-3.1.3/drivers/net/sundance.c
+--- linux-3.1.3/drivers/net/sundance.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/sundance.c 2011-11-16 18:39:07.000000000 -0500
@@ -218,7 +218,7 @@ enum {
struct pci_id_info {
const char *name;
{"D-Link DFE-550TX FAST Ethernet Adapter"},
{"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
{"D-Link DFE-580TX 4 port Server Adapter"},
-diff -urNp linux-3.1.1/drivers/net/tg3.h linux-3.1.1/drivers/net/tg3.h
---- linux-3.1.1/drivers/net/tg3.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/tg3.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/tg3.h linux-3.1.3/drivers/net/tg3.h
+--- linux-3.1.3/drivers/net/tg3.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/tg3.h 2011-11-16 18:39:07.000000000 -0500
@@ -134,6 +134,7 @@
#define CHIPREV_ID_5750_A0 0x4000
#define CHIPREV_ID_5750_A1 0x4001
#define CHIPREV_ID_5750_C2 0x4202
#define CHIPREV_ID_5752_A0_HW 0x5000
#define CHIPREV_ID_5752_A0 0x6000
-diff -urNp linux-3.1.1/drivers/net/tokenring/abyss.c linux-3.1.1/drivers/net/tokenring/abyss.c
---- linux-3.1.1/drivers/net/tokenring/abyss.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/tokenring/abyss.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/tokenring/abyss.c linux-3.1.3/drivers/net/tokenring/abyss.c
+--- linux-3.1.3/drivers/net/tokenring/abyss.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/tokenring/abyss.c 2011-11-16 18:39:07.000000000 -0500
@@ -451,10 +451,12 @@ static struct pci_driver abyss_driver =
static int __init abyss_init (void)
return pci_register_driver(&abyss_driver);
}
-diff -urNp linux-3.1.1/drivers/net/tokenring/madgemc.c linux-3.1.1/drivers/net/tokenring/madgemc.c
---- linux-3.1.1/drivers/net/tokenring/madgemc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/tokenring/madgemc.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/tokenring/madgemc.c linux-3.1.3/drivers/net/tokenring/madgemc.c
+--- linux-3.1.3/drivers/net/tokenring/madgemc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/tokenring/madgemc.c 2011-11-16 18:39:07.000000000 -0500
@@ -744,9 +744,11 @@ static struct mca_driver madgemc_driver
static int __init madgemc_init (void)
return mca_register_driver (&madgemc_driver);
}
-diff -urNp linux-3.1.1/drivers/net/tokenring/proteon.c linux-3.1.1/drivers/net/tokenring/proteon.c
---- linux-3.1.1/drivers/net/tokenring/proteon.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/tokenring/proteon.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/tokenring/proteon.c linux-3.1.3/drivers/net/tokenring/proteon.c
+--- linux-3.1.3/drivers/net/tokenring/proteon.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/tokenring/proteon.c 2011-11-16 18:39:07.000000000 -0500
@@ -353,9 +353,11 @@ static int __init proteon_init(void)
struct platform_device *pdev;
int i, num = 0, err = 0;
err = platform_driver_register(&proteon_driver);
if (err)
-diff -urNp linux-3.1.1/drivers/net/tokenring/skisa.c linux-3.1.1/drivers/net/tokenring/skisa.c
---- linux-3.1.1/drivers/net/tokenring/skisa.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/tokenring/skisa.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/tokenring/skisa.c linux-3.1.3/drivers/net/tokenring/skisa.c
+--- linux-3.1.3/drivers/net/tokenring/skisa.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/tokenring/skisa.c 2011-11-16 18:39:07.000000000 -0500
@@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
struct platform_device *pdev;
int i, num = 0, err = 0;
err = platform_driver_register(&sk_isa_driver);
if (err)
-diff -urNp linux-3.1.1/drivers/net/tulip/de2104x.c linux-3.1.1/drivers/net/tulip/de2104x.c
---- linux-3.1.1/drivers/net/tulip/de2104x.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/tulip/de2104x.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/tulip/de2104x.c linux-3.1.3/drivers/net/tulip/de2104x.c
+--- linux-3.1.3/drivers/net/tulip/de2104x.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/tulip/de2104x.c 2011-11-16 18:40:22.000000000 -0500
@@ -1795,6 +1795,8 @@ static void __devinit de21041_get_srom_i
struct de_srom_info_leaf *il;
void *bufp;
/* download entire eeprom */
for (i = 0; i < DE_EEPROM_WORDS; i++)
((__le16 *)ee_data)[i] =
-diff -urNp linux-3.1.1/drivers/net/tulip/de4x5.c linux-3.1.1/drivers/net/tulip/de4x5.c
---- linux-3.1.1/drivers/net/tulip/de4x5.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/tulip/de4x5.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/tulip/de4x5.c linux-3.1.3/drivers/net/tulip/de4x5.c
+--- linux-3.1.3/drivers/net/tulip/de4x5.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/tulip/de4x5.c 2011-11-16 18:39:07.000000000 -0500
@@ -5397,7 +5397,7 @@ de4x5_ioctl(struct net_device *dev, stru
for (i=0; i<ETH_ALEN; i++) {
tmp.addr[i] = dev->dev_addr[i];
return -EFAULT;
break;
}
-diff -urNp linux-3.1.1/drivers/net/tulip/eeprom.c linux-3.1.1/drivers/net/tulip/eeprom.c
---- linux-3.1.1/drivers/net/tulip/eeprom.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/tulip/eeprom.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/tulip/eeprom.c linux-3.1.3/drivers/net/tulip/eeprom.c
+--- linux-3.1.3/drivers/net/tulip/eeprom.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/tulip/eeprom.c 2011-11-16 18:39:07.000000000 -0500
@@ -81,7 +81,7 @@ static struct eeprom_fixup eeprom_fixups
{NULL}};
"21140 non-MII",
"21140 MII PHY",
"21142 Serial PHY",
-diff -urNp linux-3.1.1/drivers/net/tulip/winbond-840.c linux-3.1.1/drivers/net/tulip/winbond-840.c
---- linux-3.1.1/drivers/net/tulip/winbond-840.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/tulip/winbond-840.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/tulip/winbond-840.c linux-3.1.3/drivers/net/tulip/winbond-840.c
+--- linux-3.1.3/drivers/net/tulip/winbond-840.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/tulip/winbond-840.c 2011-11-16 18:39:07.000000000 -0500
@@ -236,7 +236,7 @@ struct pci_id_info {
int drv_flags; /* Driver use, intended as capability flags. */
};
{ /* Sometime a Level-One switch card. */
"Winbond W89c840", CanHaveMII | HasBrokenTx | FDXOnNoMII},
{ "Winbond W89c840", CanHaveMII | HasBrokenTx},
-diff -urNp linux-3.1.1/drivers/net/usb/hso.c linux-3.1.1/drivers/net/usb/hso.c
---- linux-3.1.1/drivers/net/usb/hso.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/usb/hso.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/usb/hso.c linux-3.1.3/drivers/net/usb/hso.c
+--- linux-3.1.3/drivers/net/usb/hso.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/usb/hso.c 2011-11-16 18:39:07.000000000 -0500
@@ -71,7 +71,7 @@
#include <asm/byteorder.h>
#include <linux/serial_core.h>
result =
hso_start_serial_device(serial_table[i], GFP_NOIO);
hso_kick_transmit(dev2ser(serial_table[i]));
-diff -urNp linux-3.1.1/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.1.1/drivers/net/vmxnet3/vmxnet3_ethtool.c
---- linux-3.1.1/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.1.3/drivers/net/vmxnet3/vmxnet3_ethtool.c
+--- linux-3.1.3/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-11-16 18:39:07.000000000 -0500
@@ -601,8 +601,7 @@ vmxnet3_set_rss_indir(struct net_device
* Return with error code if any of the queue indices
* is out of range
return -EINVAL;
}
-diff -urNp linux-3.1.1/drivers/net/vxge/vxge-config.h linux-3.1.1/drivers/net/vxge/vxge-config.h
---- linux-3.1.1/drivers/net/vxge/vxge-config.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/vxge/vxge-config.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/vxge/vxge-config.h linux-3.1.3/drivers/net/vxge/vxge-config.h
+--- linux-3.1.3/drivers/net/vxge/vxge-config.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/vxge/vxge-config.h 2011-11-16 18:39:07.000000000 -0500
@@ -514,7 +514,7 @@ struct vxge_hw_uld_cbs {
void (*link_down)(struct __vxge_hw_device *devh);
void (*crit_err)(struct __vxge_hw_device *devh,
/*
* struct __vxge_hw_blockpool_entry - Block private data structure
-diff -urNp linux-3.1.1/drivers/net/vxge/vxge-main.c linux-3.1.1/drivers/net/vxge/vxge-main.c
---- linux-3.1.1/drivers/net/vxge/vxge-main.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/vxge/vxge-main.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/vxge/vxge-main.c linux-3.1.3/drivers/net/vxge/vxge-main.c
+--- linux-3.1.3/drivers/net/vxge/vxge-main.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/vxge/vxge-main.c 2011-11-16 18:40:22.000000000 -0500
@@ -100,6 +100,8 @@ static inline void VXGE_COMPLETE_VPATH_T
struct sk_buff *completed[NR_SKB_COMPLETED];
int more;
/*
* Filling
* - itable with bucket numbers
-diff -urNp linux-3.1.1/drivers/net/vxge/vxge-traffic.h linux-3.1.1/drivers/net/vxge/vxge-traffic.h
---- linux-3.1.1/drivers/net/vxge/vxge-traffic.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/vxge/vxge-traffic.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/vxge/vxge-traffic.h linux-3.1.3/drivers/net/vxge/vxge-traffic.h
+--- linux-3.1.3/drivers/net/vxge/vxge-traffic.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/vxge/vxge-traffic.h 2011-11-16 18:39:07.000000000 -0500
@@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs {
struct vxge_hw_mempool_dma *dma_object,
u32 index,
#define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath) \
((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
-diff -urNp linux-3.1.1/drivers/net/wan/hdlc_x25.c linux-3.1.1/drivers/net/wan/hdlc_x25.c
---- linux-3.1.1/drivers/net/wan/hdlc_x25.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wan/hdlc_x25.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wan/hdlc_x25.c linux-3.1.3/drivers/net/wan/hdlc_x25.c
+--- linux-3.1.3/drivers/net/wan/hdlc_x25.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wan/hdlc_x25.c 2011-11-16 18:39:07.000000000 -0500
@@ -134,16 +134,16 @@ static netdev_tx_t x25_xmit(struct sk_bu
static int x25_open(struct net_device *dev)
result = lapb_register(dev, &cb);
if (result != LAPB_OK)
return result;
-diff -urNp linux-3.1.1/drivers/net/wimax/i2400m/usb-fw.c linux-3.1.1/drivers/net/wimax/i2400m/usb-fw.c
---- linux-3.1.1/drivers/net/wimax/i2400m/usb-fw.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wimax/i2400m/usb-fw.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wimax/i2400m/usb-fw.c linux-3.1.3/drivers/net/wimax/i2400m/usb-fw.c
+--- linux-3.1.3/drivers/net/wimax/i2400m/usb-fw.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wimax/i2400m/usb-fw.c 2011-11-16 18:40:22.000000000 -0500
@@ -287,6 +287,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(stru
int do_autopm = 1;
DECLARE_COMPLETION_ONSTACK(notif_completion);
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-3.1.1/drivers/net/wireless/airo.c linux-3.1.1/drivers/net/wireless/airo.c
---- linux-3.1.1/drivers/net/wireless/airo.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/airo.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/airo.c linux-3.1.3/drivers/net/wireless/airo.c
+--- linux-3.1.3/drivers/net/wireless/airo.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/airo.c 2011-11-16 18:40:22.000000000 -0500
@@ -3003,6 +3003,8 @@ static void airo_process_scan_results (s
BSSListElement * loop_net;
BSSListElement * tmp_net;
/* Get stats out of the card */
clear_bit(JOB_WSTATS, &local->jobs);
if (local->power.event) {
-diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath5k/debug.c linux-3.1.1/drivers/net/wireless/ath/ath5k/debug.c
---- linux-3.1.1/drivers/net/wireless/ath/ath5k/debug.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/ath/ath5k/debug.c 2011-11-16 19:08:21.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath5k/debug.c linux-3.1.3/drivers/net/wireless/ath/ath5k/debug.c
+--- linux-3.1.3/drivers/net/wireless/ath/ath5k/debug.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/ath/ath5k/debug.c 2011-11-16 19:08:21.000000000 -0500
@@ -203,6 +203,8 @@ static ssize_t read_file_beacon(struct f
unsigned int v;
u64 tsf;
len += snprintf(buf + len, sizeof(buf) - len,
"available txbuffers: %d\n", ah->txbuf_len);
-diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_calib.c
---- linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.1.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+--- linux-3.1.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-11-16 18:40:22.000000000 -0500
@@ -758,6 +758,8 @@ static void ar9003_hw_tx_iq_cal_post_pro
int i, im, j;
int nmeasurement;
for (i = 0; i < AR9300_MAX_CHAINS; i++) {
if (ah->txchainmask & (1 << i))
num_chains++;
-diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
---- linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.1.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+--- linux-3.1.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-11-16 18:40:22.000000000 -0500
@@ -406,6 +406,8 @@ static bool create_pa_curve(u32 *data_L,
int theta_low_bin = 0;
int i;
/* disregard any bin that contains <= 16 samples */
thresh_accum_cnt = 16;
scale_factor = 5;
-diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath9k/debug.c linux-3.1.1/drivers/net/wireless/ath/ath9k/debug.c
---- linux-3.1.1/drivers/net/wireless/ath/ath9k/debug.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/ath/ath9k/debug.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath9k/debug.c linux-3.1.3/drivers/net/wireless/ath/ath9k/debug.c
+--- linux-3.1.3/drivers/net/wireless/ath/ath9k/debug.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/ath/ath9k/debug.c 2011-11-16 18:40:22.000000000 -0500
@@ -387,6 +387,8 @@ static ssize_t read_file_interrupt(struc
char buf[512];
unsigned int len = 0;
len += snprintf(buf + len, sizeof(buf) - len,
"%s (chan=%d center-freq: %d MHz channel-type: %d (%s))\n",
wiphy_name(sc->hw->wiphy),
-diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.1.1/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
---- linux-3.1.1/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.1.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
+--- linux-3.1.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-11-16 18:40:22.000000000 -0500
@@ -31,6 +31,8 @@ static ssize_t read_file_tgt_int_stats(s
unsigned int len = 0;
int ret = 0;
len += snprintf(buf + len, sizeof(buf) - len, "%20s : %10u\n",
"Mgmt endpoint", skb_queue_len(&priv->tx.mgmt_ep_queue));
-diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath9k/hw.h linux-3.1.1/drivers/net/wireless/ath/ath9k/hw.h
---- linux-3.1.1/drivers/net/wireless/ath/ath9k/hw.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/ath/ath9k/hw.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath9k/hw.h linux-3.1.3/drivers/net/wireless/ath/ath9k/hw.h
+--- linux-3.1.3/drivers/net/wireless/ath/ath9k/hw.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/ath/ath9k/hw.h 2011-11-16 18:39:07.000000000 -0500
@@ -588,7 +588,7 @@ struct ath_hw_private_ops {
/* ANI */
struct ieee80211_hw *hw;
struct ath_common common;
-diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath.h linux-3.1.1/drivers/net/wireless/ath/ath.h
---- linux-3.1.1/drivers/net/wireless/ath/ath.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/ath/ath.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath.h linux-3.1.3/drivers/net/wireless/ath/ath.h
+--- linux-3.1.3/drivers/net/wireless/ath/ath.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/ath/ath.h 2011-11-16 18:39:07.000000000 -0500
@@ -121,6 +121,7 @@ struct ath_ops {
void (*write_flush) (void *);
u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr);
struct ath_common;
struct ath_bus_ops;
-diff -urNp linux-3.1.1/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.1.1/drivers/net/wireless/ipw2x00/ipw2100.c
---- linux-3.1.1/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.1.3/drivers/net/wireless/ipw2x00/ipw2100.c
+--- linux-3.1.3/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-16 18:40:22.000000000 -0500
@@ -2102,6 +2102,8 @@ static int ipw2100_set_essid(struct ipw2
int err;
DECLARE_SSID_BUF(ssid);
IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n",
idx, keylen, len);
-diff -urNp linux-3.1.1/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.1.1/drivers/net/wireless/ipw2x00/libipw_rx.c
---- linux-3.1.1/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.1.3/drivers/net/wireless/ipw2x00/libipw_rx.c
+--- linux-3.1.3/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-11-16 18:40:22.000000000 -0500
@@ -1565,6 +1565,8 @@ static void libipw_process_probe_respons
unsigned long flags;
DECLARE_SSID_BUF(ssid);
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-3.1.1/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.1.1/drivers/net/wireless/iwlegacy/iwl3945-base.c
---- linux-3.1.1/drivers/net/wireless/iwlegacy/iwl3945-base.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/iwlegacy/iwl3945-base.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.1.3/drivers/net/wireless/iwlegacy/iwl3945-base.c
+--- linux-3.1.3/drivers/net/wireless/iwlegacy/iwl3945-base.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/iwlegacy/iwl3945-base.c 2011-11-16 18:39:07.000000000 -0500
@@ -3687,7 +3687,9 @@ static int iwl3945_pci_probe(struct pci_
*/
if (iwl3945_mod_params.disable_hw_scan) {
}
IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
-diff -urNp linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
---- linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+--- linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-11-16 18:40:22.000000000 -0500
@@ -920,6 +920,8 @@ static void rs_tx_status(void *priv_r, s
struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
struct iwl_rxon_context *ctx = sta_priv->common.ctx;
/* Override starting rate (index 0) if needed for debug purposes */
rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
-diff -urNp linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debugfs.c
---- linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+--- linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-11-16 18:40:22.000000000 -0500
@@ -561,6 +561,8 @@ static ssize_t iwl_dbgfs_status_read(str
int pos = 0;
const size_t bufsz = sizeof(buf);
for_each_context(priv, ctx) {
pos += scnprintf(buf + pos, bufsz - pos, "context %d:\n",
ctx->ctxid);
-diff -urNp linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-11-16 18:39:07.000000000 -0500
@@ -68,8 +68,8 @@ do {
} while (0)
static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
const void *p, u32 len)
{}
-diff -urNp linux-3.1.1/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.1.1/drivers/net/wireless/iwmc3200wifi/debugfs.c
---- linux-3.1.1/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.1.3/drivers/net/wireless/iwmc3200wifi/debugfs.c
+--- linux-3.1.3/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-11-16 18:40:22.000000000 -0500
@@ -327,6 +327,8 @@ static ssize_t iwm_debugfs_fw_err_read(s
int buf_len = 512;
size_t len = 0;
if (*ppos != 0)
return 0;
if (count < sizeof(buf))
-diff -urNp linux-3.1.1/drivers/net/wireless/mac80211_hwsim.c linux-3.1.1/drivers/net/wireless/mac80211_hwsim.c
---- linux-3.1.1/drivers/net/wireless/mac80211_hwsim.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/mac80211_hwsim.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/mac80211_hwsim.c linux-3.1.3/drivers/net/wireless/mac80211_hwsim.c
+--- linux-3.1.3/drivers/net/wireless/mac80211_hwsim.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/mac80211_hwsim.c 2011-11-16 18:39:07.000000000 -0500
@@ -1670,9 +1670,11 @@ static int __init init_mac80211_hwsim(vo
return -EINVAL;
}
spin_lock_init(&hwsim_radio_lock);
-diff -urNp linux-3.1.1/drivers/net/wireless/mwifiex/main.h linux-3.1.1/drivers/net/wireless/mwifiex/main.h
---- linux-3.1.1/drivers/net/wireless/mwifiex/main.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/mwifiex/main.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/mwifiex/main.h linux-3.1.3/drivers/net/wireless/mwifiex/main.h
+--- linux-3.1.3/drivers/net/wireless/mwifiex/main.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/mwifiex/main.h 2011-11-16 18:39:07.000000000 -0500
@@ -560,7 +560,7 @@ struct mwifiex_if_ops {
void (*update_mp_end_port) (struct mwifiex_adapter *, u16);
struct mwifiex_adapter {
struct mwifiex_private *priv[MWIFIEX_MAX_BSS_NUM];
-diff -urNp linux-3.1.1/drivers/net/wireless/rndis_wlan.c linux-3.1.1/drivers/net/wireless/rndis_wlan.c
---- linux-3.1.1/drivers/net/wireless/rndis_wlan.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/rndis_wlan.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/rndis_wlan.c linux-3.1.3/drivers/net/wireless/rndis_wlan.c
+--- linux-3.1.3/drivers/net/wireless/rndis_wlan.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/rndis_wlan.c 2011-11-16 18:39:07.000000000 -0500
@@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbn
netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
rts_threshold = 2347;
tmp = cpu_to_le32(rts_threshold);
-diff -urNp linux-3.1.1/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-3.1.1/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
---- linux-3.1.1/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-3.1.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
+--- linux-3.1.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-11-16 18:40:22.000000000 -0500
@@ -837,6 +837,8 @@ bool _rtl92c_phy_sw_chnl_step_by_step(st
u8 rfpath;
u8 num_total_rfpath = rtlphy->num_total_rfpath;
precommoncmdcnt = 0;
_rtl92c_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++,
MAX_PRECMD_CNT,
-diff -urNp linux-3.1.1/drivers/net/wireless/wl1251/wl1251.h linux-3.1.1/drivers/net/wireless/wl1251/wl1251.h
---- linux-3.1.1/drivers/net/wireless/wl1251/wl1251.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/wl1251/wl1251.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/wl1251/wl1251.h linux-3.1.3/drivers/net/wireless/wl1251/wl1251.h
+--- linux-3.1.3/drivers/net/wireless/wl1251/wl1251.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/wl1251/wl1251.h 2011-11-16 18:39:07.000000000 -0500
@@ -266,7 +266,7 @@ struct wl1251_if_operations {
void (*reset)(struct wl1251 *wl);
void (*enable_irq)(struct wl1251 *wl);
struct wl1251 {
struct ieee80211_hw *hw;
-diff -urNp linux-3.1.1/drivers/net/wireless/wl12xx/spi.c linux-3.1.1/drivers/net/wireless/wl12xx/spi.c
---- linux-3.1.1/drivers/net/wireless/wl12xx/spi.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/net/wireless/wl12xx/spi.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/net/wireless/wl12xx/spi.c linux-3.1.3/drivers/net/wireless/wl12xx/spi.c
+--- linux-3.1.3/drivers/net/wireless/wl12xx/spi.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/net/wireless/wl12xx/spi.c 2011-11-16 18:40:22.000000000 -0500
@@ -281,6 +281,8 @@ static void wl1271_spi_raw_write(struct
u32 chunk_len;
int i;
WARN_ON(len > WL1271_AGGR_BUFFER_SIZE);
spi_message_init(&m);
-diff -urNp linux-3.1.1/drivers/oprofile/buffer_sync.c linux-3.1.1/drivers/oprofile/buffer_sync.c
---- linux-3.1.1/drivers/oprofile/buffer_sync.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/oprofile/buffer_sync.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/oprofile/buffer_sync.c linux-3.1.3/drivers/oprofile/buffer_sync.c
+--- linux-3.1.3/drivers/oprofile/buffer_sync.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/oprofile/buffer_sync.c 2011-11-16 18:39:07.000000000 -0500
@@ -343,7 +343,7 @@ static void add_data(struct op_entry *en
if (cookie == NO_COOKIE)
offset = pc;
}
}
release_mm(mm);
-diff -urNp linux-3.1.1/drivers/oprofile/event_buffer.c linux-3.1.1/drivers/oprofile/event_buffer.c
---- linux-3.1.1/drivers/oprofile/event_buffer.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/oprofile/event_buffer.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/oprofile/event_buffer.c linux-3.1.3/drivers/oprofile/event_buffer.c
+--- linux-3.1.3/drivers/oprofile/event_buffer.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/oprofile/event_buffer.c 2011-11-16 18:39:07.000000000 -0500
@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
}
return;
}
-diff -urNp linux-3.1.1/drivers/oprofile/oprof.c linux-3.1.1/drivers/oprofile/oprof.c
---- linux-3.1.1/drivers/oprofile/oprof.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/oprofile/oprof.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/oprofile/oprof.c linux-3.1.3/drivers/oprofile/oprof.c
+--- linux-3.1.3/drivers/oprofile/oprof.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/oprofile/oprof.c 2011-11-16 18:39:07.000000000 -0500
@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
if (oprofile_ops.switch_events())
return;
start_switch_worker();
}
-diff -urNp linux-3.1.1/drivers/oprofile/oprofilefs.c linux-3.1.1/drivers/oprofile/oprofilefs.c
---- linux-3.1.1/drivers/oprofile/oprofilefs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/oprofile/oprofilefs.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/oprofile/oprofilefs.c linux-3.1.3/drivers/oprofile/oprofilefs.c
+--- linux-3.1.3/drivers/oprofile/oprofilefs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/oprofile/oprofilefs.c 2011-11-16 18:39:07.000000000 -0500
@@ -186,7 +186,7 @@ static const struct file_operations atom
{
return __oprofilefs_create_file(sb, root, name,
&atomic_ro_fops, 0444, val);
-diff -urNp linux-3.1.1/drivers/oprofile/oprofile_stats.c linux-3.1.1/drivers/oprofile/oprofile_stats.c
---- linux-3.1.1/drivers/oprofile/oprofile_stats.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/oprofile/oprofile_stats.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/oprofile/oprofile_stats.c linux-3.1.3/drivers/oprofile/oprofile_stats.c
+--- linux-3.1.3/drivers/oprofile/oprofile_stats.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/oprofile/oprofile_stats.c 2011-11-16 18:39:07.000000000 -0500
@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
cpu_buf->sample_invalid_eip = 0;
}
}
-diff -urNp linux-3.1.1/drivers/oprofile/oprofile_stats.h linux-3.1.1/drivers/oprofile/oprofile_stats.h
---- linux-3.1.1/drivers/oprofile/oprofile_stats.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/oprofile/oprofile_stats.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/oprofile/oprofile_stats.h linux-3.1.3/drivers/oprofile/oprofile_stats.h
+--- linux-3.1.3/drivers/oprofile/oprofile_stats.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/oprofile/oprofile_stats.h 2011-11-16 18:39:07.000000000 -0500
@@ -13,11 +13,11 @@
#include <linux/atomic.h>
};
extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-3.1.1/drivers/parport/procfs.c linux-3.1.1/drivers/parport/procfs.c
---- linux-3.1.1/drivers/parport/procfs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/parport/procfs.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/parport/procfs.c linux-3.1.3/drivers/parport/procfs.c
+--- linux-3.1.3/drivers/parport/procfs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/parport/procfs.c 2011-11-16 18:39:07.000000000 -0500
@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
*ppos += len;
}
#endif /* IEEE1284.3 support. */
-diff -urNp linux-3.1.1/drivers/pci/hotplug/cpci_hotplug.h linux-3.1.1/drivers/pci/hotplug/cpci_hotplug.h
---- linux-3.1.1/drivers/pci/hotplug/cpci_hotplug.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/pci/hotplug/cpci_hotplug.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/pci/hotplug/cpci_hotplug.h linux-3.1.3/drivers/pci/hotplug/cpci_hotplug.h
+--- linux-3.1.3/drivers/pci/hotplug/cpci_hotplug.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/pci/hotplug/cpci_hotplug.h 2011-11-16 18:39:07.000000000 -0500
@@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
int (*hardware_test) (struct slot* slot, u32 value);
u8 (*get_power) (struct slot* slot);
struct cpci_hp_controller {
unsigned int irq;
-diff -urNp linux-3.1.1/drivers/pci/hotplug/cpqphp_nvram.c linux-3.1.1/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-3.1.1/drivers/pci/hotplug/cpqphp_nvram.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/pci/hotplug/cpqphp_nvram.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/pci/hotplug/cpqphp_nvram.c linux-3.1.3/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-3.1.3/drivers/pci/hotplug/cpqphp_nvram.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/pci/hotplug/cpqphp_nvram.c 2011-11-16 18:39:07.000000000 -0500
@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
void compaq_nvram_init (void __iomem *rom_start)
dbg("int15 entry = %p\n", compaq_int15_entry_point);
/* initialize our int15 lock */
-diff -urNp linux-3.1.1/drivers/pci/pcie/aspm.c linux-3.1.1/drivers/pci/pcie/aspm.c
---- linux-3.1.1/drivers/pci/pcie/aspm.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/pci/pcie/aspm.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/pci/pcie/aspm.c linux-3.1.3/drivers/pci/pcie/aspm.c
+--- linux-3.1.3/drivers/pci/pcie/aspm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/pci/pcie/aspm.c 2011-11-16 18:39:07.000000000 -0500
@@ -27,9 +27,9 @@
#define MODULE_PARAM_PREFIX "pcie_aspm."
#define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
#define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
-diff -urNp linux-3.1.1/drivers/pci/probe.c linux-3.1.1/drivers/pci/probe.c
---- linux-3.1.1/drivers/pci/probe.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/pci/probe.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/pci/probe.c linux-3.1.3/drivers/pci/probe.c
+--- linux-3.1.3/drivers/pci/probe.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/pci/probe.c 2011-11-16 18:39:07.000000000 -0500
@@ -136,7 +136,7 @@ int __pci_read_base(struct pci_dev *dev,
u32 l, sz, mask;
u16 orig_cmd;
if (!dev->mmio_always_on) {
pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
-diff -urNp linux-3.1.1/drivers/pci/proc.c linux-3.1.1/drivers/pci/proc.c
---- linux-3.1.1/drivers/pci/proc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/pci/proc.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/pci/proc.c linux-3.1.3/drivers/pci/proc.c
+--- linux-3.1.3/drivers/pci/proc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/pci/proc.c 2011-11-16 18:40:22.000000000 -0500
@@ -476,7 +476,16 @@ static const struct file_operations proc
static int __init pci_proc_init(void)
{
proc_create("devices", 0, proc_bus_pci_dir,
&proc_bus_pci_dev_operations);
proc_initialized = 1;
-diff -urNp linux-3.1.1/drivers/pci/xen-pcifront.c linux-3.1.1/drivers/pci/xen-pcifront.c
---- linux-3.1.1/drivers/pci/xen-pcifront.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/pci/xen-pcifront.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/pci/xen-pcifront.c linux-3.1.3/drivers/pci/xen-pcifront.c
+--- linux-3.1.3/drivers/pci/xen-pcifront.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/pci/xen-pcifront.c 2011-11-16 18:40:22.000000000 -0500
@@ -187,6 +187,8 @@ static int pcifront_bus_read(struct pci_
struct pcifront_sd *sd = bus->sysdata;
struct pcifront_device *pdev = pcifront_get_pdev(sd);
err = do_pci_op(pdev, &op);
if (likely(!err)) {
vector[0] = op.value;
-diff -urNp linux-3.1.1/drivers/platform/x86/thinkpad_acpi.c linux-3.1.1/drivers/platform/x86/thinkpad_acpi.c
---- linux-3.1.1/drivers/platform/x86/thinkpad_acpi.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/platform/x86/thinkpad_acpi.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/platform/x86/thinkpad_acpi.c linux-3.1.3/drivers/platform/x86/thinkpad_acpi.c
+--- linux-3.1.3/drivers/platform/x86/thinkpad_acpi.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/platform/x86/thinkpad_acpi.c 2011-11-16 18:39:07.000000000 -0500
@@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
return 0;
}
{
/* log only what the user can fix... */
const u32 wantedmask = hotkey_driver_mask &
-diff -urNp linux-3.1.1/drivers/pnp/pnpbios/bioscalls.c linux-3.1.1/drivers/pnp/pnpbios/bioscalls.c
---- linux-3.1.1/drivers/pnp/pnpbios/bioscalls.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/pnp/pnpbios/bioscalls.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/pnp/pnpbios/bioscalls.c linux-3.1.3/drivers/pnp/pnpbios/bioscalls.c
+--- linux-3.1.3/drivers/pnp/pnpbios/bioscalls.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/pnp/pnpbios/bioscalls.c 2011-11-16 18:39:07.000000000 -0500
@@ -59,7 +59,7 @@ do { \
set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
} while(0)
+
+ pax_close_kernel();
}
-diff -urNp linux-3.1.1/drivers/pnp/resource.c linux-3.1.1/drivers/pnp/resource.c
---- linux-3.1.1/drivers/pnp/resource.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/pnp/resource.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/pnp/resource.c linux-3.1.3/drivers/pnp/resource.c
+--- linux-3.1.3/drivers/pnp/resource.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/pnp/resource.c 2011-11-16 18:39:07.000000000 -0500
@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
return 1;
return 0;
/* check if the resource is reserved */
-diff -urNp linux-3.1.1/drivers/power/bq27x00_battery.c linux-3.1.1/drivers/power/bq27x00_battery.c
---- linux-3.1.1/drivers/power/bq27x00_battery.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/power/bq27x00_battery.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/power/bq27x00_battery.c linux-3.1.3/drivers/power/bq27x00_battery.c
+--- linux-3.1.3/drivers/power/bq27x00_battery.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/power/bq27x00_battery.c 2011-11-16 18:39:07.000000000 -0500
@@ -67,7 +67,7 @@
struct bq27x00_device_info;
struct bq27x00_access_methods {
enum bq27x00_chip { BQ27000, BQ27500 };
-diff -urNp linux-3.1.1/drivers/regulator/max8660.c linux-3.1.1/drivers/regulator/max8660.c
---- linux-3.1.1/drivers/regulator/max8660.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/regulator/max8660.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/regulator/max8660.c linux-3.1.3/drivers/regulator/max8660.c
+--- linux-3.1.3/drivers/regulator/max8660.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/regulator/max8660.c 2011-11-16 18:39:07.000000000 -0500
@@ -383,8 +383,10 @@ static int __devinit max8660_probe(struc
max8660->shadow_regs[MAX8660_OVER1] = 5;
} else {
}
/*
-diff -urNp linux-3.1.1/drivers/regulator/mc13892-regulator.c linux-3.1.1/drivers/regulator/mc13892-regulator.c
---- linux-3.1.1/drivers/regulator/mc13892-regulator.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/regulator/mc13892-regulator.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/regulator/mc13892-regulator.c linux-3.1.3/drivers/regulator/mc13892-regulator.c
+--- linux-3.1.3/drivers/regulator/mc13892-regulator.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/regulator/mc13892-regulator.c 2011-11-16 18:39:07.000000000 -0500
@@ -564,10 +564,12 @@ static int __devinit mc13892_regulator_p
}
mc13xxx_unlock(mc13892);
for (i = 0; i < pdata->num_regulators; i++) {
init_data = &pdata->regulators[i];
priv->regulators[i] = regulator_register(
-diff -urNp linux-3.1.1/drivers/rtc/rtc-dev.c linux-3.1.1/drivers/rtc/rtc-dev.c
---- linux-3.1.1/drivers/rtc/rtc-dev.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/rtc/rtc-dev.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/rtc/rtc-dev.c linux-3.1.3/drivers/rtc/rtc-dev.c
+--- linux-3.1.3/drivers/rtc/rtc-dev.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/rtc/rtc-dev.c 2011-11-16 18:40:22.000000000 -0500
@@ -14,6 +14,7 @@
#include <linux/module.h>
#include <linux/rtc.h>
return rtc_set_time(rtc, &tm);
case RTC_PIE_ON:
-diff -urNp linux-3.1.1/drivers/scsi/aacraid/aacraid.h linux-3.1.1/drivers/scsi/aacraid/aacraid.h
---- linux-3.1.1/drivers/scsi/aacraid/aacraid.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/aacraid/aacraid.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/aacraid/aacraid.h linux-3.1.3/drivers/scsi/aacraid/aacraid.h
+--- linux-3.1.3/drivers/scsi/aacraid/aacraid.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/aacraid/aacraid.h 2011-11-16 18:39:07.000000000 -0500
@@ -492,7 +492,7 @@ struct adapter_ops
int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
/* Administrative operations */
/*
* Define which interrupt handler needs to be installed
-diff -urNp linux-3.1.1/drivers/scsi/aacraid/commctrl.c linux-3.1.1/drivers/scsi/aacraid/commctrl.c
---- linux-3.1.1/drivers/scsi/aacraid/commctrl.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/aacraid/commctrl.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/aacraid/commctrl.c linux-3.1.3/drivers/scsi/aacraid/commctrl.c
+--- linux-3.1.3/drivers/scsi/aacraid/commctrl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/aacraid/commctrl.c 2011-11-16 18:40:22.000000000 -0500
@@ -482,6 +482,7 @@ static int aac_send_raw_srb(struct aac_d
u32 actual_fibsize64, actual_fibsize = 0;
int i;
if (dev->in_reset) {
dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n"));
-diff -urNp linux-3.1.1/drivers/scsi/aacraid/linit.c linux-3.1.1/drivers/scsi/aacraid/linit.c
---- linux-3.1.1/drivers/scsi/aacraid/linit.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/aacraid/linit.c 2011-11-16 18:39:07.000000000 -0500
-@@ -92,7 +92,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_
+diff -urNp linux-3.1.3/drivers/scsi/aacraid/linit.c linux-3.1.3/drivers/scsi/aacraid/linit.c
+--- linux-3.1.3/drivers/scsi/aacraid/linit.c 2011-11-26 19:57:29.000000000 -0500
++++ linux-3.1.3/drivers/scsi/aacraid/linit.c 2011-11-26 20:00:43.000000000 -0500
+@@ -93,7 +93,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_
#elif defined(__devinitconst)
static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
#else
#endif
{ 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
{ 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
-diff -urNp linux-3.1.1/drivers/scsi/aic94xx/aic94xx_init.c linux-3.1.1/drivers/scsi/aic94xx/aic94xx_init.c
---- linux-3.1.1/drivers/scsi/aic94xx/aic94xx_init.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/aic94xx/aic94xx_init.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/aic94xx/aic94xx_init.c linux-3.1.3/drivers/scsi/aic94xx/aic94xx_init.c
+--- linux-3.1.3/drivers/scsi/aic94xx/aic94xx_init.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/aic94xx/aic94xx_init.c 2011-11-16 18:39:07.000000000 -0500
@@ -1012,7 +1012,7 @@ static struct sas_domain_function_templa
.lldd_control_phy = asd_control_phy,
};
{PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1},
{PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1},
{PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},
-diff -urNp linux-3.1.1/drivers/scsi/bfa/bfad.c linux-3.1.1/drivers/scsi/bfa/bfad.c
---- linux-3.1.1/drivers/scsi/bfa/bfad.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/bfa/bfad.c 2011-11-16 19:01:15.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/bfa/bfad.c linux-3.1.3/drivers/scsi/bfa/bfad.c
+--- linux-3.1.3/drivers/scsi/bfa/bfad.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/bfa/bfad.c 2011-11-16 19:01:15.000000000 -0500
@@ -1019,6 +1019,8 @@ bfad_start_ops(struct bfad_s *bfad) {
struct bfad_vport_s *vport, *vport_new;
struct bfa_fcs_driver_info_s driver_info;
/* Limit min/max. xfer size to [64k-32MB] */
if (max_xfer_size < BFAD_MIN_SECTORS >> 1)
max_xfer_size = BFAD_MIN_SECTORS >> 1;
-diff -urNp linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.c linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.c
---- linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/bfa/bfa_fcpim.c linux-3.1.3/drivers/scsi/bfa/bfa_fcpim.c
+--- linux-3.1.3/drivers/scsi/bfa/bfa_fcpim.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/bfa/bfa_fcpim.c 2011-11-16 18:39:07.000000000 -0500
@@ -4179,7 +4179,7 @@ bfa_itn_create(struct bfa_s *bfa, struct
void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m))
{
itn = BFA_ITN_FROM_TAG(fcp, rport->rport_tag);
itn->isr = isr;
-diff -urNp linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.h linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.h
---- linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/bfa/bfa_fcpim.h linux-3.1.3/drivers/scsi/bfa/bfa_fcpim.h
+--- linux-3.1.3/drivers/scsi/bfa/bfa_fcpim.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/bfa/bfa_fcpim.h 2011-11-16 18:39:07.000000000 -0500
@@ -37,6 +37,7 @@ struct bfa_iotag_s {
struct bfa_itn_s {
bfa_isr_func_t isr;
int num_ioim_reqs;
int num_fwtio_reqs;
int num_itns;
-diff -urNp linux-3.1.1/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.1.1/drivers/scsi/bfa/bfa_fcs_lport.c
---- linux-3.1.1/drivers/scsi/bfa/bfa_fcs_lport.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/bfa/bfa_fcs_lport.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.1.3/drivers/scsi/bfa/bfa_fcs_lport.c
+--- linux-3.1.3/drivers/scsi/bfa/bfa_fcs_lport.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/bfa/bfa_fcs_lport.c 2011-11-16 18:40:22.000000000 -0500
@@ -1700,6 +1700,8 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struc
u16 len, count;
u16 templen;
/*
* get port attributes
*/
-diff -urNp linux-3.1.1/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.1.1/drivers/scsi/bfa/bfa_fcs_rport.c
---- linux-3.1.1/drivers/scsi/bfa/bfa_fcs_rport.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/bfa/bfa_fcs_rport.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.1.3/drivers/scsi/bfa/bfa_fcs_rport.c
+--- linux-3.1.3/drivers/scsi/bfa/bfa_fcs_rport.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/bfa/bfa_fcs_rport.c 2011-11-16 18:40:22.000000000 -0500
@@ -1871,6 +1871,8 @@ bfa_fcs_rport_process_rpsc(struct bfa_fc
struct fc_rpsc_speed_info_s speeds;
struct bfa_port_attr_s pport_attr;
bfa_trc(port->fcs, rx_fchs->s_id);
bfa_trc(port->fcs, rx_fchs->d_id);
-diff -urNp linux-3.1.1/drivers/scsi/bfa/bfa.h linux-3.1.1/drivers/scsi/bfa/bfa.h
---- linux-3.1.1/drivers/scsi/bfa/bfa.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/bfa/bfa.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/bfa/bfa.h linux-3.1.3/drivers/scsi/bfa/bfa.h
+--- linux-3.1.3/drivers/scsi/bfa/bfa.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/bfa/bfa.h 2011-11-16 18:39:07.000000000 -0500
@@ -196,7 +196,7 @@ struct bfa_hwif_s {
u32 *end);
int cpe_vec_q0;
typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
struct bfa_faa_cbfn_s {
-diff -urNp linux-3.1.1/drivers/scsi/bfa/bfa_ioc.h linux-3.1.1/drivers/scsi/bfa/bfa_ioc.h
---- linux-3.1.1/drivers/scsi/bfa/bfa_ioc.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/bfa/bfa_ioc.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/bfa/bfa_ioc.h linux-3.1.3/drivers/scsi/bfa/bfa_ioc.h
+--- linux-3.1.3/drivers/scsi/bfa/bfa_ioc.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/bfa/bfa_ioc.h 2011-11-16 18:39:07.000000000 -0500
@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
bfa_ioc_disable_cbfn_t disable_cbfn;
bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
/*
* Queue element to wait for room in request queue. FIFO order is
-diff -urNp linux-3.1.1/drivers/scsi/BusLogic.c linux-3.1.1/drivers/scsi/BusLogic.c
---- linux-3.1.1/drivers/scsi/BusLogic.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/BusLogic.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/BusLogic.c linux-3.1.3/drivers/scsi/BusLogic.c
+--- linux-3.1.3/drivers/scsi/BusLogic.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/BusLogic.c 2011-11-16 18:40:22.000000000 -0500
@@ -962,6 +962,8 @@ static int __init BusLogic_InitializeFla
static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter
*PrototypeHostAdapter)
/*
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-3.1.1/drivers/scsi/dpt_i2o.c linux-3.1.1/drivers/scsi/dpt_i2o.c
---- linux-3.1.1/drivers/scsi/dpt_i2o.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/dpt_i2o.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/dpt_i2o.c linux-3.1.3/drivers/scsi/dpt_i2o.c
+--- linux-3.1.3/drivers/scsi/dpt_i2o.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/dpt_i2o.c 2011-11-16 18:40:22.000000000 -0500
@@ -1811,6 +1811,8 @@ static int adpt_i2o_passthru(adpt_hba* p
dma_addr_t addr;
ulong flags = 0;
memset(msg, 0 , sizeof(msg));
len = scsi_bufflen(cmd);
direction = 0x00000000;
-diff -urNp linux-3.1.1/drivers/scsi/eata.c linux-3.1.1/drivers/scsi/eata.c
---- linux-3.1.1/drivers/scsi/eata.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/eata.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/eata.c linux-3.1.3/drivers/scsi/eata.c
+--- linux-3.1.3/drivers/scsi/eata.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/eata.c 2011-11-16 18:40:22.000000000 -0500
@@ -1087,6 +1087,8 @@ static int port_detect(unsigned long por
struct hostdata *ha;
char name[16];
sprintf(name, "%s%d", driver_name, j);
if (!request_region(port_base, REGION_SIZE, driver_name)) {
-diff -urNp linux-3.1.1/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.1.1/drivers/scsi/fcoe/fcoe_ctlr.c
---- linux-3.1.1/drivers/scsi/fcoe/fcoe_ctlr.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/fcoe/fcoe_ctlr.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.1.3/drivers/scsi/fcoe/fcoe_ctlr.c
+--- linux-3.1.3/drivers/scsi/fcoe/fcoe_ctlr.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/fcoe/fcoe_ctlr.c 2011-11-16 18:40:22.000000000 -0500
@@ -2503,6 +2503,8 @@ static int fcoe_ctlr_vn_recv(struct fcoe
} buf;
int rc;
fiph = (struct fip_header *)skb->data;
sub = fiph->fip_subcode;
-diff -urNp linux-3.1.1/drivers/scsi/gdth.c linux-3.1.1/drivers/scsi/gdth.c
---- linux-3.1.1/drivers/scsi/gdth.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/gdth.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/gdth.c linux-3.1.3/drivers/scsi/gdth.c
+--- linux-3.1.3/drivers/scsi/gdth.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/gdth.c 2011-11-16 18:40:22.000000000 -0500
@@ -4107,6 +4107,8 @@ static int ioc_lockdrv(void __user *arg)
unsigned long flags;
gdth_ha_str *ha;
memset(cmnd, 0xff, MAX_COMMAND_SIZE);
TRACE2(("gdth_flush() hanum %d\n", ha->hanum));
-diff -urNp linux-3.1.1/drivers/scsi/gdth_proc.c linux-3.1.1/drivers/scsi/gdth_proc.c
---- linux-3.1.1/drivers/scsi/gdth_proc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/gdth_proc.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/gdth_proc.c linux-3.1.3/drivers/scsi/gdth_proc.c
+--- linux-3.1.3/drivers/scsi/gdth_proc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/gdth_proc.c 2011-11-16 18:40:22.000000000 -0500
@@ -47,6 +47,9 @@ static int gdth_set_asc_info(struct Scsi
u64 paddr;
gdtcmd = kmalloc(sizeof(*gdtcmd), GFP_KERNEL);
estr = kmalloc(sizeof(*estr), GFP_KERNEL);
if (!gdtcmd || !estr)
-diff -urNp linux-3.1.1/drivers/scsi/hosts.c linux-3.1.1/drivers/scsi/hosts.c
---- linux-3.1.1/drivers/scsi/hosts.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/hosts.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/hosts.c linux-3.1.3/drivers/scsi/hosts.c
+--- linux-3.1.3/drivers/scsi/hosts.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/hosts.c 2011-11-16 18:39:07.000000000 -0500
@@ -42,7 +42,7 @@
#include "scsi_logging.h"
shost->dma_channel = 0xff;
/* These three are default values which can be overridden */
-diff -urNp linux-3.1.1/drivers/scsi/hpsa.c linux-3.1.1/drivers/scsi/hpsa.c
---- linux-3.1.1/drivers/scsi/hpsa.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/hpsa.c 2011-11-16 18:39:07.000000000 -0500
-@@ -498,7 +498,7 @@ static inline u32 next_command(struct ct
+diff -urNp linux-3.1.3/drivers/scsi/hpsa.c linux-3.1.3/drivers/scsi/hpsa.c
+--- linux-3.1.3/drivers/scsi/hpsa.c 2011-11-26 19:57:29.000000000 -0500
++++ linux-3.1.3/drivers/scsi/hpsa.c 2011-11-26 20:00:43.000000000 -0500
+@@ -499,7 +499,7 @@ static inline u32 next_command(struct ct
u32 a;
if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
a = *(h->reply_pool_head); /* Next cmd in ring buffer */
-@@ -2955,7 +2955,7 @@ static void start_io(struct ctlr_info *h
+@@ -2956,7 +2956,7 @@ static void start_io(struct ctlr_info *h
while (!list_empty(&h->reqQ)) {
c = list_entry(h->reqQ.next, struct CommandList, list);
/* can't do anything if fifo is full */
dev_warn(&h->pdev->dev, "fifo full\n");
break;
}
-@@ -2965,7 +2965,7 @@ static void start_io(struct ctlr_info *h
+@@ -2966,7 +2966,7 @@ static void start_io(struct ctlr_info *h
h->Qdepth--;
/* Tell the controller execute command */
/* Put job onto the completed Q */
addQ(&h->cmpQ, c);
-@@ -2974,17 +2974,17 @@ static void start_io(struct ctlr_info *h
+@@ -2975,17 +2975,17 @@ static void start_io(struct ctlr_info *h
static inline unsigned long get_next_completion(struct ctlr_info *h)
{
(h->interrupts_enabled == 0);
}
-@@ -3881,7 +3881,7 @@ static int __devinit hpsa_pci_init(struc
+@@ -3882,7 +3882,7 @@ static int __devinit hpsa_pci_init(struc
if (prod_index < 0)
return -ENODEV;
h->product_name = products[prod_index].product_name;
if (hpsa_board_disabled(h->pdev)) {
dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
-@@ -4158,7 +4158,7 @@ reinit_after_soft_reset:
+@@ -4163,7 +4163,7 @@ reinit_after_soft_reset:
}
/* make sure the board interrupts are off */
if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
goto clean2;
-@@ -4192,7 +4192,7 @@ reinit_after_soft_reset:
+@@ -4197,7 +4197,7 @@ reinit_after_soft_reset:
* fake ones to scoop up any residual completions.
*/
spin_lock_irqsave(&h->lock, flags);
spin_unlock_irqrestore(&h->lock, flags);
free_irq(h->intr[h->intr_mode], h);
rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
-@@ -4211,9 +4211,9 @@ reinit_after_soft_reset:
+@@ -4216,9 +4216,9 @@ reinit_after_soft_reset:
dev_info(&h->pdev->dev, "Board READY.\n");
dev_info(&h->pdev->dev,
"Waiting for stale completions to drain.\n");
rc = controller_reset_failed(h->cfgtable);
if (rc)
-@@ -4234,7 +4234,7 @@ reinit_after_soft_reset:
+@@ -4239,7 +4239,7 @@ reinit_after_soft_reset:
}
/* Turn the interrupts on so we can service requests */
hpsa_hba_inquiry(h);
hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
-@@ -4287,7 +4287,7 @@ static void hpsa_shutdown(struct pci_dev
+@@ -4292,7 +4292,7 @@ static void hpsa_shutdown(struct pci_dev
* To write all data in the battery backed cache to disks
*/
hpsa_flush_cache(h);
free_irq(h->intr[h->intr_mode], h);
#ifdef CONFIG_PCI_MSI
if (h->msix_vector)
-@@ -4450,7 +4450,7 @@ static __devinit void hpsa_enter_perform
+@@ -4455,7 +4455,7 @@ static __devinit void hpsa_enter_perform
return;
}
/* Change the access methods to the performant access methods */
h->transMethod = CFGTBL_Trans_Performant;
}
-diff -urNp linux-3.1.1/drivers/scsi/hpsa.h linux-3.1.1/drivers/scsi/hpsa.h
---- linux-3.1.1/drivers/scsi/hpsa.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/hpsa.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/hpsa.h linux-3.1.3/drivers/scsi/hpsa.h
+--- linux-3.1.3/drivers/scsi/hpsa.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/hpsa.h 2011-11-16 18:39:07.000000000 -0500
@@ -73,7 +73,7 @@ struct ctlr_info {
unsigned int msix_vector;
unsigned int msi_vector;
/* queue and queue Info */
struct list_head reqQ;
-diff -urNp linux-3.1.1/drivers/scsi/ips.h linux-3.1.1/drivers/scsi/ips.h
---- linux-3.1.1/drivers/scsi/ips.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/ips.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/ips.h linux-3.1.3/drivers/scsi/ips.h
+--- linux-3.1.3/drivers/scsi/ips.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/ips.h 2011-11-16 18:39:07.000000000 -0500
@@ -1027,7 +1027,7 @@ typedef struct {
int (*intr)(struct ips_ha *);
void (*enableint)(struct ips_ha *);
typedef struct ips_ha {
uint8_t ha_id[IPS_MAX_CHANNELS+1];
-diff -urNp linux-3.1.1/drivers/scsi/libfc/fc_exch.c linux-3.1.1/drivers/scsi/libfc/fc_exch.c
---- linux-3.1.1/drivers/scsi/libfc/fc_exch.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/libfc/fc_exch.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/libfc/fc_exch.c linux-3.1.3/drivers/scsi/libfc/fc_exch.c
+--- linux-3.1.3/drivers/scsi/libfc/fc_exch.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/libfc/fc_exch.c 2011-11-16 18:39:07.000000000 -0500
@@ -105,12 +105,12 @@ struct fc_exch_mgr {
* all together if not used XXX
*/
fc_frame_free(fp);
}
-diff -urNp linux-3.1.1/drivers/scsi/libsas/sas_ata.c linux-3.1.1/drivers/scsi/libsas/sas_ata.c
---- linux-3.1.1/drivers/scsi/libsas/sas_ata.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/libsas/sas_ata.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/libsas/sas_ata.c linux-3.1.3/drivers/scsi/libsas/sas_ata.c
+--- linux-3.1.3/drivers/scsi/libsas/sas_ata.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/libsas/sas_ata.c 2011-11-16 18:39:07.000000000 -0500
@@ -368,7 +368,7 @@ static struct ata_port_operations sas_sa
.postreset = ata_std_postreset,
.error_handler = ata_std_error_handler,
.qc_prep = ata_noop_qc_prep,
.qc_issue = sas_ata_qc_issue,
.qc_fill_rtf = sas_ata_qc_fill_rtf,
-diff -urNp linux-3.1.1/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.1.1/drivers/scsi/lpfc/lpfc_debugfs.c
---- linux-3.1.1/drivers/scsi/lpfc/lpfc_debugfs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/lpfc/lpfc_debugfs.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.1.3/drivers/scsi/lpfc/lpfc_debugfs.c
+--- linux-3.1.3/drivers/scsi/lpfc/lpfc_debugfs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/lpfc/lpfc_debugfs.c 2011-11-16 18:40:22.000000000 -0500
@@ -105,7 +105,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_
#include <linux/debugfs.h>
snprintf(name, sizeof(name), "discovery_trace");
vport->debug_disc_trc =
-diff -urNp linux-3.1.1/drivers/scsi/lpfc/lpfc.h linux-3.1.1/drivers/scsi/lpfc/lpfc.h
---- linux-3.1.1/drivers/scsi/lpfc/lpfc.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/lpfc/lpfc.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/lpfc/lpfc.h linux-3.1.3/drivers/scsi/lpfc/lpfc.h
+--- linux-3.1.3/drivers/scsi/lpfc/lpfc.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/lpfc/lpfc.h 2011-11-16 18:39:07.000000000 -0500
@@ -425,7 +425,7 @@ struct lpfc_vport {
struct dentry *debug_nodelist;
struct dentry *vport_debugfs_root;
/* iDiag debugfs sub-directory */
struct dentry *idiag_root;
struct dentry *idiag_pci_cfg;
-diff -urNp linux-3.1.1/drivers/scsi/lpfc/lpfc_init.c linux-3.1.1/drivers/scsi/lpfc/lpfc_init.c
---- linux-3.1.1/drivers/scsi/lpfc/lpfc_init.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/lpfc/lpfc_init.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/lpfc/lpfc_init.c linux-3.1.3/drivers/scsi/lpfc/lpfc_init.c
+--- linux-3.1.3/drivers/scsi/lpfc/lpfc_init.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/lpfc/lpfc_init.c 2011-11-16 18:39:07.000000000 -0500
@@ -9969,8 +9969,10 @@ lpfc_init(void)
printk(LPFC_COPYRIGHT "\n");
}
lpfc_transport_template =
fc_attach_transport(&lpfc_transport_functions);
-diff -urNp linux-3.1.1/drivers/scsi/lpfc/lpfc_scsi.c linux-3.1.1/drivers/scsi/lpfc/lpfc_scsi.c
---- linux-3.1.1/drivers/scsi/lpfc/lpfc_scsi.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/lpfc/lpfc_scsi.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/lpfc/lpfc_scsi.c linux-3.1.3/drivers/scsi/lpfc/lpfc_scsi.c
+--- linux-3.1.3/drivers/scsi/lpfc/lpfc_scsi.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/lpfc/lpfc_scsi.c 2011-11-16 18:39:07.000000000 -0500
@@ -297,7 +297,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb
uint32_t evt_posted;
}
/**
-diff -urNp linux-3.1.1/drivers/scsi/megaraid/megaraid_mbox.c linux-3.1.1/drivers/scsi/megaraid/megaraid_mbox.c
---- linux-3.1.1/drivers/scsi/megaraid/megaraid_mbox.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/megaraid/megaraid_mbox.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/megaraid/megaraid_mbox.c linux-3.1.3/drivers/scsi/megaraid/megaraid_mbox.c
+--- linux-3.1.3/drivers/scsi/megaraid/megaraid_mbox.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/megaraid/megaraid_mbox.c 2011-11-16 18:40:22.000000000 -0500
@@ -3503,6 +3503,8 @@ megaraid_cmm_register(adapter_t *adapter
int rval;
int i;
// 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-3.1.1/drivers/scsi/osd/osd_initiator.c linux-3.1.1/drivers/scsi/osd/osd_initiator.c
---- linux-3.1.1/drivers/scsi/osd/osd_initiator.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/osd/osd_initiator.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/osd/osd_initiator.c linux-3.1.3/drivers/scsi/osd/osd_initiator.c
+--- linux-3.1.3/drivers/scsi/osd/osd_initiator.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/osd/osd_initiator.c 2011-11-16 18:40:22.000000000 -0500
@@ -97,6 +97,8 @@ static int _osd_get_print_system_info(st
int nelem = ARRAY_SIZE(get_attrs), a = 0;
int ret;
or = osd_start_request(od, GFP_KERNEL);
if (!or)
return -ENOMEM;
-diff -urNp linux-3.1.1/drivers/scsi/pmcraid.c linux-3.1.1/drivers/scsi/pmcraid.c
---- linux-3.1.1/drivers/scsi/pmcraid.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/pmcraid.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/pmcraid.c linux-3.1.3/drivers/scsi/pmcraid.c
+--- linux-3.1.3/drivers/scsi/pmcraid.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/pmcraid.c 2011-11-16 18:39:07.000000000 -0500
@@ -201,8 +201,8 @@ static int pmcraid_slave_alloc(struct sc
res->scsi_dev = scsi_dev;
scsi_dev->hostdata = res;
schedule_work(&pinstance->worker_q);
return rc;
-diff -urNp linux-3.1.1/drivers/scsi/pmcraid.h linux-3.1.1/drivers/scsi/pmcraid.h
---- linux-3.1.1/drivers/scsi/pmcraid.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/pmcraid.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/pmcraid.h linux-3.1.3/drivers/scsi/pmcraid.h
+--- linux-3.1.3/drivers/scsi/pmcraid.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/pmcraid.h 2011-11-16 18:39:07.000000000 -0500
@@ -749,7 +749,7 @@ struct pmcraid_instance {
struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
/* To indicate add/delete/modify during CCN */
u8 change_detected;
-diff -urNp linux-3.1.1/drivers/scsi/qla2xxx/qla_def.h linux-3.1.1/drivers/scsi/qla2xxx/qla_def.h
---- linux-3.1.1/drivers/scsi/qla2xxx/qla_def.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/qla2xxx/qla_def.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/qla2xxx/qla_def.h linux-3.1.3/drivers/scsi/qla2xxx/qla_def.h
+--- linux-3.1.3/drivers/scsi/qla2xxx/qla_def.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/qla2xxx/qla_def.h 2011-11-16 18:39:07.000000000 -0500
@@ -2244,7 +2244,7 @@ struct isp_operations {
int (*get_flash_version) (struct scsi_qla_host *, void *);
int (*start_scsi) (srb_t *);
/* MSI-X Support *************************************************************/
-diff -urNp linux-3.1.1/drivers/scsi/qla4xxx/ql4_def.h linux-3.1.1/drivers/scsi/qla4xxx/ql4_def.h
---- linux-3.1.1/drivers/scsi/qla4xxx/ql4_def.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/qla4xxx/ql4_def.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/qla4xxx/ql4_def.h linux-3.1.3/drivers/scsi/qla4xxx/ql4_def.h
+--- linux-3.1.3/drivers/scsi/qla4xxx/ql4_def.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/qla4xxx/ql4_def.h 2011-11-16 18:39:07.000000000 -0500
@@ -256,7 +256,7 @@ struct ddb_entry {
atomic_t retry_relogin_timer; /* Min Time between relogins
* (4000 only) */
* retried */
uint16_t port;
-diff -urNp linux-3.1.1/drivers/scsi/qla4xxx/ql4_init.c linux-3.1.1/drivers/scsi/qla4xxx/ql4_init.c
---- linux-3.1.1/drivers/scsi/qla4xxx/ql4_init.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/qla4xxx/ql4_init.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/qla4xxx/ql4_init.c linux-3.1.3/drivers/scsi/qla4xxx/ql4_init.c
+--- linux-3.1.3/drivers/scsi/qla4xxx/ql4_init.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/qla4xxx/ql4_init.c 2011-11-16 18:39:07.000000000 -0500
@@ -680,7 +680,7 @@ static struct ddb_entry * qla4xxx_alloc_
ddb_entry->fw_ddb_index = fw_ddb_index;
atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
atomic_set(&ddb_entry->relogin_timer, 0);
clear_bit(DF_RELOGIN, &ddb_entry->flags);
iscsi_unblock_session(ddb_entry->sess);
-diff -urNp linux-3.1.1/drivers/scsi/qla4xxx/ql4_os.c linux-3.1.1/drivers/scsi/qla4xxx/ql4_os.c
---- linux-3.1.1/drivers/scsi/qla4xxx/ql4_os.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/qla4xxx/ql4_os.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/qla4xxx/ql4_os.c linux-3.1.3/drivers/scsi/qla4xxx/ql4_os.c
+--- linux-3.1.3/drivers/scsi/qla4xxx/ql4_os.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/qla4xxx/ql4_os.c 2011-11-16 18:39:07.000000000 -0500
@@ -811,13 +811,13 @@ static void qla4xxx_timer(struct scsi_ql
ddb_entry->fw_ddb_device_state ==
DDB_DS_SESSION_FAILED) {
relogin_retry_count))
);
start_dpc++;
-diff -urNp linux-3.1.1/drivers/scsi/scsi.c linux-3.1.1/drivers/scsi/scsi.c
---- linux-3.1.1/drivers/scsi/scsi.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/scsi.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/scsi.c linux-3.1.3/drivers/scsi/scsi.c
+--- linux-3.1.3/drivers/scsi/scsi.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/scsi.c 2011-11-16 18:39:07.000000000 -0500
@@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *
unsigned long timeout;
int rtn = 0;
/* check if the device is still usable */
if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
-diff -urNp linux-3.1.1/drivers/scsi/scsi_debug.c linux-3.1.1/drivers/scsi/scsi_debug.c
---- linux-3.1.1/drivers/scsi/scsi_debug.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/scsi_debug.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/scsi_debug.c linux-3.1.3/drivers/scsi/scsi_debug.c
+--- linux-3.1.3/drivers/scsi/scsi_debug.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/scsi_debug.c 2011-11-16 18:40:22.000000000 -0500
@@ -1493,6 +1493,8 @@ static int resp_mode_select(struct scsi_
unsigned char arr[SDEBUG_MAX_MSELECT_SZ];
unsigned char *cmd = (unsigned char *)scp->cmnd;
if ((errsts = check_readiness(scp, 1, devip)))
return errsts;
memset(arr, 0, sizeof(arr));
-diff -urNp linux-3.1.1/drivers/scsi/scsi_lib.c linux-3.1.1/drivers/scsi/scsi_lib.c
---- linux-3.1.1/drivers/scsi/scsi_lib.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/scsi_lib.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/scsi_lib.c linux-3.1.3/drivers/scsi/scsi_lib.c
+--- linux-3.1.3/drivers/scsi/scsi_lib.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/scsi_lib.c 2011-11-16 18:39:07.000000000 -0500
@@ -1413,7 +1413,7 @@ static void scsi_kill_request(struct req
shost = sdev->host;
scsi_init_cmd_errh(cmd);
disposition = scsi_decide_disposition(cmd);
if (disposition != SUCCESS &&
-diff -urNp linux-3.1.1/drivers/scsi/scsi_sysfs.c linux-3.1.1/drivers/scsi/scsi_sysfs.c
---- linux-3.1.1/drivers/scsi/scsi_sysfs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/scsi_sysfs.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/scsi_sysfs.c linux-3.1.3/drivers/scsi/scsi_sysfs.c
+--- linux-3.1.3/drivers/scsi/scsi_sysfs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/scsi_sysfs.c 2011-11-16 18:39:07.000000000 -0500
@@ -622,7 +622,7 @@ show_iostat_##field(struct device *dev,
char *buf) \
{ \
return snprintf(buf, 20, "0x%llx\n", count); \
} \
static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
-diff -urNp linux-3.1.1/drivers/scsi/scsi_tgt_lib.c linux-3.1.1/drivers/scsi/scsi_tgt_lib.c
---- linux-3.1.1/drivers/scsi/scsi_tgt_lib.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/scsi_tgt_lib.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/scsi_tgt_lib.c linux-3.1.3/drivers/scsi/scsi_tgt_lib.c
+--- linux-3.1.3/drivers/scsi/scsi_tgt_lib.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/scsi_tgt_lib.c 2011-11-16 18:39:07.000000000 -0500
@@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct sc
int err;
if (err) {
/*
* TODO: need to fixup sg_tablesize, max_segment_size,
-diff -urNp linux-3.1.1/drivers/scsi/scsi_transport_fc.c linux-3.1.1/drivers/scsi/scsi_transport_fc.c
---- linux-3.1.1/drivers/scsi/scsi_transport_fc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/scsi_transport_fc.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/scsi_transport_fc.c linux-3.1.3/drivers/scsi/scsi_transport_fc.c
+--- linux-3.1.3/drivers/scsi/scsi_transport_fc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/scsi_transport_fc.c 2011-11-16 18:39:07.000000000 -0500
@@ -484,7 +484,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_
* Netlink Infrastructure
*/
return -EINVAL;
/*
* Check for overflow; dev_loss_tmo is u32
-diff -urNp linux-3.1.1/drivers/scsi/scsi_transport_iscsi.c linux-3.1.1/drivers/scsi/scsi_transport_iscsi.c
---- linux-3.1.1/drivers/scsi/scsi_transport_iscsi.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/scsi_transport_iscsi.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/scsi_transport_iscsi.c linux-3.1.3/drivers/scsi/scsi_transport_iscsi.c
+--- linux-3.1.3/drivers/scsi/scsi_transport_iscsi.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/scsi_transport_iscsi.c 2011-11-16 18:39:07.000000000 -0500
@@ -83,7 +83,7 @@ struct iscsi_internal {
struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];
};
err = class_register(&iscsi_transport_class);
if (err)
-diff -urNp linux-3.1.1/drivers/scsi/scsi_transport_srp.c linux-3.1.1/drivers/scsi/scsi_transport_srp.c
---- linux-3.1.1/drivers/scsi/scsi_transport_srp.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/scsi_transport_srp.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/scsi_transport_srp.c linux-3.1.3/drivers/scsi/scsi_transport_srp.c
+--- linux-3.1.3/drivers/scsi/scsi_transport_srp.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/scsi_transport_srp.c 2011-11-16 18:39:07.000000000 -0500
@@ -33,7 +33,7 @@
#include "scsi_transport_srp_internal.h"
dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
transport_setup_device(&rport->dev);
-diff -urNp linux-3.1.1/drivers/scsi/sg.c linux-3.1.1/drivers/scsi/sg.c
---- linux-3.1.1/drivers/scsi/sg.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/sg.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/sg.c linux-3.1.3/drivers/scsi/sg.c
+--- linux-3.1.3/drivers/scsi/sg.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/sg.c 2011-11-16 18:39:07.000000000 -0500
@@ -1075,7 +1075,7 @@ sg_ioctl(struct file *filp, unsigned int
sdp->disk->disk_name,
MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
if (!sg_proc_sgp)
-diff -urNp linux-3.1.1/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.1.1/drivers/scsi/sym53c8xx_2/sym_glue.c
---- linux-3.1.1/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.1.3/drivers/scsi/sym53c8xx_2/sym_glue.c
+--- linux-3.1.3/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-11-16 18:40:22.000000000 -0500
@@ -1756,6 +1756,8 @@ static int __devinit sym2_probe(struct p
int do_iounmap = 0;
int do_disable_device = 1;
memset(&sym_dev, 0, sizeof(sym_dev));
memset(&nvram, 0, sizeof(nvram));
sym_dev.pdev = pdev;
-diff -urNp linux-3.1.1/drivers/scsi/vmw_pvscsi.c linux-3.1.1/drivers/scsi/vmw_pvscsi.c
---- linux-3.1.1/drivers/scsi/vmw_pvscsi.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/scsi/vmw_pvscsi.c 2011-11-16 18:40:22.000000000 -0500
+diff -urNp linux-3.1.3/drivers/scsi/vmw_pvscsi.c linux-3.1.3/drivers/scsi/vmw_pvscsi.c
+--- linux-3.1.3/drivers/scsi/vmw_pvscsi.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/scsi/vmw_pvscsi.c 2011-11-16 18:40:22.000000000 -0500
@@ -447,6 +447,8 @@ static void pvscsi_setup_all_rings(const
dma_addr_t base;
unsigned i;
cmd.ringsStatePPN = adapter->ringStatePA >> PAGE_SHIFT;
cmd.reqRingNumPages = adapter->req_pages;
cmd.cmpRingNumPages = adapter->cmp_pages;
-diff -urNp linux-3.1.1/drivers/spi/spi.c linux-3.1.1/drivers/spi/spi.c
---- linux-3.1.1/drivers/spi/spi.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/spi/spi.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/spi/spi.c linux-3.1.3/drivers/spi/spi.c
+--- linux-3.1.3/drivers/spi/spi.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/spi/spi.c 2011-11-16 18:39:07.000000000 -0500
@@ -1023,7 +1023,7 @@ int spi_bus_unlock(struct spi_master *ma
EXPORT_SYMBOL_GPL(spi_bus_unlock);
static u8 *buf;
-diff -urNp linux-3.1.1/drivers/spi/spi-dw-pci.c linux-3.1.1/drivers/spi/spi-dw-pci.c
---- linux-3.1.1/drivers/spi/spi-dw-pci.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/spi/spi-dw-pci.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/spi/spi-dw-pci.c linux-3.1.3/drivers/spi/spi-dw-pci.c
+--- linux-3.1.3/drivers/spi/spi-dw-pci.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/spi/spi-dw-pci.c 2011-11-16 18:39:07.000000000 -0500
@@ -148,7 +148,7 @@ static int spi_resume(struct pci_dev *pd
#define spi_resume NULL
#endif
/* Intel MID platform SPI controller 0 */
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) },
{},
-diff -urNp linux-3.1.1/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.1.1/drivers/staging/ath6kl/os/linux/ar6000_drv.c
---- linux-3.1.1/drivers/staging/ath6kl/os/linux/ar6000_drv.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/ath6kl/os/linux/ar6000_drv.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.1.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+--- linux-3.1.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c 2011-11-16 18:39:07.000000000 -0500
@@ -362,7 +362,7 @@ static struct ar_cookie s_ar_cookie_mem[
(((ar)->arTargetType == TARGET_TYPE_AR6003) ? AR6003_HOST_INTEREST_ITEM_ADDRESS(item) : 0))
.ndo_init = NULL,
.ndo_open = ar6000_open,
.ndo_stop = ar6000_close,
-diff -urNp linux-3.1.1/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-3.1.1/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
---- linux-3.1.1/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-3.1.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
+--- linux-3.1.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h 2011-11-16 18:39:07.000000000 -0500
@@ -30,7 +30,7 @@ typedef bool (*ar6k_pal_recv_pkt_t)(void
typedef struct ar6k_pal_config_s
{
void register_pal_cb(ar6k_pal_config_t *palConfig_p);
#endif /* _AR6K_PAL_H_ */
-diff -urNp linux-3.1.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.1.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
---- linux-3.1.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.1.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+--- linux-3.1.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-11-16 18:39:07.000000000 -0500
@@ -451,14 +451,14 @@ static void brcmf_op_if(struct brcmf_if
free_netdev(ifp->net);
}
#if defined(CONFIG_PM_SLEEP)
atomic_set(&brcmf_mmc_suspend, false);
-diff -urNp linux-3.1.1/drivers/staging/brcm80211/brcmfmac/sdio_host.h linux-3.1.1/drivers/staging/brcm80211/brcmfmac/sdio_host.h
---- linux-3.1.1/drivers/staging/brcm80211/brcmfmac/sdio_host.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/brcm80211/brcmfmac/sdio_host.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/brcm80211/brcmfmac/sdio_host.h linux-3.1.3/drivers/staging/brcm80211/brcmfmac/sdio_host.h
+--- linux-3.1.3/drivers/staging/brcm80211/brcmfmac/sdio_host.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/brcm80211/brcmfmac/sdio_host.h 2011-11-16 18:39:07.000000000 -0500
@@ -263,7 +263,7 @@ struct brcmf_sdioh_driver {
u16 func, uint bustype, u32 regsva, void *param);
/* detach from device */
struct sdioh_info;
-diff -urNp linux-3.1.1/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h linux-3.1.1/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h
---- linux-3.1.1/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h linux-3.1.3/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h
+--- linux-3.1.3/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h 2011-11-16 18:39:07.000000000 -0500
@@ -591,7 +591,7 @@ struct phy_func_ptr {
initfn_t carrsuppr;
rxsigpwrfn_t rxsigpwr;
struct brcms_phy {
struct brcms_phy_pub pubpi_ro;
-diff -urNp linux-3.1.1/drivers/staging/et131x/et1310_tx.c linux-3.1.1/drivers/staging/et131x/et1310_tx.c
---- linux-3.1.1/drivers/staging/et131x/et1310_tx.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/et131x/et1310_tx.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/et131x/et1310_tx.c linux-3.1.3/drivers/staging/et131x/et1310_tx.c
+--- linux-3.1.3/drivers/staging/et131x/et1310_tx.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/et131x/et1310_tx.c 2011-11-16 18:39:07.000000000 -0500
@@ -635,11 +635,11 @@ inline void et131x_free_send_packet(stru
struct net_device_stats *stats = &etdev->net_stats;
if (tcb->skb) {
stats->tx_bytes += tcb->skb->len;
-diff -urNp linux-3.1.1/drivers/staging/et131x/et131x_adapter.h linux-3.1.1/drivers/staging/et131x/et131x_adapter.h
---- linux-3.1.1/drivers/staging/et131x/et131x_adapter.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/et131x/et131x_adapter.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/et131x/et131x_adapter.h linux-3.1.3/drivers/staging/et131x/et131x_adapter.h
+--- linux-3.1.3/drivers/staging/et131x/et131x_adapter.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/et131x/et131x_adapter.h 2011-11-16 18:39:07.000000000 -0500
@@ -106,11 +106,11 @@ struct ce_stats {
* operations
*/
u32 norcvbuf; /* # Rx packets discarded */
u32 noxmtbuf; /* # Tx packets discarded */
-diff -urNp linux-3.1.1/drivers/staging/hv/channel.c linux-3.1.1/drivers/staging/hv/channel.c
---- linux-3.1.1/drivers/staging/hv/channel.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/hv/channel.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/hv/channel.c linux-3.1.3/drivers/staging/hv/channel.c
+--- linux-3.1.3/drivers/staging/hv/channel.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/hv/channel.c 2011-11-16 18:39:07.000000000 -0500
@@ -447,8 +447,8 @@ int vmbus_establish_gpadl(struct vmbus_c
int ret = 0;
int t;
ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
if (ret)
-diff -urNp linux-3.1.1/drivers/staging/hv/hv.c linux-3.1.1/drivers/staging/hv/hv.c
---- linux-3.1.1/drivers/staging/hv/hv.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/hv/hv.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/hv/hv.c linux-3.1.3/drivers/staging/hv/hv.c
+--- linux-3.1.3/drivers/staging/hv/hv.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/hv/hv.c 2011-11-16 18:39:07.000000000 -0500
@@ -132,7 +132,7 @@ static u64 do_hypercall(u64 control, voi
u64 output_address = (output) ? virt_to_phys(output) : 0;
u32 output_address_hi = output_address >> 32;
__asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
"=a"(hv_status_lo) : "d" (control_hi),
-diff -urNp linux-3.1.1/drivers/staging/hv/hv_mouse.c linux-3.1.1/drivers/staging/hv/hv_mouse.c
---- linux-3.1.1/drivers/staging/hv/hv_mouse.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/hv/hv_mouse.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/hv/hv_mouse.c linux-3.1.3/drivers/staging/hv/hv_mouse.c
+--- linux-3.1.3/drivers/staging/hv/hv_mouse.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/hv/hv_mouse.c 2011-11-16 18:39:07.000000000 -0500
@@ -878,8 +878,10 @@ static void reportdesc_callback(struct h
if (hid_dev) {
DPRINT_INFO(INPUTVSC_DRV, "hid_device created");
hid_dev->bus = BUS_VIRTUAL;
hid_dev->vendor = input_device_ctx->device_info.vendor;
-diff -urNp linux-3.1.1/drivers/staging/hv/hyperv_vmbus.h linux-3.1.1/drivers/staging/hv/hyperv_vmbus.h
---- linux-3.1.1/drivers/staging/hv/hyperv_vmbus.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/hv/hyperv_vmbus.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/hv/hyperv_vmbus.h linux-3.1.3/drivers/staging/hv/hyperv_vmbus.h
+--- linux-3.1.3/drivers/staging/hv/hyperv_vmbus.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/hv/hyperv_vmbus.h 2011-11-16 18:39:07.000000000 -0500
@@ -559,7 +559,7 @@ enum vmbus_connect_state {
struct vmbus_connection {
enum vmbus_connect_state conn_state;
/*
* Represents channel interrupts. Each bit position represents a
-diff -urNp linux-3.1.1/drivers/staging/hv/rndis_filter.c linux-3.1.1/drivers/staging/hv/rndis_filter.c
---- linux-3.1.1/drivers/staging/hv/rndis_filter.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/hv/rndis_filter.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/hv/rndis_filter.c linux-3.1.3/drivers/staging/hv/rndis_filter.c
+--- linux-3.1.3/drivers/staging/hv/rndis_filter.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/hv/rndis_filter.c 2011-11-16 18:39:07.000000000 -0500
@@ -43,7 +43,7 @@ struct rndis_device {
enum rndis_device_state state;
/* Ignore return since this msg is optional. */
rndis_filter_send_request(dev, request);
-diff -urNp linux-3.1.1/drivers/staging/hv/vmbus_drv.c linux-3.1.1/drivers/staging/hv/vmbus_drv.c
---- linux-3.1.1/drivers/staging/hv/vmbus_drv.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/hv/vmbus_drv.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/hv/vmbus_drv.c linux-3.1.3/drivers/staging/hv/vmbus_drv.c
+--- linux-3.1.3/drivers/staging/hv/vmbus_drv.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/hv/vmbus_drv.c 2011-11-16 18:39:07.000000000 -0500
@@ -660,11 +660,11 @@ int vmbus_child_device_register(struct h
{
int ret = 0;
/* The new device belongs to this bus */
child_device_obj->device.bus = &hv_bus; /* device->dev.bus; */
-diff -urNp linux-3.1.1/drivers/staging/iio/ring_generic.h linux-3.1.1/drivers/staging/iio/ring_generic.h
---- linux-3.1.1/drivers/staging/iio/ring_generic.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/iio/ring_generic.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/iio/ring_generic.h linux-3.1.3/drivers/staging/iio/ring_generic.h
+--- linux-3.1.3/drivers/staging/iio/ring_generic.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/iio/ring_generic.h 2011-11-16 18:39:07.000000000 -0500
@@ -62,7 +62,7 @@ struct iio_ring_access_funcs {
int (*is_enabled)(struct iio_ring_buffer *ring);
struct iio_ring_setup_ops {
int (*preenable)(struct iio_dev *);
-diff -urNp linux-3.1.1/drivers/staging/mei/interface.c linux-3.1.1/drivers/staging/mei/interface.c
---- linux-3.1.1/drivers/staging/mei/interface.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/mei/interface.c 2011-11-17 18:39:18.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/mei/interface.c linux-3.1.3/drivers/staging/mei/interface.c
+--- linux-3.1.3/drivers/staging/mei/interface.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/mei/interface.c 2011-11-17 18:39:18.000000000 -0500
@@ -332,7 +332,7 @@ int mei_send_flow_control(struct mei_dev
mei_hdr->reserved = 0;
mei_cli_disconnect->host_addr = cl->host_client_id;
mei_cli_disconnect->me_addr = cl->me_client_id;
mei_cli_disconnect->cmd.cmd = CLIENT_DISCONNECT_REQ_CMD;
-diff -urNp linux-3.1.1/drivers/staging/octeon/ethernet.c linux-3.1.1/drivers/staging/octeon/ethernet.c
---- linux-3.1.1/drivers/staging/octeon/ethernet.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/octeon/ethernet.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/octeon/ethernet.c linux-3.1.3/drivers/staging/octeon/ethernet.c
+--- linux-3.1.3/drivers/staging/octeon/ethernet.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/octeon/ethernet.c 2011-11-16 18:39:07.000000000 -0500
@@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_
* since the RX tasklet also increments it.
*/
#endif
}
-diff -urNp linux-3.1.1/drivers/staging/octeon/ethernet-rx.c linux-3.1.1/drivers/staging/octeon/ethernet-rx.c
---- linux-3.1.1/drivers/staging/octeon/ethernet-rx.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/octeon/ethernet-rx.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/octeon/ethernet-rx.c linux-3.1.3/drivers/staging/octeon/ethernet-rx.c
+--- linux-3.1.3/drivers/staging/octeon/ethernet-rx.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/octeon/ethernet-rx.c 2011-11-16 18:39:07.000000000 -0500
@@ -420,11 +420,11 @@ static int cvm_oct_napi_poll(struct napi
/* Increment RX stats for virtual ports */
if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
#endif
dev_kfree_skb_irq(skb);
}
-diff -urNp linux-3.1.1/drivers/staging/pohmelfs/inode.c linux-3.1.1/drivers/staging/pohmelfs/inode.c
---- linux-3.1.1/drivers/staging/pohmelfs/inode.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/pohmelfs/inode.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/pohmelfs/inode.c linux-3.1.3/drivers/staging/pohmelfs/inode.c
+--- linux-3.1.3/drivers/staging/pohmelfs/inode.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/pohmelfs/inode.c 2011-11-16 18:39:07.000000000 -0500
@@ -1861,7 +1861,7 @@ static int pohmelfs_fill_super(struct su
mutex_init(&psb->mcache_lock);
psb->mcache_root = RB_ROOT;
atomic_long_set(&psb->total_inodes, 0);
mutex_init(&psb->state_lock);
-diff -urNp linux-3.1.1/drivers/staging/pohmelfs/mcache.c linux-3.1.1/drivers/staging/pohmelfs/mcache.c
---- linux-3.1.1/drivers/staging/pohmelfs/mcache.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/pohmelfs/mcache.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/pohmelfs/mcache.c linux-3.1.3/drivers/staging/pohmelfs/mcache.c
+--- linux-3.1.3/drivers/staging/pohmelfs/mcache.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/pohmelfs/mcache.c 2011-11-16 18:39:07.000000000 -0500
@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
m->data = data;
m->start = start;
mutex_lock(&psb->mcache_lock);
err = pohmelfs_mcache_insert(psb, m);
-diff -urNp linux-3.1.1/drivers/staging/pohmelfs/netfs.h linux-3.1.1/drivers/staging/pohmelfs/netfs.h
---- linux-3.1.1/drivers/staging/pohmelfs/netfs.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/pohmelfs/netfs.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/pohmelfs/netfs.h linux-3.1.3/drivers/staging/pohmelfs/netfs.h
+--- linux-3.1.3/drivers/staging/pohmelfs/netfs.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/pohmelfs/netfs.h 2011-11-16 18:39:07.000000000 -0500
@@ -571,14 +571,14 @@ struct pohmelfs_config;
struct pohmelfs_sb {
struct rb_root mcache_root;
unsigned int crypto_attached_size;
unsigned int crypto_align_size;
-diff -urNp linux-3.1.1/drivers/staging/pohmelfs/trans.c linux-3.1.1/drivers/staging/pohmelfs/trans.c
---- linux-3.1.1/drivers/staging/pohmelfs/trans.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/pohmelfs/trans.c 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/pohmelfs/trans.c linux-3.1.3/drivers/staging/pohmelfs/trans.c
+--- linux-3.1.3/drivers/staging/pohmelfs/trans.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/pohmelfs/trans.c 2011-11-16 18:39:07.000000000 -0500
@@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran
int err;
struct netfs_cmd *cmd = t->iovec.iov_base;
cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
-diff -urNp linux-3.1.1/drivers/staging/rtl8712/rtl871x_io.h linux-3.1.1/drivers/staging/rtl8712/rtl871x_io.h
---- linux-3.1.1/drivers/staging/rtl8712/rtl871x_io.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/rtl8712/rtl871x_io.h 2011-11-16 18:39:07.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/rtl8712/rtl871x_io.h linux-3.1.3/drivers/staging/rtl8712/rtl871x_io.h
+--- linux-3.1.3/drivers/staging/rtl8712/rtl871x_io.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/rtl8712/rtl871x_io.h 2011-11-16 18:39:07.000000000 -0500
@@ -83,7 +83,7 @@ struct _io_ops {
u8 *pmem);
u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
struct io_req {
struct list_head list;
-diff -urNp linux-3.1.1/drivers/staging/sbe-2t3e3/netdev.c linux-3.1.1/drivers/staging/sbe-2t3e3/netdev.c
---- linux-3.1.1/drivers/staging/sbe-2t3e3/netdev.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/sbe-2t3e3/netdev.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/sbe-2t3e3/netdev.c linux-3.1.3/drivers/staging/sbe-2t3e3/netdev.c
+--- linux-3.1.3/drivers/staging/sbe-2t3e3/netdev.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/sbe-2t3e3/netdev.c 2011-11-16 18:39:08.000000000 -0500
@@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, s
t3e3_if_config(sc, cmd_2t3e3, (char *)¶m, &resp, &rlen);
return -EFAULT;
return 0;
-diff -urNp linux-3.1.1/drivers/staging/usbip/usbip_common.h linux-3.1.1/drivers/staging/usbip/usbip_common.h
---- linux-3.1.1/drivers/staging/usbip/usbip_common.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/usbip/usbip_common.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/usbip/usbip_common.h linux-3.1.3/drivers/staging/usbip/usbip_common.h
+--- linux-3.1.3/drivers/staging/usbip/usbip_common.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/usbip/usbip_common.h 2011-11-16 18:39:08.000000000 -0500
@@ -289,7 +289,7 @@ struct usbip_device {
void (*shutdown)(struct usbip_device *);
void (*reset)(struct usbip_device *);
};
#if 0
-diff -urNp linux-3.1.1/drivers/staging/usbip/vhci.h linux-3.1.1/drivers/staging/usbip/vhci.h
---- linux-3.1.1/drivers/staging/usbip/vhci.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/usbip/vhci.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/usbip/vhci.h linux-3.1.3/drivers/staging/usbip/vhci.h
+--- linux-3.1.3/drivers/staging/usbip/vhci.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/usbip/vhci.h 2011-11-16 18:39:08.000000000 -0500
@@ -85,7 +85,7 @@ struct vhci_hcd {
unsigned resuming:1;
unsigned long re_timeout;
/*
* NOTE:
-diff -urNp linux-3.1.1/drivers/staging/usbip/vhci_hcd.c linux-3.1.1/drivers/staging/usbip/vhci_hcd.c
---- linux-3.1.1/drivers/staging/usbip/vhci_hcd.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/usbip/vhci_hcd.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/usbip/vhci_hcd.c linux-3.1.3/drivers/staging/usbip/vhci_hcd.c
+--- linux-3.1.3/drivers/staging/usbip/vhci_hcd.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/usbip/vhci_hcd.c 2011-11-16 18:39:08.000000000 -0500
@@ -527,7 +527,7 @@ static void vhci_tx_urb(struct urb *urb)
return;
}
spin_lock_init(&vhci->lock);
hcd->power_budget = 0; /* no limit */
-diff -urNp linux-3.1.1/drivers/staging/usbip/vhci_rx.c linux-3.1.1/drivers/staging/usbip/vhci_rx.c
---- linux-3.1.1/drivers/staging/usbip/vhci_rx.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/usbip/vhci_rx.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/usbip/vhci_rx.c linux-3.1.3/drivers/staging/usbip/vhci_rx.c
+--- linux-3.1.3/drivers/staging/usbip/vhci_rx.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/usbip/vhci_rx.c 2011-11-16 18:39:08.000000000 -0500
@@ -76,7 +76,7 @@ static void vhci_recv_ret_submit(struct
if (!urb) {
pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
return;
}
-diff -urNp linux-3.1.1/drivers/staging/vt6655/hostap.c linux-3.1.1/drivers/staging/vt6655/hostap.c
---- linux-3.1.1/drivers/staging/vt6655/hostap.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/vt6655/hostap.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/vt6655/hostap.c linux-3.1.3/drivers/staging/vt6655/hostap.c
+--- linux-3.1.3/drivers/staging/vt6655/hostap.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/vt6655/hostap.c 2011-11-16 18:39:08.000000000 -0500
@@ -79,14 +79,13 @@ static int msglevel
*
*/
pDevice->apdev->netdev_ops = &apdev_netdev_ops;
pDevice->apdev->type = ARPHRD_IEEE80211;
-diff -urNp linux-3.1.1/drivers/staging/vt6656/hostap.c linux-3.1.1/drivers/staging/vt6656/hostap.c
---- linux-3.1.1/drivers/staging/vt6656/hostap.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/vt6656/hostap.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/vt6656/hostap.c linux-3.1.3/drivers/staging/vt6656/hostap.c
+--- linux-3.1.3/drivers/staging/vt6656/hostap.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/vt6656/hostap.c 2011-11-16 18:39:08.000000000 -0500
@@ -80,14 +80,13 @@ static int msglevel
*
*/
pDevice->apdev->netdev_ops = &apdev_netdev_ops;
pDevice->apdev->type = ARPHRD_IEEE80211;
-diff -urNp linux-3.1.1/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.1.1/drivers/staging/wlan-ng/hfa384x_usb.c
---- linux-3.1.1/drivers/staging/wlan-ng/hfa384x_usb.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/wlan-ng/hfa384x_usb.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.1.3/drivers/staging/wlan-ng/hfa384x_usb.c
+--- linux-3.1.3/drivers/staging/wlan-ng/hfa384x_usb.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/wlan-ng/hfa384x_usb.c 2011-11-16 18:39:08.000000000 -0500
@@ -204,7 +204,7 @@ static void unlocked_usbctlx_complete(hf
struct usbctlx_completor {
static int
hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
-diff -urNp linux-3.1.1/drivers/staging/zcache/tmem.c linux-3.1.1/drivers/staging/zcache/tmem.c
---- linux-3.1.1/drivers/staging/zcache/tmem.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/zcache/tmem.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/zcache/tmem.c linux-3.1.3/drivers/staging/zcache/tmem.c
+--- linux-3.1.3/drivers/staging/zcache/tmem.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/zcache/tmem.c 2011-11-16 18:39:08.000000000 -0500
@@ -39,7 +39,7 @@
* A tmem host implementation must use this function to register callbacks
* for memory allocation.
void tmem_register_pamops(struct tmem_pamops *m)
{
-diff -urNp linux-3.1.1/drivers/staging/zcache/tmem.h linux-3.1.1/drivers/staging/zcache/tmem.h
---- linux-3.1.1/drivers/staging/zcache/tmem.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/staging/zcache/tmem.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/staging/zcache/tmem.h linux-3.1.3/drivers/staging/zcache/tmem.h
+--- linux-3.1.3/drivers/staging/zcache/tmem.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/staging/zcache/tmem.h 2011-11-16 18:39:08.000000000 -0500
@@ -180,6 +180,7 @@ struct tmem_pamops {
void (*new_obj)(struct tmem_obj *);
int (*replace_in_obj)(void *, struct tmem_obj *);
extern void tmem_register_hostops(struct tmem_hostops *m);
/* core tmem accessor functions */
-diff -urNp linux-3.1.1/drivers/target/iscsi/iscsi_target.c linux-3.1.1/drivers/target/iscsi/iscsi_target.c
---- linux-3.1.1/drivers/target/iscsi/iscsi_target.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/target/iscsi/iscsi_target.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/target/iscsi/iscsi_target.c linux-3.1.3/drivers/target/iscsi/iscsi_target.c
+--- linux-3.1.3/drivers/target/iscsi/iscsi_target.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/target/iscsi/iscsi_target.c 2011-11-16 18:39:08.000000000 -0500
@@ -1368,7 +1368,7 @@ static int iscsit_handle_data_out(struct
* outstanding_r2ts reaches zero, go ahead and send the delayed
* TASK_ABORTED status.
if (hdr->flags & ISCSI_FLAG_CMD_FINAL)
if (--cmd->outstanding_r2ts < 1) {
iscsit_stop_dataout_timer(cmd);
-diff -urNp linux-3.1.1/drivers/target/target_core_alua.c linux-3.1.1/drivers/target/target_core_alua.c
---- linux-3.1.1/drivers/target/target_core_alua.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/target/target_core_alua.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/drivers/target/target_core_alua.c linux-3.1.3/drivers/target/target_core_alua.c
+--- linux-3.1.3/drivers/target/target_core_alua.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/target/target_core_alua.c 2011-11-16 18:40:29.000000000 -0500
@@ -723,6 +723,8 @@ static int core_alua_update_tpg_primary_
char path[ALUA_METADATA_PATH_LEN];
int len;
memset(path, 0, ALUA_METADATA_PATH_LEN);
memset(wwn, 0, ALUA_SECONDARY_METADATA_WWN_LEN);
-diff -urNp linux-3.1.1/drivers/target/target_core_cdb.c linux-3.1.1/drivers/target/target_core_cdb.c
---- linux-3.1.1/drivers/target/target_core_cdb.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/target/target_core_cdb.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/drivers/target/target_core_cdb.c linux-3.1.3/drivers/target/target_core_cdb.c
+--- linux-3.1.3/drivers/target/target_core_cdb.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/target/target_core_cdb.c 2011-11-16 18:40:29.000000000 -0500
@@ -933,6 +933,8 @@ target_emulate_modesense(struct se_cmd *
int length = 0;
unsigned char buf[SE_MODE_PAGE_BUF];
memset(buf, 0, SE_MODE_PAGE_BUF);
switch (cdb[2] & 0x3f) {
-diff -urNp linux-3.1.1/drivers/target/target_core_configfs.c linux-3.1.1/drivers/target/target_core_configfs.c
---- linux-3.1.1/drivers/target/target_core_configfs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/target/target_core_configfs.c 2011-11-16 19:04:37.000000000 -0500
+diff -urNp linux-3.1.3/drivers/target/target_core_configfs.c linux-3.1.3/drivers/target/target_core_configfs.c
+--- linux-3.1.3/drivers/target/target_core_configfs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/target/target_core_configfs.c 2011-11-16 19:04:37.000000000 -0500
@@ -1267,6 +1267,8 @@ static ssize_t target_core_dev_pr_show_a
ssize_t len = 0;
int reg_count = 0, prf_isid;
if (!su_dev->se_dev_ptr)
return -ENODEV;
-diff -urNp linux-3.1.1/drivers/target/target_core_pr.c linux-3.1.1/drivers/target/target_core_pr.c
---- linux-3.1.1/drivers/target/target_core_pr.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/target/target_core_pr.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/drivers/target/target_core_pr.c linux-3.1.3/drivers/target/target_core_pr.c
+--- linux-3.1.3/drivers/target/target_core_pr.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/target/target_core_pr.c 2011-11-16 18:40:29.000000000 -0500
@@ -918,6 +918,8 @@ static int __core_scsi3_check_aptpl_regi
unsigned char t_port[PR_APTPL_MAX_TPORT_LEN];
u16 tpgt;
memset(iov, 0, sizeof(struct iovec));
memset(path, 0, 512);
-diff -urNp linux-3.1.1/drivers/target/target_core_tmr.c linux-3.1.1/drivers/target/target_core_tmr.c
---- linux-3.1.1/drivers/target/target_core_tmr.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/target/target_core_tmr.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/target/target_core_tmr.c linux-3.1.3/drivers/target/target_core_tmr.c
+--- linux-3.1.3/drivers/target/target_core_tmr.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/target/target_core_tmr.c 2011-11-16 18:39:08.000000000 -0500
@@ -255,7 +255,7 @@ static void core_tmr_drain_task_list(
cmd->se_tfo->get_task_tag(cmd), cmd->pr_res_key,
cmd->t_task_list_num,
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
-diff -urNp linux-3.1.1/drivers/target/target_core_transport.c linux-3.1.1/drivers/target/target_core_transport.c
---- linux-3.1.1/drivers/target/target_core_transport.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/target/target_core_transport.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/target/target_core_transport.c linux-3.1.3/drivers/target/target_core_transport.c
+--- linux-3.1.3/drivers/target/target_core_transport.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/target/target_core_transport.c 2011-11-16 18:39:08.000000000 -0500
@@ -1445,7 +1445,7 @@ struct se_device *transport_add_device_t
dev->queue_depth = dev_limits->queue_depth;
atomic_read(&cmd->t_transport_active),
atomic_read(&cmd->t_transport_stop),
atomic_read(&cmd->t_transport_sent));
-diff -urNp linux-3.1.1/drivers/telephony/ixj.c linux-3.1.1/drivers/telephony/ixj.c
---- linux-3.1.1/drivers/telephony/ixj.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/telephony/ixj.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/drivers/telephony/ixj.c linux-3.1.3/drivers/telephony/ixj.c
+--- linux-3.1.3/drivers/telephony/ixj.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/telephony/ixj.c 2011-11-16 18:40:29.000000000 -0500
@@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j)
bool mContinue;
char *pIn, *pOut;
if (!SCI_Prepare(j))
return 0;
-diff -urNp linux-3.1.1/drivers/tty/hvc/hvcs.c linux-3.1.1/drivers/tty/hvc/hvcs.c
---- linux-3.1.1/drivers/tty/hvc/hvcs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/tty/hvc/hvcs.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/tty/hvc/hvcs.c linux-3.1.3/drivers/tty/hvc/hvcs.c
+--- linux-3.1.3/drivers/tty/hvc/hvcs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/tty/hvc/hvcs.c 2011-11-16 18:39:08.000000000 -0500
@@ -83,6 +83,7 @@
#include <asm/hvcserver.h>
#include <asm/uaccess.h>
return 0;
return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-3.1.1/drivers/tty/ipwireless/tty.c linux-3.1.1/drivers/tty/ipwireless/tty.c
---- linux-3.1.1/drivers/tty/ipwireless/tty.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/tty/ipwireless/tty.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/tty/ipwireless/tty.c linux-3.1.3/drivers/tty/ipwireless/tty.c
+--- linux-3.1.3/drivers/tty/ipwireless/tty.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/tty/ipwireless/tty.c 2011-11-16 18:39:08.000000000 -0500
@@ -29,6 +29,7 @@
#include <linux/tty_driver.h>
#include <linux/tty_flip.h>
do_ipw_close(ttyj);
ipwireless_disassociate_network_ttys(network,
ttyj->channel_idx);
-diff -urNp linux-3.1.1/drivers/tty/n_gsm.c linux-3.1.1/drivers/tty/n_gsm.c
---- linux-3.1.1/drivers/tty/n_gsm.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/tty/n_gsm.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/tty/n_gsm.c linux-3.1.3/drivers/tty/n_gsm.c
+--- linux-3.1.3/drivers/tty/n_gsm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/tty/n_gsm.c 2011-11-16 18:39:08.000000000 -0500
@@ -1625,7 +1625,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s
kref_init(&dlci->ref);
mutex_init(&dlci->mutex);
kfree(dlci);
return NULL;
}
-diff -urNp linux-3.1.1/drivers/tty/n_tty.c linux-3.1.1/drivers/tty/n_tty.c
---- linux-3.1.1/drivers/tty/n_tty.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/tty/n_tty.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/tty/n_tty.c linux-3.1.3/drivers/tty/n_tty.c
+--- linux-3.1.3/drivers/tty/n_tty.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/tty/n_tty.c 2011-11-16 18:39:08.000000000 -0500
@@ -2123,6 +2123,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
{
*ops = tty_ldisc_N_TTY;
+ ops->flags = 0;
}
EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
-diff -urNp linux-3.1.1/drivers/tty/pty.c linux-3.1.1/drivers/tty/pty.c
---- linux-3.1.1/drivers/tty/pty.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/tty/pty.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/tty/pty.c linux-3.1.3/drivers/tty/pty.c
+--- linux-3.1.3/drivers/tty/pty.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/tty/pty.c 2011-11-16 18:39:08.000000000 -0500
@@ -773,8 +773,10 @@ static void __init unix98_pty_init(void)
register_sysctl_table(pty_root_table);
cdev_init(&ptmx_cdev, &ptmx_fops);
if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
-diff -urNp linux-3.1.1/drivers/tty/rocket.c linux-3.1.1/drivers/tty/rocket.c
---- linux-3.1.1/drivers/tty/rocket.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/tty/rocket.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/drivers/tty/rocket.c linux-3.1.3/drivers/tty/rocket.c
+--- linux-3.1.3/drivers/tty/rocket.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/tty/rocket.c 2011-11-16 18:40:29.000000000 -0500
@@ -1277,6 +1277,8 @@ static int get_ports(struct r_port *info
struct rocket_ports tmp;
int board;
if (!retports)
return -EFAULT;
memset(&tmp, 0, sizeof (tmp));
-diff -urNp linux-3.1.1/drivers/tty/serial/kgdboc.c linux-3.1.1/drivers/tty/serial/kgdboc.c
---- linux-3.1.1/drivers/tty/serial/kgdboc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/tty/serial/kgdboc.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/tty/serial/kgdboc.c linux-3.1.3/drivers/tty/serial/kgdboc.c
+--- linux-3.1.3/drivers/tty/serial/kgdboc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/tty/serial/kgdboc.c 2011-11-16 18:39:08.000000000 -0500
@@ -23,8 +23,9 @@
#define MAX_CONFIG_LEN 40
#ifdef CONFIG_KGDB_SERIAL_CONSOLE
/* This is only available if kgdboc is a built in for early debugging */
static int __init kgdboc_early_init(char *opt)
-diff -urNp linux-3.1.1/drivers/tty/serial/mfd.c linux-3.1.1/drivers/tty/serial/mfd.c
---- linux-3.1.1/drivers/tty/serial/mfd.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/tty/serial/mfd.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/tty/serial/mfd.c linux-3.1.3/drivers/tty/serial/mfd.c
+--- linux-3.1.3/drivers/tty/serial/mfd.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/tty/serial/mfd.c 2011-11-16 18:39:08.000000000 -0500
@@ -1423,7 +1423,7 @@ static void serial_hsu_remove(struct pci
}
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081B) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081C) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081D) },
-diff -urNp linux-3.1.1/drivers/tty/serial/mrst_max3110.c linux-3.1.1/drivers/tty/serial/mrst_max3110.c
---- linux-3.1.1/drivers/tty/serial/mrst_max3110.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/tty/serial/mrst_max3110.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/drivers/tty/serial/mrst_max3110.c linux-3.1.3/drivers/tty/serial/mrst_max3110.c
+--- linux-3.1.3/drivers/tty/serial/mrst_max3110.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/tty/serial/mrst_max3110.c 2011-11-16 18:40:29.000000000 -0500
@@ -393,6 +393,8 @@ static void max3110_con_receive(struct u
int loop = 1, num, total = 0;
u8 recv_buf[512], *pbuf;
pbuf = recv_buf;
do {
num = max3110_read_multi(max, pbuf);
-diff -urNp linux-3.1.1/drivers/tty/tty_io.c linux-3.1.1/drivers/tty/tty_io.c
---- linux-3.1.1/drivers/tty/tty_io.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/tty/tty_io.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/tty/tty_io.c linux-3.1.3/drivers/tty/tty_io.c
+--- linux-3.1.3/drivers/tty/tty_io.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/tty/tty_io.c 2011-11-16 18:39:08.000000000 -0500
@@ -3238,7 +3238,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
void tty_default_fops(struct file_operations *fops)
}
/*
-diff -urNp linux-3.1.1/drivers/tty/tty_ldisc.c linux-3.1.1/drivers/tty/tty_ldisc.c
---- linux-3.1.1/drivers/tty/tty_ldisc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/tty/tty_ldisc.c 2011-11-16 18:39:08.000000000 -0500
-@@ -74,7 +74,7 @@ static void put_ldisc(struct tty_ldisc *
+diff -urNp linux-3.1.3/drivers/tty/tty_ldisc.c linux-3.1.3/drivers/tty/tty_ldisc.c
+--- linux-3.1.3/drivers/tty/tty_ldisc.c 2011-11-26 19:57:29.000000000 -0500
++++ linux-3.1.3/drivers/tty/tty_ldisc.c 2011-11-26 20:00:43.000000000 -0500
+@@ -75,7 +75,7 @@ static void put_ldisc(struct tty_ldisc *
if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
struct tty_ldisc_ops *ldo = ld->ops;
module_put(ldo->owner);
spin_unlock_irqrestore(&tty_ldisc_lock, flags);
-@@ -109,7 +109,7 @@ int tty_register_ldisc(int disc, struct
+@@ -110,7 +110,7 @@ int tty_register_ldisc(int disc, struct
spin_lock_irqsave(&tty_ldisc_lock, flags);
tty_ldiscs[disc] = new_ldisc;
new_ldisc->num = disc;
spin_unlock_irqrestore(&tty_ldisc_lock, flags);
return ret;
-@@ -137,7 +137,7 @@ int tty_unregister_ldisc(int disc)
+@@ -138,7 +138,7 @@ int tty_unregister_ldisc(int disc)
return -EINVAL;
spin_lock_irqsave(&tty_ldisc_lock, flags);
ret = -EBUSY;
else
tty_ldiscs[disc] = NULL;
-@@ -158,7 +158,7 @@ static struct tty_ldisc_ops *get_ldops(i
+@@ -159,7 +159,7 @@ static struct tty_ldisc_ops *get_ldops(i
if (ldops) {
ret = ERR_PTR(-EAGAIN);
if (try_module_get(ldops->owner)) {
ret = ldops;
}
}
-@@ -171,7 +171,7 @@ static void put_ldops(struct tty_ldisc_o
+@@ -172,7 +172,7 @@ static void put_ldops(struct tty_ldisc_o
unsigned long flags;
spin_lock_irqsave(&tty_ldisc_lock, flags);
module_put(ldops->owner);
spin_unlock_irqrestore(&tty_ldisc_lock, flags);
}
-diff -urNp linux-3.1.1/drivers/tty/vt/keyboard.c linux-3.1.1/drivers/tty/vt/keyboard.c
---- linux-3.1.1/drivers/tty/vt/keyboard.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/tty/vt/keyboard.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/drivers/tty/vt/keyboard.c linux-3.1.3/drivers/tty/vt/keyboard.c
+--- linux-3.1.3/drivers/tty/vt/keyboard.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/tty/vt/keyboard.c 2011-11-16 18:40:29.000000000 -0500
@@ -656,6 +656,16 @@ static void k_spec(struct vc_data *vc, u
kbd->kbdmode == VC_OFF) &&
value != KVAL(K_SAK))
fn_handler[value](vc);
}
-diff -urNp linux-3.1.1/drivers/tty/vt/vt.c linux-3.1.1/drivers/tty/vt/vt.c
---- linux-3.1.1/drivers/tty/vt/vt.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/tty/vt/vt.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/tty/vt/vt.c linux-3.1.3/drivers/tty/vt/vt.c
+--- linux-3.1.3/drivers/tty/vt/vt.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/tty/vt/vt.c 2011-11-16 18:39:08.000000000 -0500
@@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier
static void notify_write(struct vc_data *vc, unsigned int unicode)
atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, ¶m);
}
-diff -urNp linux-3.1.1/drivers/tty/vt/vt_ioctl.c linux-3.1.1/drivers/tty/vt/vt_ioctl.c
---- linux-3.1.1/drivers/tty/vt/vt_ioctl.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/tty/vt/vt_ioctl.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/drivers/tty/vt/vt_ioctl.c linux-3.1.3/drivers/tty/vt/vt_ioctl.c
+--- linux-3.1.3/drivers/tty/vt/vt_ioctl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/tty/vt/vt_ioctl.c 2011-11-16 18:40:29.000000000 -0500
@@ -207,9 +207,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
return -EFAULT;
if (!perm) {
ret = -EPERM;
goto reterr;
-diff -urNp linux-3.1.1/drivers/uio/uio.c linux-3.1.1/drivers/uio/uio.c
---- linux-3.1.1/drivers/uio/uio.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/uio/uio.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/uio/uio.c linux-3.1.3/drivers/uio/uio.c
+--- linux-3.1.3/drivers/uio/uio.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/uio/uio.c 2011-11-16 18:39:08.000000000 -0500
@@ -25,6 +25,7 @@
#include <linux/kobject.h>
#include <linux/cdev.h>
ret = uio_get_minor(idev);
if (ret)
-diff -urNp linux-3.1.1/drivers/usb/atm/cxacru.c linux-3.1.1/drivers/usb/atm/cxacru.c
---- linux-3.1.1/drivers/usb/atm/cxacru.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/usb/atm/cxacru.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/usb/atm/cxacru.c linux-3.1.3/drivers/usb/atm/cxacru.c
+--- linux-3.1.3/drivers/usb/atm/cxacru.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/usb/atm/cxacru.c 2011-11-16 18:39:08.000000000 -0500
@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_c
ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
if (ret < 2)
return -EINVAL;
pos += tmp;
-diff -urNp linux-3.1.1/drivers/usb/atm/usbatm.c linux-3.1.1/drivers/usb/atm/usbatm.c
---- linux-3.1.1/drivers/usb/atm/usbatm.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/usb/atm/usbatm.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/usb/atm/usbatm.c linux-3.1.3/drivers/usb/atm/usbatm.c
+--- linux-3.1.3/drivers/usb/atm/usbatm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/usb/atm/usbatm.c 2011-11-16 18:39:08.000000000 -0500
@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
if (printk_ratelimit())
atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
if (!left--) {
if (instance->disconnected)
-diff -urNp linux-3.1.1/drivers/usb/core/devices.c linux-3.1.1/drivers/usb/core/devices.c
---- linux-3.1.1/drivers/usb/core/devices.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/usb/core/devices.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/usb/core/devices.c linux-3.1.3/drivers/usb/core/devices.c
+--- linux-3.1.3/drivers/usb/core/devices.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/usb/core/devices.c 2011-11-16 18:39:08.000000000 -0500
@@ -126,7 +126,7 @@ static const char format_endpt[] =
* time it gets called.
*/
if (file->f_version != event_count) {
file->f_version = event_count;
return POLLIN | POLLRDNORM;
-diff -urNp linux-3.1.1/drivers/usb/core/message.c linux-3.1.1/drivers/usb/core/message.c
---- linux-3.1.1/drivers/usb/core/message.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/usb/core/message.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/usb/core/message.c linux-3.1.3/drivers/usb/core/message.c
+--- linux-3.1.3/drivers/usb/core/message.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/usb/core/message.c 2011-11-16 18:39:08.000000000 -0500
@@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device
buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
if (buf) {
if (!smallbuf)
return buf;
memcpy(smallbuf, buf, len);
-diff -urNp linux-3.1.1/drivers/usb/early/ehci-dbgp.c linux-3.1.1/drivers/usb/early/ehci-dbgp.c
---- linux-3.1.1/drivers/usb/early/ehci-dbgp.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/usb/early/ehci-dbgp.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/usb/early/ehci-dbgp.c linux-3.1.3/drivers/usb/early/ehci-dbgp.c
+--- linux-3.1.3/drivers/usb/early/ehci-dbgp.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/usb/early/ehci-dbgp.c 2011-11-16 18:39:08.000000000 -0500
@@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x,
#ifdef CONFIG_KGDB
return 0;
}
-diff -urNp linux-3.1.1/drivers/usb/host/xhci-mem.c linux-3.1.1/drivers/usb/host/xhci-mem.c
---- linux-3.1.1/drivers/usb/host/xhci-mem.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/usb/host/xhci-mem.c 2011-11-16 18:40:29.000000000 -0500
-@@ -1690,6 +1690,8 @@ static int xhci_check_trb_in_td_math(str
+diff -urNp linux-3.1.3/drivers/usb/host/xhci-mem.c linux-3.1.3/drivers/usb/host/xhci-mem.c
+--- linux-3.1.3/drivers/usb/host/xhci-mem.c 2011-11-26 19:57:29.000000000 -0500
++++ linux-3.1.3/drivers/usb/host/xhci-mem.c 2011-11-26 20:00:43.000000000 -0500
+@@ -1685,6 +1685,8 @@ static int xhci_check_trb_in_td_math(str
unsigned int num_tests;
int i, ret;
num_tests = ARRAY_SIZE(simple_test_vector);
for (i = 0; i < num_tests; i++) {
ret = xhci_test_trb_in_td(xhci,
-diff -urNp linux-3.1.1/drivers/usb/wusbcore/wa-hc.h linux-3.1.1/drivers/usb/wusbcore/wa-hc.h
---- linux-3.1.1/drivers/usb/wusbcore/wa-hc.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/usb/wusbcore/wa-hc.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/usb/wusbcore/wa-hc.h linux-3.1.3/drivers/usb/wusbcore/wa-hc.h
+--- linux-3.1.3/drivers/usb/wusbcore/wa-hc.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/usb/wusbcore/wa-hc.h 2011-11-16 18:39:08.000000000 -0500
@@ -192,7 +192,7 @@ struct wahc {
struct list_head xfer_delayed_list;
spinlock_t xfer_list_lock;
}
/**
-diff -urNp linux-3.1.1/drivers/usb/wusbcore/wa-xfer.c linux-3.1.1/drivers/usb/wusbcore/wa-xfer.c
---- linux-3.1.1/drivers/usb/wusbcore/wa-xfer.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/usb/wusbcore/wa-xfer.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/usb/wusbcore/wa-xfer.c linux-3.1.3/drivers/usb/wusbcore/wa-xfer.c
+--- linux-3.1.3/drivers/usb/wusbcore/wa-xfer.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/usb/wusbcore/wa-xfer.c 2011-11-16 18:39:08.000000000 -0500
@@ -295,7 +295,7 @@ out:
*/
static void wa_xfer_id_init(struct wa_xfer *xfer)
}
/*
-diff -urNp linux-3.1.1/drivers/vhost/vhost.c linux-3.1.1/drivers/vhost/vhost.c
---- linux-3.1.1/drivers/vhost/vhost.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/vhost/vhost.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/vhost/vhost.c linux-3.1.3/drivers/vhost/vhost.c
+--- linux-3.1.3/drivers/vhost/vhost.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/vhost/vhost.c 2011-11-16 18:39:08.000000000 -0500
@@ -629,7 +629,7 @@ static long vhost_set_memory(struct vhos
return 0;
}
{
struct file *eventfp, *filep = NULL,
*pollstart = NULL, *pollstop = NULL;
-diff -urNp linux-3.1.1/drivers/video/aty/aty128fb.c linux-3.1.1/drivers/video/aty/aty128fb.c
---- linux-3.1.1/drivers/video/aty/aty128fb.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/video/aty/aty128fb.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/video/aty/aty128fb.c linux-3.1.3/drivers/video/aty/aty128fb.c
+--- linux-3.1.3/drivers/video/aty/aty128fb.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/video/aty/aty128fb.c 2011-11-16 18:39:08.000000000 -0500
@@ -148,7 +148,7 @@ enum {
};
"AGP",
"PCI",
"PRO AGP",
-diff -urNp linux-3.1.1/drivers/video/fbcmap.c linux-3.1.1/drivers/video/fbcmap.c
---- linux-3.1.1/drivers/video/fbcmap.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/video/fbcmap.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/video/fbcmap.c linux-3.1.3/drivers/video/fbcmap.c
+--- linux-3.1.3/drivers/video/fbcmap.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/video/fbcmap.c 2011-11-16 18:39:08.000000000 -0500
@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user
rc = -ENODEV;
goto out;
rc = -EINVAL;
goto out1;
}
-diff -urNp linux-3.1.1/drivers/video/fbmem.c linux-3.1.1/drivers/video/fbmem.c
---- linux-3.1.1/drivers/video/fbmem.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/video/fbmem.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/drivers/video/fbmem.c linux-3.1.3/drivers/video/fbmem.c
+--- linux-3.1.3/drivers/video/fbmem.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/video/fbmem.c 2011-11-16 18:40:29.000000000 -0500
@@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_in
image->dx += image->width + 8;
}
return -EINVAL;
if (!registered_fb[con2fb.framebuffer])
request_module("fb%d", con2fb.framebuffer);
-diff -urNp linux-3.1.1/drivers/video/geode/gx1fb_core.c linux-3.1.1/drivers/video/geode/gx1fb_core.c
---- linux-3.1.1/drivers/video/geode/gx1fb_core.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/video/geode/gx1fb_core.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/video/geode/gx1fb_core.c linux-3.1.3/drivers/video/geode/gx1fb_core.c
+--- linux-3.1.3/drivers/video/geode/gx1fb_core.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/video/geode/gx1fb_core.c 2011-11-16 18:39:08.000000000 -0500
@@ -29,7 +29,7 @@ static int crt_option = 1;
static char panel_option[32] = "";
/* 640x480-60 VESA */
{ NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-diff -urNp linux-3.1.1/drivers/video/gxt4500.c linux-3.1.1/drivers/video/gxt4500.c
---- linux-3.1.1/drivers/video/gxt4500.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/video/gxt4500.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/video/gxt4500.c linux-3.1.3/drivers/video/gxt4500.c
+--- linux-3.1.3/drivers/video/gxt4500.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/video/gxt4500.c 2011-11-16 18:39:08.000000000 -0500
@@ -156,7 +156,7 @@ struct gxt4500_par {
static char *mode_option;
.id = "IBM GXT4500P",
.type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_PSEUDOCOLOR,
-diff -urNp linux-3.1.1/drivers/video/i810/i810_accel.c linux-3.1.1/drivers/video/i810/i810_accel.c
---- linux-3.1.1/drivers/video/i810/i810_accel.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/video/i810/i810_accel.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/video/i810/i810_accel.c linux-3.1.3/drivers/video/i810/i810_accel.c
+--- linux-3.1.3/drivers/video/i810/i810_accel.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/video/i810/i810_accel.c 2011-11-16 18:39:08.000000000 -0500
@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
}
}
i810_report_error(mmio);
par->dev_flags |= LOCKUP;
info->pixmap.scan_align = 1;
-diff -urNp linux-3.1.1/drivers/video/i810/i810_main.c linux-3.1.1/drivers/video/i810/i810_main.c
---- linux-3.1.1/drivers/video/i810/i810_main.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/video/i810/i810_main.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/video/i810/i810_main.c linux-3.1.3/drivers/video/i810/i810_main.c
+--- linux-3.1.3/drivers/video/i810/i810_main.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/video/i810/i810_main.c 2011-11-16 18:39:08.000000000 -0500
@@ -97,7 +97,7 @@ static int i810fb_blank (int blank_
static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par);
"Intel(R) 810 Framebuffer Device" ,
"Intel(R) 810-DC100 Framebuffer Device" ,
"Intel(R) 810E Framebuffer Device" ,
-diff -urNp linux-3.1.1/drivers/video/jz4740_fb.c linux-3.1.1/drivers/video/jz4740_fb.c
---- linux-3.1.1/drivers/video/jz4740_fb.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/video/jz4740_fb.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/video/jz4740_fb.c linux-3.1.3/drivers/video/jz4740_fb.c
+--- linux-3.1.3/drivers/video/jz4740_fb.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/video/jz4740_fb.c 2011-11-16 18:39:08.000000000 -0500
@@ -136,7 +136,7 @@ struct jzfb {
uint32_t pseudo_palette[16];
};
.id = "JZ4740 FB",
.type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_TRUECOLOR,
-diff -urNp linux-3.1.1/drivers/video/logo/logo_linux_clut224.ppm linux-3.1.1/drivers/video/logo/logo_linux_clut224.ppm
---- linux-3.1.1/drivers/video/logo/logo_linux_clut224.ppm 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/video/logo/logo_linux_clut224.ppm 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/drivers/video/logo/logo_linux_clut224.ppm linux-3.1.3/drivers/video/logo/logo_linux_clut224.ppm
+--- linux-3.1.3/drivers/video/logo/logo_linux_clut224.ppm 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/video/logo/logo_linux_clut224.ppm 2011-11-16 18:40:29.000000000 -0500
@@ -1,1604 +1,1123 @@
P3
-# Standard 224-color Linux logo
+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
+4 4 4 4 4 4
-diff -urNp linux-3.1.1/drivers/video/udlfb.c linux-3.1.1/drivers/video/udlfb.c
---- linux-3.1.1/drivers/video/udlfb.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/video/udlfb.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/video/udlfb.c linux-3.1.3/drivers/video/udlfb.c
+--- linux-3.1.3/drivers/video/udlfb.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/video/udlfb.c 2011-11-16 18:39:08.000000000 -0500
@@ -585,11 +585,11 @@ int dlfb_handle_damage(struct dlfb_data
dlfb_urb_completion(urb);
return count;
}
-diff -urNp linux-3.1.1/drivers/video/uvesafb.c linux-3.1.1/drivers/video/uvesafb.c
---- linux-3.1.1/drivers/video/uvesafb.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/video/uvesafb.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/video/uvesafb.c linux-3.1.3/drivers/video/uvesafb.c
+--- linux-3.1.3/drivers/video/uvesafb.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/video/uvesafb.c 2011-11-16 18:39:08.000000000 -0500
@@ -19,6 +19,7 @@
#include <linux/io.h>
#include <linux/mutex.h>
}
framebuffer_release(info);
-diff -urNp linux-3.1.1/drivers/video/vesafb.c linux-3.1.1/drivers/video/vesafb.c
---- linux-3.1.1/drivers/video/vesafb.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/video/vesafb.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/video/vesafb.c linux-3.1.3/drivers/video/vesafb.c
+--- linux-3.1.3/drivers/video/vesafb.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/video/vesafb.c 2011-11-16 18:39:08.000000000 -0500
@@ -9,6 +9,7 @@
*/
if (info->screen_base)
iounmap(info->screen_base);
framebuffer_release(info);
-diff -urNp linux-3.1.1/drivers/video/via/via_clock.h linux-3.1.1/drivers/video/via/via_clock.h
---- linux-3.1.1/drivers/video/via/via_clock.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/video/via/via_clock.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/video/via/via_clock.h linux-3.1.3/drivers/video/via/via_clock.h
+--- linux-3.1.3/drivers/video/via/via_clock.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/video/via/via_clock.h 2011-11-16 18:39:08.000000000 -0500
@@ -56,7 +56,7 @@ struct via_clock {
void (*set_engine_pll_state)(u8 state);
static inline u32 get_pll_internal_frequency(u32 ref_freq,
-diff -urNp linux-3.1.1/drivers/virtio/virtio_balloon.c linux-3.1.1/drivers/virtio/virtio_balloon.c
---- linux-3.1.1/drivers/virtio/virtio_balloon.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/virtio/virtio_balloon.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/drivers/virtio/virtio_balloon.c linux-3.1.3/drivers/virtio/virtio_balloon.c
+--- linux-3.1.3/drivers/virtio/virtio_balloon.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/virtio/virtio_balloon.c 2011-11-16 18:40:29.000000000 -0500
@@ -174,6 +174,8 @@ static void update_balloon_stats(struct
struct sysinfo i;
int idx = 0;
all_vm_events(events);
si_meminfo(&i);
-diff -urNp linux-3.1.1/drivers/xen/xen-pciback/conf_space.h linux-3.1.1/drivers/xen/xen-pciback/conf_space.h
---- linux-3.1.1/drivers/xen/xen-pciback/conf_space.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/drivers/xen/xen-pciback/conf_space.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/drivers/xen/xen-pciback/conf_space.h linux-3.1.3/drivers/xen/xen-pciback/conf_space.h
+--- linux-3.1.3/drivers/xen/xen-pciback/conf_space.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/drivers/xen/xen-pciback/conf_space.h 2011-11-16 18:39:08.000000000 -0500
@@ -44,15 +44,15 @@ struct config_field {
struct {
conf_dword_write write;
} u;
struct list_head list;
};
-diff -urNp linux-3.1.1/fs/9p/vfs_inode.c linux-3.1.1/fs/9p/vfs_inode.c
---- linux-3.1.1/fs/9p/vfs_inode.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/9p/vfs_inode.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/9p/vfs_inode.c linux-3.1.3/fs/9p/vfs_inode.c
+--- linux-3.1.3/fs/9p/vfs_inode.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/9p/vfs_inode.c 2011-11-16 18:39:08.000000000 -0500
@@ -1288,7 +1288,7 @@ static void *v9fs_vfs_follow_link(struct
void
v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
IS_ERR(s) ? "<error>" : s);
-diff -urNp linux-3.1.1/fs/aio.c linux-3.1.1/fs/aio.c
---- linux-3.1.1/fs/aio.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/aio.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/aio.c linux-3.1.3/fs/aio.c
+--- linux-3.1.3/fs/aio.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/aio.c 2011-11-16 18:40:29.000000000 -0500
@@ -119,7 +119,7 @@ static int aio_setup_ring(struct kioctx
size += sizeof(struct io_event) * nr_events;
nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
kiocb->ki_nr_segs = kiocb->ki_nbytes;
kiocb->ki_cur_seg = 0;
/* ki_nbytes/left now reflect bytes instead of segs */
-diff -urNp linux-3.1.1/fs/attr.c linux-3.1.1/fs/attr.c
---- linux-3.1.1/fs/attr.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/attr.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/attr.c linux-3.1.3/fs/attr.c
+--- linux-3.1.3/fs/attr.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/attr.c 2011-11-16 18:40:29.000000000 -0500
@@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode
unsigned long limit;
if (limit != RLIM_INFINITY && offset > limit)
goto out_sig;
if (offset > inode->i_sb->s_maxbytes)
-diff -urNp linux-3.1.1/fs/autofs4/waitq.c linux-3.1.1/fs/autofs4/waitq.c
---- linux-3.1.1/fs/autofs4/waitq.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/autofs4/waitq.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/autofs4/waitq.c linux-3.1.3/fs/autofs4/waitq.c
+--- linux-3.1.3/fs/autofs4/waitq.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/autofs4/waitq.c 2011-11-16 18:39:08.000000000 -0500
@@ -60,7 +60,7 @@ static int autofs4_write(struct file *fi
{
unsigned long sigpipe, flags;
ssize_t wr = 0;
/** WARNING: this is not safe for writing more than PIPE_BUF bytes! **/
-diff -urNp linux-3.1.1/fs/befs/linuxvfs.c linux-3.1.1/fs/befs/linuxvfs.c
---- linux-3.1.1/fs/befs/linuxvfs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/befs/linuxvfs.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/befs/linuxvfs.c linux-3.1.3/fs/befs/linuxvfs.c
+--- linux-3.1.3/fs/befs/linuxvfs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/befs/linuxvfs.c 2011-11-16 18:39:08.000000000 -0500
@@ -503,7 +503,7 @@ static void befs_put_link(struct dentry
{
befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
if (!IS_ERR(link))
kfree(link);
}
-diff -urNp linux-3.1.1/fs/binfmt_aout.c linux-3.1.1/fs/binfmt_aout.c
---- linux-3.1.1/fs/binfmt_aout.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/binfmt_aout.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/binfmt_aout.c linux-3.1.3/fs/binfmt_aout.c
+--- linux-3.1.3/fs/binfmt_aout.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/binfmt_aout.c 2011-11-16 18:40:29.000000000 -0500
@@ -16,6 +16,7 @@
#include <linux/string.h>
#include <linux/fs.h>
MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
fd_offset + ex.a_text);
up_write(¤t->mm->mmap_sem);
-diff -urNp linux-3.1.1/fs/binfmt_elf.c linux-3.1.1/fs/binfmt_elf.c
---- linux-3.1.1/fs/binfmt_elf.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/binfmt_elf.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/binfmt_elf.c linux-3.1.3/fs/binfmt_elf.c
+--- linux-3.1.3/fs/binfmt_elf.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/binfmt_elf.c 2011-11-16 18:40:29.000000000 -0500
@@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump
#define elf_core_dump NULL
#endif
static int __init init_elf_binfmt(void)
{
return register_binfmt(&elf_format);
-diff -urNp linux-3.1.1/fs/binfmt_flat.c linux-3.1.1/fs/binfmt_flat.c
---- linux-3.1.1/fs/binfmt_flat.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/binfmt_flat.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/binfmt_flat.c linux-3.1.3/fs/binfmt_flat.c
+--- linux-3.1.3/fs/binfmt_flat.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/binfmt_flat.c 2011-11-16 18:39:08.000000000 -0500
@@ -567,7 +567,9 @@ static int load_flat_file(struct linux_b
realdatastart = (unsigned long) -ENOMEM;
printk("Unable to allocate RAM for process data, errno %d\n",
ret = result;
goto err;
}
-diff -urNp linux-3.1.1/fs/bio.c linux-3.1.1/fs/bio.c
---- linux-3.1.1/fs/bio.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/bio.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/bio.c linux-3.1.3/fs/bio.c
+--- linux-3.1.3/fs/bio.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/bio.c 2011-11-16 18:39:08.000000000 -0500
@@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct b
const int read = bio_data_dir(bio) == READ;
struct bio_map_data *bmd = bio->bi_private;
__bio_for_each_segment(bvec, bio, i, 0) {
char *addr = page_address(bvec->bv_page);
-diff -urNp linux-3.1.1/fs/block_dev.c linux-3.1.1/fs/block_dev.c
---- linux-3.1.1/fs/block_dev.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/block_dev.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/block_dev.c linux-3.1.3/fs/block_dev.c
+--- linux-3.1.3/fs/block_dev.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/block_dev.c 2011-11-16 18:39:08.000000000 -0500
@@ -681,7 +681,7 @@ static bool bd_may_claim(struct block_de
else if (bdev->bd_contains == bdev)
return true; /* is a whole device which isn't held */
return true; /* is a partition of a device that is being partitioned */
else if (whole->bd_holder != NULL)
return false; /* is a partition of a held device */
-diff -urNp linux-3.1.1/fs/btrfs/ctree.c linux-3.1.1/fs/btrfs/ctree.c
---- linux-3.1.1/fs/btrfs/ctree.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/btrfs/ctree.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/btrfs/ctree.c linux-3.1.3/fs/btrfs/ctree.c
+--- linux-3.1.3/fs/btrfs/ctree.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/btrfs/ctree.c 2011-11-16 18:39:08.000000000 -0500
@@ -488,9 +488,12 @@ static noinline int __btrfs_cow_block(st
free_extent_buffer(buf);
add_root_to_dirty_list(root);
parent_start = 0;
WARN_ON(trans->transid != btrfs_header_generation(parent));
-diff -urNp linux-3.1.1/fs/btrfs/inode.c linux-3.1.1/fs/btrfs/inode.c
---- linux-3.1.1/fs/btrfs/inode.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/btrfs/inode.c 2011-11-17 18:12:11.000000000 -0500
+diff -urNp linux-3.1.3/fs/btrfs/inode.c linux-3.1.3/fs/btrfs/inode.c
+--- linux-3.1.3/fs/btrfs/inode.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/btrfs/inode.c 2011-11-17 18:12:11.000000000 -0500
@@ -6922,7 +6922,7 @@ fail:
return -ENOMEM;
}
/*
* If a file is moved, it will inherit the cow and compression flags of the new
* directory.
-diff -urNp linux-3.1.1/fs/btrfs/ioctl.c linux-3.1.1/fs/btrfs/ioctl.c
---- linux-3.1.1/fs/btrfs/ioctl.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/btrfs/ioctl.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/btrfs/ioctl.c linux-3.1.3/fs/btrfs/ioctl.c
+--- linux-3.1.3/fs/btrfs/ioctl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/btrfs/ioctl.c 2011-11-16 18:40:29.000000000 -0500
@@ -2704,9 +2704,12 @@ long btrfs_ioctl_space_info(struct btrfs
for (i = 0; i < num_types; i++) {
struct btrfs_space_info *tmp;
(arg + sizeof(struct btrfs_ioctl_space_args));
if (copy_to_user(user_dest, dest_orig, alloc_size))
-diff -urNp linux-3.1.1/fs/btrfs/relocation.c linux-3.1.1/fs/btrfs/relocation.c
---- linux-3.1.1/fs/btrfs/relocation.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/btrfs/relocation.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/btrfs/relocation.c linux-3.1.3/fs/btrfs/relocation.c
+--- linux-3.1.3/fs/btrfs/relocation.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/btrfs/relocation.c 2011-11-16 18:39:08.000000000 -0500
@@ -1242,7 +1242,7 @@ static int __update_reloc_root(struct bt
}
spin_unlock(&rc->reloc_root_tree.lock);
if (!del) {
spin_lock(&rc->reloc_root_tree.lock);
-diff -urNp linux-3.1.1/fs/cachefiles/bind.c linux-3.1.1/fs/cachefiles/bind.c
---- linux-3.1.1/fs/cachefiles/bind.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/cachefiles/bind.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/cachefiles/bind.c linux-3.1.3/fs/cachefiles/bind.c
+--- linux-3.1.3/fs/cachefiles/bind.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/cachefiles/bind.c 2011-11-16 18:39:08.000000000 -0500
@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
args);
cache->bcull_percent < cache->brun_percent &&
cache->brun_percent < 100);
-diff -urNp linux-3.1.1/fs/cachefiles/daemon.c linux-3.1.1/fs/cachefiles/daemon.c
---- linux-3.1.1/fs/cachefiles/daemon.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/cachefiles/daemon.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/cachefiles/daemon.c linux-3.1.3/fs/cachefiles/daemon.c
+--- linux-3.1.3/fs/cachefiles/daemon.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/cachefiles/daemon.c 2011-11-16 18:39:08.000000000 -0500
@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st
if (n > buflen)
return -EMSGSIZE;
return cachefiles_daemon_range_error(cache, args);
cache->bstop_percent = bstop;
-diff -urNp linux-3.1.1/fs/cachefiles/internal.h linux-3.1.1/fs/cachefiles/internal.h
---- linux-3.1.1/fs/cachefiles/internal.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/cachefiles/internal.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/cachefiles/internal.h linux-3.1.3/fs/cachefiles/internal.h
+--- linux-3.1.3/fs/cachefiles/internal.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/cachefiles/internal.h 2011-11-16 18:39:08.000000000 -0500
@@ -57,7 +57,7 @@ struct cachefiles_cache {
wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
struct rb_root active_nodes; /* active nodes (can't be culled) */
}
#else
-diff -urNp linux-3.1.1/fs/cachefiles/namei.c linux-3.1.1/fs/cachefiles/namei.c
---- linux-3.1.1/fs/cachefiles/namei.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/cachefiles/namei.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/cachefiles/namei.c linux-3.1.3/fs/cachefiles/namei.c
+--- linux-3.1.3/fs/cachefiles/namei.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/cachefiles/namei.c 2011-11-16 18:39:08.000000000 -0500
@@ -318,7 +318,7 @@ try_again:
/* first step is to make up a grave dentry in the graveyard */
sprintf(nbuffer, "%08x%08x",
/* do the multiway lock magic */
trap = lock_rename(cache->graveyard, dir);
-diff -urNp linux-3.1.1/fs/cachefiles/proc.c linux-3.1.1/fs/cachefiles/proc.c
---- linux-3.1.1/fs/cachefiles/proc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/cachefiles/proc.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/cachefiles/proc.c linux-3.1.3/fs/cachefiles/proc.c
+--- linux-3.1.3/fs/cachefiles/proc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/cachefiles/proc.c 2011-11-16 18:39:08.000000000 -0500
@@ -14,9 +14,9 @@
#include <linux/seq_file.h>
#include "internal.h"
if (x == 0 && y == 0 && z == 0)
return 0;
-diff -urNp linux-3.1.1/fs/cachefiles/rdwr.c linux-3.1.1/fs/cachefiles/rdwr.c
---- linux-3.1.1/fs/cachefiles/rdwr.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/cachefiles/rdwr.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/cachefiles/rdwr.c linux-3.1.3/fs/cachefiles/rdwr.c
+--- linux-3.1.3/fs/cachefiles/rdwr.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/cachefiles/rdwr.c 2011-11-16 18:39:08.000000000 -0500
@@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache
old_fs = get_fs();
set_fs(KERNEL_DS);
set_fs(old_fs);
kunmap(page);
if (ret != len)
-diff -urNp linux-3.1.1/fs/ceph/dir.c linux-3.1.1/fs/ceph/dir.c
---- linux-3.1.1/fs/ceph/dir.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ceph/dir.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/ceph/dir.c linux-3.1.3/fs/ceph/dir.c
+--- linux-3.1.3/fs/ceph/dir.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ceph/dir.c 2011-11-16 18:39:08.000000000 -0500
@@ -244,7 +244,7 @@ static int ceph_readdir(struct file *fil
struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
struct ceph_mds_client *mdsc = fsc->mdsc;
int err;
u32 ftype;
struct ceph_mds_reply_info_parsed *rinfo;
-diff -urNp linux-3.1.1/fs/cifs/cifs_debug.c linux-3.1.1/fs/cifs/cifs_debug.c
---- linux-3.1.1/fs/cifs/cifs_debug.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/cifs/cifs_debug.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/cifs/cifs_debug.c linux-3.1.3/fs/cifs/cifs_debug.c
+--- linux-3.1.3/fs/cifs/cifs_debug.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/cifs/cifs_debug.c 2011-11-16 18:39:08.000000000 -0500
@@ -265,8 +265,8 @@ static ssize_t cifs_stats_proc_write(str
if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
}
}
}
-diff -urNp linux-3.1.1/fs/cifs/cifsfs.c linux-3.1.1/fs/cifs/cifsfs.c
---- linux-3.1.1/fs/cifs/cifsfs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/cifs/cifsfs.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/cifs/cifsfs.c linux-3.1.3/fs/cifs/cifsfs.c
+--- linux-3.1.3/fs/cifs/cifsfs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/cifs/cifsfs.c 2011-11-16 18:39:08.000000000 -0500
@@ -981,7 +981,7 @@ cifs_init_request_bufs(void)
cifs_req_cachep = kmem_cache_create("cifs_request",
CIFSMaxBufSize +
#endif /* CONFIG_CIFS_STATS2 */
atomic_set(&midCount, 0);
-diff -urNp linux-3.1.1/fs/cifs/cifsglob.h linux-3.1.1/fs/cifs/cifsglob.h
---- linux-3.1.1/fs/cifs/cifsglob.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/cifs/cifsglob.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/cifs/cifsglob.h linux-3.1.3/fs/cifs/cifsglob.h
+--- linux-3.1.3/fs/cifs/cifsglob.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/cifs/cifsglob.h 2011-11-16 18:39:08.000000000 -0500
@@ -381,28 +381,28 @@ struct cifs_tcon {
__u16 Flags; /* optional support bits */
enum statusEnum tidStatus;
#endif
GLOBAL_EXTERN atomic_t smBufAllocCount;
GLOBAL_EXTERN atomic_t midCount;
-diff -urNp linux-3.1.1/fs/cifs/link.c linux-3.1.1/fs/cifs/link.c
---- linux-3.1.1/fs/cifs/link.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/cifs/link.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/cifs/link.c linux-3.1.3/fs/cifs/link.c
+--- linux-3.1.3/fs/cifs/link.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/cifs/link.c 2011-11-16 18:39:08.000000000 -0500
@@ -593,7 +593,7 @@ symlink_exit:
void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
if (!IS_ERR(p))
kfree(p);
}
-diff -urNp linux-3.1.1/fs/cifs/misc.c linux-3.1.1/fs/cifs/misc.c
---- linux-3.1.1/fs/cifs/misc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/cifs/misc.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/cifs/misc.c linux-3.1.3/fs/cifs/misc.c
+--- linux-3.1.3/fs/cifs/misc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/cifs/misc.c 2011-11-16 18:39:08.000000000 -0500
@@ -156,7 +156,7 @@ cifs_buf_get(void)
memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
atomic_inc(&bufAllocCount);
#endif /* CONFIG_CIFS_STATS2 */
}
-diff -urNp linux-3.1.1/fs/coda/cache.c linux-3.1.1/fs/coda/cache.c
---- linux-3.1.1/fs/coda/cache.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/coda/cache.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/coda/cache.c linux-3.1.3/fs/coda/cache.c
+--- linux-3.1.3/fs/coda/cache.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/coda/cache.c 2011-11-16 18:39:08.000000000 -0500
@@ -24,7 +24,7 @@
#include "coda_linux.h"
#include "coda_cache.h"
spin_unlock(&cii->c_lock);
return hit;
-diff -urNp linux-3.1.1/fs/compat_binfmt_elf.c linux-3.1.1/fs/compat_binfmt_elf.c
---- linux-3.1.1/fs/compat_binfmt_elf.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/compat_binfmt_elf.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/compat_binfmt_elf.c linux-3.1.3/fs/compat_binfmt_elf.c
+--- linux-3.1.3/fs/compat_binfmt_elf.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/compat_binfmt_elf.c 2011-11-16 18:39:08.000000000 -0500
@@ -30,11 +30,13 @@
#undef elf_phdr
#undef elf_shdr
#define elf_addr_t Elf32_Addr
/*
-diff -urNp linux-3.1.1/fs/compat.c linux-3.1.1/fs/compat.c
---- linux-3.1.1/fs/compat.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/compat.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/compat.c linux-3.1.3/fs/compat.c
+--- linux-3.1.3/fs/compat.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/compat.c 2011-11-16 18:40:29.000000000 -0500
@@ -133,8 +133,8 @@ asmlinkage long compat_sys_utimes(const
static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
{
if (n < 0)
goto out_nofds;
-diff -urNp linux-3.1.1/fs/compat_ioctl.c linux-3.1.1/fs/compat_ioctl.c
---- linux-3.1.1/fs/compat_ioctl.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/compat_ioctl.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/compat_ioctl.c linux-3.1.3/fs/compat_ioctl.c
+--- linux-3.1.3/fs/compat_ioctl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/compat_ioctl.c 2011-11-16 18:39:08.000000000 -0500
@@ -210,6 +210,8 @@ static int do_video_set_spu_palette(unsi
err = get_user(palp, &up->palette);
if (a > b)
return 1;
if (a < b)
-diff -urNp linux-3.1.1/fs/configfs/dir.c linux-3.1.1/fs/configfs/dir.c
---- linux-3.1.1/fs/configfs/dir.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/configfs/dir.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/configfs/dir.c linux-3.1.3/fs/configfs/dir.c
+--- linux-3.1.3/fs/configfs/dir.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/configfs/dir.c 2011-11-16 18:39:08.000000000 -0500
@@ -1575,7 +1575,8 @@ static int configfs_readdir(struct file
}
for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
/*
* We'll have a dentry and an inode for
-diff -urNp linux-3.1.1/fs/dcache.c linux-3.1.1/fs/dcache.c
---- linux-3.1.1/fs/dcache.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/dcache.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/dcache.c linux-3.1.3/fs/dcache.c
+--- linux-3.1.3/fs/dcache.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/dcache.c 2011-11-16 18:39:08.000000000 -0500
@@ -2998,7 +2998,7 @@ void __init vfs_caches_init(unsigned lon
mempages -= reserve;
dcache_init();
inode_init();
-diff -urNp linux-3.1.1/fs/ecryptfs/inode.c linux-3.1.1/fs/ecryptfs/inode.c
---- linux-3.1.1/fs/ecryptfs/inode.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ecryptfs/inode.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/ecryptfs/inode.c linux-3.1.3/fs/ecryptfs/inode.c
+--- linux-3.1.3/fs/ecryptfs/inode.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ecryptfs/inode.c 2011-11-16 18:39:08.000000000 -0500
@@ -681,7 +681,7 @@ static int ecryptfs_readlink_lower(struc
old_fs = get_fs();
set_fs(get_ds());
if (!IS_ERR(buf)) {
/* Free the char* */
kfree(buf);
-diff -urNp linux-3.1.1/fs/ecryptfs/miscdev.c linux-3.1.1/fs/ecryptfs/miscdev.c
---- linux-3.1.1/fs/ecryptfs/miscdev.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ecryptfs/miscdev.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/ecryptfs/miscdev.c linux-3.1.3/fs/ecryptfs/miscdev.c
+--- linux-3.1.3/fs/ecryptfs/miscdev.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ecryptfs/miscdev.c 2011-11-16 18:39:08.000000000 -0500
@@ -328,7 +328,7 @@ check_list:
goto out_unlock_msg_ctx;
i = 5;
goto out_unlock_msg_ctx;
i += packet_length_size;
if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
-diff -urNp linux-3.1.1/fs/ecryptfs/read_write.c linux-3.1.1/fs/ecryptfs/read_write.c
---- linux-3.1.1/fs/ecryptfs/read_write.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ecryptfs/read_write.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/ecryptfs/read_write.c linux-3.1.3/fs/ecryptfs/read_write.c
+--- linux-3.1.3/fs/ecryptfs/read_write.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ecryptfs/read_write.c 2011-11-16 18:39:08.000000000 -0500
@@ -48,7 +48,7 @@ int ecryptfs_write_lower(struct inode *e
return -EIO;
fs_save = get_fs();
set_fs(fs_save);
return rc;
}
-diff -urNp linux-3.1.1/fs/exec.c linux-3.1.1/fs/exec.c
---- linux-3.1.1/fs/exec.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/exec.c 2011-11-17 18:40:47.000000000 -0500
+diff -urNp linux-3.1.3/fs/exec.c linux-3.1.3/fs/exec.c
+--- linux-3.1.3/fs/exec.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/exec.c 2011-11-17 18:40:47.000000000 -0500
@@ -55,12 +55,24 @@
#include <linux/pipe_fs_i.h>
#include <linux/oom.h>
}
EXPORT_SYMBOL(dump_write);
-diff -urNp linux-3.1.1/fs/ext2/balloc.c linux-3.1.1/fs/ext2/balloc.c
---- linux-3.1.1/fs/ext2/balloc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ext2/balloc.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/ext2/balloc.c linux-3.1.3/fs/ext2/balloc.c
+--- linux-3.1.3/fs/ext2/balloc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ext2/balloc.c 2011-11-16 18:40:29.000000000 -0500
@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
sbi->s_resuid != current_fsuid() &&
(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
return 0;
-diff -urNp linux-3.1.1/fs/ext3/balloc.c linux-3.1.1/fs/ext3/balloc.c
---- linux-3.1.1/fs/ext3/balloc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ext3/balloc.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/ext3/balloc.c linux-3.1.3/fs/ext3/balloc.c
+--- linux-3.1.3/fs/ext3/balloc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ext3/balloc.c 2011-11-16 18:40:29.000000000 -0500
@@ -1446,7 +1446,7 @@ static int ext3_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
sbi->s_resuid != current_fsuid() &&
(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
return 0;
-diff -urNp linux-3.1.1/fs/ext4/balloc.c linux-3.1.1/fs/ext4/balloc.c
---- linux-3.1.1/fs/ext4/balloc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ext4/balloc.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/ext4/balloc.c linux-3.1.3/fs/ext4/balloc.c
+--- linux-3.1.3/fs/ext4/balloc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ext4/balloc.c 2011-11-16 18:40:29.000000000 -0500
@@ -394,8 +394,8 @@ static int ext4_has_free_blocks(struct e
/* Hm, nope. Are (enough) root reserved blocks available? */
if (sbi->s_resuid == current_fsuid() ||
if (free_blocks >= (nblocks + dirty_blocks))
return 1;
-diff -urNp linux-3.1.1/fs/ext4/ext4.h linux-3.1.1/fs/ext4/ext4.h
---- linux-3.1.1/fs/ext4/ext4.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ext4/ext4.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/ext4/ext4.h linux-3.1.3/fs/ext4/ext4.h
+--- linux-3.1.3/fs/ext4/ext4.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ext4/ext4.h 2011-11-16 18:39:08.000000000 -0500
@@ -1180,19 +1180,19 @@ struct ext4_sb_info {
unsigned long s_mb_last_start;
atomic_t s_lock_busy;
/* locality groups */
-diff -urNp linux-3.1.1/fs/ext4/file.c linux-3.1.1/fs/ext4/file.c
---- linux-3.1.1/fs/ext4/file.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ext4/file.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/ext4/file.c linux-3.1.3/fs/ext4/file.c
+--- linux-3.1.3/fs/ext4/file.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ext4/file.c 2011-11-16 18:40:29.000000000 -0500
@@ -181,8 +181,8 @@ static int ext4_file_open(struct inode *
path.dentry = mnt->mnt_root;
cp = d_path(&path, buf, sizeof(buf));
ext4_mark_super_dirty(sb);
}
}
-diff -urNp linux-3.1.1/fs/ext4/ioctl.c linux-3.1.1/fs/ext4/ioctl.c
---- linux-3.1.1/fs/ext4/ioctl.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ext4/ioctl.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/ext4/ioctl.c linux-3.1.3/fs/ext4/ioctl.c
+--- linux-3.1.3/fs/ext4/ioctl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ext4/ioctl.c 2011-11-16 18:39:08.000000000 -0500
@@ -348,7 +348,7 @@ mext_out:
if (!blk_queue_discard(q))
return -EOPNOTSUPP;
sizeof(range)))
return -EFAULT;
-diff -urNp linux-3.1.1/fs/ext4/mballoc.c linux-3.1.1/fs/ext4/mballoc.c
---- linux-3.1.1/fs/ext4/mballoc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ext4/mballoc.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/ext4/mballoc.c linux-3.1.3/fs/ext4/mballoc.c
+--- linux-3.1.3/fs/ext4/mballoc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ext4/mballoc.c 2011-11-16 18:40:29.000000000 -0500
@@ -1795,7 +1795,7 @@ void ext4_mb_simple_scan_group(struct ex
BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
return 0;
-diff -urNp linux-3.1.1/fs/fcntl.c linux-3.1.1/fs/fcntl.c
---- linux-3.1.1/fs/fcntl.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/fcntl.c 2011-11-16 23:40:25.000000000 -0500
+diff -urNp linux-3.1.3/fs/fcntl.c linux-3.1.3/fs/fcntl.c
+--- linux-3.1.3/fs/fcntl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/fcntl.c 2011-11-16 23:40:25.000000000 -0500
@@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct
if (err)
return err;
if (arg >= rlimit(RLIMIT_NOFILE))
break;
err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
-diff -urNp linux-3.1.1/fs/fifo.c linux-3.1.1/fs/fifo.c
---- linux-3.1.1/fs/fifo.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/fifo.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/fifo.c linux-3.1.3/fs/fifo.c
+--- linux-3.1.3/fs/fifo.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/fifo.c 2011-11-16 18:39:08.000000000 -0500
@@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode
*/
filp->f_op = &read_pipefifo_fops;
free_pipe_info(inode);
err_nocleanup:
-diff -urNp linux-3.1.1/fs/file.c linux-3.1.1/fs/file.c
---- linux-3.1.1/fs/file.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/file.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/file.c linux-3.1.3/fs/file.c
+--- linux-3.1.3/fs/file.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/file.c 2011-11-16 18:40:29.000000000 -0500
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
if (nr >= rlimit(RLIMIT_NOFILE))
return -EMFILE;
-diff -urNp linux-3.1.1/fs/filesystems.c linux-3.1.1/fs/filesystems.c
---- linux-3.1.1/fs/filesystems.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/filesystems.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/filesystems.c linux-3.1.3/fs/filesystems.c
+--- linux-3.1.3/fs/filesystems.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/filesystems.c 2011-11-16 18:40:29.000000000 -0500
@@ -274,7 +274,12 @@ struct file_system_type *get_fs_type(con
int len = dot ? dot - name : strlen(name);
fs = __get_fs_type(name, len);
if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
-diff -urNp linux-3.1.1/fs/fscache/cookie.c linux-3.1.1/fs/fscache/cookie.c
---- linux-3.1.1/fs/fscache/cookie.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/fscache/cookie.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/fscache/cookie.c linux-3.1.3/fs/fscache/cookie.c
+--- linux-3.1.3/fs/fscache/cookie.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/fscache/cookie.c 2011-11-16 18:39:08.000000000 -0500
@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire
parent ? (char *) parent->def->name : "<no-parent>",
def->name, netfs_data);
wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
fscache_wait_bit, TASK_UNINTERRUPTIBLE);
}
-diff -urNp linux-3.1.1/fs/fscache/internal.h linux-3.1.1/fs/fscache/internal.h
---- linux-3.1.1/fs/fscache/internal.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/fscache/internal.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/fscache/internal.h linux-3.1.3/fs/fscache/internal.h
+--- linux-3.1.3/fs/fscache/internal.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/fscache/internal.h 2011-11-16 18:39:08.000000000 -0500
@@ -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];
#define fscache_stat_d(stat) do {} while (0)
#endif
-diff -urNp linux-3.1.1/fs/fscache/object.c linux-3.1.1/fs/fscache/object.c
---- linux-3.1.1/fs/fscache/object.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/fscache/object.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/fscache/object.c linux-3.1.3/fs/fscache/object.c
+--- linux-3.1.3/fs/fscache/object.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/fscache/object.c 2011-11-16 18:39:08.000000000 -0500
@@ -128,7 +128,7 @@ static void fscache_object_state_machine
/* update the object metadata on disk */
case FSCACHE_OBJECT_UPDATING:
break;
default:
-diff -urNp linux-3.1.1/fs/fscache/operation.c linux-3.1.1/fs/fscache/operation.c
---- linux-3.1.1/fs/fscache/operation.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/fscache/operation.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/fscache/operation.c linux-3.1.3/fs/fscache/operation.c
+--- linux-3.1.3/fs/fscache/operation.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/fscache/operation.c 2011-11-16 18:39:08.000000000 -0500
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include "internal.h"
ASSERTCMP(atomic_read(&op->usage), ==, 0);
-diff -urNp linux-3.1.1/fs/fscache/page.c linux-3.1.1/fs/fscache/page.c
---- linux-3.1.1/fs/fscache/page.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/fscache/page.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/fscache/page.c linux-3.1.3/fs/fscache/page.c
+--- linux-3.1.3/fs/fscache/page.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/fscache/page.c 2011-11-16 18:39:08.000000000 -0500
@@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct
val = radix_tree_lookup(&cookie->stores, page->index);
if (!val) {
#endif
for (loop = 0; loop < pagevec->nr; loop++) {
-diff -urNp linux-3.1.1/fs/fscache/stats.c linux-3.1.1/fs/fscache/stats.c
---- linux-3.1.1/fs/fscache/stats.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/fscache/stats.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/fscache/stats.c linux-3.1.3/fs/fscache/stats.c
+--- linux-3.1.3/fs/fscache/stats.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/fscache/stats.c 2011-11-16 18:39:08.000000000 -0500
@@ -18,95 +18,95 @@
/*
* operation counters
seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
atomic_read(&fscache_n_cop_alloc_object),
-diff -urNp linux-3.1.1/fs/fs_struct.c linux-3.1.1/fs/fs_struct.c
---- linux-3.1.1/fs/fs_struct.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/fs_struct.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/fs_struct.c linux-3.1.3/fs/fs_struct.c
+--- linux-3.1.3/fs/fs_struct.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/fs_struct.c 2011-11-16 18:40:29.000000000 -0500
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
spin_unlock(&fs->lock);
task_unlock(current);
-diff -urNp linux-3.1.1/fs/fuse/cuse.c linux-3.1.1/fs/fuse/cuse.c
---- linux-3.1.1/fs/fuse/cuse.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/fuse/cuse.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/fuse/cuse.c linux-3.1.3/fs/fuse/cuse.c
+--- linux-3.1.3/fs/fuse/cuse.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/fuse/cuse.c 2011-11-16 18:39:08.000000000 -0500
@@ -586,10 +586,12 @@ static int __init cuse_init(void)
INIT_LIST_HEAD(&cuse_conntbl[i]);
cuse_class = class_create(THIS_MODULE, "cuse");
if (IS_ERR(cuse_class))
-diff -urNp linux-3.1.1/fs/fuse/dev.c linux-3.1.1/fs/fuse/dev.c
---- linux-3.1.1/fs/fuse/dev.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/fuse/dev.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/fuse/dev.c linux-3.1.3/fs/fuse/dev.c
+--- linux-3.1.3/fs/fuse/dev.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/fuse/dev.c 2011-11-16 18:39:08.000000000 -0500
@@ -1242,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(stru
ret = 0;
pipe_lock(pipe);
send_sig(SIGPIPE, current, 0);
if (!ret)
ret = -EPIPE;
-diff -urNp linux-3.1.1/fs/fuse/dir.c linux-3.1.1/fs/fuse/dir.c
---- linux-3.1.1/fs/fuse/dir.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/fuse/dir.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/fuse/dir.c linux-3.1.3/fs/fuse/dir.c
+--- linux-3.1.3/fs/fuse/dir.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/fuse/dir.c 2011-11-16 18:39:08.000000000 -0500
@@ -1147,7 +1147,7 @@ static char *read_link(struct dentry *de
return link;
}
{
if (!IS_ERR(link))
free_page((unsigned long) link);
-diff -urNp linux-3.1.1/fs/gfs2/inode.c linux-3.1.1/fs/gfs2/inode.c
---- linux-3.1.1/fs/gfs2/inode.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/gfs2/inode.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/gfs2/inode.c linux-3.1.3/fs/gfs2/inode.c
+--- linux-3.1.3/fs/gfs2/inode.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/gfs2/inode.c 2011-11-16 18:39:08.000000000 -0500
@@ -1517,7 +1517,7 @@ out:
static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
if (!IS_ERR(s))
kfree(s);
}
-diff -urNp linux-3.1.1/fs/hfsplus/catalog.c linux-3.1.1/fs/hfsplus/catalog.c
---- linux-3.1.1/fs/hfsplus/catalog.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/hfsplus/catalog.c 2011-11-16 19:23:09.000000000 -0500
+diff -urNp linux-3.1.3/fs/hfs/btree.c linux-3.1.3/fs/hfs/btree.c
+--- linux-3.1.3/fs/hfs/btree.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/hfs/btree.c 2011-11-18 18:48:11.000000000 -0500
+@@ -46,11 +46,27 @@ struct hfs_btree *hfs_btree_open(struct
+ case HFS_EXT_CNID:
+ hfs_inode_read_fork(tree->inode, mdb->drXTExtRec, mdb->drXTFlSize,
+ mdb->drXTFlSize, be32_to_cpu(mdb->drXTClpSiz));
++
++ if (HFS_I(tree->inode)->alloc_blocks >
++ HFS_I(tree->inode)->first_blocks) {
++ printk(KERN_ERR "hfs: invalid btree extent records\n");
++ unlock_new_inode(tree->inode);
++ goto free_inode;
++ }
++
+ tree->inode->i_mapping->a_ops = &hfs_btree_aops;
+ break;
+ case HFS_CAT_CNID:
+ hfs_inode_read_fork(tree->inode, mdb->drCTExtRec, mdb->drCTFlSize,
+ mdb->drCTFlSize, be32_to_cpu(mdb->drCTClpSiz));
++
++ if (!HFS_I(tree->inode)->first_blocks) {
++ printk(KERN_ERR "hfs: invalid btree extent records "
++ "(0 size).\n");
++ unlock_new_inode(tree->inode);
++ goto free_inode;
++ }
++
+ tree->inode->i_mapping->a_ops = &hfs_btree_aops;
+ break;
+ default:
+@@ -59,11 +75,6 @@ struct hfs_btree *hfs_btree_open(struct
+ }
+ unlock_new_inode(tree->inode);
+
+- if (!HFS_I(tree->inode)->first_blocks) {
+- printk(KERN_ERR "hfs: invalid btree extent records (0 size).\n");
+- goto free_inode;
+- }
+-
+ mapping = tree->inode->i_mapping;
+ page = read_mapping_page(mapping, 0, NULL);
+ if (IS_ERR(page))
+diff -urNp linux-3.1.3/fs/hfsplus/catalog.c linux-3.1.3/fs/hfsplus/catalog.c
+--- linux-3.1.3/fs/hfsplus/catalog.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/hfsplus/catalog.c 2011-11-16 19:23:09.000000000 -0500
@@ -179,6 +179,8 @@ int hfsplus_find_cat(struct super_block
int err;
u16 type;
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-3.1.1/fs/hfsplus/dir.c linux-3.1.1/fs/hfsplus/dir.c
---- linux-3.1.1/fs/hfsplus/dir.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/hfsplus/dir.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/hfsplus/dir.c linux-3.1.3/fs/hfsplus/dir.c
+--- linux-3.1.3/fs/hfsplus/dir.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/hfsplus/dir.c 2011-11-16 18:40:29.000000000 -0500
@@ -131,6 +131,8 @@ static int hfsplus_readdir(struct file *
struct hfsplus_readdir_data *rd;
u16 type;
if (filp->f_pos >= inode->i_size)
return 0;
-diff -urNp linux-3.1.1/fs/hfsplus/inode.c linux-3.1.1/fs/hfsplus/inode.c
---- linux-3.1.1/fs/hfsplus/inode.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/hfsplus/inode.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/hfsplus/inode.c linux-3.1.3/fs/hfsplus/inode.c
+--- linux-3.1.3/fs/hfsplus/inode.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/hfsplus/inode.c 2011-11-16 18:40:29.000000000 -0500
@@ -501,6 +501,8 @@ int hfsplus_cat_read_inode(struct inode
int res = 0;
u16 type;
if (HFSPLUS_IS_RSRC(inode))
main_inode = HFSPLUS_I(inode)->rsrc_inode;
-diff -urNp linux-3.1.1/fs/hfsplus/ioctl.c linux-3.1.1/fs/hfsplus/ioctl.c
---- linux-3.1.1/fs/hfsplus/ioctl.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/hfsplus/ioctl.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/hfsplus/ioctl.c linux-3.1.3/fs/hfsplus/ioctl.c
+--- linux-3.1.3/fs/hfsplus/ioctl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/hfsplus/ioctl.c 2011-11-16 18:40:29.000000000 -0500
@@ -122,6 +122,8 @@ int hfsplus_setxattr(struct dentry *dent
struct hfsplus_cat_file *file;
int res;
if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
return -EOPNOTSUPP;
-diff -urNp linux-3.1.1/fs/hfsplus/super.c linux-3.1.1/fs/hfsplus/super.c
---- linux-3.1.1/fs/hfsplus/super.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/hfsplus/super.c 2011-11-16 19:23:30.000000000 -0500
+diff -urNp linux-3.1.3/fs/hfsplus/super.c linux-3.1.3/fs/hfsplus/super.c
+--- linux-3.1.3/fs/hfsplus/super.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/hfsplus/super.c 2011-11-16 19:23:30.000000000 -0500
@@ -347,6 +347,8 @@ static int hfsplus_fill_super(struct sup
u64 last_fs_block, last_fs_page;
int err;
err = -EINVAL;
sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
if (!sbi)
-diff -urNp linux-3.1.1/fs/hugetlbfs/inode.c linux-3.1.1/fs/hugetlbfs/inode.c
---- linux-3.1.1/fs/hugetlbfs/inode.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/hugetlbfs/inode.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/hugetlbfs/inode.c linux-3.1.3/fs/hugetlbfs/inode.c
+--- linux-3.1.3/fs/hugetlbfs/inode.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/hugetlbfs/inode.c 2011-11-16 18:40:29.000000000 -0500
@@ -915,7 +915,7 @@ static struct file_system_type hugetlbfs
.kill_sb = kill_litter_super,
};
static int can_do_hugetlb_shm(void)
{
-diff -urNp linux-3.1.1/fs/inode.c linux-3.1.1/fs/inode.c
---- linux-3.1.1/fs/inode.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/inode.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/inode.c linux-3.1.3/fs/inode.c
+--- linux-3.1.3/fs/inode.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/inode.c 2011-11-16 18:39:08.000000000 -0500
@@ -787,8 +787,8 @@ unsigned int get_next_ino(void)
#ifdef CONFIG_SMP
res = next - LAST_INO_BATCH;
}
-diff -urNp linux-3.1.1/fs/jbd/checkpoint.c linux-3.1.1/fs/jbd/checkpoint.c
---- linux-3.1.1/fs/jbd/checkpoint.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/jbd/checkpoint.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/jbd/checkpoint.c linux-3.1.3/fs/jbd/checkpoint.c
+--- linux-3.1.3/fs/jbd/checkpoint.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/jbd/checkpoint.c 2011-11-16 18:40:29.000000000 -0500
@@ -358,6 +358,8 @@ int log_do_checkpoint(journal_t *journal
tid_t this_tid;
int result;
jbd_debug(1, "Start checkpoint\n");
/*
-diff -urNp linux-3.1.1/fs/jffs2/compr_rtime.c linux-3.1.1/fs/jffs2/compr_rtime.c
---- linux-3.1.1/fs/jffs2/compr_rtime.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/jffs2/compr_rtime.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/jffs2/compr_rtime.c linux-3.1.3/fs/jffs2/compr_rtime.c
+--- linux-3.1.3/fs/jffs2/compr_rtime.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/jffs2/compr_rtime.c 2011-11-16 18:40:29.000000000 -0500
@@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned
int outpos = 0;
int pos=0;
memset(positions,0,sizeof(positions));
while (outpos<destlen) {
-diff -urNp linux-3.1.1/fs/jffs2/compr_rubin.c linux-3.1.1/fs/jffs2/compr_rubin.c
---- linux-3.1.1/fs/jffs2/compr_rubin.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/jffs2/compr_rubin.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/jffs2/compr_rubin.c linux-3.1.3/fs/jffs2/compr_rubin.c
+--- linux-3.1.3/fs/jffs2/compr_rubin.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/jffs2/compr_rubin.c 2011-11-16 18:40:29.000000000 -0500
@@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsig
int ret;
uint32_t mysrclen, mydstlen;
mysrclen = *sourcelen;
mydstlen = *dstlen - 8;
-diff -urNp linux-3.1.1/fs/jffs2/erase.c linux-3.1.1/fs/jffs2/erase.c
---- linux-3.1.1/fs/jffs2/erase.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/jffs2/erase.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/jffs2/erase.c linux-3.1.3/fs/jffs2/erase.c
+--- linux-3.1.3/fs/jffs2/erase.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/jffs2/erase.c 2011-11-16 18:39:08.000000000 -0500
@@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(stru
struct jffs2_unknown_node marker = {
.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
};
jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-3.1.1/fs/jffs2/wbuf.c linux-3.1.1/fs/jffs2/wbuf.c
---- linux-3.1.1/fs/jffs2/wbuf.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/jffs2/wbuf.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/jffs2/wbuf.c linux-3.1.3/fs/jffs2/wbuf.c
+--- linux-3.1.3/fs/jffs2/wbuf.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/jffs2/wbuf.c 2011-11-16 18:39:08.000000000 -0500
@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
{
.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
};
/*
-diff -urNp linux-3.1.1/fs/jffs2/xattr.c linux-3.1.1/fs/jffs2/xattr.c
---- linux-3.1.1/fs/jffs2/xattr.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/jffs2/xattr.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/jffs2/xattr.c linux-3.1.3/fs/jffs2/xattr.c
+--- linux-3.1.3/fs/jffs2/xattr.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/jffs2/xattr.c 2011-11-16 18:40:29.000000000 -0500
@@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct
BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING));
/* Phase.1 : Merge same xref */
for (i=0; i < XREF_TMPHASH_SIZE; i++)
xref_tmphash[i] = NULL;
-diff -urNp linux-3.1.1/fs/jfs/super.c linux-3.1.1/fs/jfs/super.c
---- linux-3.1.1/fs/jfs/super.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/jfs/super.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/jfs/super.c linux-3.1.3/fs/jfs/super.c
+--- linux-3.1.3/fs/jfs/super.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/jfs/super.c 2011-11-16 18:39:08.000000000 -0500
@@ -803,7 +803,7 @@ static int __init init_jfs_fs(void)
jfs_inode_cachep =
init_once);
if (jfs_inode_cachep == NULL)
return -ENOMEM;
-diff -urNp linux-3.1.1/fs/Kconfig.binfmt linux-3.1.1/fs/Kconfig.binfmt
---- linux-3.1.1/fs/Kconfig.binfmt 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/Kconfig.binfmt 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/Kconfig.binfmt linux-3.1.3/fs/Kconfig.binfmt
+--- linux-3.1.3/fs/Kconfig.binfmt 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/Kconfig.binfmt 2011-11-16 18:39:08.000000000 -0500
@@ -86,7 +86,7 @@ config HAVE_AOUT
config BINFMT_AOUT
---help---
A.out (Assembler.OUTput) is a set of formats for libraries and
executables used in the earliest versions of UNIX. Linux used
-diff -urNp linux-3.1.1/fs/libfs.c linux-3.1.1/fs/libfs.c
---- linux-3.1.1/fs/libfs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/libfs.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/libfs.c linux-3.1.3/fs/libfs.c
+--- linux-3.1.3/fs/libfs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/libfs.c 2011-11-16 18:39:08.000000000 -0500
@@ -165,6 +165,9 @@ int dcache_readdir(struct file * filp, v
for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
next->d_name.len, filp->f_pos,
next->d_inode->i_ino,
dt_type(next->d_inode)) < 0)
-diff -urNp linux-3.1.1/fs/lockd/clntproc.c linux-3.1.1/fs/lockd/clntproc.c
---- linux-3.1.1/fs/lockd/clntproc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/lockd/clntproc.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/lockd/clntproc.c linux-3.1.3/fs/lockd/clntproc.c
+--- linux-3.1.3/fs/lockd/clntproc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/lockd/clntproc.c 2011-11-16 18:40:29.000000000 -0500
@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt
/*
* Cookie counter for NLM requests
req = &reqst;
memset(req, 0, sizeof(*req));
locks_init_lock(&req->a_args.lock.fl);
-diff -urNp linux-3.1.1/fs/locks.c linux-3.1.1/fs/locks.c
---- linux-3.1.1/fs/locks.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/locks.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/locks.c linux-3.1.3/fs/locks.c
+--- linux-3.1.3/fs/locks.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/locks.c 2011-11-16 18:39:08.000000000 -0500
@@ -2022,16 +2022,16 @@ void locks_remove_flock(struct file *fil
return;
}
lock_flocks();
-diff -urNp linux-3.1.1/fs/logfs/super.c linux-3.1.1/fs/logfs/super.c
---- linux-3.1.1/fs/logfs/super.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/logfs/super.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/logfs/super.c linux-3.1.3/fs/logfs/super.c
+--- linux-3.1.3/fs/logfs/super.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/logfs/super.c 2011-11-16 18:40:29.000000000 -0500
@@ -266,6 +266,8 @@ static int logfs_recover_sb(struct super
struct logfs_disk_super _ds1, *ds1 = &_ds1;
int err, valid0, valid1;
/* read first superblock */
err = wbuf_read(sb, super->s_sb_ofs[0], sizeof(*ds0), ds0);
if (err)
-diff -urNp linux-3.1.1/fs/namei.c linux-3.1.1/fs/namei.c
---- linux-3.1.1/fs/namei.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/namei.c 2011-11-17 00:36:54.000000000 -0500
+diff -urNp linux-3.1.3/fs/namei.c linux-3.1.3/fs/namei.c
+--- linux-3.1.3/fs/namei.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/namei.c 2011-11-17 00:36:54.000000000 -0500
@@ -283,14 +283,22 @@ int generic_permission(struct inode *ino
if (S_ISDIR(inode->i_mode)) {
len = -EFAULT;
out:
return len;
-diff -urNp linux-3.1.1/fs/namespace.c linux-3.1.1/fs/namespace.c
---- linux-3.1.1/fs/namespace.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/namespace.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/namespace.c linux-3.1.3/fs/namespace.c
+--- linux-3.1.3/fs/namespace.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/namespace.c 2011-11-16 18:40:29.000000000 -0500
@@ -1329,6 +1329,9 @@ static int do_umount(struct vfsmount *mn
if (!(sb->s_flags & MS_RDONLY))
retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
get_fs_root(current->fs, &root);
error = lock_mount(&old);
if (error)
-diff -urNp linux-3.1.1/fs/ncpfs/dir.c linux-3.1.1/fs/ncpfs/dir.c
---- linux-3.1.1/fs/ncpfs/dir.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ncpfs/dir.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/ncpfs/dir.c linux-3.1.3/fs/ncpfs/dir.c
+--- linux-3.1.3/fs/ncpfs/dir.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ncpfs/dir.c 2011-11-16 18:40:29.000000000 -0500
@@ -299,6 +299,8 @@ ncp_lookup_validate(struct dentry *dentr
int res, val = 0, len;
__u8 __name[NCP_MAXPATHLEN + 1];
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-3.1.1/fs/ncpfs/inode.c linux-3.1.1/fs/ncpfs/inode.c
---- linux-3.1.1/fs/ncpfs/inode.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ncpfs/inode.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/ncpfs/inode.c linux-3.1.3/fs/ncpfs/inode.c
+--- linux-3.1.3/fs/ncpfs/inode.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ncpfs/inode.c 2011-11-16 18:40:29.000000000 -0500
@@ -461,6 +461,8 @@ static int ncp_fill_super(struct super_b
#endif
struct ncp_entry_info finfo;
memset(&data, 0, sizeof(data));
server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL);
if (!server)
-diff -urNp linux-3.1.1/fs/nfs/blocklayout/blocklayout.c linux-3.1.1/fs/nfs/blocklayout/blocklayout.c
---- linux-3.1.1/fs/nfs/blocklayout/blocklayout.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/nfs/blocklayout/blocklayout.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/nfs/blocklayout/blocklayout.c linux-3.1.3/fs/nfs/blocklayout/blocklayout.c
+--- linux-3.1.3/fs/nfs/blocklayout/blocklayout.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/nfs/blocklayout/blocklayout.c 2011-11-16 18:39:08.000000000 -0500
@@ -90,7 +90,7 @@ static int is_writable(struct pnfs_block
*/
struct parallel_io {
void (*pnfs_callback) (void *data);
void *data;
};
-diff -urNp linux-3.1.1/fs/nfs/inode.c linux-3.1.1/fs/nfs/inode.c
---- linux-3.1.1/fs/nfs/inode.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/nfs/inode.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/nfs/inode.c linux-3.1.3/fs/nfs/inode.c
+--- linux-3.1.3/fs/nfs/inode.c 2011-11-26 19:57:29.000000000 -0500
++++ linux-3.1.3/fs/nfs/inode.c 2011-11-26 20:00:43.000000000 -0500
@@ -150,7 +150,7 @@ static void nfs_zap_caches_locked(struct
nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
nfsi->attrtimeo_timestamp = jiffies;
}
void nfs_fattr_init(struct nfs_fattr *fattr)
-diff -urNp linux-3.1.1/fs/nfsd/nfs4state.c linux-3.1.1/fs/nfsd/nfs4state.c
---- linux-3.1.1/fs/nfsd/nfs4state.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/nfsd/nfs4state.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/nfsd/nfs4state.c linux-3.1.3/fs/nfsd/nfs4state.c
+--- linux-3.1.3/fs/nfsd/nfs4state.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/nfsd/nfs4state.c 2011-11-16 18:40:29.000000000 -0500
@@ -3999,6 +3999,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc
unsigned int strhashval;
int err;
dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n",
(long long) lock->lk_offset,
(long long) lock->lk_length);
-diff -urNp linux-3.1.1/fs/nfsd/nfs4xdr.c linux-3.1.1/fs/nfsd/nfs4xdr.c
---- linux-3.1.1/fs/nfsd/nfs4xdr.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/nfsd/nfs4xdr.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/nfsd/nfs4xdr.c linux-3.1.3/fs/nfsd/nfs4xdr.c
+--- linux-3.1.3/fs/nfsd/nfs4xdr.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/nfsd/nfs4xdr.c 2011-11-16 18:40:29.000000000 -0500
@@ -1875,6 +1875,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
.dentry = dentry,
};
BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1);
BUG_ON(bmval0 & ~nfsd_suppattrs0(minorversion));
BUG_ON(bmval1 & ~nfsd_suppattrs1(minorversion));
-diff -urNp linux-3.1.1/fs/nfsd/vfs.c linux-3.1.1/fs/nfsd/vfs.c
---- linux-3.1.1/fs/nfsd/vfs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/nfsd/vfs.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/nfsd/vfs.c linux-3.1.3/fs/nfsd/vfs.c
+--- linux-3.1.3/fs/nfsd/vfs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/nfsd/vfs.c 2011-11-16 18:39:08.000000000 -0500
@@ -896,7 +896,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
} else {
oldfs = get_fs();
set_fs(oldfs);
if (host_err < 0)
-diff -urNp linux-3.1.1/fs/notify/fanotify/fanotify_user.c linux-3.1.1/fs/notify/fanotify/fanotify_user.c
---- linux-3.1.1/fs/notify/fanotify/fanotify_user.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/notify/fanotify/fanotify_user.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/notify/fanotify/fanotify_user.c linux-3.1.3/fs/notify/fanotify/fanotify_user.c
+--- linux-3.1.3/fs/notify/fanotify/fanotify_user.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/notify/fanotify/fanotify_user.c 2011-11-16 18:39:08.000000000 -0500
@@ -276,7 +276,8 @@ static ssize_t copy_event_to_user(struct
goto out_close_fd;
fanotify_event_metadata.event_len))
goto out_kill_access_response;
-diff -urNp linux-3.1.1/fs/notify/notification.c linux-3.1.1/fs/notify/notification.c
---- linux-3.1.1/fs/notify/notification.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/notify/notification.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/notify/notification.c linux-3.1.3/fs/notify/notification.c
+--- linux-3.1.3/fs/notify/notification.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/notify/notification.c 2011-11-16 18:39:08.000000000 -0500
@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event
* get set to 0 so it will never get 'freed'
*/
}
EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
-diff -urNp linux-3.1.1/fs/ntfs/dir.c linux-3.1.1/fs/ntfs/dir.c
---- linux-3.1.1/fs/ntfs/dir.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ntfs/dir.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/ntfs/dir.c linux-3.1.3/fs/ntfs/dir.c
+--- linux-3.1.3/fs/ntfs/dir.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ntfs/dir.c 2011-11-16 18:39:08.000000000 -0500
@@ -1329,7 +1329,7 @@ find_next_index_buffer:
ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
~(s64)(ndir->itype.index.block_size - 1)));
ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
"inode 0x%lx or driver bug.", vdir->i_ino);
goto err_out;
-diff -urNp linux-3.1.1/fs/ntfs/file.c linux-3.1.1/fs/ntfs/file.c
---- linux-3.1.1/fs/ntfs/file.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ntfs/file.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/ntfs/file.c linux-3.1.3/fs/ntfs/file.c
+--- linux-3.1.3/fs/ntfs/file.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ntfs/file.c 2011-11-16 18:39:08.000000000 -0500
@@ -2229,6 +2229,6 @@ const struct inode_operations ntfs_file_
#endif /* NTFS_RW */
};
-const struct inode_operations ntfs_empty_inode_ops = {};
+const struct inode_operations ntfs_empty_inode_ops __read_only;
-diff -urNp linux-3.1.1/fs/ocfs2/localalloc.c linux-3.1.1/fs/ocfs2/localalloc.c
---- linux-3.1.1/fs/ocfs2/localalloc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ocfs2/localalloc.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/ocfs2/localalloc.c linux-3.1.3/fs/ocfs2/localalloc.c
+--- linux-3.1.3/fs/ocfs2/localalloc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ocfs2/localalloc.c 2011-11-16 18:39:08.000000000 -0500
@@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_windo
goto bail;
}
bail:
if (handle)
-diff -urNp linux-3.1.1/fs/ocfs2/namei.c linux-3.1.1/fs/ocfs2/namei.c
---- linux-3.1.1/fs/ocfs2/namei.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ocfs2/namei.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/ocfs2/namei.c linux-3.1.3/fs/ocfs2/namei.c
+--- linux-3.1.3/fs/ocfs2/namei.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ocfs2/namei.c 2011-11-16 18:40:29.000000000 -0500
@@ -1063,6 +1063,8 @@ static int ocfs2_rename(struct inode *ol
struct ocfs2_dir_lookup_result orphan_insert = { NULL, };
struct ocfs2_dir_lookup_result target_insert = { NULL, };
/* At some point it might be nice to break this function up a
* bit. */
-diff -urNp linux-3.1.1/fs/ocfs2/ocfs2.h linux-3.1.1/fs/ocfs2/ocfs2.h
---- linux-3.1.1/fs/ocfs2/ocfs2.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ocfs2/ocfs2.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/ocfs2/ocfs2.h linux-3.1.3/fs/ocfs2/ocfs2.h
+--- linux-3.1.3/fs/ocfs2/ocfs2.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ocfs2/ocfs2.h 2011-11-16 18:39:08.000000000 -0500
@@ -235,11 +235,11 @@ enum ocfs2_vol_state
struct ocfs2_alloc_stats
};
enum ocfs2_local_alloc_state
-diff -urNp linux-3.1.1/fs/ocfs2/suballoc.c linux-3.1.1/fs/ocfs2/suballoc.c
---- linux-3.1.1/fs/ocfs2/suballoc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ocfs2/suballoc.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/ocfs2/suballoc.c linux-3.1.3/fs/ocfs2/suballoc.c
+--- linux-3.1.3/fs/ocfs2/suballoc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ocfs2/suballoc.c 2011-11-16 18:39:08.000000000 -0500
@@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(s
mlog_errno(status);
goto bail;
*num_clusters = res.sr_bits;
}
}
-diff -urNp linux-3.1.1/fs/ocfs2/super.c linux-3.1.1/fs/ocfs2/super.c
---- linux-3.1.1/fs/ocfs2/super.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ocfs2/super.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/ocfs2/super.c linux-3.1.3/fs/ocfs2/super.c
+--- linux-3.1.3/fs/ocfs2/super.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ocfs2/super.c 2011-11-16 18:39:08.000000000 -0500
@@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
"%10s => GlobalAllocs: %d LocalAllocs: %d "
"SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
/* Copy the blockcheck stats from the superblock probe */
osb->osb_ecc_stats = *stats;
-diff -urNp linux-3.1.1/fs/ocfs2/symlink.c linux-3.1.1/fs/ocfs2/symlink.c
---- linux-3.1.1/fs/ocfs2/symlink.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/ocfs2/symlink.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/ocfs2/symlink.c linux-3.1.3/fs/ocfs2/symlink.c
+--- linux-3.1.3/fs/ocfs2/symlink.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/ocfs2/symlink.c 2011-11-16 18:39:08.000000000 -0500
@@ -142,7 +142,7 @@ bail:
static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
if (!IS_ERR(link))
kfree(link);
}
-diff -urNp linux-3.1.1/fs/open.c linux-3.1.1/fs/open.c
---- linux-3.1.1/fs/open.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/open.c 2011-11-17 19:07:55.000000000 -0500
+diff -urNp linux-3.1.3/fs/open.c linux-3.1.3/fs/open.c
+--- linux-3.1.3/fs/open.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/open.c 2011-11-17 19:07:55.000000000 -0500
@@ -112,6 +112,10 @@ static long do_sys_truncate(const char _
error = locks_verify_truncate(inode, NULL, length);
if (!error)
newattrs.ia_valid = ATTR_CTIME;
if (user != (uid_t) -1) {
newattrs.ia_valid |= ATTR_UID;
-diff -urNp linux-3.1.1/fs/partitions/ldm.c linux-3.1.1/fs/partitions/ldm.c
---- linux-3.1.1/fs/partitions/ldm.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/partitions/ldm.c 2011-11-17 19:08:15.000000000 -0500
+diff -urNp linux-3.1.3/fs/partitions/ldm.c linux-3.1.3/fs/partitions/ldm.c
+--- linux-3.1.3/fs/partitions/ldm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/partitions/ldm.c 2011-11-17 19:08:15.000000000 -0500
@@ -1322,7 +1322,7 @@ static bool ldm_frag_add (const u8 *data
goto found;
}
if (!f) {
ldm_crit ("Out of memory.");
return false;
-diff -urNp linux-3.1.1/fs/pipe.c linux-3.1.1/fs/pipe.c
---- linux-3.1.1/fs/pipe.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/pipe.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/pipe.c linux-3.1.3/fs/pipe.c
+--- linux-3.1.3/fs/pipe.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/pipe.c 2011-11-16 18:40:29.000000000 -0500
@@ -420,9 +420,9 @@ redo:
}
if (bufs) /* More to do? */
inode->i_fop = &rdwr_pipefifo_fops;
/*
-diff -urNp linux-3.1.1/fs/proc/array.c linux-3.1.1/fs/proc/array.c
---- linux-3.1.1/fs/proc/array.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/proc/array.c 2011-11-17 18:42:02.000000000 -0500
+diff -urNp linux-3.1.3/fs/proc/array.c linux-3.1.3/fs/proc/array.c
+--- linux-3.1.3/fs/proc/array.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/proc/array.c 2011-11-17 18:42:02.000000000 -0500
@@ -60,6 +60,7 @@
#include <linux/tty.h>
#include <linux/string.h>
+ return sprintf(buffer, "%pI4\n", &curr_ip);
+}
+#endif
-diff -urNp linux-3.1.1/fs/proc/base.c linux-3.1.1/fs/proc/base.c
---- linux-3.1.1/fs/proc/base.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/proc/base.c 2011-11-17 18:43:19.000000000 -0500
+diff -urNp linux-3.1.3/fs/proc/base.c linux-3.1.3/fs/proc/base.c
+--- linux-3.1.3/fs/proc/base.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/proc/base.c 2011-11-17 18:43:19.000000000 -0500
@@ -107,6 +107,22 @@ struct pid_entry {
union proc_op op;
};
ONE("stack", S_IRUGO, proc_pid_stack),
#endif
#ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-3.1.1/fs/proc/cmdline.c linux-3.1.1/fs/proc/cmdline.c
---- linux-3.1.1/fs/proc/cmdline.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/proc/cmdline.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/proc/cmdline.c linux-3.1.3/fs/proc/cmdline.c
+--- linux-3.1.3/fs/proc/cmdline.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/proc/cmdline.c 2011-11-16 18:40:29.000000000 -0500
@@ -23,7 +23,11 @@ static const struct file_operations cmdl
static int __init proc_cmdline_init(void)
return 0;
}
module_init(proc_cmdline_init);
-diff -urNp linux-3.1.1/fs/proc/devices.c linux-3.1.1/fs/proc/devices.c
---- linux-3.1.1/fs/proc/devices.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/proc/devices.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/proc/devices.c linux-3.1.3/fs/proc/devices.c
+--- linux-3.1.3/fs/proc/devices.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/proc/devices.c 2011-11-16 18:40:29.000000000 -0500
@@ -64,7 +64,11 @@ static const struct file_operations proc
static int __init proc_devices_init(void)
return 0;
}
module_init(proc_devices_init);
-diff -urNp linux-3.1.1/fs/proc/inode.c linux-3.1.1/fs/proc/inode.c
---- linux-3.1.1/fs/proc/inode.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/proc/inode.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/proc/inode.c linux-3.1.3/fs/proc/inode.c
+--- linux-3.1.3/fs/proc/inode.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/proc/inode.c 2011-11-16 18:40:29.000000000 -0500
@@ -18,12 +18,18 @@
#include <linux/module.h>
#include <linux/sysctl.h>
}
if (de->size)
inode->i_size = de->size;
-diff -urNp linux-3.1.1/fs/proc/internal.h linux-3.1.1/fs/proc/internal.h
---- linux-3.1.1/fs/proc/internal.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/proc/internal.h 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/proc/internal.h linux-3.1.3/fs/proc/internal.h
+--- linux-3.1.3/fs/proc/internal.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/proc/internal.h 2011-11-16 18:40:29.000000000 -0500
@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
struct pid *pid, struct task_struct *task);
extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
extern const struct file_operations proc_maps_operations;
-diff -urNp linux-3.1.1/fs/proc/Kconfig linux-3.1.1/fs/proc/Kconfig
---- linux-3.1.1/fs/proc/Kconfig 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/proc/Kconfig 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/proc/Kconfig linux-3.1.3/fs/proc/Kconfig
+--- linux-3.1.3/fs/proc/Kconfig 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/proc/Kconfig 2011-11-16 18:40:29.000000000 -0500
@@ -30,12 +30,12 @@ config PROC_FS
config PROC_KCORE
bool "Enable /proc page monitoring" if EXPERT
help
Various /proc files exist to monitor process memory utilization:
-diff -urNp linux-3.1.1/fs/proc/kcore.c linux-3.1.1/fs/proc/kcore.c
---- linux-3.1.1/fs/proc/kcore.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/proc/kcore.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/proc/kcore.c linux-3.1.3/fs/proc/kcore.c
+--- linux-3.1.3/fs/proc/kcore.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/proc/kcore.c 2011-11-16 18:40:29.000000000 -0500
@@ -321,6 +321,8 @@ static void elf_kcore_store_hdr(char *bu
off_t offset = 0;
struct kcore_list *m;
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
if (kcore_need_update)
-diff -urNp linux-3.1.1/fs/proc/meminfo.c linux-3.1.1/fs/proc/meminfo.c
---- linux-3.1.1/fs/proc/meminfo.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/proc/meminfo.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/proc/meminfo.c linux-3.1.3/fs/proc/meminfo.c
+--- linux-3.1.3/fs/proc/meminfo.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/proc/meminfo.c 2011-11-16 18:40:29.000000000 -0500
@@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_
unsigned long pages[NR_LRU_LISTS];
int lru;
#endif
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
-diff -urNp linux-3.1.1/fs/proc/nommu.c linux-3.1.1/fs/proc/nommu.c
---- linux-3.1.1/fs/proc/nommu.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/proc/nommu.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/proc/nommu.c linux-3.1.3/fs/proc/nommu.c
+--- linux-3.1.3/fs/proc/nommu.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/proc/nommu.c 2011-11-16 18:39:08.000000000 -0500
@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_
if (len < 1)
len = 1;
}
seq_putc(m, '\n');
-diff -urNp linux-3.1.1/fs/proc/proc_net.c linux-3.1.1/fs/proc/proc_net.c
---- linux-3.1.1/fs/proc/proc_net.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/proc/proc_net.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/proc/proc_net.c linux-3.1.3/fs/proc/proc_net.c
+--- linux-3.1.3/fs/proc/proc_net.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/proc/proc_net.c 2011-11-16 18:40:29.000000000 -0500
@@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str
struct task_struct *task;
struct nsproxy *ns;
rcu_read_lock();
task = pid_task(proc_pid(dir), PIDTYPE_PID);
-diff -urNp linux-3.1.1/fs/proc/proc_sysctl.c linux-3.1.1/fs/proc/proc_sysctl.c
---- linux-3.1.1/fs/proc/proc_sysctl.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/proc/proc_sysctl.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/proc/proc_sysctl.c linux-3.1.3/fs/proc/proc_sysctl.c
+--- linux-3.1.3/fs/proc/proc_sysctl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/proc/proc_sysctl.c 2011-11-18 18:45:33.000000000 -0500
@@ -8,11 +8,13 @@
#include <linux/namei.h>
#include "internal.h"
generic_fillattr(inode, stat);
if (table)
stat->mode = (stat->mode & S_IFMT) | table->mode;
-@@ -374,13 +391,13 @@ static const struct file_operations proc
+@@ -370,17 +387,18 @@ static const struct file_operations proc
+ };
+
+ static const struct file_operations proc_sys_dir_file_operations = {
++ .read = generic_read_dir,
+ .readdir = proc_sys_readdir,
.llseek = generic_file_llseek,
};
.lookup = proc_sys_lookup,
.permission = proc_sys_permission,
.setattr = proc_sys_setattr,
-diff -urNp linux-3.1.1/fs/proc/root.c linux-3.1.1/fs/proc/root.c
---- linux-3.1.1/fs/proc/root.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/proc/root.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/proc/root.c linux-3.1.3/fs/proc/root.c
+--- linux-3.1.3/fs/proc/root.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/proc/root.c 2011-11-16 18:40:29.000000000 -0500
@@ -123,7 +123,15 @@ void __init proc_root_init(void)
#ifdef CONFIG_PROC_DEVICETREE
proc_device_tree_init();
proc_sys_init();
}
-diff -urNp linux-3.1.1/fs/proc/task_mmu.c linux-3.1.1/fs/proc/task_mmu.c
---- linux-3.1.1/fs/proc/task_mmu.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/proc/task_mmu.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/proc/task_mmu.c linux-3.1.3/fs/proc/task_mmu.c
+--- linux-3.1.3/fs/proc/task_mmu.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/proc/task_mmu.c 2011-11-16 18:40:29.000000000 -0500
@@ -51,8 +51,13 @@ void task_mem(struct seq_file *m, struct
"VmExe:\t%8lu kB\n"
"VmLib:\t%8lu kB\n"
} 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-3.1.1/fs/proc/task_nommu.c linux-3.1.1/fs/proc/task_nommu.c
---- linux-3.1.1/fs/proc/task_nommu.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/proc/task_nommu.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/proc/task_nommu.c linux-3.1.3/fs/proc/task_nommu.c
+--- linux-3.1.3/fs/proc/task_nommu.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/proc/task_nommu.c 2011-11-16 18:39:08.000000000 -0500
@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct
else
bytes += kobjsize(mm);
} else if (mm) {
if (vma->vm_start <= mm->start_stack &&
vma->vm_end >= mm->start_stack) {
-diff -urNp linux-3.1.1/fs/quota/netlink.c linux-3.1.1/fs/quota/netlink.c
---- linux-3.1.1/fs/quota/netlink.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/quota/netlink.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/quota/netlink.c linux-3.1.3/fs/quota/netlink.c
+--- linux-3.1.3/fs/quota/netlink.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/quota/netlink.c 2011-11-16 18:39:08.000000000 -0500
@@ -33,7 +33,7 @@ static struct genl_family quota_genl_fam
void quota_send_warning(short type, unsigned int id, dev_t dev,
const char warntype)
"a_genl_family, 0, QUOTA_NL_C_WARNING);
if (!msg_head) {
printk(KERN_ERR
-diff -urNp linux-3.1.1/fs/readdir.c linux-3.1.1/fs/readdir.c
---- linux-3.1.1/fs/readdir.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/readdir.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/readdir.c linux-3.1.3/fs/readdir.c
+--- linux-3.1.3/fs/readdir.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/readdir.c 2011-11-16 18:40:29.000000000 -0500
@@ -17,6 +17,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
if (__put_user(d_off, &lastdirent->d_off))
error = -EFAULT;
else
-diff -urNp linux-3.1.1/fs/reiserfs/dir.c linux-3.1.1/fs/reiserfs/dir.c
---- linux-3.1.1/fs/reiserfs/dir.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/reiserfs/dir.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/reiserfs/dir.c linux-3.1.3/fs/reiserfs/dir.c
+--- linux-3.1.3/fs/reiserfs/dir.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/reiserfs/dir.c 2011-11-16 18:40:29.000000000 -0500
@@ -75,6 +75,8 @@ int reiserfs_readdir_dentry(struct dentr
struct reiserfs_dir_entry de;
int ret = 0;
reiserfs_write_lock(inode->i_sb);
reiserfs_check_lock_depth(inode->i_sb, "readdir");
-diff -urNp linux-3.1.1/fs/reiserfs/do_balan.c linux-3.1.1/fs/reiserfs/do_balan.c
---- linux-3.1.1/fs/reiserfs/do_balan.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/reiserfs/do_balan.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/reiserfs/do_balan.c linux-3.1.3/fs/reiserfs/do_balan.c
+--- linux-3.1.3/fs/reiserfs/do_balan.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/reiserfs/do_balan.c 2011-11-16 18:39:08.000000000 -0500
@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb,
return;
}
do_balance_starts(tb);
/* balance leaf returns 0 except if combining L R and S into
-diff -urNp linux-3.1.1/fs/reiserfs/journal.c linux-3.1.1/fs/reiserfs/journal.c
---- linux-3.1.1/fs/reiserfs/journal.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/reiserfs/journal.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/reiserfs/journal.c linux-3.1.3/fs/reiserfs/journal.c
+--- linux-3.1.3/fs/reiserfs/journal.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/reiserfs/journal.c 2011-11-16 18:40:29.000000000 -0500
@@ -2289,6 +2289,8 @@ static struct buffer_head *reiserfs_brea
struct buffer_head *bh;
int i, j;
bh = __getblk(dev, block, bufsize);
if (buffer_uptodate(bh))
return (bh);
-diff -urNp linux-3.1.1/fs/reiserfs/namei.c linux-3.1.1/fs/reiserfs/namei.c
---- linux-3.1.1/fs/reiserfs/namei.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/reiserfs/namei.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/reiserfs/namei.c linux-3.1.3/fs/reiserfs/namei.c
+--- linux-3.1.3/fs/reiserfs/namei.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/reiserfs/namei.c 2011-11-16 18:40:29.000000000 -0500
@@ -1225,6 +1225,8 @@ static int reiserfs_rename(struct inode
unsigned long savelink = 1;
struct timespec ctime;
/* 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-3.1.1/fs/reiserfs/procfs.c linux-3.1.1/fs/reiserfs/procfs.c
---- linux-3.1.1/fs/reiserfs/procfs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/reiserfs/procfs.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/reiserfs/procfs.c linux-3.1.3/fs/reiserfs/procfs.c
+--- linux-3.1.3/fs/reiserfs/procfs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/reiserfs/procfs.c 2011-11-16 18:40:29.000000000 -0500
@@ -113,7 +113,7 @@ static int show_super(struct seq_file *m
"SMALL_TAILS " : "NO_TAILS ",
replay_only(sb) ? "REPLAY_ONLY " : "",
seq_printf(m, /* on-disk fields */
"jp_journal_1st_block: \t%i\n"
"jp_journal_dev: \t%s[%x]\n"
-diff -urNp linux-3.1.1/fs/reiserfs/stree.c linux-3.1.1/fs/reiserfs/stree.c
---- linux-3.1.1/fs/reiserfs/stree.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/reiserfs/stree.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/reiserfs/stree.c linux-3.1.3/fs/reiserfs/stree.c
+--- linux-3.1.3/fs/reiserfs/stree.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/reiserfs/stree.c 2011-11-16 18:40:29.000000000 -0500
@@ -1196,6 +1196,8 @@ int reiserfs_delete_item(struct reiserfs
int iter = 0;
#endif
BUG_ON(!th->t_trans_id);
if (inode) { /* Do we count quotas for item? */
-diff -urNp linux-3.1.1/fs/reiserfs/super.c linux-3.1.1/fs/reiserfs/super.c
---- linux-3.1.1/fs/reiserfs/super.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/reiserfs/super.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/reiserfs/super.c linux-3.1.3/fs/reiserfs/super.c
+--- linux-3.1.3/fs/reiserfs/super.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/reiserfs/super.c 2011-11-16 18:40:29.000000000 -0500
@@ -927,6 +927,8 @@ static int reiserfs_parse_options(struct
{.option_name = NULL}
};
*blocks = 0;
if (!options || !*options)
/* use default configuration: create tails, journaling on, no
-diff -urNp linux-3.1.1/fs/select.c linux-3.1.1/fs/select.c
---- linux-3.1.1/fs/select.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/select.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/select.c linux-3.1.3/fs/select.c
+--- linux-3.1.3/fs/select.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/select.c 2011-11-16 18:40:29.000000000 -0500
@@ -20,6 +20,7 @@
#include <linux/module.h>
#include <linux/slab.h>
if (nfds > rlimit(RLIMIT_NOFILE))
return -EINVAL;
-diff -urNp linux-3.1.1/fs/seq_file.c linux-3.1.1/fs/seq_file.c
---- linux-3.1.1/fs/seq_file.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/seq_file.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/seq_file.c linux-3.1.3/fs/seq_file.c
+--- linux-3.1.3/fs/seq_file.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/seq_file.c 2011-11-16 18:39:08.000000000 -0500
@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
return 0;
}
int res = -ENOMEM;
if (op) {
-diff -urNp linux-3.1.1/fs/splice.c linux-3.1.1/fs/splice.c
---- linux-3.1.1/fs/splice.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/splice.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/splice.c linux-3.1.3/fs/splice.c
+--- linux-3.1.3/fs/splice.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/splice.c 2011-11-16 18:40:29.000000000 -0500
@@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode
pipe_lock(pipe);
ret = -EAGAIN;
pipe_unlock(ipipe);
-diff -urNp linux-3.1.1/fs/sysfs/file.c linux-3.1.1/fs/sysfs/file.c
---- linux-3.1.1/fs/sysfs/file.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/sysfs/file.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/sysfs/file.c linux-3.1.3/fs/sysfs/file.c
+--- linux-3.1.3/fs/sysfs/file.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/sysfs/file.c 2011-11-16 18:39:08.000000000 -0500
@@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent
struct sysfs_open_dirent {
wake_up_interruptible(&od->poll);
}
-diff -urNp linux-3.1.1/fs/sysfs/mount.c linux-3.1.1/fs/sysfs/mount.c
---- linux-3.1.1/fs/sysfs/mount.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/sysfs/mount.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/sysfs/mount.c linux-3.1.3/fs/sysfs/mount.c
+--- linux-3.1.3/fs/sysfs/mount.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/sysfs/mount.c 2011-11-16 18:40:29.000000000 -0500
@@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = {
.s_name = "",
.s_count = ATOMIC_INIT(1),
.s_ino = 1,
};
-diff -urNp linux-3.1.1/fs/sysfs/symlink.c linux-3.1.1/fs/sysfs/symlink.c
---- linux-3.1.1/fs/sysfs/symlink.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/sysfs/symlink.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/sysfs/symlink.c linux-3.1.3/fs/sysfs/symlink.c
+--- linux-3.1.3/fs/sysfs/symlink.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/sysfs/symlink.c 2011-11-16 18:39:08.000000000 -0500
@@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de
static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
if (!IS_ERR(page))
free_page((unsigned long)page);
}
-diff -urNp linux-3.1.1/fs/udf/inode.c linux-3.1.1/fs/udf/inode.c
---- linux-3.1.1/fs/udf/inode.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/udf/inode.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/udf/inode.c linux-3.1.3/fs/udf/inode.c
+--- linux-3.1.3/fs/udf/inode.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/udf/inode.c 2011-11-16 18:40:29.000000000 -0500
@@ -560,6 +560,8 @@ static struct buffer_head *inode_getblk(
int goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
int lastblock = 0;
prev_epos.offset = udf_file_entry_alloc_offset(inode);
prev_epos.block = iinfo->i_location;
prev_epos.bh = NULL;
-diff -urNp linux-3.1.1/fs/udf/misc.c linux-3.1.1/fs/udf/misc.c
---- linux-3.1.1/fs/udf/misc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/udf/misc.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/udf/misc.c linux-3.1.3/fs/udf/misc.c
+--- linux-3.1.3/fs/udf/misc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/udf/misc.c 2011-11-16 18:39:08.000000000 -0500
@@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id
u8 udf_tag_checksum(const struct tag *t)
u8 checksum = 0;
int i;
for (i = 0; i < sizeof(struct tag); ++i)
-diff -urNp linux-3.1.1/fs/utimes.c linux-3.1.1/fs/utimes.c
---- linux-3.1.1/fs/utimes.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/utimes.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/utimes.c linux-3.1.3/fs/utimes.c
+--- linux-3.1.3/fs/utimes.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/utimes.c 2011-11-16 18:40:29.000000000 -0500
@@ -1,6 +1,7 @@
#include <linux/compiler.h>
#include <linux/file.h>
mutex_lock(&inode->i_mutex);
error = notify_change(path->dentry, &newattrs);
mutex_unlock(&inode->i_mutex);
-diff -urNp linux-3.1.1/fs/xattr_acl.c linux-3.1.1/fs/xattr_acl.c
---- linux-3.1.1/fs/xattr_acl.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/xattr_acl.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/xattr_acl.c linux-3.1.3/fs/xattr_acl.c
+--- linux-3.1.3/fs/xattr_acl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/xattr_acl.c 2011-11-16 18:39:08.000000000 -0500
@@ -17,8 +17,8 @@
struct posix_acl *
posix_acl_from_xattr(const void *value, size_t size)
int count;
struct posix_acl *acl;
struct posix_acl_entry *acl_e;
-diff -urNp linux-3.1.1/fs/xattr.c linux-3.1.1/fs/xattr.c
---- linux-3.1.1/fs/xattr.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/xattr.c 2011-11-16 18:40:29.000000000 -0500
+diff -urNp linux-3.1.3/fs/xattr.c linux-3.1.3/fs/xattr.c
+--- linux-3.1.3/fs/xattr.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/xattr.c 2011-11-16 18:40:29.000000000 -0500
@@ -254,7 +254,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
* Extended attribute SET operations
*/
mnt_drop_write(f->f_path.mnt);
}
fput(f);
-diff -urNp linux-3.1.1/fs/xfs/xfs_bmap.c linux-3.1.1/fs/xfs/xfs_bmap.c
---- linux-3.1.1/fs/xfs/xfs_bmap.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/xfs/xfs_bmap.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/xfs/xfs_bmap.c linux-3.1.3/fs/xfs/xfs_bmap.c
+--- linux-3.1.3/fs/xfs/xfs_bmap.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/xfs/xfs_bmap.c 2011-11-16 18:39:08.000000000 -0500
@@ -250,7 +250,7 @@ xfs_bmap_validate_ret(
int nmap,
int ret_nmap);
#endif /* DEBUG */
STATIC int
-diff -urNp linux-3.1.1/fs/xfs/xfs_dir2_sf.c linux-3.1.1/fs/xfs/xfs_dir2_sf.c
---- linux-3.1.1/fs/xfs/xfs_dir2_sf.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/xfs/xfs_dir2_sf.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/xfs/xfs_dir2_sf.c linux-3.1.3/fs/xfs/xfs_dir2_sf.c
+--- linux-3.1.3/fs/xfs/xfs_dir2_sf.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/xfs/xfs_dir2_sf.c 2011-11-16 18:39:08.000000000 -0500
@@ -852,7 +852,15 @@ xfs_dir2_sf_getdents(
}
off & 0x7fffffff, ino, DT_UNKNOWN)) {
*offset = off & 0x7fffffff;
return 0;
-diff -urNp linux-3.1.1/fs/xfs/xfs_ioctl.c linux-3.1.1/fs/xfs/xfs_ioctl.c
---- linux-3.1.1/fs/xfs/xfs_ioctl.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/xfs/xfs_ioctl.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/xfs/xfs_ioctl.c linux-3.1.3/fs/xfs/xfs_ioctl.c
+--- linux-3.1.3/fs/xfs/xfs_ioctl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/xfs/xfs_ioctl.c 2011-11-16 18:39:08.000000000 -0500
@@ -128,7 +128,7 @@ xfs_find_handle(
}
copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
goto out_put;
-diff -urNp linux-3.1.1/fs/xfs/xfs_iops.c linux-3.1.1/fs/xfs/xfs_iops.c
---- linux-3.1.1/fs/xfs/xfs_iops.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/fs/xfs/xfs_iops.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/fs/xfs/xfs_iops.c linux-3.1.3/fs/xfs/xfs_iops.c
+--- linux-3.1.3/fs/xfs/xfs_iops.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/xfs/xfs_iops.c 2011-11-16 18:39:08.000000000 -0500
@@ -446,7 +446,7 @@ xfs_vn_put_link(
struct nameidata *nd,
void *p)
if (!IS_ERR(s))
kfree(s);
-diff -urNp linux-3.1.1/grsecurity/gracl_alloc.c linux-3.1.1/grsecurity/gracl_alloc.c
---- linux-3.1.1/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/gracl_alloc.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/fs/xfs/xfs_vnodeops.c linux-3.1.3/fs/xfs/xfs_vnodeops.c
+--- linux-3.1.3/fs/xfs/xfs_vnodeops.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/fs/xfs/xfs_vnodeops.c 2011-11-18 18:54:56.000000000 -0500
+@@ -123,13 +123,17 @@ xfs_readlink(
+
+ xfs_ilock(ip, XFS_ILOCK_SHARED);
+
+- ASSERT(S_ISLNK(ip->i_d.di_mode));
+- ASSERT(ip->i_d.di_size <= MAXPATHLEN);
+-
+ pathlen = ip->i_d.di_size;
+ if (!pathlen)
+ goto out;
+
++ if (pathlen > MAXPATHLEN) {
++ xfs_alert(mp, "%s: inode (%llu) symlink length (%d) too long",
++ __func__, (unsigned long long)ip->i_ino, pathlen);
++ ASSERT(0);
++ return XFS_ERROR(EFSCORRUPTED);
++ }
++
+ if (ip->i_df.if_flags & XFS_IFINLINE) {
+ memcpy(link, ip->i_df.if_u1.if_data, pathlen);
+ link[pathlen] = '\0';
+diff -urNp linux-3.1.3/grsecurity/gracl_alloc.c linux-3.1.3/grsecurity/gracl_alloc.c
+--- linux-3.1.3/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/gracl_alloc.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,105 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
+ else
+ return 1;
+}
-diff -urNp linux-3.1.1/grsecurity/gracl.c linux-3.1.1/grsecurity/gracl.c
---- linux-3.1.1/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/gracl.c 2011-11-16 19:31:00.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/gracl.c linux-3.1.3/grsecurity/gracl.c
+--- linux-3.1.3/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/gracl.c 2011-11-16 19:31:00.000000000 -0500
@@ -0,0 +1,4156 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+EXPORT_SYMBOL(gr_check_group_change);
+#endif
+
-diff -urNp linux-3.1.1/grsecurity/gracl_cap.c linux-3.1.1/grsecurity/gracl_cap.c
---- linux-3.1.1/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/gracl_cap.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/gracl_cap.c linux-3.1.3/grsecurity/gracl_cap.c
+--- linux-3.1.3/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/gracl_cap.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,101 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+ return 0;
+}
+
-diff -urNp linux-3.1.1/grsecurity/gracl_fs.c linux-3.1.1/grsecurity/gracl_fs.c
---- linux-3.1.1/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/gracl_fs.c 2011-11-17 00:25:32.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/gracl_fs.c linux-3.1.3/grsecurity/gracl_fs.c
+--- linux-3.1.3/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/gracl_fs.c 2011-11-17 00:25:32.000000000 -0500
@@ -0,0 +1,433 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+
+ return 0;
+}
-diff -urNp linux-3.1.1/grsecurity/gracl_ip.c linux-3.1.1/grsecurity/gracl_ip.c
---- linux-3.1.1/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/gracl_ip.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/gracl_ip.c linux-3.1.3/grsecurity/gracl_ip.c
+--- linux-3.1.3/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/gracl_ip.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,381 @@
+#include <linux/kernel.h>
+#include <asm/uaccess.h>
+
+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
+}
-diff -urNp linux-3.1.1/grsecurity/gracl_learn.c linux-3.1.1/grsecurity/gracl_learn.c
---- linux-3.1.1/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/gracl_learn.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/gracl_learn.c linux-3.1.3/grsecurity/gracl_learn.c
+--- linux-3.1.3/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/gracl_learn.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,207 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
+ .release = close_learn,
+ .poll = poll_learn,
+};
-diff -urNp linux-3.1.1/grsecurity/gracl_res.c linux-3.1.1/grsecurity/gracl_res.c
---- linux-3.1.1/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/gracl_res.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/gracl_res.c linux-3.1.3/grsecurity/gracl_res.c
+--- linux-3.1.3/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/gracl_res.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,68 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+ rcu_read_unlock();
+ return;
+}
-diff -urNp linux-3.1.1/grsecurity/gracl_segv.c linux-3.1.1/grsecurity/gracl_segv.c
---- linux-3.1.1/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/gracl_segv.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/gracl_segv.c linux-3.1.3/grsecurity/gracl_segv.c
+--- linux-3.1.3/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/gracl_segv.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,299 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
+
+ return;
+}
-diff -urNp linux-3.1.1/grsecurity/gracl_shm.c linux-3.1.1/grsecurity/gracl_shm.c
---- linux-3.1.1/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/gracl_shm.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/gracl_shm.c linux-3.1.3/grsecurity/gracl_shm.c
+--- linux-3.1.3/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/gracl_shm.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,40 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
+
+ return 1;
+}
-diff -urNp linux-3.1.1/grsecurity/grsec_chdir.c linux-3.1.1/grsecurity/grsec_chdir.c
---- linux-3.1.1/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/grsec_chdir.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/grsec_chdir.c linux-3.1.3/grsecurity/grsec_chdir.c
+--- linux-3.1.3/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/grsec_chdir.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,19 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return;
+}
-diff -urNp linux-3.1.1/grsecurity/grsec_chroot.c linux-3.1.1/grsecurity/grsec_chroot.c
---- linux-3.1.1/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/grsec_chroot.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/grsec_chroot.c linux-3.1.3/grsecurity/grsec_chroot.c
+--- linux-3.1.3/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/grsec_chroot.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,351 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#endif
+ return 0;
+}
-diff -urNp linux-3.1.1/grsecurity/grsec_disabled.c linux-3.1.1/grsecurity/grsec_disabled.c
---- linux-3.1.1/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/grsec_disabled.c 2011-11-17 00:16:25.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/grsec_disabled.c linux-3.1.3/grsecurity/grsec_disabled.c
+--- linux-3.1.3/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/grsec_disabled.c 2011-11-17 00:16:25.000000000 -0500
@@ -0,0 +1,439 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+EXPORT_SYMBOL(gr_check_user_change);
+EXPORT_SYMBOL(gr_check_group_change);
+#endif
-diff -urNp linux-3.1.1/grsecurity/grsec_exec.c linux-3.1.1/grsecurity/grsec_exec.c
---- linux-3.1.1/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/grsec_exec.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/grsec_exec.c linux-3.1.3/grsecurity/grsec_exec.c
+--- linux-3.1.3/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/grsec_exec.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,146 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+
+EXPORT_SYMBOL(gr_is_capable);
+EXPORT_SYMBOL(gr_is_capable_nolog);
-diff -urNp linux-3.1.1/grsecurity/grsec_fifo.c linux-3.1.1/grsecurity/grsec_fifo.c
---- linux-3.1.1/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/grsec_fifo.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/grsec_fifo.c linux-3.1.3/grsecurity/grsec_fifo.c
+--- linux-3.1.3/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/grsec_fifo.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,24 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return 0;
+}
-diff -urNp linux-3.1.1/grsecurity/grsec_fork.c linux-3.1.1/grsecurity/grsec_fork.c
---- linux-3.1.1/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/grsec_fork.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/grsec_fork.c linux-3.1.3/grsecurity/grsec_fork.c
+--- linux-3.1.3/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/grsec_fork.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,23 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return;
+}
-diff -urNp linux-3.1.1/grsecurity/grsec_init.c linux-3.1.1/grsecurity/grsec_init.c
---- linux-3.1.1/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/grsec_init.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/grsec_init.c linux-3.1.3/grsecurity/grsec_init.c
+--- linux-3.1.3/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/grsec_init.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,269 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+
+ return;
+}
-diff -urNp linux-3.1.1/grsecurity/grsec_link.c linux-3.1.1/grsecurity/grsec_link.c
---- linux-3.1.1/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/grsec_link.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/grsec_link.c linux-3.1.3/grsecurity/grsec_link.c
+--- linux-3.1.3/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/grsec_link.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,43 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return 0;
+}
-diff -urNp linux-3.1.1/grsecurity/grsec_log.c linux-3.1.1/grsecurity/grsec_log.c
---- linux-3.1.1/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/grsec_log.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/grsec_log.c linux-3.1.3/grsecurity/grsec_log.c
+--- linux-3.1.3/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/grsec_log.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,322 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+ gr_log_end(audit, 1);
+ END_LOCKS(audit);
+}
-diff -urNp linux-3.1.1/grsecurity/grsec_mem.c linux-3.1.1/grsecurity/grsec_mem.c
---- linux-3.1.1/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/grsec_mem.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/grsec_mem.c linux-3.1.3/grsecurity/grsec_mem.c
+--- linux-3.1.3/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/grsec_mem.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,33 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
+ return;
+}
-diff -urNp linux-3.1.1/grsecurity/grsec_mount.c linux-3.1.1/grsecurity/grsec_mount.c
---- linux-3.1.1/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/grsec_mount.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/grsec_mount.c linux-3.1.3/grsecurity/grsec_mount.c
+--- linux-3.1.3/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/grsec_mount.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,62 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return 0;
+}
-diff -urNp linux-3.1.1/grsecurity/grsec_pax.c linux-3.1.1/grsecurity/grsec_pax.c
---- linux-3.1.1/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/grsec_pax.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/grsec_pax.c linux-3.1.3/grsecurity/grsec_pax.c
+--- linux-3.1.3/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/grsec_pax.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,36 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return;
+}
-diff -urNp linux-3.1.1/grsecurity/grsec_ptrace.c linux-3.1.1/grsecurity/grsec_ptrace.c
---- linux-3.1.1/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/grsec_ptrace.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/grsec_ptrace.c linux-3.1.3/grsecurity/grsec_ptrace.c
+--- linux-3.1.3/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/grsec_ptrace.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,14 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return;
+}
-diff -urNp linux-3.1.1/grsecurity/grsec_sig.c linux-3.1.1/grsecurity/grsec_sig.c
---- linux-3.1.1/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/grsec_sig.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/grsec_sig.c linux-3.1.3/grsecurity/grsec_sig.c
+--- linux-3.1.3/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/grsec_sig.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,206 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return 0;
+}
-diff -urNp linux-3.1.1/grsecurity/grsec_sock.c linux-3.1.1/grsecurity/grsec_sock.c
---- linux-3.1.1/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/grsec_sock.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/grsec_sock.c linux-3.1.3/grsecurity/grsec_sock.c
+--- linux-3.1.3/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/grsec_sock.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,244 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#endif
+ return 0;
+}
-diff -urNp linux-3.1.1/grsecurity/grsec_sysctl.c linux-3.1.1/grsecurity/grsec_sysctl.c
---- linux-3.1.1/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/grsec_sysctl.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/grsec_sysctl.c linux-3.1.3/grsecurity/grsec_sysctl.c
+--- linux-3.1.3/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/grsec_sysctl.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,433 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+ { }
+};
+#endif
-diff -urNp linux-3.1.1/grsecurity/grsec_time.c linux-3.1.1/grsecurity/grsec_time.c
---- linux-3.1.1/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/grsec_time.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/grsec_time.c linux-3.1.3/grsecurity/grsec_time.c
+--- linux-3.1.3/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/grsec_time.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,16 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+}
+
+EXPORT_SYMBOL(gr_log_timechange);
-diff -urNp linux-3.1.1/grsecurity/grsec_tpe.c linux-3.1.1/grsecurity/grsec_tpe.c
---- linux-3.1.1/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/grsec_tpe.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/grsec_tpe.c linux-3.1.3/grsecurity/grsec_tpe.c
+--- linux-3.1.3/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/grsec_tpe.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,39 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#endif
+ return 1;
+}
-diff -urNp linux-3.1.1/grsecurity/grsum.c linux-3.1.1/grsecurity/grsum.c
---- linux-3.1.1/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/grsum.c 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/grsum.c linux-3.1.3/grsecurity/grsum.c
+--- linux-3.1.3/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/grsum.c 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,61 @@
+#include <linux/err.h>
+#include <linux/kernel.h>
+
+ return retval;
+}
-diff -urNp linux-3.1.1/grsecurity/Kconfig linux-3.1.1/grsecurity/Kconfig
---- linux-3.1.1/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/Kconfig 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/Kconfig linux-3.1.3/grsecurity/Kconfig
+--- linux-3.1.3/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/Kconfig 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,1037 @@
+#
+# grecurity configuration
+endmenu
+
+endmenu
-diff -urNp linux-3.1.1/grsecurity/Makefile linux-3.1.1/grsecurity/Makefile
---- linux-3.1.1/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/grsecurity/Makefile 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/grsecurity/Makefile linux-3.1.3/grsecurity/Makefile
+--- linux-3.1.3/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/grsecurity/Makefile 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,36 @@
+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
+# during 2001-2009 it has been completely redesigned by Brad Spengler
+ @-chmod -f 700 .
+ @echo ' grsec: protected kernel image paths'
+endif
-diff -urNp linux-3.1.1/include/acpi/acpi_bus.h linux-3.1.1/include/acpi/acpi_bus.h
---- linux-3.1.1/include/acpi/acpi_bus.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/acpi/acpi_bus.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/acpi/acpi_bus.h linux-3.1.3/include/acpi/acpi_bus.h
+--- linux-3.1.3/include/acpi/acpi_bus.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/acpi/acpi_bus.h 2011-11-16 18:39:08.000000000 -0500
@@ -107,7 +107,7 @@ struct acpi_device_ops {
acpi_op_bind bind;
acpi_op_unbind unbind;
#define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */
-diff -urNp linux-3.1.1/include/asm-generic/atomic-long.h linux-3.1.1/include/asm-generic/atomic-long.h
---- linux-3.1.1/include/asm-generic/atomic-long.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/asm-generic/atomic-long.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/asm-generic/atomic-long.h linux-3.1.3/include/asm-generic/atomic-long.h
+--- linux-3.1.3/include/asm-generic/atomic-long.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/asm-generic/atomic-long.h 2011-11-16 18:39:08.000000000 -0500
@@ -22,6 +22,12 @@
typedef atomic64_t atomic_long_t;
+#endif
+
#endif /* _ASM_GENERIC_ATOMIC_LONG_H */
-diff -urNp linux-3.1.1/include/asm-generic/cache.h linux-3.1.1/include/asm-generic/cache.h
---- linux-3.1.1/include/asm-generic/cache.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/asm-generic/cache.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/asm-generic/cache.h linux-3.1.3/include/asm-generic/cache.h
+--- linux-3.1.3/include/asm-generic/cache.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/asm-generic/cache.h 2011-11-16 18:39:08.000000000 -0500
@@ -6,7 +6,7 @@
* cache lines need to provide their own cache.h.
*/
+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
#endif /* __ASM_GENERIC_CACHE_H */
-diff -urNp linux-3.1.1/include/asm-generic/int-l64.h linux-3.1.1/include/asm-generic/int-l64.h
---- linux-3.1.1/include/asm-generic/int-l64.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/asm-generic/int-l64.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/asm-generic/int-l64.h linux-3.1.3/include/asm-generic/int-l64.h
+--- linux-3.1.3/include/asm-generic/int-l64.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/asm-generic/int-l64.h 2011-11-16 18:39:08.000000000 -0500
@@ -46,6 +46,8 @@ typedef unsigned int u32;
typedef signed long s64;
typedef unsigned long u64;
#define S8_C(x) x
#define U8_C(x) x ## U
#define S16_C(x) x
-diff -urNp linux-3.1.1/include/asm-generic/int-ll64.h linux-3.1.1/include/asm-generic/int-ll64.h
---- linux-3.1.1/include/asm-generic/int-ll64.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/asm-generic/int-ll64.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/asm-generic/int-ll64.h linux-3.1.3/include/asm-generic/int-ll64.h
+--- linux-3.1.3/include/asm-generic/int-ll64.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/asm-generic/int-ll64.h 2011-11-16 18:39:08.000000000 -0500
@@ -51,6 +51,8 @@ typedef unsigned int u32;
typedef signed long long s64;
typedef unsigned long long u64;
#define S8_C(x) x
#define U8_C(x) x ## U
#define S16_C(x) x
-diff -urNp linux-3.1.1/include/asm-generic/kmap_types.h linux-3.1.1/include/asm-generic/kmap_types.h
---- linux-3.1.1/include/asm-generic/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/asm-generic/kmap_types.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/asm-generic/kmap_types.h linux-3.1.3/include/asm-generic/kmap_types.h
+--- linux-3.1.3/include/asm-generic/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/asm-generic/kmap_types.h 2011-11-16 18:39:08.000000000 -0500
@@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE,
KMAP_D(17) KM_NMI,
KMAP_D(18) KM_NMI_PTE,
};
#undef KMAP_D
-diff -urNp linux-3.1.1/include/asm-generic/pgtable.h linux-3.1.1/include/asm-generic/pgtable.h
---- linux-3.1.1/include/asm-generic/pgtable.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/asm-generic/pgtable.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/asm-generic/pgtable.h linux-3.1.3/include/asm-generic/pgtable.h
+--- linux-3.1.3/include/asm-generic/pgtable.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/asm-generic/pgtable.h 2011-11-16 18:39:08.000000000 -0500
@@ -443,6 +443,14 @@ static inline int pmd_write(pmd_t pmd)
#endif /* __HAVE_ARCH_PMD_WRITE */
#endif
#endif /* !__ASSEMBLY__ */
#endif /* _ASM_GENERIC_PGTABLE_H */
-diff -urNp linux-3.1.1/include/asm-generic/pgtable-nopmd.h linux-3.1.1/include/asm-generic/pgtable-nopmd.h
---- linux-3.1.1/include/asm-generic/pgtable-nopmd.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/asm-generic/pgtable-nopmd.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/asm-generic/pgtable-nopmd.h linux-3.1.3/include/asm-generic/pgtable-nopmd.h
+--- linux-3.1.3/include/asm-generic/pgtable-nopmd.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/asm-generic/pgtable-nopmd.h 2011-11-16 18:39:08.000000000 -0500
@@ -1,14 +1,19 @@
#ifndef _PGTABLE_NOPMD_H
#define _PGTABLE_NOPMD_H
/*
* The "pud_xxx()" functions here are trivial for a folded two-level
* setup: the pmd is never bad, and a pmd always exists (as it's folded
-diff -urNp linux-3.1.1/include/asm-generic/pgtable-nopud.h linux-3.1.1/include/asm-generic/pgtable-nopud.h
---- linux-3.1.1/include/asm-generic/pgtable-nopud.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/asm-generic/pgtable-nopud.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/asm-generic/pgtable-nopud.h linux-3.1.3/include/asm-generic/pgtable-nopud.h
+--- linux-3.1.3/include/asm-generic/pgtable-nopud.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/asm-generic/pgtable-nopud.h 2011-11-16 18:39:08.000000000 -0500
@@ -1,10 +1,15 @@
#ifndef _PGTABLE_NOPUD_H
#define _PGTABLE_NOPUD_H
/*
* The "pgd_xxx()" functions here are trivial for a folded two-level
* setup: the pud is never bad, and a pud always exists (as it's folded
-diff -urNp linux-3.1.1/include/asm-generic/vmlinux.lds.h linux-3.1.1/include/asm-generic/vmlinux.lds.h
---- linux-3.1.1/include/asm-generic/vmlinux.lds.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/asm-generic/vmlinux.lds.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/asm-generic/vmlinux.lds.h linux-3.1.3/include/asm-generic/vmlinux.lds.h
+--- linux-3.1.3/include/asm-generic/vmlinux.lds.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/asm-generic/vmlinux.lds.h 2011-11-16 18:39:08.000000000 -0500
@@ -217,6 +217,7 @@
.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start_rodata) = .; \
/**
* PERCPU_SECTION - define output section for percpu area, simple version
-diff -urNp linux-3.1.1/include/drm/drm_crtc_helper.h linux-3.1.1/include/drm/drm_crtc_helper.h
---- linux-3.1.1/include/drm/drm_crtc_helper.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/drm/drm_crtc_helper.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/drm/drm_crtc_helper.h linux-3.1.3/include/drm/drm_crtc_helper.h
+--- linux-3.1.3/include/drm/drm_crtc_helper.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/drm/drm_crtc_helper.h 2011-11-16 18:39:08.000000000 -0500
@@ -74,7 +74,7 @@ struct drm_crtc_helper_funcs {
/* disable crtc when not in use - more explicit than dpms off */
struct drm_connector_helper_funcs {
int (*get_modes)(struct drm_connector *connector);
-diff -urNp linux-3.1.1/include/drm/drmP.h linux-3.1.1/include/drm/drmP.h
---- linux-3.1.1/include/drm/drmP.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/drm/drmP.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/drm/drmP.h linux-3.1.3/include/drm/drmP.h
+--- linux-3.1.3/include/drm/drmP.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/drm/drmP.h 2011-11-16 18:39:08.000000000 -0500
@@ -73,6 +73,7 @@
#include <linux/workqueue.h>
#include <linux/poll.h>
/*@} */
struct list_head filelist;
-diff -urNp linux-3.1.1/include/drm/ttm/ttm_memory.h linux-3.1.1/include/drm/ttm/ttm_memory.h
---- linux-3.1.1/include/drm/ttm/ttm_memory.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/drm/ttm/ttm_memory.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/drm/ttm/ttm_memory.h linux-3.1.3/include/drm/ttm/ttm_memory.h
+--- linux-3.1.3/include/drm/ttm/ttm_memory.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/drm/ttm/ttm_memory.h 2011-11-16 18:39:08.000000000 -0500
@@ -47,7 +47,7 @@
struct ttm_mem_shrink {
/**
* struct ttm_mem_global - Global memory accounting structure.
-diff -urNp linux-3.1.1/include/linux/a.out.h linux-3.1.1/include/linux/a.out.h
---- linux-3.1.1/include/linux/a.out.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/a.out.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/a.out.h linux-3.1.3/include/linux/a.out.h
+--- linux-3.1.3/include/linux/a.out.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/a.out.h 2011-11-16 18:39:08.000000000 -0500
@@ -39,6 +39,14 @@ enum machine_type {
M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
};
#if !defined (N_MAGIC)
#define N_MAGIC(exec) ((exec).a_info & 0xffff)
#endif
-diff -urNp linux-3.1.1/include/linux/atmdev.h linux-3.1.1/include/linux/atmdev.h
---- linux-3.1.1/include/linux/atmdev.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/atmdev.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/atmdev.h linux-3.1.3/include/linux/atmdev.h
+--- linux-3.1.3/include/linux/atmdev.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/atmdev.h 2011-11-16 18:39:08.000000000 -0500
@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
#endif
__AAL_STAT_ITEMS
#undef __HANDLE_ITEM
};
-diff -urNp linux-3.1.1/include/linux/binfmts.h linux-3.1.1/include/linux/binfmts.h
---- linux-3.1.1/include/linux/binfmts.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/binfmts.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/binfmts.h linux-3.1.3/include/linux/binfmts.h
+--- linux-3.1.3/include/linux/binfmts.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/binfmts.h 2011-11-16 18:39:08.000000000 -0500
@@ -88,6 +88,7 @@ struct linux_binfmt {
int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
int (*load_shlib)(struct file *);
unsigned long min_coredump; /* minimal dump size */
};
-diff -urNp linux-3.1.1/include/linux/blkdev.h linux-3.1.1/include/linux/blkdev.h
---- linux-3.1.1/include/linux/blkdev.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/blkdev.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/blkdev.h linux-3.1.3/include/linux/blkdev.h
+--- linux-3.1.3/include/linux/blkdev.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/blkdev.h 2011-11-16 18:39:08.000000000 -0500
@@ -1321,7 +1321,7 @@ struct block_device_operations {
/* this callback is with swap_lock and sometimes page table lock held */
void (*swap_slot_free_notify) (struct block_device *, unsigned long);
extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
unsigned long);
-diff -urNp linux-3.1.1/include/linux/blktrace_api.h linux-3.1.1/include/linux/blktrace_api.h
---- linux-3.1.1/include/linux/blktrace_api.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/blktrace_api.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/blktrace_api.h linux-3.1.3/include/linux/blktrace_api.h
+--- linux-3.1.3/include/linux/blktrace_api.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/blktrace_api.h 2011-11-16 18:39:08.000000000 -0500
@@ -162,7 +162,7 @@ struct blk_trace {
struct dentry *dir;
struct dentry *dropped_file;
};
extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
-diff -urNp linux-3.1.1/include/linux/byteorder/little_endian.h linux-3.1.1/include/linux/byteorder/little_endian.h
---- linux-3.1.1/include/linux/byteorder/little_endian.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/byteorder/little_endian.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/byteorder/little_endian.h linux-3.1.3/include/linux/byteorder/little_endian.h
+--- linux-3.1.3/include/linux/byteorder/little_endian.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/byteorder/little_endian.h 2011-11-16 18:39:08.000000000 -0500
@@ -42,51 +42,51 @@
static inline __le64 __cpu_to_le64p(const __u64 *p)
}
#define __cpu_to_le64s(x) do { (void)(x); } while (0)
#define __le64_to_cpus(x) do { (void)(x); } while (0)
-diff -urNp linux-3.1.1/include/linux/cache.h linux-3.1.1/include/linux/cache.h
---- linux-3.1.1/include/linux/cache.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/cache.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/cache.h linux-3.1.3/include/linux/cache.h
+--- linux-3.1.3/include/linux/cache.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/cache.h 2011-11-16 18:39:08.000000000 -0500
@@ -16,6 +16,10 @@
#define __read_mostly
#endif
#ifndef ____cacheline_aligned
#define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
#endif
-diff -urNp linux-3.1.1/include/linux/capability.h linux-3.1.1/include/linux/capability.h
---- linux-3.1.1/include/linux/capability.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/capability.h 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/capability.h linux-3.1.3/include/linux/capability.h
+--- linux-3.1.3/include/linux/capability.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/capability.h 2011-11-16 18:40:31.000000000 -0500
@@ -547,6 +547,9 @@ extern bool capable(int cap);
extern bool ns_capable(struct user_namespace *ns, int cap);
extern bool task_ns_capable(struct task_struct *t, int cap);
/* audit system wants to get cap info from files as well */
extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
-diff -urNp linux-3.1.1/include/linux/cleancache.h linux-3.1.1/include/linux/cleancache.h
---- linux-3.1.1/include/linux/cleancache.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/cleancache.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/cleancache.h linux-3.1.3/include/linux/cleancache.h
+--- linux-3.1.3/include/linux/cleancache.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/cleancache.h 2011-11-16 18:39:08.000000000 -0500
@@ -31,7 +31,7 @@ struct cleancache_ops {
void (*flush_page)(int, struct cleancache_filekey, pgoff_t);
void (*flush_inode)(int, struct cleancache_filekey);
extern struct cleancache_ops
cleancache_register_ops(struct cleancache_ops *ops);
-diff -urNp linux-3.1.1/include/linux/compiler-gcc4.h linux-3.1.1/include/linux/compiler-gcc4.h
---- linux-3.1.1/include/linux/compiler-gcc4.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/compiler-gcc4.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/compiler-gcc4.h linux-3.1.3/include/linux/compiler-gcc4.h
+--- linux-3.1.3/include/linux/compiler-gcc4.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/compiler-gcc4.h 2011-11-16 18:39:08.000000000 -0500
@@ -31,6 +31,12 @@
#endif
#if __GNUC_MINOR__ > 0
-diff -urNp linux-3.1.1/include/linux/compiler.h linux-3.1.1/include/linux/compiler.h
---- linux-3.1.1/include/linux/compiler.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/compiler.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/compiler.h linux-3.1.3/include/linux/compiler.h
+--- linux-3.1.3/include/linux/compiler.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/compiler.h 2011-11-16 18:39:08.000000000 -0500
@@ -5,31 +5,62 @@
#ifdef __CHECKER__
+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
#endif /* __LINUX_COMPILER_H */
-diff -urNp linux-3.1.1/include/linux/cpuset.h linux-3.1.1/include/linux/cpuset.h
---- linux-3.1.1/include/linux/cpuset.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/cpuset.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/cpuset.h linux-3.1.3/include/linux/cpuset.h
+--- linux-3.1.3/include/linux/cpuset.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/cpuset.h 2011-11-16 18:39:08.000000000 -0500
@@ -118,7 +118,7 @@ static inline void put_mems_allowed(void
* nodemask.
*/
}
static inline void set_mems_allowed(nodemask_t nodemask)
-diff -urNp linux-3.1.1/include/linux/crypto.h linux-3.1.1/include/linux/crypto.h
---- linux-3.1.1/include/linux/crypto.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/crypto.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/crypto.h linux-3.1.3/include/linux/crypto.h
+--- linux-3.1.3/include/linux/crypto.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/crypto.h 2011-11-16 18:39:08.000000000 -0500
@@ -361,7 +361,7 @@ struct cipher_tfm {
const u8 *key, unsigned int keylen);
void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
#define crt_ablkcipher crt_u.ablkcipher
#define crt_aead crt_u.aead
-diff -urNp linux-3.1.1/include/linux/decompress/mm.h linux-3.1.1/include/linux/decompress/mm.h
---- linux-3.1.1/include/linux/decompress/mm.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/decompress/mm.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/decompress/mm.h linux-3.1.3/include/linux/decompress/mm.h
+--- linux-3.1.3/include/linux/decompress/mm.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/decompress/mm.h 2011-11-16 18:39:08.000000000 -0500
@@ -77,7 +77,7 @@ static void free(void *where)
* warnings when not needed (indeed large_malloc / large_free are not
* needed by inflate */
#define free(a) kfree(a)
#define large_malloc(a) vmalloc(a)
-diff -urNp linux-3.1.1/include/linux/dma-mapping.h linux-3.1.1/include/linux/dma-mapping.h
---- linux-3.1.1/include/linux/dma-mapping.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/dma-mapping.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/dma-mapping.h linux-3.1.3/include/linux/dma-mapping.h
+--- linux-3.1.3/include/linux/dma-mapping.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/dma-mapping.h 2011-11-16 18:39:08.000000000 -0500
@@ -42,7 +42,7 @@ struct dma_map_ops {
int (*dma_supported)(struct device *dev, u64 mask);
int (*set_dma_mask)(struct device *dev, u64 mask);
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-diff -urNp linux-3.1.1/include/linux/efi.h linux-3.1.1/include/linux/efi.h
---- linux-3.1.1/include/linux/efi.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/efi.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/efi.h linux-3.1.3/include/linux/efi.h
+--- linux-3.1.3/include/linux/efi.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/efi.h 2011-11-16 18:39:08.000000000 -0500
@@ -446,7 +446,7 @@ struct efivar_operations {
efi_get_variable_t *get_variable;
efi_get_next_variable_t *get_next_variable;
struct efivars {
/*
-diff -urNp linux-3.1.1/include/linux/elf.h linux-3.1.1/include/linux/elf.h
---- linux-3.1.1/include/linux/elf.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/elf.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/elf.h linux-3.1.3/include/linux/elf.h
+--- linux-3.1.3/include/linux/elf.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/elf.h 2011-11-16 18:39:08.000000000 -0500
@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
#define PT_GNU_EH_FRAME 0x6474e550
#endif
-diff -urNp linux-3.1.1/include/linux/firewire.h linux-3.1.1/include/linux/firewire.h
---- linux-3.1.1/include/linux/firewire.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/firewire.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/filter.h linux-3.1.3/include/linux/filter.h
+--- linux-3.1.3/include/linux/filter.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/filter.h 2011-11-20 19:21:53.000000000 -0500
+@@ -134,6 +134,7 @@ struct sock_fprog { /* Required for SO_A
+
+ struct sk_buff;
+ struct sock;
++struct bpf_jit_work;
+
+ struct sk_filter
+ {
+@@ -141,6 +142,9 @@ struct sk_filter
+ unsigned int len; /* Number of filter blocks */
+ unsigned int (*bpf_func)(const struct sk_buff *skb,
+ const struct sock_filter *filter);
++#ifdef CONFIG_BPF_JIT
++ struct bpf_jit_work *work;
++#endif
+ struct rcu_head rcu;
+ struct sock_filter insns[0];
+ };
+diff -urNp linux-3.1.3/include/linux/firewire.h linux-3.1.3/include/linux/firewire.h
+--- linux-3.1.3/include/linux/firewire.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/firewire.h 2011-11-16 18:39:08.000000000 -0500
@@ -428,7 +428,7 @@ struct fw_iso_context {
union {
fw_iso_callback_t sc;
void *callback_data;
};
-diff -urNp linux-3.1.1/include/linux/fscache-cache.h linux-3.1.1/include/linux/fscache-cache.h
---- linux-3.1.1/include/linux/fscache-cache.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/fscache-cache.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/fscache-cache.h linux-3.1.3/include/linux/fscache-cache.h
+--- linux-3.1.3/include/linux/fscache-cache.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/fscache-cache.h 2011-11-16 18:39:08.000000000 -0500
@@ -102,7 +102,7 @@ struct fscache_operation {
fscache_operation_release_t release;
};
op->processor = processor;
op->release = release;
INIT_LIST_HEAD(&op->pend_link);
-diff -urNp linux-3.1.1/include/linux/fs.h linux-3.1.1/include/linux/fs.h
---- linux-3.1.1/include/linux/fs.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/fs.h 2011-11-16 23:39:39.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/fs.h linux-3.1.3/include/linux/fs.h
+--- linux-3.1.3/include/linux/fs.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/fs.h 2011-11-16 23:39:39.000000000 -0500
@@ -1588,7 +1588,8 @@ struct file_operations {
int (*setlease)(struct file *, long, struct file_lock **);
long (*fallocate)(struct file *file, int mode, loff_t offset,
struct inode_operations {
struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
-diff -urNp linux-3.1.1/include/linux/fsnotify.h linux-3.1.1/include/linux/fsnotify.h
---- linux-3.1.1/include/linux/fsnotify.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/fsnotify.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/fsnotify.h linux-3.1.3/include/linux/fsnotify.h
+--- linux-3.1.3/include/linux/fsnotify.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/fsnotify.h 2011-11-16 18:39:08.000000000 -0500
@@ -314,7 +314,7 @@ static inline void fsnotify_change(struc
*/
static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
}
/*
-diff -urNp linux-3.1.1/include/linux/fs_struct.h linux-3.1.1/include/linux/fs_struct.h
---- linux-3.1.1/include/linux/fs_struct.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/fs_struct.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/fs_struct.h linux-3.1.3/include/linux/fs_struct.h
+--- linux-3.1.3/include/linux/fs_struct.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/fs_struct.h 2011-11-16 18:39:08.000000000 -0500
@@ -6,7 +6,7 @@
#include <linux/seqlock.h>
spinlock_t lock;
seqcount_t seq;
int umask;
-diff -urNp linux-3.1.1/include/linux/ftrace_event.h linux-3.1.1/include/linux/ftrace_event.h
---- linux-3.1.1/include/linux/ftrace_event.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/ftrace_event.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/ftrace_event.h linux-3.1.3/include/linux/ftrace_event.h
+--- linux-3.1.3/include/linux/ftrace_event.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/ftrace_event.h 2011-11-16 18:39:08.000000000 -0500
@@ -97,7 +97,7 @@ struct trace_event_functions {
trace_print_func raw;
trace_print_func hex;
int trace_set_clr_event(const char *system, const char *event, int set);
-diff -urNp linux-3.1.1/include/linux/genhd.h linux-3.1.1/include/linux/genhd.h
---- linux-3.1.1/include/linux/genhd.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/genhd.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/genhd.h linux-3.1.3/include/linux/genhd.h
+--- linux-3.1.3/include/linux/genhd.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/genhd.h 2011-11-16 18:39:08.000000000 -0500
@@ -184,7 +184,7 @@ struct gendisk {
struct kobject *slave_dir;
struct disk_events *ev;
#ifdef CONFIG_BLK_DEV_INTEGRITY
struct blk_integrity *integrity;
-diff -urNp linux-3.1.1/include/linux/gracl.h linux-3.1.1/include/linux/gracl.h
---- linux-3.1.1/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/include/linux/gracl.h 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/gracl.h linux-3.1.3/include/linux/gracl.h
+--- linux-3.1.3/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/include/linux/gracl.h 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,317 @@
+#ifndef GR_ACL_H
+#define GR_ACL_H
+
+#endif
+
-diff -urNp linux-3.1.1/include/linux/gralloc.h linux-3.1.1/include/linux/gralloc.h
---- linux-3.1.1/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/include/linux/gralloc.h 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/gralloc.h linux-3.1.3/include/linux/gralloc.h
+--- linux-3.1.3/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/include/linux/gralloc.h 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,9 @@
+#ifndef __GRALLOC_H
+#define __GRALLOC_H
+void *acl_alloc_num(unsigned long num, unsigned long len);
+
+#endif
-diff -urNp linux-3.1.1/include/linux/grdefs.h linux-3.1.1/include/linux/grdefs.h
---- linux-3.1.1/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/include/linux/grdefs.h 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/grdefs.h linux-3.1.3/include/linux/grdefs.h
+--- linux-3.1.3/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/include/linux/grdefs.h 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,140 @@
+#ifndef GRDEFS_H
+#define GRDEFS_H
+};
+
+#endif
-diff -urNp linux-3.1.1/include/linux/grinternal.h linux-3.1.1/include/linux/grinternal.h
---- linux-3.1.1/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/include/linux/grinternal.h 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/grinternal.h linux-3.1.3/include/linux/grinternal.h
+--- linux-3.1.3/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/include/linux/grinternal.h 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,220 @@
+#ifndef __GRINTERNAL_H
+#define __GRINTERNAL_H
+#endif
+
+#endif
-diff -urNp linux-3.1.1/include/linux/grmsg.h linux-3.1.1/include/linux/grmsg.h
---- linux-3.1.1/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/include/linux/grmsg.h 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/grmsg.h linux-3.1.3/include/linux/grmsg.h
+--- linux-3.1.3/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/include/linux/grmsg.h 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,108 @@
+#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
+#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
+#define GR_VM86_MSG "denied use of vm86 by "
+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
-diff -urNp linux-3.1.1/include/linux/grsecurity.h linux-3.1.1/include/linux/grsecurity.h
---- linux-3.1.1/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/include/linux/grsecurity.h 2011-11-17 00:16:10.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/grsecurity.h linux-3.1.3/include/linux/grsecurity.h
+--- linux-3.1.3/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/include/linux/grsecurity.h 2011-11-17 00:16:10.000000000 -0500
@@ -0,0 +1,228 @@
+#ifndef GR_SECURITY_H
+#define GR_SECURITY_H
+#endif
+
+#endif
-diff -urNp linux-3.1.1/include/linux/grsock.h linux-3.1.1/include/linux/grsock.h
---- linux-3.1.1/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/include/linux/grsock.h 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/grsock.h linux-3.1.3/include/linux/grsock.h
+--- linux-3.1.3/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/include/linux/grsock.h 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,19 @@
+#ifndef __GRSOCK_H
+#define __GRSOCK_H
+ const int protocol);
+
+#endif
-diff -urNp linux-3.1.1/include/linux/hid.h linux-3.1.1/include/linux/hid.h
---- linux-3.1.1/include/linux/hid.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/hid.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/hid.h linux-3.1.3/include/linux/hid.h
+--- linux-3.1.3/include/linux/hid.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/hid.h 2011-11-16 18:39:08.000000000 -0500
@@ -676,7 +676,7 @@ struct hid_ll_driver {
unsigned int code, int value);
#define PM_HINT_FULLON 1<<5
#define PM_HINT_NORMAL 1<<1
-diff -urNp linux-3.1.1/include/linux/highmem.h linux-3.1.1/include/linux/highmem.h
---- linux-3.1.1/include/linux/highmem.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/highmem.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/highmem.h linux-3.1.3/include/linux/highmem.h
+--- linux-3.1.3/include/linux/highmem.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/highmem.h 2011-11-16 18:39:08.000000000 -0500
@@ -185,6 +185,18 @@ static inline void clear_highpage(struct
kunmap_atomic(kaddr, KM_USER0);
}
static inline void zero_user_segments(struct page *page,
unsigned start1, unsigned end1,
unsigned start2, unsigned end2)
-diff -urNp linux-3.1.1/include/linux/i2c.h linux-3.1.1/include/linux/i2c.h
---- linux-3.1.1/include/linux/i2c.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/i2c.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/i2c.h linux-3.1.3/include/linux/i2c.h
+--- linux-3.1.3/include/linux/i2c.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/i2c.h 2011-11-16 18:39:08.000000000 -0500
@@ -346,6 +346,7 @@ struct i2c_algorithm {
/* To determine what the adapter supports */
u32 (*functionality) (struct i2c_adapter *);
/*
* i2c_adapter is the structure used to identify a physical i2c bus along
-diff -urNp linux-3.1.1/include/linux/i2o.h linux-3.1.1/include/linux/i2o.h
---- linux-3.1.1/include/linux/i2o.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/i2o.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/i2o.h linux-3.1.3/include/linux/i2o.h
+--- linux-3.1.3/include/linux/i2o.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/i2o.h 2011-11-16 18:39:08.000000000 -0500
@@ -564,7 +564,7 @@ struct i2o_controller {
struct i2o_device *exec; /* Executive */
#if BITS_PER_LONG == 64
struct list_head context_list; /* list of context id's
and pointers */
#endif
-diff -urNp linux-3.1.1/include/linux/init.h linux-3.1.1/include/linux/init.h
---- linux-3.1.1/include/linux/init.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/init.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/init.h linux-3.1.3/include/linux/init.h
+--- linux-3.1.3/include/linux/init.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/init.h 2011-11-16 18:39:08.000000000 -0500
@@ -293,13 +293,13 @@ void __init parse_early_options(char *cm
/* Each module must use one module_init(). */
{ return exitfn; } \
void cleanup_module(void) __attribute__((alias(#exitfn)));
-diff -urNp linux-3.1.1/include/linux/init_task.h linux-3.1.1/include/linux/init_task.h
---- linux-3.1.1/include/linux/init_task.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/init_task.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/init_task.h linux-3.1.3/include/linux/init_task.h
+--- linux-3.1.3/include/linux/init_task.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/init_task.h 2011-11-16 18:39:08.000000000 -0500
@@ -126,6 +126,12 @@ extern struct cred init_cred;
# define INIT_PERF_EVENTS(tsk)
#endif
.fs = &init_fs, \
.files = &init_files, \
.signal = &init_signals, \
-diff -urNp linux-3.1.1/include/linux/intel-iommu.h linux-3.1.1/include/linux/intel-iommu.h
---- linux-3.1.1/include/linux/intel-iommu.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/intel-iommu.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/intel-iommu.h linux-3.1.3/include/linux/intel-iommu.h
+--- linux-3.1.3/include/linux/intel-iommu.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/intel-iommu.h 2011-11-16 18:39:08.000000000 -0500
@@ -296,7 +296,7 @@ struct iommu_flush {
u8 fm, u64 type);
void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
enum {
SR_DMAR_FECTL_REG,
-diff -urNp linux-3.1.1/include/linux/interrupt.h linux-3.1.1/include/linux/interrupt.h
---- linux-3.1.1/include/linux/interrupt.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/interrupt.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/interrupt.h linux-3.1.3/include/linux/interrupt.h
+--- linux-3.1.3/include/linux/interrupt.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/interrupt.h 2011-11-16 18:39:08.000000000 -0500
@@ -425,7 +425,7 @@ enum
/* map softirq index to softirq name. update 'softirq_to_name' in
* kernel/softirq.c when adding a new softirq.
extern void softirq_init(void);
static inline void __raise_softirq_irqoff(unsigned int nr)
{
-diff -urNp linux-3.1.1/include/linux/kallsyms.h linux-3.1.1/include/linux/kallsyms.h
---- linux-3.1.1/include/linux/kallsyms.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/kallsyms.h 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/kallsyms.h linux-3.1.3/include/linux/kallsyms.h
+--- linux-3.1.3/include/linux/kallsyms.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/kallsyms.h 2011-11-16 18:40:31.000000000 -0500
@@ -15,7 +15,8 @@
struct module;
/* This macro allows us to keep printk typechecking */
static void __check_printsym_format(const char *fmt, ...)
-diff -urNp linux-3.1.1/include/linux/kgdb.h linux-3.1.1/include/linux/kgdb.h
---- linux-3.1.1/include/linux/kgdb.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/kgdb.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/kgdb.h linux-3.1.3/include/linux/kgdb.h
+--- linux-3.1.3/include/linux/kgdb.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/kgdb.h 2011-11-16 18:39:08.000000000 -0500
@@ -53,7 +53,7 @@ extern int kgdb_connected;
extern int kgdb_io_module_registered;
extern struct kgdb_arch arch_kgdb_ops;
-diff -urNp linux-3.1.1/include/linux/kmod.h linux-3.1.1/include/linux/kmod.h
---- linux-3.1.1/include/linux/kmod.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/kmod.h 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/kmod.h linux-3.1.3/include/linux/kmod.h
+--- linux-3.1.3/include/linux/kmod.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/kmod.h 2011-11-16 18:40:31.000000000 -0500
@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysc
* usually useless though. */
extern int __request_module(bool wait, const char *name, ...) \
#define request_module(mod...) __request_module(true, mod)
#define request_module_nowait(mod...) __request_module(false, mod)
#define try_then_request_module(x, mod...) \
-diff -urNp linux-3.1.1/include/linux/kvm_host.h linux-3.1.1/include/linux/kvm_host.h
---- linux-3.1.1/include/linux/kvm_host.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/kvm_host.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/kvm_host.h linux-3.1.3/include/linux/kvm_host.h
+--- linux-3.1.3/include/linux/kvm_host.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/kvm_host.h 2011-11-16 18:39:08.000000000 -0500
@@ -308,7 +308,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
void vcpu_load(struct kvm_vcpu *vcpu);
void vcpu_put(struct kvm_vcpu *vcpu);
void kvm_arch_exit(void);
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff -urNp linux-3.1.1/include/linux/libata.h linux-3.1.1/include/linux/libata.h
---- linux-3.1.1/include/linux/libata.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/libata.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/libata.h linux-3.1.3/include/linux/libata.h
+--- linux-3.1.3/include/linux/libata.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/libata.h 2011-11-16 18:39:08.000000000 -0500
@@ -909,7 +909,7 @@ struct ata_port_operations {
* fields must be pointers.
*/
struct ata_port_info {
unsigned long flags;
-diff -urNp linux-3.1.1/include/linux/mca.h linux-3.1.1/include/linux/mca.h
---- linux-3.1.1/include/linux/mca.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/mca.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/mca.h linux-3.1.3/include/linux/mca.h
+--- linux-3.1.3/include/linux/mca.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/mca.h 2011-11-16 18:39:08.000000000 -0500
@@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
int region);
void * (*mca_transform_memory)(struct mca_device *,
struct mca_bus {
u64 default_dma_mask;
-diff -urNp linux-3.1.1/include/linux/memory.h linux-3.1.1/include/linux/memory.h
---- linux-3.1.1/include/linux/memory.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/memory.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/memory.h linux-3.1.3/include/linux/memory.h
+--- linux-3.1.3/include/linux/memory.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/memory.h 2011-11-16 18:39:08.000000000 -0500
@@ -144,7 +144,7 @@ struct memory_accessor {
size_t count);
ssize_t (*write)(struct memory_accessor *, const char *buf,
/*
* Kernel text modification mutex, used for code patching. Users of this lock
-diff -urNp linux-3.1.1/include/linux/mfd/abx500.h linux-3.1.1/include/linux/mfd/abx500.h
---- linux-3.1.1/include/linux/mfd/abx500.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/mfd/abx500.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/mfd/abx500.h linux-3.1.3/include/linux/mfd/abx500.h
+--- linux-3.1.3/include/linux/mfd/abx500.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/mfd/abx500.h 2011-11-16 18:39:08.000000000 -0500
@@ -234,6 +234,7 @@ struct abx500_ops {
int (*event_registers_startup_state_get) (struct device *, u8 *);
int (*startup_irq_enabled) (struct device *, unsigned int);
int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
void abx500_remove_ops(struct device *dev);
-diff -urNp linux-3.1.1/include/linux/mm.h linux-3.1.1/include/linux/mm.h
---- linux-3.1.1/include/linux/mm.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/mm.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/mm.h linux-3.1.3/include/linux/mm.h
+--- linux-3.1.3/include/linux/mm.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/mm.h 2011-11-16 18:39:08.000000000 -0500
@@ -114,7 +114,14 @@ extern unsigned int kobjsize(const void
#define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
+
#endif /* __KERNEL__ */
#endif /* _LINUX_MM_H */
-diff -urNp linux-3.1.1/include/linux/mm_types.h linux-3.1.1/include/linux/mm_types.h
---- linux-3.1.1/include/linux/mm_types.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/mm_types.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/mm_types.h linux-3.1.3/include/linux/mm_types.h
+--- linux-3.1.3/include/linux/mm_types.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/mm_types.h 2011-11-16 18:39:08.000000000 -0500
@@ -230,6 +230,8 @@ struct vm_area_struct {
#ifdef CONFIG_NUMA
struct mempolicy *vm_policy; /* NUMA policy for the VMA */
};
static inline void mm_init_cpumask(struct mm_struct *mm)
-diff -urNp linux-3.1.1/include/linux/mmu_notifier.h linux-3.1.1/include/linux/mmu_notifier.h
---- linux-3.1.1/include/linux/mmu_notifier.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/mmu_notifier.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/mmu_notifier.h linux-3.1.3/include/linux/mmu_notifier.h
+--- linux-3.1.3/include/linux/mmu_notifier.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/mmu_notifier.h 2011-11-16 18:39:08.000000000 -0500
@@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destr
*/
#define ptep_clear_flush_notify(__vma, __address, __ptep) \
})
#define pmdp_clear_flush_notify(__vma, __address, __pmdp) \
-diff -urNp linux-3.1.1/include/linux/mmzone.h linux-3.1.1/include/linux/mmzone.h
---- linux-3.1.1/include/linux/mmzone.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/mmzone.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/mmzone.h linux-3.1.3/include/linux/mmzone.h
+--- linux-3.1.3/include/linux/mmzone.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/mmzone.h 2011-11-16 18:39:08.000000000 -0500
@@ -356,7 +356,7 @@ struct zone {
unsigned long flags; /* zone flags, see below */
/*
* The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
-diff -urNp linux-3.1.1/include/linux/mod_devicetable.h linux-3.1.1/include/linux/mod_devicetable.h
---- linux-3.1.1/include/linux/mod_devicetable.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/mod_devicetable.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/mod_devicetable.h linux-3.1.3/include/linux/mod_devicetable.h
+--- linux-3.1.3/include/linux/mod_devicetable.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/mod_devicetable.h 2011-11-16 18:39:08.000000000 -0500
@@ -12,7 +12,7 @@
typedef unsigned long kernel_ulong_t;
#endif
struct hid_device_id {
__u16 bus;
-diff -urNp linux-3.1.1/include/linux/module.h linux-3.1.1/include/linux/module.h
---- linux-3.1.1/include/linux/module.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/module.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/module.h linux-3.1.3/include/linux/module.h
+--- linux-3.1.3/include/linux/module.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/module.h 2011-11-16 18:39:08.000000000 -0500
@@ -16,6 +16,7 @@
#include <linux/kobject.h>
#include <linux/moduleparam.h>
}
/* Search for module by name: must hold module_mutex. */
-diff -urNp linux-3.1.1/include/linux/moduleloader.h linux-3.1.1/include/linux/moduleloader.h
---- linux-3.1.1/include/linux/moduleloader.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/moduleloader.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/moduleloader.h linux-3.1.3/include/linux/moduleloader.h
+--- linux-3.1.3/include/linux/moduleloader.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/moduleloader.h 2011-11-16 18:39:08.000000000 -0500
@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(st
sections. Returns NULL on failure. */
void *module_alloc(unsigned long size);
/* Apply the given relocation to the (simplified) ELF. Return -error
or 0. */
int apply_relocate(Elf_Shdr *sechdrs,
-diff -urNp linux-3.1.1/include/linux/moduleparam.h linux-3.1.1/include/linux/moduleparam.h
---- linux-3.1.1/include/linux/moduleparam.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/moduleparam.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/moduleparam.h linux-3.1.3/include/linux/moduleparam.h
+--- linux-3.1.3/include/linux/moduleparam.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/moduleparam.h 2011-11-16 18:39:08.000000000 -0500
@@ -255,7 +255,7 @@ static inline void __kernel_param_unlock
* @len is usually just sizeof(string).
*/
= { .max = ARRAY_SIZE(array), .num = nump, \
.ops = ¶m_ops_##type, \
.elemsize = sizeof(array[0]), .elem = array }; \
-diff -urNp linux-3.1.1/include/linux/namei.h linux-3.1.1/include/linux/namei.h
---- linux-3.1.1/include/linux/namei.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/namei.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/namei.h linux-3.1.3/include/linux/namei.h
+--- linux-3.1.3/include/linux/namei.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/namei.h 2011-11-16 18:39:08.000000000 -0500
@@ -24,7 +24,7 @@ struct nameidata {
unsigned seq;
int last_type;
{
return nd->saved_names[nd->depth];
}
-diff -urNp linux-3.1.1/include/linux/netdevice.h linux-3.1.1/include/linux/netdevice.h
---- linux-3.1.1/include/linux/netdevice.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/netdevice.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/netdevice.h linux-3.1.3/include/linux/netdevice.h
+--- linux-3.1.3/include/linux/netdevice.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/netdevice.h 2011-11-16 18:39:08.000000000 -0500
@@ -944,6 +944,7 @@ struct net_device_ops {
int (*ndo_set_features)(struct net_device *dev,
u32 features);
/*
* The DEVICE structure.
-diff -urNp linux-3.1.1/include/linux/netfilter/xt_gradm.h linux-3.1.1/include/linux/netfilter/xt_gradm.h
---- linux-3.1.1/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/include/linux/netfilter/xt_gradm.h 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/netfilter/xt_gradm.h linux-3.1.3/include/linux/netfilter/xt_gradm.h
+--- linux-3.1.3/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/include/linux/netfilter/xt_gradm.h 2011-11-16 18:40:31.000000000 -0500
@@ -0,0 +1,9 @@
+#ifndef _LINUX_NETFILTER_XT_GRADM_H
+#define _LINUX_NETFILTER_XT_GRADM_H 1
+};
+
+#endif
-diff -urNp linux-3.1.1/include/linux/of_pdt.h linux-3.1.1/include/linux/of_pdt.h
---- linux-3.1.1/include/linux/of_pdt.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/of_pdt.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/of_pdt.h linux-3.1.3/include/linux/of_pdt.h
+--- linux-3.1.3/include/linux/of_pdt.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/of_pdt.h 2011-11-16 18:39:08.000000000 -0500
@@ -32,7 +32,7 @@ struct of_pdt_ops {
/* return 0 on success; fill in 'len' with number of bytes in path */
extern void *prom_early_alloc(unsigned long size);
-diff -urNp linux-3.1.1/include/linux/oprofile.h linux-3.1.1/include/linux/oprofile.h
---- linux-3.1.1/include/linux/oprofile.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/oprofile.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/oprofile.h linux-3.1.3/include/linux/oprofile.h
+--- linux-3.1.3/include/linux/oprofile.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/oprofile.h 2011-11-16 18:39:08.000000000 -0500
@@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super
int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
char const * name, ulong * val);
/** create a directory */
struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
-diff -urNp linux-3.1.1/include/linux/padata.h linux-3.1.1/include/linux/padata.h
---- linux-3.1.1/include/linux/padata.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/padata.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/padata.h linux-3.1.3/include/linux/padata.h
+--- linux-3.1.3/include/linux/padata.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/padata.h 2011-11-16 18:39:08.000000000 -0500
@@ -129,7 +129,7 @@ struct parallel_data {
struct padata_instance *pinst;
struct padata_parallel_queue __percpu *pqueue;
atomic_t reorder_objects;
atomic_t refcnt;
unsigned int max_seq_nr;
-diff -urNp linux-3.1.1/include/linux/perf_event.h linux-3.1.1/include/linux/perf_event.h
---- linux-3.1.1/include/linux/perf_event.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/perf_event.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/perf_event.h linux-3.1.3/include/linux/perf_event.h
+--- linux-3.1.3/include/linux/perf_event.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/perf_event.h 2011-11-16 18:39:08.000000000 -0500
@@ -745,8 +745,8 @@ struct perf_event {
enum perf_event_active_state state;
/*
* Protect attach/detach and child_list:
-diff -urNp linux-3.1.1/include/linux/pipe_fs_i.h linux-3.1.1/include/linux/pipe_fs_i.h
---- linux-3.1.1/include/linux/pipe_fs_i.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/pipe_fs_i.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/pipe_fs_i.h linux-3.1.3/include/linux/pipe_fs_i.h
+--- linux-3.1.3/include/linux/pipe_fs_i.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/pipe_fs_i.h 2011-11-16 18:39:08.000000000 -0500
@@ -46,9 +46,9 @@ struct pipe_buffer {
struct pipe_inode_info {
wait_queue_head_t wait;
unsigned int r_counter;
unsigned int w_counter;
struct page *tmp_page;
-diff -urNp linux-3.1.1/include/linux/pm_runtime.h linux-3.1.1/include/linux/pm_runtime.h
---- linux-3.1.1/include/linux/pm_runtime.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/pm_runtime.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/pm_runtime.h linux-3.1.3/include/linux/pm_runtime.h
+--- linux-3.1.3/include/linux/pm_runtime.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/pm_runtime.h 2011-11-16 18:39:08.000000000 -0500
@@ -99,7 +99,7 @@ static inline bool pm_runtime_callbacks_
static inline void pm_runtime_mark_last_busy(struct device *dev)
}
#else /* !CONFIG_PM_RUNTIME */
-diff -urNp linux-3.1.1/include/linux/poison.h linux-3.1.1/include/linux/poison.h
---- linux-3.1.1/include/linux/poison.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/poison.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/poison.h linux-3.1.3/include/linux/poison.h
+--- linux-3.1.3/include/linux/poison.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/poison.h 2011-11-16 18:39:08.000000000 -0500
@@ -19,8 +19,8 @@
* under normal circumstances, used to verify that nobody uses
* non-initialized list entries.
/********** include/linux/timer.h **********/
/*
-diff -urNp linux-3.1.1/include/linux/preempt.h linux-3.1.1/include/linux/preempt.h
---- linux-3.1.1/include/linux/preempt.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/preempt.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/preempt.h linux-3.1.3/include/linux/preempt.h
+--- linux-3.1.3/include/linux/preempt.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/preempt.h 2011-11-16 18:39:08.000000000 -0500
@@ -123,7 +123,7 @@ struct preempt_ops {
void (*sched_in)(struct preempt_notifier *notifier, int cpu);
void (*sched_out)(struct preempt_notifier *notifier,
/**
* preempt_notifier - key for installing preemption notifiers
-diff -urNp linux-3.1.1/include/linux/proc_fs.h linux-3.1.1/include/linux/proc_fs.h
---- linux-3.1.1/include/linux/proc_fs.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/proc_fs.h 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/proc_fs.h linux-3.1.3/include/linux/proc_fs.h
+--- linux-3.1.3/include/linux/proc_fs.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/proc_fs.h 2011-11-16 18:40:31.000000000 -0500
@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
return proc_create_data(name, mode, parent, proc_fops, NULL);
}
struct ctl_table_header;
struct ctl_table;
-diff -urNp linux-3.1.1/include/linux/ptrace.h linux-3.1.1/include/linux/ptrace.h
---- linux-3.1.1/include/linux/ptrace.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/ptrace.h 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/ptrace.h linux-3.1.3/include/linux/ptrace.h
+--- linux-3.1.3/include/linux/ptrace.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/ptrace.h 2011-11-16 18:40:31.000000000 -0500
@@ -129,10 +129,10 @@ extern void __ptrace_unlink(struct task_
extern void exit_ptrace(struct task_struct *tracer);
#define PTRACE_MODE_READ 1
static inline int ptrace_reparented(struct task_struct *child)
{
-diff -urNp linux-3.1.1/include/linux/random.h linux-3.1.1/include/linux/random.h
---- linux-3.1.1/include/linux/random.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/random.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/random.h linux-3.1.3/include/linux/random.h
+--- linux-3.1.3/include/linux/random.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/random.h 2011-11-16 18:39:08.000000000 -0500
@@ -69,12 +69,17 @@ void srandom32(u32 seed);
u32 prandom32(struct rnd_state *);
}
/**
-diff -urNp linux-3.1.1/include/linux/reboot.h linux-3.1.1/include/linux/reboot.h
---- linux-3.1.1/include/linux/reboot.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/reboot.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/reboot.h linux-3.1.3/include/linux/reboot.h
+--- linux-3.1.3/include/linux/reboot.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/reboot.h 2011-11-16 18:39:08.000000000 -0500
@@ -52,9 +52,9 @@ extern int unregister_reboot_notifier(st
* Architecture-specific implementations of sys_reboot commands.
*/
#include <asm/emergency-restart.h>
#endif
-diff -urNp linux-3.1.1/include/linux/reiserfs_fs.h linux-3.1.1/include/linux/reiserfs_fs.h
---- linux-3.1.1/include/linux/reiserfs_fs.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/reiserfs_fs.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/reiserfs_fs.h linux-3.1.3/include/linux/reiserfs_fs.h
+--- linux-3.1.3/include/linux/reiserfs_fs.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/reiserfs_fs.h 2011-11-16 18:39:08.000000000 -0500
@@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset
#define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
#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) \
-diff -urNp linux-3.1.1/include/linux/reiserfs_fs_sb.h linux-3.1.1/include/linux/reiserfs_fs_sb.h
---- linux-3.1.1/include/linux/reiserfs_fs_sb.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/reiserfs_fs_sb.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/reiserfs_fs_sb.h linux-3.1.3/include/linux/reiserfs_fs_sb.h
+--- linux-3.1.3/include/linux/reiserfs_fs_sb.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/reiserfs_fs_sb.h 2011-11-16 18:39:08.000000000 -0500
@@ -386,7 +386,7 @@ struct reiserfs_sb_info {
/* Comment? -Hans */
wait_queue_head_t s_wait;
// tree gets re-balanced
unsigned long s_properties; /* File system properties. Currently holds
on-disk FS format */
-diff -urNp linux-3.1.1/include/linux/relay.h linux-3.1.1/include/linux/relay.h
---- linux-3.1.1/include/linux/relay.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/relay.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/relay.h linux-3.1.3/include/linux/relay.h
+--- linux-3.1.3/include/linux/relay.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/relay.h 2011-11-16 18:39:08.000000000 -0500
@@ -159,7 +159,7 @@ struct rchan_callbacks
* The callback should return 0 if successful, negative if not.
*/
/*
* CONFIG_RELAY kernel API, kernel/relay.c
-diff -urNp linux-3.1.1/include/linux/rfkill.h linux-3.1.1/include/linux/rfkill.h
---- linux-3.1.1/include/linux/rfkill.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/rfkill.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/rfkill.h linux-3.1.3/include/linux/rfkill.h
+--- linux-3.1.3/include/linux/rfkill.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/rfkill.h 2011-11-16 18:39:08.000000000 -0500
@@ -147,6 +147,7 @@ struct rfkill_ops {
void (*query)(struct rfkill *rfkill, void *data);
int (*set_block)(void *data, bool blocked);
#if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
/**
-diff -urNp linux-3.1.1/include/linux/rmap.h linux-3.1.1/include/linux/rmap.h
---- linux-3.1.1/include/linux/rmap.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/rmap.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/rmap.h linux-3.1.3/include/linux/rmap.h
+--- linux-3.1.3/include/linux/rmap.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/rmap.h 2011-11-16 18:39:08.000000000 -0500
@@ -119,8 +119,8 @@ static inline void anon_vma_unlock(struc
void anon_vma_init(void); /* create anon_vma_cachep */
int anon_vma_prepare(struct vm_area_struct *);
void __anon_vma_link(struct vm_area_struct *);
static inline void anon_vma_merge(struct vm_area_struct *vma,
-diff -urNp linux-3.1.1/include/linux/sched.h linux-3.1.1/include/linux/sched.h
---- linux-3.1.1/include/linux/sched.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/sched.h 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/sched.h linux-3.1.3/include/linux/sched.h
+--- linux-3.1.3/include/linux/sched.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/sched.h 2011-11-16 18:40:31.000000000 -0500
@@ -100,6 +100,7 @@ struct bio_list;
struct fs_struct;
struct perf_event_context;
extern void thread_info_cache_init(void);
#ifdef CONFIG_DEBUG_STACK_USAGE
-diff -urNp linux-3.1.1/include/linux/screen_info.h linux-3.1.1/include/linux/screen_info.h
---- linux-3.1.1/include/linux/screen_info.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/screen_info.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/screen_info.h linux-3.1.3/include/linux/screen_info.h
+--- linux-3.1.3/include/linux/screen_info.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/screen_info.h 2011-11-16 18:39:08.000000000 -0500
@@ -43,7 +43,8 @@ struct screen_info {
__u16 pages; /* 0x32 */
__u16 vesa_attributes; /* 0x34 */
} __attribute__((packed));
#define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
-diff -urNp linux-3.1.1/include/linux/security.h linux-3.1.1/include/linux/security.h
---- linux-3.1.1/include/linux/security.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/security.h 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/security.h linux-3.1.3/include/linux/security.h
+--- linux-3.1.3/include/linux/security.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/security.h 2011-11-16 18:40:31.000000000 -0500
@@ -36,6 +36,7 @@
#include <linux/key.h>
#include <linux/xfrm.h>
#include <net/flow.h>
/* Maximum number of letters for an LSM name string */
-diff -urNp linux-3.1.1/include/linux/seq_file.h linux-3.1.1/include/linux/seq_file.h
---- linux-3.1.1/include/linux/seq_file.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/seq_file.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/seq_file.h linux-3.1.3/include/linux/seq_file.h
+--- linux-3.1.3/include/linux/seq_file.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/seq_file.h 2011-11-16 18:39:08.000000000 -0500
@@ -33,6 +33,7 @@ struct seq_operations {
void * (*next) (struct seq_file *m, void *v, loff_t *pos);
int (*show) (struct seq_file *m, void *v);
#define SEQ_SKIP 1
-diff -urNp linux-3.1.1/include/linux/shm.h linux-3.1.1/include/linux/shm.h
---- linux-3.1.1/include/linux/shm.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/shm.h 2011-11-16 18:59:58.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/shm.h linux-3.1.3/include/linux/shm.h
+--- linux-3.1.3/include/linux/shm.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/shm.h 2011-11-16 18:59:58.000000000 -0500
@@ -98,6 +98,10 @@ struct shmid_kernel /* private to the ke
/* The task created the shm object. NULL if the task is dead. */
};
/* shm_mode upper byte flags */
-diff -urNp linux-3.1.1/include/linux/skbuff.h linux-3.1.1/include/linux/skbuff.h
---- linux-3.1.1/include/linux/skbuff.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/skbuff.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/skbuff.h linux-3.1.3/include/linux/skbuff.h
+--- linux-3.1.3/include/linux/skbuff.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/skbuff.h 2011-11-16 18:39:08.000000000 -0500
@@ -610,7 +610,7 @@ static inline struct skb_shared_hwtstamp
*/
static inline int skb_queue_empty(const struct sk_buff_head *list)
#endif
extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
-diff -urNp linux-3.1.1/include/linux/slab_def.h linux-3.1.1/include/linux/slab_def.h
---- linux-3.1.1/include/linux/slab_def.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/slab_def.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/slab_def.h linux-3.1.3/include/linux/slab_def.h
+--- linux-3.1.3/include/linux/slab_def.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/slab_def.h 2011-11-16 18:39:08.000000000 -0500
@@ -68,10 +68,10 @@ struct kmem_cache {
unsigned long node_allocs;
unsigned long node_frees;
/*
* If debugging is enabled, then the allocator can add additional
-diff -urNp linux-3.1.1/include/linux/slab.h linux-3.1.1/include/linux/slab.h
---- linux-3.1.1/include/linux/slab.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/slab.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/slab.h linux-3.1.3/include/linux/slab.h
+--- linux-3.1.3/include/linux/slab.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/slab.h 2011-11-16 18:39:08.000000000 -0500
@@ -11,12 +11,20 @@
#include <linux/gfp.h>
+})
+
#endif /* _LINUX_SLAB_H */
-diff -urNp linux-3.1.1/include/linux/slub_def.h linux-3.1.1/include/linux/slub_def.h
---- linux-3.1.1/include/linux/slub_def.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/slub_def.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/slub_def.h linux-3.1.3/include/linux/slub_def.h
+--- linux-3.1.3/include/linux/slub_def.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/slub_def.h 2011-11-16 18:39:08.000000000 -0500
@@ -85,7 +85,7 @@ struct kmem_cache {
struct kmem_cache_order_objects max;
struct kmem_cache_order_objects min;
static __always_inline void *
kmalloc_order(size_t size, gfp_t flags, unsigned int order)
-diff -urNp linux-3.1.1/include/linux/sonet.h linux-3.1.1/include/linux/sonet.h
---- linux-3.1.1/include/linux/sonet.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/sonet.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/sonet.h linux-3.1.3/include/linux/sonet.h
+--- linux-3.1.3/include/linux/sonet.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/sonet.h 2011-11-16 18:39:08.000000000 -0500
@@ -61,7 +61,7 @@ struct sonet_stats {
#include <linux/atomic.h>
__SONET_ITEMS
#undef __HANDLE_ITEM
};
-diff -urNp linux-3.1.1/include/linux/sunrpc/clnt.h linux-3.1.1/include/linux/sunrpc/clnt.h
---- linux-3.1.1/include/linux/sunrpc/clnt.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/sunrpc/clnt.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/sunrpc/clnt.h linux-3.1.3/include/linux/sunrpc/clnt.h
+--- linux-3.1.3/include/linux/sunrpc/clnt.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/sunrpc/clnt.h 2011-11-16 18:39:08.000000000 -0500
@@ -169,9 +169,9 @@ static inline unsigned short rpc_get_por
{
switch (sap->sa_family) {
}
#endif /* __KERNEL__ */
-diff -urNp linux-3.1.1/include/linux/sunrpc/sched.h linux-3.1.1/include/linux/sunrpc/sched.h
---- linux-3.1.1/include/linux/sunrpc/sched.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/sunrpc/sched.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/sunrpc/sched.h linux-3.1.3/include/linux/sunrpc/sched.h
+--- linux-3.1.3/include/linux/sunrpc/sched.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/sunrpc/sched.h 2011-11-16 18:39:08.000000000 -0500
@@ -105,6 +105,7 @@ struct rpc_call_ops {
void (*rpc_call_done)(struct rpc_task *, void *);
void (*rpc_release)(void *);
struct rpc_task_setup {
struct rpc_task *task;
-diff -urNp linux-3.1.1/include/linux/sunrpc/svc_rdma.h linux-3.1.1/include/linux/sunrpc/svc_rdma.h
---- linux-3.1.1/include/linux/sunrpc/svc_rdma.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/sunrpc/svc_rdma.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/sunrpc/svc_rdma.h linux-3.1.3/include/linux/sunrpc/svc_rdma.h
+--- linux-3.1.3/include/linux/sunrpc/svc_rdma.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/sunrpc/svc_rdma.h 2011-11-16 18:39:08.000000000 -0500
@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
extern unsigned int svcrdma_max_requests;
extern unsigned int svcrdma_max_req_size;
#define RPCRDMA_VERSION 1
-diff -urNp linux-3.1.1/include/linux/sysctl.h linux-3.1.1/include/linux/sysctl.h
---- linux-3.1.1/include/linux/sysctl.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/sysctl.h 2011-11-16 18:40:31.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/sysctl.h linux-3.1.3/include/linux/sysctl.h
+--- linux-3.1.3/include/linux/sysctl.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/sysctl.h 2011-11-16 18:40:31.000000000 -0500
@@ -155,7 +155,11 @@ enum
KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
};
extern int proc_dointvec(struct ctl_table *, int,
void __user *, size_t *, loff_t *);
extern int proc_dointvec_minmax(struct ctl_table *, int,
-diff -urNp linux-3.1.1/include/linux/tty_ldisc.h linux-3.1.1/include/linux/tty_ldisc.h
---- linux-3.1.1/include/linux/tty_ldisc.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/tty_ldisc.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/tty_ldisc.h linux-3.1.3/include/linux/tty_ldisc.h
+--- linux-3.1.3/include/linux/tty_ldisc.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/tty_ldisc.h 2011-11-16 18:39:08.000000000 -0500
@@ -148,7 +148,7 @@ struct tty_ldisc_ops {
struct module *owner;
};
struct tty_ldisc {
-diff -urNp linux-3.1.1/include/linux/types.h linux-3.1.1/include/linux/types.h
---- linux-3.1.1/include/linux/types.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/types.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/types.h linux-3.1.3/include/linux/types.h
+--- linux-3.1.3/include/linux/types.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/types.h 2011-11-16 18:39:08.000000000 -0500
@@ -213,10 +213,26 @@ typedef struct {
int counter;
} atomic_t;
#endif
struct list_head {
-diff -urNp linux-3.1.1/include/linux/uaccess.h linux-3.1.1/include/linux/uaccess.h
---- linux-3.1.1/include/linux/uaccess.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/uaccess.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/uaccess.h linux-3.1.3/include/linux/uaccess.h
+--- linux-3.1.3/include/linux/uaccess.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/uaccess.h 2011-11-16 18:39:08.000000000 -0500
@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
long ret; \
mm_segment_t old_fs = get_fs(); \
ret; \
})
-diff -urNp linux-3.1.1/include/linux/unaligned/access_ok.h linux-3.1.1/include/linux/unaligned/access_ok.h
---- linux-3.1.1/include/linux/unaligned/access_ok.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/unaligned/access_ok.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/unaligned/access_ok.h linux-3.1.3/include/linux/unaligned/access_ok.h
+--- linux-3.1.3/include/linux/unaligned/access_ok.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/unaligned/access_ok.h 2011-11-16 18:39:08.000000000 -0500
@@ -6,32 +6,32 @@
static inline u16 get_unaligned_le16(const void *p)
}
static inline void put_unaligned_le16(u16 val, void *p)
-diff -urNp linux-3.1.1/include/linux/vermagic.h linux-3.1.1/include/linux/vermagic.h
---- linux-3.1.1/include/linux/vermagic.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/vermagic.h 2011-11-16 18:54:54.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/vermagic.h linux-3.1.3/include/linux/vermagic.h
+--- linux-3.1.3/include/linux/vermagic.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/vermagic.h 2011-11-16 18:54:54.000000000 -0500
@@ -26,9 +26,35 @@
#define MODULE_ARCH_VERMAGIC ""
#endif
+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
+ MODULE_GRSEC
-diff -urNp linux-3.1.1/include/linux/vmalloc.h linux-3.1.1/include/linux/vmalloc.h
---- linux-3.1.1/include/linux/vmalloc.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/vmalloc.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/vmalloc.h linux-3.1.3/include/linux/vmalloc.h
+--- linux-3.1.3/include/linux/vmalloc.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/vmalloc.h 2011-11-16 18:39:08.000000000 -0500
@@ -14,6 +14,11 @@ struct vm_area_struct; /* vma defining
#define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
#define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
+})
+
#endif /* _LINUX_VMALLOC_H */
-diff -urNp linux-3.1.1/include/linux/vmstat.h linux-3.1.1/include/linux/vmstat.h
---- linux-3.1.1/include/linux/vmstat.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/linux/vmstat.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/linux/vmstat.h linux-3.1.3/include/linux/vmstat.h
+--- linux-3.1.3/include/linux/vmstat.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/linux/vmstat.h 2011-11-16 18:39:08.000000000 -0500
@@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(in
/*
* Zone based page accounting with per cpu differentials.
}
static inline void __dec_zone_page_state(struct page *page,
-diff -urNp linux-3.1.1/include/media/saa7146_vv.h linux-3.1.1/include/media/saa7146_vv.h
---- linux-3.1.1/include/media/saa7146_vv.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/media/saa7146_vv.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/media/saa7146_vv.h linux-3.1.3/include/media/saa7146_vv.h
+--- linux-3.1.3/include/media/saa7146_vv.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/media/saa7146_vv.h 2011-11-16 18:39:08.000000000 -0500
@@ -163,7 +163,7 @@ struct saa7146_ext_vv
int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
/* pointer to the saa7146 core ops */
const struct v4l2_ioctl_ops *core_ops;
-diff -urNp linux-3.1.1/include/media/v4l2-dev.h linux-3.1.1/include/media/v4l2-dev.h
---- linux-3.1.1/include/media/v4l2-dev.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/media/v4l2-dev.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/media/v4l2-dev.h linux-3.1.3/include/media/v4l2-dev.h
+--- linux-3.1.3/include/media/v4l2-dev.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/media/v4l2-dev.h 2011-11-16 18:39:08.000000000 -0500
@@ -56,7 +56,7 @@ int v4l2_prio_check(struct v4l2_prio_sta
/*
* Newer version of video_device, handled by videodev2.c
-diff -urNp linux-3.1.1/include/media/v4l2-ioctl.h linux-3.1.1/include/media/v4l2-ioctl.h
---- linux-3.1.1/include/media/v4l2-ioctl.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/media/v4l2-ioctl.h 2011-11-17 18:44:20.000000000 -0500
+diff -urNp linux-3.1.3/include/media/v4l2-ioctl.h linux-3.1.3/include/media/v4l2-ioctl.h
+--- linux-3.1.3/include/media/v4l2-ioctl.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/media/v4l2-ioctl.h 2011-11-17 18:44:20.000000000 -0500
@@ -272,7 +272,7 @@ struct v4l2_ioctl_ops {
long (*vidioc_default) (struct file *file, void *fh,
bool valid_prio, int cmd, void *arg);
/* v4l debugging and diagnostics */
-diff -urNp linux-3.1.1/include/net/caif/caif_hsi.h linux-3.1.1/include/net/caif/caif_hsi.h
---- linux-3.1.1/include/net/caif/caif_hsi.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/net/caif/caif_hsi.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/net/caif/caif_hsi.h linux-3.1.3/include/net/caif/caif_hsi.h
+--- linux-3.1.3/include/net/caif/caif_hsi.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/net/caif/caif_hsi.h 2011-11-16 18:39:08.000000000 -0500
@@ -94,7 +94,7 @@ struct cfhsi_drv {
void (*rx_done_cb) (struct cfhsi_drv *drv);
void (*wake_up_cb) (struct cfhsi_drv *drv);
/* Structure implemented by HSI device. */
struct cfhsi_dev {
-diff -urNp linux-3.1.1/include/net/caif/cfctrl.h linux-3.1.1/include/net/caif/cfctrl.h
---- linux-3.1.1/include/net/caif/cfctrl.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/net/caif/cfctrl.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/net/caif/cfctrl.h linux-3.1.3/include/net/caif/cfctrl.h
+--- linux-3.1.3/include/net/caif/cfctrl.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/net/caif/cfctrl.h 2011-11-16 18:39:08.000000000 -0500
@@ -52,7 +52,7 @@ struct cfctrl_rsp {
void (*radioset_rsp)(void);
void (*reject_rsp)(struct cflayer *layer, u8 linkid,
struct list_head list;
/* Protects from simultaneous access to first_req list */
spinlock_t info_list_lock;
-diff -urNp linux-3.1.1/include/net/flow.h linux-3.1.1/include/net/flow.h
---- linux-3.1.1/include/net/flow.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/net/flow.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/net/flow.h linux-3.1.3/include/net/flow.h
+--- linux-3.1.3/include/net/flow.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/net/flow.h 2011-11-16 18:39:08.000000000 -0500
@@ -207,6 +207,6 @@ extern struct flow_cache_object *flow_ca
u8 dir, flow_resolve_t resolver, void *ctx);
+extern atomic_unchecked_t flow_cache_genid;
#endif
-diff -urNp linux-3.1.1/include/net/inetpeer.h linux-3.1.1/include/net/inetpeer.h
---- linux-3.1.1/include/net/inetpeer.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/net/inetpeer.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/net/inetpeer.h linux-3.1.3/include/net/inetpeer.h
+--- linux-3.1.3/include/net/inetpeer.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/net/inetpeer.h 2011-11-16 18:39:08.000000000 -0500
@@ -47,8 +47,8 @@ struct inet_peer {
*/
union {
return new;
}
-diff -urNp linux-3.1.1/include/net/ip_fib.h linux-3.1.1/include/net/ip_fib.h
---- linux-3.1.1/include/net/ip_fib.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/net/ip_fib.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/net/ip_fib.h linux-3.1.3/include/net/ip_fib.h
+--- linux-3.1.3/include/net/ip_fib.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/net/ip_fib.h 2011-11-16 18:39:08.000000000 -0500
@@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(s
#define FIB_RES_SADDR(net, res) \
FIB_RES_NH(res).nh_saddr : \
fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
#define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
-diff -urNp linux-3.1.1/include/net/ip_vs.h linux-3.1.1/include/net/ip_vs.h
---- linux-3.1.1/include/net/ip_vs.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/net/ip_vs.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/net/ip_vs.h linux-3.1.3/include/net/ip_vs.h
+--- linux-3.1.3/include/net/ip_vs.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/net/ip_vs.h 2011-11-16 18:39:08.000000000 -0500
@@ -509,7 +509,7 @@ struct ip_vs_conn {
struct ip_vs_conn *control; /* Master control connection */
atomic_t n_control; /* Number of controlled ones */
atomic_t weight; /* server weight */
atomic_t refcnt; /* reference counter */
-diff -urNp linux-3.1.1/include/net/irda/ircomm_core.h linux-3.1.1/include/net/irda/ircomm_core.h
---- linux-3.1.1/include/net/irda/ircomm_core.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/net/irda/ircomm_core.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/net/irda/ircomm_core.h linux-3.1.3/include/net/irda/ircomm_core.h
+--- linux-3.1.3/include/net/irda/ircomm_core.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/net/irda/ircomm_core.h 2011-11-16 18:39:08.000000000 -0500
@@ -51,7 +51,7 @@ typedef struct {
int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *,
struct ircomm_cb {
irda_queue_t queue;
-diff -urNp linux-3.1.1/include/net/irda/ircomm_tty.h linux-3.1.1/include/net/irda/ircomm_tty.h
---- linux-3.1.1/include/net/irda/ircomm_tty.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/net/irda/ircomm_tty.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/net/irda/ircomm_tty.h linux-3.1.3/include/net/irda/ircomm_tty.h
+--- linux-3.1.3/include/net/irda/ircomm_tty.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/net/irda/ircomm_tty.h 2011-11-16 18:39:08.000000000 -0500
@@ -35,6 +35,7 @@
#include <linux/termios.h>
#include <linux/timer.h>
/* Protect concurent access to :
* o self->open_count
-diff -urNp linux-3.1.1/include/net/iucv/af_iucv.h linux-3.1.1/include/net/iucv/af_iucv.h
---- linux-3.1.1/include/net/iucv/af_iucv.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/net/iucv/af_iucv.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/net/iucv/af_iucv.h linux-3.1.3/include/net/iucv/af_iucv.h
+--- linux-3.1.3/include/net/iucv/af_iucv.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/net/iucv/af_iucv.h 2011-11-16 18:39:08.000000000 -0500
@@ -87,7 +87,7 @@ struct iucv_sock {
struct iucv_sock_list {
struct hlist_head head;
};
unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
-diff -urNp linux-3.1.1/include/net/lapb.h linux-3.1.1/include/net/lapb.h
---- linux-3.1.1/include/net/lapb.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/net/lapb.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/net/lapb.h linux-3.1.3/include/net/lapb.h
+--- linux-3.1.3/include/net/lapb.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/net/lapb.h 2011-11-16 18:39:08.000000000 -0500
@@ -95,7 +95,7 @@ struct lapb_cb {
struct sk_buff_head write_queue;
struct sk_buff_head ack_queue;
/* FRMR control information */
struct lapb_frame frmr_data;
-diff -urNp linux-3.1.1/include/net/neighbour.h linux-3.1.1/include/net/neighbour.h
---- linux-3.1.1/include/net/neighbour.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/net/neighbour.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/net/neighbour.h linux-3.1.3/include/net/neighbour.h
+--- linux-3.1.3/include/net/neighbour.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/net/neighbour.h 2011-11-16 18:39:08.000000000 -0500
@@ -122,7 +122,7 @@ struct neigh_ops {
void (*error_report)(struct neighbour *, struct sk_buff *);
int (*output)(struct neighbour *, struct sk_buff *);
struct pneigh_entry {
struct pneigh_entry *next;
-diff -urNp linux-3.1.1/include/net/netlink.h linux-3.1.1/include/net/netlink.h
---- linux-3.1.1/include/net/netlink.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/net/netlink.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/net/netlink.h linux-3.1.3/include/net/netlink.h
+--- linux-3.1.3/include/net/netlink.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/net/netlink.h 2011-11-16 18:39:08.000000000 -0500
@@ -562,7 +562,7 @@ static inline void *nlmsg_get_pos(struct
static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
{
}
/**
-diff -urNp linux-3.1.1/include/net/netns/ipv4.h linux-3.1.1/include/net/netns/ipv4.h
---- linux-3.1.1/include/net/netns/ipv4.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/net/netns/ipv4.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/net/netns/ipv4.h linux-3.1.3/include/net/netns/ipv4.h
+--- linux-3.1.3/include/net/netns/ipv4.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/net/netns/ipv4.h 2011-11-16 18:39:08.000000000 -0500
@@ -56,8 +56,8 @@ struct netns_ipv4 {
unsigned int sysctl_ping_group_range[2];
#ifdef CONFIG_IP_MROUTE
#ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
-diff -urNp linux-3.1.1/include/net/sctp/sctp.h linux-3.1.1/include/net/sctp/sctp.h
---- linux-3.1.1/include/net/sctp/sctp.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/net/sctp/sctp.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/net/sctp/sctp.h linux-3.1.3/include/net/sctp/sctp.h
+--- linux-3.1.3/include/net/sctp/sctp.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/net/sctp/sctp.h 2011-11-16 18:39:08.000000000 -0500
@@ -318,9 +318,9 @@ do { \
#else /* SCTP_DEBUG */
#define SCTP_ENABLE_DEBUG
#define SCTP_DISABLE_DEBUG
#define SCTP_ASSERT(expr, str, func)
-diff -urNp linux-3.1.1/include/net/sock.h linux-3.1.1/include/net/sock.h
---- linux-3.1.1/include/net/sock.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/net/sock.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/net/sock.h linux-3.1.3/include/net/sock.h
+--- linux-3.1.3/include/net/sock.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/net/sock.h 2011-11-16 18:39:08.000000000 -0500
@@ -278,7 +278,7 @@ struct sock {
#ifdef CONFIG_RPS
__u32 sk_rxhash;
int copy, int offset)
{
if (skb->ip_summed == CHECKSUM_NONE) {
-diff -urNp linux-3.1.1/include/net/tcp.h linux-3.1.1/include/net/tcp.h
---- linux-3.1.1/include/net/tcp.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/net/tcp.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/net/tcp.h linux-3.1.3/include/net/tcp.h
+--- linux-3.1.3/include/net/tcp.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/net/tcp.h 2011-11-16 18:39:08.000000000 -0500
@@ -1401,8 +1401,8 @@ enum tcp_seq_states {
struct tcp_seq_afinfo {
char *name;
};
struct tcp_iter_state {
-diff -urNp linux-3.1.1/include/net/udp.h linux-3.1.1/include/net/udp.h
---- linux-3.1.1/include/net/udp.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/net/udp.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/net/udp.h linux-3.1.3/include/net/udp.h
+--- linux-3.1.3/include/net/udp.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/net/udp.h 2011-11-16 18:39:08.000000000 -0500
@@ -234,8 +234,8 @@ struct udp_seq_afinfo {
char *name;
sa_family_t family;
};
struct udp_iter_state {
-diff -urNp linux-3.1.1/include/net/xfrm.h linux-3.1.1/include/net/xfrm.h
---- linux-3.1.1/include/net/xfrm.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/net/xfrm.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/net/xfrm.h linux-3.1.3/include/net/xfrm.h
+--- linux-3.1.3/include/net/xfrm.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/net/xfrm.h 2011-11-16 18:39:08.000000000 -0500
@@ -505,7 +505,7 @@ struct xfrm_policy {
struct timer_list timer;
u32 priority;
u32 index;
struct xfrm_mark mark;
-diff -urNp linux-3.1.1/include/rdma/iw_cm.h linux-3.1.1/include/rdma/iw_cm.h
---- linux-3.1.1/include/rdma/iw_cm.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/rdma/iw_cm.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/rdma/iw_cm.h linux-3.1.3/include/rdma/iw_cm.h
+--- linux-3.1.3/include/rdma/iw_cm.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/rdma/iw_cm.h 2011-11-16 18:39:08.000000000 -0500
@@ -120,7 +120,7 @@ struct iw_cm_verbs {
int backlog);
/**
* iw_create_cm_id - Create an IW CM identifier.
-diff -urNp linux-3.1.1/include/scsi/libfc.h linux-3.1.1/include/scsi/libfc.h
---- linux-3.1.1/include/scsi/libfc.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/scsi/libfc.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/scsi/libfc.h linux-3.1.3/include/scsi/libfc.h
+--- linux-3.1.3/include/scsi/libfc.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/scsi/libfc.h 2011-11-16 18:39:08.000000000 -0500
@@ -758,6 +758,7 @@ struct libfc_function_template {
*/
void (*disc_stop_final) (struct fc_lport *);
u8 link_up;
u8 qfull;
enum fc_lport_state state;
-diff -urNp linux-3.1.1/include/scsi/scsi_device.h linux-3.1.1/include/scsi/scsi_device.h
---- linux-3.1.1/include/scsi/scsi_device.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/scsi/scsi_device.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/scsi/scsi_device.h linux-3.1.3/include/scsi/scsi_device.h
+--- linux-3.1.3/include/scsi/scsi_device.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/scsi/scsi_device.h 2011-11-16 18:39:08.000000000 -0500
@@ -161,9 +161,9 @@ struct scsi_device {
unsigned int max_device_blocked; /* what device_blocked counts down from */
#define SCSI_DEFAULT_DEVICE_BLOCKED 3
struct device sdev_gendev,
sdev_dev;
-diff -urNp linux-3.1.1/include/scsi/scsi_transport_fc.h linux-3.1.1/include/scsi/scsi_transport_fc.h
---- linux-3.1.1/include/scsi/scsi_transport_fc.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/scsi/scsi_transport_fc.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/scsi/scsi_transport_fc.h linux-3.1.3/include/scsi/scsi_transport_fc.h
+--- linux-3.1.3/include/scsi/scsi_transport_fc.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/scsi/scsi_transport_fc.h 2011-11-16 18:39:08.000000000 -0500
@@ -711,7 +711,7 @@ struct fc_function_template {
unsigned long show_host_system_hostname:1;
/**
-diff -urNp linux-3.1.1/include/sound/ak4xxx-adda.h linux-3.1.1/include/sound/ak4xxx-adda.h
---- linux-3.1.1/include/sound/ak4xxx-adda.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/sound/ak4xxx-adda.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/sound/ak4xxx-adda.h linux-3.1.3/include/sound/ak4xxx-adda.h
+--- linux-3.1.3/include/sound/ak4xxx-adda.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/sound/ak4xxx-adda.h 2011-11-16 18:39:08.000000000 -0500
@@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
unsigned char val);
#define AK4XXX_IMAGE_SIZE (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
-diff -urNp linux-3.1.1/include/sound/hwdep.h linux-3.1.1/include/sound/hwdep.h
---- linux-3.1.1/include/sound/hwdep.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/sound/hwdep.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/sound/hwdep.h linux-3.1.3/include/sound/hwdep.h
+--- linux-3.1.3/include/sound/hwdep.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/sound/hwdep.h 2011-11-16 18:39:08.000000000 -0500
@@ -49,7 +49,7 @@ struct snd_hwdep_ops {
struct snd_hwdep_dsp_status *status);
int (*dsp_load)(struct snd_hwdep *hw,
struct snd_hwdep {
struct snd_card *card;
-diff -urNp linux-3.1.1/include/sound/info.h linux-3.1.1/include/sound/info.h
---- linux-3.1.1/include/sound/info.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/sound/info.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/sound/info.h linux-3.1.3/include/sound/info.h
+--- linux-3.1.3/include/sound/info.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/sound/info.h 2011-11-16 18:39:08.000000000 -0500
@@ -44,7 +44,7 @@ struct snd_info_entry_text {
struct snd_info_buffer *buffer);
void (*write)(struct snd_info_entry *entry,
struct snd_info_entry_ops {
int (*open)(struct snd_info_entry *entry,
-diff -urNp linux-3.1.1/include/sound/pcm.h linux-3.1.1/include/sound/pcm.h
---- linux-3.1.1/include/sound/pcm.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/sound/pcm.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/sound/pcm.h linux-3.1.3/include/sound/pcm.h
+--- linux-3.1.3/include/sound/pcm.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/sound/pcm.h 2011-11-16 18:39:08.000000000 -0500
@@ -81,6 +81,7 @@ struct snd_pcm_ops {
int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
int (*ack)(struct snd_pcm_substream *substream);
/*
*
-diff -urNp linux-3.1.1/include/sound/sb16_csp.h linux-3.1.1/include/sound/sb16_csp.h
---- linux-3.1.1/include/sound/sb16_csp.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/sound/sb16_csp.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/sound/sb16_csp.h linux-3.1.3/include/sound/sb16_csp.h
+--- linux-3.1.3/include/sound/sb16_csp.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/sound/sb16_csp.h 2011-11-16 18:39:08.000000000 -0500
@@ -146,7 +146,7 @@ struct snd_sb_csp_ops {
int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
int (*csp_stop) (struct snd_sb_csp * p);
/*
* CSP private data
-diff -urNp linux-3.1.1/include/sound/soc.h linux-3.1.1/include/sound/soc.h
---- linux-3.1.1/include/sound/soc.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/sound/soc.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/sound/soc.h linux-3.1.3/include/sound/soc.h
+--- linux-3.1.3/include/sound/soc.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/sound/soc.h 2011-11-16 18:39:08.000000000 -0500
@@ -676,7 +676,7 @@ struct snd_soc_platform_driver {
/* platform IO - used for platform DAPM */
unsigned int (*read)(struct snd_soc_platform *, unsigned int);
struct snd_soc_platform {
const char *name;
-diff -urNp linux-3.1.1/include/sound/ymfpci.h linux-3.1.1/include/sound/ymfpci.h
---- linux-3.1.1/include/sound/ymfpci.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/sound/ymfpci.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/sound/ymfpci.h linux-3.1.3/include/sound/ymfpci.h
+--- linux-3.1.3/include/sound/ymfpci.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/sound/ymfpci.h 2011-11-16 18:39:08.000000000 -0500
@@ -358,7 +358,7 @@ struct snd_ymfpci {
spinlock_t reg_lock;
spinlock_t voice_lock;
struct snd_info_entry *proc_entry;
const struct firmware *dsp_microcode;
const struct firmware *controller_microcode;
-diff -urNp linux-3.1.1/include/target/target_core_base.h linux-3.1.1/include/target/target_core_base.h
---- linux-3.1.1/include/target/target_core_base.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/target/target_core_base.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/target/target_core_base.h linux-3.1.3/include/target/target_core_base.h
+--- linux-3.1.3/include/target/target_core_base.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/target/target_core_base.h 2011-11-16 18:39:08.000000000 -0500
@@ -356,7 +356,7 @@ struct t10_reservation_ops {
int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32);
int (*t10_pr_register)(struct se_cmd *);
atomic_t dev_tur_active;
atomic_t execute_tasks;
atomic_t dev_status_thr_count;
-diff -urNp linux-3.1.1/include/trace/events/irq.h linux-3.1.1/include/trace/events/irq.h
---- linux-3.1.1/include/trace/events/irq.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/trace/events/irq.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/trace/events/irq.h linux-3.1.3/include/trace/events/irq.h
+--- linux-3.1.3/include/trace/events/irq.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/trace/events/irq.h 2011-11-16 18:39:08.000000000 -0500
@@ -36,7 +36,7 @@ struct softirq_action;
*/
TRACE_EVENT(irq_handler_entry,
TP_ARGS(irq, action, ret),
-diff -urNp linux-3.1.1/include/video/udlfb.h linux-3.1.1/include/video/udlfb.h
---- linux-3.1.1/include/video/udlfb.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/video/udlfb.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/video/udlfb.h linux-3.1.3/include/video/udlfb.h
+--- linux-3.1.3/include/video/udlfb.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/video/udlfb.h 2011-11-16 18:39:08.000000000 -0500
@@ -51,10 +51,10 @@ struct dlfb_data {
int base8;
u32 pseudo_palette[256];
};
#define NR_USB_REQUEST_I2C_SUB_IO 0x02
-diff -urNp linux-3.1.1/include/video/uvesafb.h linux-3.1.1/include/video/uvesafb.h
---- linux-3.1.1/include/video/uvesafb.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/include/video/uvesafb.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/include/video/uvesafb.h linux-3.1.3/include/video/uvesafb.h
+--- linux-3.1.3/include/video/uvesafb.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/include/video/uvesafb.h 2011-11-16 18:39:08.000000000 -0500
@@ -177,6 +177,7 @@ struct uvesafb_par {
u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
u8 pmi_setpal; /* PMI for palette changes */
void *pmi_start;
void *pmi_pal;
u8 *vbe_state_orig; /*
-diff -urNp linux-3.1.1/init/do_mounts.c linux-3.1.1/init/do_mounts.c
---- linux-3.1.1/init/do_mounts.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/init/do_mounts.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/init/do_mounts.c linux-3.1.3/init/do_mounts.c
+--- linux-3.1.3/init/do_mounts.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/init/do_mounts.c 2011-11-16 18:39:08.000000000 -0500
@@ -287,11 +287,11 @@ static void __init get_fs_names(char *pa
static int __init do_mount_root(char *name, char *fs, int flags, void *data)
+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
+ sys_chroot((const char __force_user *)".");
}
-diff -urNp linux-3.1.1/init/do_mounts.h linux-3.1.1/init/do_mounts.h
---- linux-3.1.1/init/do_mounts.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/init/do_mounts.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/init/do_mounts.h linux-3.1.3/init/do_mounts.h
+--- linux-3.1.3/init/do_mounts.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/init/do_mounts.h 2011-11-16 18:39:08.000000000 -0500
@@ -15,15 +15,15 @@ extern int root_mountflags;
static inline int create_dev(char *name, dev_t dev)
return 0;
if (!S_ISBLK(stat.st_mode))
return 0;
-diff -urNp linux-3.1.1/init/do_mounts_initrd.c linux-3.1.1/init/do_mounts_initrd.c
---- linux-3.1.1/init/do_mounts_initrd.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/init/do_mounts_initrd.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/init/do_mounts_initrd.c linux-3.1.3/init/do_mounts_initrd.c
+--- linux-3.1.3/init/do_mounts_initrd.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/init/do_mounts_initrd.c 2011-11-16 18:39:08.000000000 -0500
@@ -44,13 +44,13 @@ static void __init handle_initrd(void)
create_dev("/dev/root.old", Root_RAM0);
/* mount initrd on rootfs' /root */
+ sys_unlink((const char __force_user *)"/initrd.image");
return 0;
}
-diff -urNp linux-3.1.1/init/do_mounts_md.c linux-3.1.1/init/do_mounts_md.c
---- linux-3.1.1/init/do_mounts_md.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/init/do_mounts_md.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/init/do_mounts_md.c linux-3.1.3/init/do_mounts_md.c
+--- linux-3.1.3/init/do_mounts_md.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/init/do_mounts_md.c 2011-11-16 18:39:08.000000000 -0500
@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
partitioned ? "_d" : "", minor,
md_setup_args[ent].device_names);
if (fd >= 0) {
sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
sys_close(fd);
-diff -urNp linux-3.1.1/init/initramfs.c linux-3.1.1/init/initramfs.c
---- linux-3.1.1/init/initramfs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/init/initramfs.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/init/initramfs.c linux-3.1.3/init/initramfs.c
+--- linux-3.1.3/init/initramfs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/init/initramfs.c 2011-11-16 18:39:08.000000000 -0500
@@ -74,7 +74,7 @@ static void __init free_hash(void)
}
}
state = SkipIt;
next_state = Reset;
return 0;
-diff -urNp linux-3.1.1/init/Kconfig linux-3.1.1/init/Kconfig
---- linux-3.1.1/init/Kconfig 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/init/Kconfig 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/init/Kconfig linux-3.1.3/init/Kconfig
+--- linux-3.1.3/init/Kconfig 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/init/Kconfig 2011-11-16 18:39:08.000000000 -0500
@@ -1202,7 +1202,7 @@ config SLUB_DEBUG
config COMPAT_BRK
help
Randomizing heap placement makes heap exploits harder, but it
also breaks ancient binaries (including anything libc5 based).
-diff -urNp linux-3.1.1/init/main.c linux-3.1.1/init/main.c
---- linux-3.1.1/init/main.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/init/main.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/init/main.c linux-3.1.3/init/main.c
+--- linux-3.1.3/init/main.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/init/main.c 2011-11-16 18:40:44.000000000 -0500
@@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void)
extern void tc_init(void);
#endif
/*
* Ok, we have completed the initial bootup, and
* we're essentially up and running. Get rid of the
-diff -urNp linux-3.1.1/ipc/mqueue.c linux-3.1.1/ipc/mqueue.c
---- linux-3.1.1/ipc/mqueue.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/ipc/mqueue.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/ipc/mqueue.c linux-3.1.3/ipc/mqueue.c
+--- linux-3.1.3/ipc/mqueue.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/ipc/mqueue.c 2011-11-16 18:40:44.000000000 -0500
@@ -156,6 +156,7 @@ static struct inode *mqueue_get_inode(st
mq_bytes = (mq_msg_tblsz +
(info->attr.mq_maxmsg * info->attr.mq_msgsize));
spin_lock(&mq_lock);
if (u->mq_bytes + mq_bytes < u->mq_bytes ||
u->mq_bytes + mq_bytes > task_rlimit(p, RLIMIT_MSGQUEUE)) {
-diff -urNp linux-3.1.1/ipc/msg.c linux-3.1.1/ipc/msg.c
---- linux-3.1.1/ipc/msg.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/ipc/msg.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/ipc/msg.c linux-3.1.3/ipc/msg.c
+--- linux-3.1.3/ipc/msg.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/ipc/msg.c 2011-11-16 18:39:08.000000000 -0500
@@ -309,18 +309,19 @@ static inline int msg_security(struct ke
return security_msg_queue_associate(msq, msgflg);
}
msg_params.key = key;
msg_params.flg = msgflg;
-diff -urNp linux-3.1.1/ipc/sem.c linux-3.1.1/ipc/sem.c
---- linux-3.1.1/ipc/sem.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/ipc/sem.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/ipc/sem.c linux-3.1.3/ipc/sem.c
+--- linux-3.1.3/ipc/sem.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/ipc/sem.c 2011-11-16 18:40:44.000000000 -0500
@@ -318,10 +318,15 @@ static inline int sem_more_checks(struct
return 0;
}
ns = current->nsproxy->ipc_ns;
if (nsops < 1 || semid < 0)
-diff -urNp linux-3.1.1/ipc/shm.c linux-3.1.1/ipc/shm.c
---- linux-3.1.1/ipc/shm.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/ipc/shm.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/ipc/shm.c linux-3.1.3/ipc/shm.c
+--- linux-3.1.3/ipc/shm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/ipc/shm.c 2011-11-16 18:40:44.000000000 -0500
@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name
static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
#endif
size = i_size_read(path.dentry->d_inode);
shm_unlock(shp);
-diff -urNp linux-3.1.1/kernel/acct.c linux-3.1.1/kernel/acct.c
---- linux-3.1.1/kernel/acct.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/acct.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/acct.c linux-3.1.3/kernel/acct.c
+--- linux-3.1.3/kernel/acct.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/acct.c 2011-11-16 18:39:08.000000000 -0500
@@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a
*/
flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
sizeof(acct_t), &file->f_pos);
current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
set_fs(fs);
-diff -urNp linux-3.1.1/kernel/audit.c linux-3.1.1/kernel/audit.c
---- linux-3.1.1/kernel/audit.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/audit.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/audit.c linux-3.1.3/kernel/audit.c
+--- linux-3.1.3/kernel/audit.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/audit.c 2011-11-16 18:39:08.000000000 -0500
@@ -115,7 +115,7 @@ u32 audit_sig_sid = 0;
3) suppressed due to audit_rate_limit
4) suppressed due to audit_backlog_limit
status_set.backlog = skb_queue_len(&audit_skb_queue);
audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
&status_set, sizeof(status_set));
-diff -urNp linux-3.1.1/kernel/auditsc.c linux-3.1.1/kernel/auditsc.c
---- linux-3.1.1/kernel/auditsc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/auditsc.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/auditsc.c linux-3.1.3/kernel/auditsc.c
+--- linux-3.1.3/kernel/auditsc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/auditsc.c 2011-11-16 18:39:08.000000000 -0500
@@ -2118,7 +2118,7 @@ int auditsc_get_stamp(struct audit_conte
}
struct audit_context *context = task->audit_context;
if (context && context->in_syscall) {
-diff -urNp linux-3.1.1/kernel/capability.c linux-3.1.1/kernel/capability.c
---- linux-3.1.1/kernel/capability.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/capability.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/capability.c linux-3.1.3/kernel/capability.c
+--- linux-3.1.3/kernel/capability.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/capability.c 2011-11-16 18:40:44.000000000 -0500
@@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_
* before modification is attempted and the application
* fails.
/**
* nsown_capable - Check superior capability to one's own user_ns
* @cap: The capability in question
-diff -urNp linux-3.1.1/kernel/cgroup.c linux-3.1.1/kernel/cgroup.c
---- linux-3.1.1/kernel/cgroup.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/cgroup.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/cgroup.c linux-3.1.3/kernel/cgroup.c
+--- linux-3.1.3/kernel/cgroup.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/cgroup.c 2011-11-16 18:40:44.000000000 -0500
@@ -595,6 +595,8 @@ static struct css_set *find_css_set(
struct hlist_head *hhead;
struct cg_cgroup_link *link;
/* First see if we already have a cgroup group that matches
* the desired set */
read_lock(&css_set_lock);
-diff -urNp linux-3.1.1/kernel/compat.c linux-3.1.1/kernel/compat.c
---- linux-3.1.1/kernel/compat.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/compat.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/compat.c linux-3.1.3/kernel/compat.c
+--- linux-3.1.3/kernel/compat.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/compat.c 2011-11-16 18:40:44.000000000 -0500
@@ -13,6 +13,7 @@
#include <linux/linkage.h>
set_fs(oldfs);
if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
-diff -urNp linux-3.1.1/kernel/configs.c linux-3.1.1/kernel/configs.c
---- linux-3.1.1/kernel/configs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/configs.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/configs.c linux-3.1.3/kernel/configs.c
+--- linux-3.1.3/kernel/configs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/configs.c 2011-11-16 18:40:44.000000000 -0500
@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
struct proc_dir_entry *entry;
if (!entry)
return -ENOMEM;
-diff -urNp linux-3.1.1/kernel/cred.c linux-3.1.1/kernel/cred.c
---- linux-3.1.1/kernel/cred.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/cred.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/cred.c linux-3.1.3/kernel/cred.c
+--- linux-3.1.3/kernel/cred.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/cred.c 2011-11-16 18:40:44.000000000 -0500
@@ -158,6 +158,8 @@ static void put_cred_rcu(struct rcu_head
*/
void __put_cred(struct cred *cred)
ret = security_secctx_to_secid(secctx, strlen(secctx), &secid);
if (ret < 0)
return ret;
-diff -urNp linux-3.1.1/kernel/debug/debug_core.c linux-3.1.1/kernel/debug/debug_core.c
---- linux-3.1.1/kernel/debug/debug_core.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/debug/debug_core.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/debug/debug_core.c linux-3.1.3/kernel/debug/debug_core.c
+--- linux-3.1.3/kernel/debug/debug_core.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/debug/debug_core.c 2011-11-16 18:39:08.000000000 -0500
@@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_loc
*/
static atomic_t masters_in_kgdb;
tasklet_schedule(&kgdb_tasklet_breakpoint);
}
EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
-diff -urNp linux-3.1.1/kernel/debug/kdb/kdb_main.c linux-3.1.1/kernel/debug/kdb/kdb_main.c
---- linux-3.1.1/kernel/debug/kdb/kdb_main.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/debug/kdb/kdb_main.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/debug/kdb/kdb_main.c linux-3.1.3/kernel/debug/kdb/kdb_main.c
+--- linux-3.1.3/kernel/debug/kdb/kdb_main.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/debug/kdb/kdb_main.c 2011-11-16 18:39:08.000000000 -0500
@@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha
list_for_each_entry(mod, kdb_modules, list) {
#ifdef CONFIG_MODULE_UNLOAD
{
-diff -urNp linux-3.1.1/kernel/events/core.c linux-3.1.1/kernel/events/core.c
---- linux-3.1.1/kernel/events/core.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/events/core.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/events/core.c linux-3.1.3/kernel/events/core.c
+--- linux-3.1.3/kernel/events/core.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/events/core.c 2011-11-16 18:39:08.000000000 -0500
@@ -172,7 +172,7 @@ int perf_proc_update_handler(struct ctl_
return 0;
}
&parent_event->child_total_time_running);
/*
-diff -urNp linux-3.1.1/kernel/exit.c linux-3.1.1/kernel/exit.c
---- linux-3.1.1/kernel/exit.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/exit.c 2011-11-16 19:33:48.000000000 -0500
+diff -urNp linux-3.1.3/kernel/exit.c linux-3.1.3/kernel/exit.c
+--- linux-3.1.3/kernel/exit.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/exit.c 2011-11-16 19:33:48.000000000 -0500
@@ -57,6 +57,10 @@
#include <asm/pgtable.h>
#include <asm/mmu_context.h>
exit_mm(tsk);
if (group_dead)
-diff -urNp linux-3.1.1/kernel/fork.c linux-3.1.1/kernel/fork.c
---- linux-3.1.1/kernel/fork.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/fork.c 2011-11-16 19:36:31.000000000 -0500
+diff -urNp linux-3.1.3/kernel/fork.c linux-3.1.3/kernel/fork.c
+--- linux-3.1.3/kernel/fork.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/fork.c 2011-11-16 19:36:31.000000000 -0500
@@ -285,7 +285,7 @@ static struct task_struct *dup_task_stru
*stackend = STACK_END_MAGIC; /* for overflow detection */
new_fs = NULL;
else
new_fs = fs;
-diff -urNp linux-3.1.1/kernel/futex.c linux-3.1.1/kernel/futex.c
---- linux-3.1.1/kernel/futex.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/futex.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/futex.c linux-3.1.3/kernel/futex.c
+--- linux-3.1.3/kernel/futex.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/futex.c 2011-11-16 18:40:44.000000000 -0500
@@ -54,6 +54,7 @@
#include <linux/mount.h>
#include <linux/pagemap.h>
for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
plist_head_init(&futex_queues[i].chain);
-diff -urNp linux-3.1.1/kernel/futex_compat.c linux-3.1.1/kernel/futex_compat.c
---- linux-3.1.1/kernel/futex_compat.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/futex_compat.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/futex_compat.c linux-3.1.3/kernel/futex_compat.c
+--- linux-3.1.3/kernel/futex_compat.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/futex_compat.c 2011-11-16 18:40:44.000000000 -0500
@@ -10,6 +10,7 @@
#include <linux/compat.h>
#include <linux/nsproxy.h>
head = p->compat_robust_list;
rcu_read_unlock();
}
-diff -urNp linux-3.1.1/kernel/gcov/base.c linux-3.1.1/kernel/gcov/base.c
---- linux-3.1.1/kernel/gcov/base.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/gcov/base.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/gcov/base.c linux-3.1.3/kernel/gcov/base.c
+--- linux-3.1.3/kernel/gcov/base.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/gcov/base.c 2011-11-16 18:39:08.000000000 -0500
@@ -102,11 +102,6 @@ void gcov_enable_events(void)
}
if (prev)
prev->next = info->next;
else
-diff -urNp linux-3.1.1/kernel/hrtimer.c linux-3.1.1/kernel/hrtimer.c
---- linux-3.1.1/kernel/hrtimer.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/hrtimer.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/hrtimer.c linux-3.1.3/kernel/hrtimer.c
+--- linux-3.1.3/kernel/hrtimer.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/hrtimer.c 2011-11-16 18:39:08.000000000 -0500
@@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
local_irq_restore(flags);
}
{
hrtimer_peek_ahead_timers();
}
-diff -urNp linux-3.1.1/kernel/jump_label.c linux-3.1.1/kernel/jump_label.c
---- linux-3.1.1/kernel/jump_label.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/jump_label.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/jump_label.c linux-3.1.3/kernel/jump_label.c
+--- linux-3.1.3/kernel/jump_label.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/jump_label.c 2011-11-16 18:39:08.000000000 -0500
@@ -55,7 +55,9 @@ jump_label_sort_entries(struct jump_entr
size = (((unsigned long)stop - (unsigned long)start)
}
static int
-diff -urNp linux-3.1.1/kernel/kallsyms.c linux-3.1.1/kernel/kallsyms.c
---- linux-3.1.1/kernel/kallsyms.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/kallsyms.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/kallsyms.c linux-3.1.3/kernel/kallsyms.c
+--- linux-3.1.3/kernel/kallsyms.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/kallsyms.c 2011-11-16 18:40:44.000000000 -0500
@@ -11,6 +11,9 @@
* Changed the compression method from stem compression to "table lookup"
* compression (see scripts/kallsyms.c for a more complete description)
if (!iter)
return -ENOMEM;
reset_iter(iter, 0);
-diff -urNp linux-3.1.1/kernel/kexec.c linux-3.1.1/kernel/kexec.c
---- linux-3.1.1/kernel/kexec.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/kexec.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/kexec.c linux-3.1.3/kernel/kexec.c
+--- linux-3.1.3/kernel/kexec.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/kexec.c 2011-11-16 18:39:08.000000000 -0500
@@ -1033,7 +1033,8 @@ asmlinkage long compat_sys_kexec_load(un
unsigned long flags)
{
unsigned long i, result;
/* Don't allow clients that don't understand the native
-diff -urNp linux-3.1.1/kernel/kmod.c linux-3.1.1/kernel/kmod.c
---- linux-3.1.1/kernel/kmod.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/kmod.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/kmod.c linux-3.1.3/kernel/kmod.c
+--- linux-3.1.3/kernel/kmod.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/kmod.c 2011-11-16 18:40:44.000000000 -0500
@@ -73,13 +73,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sb
* If module auto-loading support is disabled then this function
* becomes a no-operation.
/*
* If ret is 0, either ____call_usermodehelper failed and the
-diff -urNp linux-3.1.1/kernel/kprobes.c linux-3.1.1/kernel/kprobes.c
---- linux-3.1.1/kernel/kprobes.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/kprobes.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/kprobes.c linux-3.1.3/kernel/kprobes.c
+--- linux-3.1.3/kernel/kprobes.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/kprobes.c 2011-11-16 18:39:08.000000000 -0500
@@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_
* kernel image and loaded module images reside. This is required
* so x86_64 can correctly handle the %rip-relative fixups.
head = &kprobe_table[i];
preempt_disable();
-diff -urNp linux-3.1.1/kernel/lockdep.c linux-3.1.1/kernel/lockdep.c
---- linux-3.1.1/kernel/lockdep.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/lockdep.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/lockdep.c linux-3.1.3/kernel/lockdep.c
+--- linux-3.1.3/kernel/lockdep.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/lockdep.c 2011-11-16 18:39:08.000000000 -0500
@@ -583,6 +583,10 @@ static int static_obj(void *obj)
end = (unsigned long) &_end,
addr = (unsigned long) obj;
if (very_verbose(class)) {
printk("\nacquire class [%p] %s", class->key, class->name);
if (class->name_version > 1)
-diff -urNp linux-3.1.1/kernel/lockdep_proc.c linux-3.1.1/kernel/lockdep_proc.c
---- linux-3.1.1/kernel/lockdep_proc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/lockdep_proc.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/lockdep_proc.c linux-3.1.3/kernel/lockdep_proc.c
+--- linux-3.1.3/kernel/lockdep_proc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/lockdep_proc.c 2011-11-16 18:39:08.000000000 -0500
@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
static void print_name(struct seq_file *m, struct lock_class *class)
const char *name = class->name;
if (!name) {
-diff -urNp linux-3.1.1/kernel/module.c linux-3.1.1/kernel/module.c
---- linux-3.1.1/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/module.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
+--- linux-3.1.3/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/module.c 2011-11-16 18:40:44.000000000 -0500
@@ -58,6 +58,7 @@
#include <linux/jump_label.h>
#include <linux/pfn.h>
mod = NULL;
}
return mod;
-diff -urNp linux-3.1.1/kernel/mutex.c linux-3.1.1/kernel/mutex.c
---- linux-3.1.1/kernel/mutex.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/mutex.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/mutex.c linux-3.1.3/kernel/mutex.c
+--- linux-3.1.3/kernel/mutex.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/mutex.c 2011-11-16 18:39:08.000000000 -0500
@@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock,
spin_lock_mutex(&lock->wait_lock, flags);
mutex_set_owner(lock);
/* set it to 0 if there are no waiters left: */
-diff -urNp linux-3.1.1/kernel/mutex-debug.c linux-3.1.1/kernel/mutex-debug.c
---- linux-3.1.1/kernel/mutex-debug.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/mutex-debug.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/mutex-debug.c linux-3.1.3/kernel/mutex-debug.c
+--- linux-3.1.3/kernel/mutex-debug.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/mutex-debug.c 2011-11-16 18:39:08.000000000 -0500
@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute
}
list_del_init(&waiter->list);
waiter->task = NULL;
-diff -urNp linux-3.1.1/kernel/mutex-debug.h linux-3.1.1/kernel/mutex-debug.h
---- linux-3.1.1/kernel/mutex-debug.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/mutex-debug.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/mutex-debug.h linux-3.1.3/kernel/mutex-debug.h
+--- linux-3.1.3/kernel/mutex-debug.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/mutex-debug.h 2011-11-16 18:39:08.000000000 -0500
@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(stru
extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
extern void debug_mutex_add_waiter(struct mutex *lock,
extern void debug_mutex_unlock(struct mutex *lock);
extern void debug_mutex_init(struct mutex *lock, const char *name,
struct lock_class_key *key);
-diff -urNp linux-3.1.1/kernel/padata.c linux-3.1.1/kernel/padata.c
---- linux-3.1.1/kernel/padata.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/padata.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/padata.c linux-3.1.3/kernel/padata.c
+--- linux-3.1.3/kernel/padata.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/padata.c 2011-11-16 18:39:08.000000000 -0500
@@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_ins
padata->pd = pd;
padata->cb_cpu = cb_cpu;
atomic_set(&pd->reorder_objects, 0);
atomic_set(&pd->refcnt, 0);
pd->pinst = pinst;
-diff -urNp linux-3.1.1/kernel/panic.c linux-3.1.1/kernel/panic.c
---- linux-3.1.1/kernel/panic.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/panic.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/panic.c linux-3.1.3/kernel/panic.c
+--- linux-3.1.3/kernel/panic.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/panic.c 2011-11-16 18:40:44.000000000 -0500
@@ -371,7 +371,7 @@ static void warn_slowpath_common(const c
const char *board;
__builtin_return_address(0));
}
EXPORT_SYMBOL(__stack_chk_fail);
-diff -urNp linux-3.1.1/kernel/pid.c linux-3.1.1/kernel/pid.c
---- linux-3.1.1/kernel/pid.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/pid.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/pid.c linux-3.1.3/kernel/pid.c
+--- linux-3.1.3/kernel/pid.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/pid.c 2011-11-16 18:40:44.000000000 -0500
@@ -33,6 +33,7 @@
#include <linux/rculist.h>
#include <linux/bootmem.h>
struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
{
struct pid *pid;
-diff -urNp linux-3.1.1/kernel/posix-cpu-timers.c linux-3.1.1/kernel/posix-cpu-timers.c
---- linux-3.1.1/kernel/posix-cpu-timers.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/posix-cpu-timers.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/posix-cpu-timers.c linux-3.1.3/kernel/posix-cpu-timers.c
+--- linux-3.1.3/kernel/posix-cpu-timers.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/posix-cpu-timers.c 2011-11-16 18:40:44.000000000 -0500
@@ -6,6 +6,7 @@
#include <linux/posix-timers.h>
#include <linux/errno.h>
.clock_getres = thread_cpu_clock_getres,
.clock_get = thread_cpu_clock_get,
.timer_create = thread_cpu_timer_create,
-diff -urNp linux-3.1.1/kernel/posix-timers.c linux-3.1.1/kernel/posix-timers.c
---- linux-3.1.1/kernel/posix-timers.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/posix-timers.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/posix-timers.c linux-3.1.3/kernel/posix-timers.c
+--- linux-3.1.3/kernel/posix-timers.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/posix-timers.c 2011-11-16 18:40:44.000000000 -0500
@@ -43,6 +43,7 @@
#include <linux/idr.h>
#include <linux/posix-clock.h>
return kc->clock_set(which_clock, &new_tp);
}
-diff -urNp linux-3.1.1/kernel/power/poweroff.c linux-3.1.1/kernel/power/poweroff.c
---- linux-3.1.1/kernel/power/poweroff.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/power/poweroff.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/power/poweroff.c linux-3.1.3/kernel/power/poweroff.c
+--- linux-3.1.3/kernel/power/poweroff.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/power/poweroff.c 2011-11-16 18:39:08.000000000 -0500
@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
.enable_mask = SYSRQ_ENABLE_BOOT,
};
{
register_sysrq_key('o', &sysrq_poweroff_op);
return 0;
-diff -urNp linux-3.1.1/kernel/power/process.c linux-3.1.1/kernel/power/process.c
---- linux-3.1.1/kernel/power/process.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/power/process.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/power/process.c linux-3.1.3/kernel/power/process.c
+--- linux-3.1.3/kernel/power/process.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/power/process.c 2011-11-16 18:39:08.000000000 -0500
@@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_
u64 elapsed_csecs64;
unsigned int elapsed_csecs;
break;
if (pm_wakeup_pending()) {
-diff -urNp linux-3.1.1/kernel/printk.c linux-3.1.1/kernel/printk.c
---- linux-3.1.1/kernel/printk.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/printk.c 2011-11-16 19:38:11.000000000 -0500
+diff -urNp linux-3.1.3/kernel/printk.c linux-3.1.3/kernel/printk.c
+--- linux-3.1.3/kernel/printk.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/printk.c 2011-11-16 19:38:11.000000000 -0500
@@ -313,6 +313,11 @@ static int check_syslog_permissions(int
if (from_file && type != SYSLOG_ACTION_OPEN)
return 0;
if (syslog_action_restricted(type)) {
if (capable(CAP_SYSLOG))
return 0;
-diff -urNp linux-3.1.1/kernel/profile.c linux-3.1.1/kernel/profile.c
---- linux-3.1.1/kernel/profile.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/profile.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/profile.c linux-3.1.3/kernel/profile.c
+--- linux-3.1.3/kernel/profile.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/profile.c 2011-11-16 18:39:08.000000000 -0500
@@ -39,7 +39,7 @@ struct profile_hit {
/* Oprofile timer tick hook */
static int (*timer_hook)(struct pt_regs *) __read_mostly;
return count;
}
-diff -urNp linux-3.1.1/kernel/ptrace.c linux-3.1.1/kernel/ptrace.c
---- linux-3.1.1/kernel/ptrace.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/ptrace.c 2011-11-16 19:50:22.000000000 -0500
+diff -urNp linux-3.1.3/kernel/ptrace.c linux-3.1.3/kernel/ptrace.c
+--- linux-3.1.3/kernel/ptrace.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/ptrace.c 2011-11-16 19:50:22.000000000 -0500
@@ -161,7 +161,8 @@ int ptrace_check_attach(struct task_stru
return ret;
}
goto out_put_task_struct;
}
-diff -urNp linux-3.1.1/kernel/rcutorture.c linux-3.1.1/kernel/rcutorture.c
---- linux-3.1.1/kernel/rcutorture.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/rcutorture.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/rcutorture.c linux-3.1.3/kernel/rcutorture.c
+--- linux-3.1.3/kernel/rcutorture.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/rcutorture.c 2011-11-16 18:39:08.000000000 -0500
@@ -138,12 +138,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_
{ 0 };
static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
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-3.1.1/kernel/rcutree.c linux-3.1.1/kernel/rcutree.c
---- linux-3.1.1/kernel/rcutree.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/rcutree.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/rcutree.c linux-3.1.3/kernel/rcutree.c
+--- linux-3.1.3/kernel/rcutree.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/rcutree.c 2011-11-16 18:39:08.000000000 -0500
@@ -356,9 +356,9 @@ void rcu_enter_nohz(void)
}
/* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
{
__rcu_process_callbacks(&rcu_sched_state,
&__get_cpu_var(rcu_sched_data));
-diff -urNp linux-3.1.1/kernel/rcutree.h linux-3.1.1/kernel/rcutree.h
---- linux-3.1.1/kernel/rcutree.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/rcutree.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/rcutree.h linux-3.1.3/kernel/rcutree.h
+--- linux-3.1.3/kernel/rcutree.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/rcutree.h 2011-11-16 18:39:08.000000000 -0500
@@ -86,7 +86,7 @@
struct rcu_dynticks {
int dynticks_nesting; /* Track irq/process nesting level. */
};
/* RCU's kthread states for tracing. */
-diff -urNp linux-3.1.1/kernel/rcutree_plugin.h linux-3.1.1/kernel/rcutree_plugin.h
---- linux-3.1.1/kernel/rcutree_plugin.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/rcutree_plugin.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/rcutree_plugin.h linux-3.1.3/kernel/rcutree_plugin.h
+--- linux-3.1.3/kernel/rcutree_plugin.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/rcutree_plugin.h 2011-11-16 18:39:08.000000000 -0500
@@ -822,7 +822,7 @@ void synchronize_rcu_expedited(void)
/* Clean up and exit. */
put_online_cpus();
}
-diff -urNp linux-3.1.1/kernel/relay.c linux-3.1.1/kernel/relay.c
---- linux-3.1.1/kernel/relay.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/relay.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/relay.c linux-3.1.3/kernel/relay.c
+--- linux-3.1.3/kernel/relay.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/relay.c 2011-11-16 18:40:44.000000000 -0500
@@ -1236,6 +1236,8 @@ static ssize_t subbuf_splice_actor(struc
};
ssize_t ret;
if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
return 0;
if (splice_grow_spd(pipe, &spd))
-diff -urNp linux-3.1.1/kernel/resource.c linux-3.1.1/kernel/resource.c
---- linux-3.1.1/kernel/resource.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/resource.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/resource.c linux-3.1.3/kernel/resource.c
+--- linux-3.1.3/kernel/resource.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/resource.c 2011-11-16 18:40:44.000000000 -0500
@@ -141,8 +141,18 @@ static const struct file_operations proc
static int __init ioresources_init(void)
return 0;
}
__initcall(ioresources_init);
-diff -urNp linux-3.1.1/kernel/rtmutex-tester.c linux-3.1.1/kernel/rtmutex-tester.c
---- linux-3.1.1/kernel/rtmutex-tester.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/rtmutex-tester.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/rtmutex-tester.c linux-3.1.3/kernel/rtmutex-tester.c
+--- linux-3.1.3/kernel/rtmutex-tester.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/rtmutex-tester.c 2011-11-16 18:39:08.000000000 -0500
@@ -20,7 +20,7 @@
#define MAX_RT_TEST_MUTEXES 8
return;
default:
-diff -urNp linux-3.1.1/kernel/sched_autogroup.c linux-3.1.1/kernel/sched_autogroup.c
---- linux-3.1.1/kernel/sched_autogroup.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/sched_autogroup.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/sched_autogroup.c linux-3.1.3/kernel/sched_autogroup.c
+--- linux-3.1.3/kernel/sched_autogroup.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/sched_autogroup.c 2011-11-16 18:39:08.000000000 -0500
@@ -7,7 +7,7 @@
unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
ag->tg = tg;
#ifdef CONFIG_RT_GROUP_SCHED
/*
-diff -urNp linux-3.1.1/kernel/sched.c linux-3.1.1/kernel/sched.c
---- linux-3.1.1/kernel/sched.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/sched.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/sched.c linux-3.1.3/kernel/sched.c
+--- linux-3.1.3/kernel/sched.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/sched.c 2011-11-16 18:40:44.000000000 -0500
@@ -4264,6 +4264,8 @@ static void __sched __schedule(void)
struct rq *rq;
int cpu;
/* can't set/change the rt policy */
if (policy != p->policy && !rlim_rtprio)
return -EPERM;
-diff -urNp linux-3.1.1/kernel/sched_fair.c linux-3.1.1/kernel/sched_fair.c
---- linux-3.1.1/kernel/sched_fair.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/sched_fair.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/sched_fair.c linux-3.1.3/kernel/sched_fair.c
+--- linux-3.1.3/kernel/sched_fair.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/sched_fair.c 2011-11-16 18:39:08.000000000 -0500
@@ -4062,7 +4062,7 @@ static void nohz_idle_balance(int this_c
* run_rebalance_domains is triggered when needed from the scheduler tick.
* Also triggered for nohz idle balancing (with nohz_balancing_kick set).
{
int this_cpu = smp_processor_id();
struct rq *this_rq = cpu_rq(this_cpu);
-diff -urNp linux-3.1.1/kernel/signal.c linux-3.1.1/kernel/signal.c
---- linux-3.1.1/kernel/signal.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/signal.c 2011-11-16 19:30:04.000000000 -0500
+diff -urNp linux-3.1.3/kernel/signal.c linux-3.1.3/kernel/signal.c
+--- linux-3.1.3/kernel/signal.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/signal.c 2011-11-16 19:30:04.000000000 -0500
@@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache
int print_fatal_signals __read_mostly;
if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
error = check_kill_permission(sig, info, p);
/*
-diff -urNp linux-3.1.1/kernel/smp.c linux-3.1.1/kernel/smp.c
---- linux-3.1.1/kernel/smp.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/smp.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/smp.c linux-3.1.3/kernel/smp.c
+--- linux-3.1.3/kernel/smp.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/smp.c 2011-11-16 18:39:08.000000000 -0500
@@ -580,22 +580,22 @@ int smp_call_function(smp_call_func_t fu
}
EXPORT_SYMBOL(smp_call_function);
{
raw_spin_unlock_irq(&call_function.lock);
}
-diff -urNp linux-3.1.1/kernel/softirq.c linux-3.1.1/kernel/softirq.c
---- linux-3.1.1/kernel/softirq.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/softirq.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/softirq.c linux-3.1.3/kernel/softirq.c
+--- linux-3.1.3/kernel/softirq.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/softirq.c 2011-11-16 18:39:08.000000000 -0500
@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
{
struct tasklet_struct *list;
-diff -urNp linux-3.1.1/kernel/sys.c linux-3.1.1/kernel/sys.c
---- linux-3.1.1/kernel/sys.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/sys.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/sys.c linux-3.1.3/kernel/sys.c
+--- linux-3.1.3/kernel/sys.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/sys.c 2011-11-16 18:40:44.000000000 -0500
@@ -157,6 +157,12 @@ static int set_one_prio(struct task_stru
error = -EACCES;
goto out;
error = -EINVAL;
break;
}
-diff -urNp linux-3.1.1/kernel/sysctl_binary.c linux-3.1.1/kernel/sysctl_binary.c
---- linux-3.1.1/kernel/sysctl_binary.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/sysctl_binary.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/sysctl_binary.c linux-3.1.3/kernel/sysctl_binary.c
+--- linux-3.1.3/kernel/sysctl_binary.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/sysctl_binary.c 2011-11-16 18:39:08.000000000 -0500
@@ -989,7 +989,7 @@ static ssize_t bin_intvec(struct file *f
int i;
set_fs(old_fs);
if (result < 0)
goto out;
-diff -urNp linux-3.1.1/kernel/sysctl.c linux-3.1.1/kernel/sysctl.c
---- linux-3.1.1/kernel/sysctl.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/sysctl.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/sysctl.c linux-3.1.3/kernel/sysctl.c
+--- linux-3.1.3/kernel/sysctl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/sysctl.c 2011-11-16 18:40:44.000000000 -0500
@@ -85,6 +85,13 @@
EXPORT_SYMBOL(proc_doulongvec_minmax);
EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
EXPORT_SYMBOL(register_sysctl_table);
-diff -urNp linux-3.1.1/kernel/sysctl_check.c linux-3.1.1/kernel/sysctl_check.c
---- linux-3.1.1/kernel/sysctl_check.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/sysctl_check.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/sysctl_check.c linux-3.1.3/kernel/sysctl_check.c
+--- linux-3.1.3/kernel/sysctl_check.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/sysctl_check.c 2011-11-16 18:40:44.000000000 -0500
@@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *n
set_fail(&fail, table, "Directory with extra2");
} else {
(table->proc_handler == proc_dointvec) ||
(table->proc_handler == proc_dointvec_minmax) ||
(table->proc_handler == proc_dointvec_jiffies) ||
-diff -urNp linux-3.1.1/kernel/taskstats.c linux-3.1.1/kernel/taskstats.c
---- linux-3.1.1/kernel/taskstats.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/taskstats.c 2011-11-16 19:35:09.000000000 -0500
+diff -urNp linux-3.1.3/kernel/taskstats.c linux-3.1.3/kernel/taskstats.c
+--- linux-3.1.3/kernel/taskstats.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/taskstats.c 2011-11-16 19:35:09.000000000 -0500
@@ -27,9 +27,12 @@
#include <linux/cgroup.h>
#include <linux/fs.h>
if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
return cmd_attr_register_cpumask(info);
else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
-diff -urNp linux-3.1.1/kernel/time/alarmtimer.c linux-3.1.1/kernel/time/alarmtimer.c
---- linux-3.1.1/kernel/time/alarmtimer.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/time/alarmtimer.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/time/alarmtimer.c linux-3.1.3/kernel/time/alarmtimer.c
+--- linux-3.1.3/kernel/time/alarmtimer.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/time/alarmtimer.c 2011-11-16 18:39:08.000000000 -0500
@@ -693,7 +693,7 @@ static int __init alarmtimer_init(void)
{
int error = 0;
.clock_getres = alarm_clock_getres,
.clock_get = alarm_clock_get,
.timer_create = alarm_timer_create,
-diff -urNp linux-3.1.1/kernel/time/tick-broadcast.c linux-3.1.1/kernel/time/tick-broadcast.c
---- linux-3.1.1/kernel/time/tick-broadcast.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/time/tick-broadcast.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/time/tick-broadcast.c linux-3.1.3/kernel/time/tick-broadcast.c
+--- linux-3.1.3/kernel/time/tick-broadcast.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/time/tick-broadcast.c 2011-11-16 18:39:08.000000000 -0500
@@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct cl
* then clear the broadcast bit.
*/
cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
tick_broadcast_clear_oneshot(cpu);
-diff -urNp linux-3.1.1/kernel/time/timekeeping.c linux-3.1.1/kernel/time/timekeeping.c
---- linux-3.1.1/kernel/time/timekeeping.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/time/timekeeping.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/time/timekeeping.c linux-3.1.3/kernel/time/timekeeping.c
+--- linux-3.1.3/kernel/time/timekeeping.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/time/timekeeping.c 2011-11-16 18:40:44.000000000 -0500
@@ -14,6 +14,7 @@
#include <linux/init.h>
#include <linux/mm.h>
write_seqlock_irqsave(&xtime_lock, flags);
timekeeping_forward_now();
-diff -urNp linux-3.1.1/kernel/time/timer_list.c linux-3.1.1/kernel/time/timer_list.c
---- linux-3.1.1/kernel/time/timer_list.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/time/timer_list.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/time/timer_list.c linux-3.1.3/kernel/time/timer_list.c
+--- linux-3.1.3/kernel/time/timer_list.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/time/timer_list.c 2011-11-16 18:40:44.000000000 -0500
@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
static void print_name_offset(struct seq_file *m, void *sym)
if (!pe)
return -ENOMEM;
return 0;
-diff -urNp linux-3.1.1/kernel/time/timer_stats.c linux-3.1.1/kernel/time/timer_stats.c
---- linux-3.1.1/kernel/time/timer_stats.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/time/timer_stats.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/time/timer_stats.c linux-3.1.3/kernel/time/timer_stats.c
+--- linux-3.1.3/kernel/time/timer_stats.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/time/timer_stats.c 2011-11-16 18:40:44.000000000 -0500
@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
static unsigned long nr_entries;
static struct entry entries[MAX_ENTRIES];
if (!pe)
return -ENOMEM;
return 0;
-diff -urNp linux-3.1.1/kernel/time.c linux-3.1.1/kernel/time.c
---- linux-3.1.1/kernel/time.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/time.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/time.c linux-3.1.3/kernel/time.c
+--- linux-3.1.3/kernel/time.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/time.c 2011-11-16 18:40:44.000000000 -0500
@@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct tim
return error;
/* SMP safe, global irq locking makes it work. */
sys_tz = *tz;
update_vsyscall_tz();
-diff -urNp linux-3.1.1/kernel/timer.c linux-3.1.1/kernel/timer.c
---- linux-3.1.1/kernel/timer.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/timer.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/timer.c linux-3.1.3/kernel/timer.c
+--- linux-3.1.3/kernel/timer.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/timer.c 2011-11-16 18:39:08.000000000 -0500
@@ -1304,7 +1304,7 @@ void update_process_times(int user_tick)
/*
* This function runs timers and the timer-tq in bottom half context.
{
struct tvec_base *base = __this_cpu_read(tvec_bases);
-diff -urNp linux-3.1.1/kernel/trace/blktrace.c linux-3.1.1/kernel/trace/blktrace.c
---- linux-3.1.1/kernel/trace/blktrace.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/trace/blktrace.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/trace/blktrace.c linux-3.1.3/kernel/trace/blktrace.c
+--- linux-3.1.3/kernel/trace/blktrace.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/trace/blktrace.c 2011-11-16 18:39:08.000000000 -0500
@@ -323,7 +323,7 @@ static ssize_t blk_dropped_read(struct f
struct blk_trace *bt = filp->private_data;
char buf[16];
ret = -EIO;
bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
-diff -urNp linux-3.1.1/kernel/trace/ftrace.c linux-3.1.1/kernel/trace/ftrace.c
---- linux-3.1.1/kernel/trace/ftrace.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/trace/ftrace.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/trace/ftrace.c linux-3.1.3/kernel/trace/ftrace.c
+--- linux-3.1.3/kernel/trace/ftrace.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/trace/ftrace.c 2011-11-16 18:39:08.000000000 -0500
@@ -1585,12 +1585,17 @@ ftrace_code_disable(struct module *mod,
if (unlikely(ftrace_disabled))
return 0;
{
struct ftrace_func_probe *entry;
struct ftrace_page *pg;
-diff -urNp linux-3.1.1/kernel/trace/trace.c linux-3.1.1/kernel/trace/trace.c
---- linux-3.1.1/kernel/trace/trace.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/trace/trace.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/kernel/trace/trace.c linux-3.1.3/kernel/trace/trace.c
+--- linux-3.1.3/kernel/trace/trace.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/trace/trace.c 2011-11-16 18:40:44.000000000 -0500
@@ -3451,6 +3451,8 @@ static ssize_t tracing_splice_read_pipe(
size_t rem;
unsigned int i;
static int once;
struct dentry *d_tracer;
-diff -urNp linux-3.1.1/kernel/trace/trace_events.c linux-3.1.1/kernel/trace/trace_events.c
---- linux-3.1.1/kernel/trace/trace_events.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/trace/trace_events.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/trace/trace_events.c linux-3.1.3/kernel/trace/trace_events.c
+--- linux-3.1.3/kernel/trace/trace_events.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/trace/trace_events.c 2011-11-16 18:39:08.000000000 -0500
@@ -1300,10 +1300,6 @@ static LIST_HEAD(ftrace_module_file_list
struct ftrace_module_file_ops {
struct list_head list;
}
}
-diff -urNp linux-3.1.1/kernel/trace/trace_kprobe.c linux-3.1.1/kernel/trace/trace_kprobe.c
---- linux-3.1.1/kernel/trace/trace_kprobe.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/trace/trace_kprobe.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/trace/trace_kprobe.c linux-3.1.3/kernel/trace/trace_kprobe.c
+--- linux-3.1.3/kernel/trace/trace_kprobe.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/trace/trace_kprobe.c 2011-11-16 18:39:08.000000000 -0500
@@ -217,7 +217,7 @@ static __kprobes void FETCH_FUNC_NAME(me
long ret;
int maxlen = get_rloc_len(*(u32 *)dest);
len++;
} while (c && ret == 0 && len < MAX_STRING_SIZE);
pagefault_enable();
-diff -urNp linux-3.1.1/kernel/trace/trace_mmiotrace.c linux-3.1.1/kernel/trace/trace_mmiotrace.c
---- linux-3.1.1/kernel/trace/trace_mmiotrace.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/trace/trace_mmiotrace.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/trace/trace_mmiotrace.c linux-3.1.3/kernel/trace/trace_mmiotrace.c
+--- linux-3.1.3/kernel/trace/trace_mmiotrace.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/trace/trace_mmiotrace.c 2011-11-16 18:39:08.000000000 -0500
@@ -24,7 +24,7 @@ struct header_iter {
static struct trace_array *mmio_trace_array;
static bool overrun_detected;
return;
}
entry = ring_buffer_event_data(event);
-diff -urNp linux-3.1.1/kernel/trace/trace_output.c linux-3.1.1/kernel/trace/trace_output.c
---- linux-3.1.1/kernel/trace/trace_output.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/trace/trace_output.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/trace/trace_output.c linux-3.1.3/kernel/trace/trace_output.c
+--- linux-3.1.3/kernel/trace/trace_output.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/trace/trace_output.c 2011-11-16 18:39:08.000000000 -0500
@@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s,
p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
if (p) {
s->len = p - s->buffer;
return 1;
-diff -urNp linux-3.1.1/kernel/trace/trace_stack.c linux-3.1.1/kernel/trace/trace_stack.c
---- linux-3.1.1/kernel/trace/trace_stack.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/trace/trace_stack.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/trace/trace_stack.c linux-3.1.3/kernel/trace/trace_stack.c
+--- linux-3.1.3/kernel/trace/trace_stack.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/trace/trace_stack.c 2011-11-16 18:39:08.000000000 -0500
@@ -50,7 +50,7 @@ static inline void check_stack(void)
return;
return;
local_irq_save(flags);
-diff -urNp linux-3.1.1/kernel/trace/trace_workqueue.c linux-3.1.1/kernel/trace/trace_workqueue.c
---- linux-3.1.1/kernel/trace/trace_workqueue.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/kernel/trace/trace_workqueue.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/kernel/trace/trace_workqueue.c linux-3.1.3/kernel/trace/trace_workqueue.c
+--- linux-3.1.3/kernel/trace/trace_workqueue.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/kernel/trace/trace_workqueue.c 2011-11-16 18:39:08.000000000 -0500
@@ -22,7 +22,7 @@ struct cpu_workqueue_stats {
int cpu;
pid_t pid;
tsk->comm);
put_task_struct(tsk);
}
-diff -urNp linux-3.1.1/lib/bitmap.c linux-3.1.1/lib/bitmap.c
---- linux-3.1.1/lib/bitmap.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/lib/bitmap.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/lib/bitmap.c linux-3.1.3/lib/bitmap.c
+--- linux-3.1.3/lib/bitmap.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/lib/bitmap.c 2011-11-16 18:39:08.000000000 -0500
@@ -419,7 +419,7 @@ int __bitmap_parse(const char *buf, unsi
{
int c, old_c, totaldigits, ndigits, nchunks, nbits;
ulen, 1, maskp, nmaskbits);
}
EXPORT_SYMBOL(bitmap_parselist_user);
-diff -urNp linux-3.1.1/lib/bug.c linux-3.1.1/lib/bug.c
---- linux-3.1.1/lib/bug.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/lib/bug.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/lib/bug.c linux-3.1.3/lib/bug.c
+--- linux-3.1.3/lib/bug.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/lib/bug.c 2011-11-16 18:39:08.000000000 -0500
@@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l
return BUG_TRAP_TYPE_NONE;
file = NULL;
line = 0;
-diff -urNp linux-3.1.1/lib/debugobjects.c linux-3.1.1/lib/debugobjects.c
---- linux-3.1.1/lib/debugobjects.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/lib/debugobjects.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/lib/debugobjects.c linux-3.1.3/lib/debugobjects.c
+--- linux-3.1.3/lib/debugobjects.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/lib/debugobjects.c 2011-11-16 18:39:08.000000000 -0500
@@ -284,7 +284,7 @@ static void debug_object_is_on_stack(voi
if (limit > 4)
return;
if (is_on_stack == onstack)
return;
-diff -urNp linux-3.1.1/lib/devres.c linux-3.1.1/lib/devres.c
---- linux-3.1.1/lib/devres.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/lib/devres.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/lib/devres.c linux-3.1.3/lib/devres.c
+--- linux-3.1.3/lib/devres.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/lib/devres.c 2011-11-16 18:39:08.000000000 -0500
@@ -80,7 +80,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
void devm_iounmap(struct device *dev, void __iomem *addr)
{
}
EXPORT_SYMBOL(devm_ioport_unmap);
-diff -urNp linux-3.1.1/lib/dma-debug.c linux-3.1.1/lib/dma-debug.c
---- linux-3.1.1/lib/dma-debug.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/lib/dma-debug.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/lib/dma-debug.c linux-3.1.3/lib/dma-debug.c
+--- linux-3.1.3/lib/dma-debug.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/lib/dma-debug.c 2011-11-16 18:39:08.000000000 -0500
@@ -870,7 +870,7 @@ out:
static void check_for_stack(struct device *dev, void *addr)
err_printk(dev, NULL, "DMA-API: device driver maps memory from"
"stack [addr=%p]\n", addr);
}
-diff -urNp linux-3.1.1/lib/extable.c linux-3.1.1/lib/extable.c
---- linux-3.1.1/lib/extable.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/lib/extable.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/lib/extable.c linux-3.1.3/lib/extable.c
+--- linux-3.1.3/lib/extable.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/lib/extable.c 2011-11-16 18:39:08.000000000 -0500
@@ -13,6 +13,7 @@
#include <linux/init.h>
#include <linux/sort.h>
}
#ifdef CONFIG_MODULES
-diff -urNp linux-3.1.1/lib/inflate.c linux-3.1.1/lib/inflate.c
---- linux-3.1.1/lib/inflate.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/lib/inflate.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/lib/inflate.c linux-3.1.3/lib/inflate.c
+--- linux-3.1.3/lib/inflate.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/lib/inflate.c 2011-11-16 18:39:08.000000000 -0500
@@ -269,7 +269,7 @@ static void free(void *where)
malloc_ptr = free_mem_ptr;
}
#define free(a) kfree(a)
#endif
-diff -urNp linux-3.1.1/lib/Kconfig.debug linux-3.1.1/lib/Kconfig.debug
---- linux-3.1.1/lib/Kconfig.debug 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/lib/Kconfig.debug 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/lib/Kconfig.debug linux-3.1.3/lib/Kconfig.debug
+--- linux-3.1.3/lib/Kconfig.debug 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/lib/Kconfig.debug 2011-11-16 18:40:44.000000000 -0500
@@ -1091,6 +1091,7 @@ config LATENCYTOP
depends on DEBUG_KERNEL
depends on STACKTRACE_SUPPORT
select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE
select KALLSYMS
select KALLSYMS_ALL
-diff -urNp linux-3.1.1/lib/kref.c linux-3.1.1/lib/kref.c
---- linux-3.1.1/lib/kref.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/lib/kref.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/lib/kref.c linux-3.1.3/lib/kref.c
+--- linux-3.1.3/lib/kref.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/lib/kref.c 2011-11-16 18:39:08.000000000 -0500
@@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
*/
int kref_put(struct kref *kref, void (*release)(struct kref *kref))
WARN_ON(release == (void (*)(struct kref *))kfree);
if (atomic_dec_and_test(&kref->refcount)) {
-diff -urNp linux-3.1.1/lib/radix-tree.c linux-3.1.1/lib/radix-tree.c
---- linux-3.1.1/lib/radix-tree.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/lib/radix-tree.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/lib/radix-tree.c linux-3.1.3/lib/radix-tree.c
+--- linux-3.1.3/lib/radix-tree.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/lib/radix-tree.c 2011-11-16 18:39:08.000000000 -0500
@@ -80,7 +80,7 @@ struct radix_tree_preload {
int nr;
struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
static inline void *ptr_to_indirect(void *ptr)
{
-diff -urNp linux-3.1.1/lib/vsprintf.c linux-3.1.1/lib/vsprintf.c
---- linux-3.1.1/lib/vsprintf.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/lib/vsprintf.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/lib/vsprintf.c linux-3.1.3/lib/vsprintf.c
+--- linux-3.1.3/lib/vsprintf.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/lib/vsprintf.c 2011-11-16 18:40:44.000000000 -0500
@@ -16,6 +16,9 @@
* - scnprintf and vscnprintf
*/
break;
}
-diff -urNp linux-3.1.1/localversion-grsec linux-3.1.1/localversion-grsec
---- linux-3.1.1/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/localversion-grsec 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/localversion-grsec linux-3.1.3/localversion-grsec
+--- linux-3.1.3/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/localversion-grsec 2011-11-16 18:40:44.000000000 -0500
@@ -0,0 +1 @@
+-grsec
-diff -urNp linux-3.1.1/Makefile linux-3.1.1/Makefile
---- linux-3.1.1/Makefile 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/Makefile 2011-11-17 18:56:01.000000000 -0500
+diff -urNp linux-3.1.3/Makefile linux-3.1.3/Makefile
+--- linux-3.1.3/Makefile 2011-11-26 19:57:29.000000000 -0500
++++ linux-3.1.3/Makefile 2011-11-26 20:00:43.000000000 -0500
@@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
HOSTCC = gcc
$(Q)$(MAKE) $(build)=scripts/basic
$(Q)rm -f .tmp_quiet_recordmcount
-@@ -564,6 +565,37 @@ else
+@@ -564,6 +565,41 @@ else
KBUILD_CFLAGS += -O2
endif
++ifndef DISABLE_PAX_PLUGINS
+ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(CC)"), y)
++ifndef DISABLE_PAX_CONSTIFY_PLUGIN
+CONSTIFY_PLUGIN := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
++endif
+ifdef CONFIG_PAX_MEMORY_STACKLEAK
+STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
+STACKLEAK_PLUGIN += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
+else
+gcc-plugins:
+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
-+ $(error Your gcc installation does not support plugins. If the necessary headers for plugin support are missing, they should be installed. On Debian, apt-get install gcc-<ver>-plugin-dev.))
++ $(error Your gcc installation does not support plugins. If the necessary headers for plugin support are missing, they should be installed. On Debian, apt-get install gcc-<ver>-plugin-dev. If you choose to ignore this error and lessen the improvements provided by this patch, re-run make with the DISABLE_PAX_PLUGINS=y argument.))
+else
+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
+endif
+ $(Q)echo "PAX_MEMORY_STACKLEAK and other features will be less secure"
+endif
++endif
+
include $(srctree)/arch/$(SRCARCH)/Makefile
ifneq ($(CONFIG_FRAME_WARN),0)
-@@ -708,7 +740,7 @@ export mod_strip_cmd
+@@ -708,7 +744,7 @@ export mod_strip_cmd
ifeq ($(KBUILD_EXTMOD),)
vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-@@ -932,6 +964,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-mai
+@@ -932,6 +968,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-mai
# The actual objects are generated when descending,
# make sure no implicit rule kicks in
$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
# Handle descending into subdirectories listed in $(vmlinux-dirs)
-@@ -941,7 +974,7 @@ $(sort $(vmlinux-init) $(vmlinux-main))
+@@ -941,7 +978,7 @@ $(sort $(vmlinux-init) $(vmlinux-main))
# Error messages still appears in the original language
PHONY += $(vmlinux-dirs)
$(Q)$(MAKE) $(build)=$@
# Store (new) KERNELRELASE string in include/config/kernel.release
-@@ -986,6 +1019,7 @@ prepare0: archprepare FORCE
+@@ -986,6 +1023,7 @@ prepare0: archprepare FORCE
$(Q)$(MAKE) $(build)=. missing-syscalls
# All the preparing..
prepare: prepare0
# Generate some files
-@@ -1087,6 +1121,7 @@ all: modules
+@@ -1087,6 +1125,7 @@ all: modules
# using awk while concatenating to the final file.
PHONY += modules
modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
@$(kecho) ' Building modules, stage 2.';
-@@ -1102,7 +1137,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modu
+@@ -1102,7 +1141,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modu
# Target to prepare building external modules
PHONY += modules_prepare
# Target to install modules
PHONY += modules_install
-@@ -1198,7 +1233,7 @@ distclean: mrproper
+@@ -1198,7 +1237,7 @@ distclean: mrproper
@find $(srctree) $(RCS_FIND_IGNORE) \
\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
-type f -print | xargs rm -f
-@@ -1360,6 +1395,7 @@ PHONY += $(module-dirs) modules
+@@ -1360,6 +1399,7 @@ PHONY += $(module-dirs) modules
$(module-dirs): crmodverdir $(objtree)/Module.symvers
$(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
modules: $(module-dirs)
@$(kecho) ' Building modules, stage 2.';
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
-@@ -1486,17 +1522,19 @@ else
+@@ -1486,17 +1526,19 @@ else
target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
endif
$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
%.symtypes: %.c prepare scripts FORCE
$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
-@@ -1506,11 +1544,13 @@ endif
+@@ -1506,11 +1548,13 @@ endif
$(cmd_crmodverdir)
$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
$(build)=$(build-dir)
$(cmd_crmodverdir)
$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
$(build)=$(build-dir) $(@:.ko=.o)
-diff -urNp linux-3.1.1/mm/filemap.c linux-3.1.1/mm/filemap.c
---- linux-3.1.1/mm/filemap.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/filemap.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/mm/filemap.c linux-3.1.3/mm/filemap.c
+--- linux-3.1.3/mm/filemap.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/filemap.c 2011-11-16 18:40:44.000000000 -0500
@@ -1784,7 +1784,7 @@ int generic_file_mmap(struct file * file
struct address_space *mapping = file->f_mapping;
if (*pos >= limit) {
send_sig(SIGXFSZ, current, 0);
return -EFBIG;
-diff -urNp linux-3.1.1/mm/fremap.c linux-3.1.1/mm/fremap.c
---- linux-3.1.1/mm/fremap.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/fremap.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/mm/fremap.c linux-3.1.3/mm/fremap.c
+--- linux-3.1.3/mm/fremap.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/fremap.c 2011-11-16 18:39:08.000000000 -0500
@@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
retry:
vma = find_vma(mm, start);
/*
* Make sure the vma is shared, that it supports prefaulting,
* and that the remapped range is valid and fully within
-diff -urNp linux-3.1.1/mm/highmem.c linux-3.1.1/mm/highmem.c
---- linux-3.1.1/mm/highmem.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/highmem.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/mm/highmem.c linux-3.1.3/mm/highmem.c
+--- linux-3.1.3/mm/highmem.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/highmem.c 2011-11-16 18:39:08.000000000 -0500
@@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
* So no dangers, even with speculative execution.
*/
pkmap_count[last_pkmap_nr] = 1;
set_page_address(page, (void *)vaddr);
-diff -urNp linux-3.1.1/mm/huge_memory.c linux-3.1.1/mm/huge_memory.c
---- linux-3.1.1/mm/huge_memory.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/huge_memory.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/mm/huge_memory.c linux-3.1.3/mm/huge_memory.c
+--- linux-3.1.3/mm/huge_memory.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/huge_memory.c 2011-11-16 18:39:08.000000000 -0500
@@ -702,7 +702,7 @@ out:
* run pte_offset_map on the pmd, if an huge pmd could
* materialize from under us from a different thread.
return VM_FAULT_OOM;
/* if an huge pmd materialized from under us just retry later */
if (unlikely(pmd_trans_huge(*pmd)))
-diff -urNp linux-3.1.1/mm/hugetlb.c linux-3.1.1/mm/hugetlb.c
---- linux-3.1.1/mm/hugetlb.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/hugetlb.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/mm/hugetlb.c linux-3.1.3/mm/hugetlb.c
+--- linux-3.1.3/mm/hugetlb.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/hugetlb.c 2011-11-16 18:39:08.000000000 -0500
@@ -2346,6 +2346,27 @@ static int unmap_ref_private(struct mm_s
return 1;
}
ptep = huge_pte_alloc(mm, address, huge_page_size(h));
if (!ptep)
return VM_FAULT_OOM;
-diff -urNp linux-3.1.1/mm/internal.h linux-3.1.1/mm/internal.h
---- linux-3.1.1/mm/internal.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/internal.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/mm/internal.h linux-3.1.3/mm/internal.h
+--- linux-3.1.3/mm/internal.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/internal.h 2011-11-16 18:39:08.000000000 -0500
@@ -95,6 +95,7 @@ extern void putback_lru_page(struct page
* in mm/page_alloc.c
*/
extern void prep_compound_page(struct page *page, unsigned long order);
#ifdef CONFIG_MEMORY_FAILURE
extern bool is_free_buddy_page(struct page *page);
-diff -urNp linux-3.1.1/mm/Kconfig linux-3.1.1/mm/Kconfig
---- linux-3.1.1/mm/Kconfig 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/Kconfig 2011-11-17 18:57:00.000000000 -0500
+diff -urNp linux-3.1.3/mm/Kconfig linux-3.1.3/mm/Kconfig
+--- linux-3.1.3/mm/Kconfig 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/Kconfig 2011-11-17 18:57:00.000000000 -0500
@@ -238,10 +238,10 @@ config KSM
root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
This is the portion of low virtual memory which should be protected
from userspace allocation. Keeping a user from writing to low pages
can help reduce the impact of kernel NULL pointer bugs.
-diff -urNp linux-3.1.1/mm/kmemleak.c linux-3.1.1/mm/kmemleak.c
---- linux-3.1.1/mm/kmemleak.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/kmemleak.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/mm/kmemleak.c linux-3.1.3/mm/kmemleak.c
+--- linux-3.1.3/mm/kmemleak.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/kmemleak.c 2011-11-16 18:40:44.000000000 -0500
@@ -357,7 +357,7 @@ static void print_unreferenced(struct se
for (i = 0; i < object->trace_len; i++) {
}
}
-diff -urNp linux-3.1.1/mm/maccess.c linux-3.1.1/mm/maccess.c
---- linux-3.1.1/mm/maccess.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/maccess.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/mm/maccess.c linux-3.1.3/mm/maccess.c
+--- linux-3.1.3/mm/maccess.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/maccess.c 2011-11-16 18:39:08.000000000 -0500
@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, cons
set_fs(KERNEL_DS);
pagefault_disable();
pagefault_enable();
set_fs(old_fs);
-diff -urNp linux-3.1.1/mm/madvise.c linux-3.1.1/mm/madvise.c
---- linux-3.1.1/mm/madvise.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/madvise.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/mm/madvise.c linux-3.1.3/mm/madvise.c
+--- linux-3.1.3/mm/madvise.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/madvise.c 2011-11-16 18:39:08.000000000 -0500
@@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a
pgoff_t pgoff;
unsigned long new_flags = vma->vm_flags;
error = 0;
if (end == start)
goto out;
-diff -urNp linux-3.1.1/mm/memory.c linux-3.1.1/mm/memory.c
---- linux-3.1.1/mm/memory.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/memory.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/mm/memory.c linux-3.1.3/mm/memory.c
+--- linux-3.1.3/mm/memory.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/memory.c 2011-11-16 18:39:08.000000000 -0500
@@ -457,8 +457,12 @@ static inline void free_pmd_range(struct
return;
/*
* Make sure the vDSO gets into every core dump.
* Dumping its contents makes post-mortem fully interpretable later
-diff -urNp linux-3.1.1/mm/memory-failure.c linux-3.1.1/mm/memory-failure.c
---- linux-3.1.1/mm/memory-failure.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/memory-failure.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/mm/memory-failure.c linux-3.1.3/mm/memory-failure.c
+--- linux-3.1.3/mm/memory-failure.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/memory-failure.c 2011-11-16 18:39:08.000000000 -0500
@@ -60,7 +60,7 @@ int sysctl_memory_failure_early_kill __r
int sysctl_memory_failure_recovery __read_mostly = 1;
SetPageHWPoison(page);
/* keep elevated page count for bad page */
return ret;
-diff -urNp linux-3.1.1/mm/mempolicy.c linux-3.1.1/mm/mempolicy.c
---- linux-3.1.1/mm/mempolicy.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/mempolicy.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/mm/mempolicy.c linux-3.1.3/mm/mempolicy.c
+--- linux-3.1.3/mm/mempolicy.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/mempolicy.c 2011-11-16 18:40:44.000000000 -0500
@@ -639,6 +639,10 @@ static int mbind_range(struct mm_struct
unsigned long vmstart;
unsigned long vmend;
rcu_read_unlock();
err = -EPERM;
goto out;
-diff -urNp linux-3.1.1/mm/migrate.c linux-3.1.1/mm/migrate.c
---- linux-3.1.1/mm/migrate.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/migrate.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/mm/migrate.c linux-3.1.3/mm/migrate.c
+--- linux-3.1.3/mm/migrate.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/migrate.c 2011-11-16 18:40:44.000000000 -0500
@@ -1124,6 +1124,8 @@ static int do_pages_move(struct mm_struc
unsigned long chunk_start;
int err;
rcu_read_unlock();
err = -EPERM;
goto out;
-diff -urNp linux-3.1.1/mm/mlock.c linux-3.1.1/mm/mlock.c
---- linux-3.1.1/mm/mlock.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/mlock.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/mm/mlock.c linux-3.1.3/mm/mlock.c
+--- linux-3.1.3/mm/mlock.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/mlock.c 2011-11-16 18:40:44.000000000 -0500
@@ -13,6 +13,7 @@
#include <linux/pagemap.h>
#include <linux/mempolicy.h>
if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
capable(CAP_IPC_LOCK))
ret = do_mlockall(flags);
-diff -urNp linux-3.1.1/mm/mmap.c linux-3.1.1/mm/mmap.c
---- linux-3.1.1/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/mmap.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/mm/mmap.c linux-3.1.3/mm/mmap.c
+--- linux-3.1.3/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/mmap.c 2011-11-16 18:40:44.000000000 -0500
@@ -46,6 +46,16 @@
#define arch_rebalance_pgtables(addr, len) (addr)
#endif
vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
-diff -urNp linux-3.1.1/mm/mprotect.c linux-3.1.1/mm/mprotect.c
---- linux-3.1.1/mm/mprotect.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/mprotect.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/mm/mprotect.c linux-3.1.3/mm/mprotect.c
+--- linux-3.1.3/mm/mprotect.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/mprotect.c 2011-11-16 18:40:44.000000000 -0500
@@ -23,10 +23,16 @@
#include <linux/mmu_notifier.h>
#include <linux/migrate.h>
nstart = tmp;
if (nstart < prev->vm_end)
-diff -urNp linux-3.1.1/mm/mremap.c linux-3.1.1/mm/mremap.c
---- linux-3.1.1/mm/mremap.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/mremap.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/mm/mremap.c linux-3.1.3/mm/mremap.c
+--- linux-3.1.3/mm/mremap.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/mremap.c 2011-11-16 18:39:08.000000000 -0500
@@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_str
continue;
pte = ptep_clear_flush(vma, old_addr, old_pte);
}
out:
if (ret & ~PAGE_MASK)
-diff -urNp linux-3.1.1/mm/nobootmem.c linux-3.1.1/mm/nobootmem.c
---- linux-3.1.1/mm/nobootmem.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/nobootmem.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/mm/nobootmem.c linux-3.1.3/mm/nobootmem.c
+--- linux-3.1.3/mm/nobootmem.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/nobootmem.c 2011-11-16 18:39:08.000000000 -0500
@@ -110,19 +110,30 @@ static void __init __free_pages_memory(u
unsigned long __init free_all_memory_core_early(int nodeid)
{
return count;
}
-diff -urNp linux-3.1.1/mm/nommu.c linux-3.1.1/mm/nommu.c
---- linux-3.1.1/mm/nommu.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/nommu.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/mm/nommu.c linux-3.1.3/mm/nommu.c
+--- linux-3.1.3/mm/nommu.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/nommu.c 2011-11-16 18:39:08.000000000 -0500
@@ -62,7 +62,6 @@ int sysctl_overcommit_memory = OVERCOMMI
int sysctl_overcommit_ratio = 50; /* default is 50% */
int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
*region = *vma->vm_region;
new->vm_region = region;
-diff -urNp linux-3.1.1/mm/page_alloc.c linux-3.1.1/mm/page_alloc.c
---- linux-3.1.1/mm/page_alloc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/page_alloc.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/mm/oom_kill.c linux-3.1.3/mm/oom_kill.c
+--- linux-3.1.3/mm/oom_kill.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/oom_kill.c 2011-11-18 18:44:21.000000000 -0500
+@@ -162,7 +162,7 @@ static bool oom_unkillable_task(struct t
+ unsigned int oom_badness(struct task_struct *p, struct mem_cgroup *mem,
+ const nodemask_t *nodemask, unsigned long totalpages)
+ {
+- int points;
++ long points;
+
+ if (oom_unkillable_task(p, mem, nodemask))
+ return 0;
+diff -urNp linux-3.1.3/mm/page_alloc.c linux-3.1.3/mm/page_alloc.c
+--- linux-3.1.3/mm/page_alloc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/page_alloc.c 2011-11-16 18:40:44.000000000 -0500
@@ -340,7 +340,7 @@ out:
* This usage means that zero-order pages may not be compound.
*/
return 1;
}
return 0;
-diff -urNp linux-3.1.1/mm/percpu.c linux-3.1.1/mm/percpu.c
---- linux-3.1.1/mm/percpu.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/percpu.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/mm/percpu.c linux-3.1.3/mm/percpu.c
+--- linux-3.1.3/mm/percpu.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/percpu.c 2011-11-16 18:39:08.000000000 -0500
@@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu
static unsigned int pcpu_last_unit_cpu __read_mostly;
EXPORT_SYMBOL_GPL(pcpu_base_addr);
static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
-diff -urNp linux-3.1.1/mm/rmap.c linux-3.1.1/mm/rmap.c
---- linux-3.1.1/mm/rmap.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/rmap.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/mm/rmap.c linux-3.1.3/mm/rmap.c
+--- linux-3.1.3/mm/rmap.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/rmap.c 2011-11-16 18:39:08.000000000 -0500
@@ -152,6 +152,10 @@ int anon_vma_prepare(struct vm_area_stru
struct anon_vma *anon_vma = vma->anon_vma;
struct anon_vma_chain *avc;
{
struct anon_vma_chain *avc;
struct anon_vma *anon_vma;
-diff -urNp linux-3.1.1/mm/shmem.c linux-3.1.1/mm/shmem.c
---- linux-3.1.1/mm/shmem.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/shmem.c 2011-11-16 19:28:28.000000000 -0500
+diff -urNp linux-3.1.3/mm/shmem.c linux-3.1.3/mm/shmem.c
+--- linux-3.1.3/mm/shmem.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/shmem.c 2011-11-16 19:28:28.000000000 -0500
@@ -31,7 +31,7 @@
#include <linux/module.h>
#include <linux/swap.h>
if (!sbinfo)
return -ENOMEM;
-diff -urNp linux-3.1.1/mm/slab.c linux-3.1.1/mm/slab.c
---- linux-3.1.1/mm/slab.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/slab.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/mm/slab.c linux-3.1.3/mm/slab.c
+--- linux-3.1.3/mm/slab.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/slab.c 2011-11-16 18:40:44.000000000 -0500
@@ -151,7 +151,7 @@
/* Legal flag mask for kmem_cache_create(). */
/**
* ksize - get the actual amount of memory allocated for a given object
* @objp: Pointer to the object
-diff -urNp linux-3.1.1/mm/slob.c linux-3.1.1/mm/slob.c
---- linux-3.1.1/mm/slob.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/slob.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/mm/slob.c linux-3.1.3/mm/slob.c
+--- linux-3.1.3/mm/slob.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/slob.c 2011-11-16 18:39:08.000000000 -0500
@@ -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
}
EXPORT_SYMBOL(kmem_cache_free);
-diff -urNp linux-3.1.1/mm/slub.c linux-3.1.1/mm/slub.c
---- linux-3.1.1/mm/slub.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/slub.c 2011-11-16 19:27:25.000000000 -0500
+diff -urNp linux-3.1.3/mm/slub.c linux-3.1.3/mm/slub.c
+--- linux-3.1.3/mm/slub.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/slub.c 2011-11-16 19:27:25.000000000 -0500
@@ -208,7 +208,7 @@ struct track {
enum track_item { TRACK_ALLOC, TRACK_FREE };
return 0;
}
module_init(slab_proc_init);
-diff -urNp linux-3.1.1/mm/swap.c linux-3.1.1/mm/swap.c
---- linux-3.1.1/mm/swap.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/swap.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/mm/swap.c linux-3.1.3/mm/swap.c
+--- linux-3.1.3/mm/swap.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/swap.c 2011-11-16 18:39:08.000000000 -0500
@@ -31,6 +31,7 @@
#include <linux/backing-dev.h>
#include <linux/memcontrol.h>
(*dtor)(page);
}
-diff -urNp linux-3.1.1/mm/swapfile.c linux-3.1.1/mm/swapfile.c
---- linux-3.1.1/mm/swapfile.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/swapfile.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/mm/swapfile.c linux-3.1.3/mm/swapfile.c
+--- linux-3.1.3/mm/swapfile.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/swapfile.c 2011-11-16 18:39:08.000000000 -0500
@@ -62,7 +62,7 @@ static DEFINE_MUTEX(swapon_mutex);
static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
wake_up_interruptible(&proc_poll_wait);
if (S_ISREG(inode->i_mode))
-diff -urNp linux-3.1.1/mm/util.c linux-3.1.1/mm/util.c
---- linux-3.1.1/mm/util.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/util.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/mm/util.c linux-3.1.3/mm/util.c
+--- linux-3.1.3/mm/util.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/util.c 2011-11-16 18:39:08.000000000 -0500
@@ -114,6 +114,7 @@ EXPORT_SYMBOL(memdup_user);
* allocated buffer. Use this if you don't want to free the buffer immediately
* like, for example, with RCU.
mm->get_unmapped_area = arch_get_unmapped_area;
mm->unmap_area = arch_unmap_area;
}
-diff -urNp linux-3.1.1/mm/vmalloc.c linux-3.1.1/mm/vmalloc.c
---- linux-3.1.1/mm/vmalloc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/vmalloc.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/mm/vmalloc.c linux-3.1.3/mm/vmalloc.c
+--- linux-3.1.3/mm/vmalloc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/vmalloc.c 2011-11-16 18:40:44.000000000 -0500
@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd,
pte = pte_offset_kernel(pmd, addr);
if ((PAGE_SIZE-1) & (unsigned long)addr)
return -EINVAL;
-diff -urNp linux-3.1.1/mm/vmstat.c linux-3.1.1/mm/vmstat.c
---- linux-3.1.1/mm/vmstat.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/mm/vmstat.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/mm/vmstat.c linux-3.1.3/mm/vmstat.c
+--- linux-3.1.3/mm/vmstat.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/mm/vmstat.c 2011-11-16 18:40:44.000000000 -0500
@@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
*
* vm_stat contains the global counters
#endif
return 0;
}
-diff -urNp linux-3.1.1/net/8021q/vlan.c linux-3.1.1/net/8021q/vlan.c
---- linux-3.1.1/net/8021q/vlan.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/8021q/vlan.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/8021q/vlan.c linux-3.1.3/net/8021q/vlan.c
+--- linux-3.1.3/net/8021q/vlan.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/8021q/vlan.c 2011-11-16 18:39:08.000000000 -0500
@@ -588,8 +588,7 @@ static int vlan_ioctl_handler(struct net
err = -EPERM;
if (!capable(CAP_NET_ADMIN))
struct vlan_net *vn;
vn = net_generic(net, vlan_net_id);
-diff -urNp linux-3.1.1/net/9p/trans_fd.c linux-3.1.1/net/9p/trans_fd.c
---- linux-3.1.1/net/9p/trans_fd.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/9p/trans_fd.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/9p/trans_fd.c linux-3.1.3/net/9p/trans_fd.c
+--- linux-3.1.3/net/9p/trans_fd.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/9p/trans_fd.c 2011-11-16 18:39:08.000000000 -0500
@@ -423,7 +423,7 @@ static int p9_fd_write(struct p9_client
oldfs = get_fs();
set_fs(get_ds());
set_fs(oldfs);
if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
-diff -urNp linux-3.1.1/net/9p/trans_virtio.c linux-3.1.1/net/9p/trans_virtio.c
---- linux-3.1.1/net/9p/trans_virtio.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/9p/trans_virtio.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/9p/trans_virtio.c linux-3.1.3/net/9p/trans_virtio.c
+--- linux-3.1.3/net/9p/trans_virtio.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/9p/trans_virtio.c 2011-11-16 18:39:08.000000000 -0500
@@ -327,7 +327,7 @@ req_retry_pinned:
} else {
char *pbuf;
else
pbuf = req->tc->pkbuf;
-diff -urNp linux-3.1.1/net/atm/atm_misc.c linux-3.1.1/net/atm/atm_misc.c
---- linux-3.1.1/net/atm/atm_misc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/atm/atm_misc.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/atm/atm_misc.c linux-3.1.3/net/atm/atm_misc.c
+--- linux-3.1.3/net/atm/atm_misc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/atm/atm_misc.c 2011-11-16 18:39:08.000000000 -0500
@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int
if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
return 1;
__SONET_ITEMS
#undef __HANDLE_ITEM
}
-diff -urNp linux-3.1.1/net/atm/lec.h linux-3.1.1/net/atm/lec.h
---- linux-3.1.1/net/atm/lec.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/atm/lec.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/atm/lec.h linux-3.1.3/net/atm/lec.h
+--- linux-3.1.3/net/atm/lec.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/atm/lec.h 2011-11-16 18:39:08.000000000 -0500
@@ -48,7 +48,7 @@ struct lane2_ops {
const u8 *tlvs, u32 sizeoftlvs);
void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
/*
* ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
-diff -urNp linux-3.1.1/net/atm/mpc.h linux-3.1.1/net/atm/mpc.h
---- linux-3.1.1/net/atm/mpc.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/atm/mpc.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/atm/mpc.h linux-3.1.3/net/atm/mpc.h
+--- linux-3.1.3/net/atm/mpc.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/atm/mpc.h 2011-11-16 18:39:08.000000000 -0500
@@ -33,7 +33,7 @@ struct mpoa_client {
struct mpc_parameters parameters; /* parameters for this client */
};
-diff -urNp linux-3.1.1/net/atm/mpoa_caches.c linux-3.1.1/net/atm/mpoa_caches.c
---- linux-3.1.1/net/atm/mpoa_caches.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/atm/mpoa_caches.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/atm/mpoa_caches.c linux-3.1.3/net/atm/mpoa_caches.c
+--- linux-3.1.3/net/atm/mpoa_caches.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/atm/mpoa_caches.c 2011-11-16 18:40:44.000000000 -0500
@@ -255,6 +255,8 @@ static void check_resolving_entries(stru
struct timeval now;
struct k_message msg;
do_gettimeofday(&now);
read_lock_bh(&client->ingress_lock);
-diff -urNp linux-3.1.1/net/atm/proc.c linux-3.1.1/net/atm/proc.c
---- linux-3.1.1/net/atm/proc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/atm/proc.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/atm/proc.c linux-3.1.3/net/atm/proc.c
+--- linux-3.1.3/net/atm/proc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/atm/proc.c 2011-11-16 18:39:08.000000000 -0500
@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s
const struct k_atm_aal_stats *stats)
{
}
static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
-diff -urNp linux-3.1.1/net/atm/resources.c linux-3.1.1/net/atm/resources.c
---- linux-3.1.1/net/atm/resources.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/atm/resources.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/atm/resources.c linux-3.1.3/net/atm/resources.c
+--- linux-3.1.3/net/atm/resources.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/atm/resources.c 2011-11-16 18:39:08.000000000 -0500
@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
static void copy_aal_stats(struct k_atm_aal_stats *from,
struct atm_aal_stats *to)
__AAL_STAT_ITEMS
#undef __HANDLE_ITEM
}
-diff -urNp linux-3.1.1/net/batman-adv/hard-interface.c linux-3.1.1/net/batman-adv/hard-interface.c
---- linux-3.1.1/net/batman-adv/hard-interface.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/batman-adv/hard-interface.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/batman-adv/hard-interface.c linux-3.1.3/net/batman-adv/hard-interface.c
+--- linux-3.1.3/net/batman-adv/hard-interface.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/batman-adv/hard-interface.c 2011-11-16 18:39:08.000000000 -0500
@@ -347,8 +347,8 @@ int hardif_enable_interface(struct hard_
hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
dev_add_pack(&hard_iface->batman_adv_ptype);
bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
hard_iface->net_dev->name);
-diff -urNp linux-3.1.1/net/batman-adv/routing.c linux-3.1.1/net/batman-adv/routing.c
---- linux-3.1.1/net/batman-adv/routing.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/batman-adv/routing.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/batman-adv/routing.c linux-3.1.3/net/batman-adv/routing.c
+--- linux-3.1.3/net/batman-adv/routing.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/batman-adv/routing.c 2011-11-16 18:39:08.000000000 -0500
@@ -656,7 +656,7 @@ void receive_bat_packet(const struct eth
return;
has_directlink_flag = (batman_packet->flags & DIRECTLINK ? 1 : 0);
-diff -urNp linux-3.1.1/net/batman-adv/send.c linux-3.1.1/net/batman-adv/send.c
---- linux-3.1.1/net/batman-adv/send.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/batman-adv/send.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/batman-adv/send.c linux-3.1.3/net/batman-adv/send.c
+--- linux-3.1.3/net/batman-adv/send.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/batman-adv/send.c 2011-11-16 18:39:08.000000000 -0500
@@ -326,7 +326,7 @@ void schedule_own_packet(struct hard_ifa
/* change sequence number to network order */
slide_own_bcast_window(hard_iface);
send_time = own_send_time(bat_priv);
-diff -urNp linux-3.1.1/net/batman-adv/soft-interface.c linux-3.1.1/net/batman-adv/soft-interface.c
---- linux-3.1.1/net/batman-adv/soft-interface.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/batman-adv/soft-interface.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/batman-adv/soft-interface.c linux-3.1.3/net/batman-adv/soft-interface.c
+--- linux-3.1.3/net/batman-adv/soft-interface.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/batman-adv/soft-interface.c 2011-11-16 18:39:08.000000000 -0500
@@ -632,7 +632,7 @@ static int interface_tx(struct sk_buff *
/* set broadcast sequence number */
atomic_set(&bat_priv->ttvn, 0);
atomic_set(&bat_priv->tt_local_changes, 0);
atomic_set(&bat_priv->tt_ogm_append_cnt, 0);
-diff -urNp linux-3.1.1/net/batman-adv/types.h linux-3.1.1/net/batman-adv/types.h
---- linux-3.1.1/net/batman-adv/types.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/batman-adv/types.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/batman-adv/types.h linux-3.1.3/net/batman-adv/types.h
+--- linux-3.1.3/net/batman-adv/types.h 2011-11-26 19:57:29.000000000 -0500
++++ linux-3.1.3/net/batman-adv/types.h 2011-11-26 20:00:43.000000000 -0500
@@ -38,8 +38,8 @@ struct hard_iface {
int16_t if_num;
char if_status;
atomic_t bcast_queue_left;
atomic_t batman_queue_left;
atomic_t ttvn; /* tranlation table version number */
-diff -urNp linux-3.1.1/net/batman-adv/unicast.c linux-3.1.1/net/batman-adv/unicast.c
---- linux-3.1.1/net/batman-adv/unicast.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/batman-adv/unicast.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/batman-adv/unicast.c linux-3.1.3/net/batman-adv/unicast.c
+--- linux-3.1.3/net/batman-adv/unicast.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/batman-adv/unicast.c 2011-11-16 18:39:08.000000000 -0500
@@ -264,7 +264,7 @@ int frag_send_skb(struct sk_buff *skb, s
frag1->flags = UNI_FRAG_HEAD | large_tail;
frag2->flags = large_tail;
frag1->seqno = htons(seqno - 1);
frag2->seqno = htons(seqno);
-diff -urNp linux-3.1.1/net/bluetooth/hci_conn.c linux-3.1.1/net/bluetooth/hci_conn.c
---- linux-3.1.1/net/bluetooth/hci_conn.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/bluetooth/hci_conn.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/bluetooth/hci_conn.c linux-3.1.3/net/bluetooth/hci_conn.c
+--- linux-3.1.3/net/bluetooth/hci_conn.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/bluetooth/hci_conn.c 2011-11-16 18:39:08.000000000 -0500
@@ -218,7 +218,7 @@ void hci_le_start_enc(struct hci_conn *c
cp.handle = cpu_to_le16(conn->handle);
memcpy(cp.ltk, ltk, sizeof(cp.ltk));
hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof(cp), &cp);
}
-diff -urNp linux-3.1.1/net/bridge/br_multicast.c linux-3.1.1/net/bridge/br_multicast.c
---- linux-3.1.1/net/bridge/br_multicast.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/bridge/br_multicast.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/bridge/br_multicast.c linux-3.1.3/net/bridge/br_multicast.c
+--- linux-3.1.3/net/bridge/br_multicast.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/bridge/br_multicast.c 2011-11-16 18:39:08.000000000 -0500
@@ -1485,7 +1485,7 @@ static int br_multicast_ipv6_rcv(struct
nexthdr = ip6h->nexthdr;
offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
return 0;
/* Okay, we found ICMPv6 header */
-diff -urNp linux-3.1.1/net/bridge/netfilter/ebtables.c linux-3.1.1/net/bridge/netfilter/ebtables.c
---- linux-3.1.1/net/bridge/netfilter/ebtables.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/bridge/netfilter/ebtables.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/bridge/netfilter/ebtables.c linux-3.1.3/net/bridge/netfilter/ebtables.c
+--- linux-3.1.3/net/bridge/netfilter/ebtables.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/bridge/netfilter/ebtables.c 2011-11-16 18:40:44.000000000 -0500
@@ -1513,7 +1513,7 @@ static int do_ebt_get_ctl(struct sock *s
tmp.valid_hooks = t->table->valid_hooks;
}
memset(&tinfo, 0, sizeof(tinfo));
if (cmd == EBT_SO_GET_ENTRIES) {
-diff -urNp linux-3.1.1/net/caif/caif_socket.c linux-3.1.1/net/caif/caif_socket.c
---- linux-3.1.1/net/caif/caif_socket.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/caif/caif_socket.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/caif/caif_socket.c linux-3.1.3/net/caif/caif_socket.c
+--- linux-3.1.3/net/caif/caif_socket.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/caif/caif_socket.c 2011-11-16 18:39:08.000000000 -0500
@@ -48,19 +48,20 @@ static struct dentry *debugfsdir;
#ifdef CONFIG_DEBUG_FS
struct debug_fs_counter {
#ifdef CONFIG_DEBUG_FS
if (!IS_ERR(debugfsdir)) {
-diff -urNp linux-3.1.1/net/caif/cfctrl.c linux-3.1.1/net/caif/cfctrl.c
---- linux-3.1.1/net/caif/cfctrl.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/caif/cfctrl.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/caif/cfctrl.c linux-3.1.3/net/caif/cfctrl.c
+--- linux-3.1.3/net/caif/cfctrl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/caif/cfctrl.c 2011-11-16 18:40:44.000000000 -0500
@@ -9,6 +9,7 @@
#include <linux/stddef.h>
#include <linux/spinlock.h>
cfpkt_extr_head(pkt, &cmdrsp, 1);
cmd = cmdrsp & CFCTRL_CMD_MASK;
-diff -urNp linux-3.1.1/net/compat.c linux-3.1.1/net/compat.c
---- linux-3.1.1/net/compat.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/compat.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/compat.c linux-3.1.3/net/compat.c
+--- linux-3.1.3/net/compat.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/compat.c 2011-11-16 18:39:08.000000000 -0500
@@ -70,9 +70,9 @@ int get_compat_msghdr(struct msghdr *kms
__get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
__get_user(kmsg->msg_flags, &umsg->msg_flags))
struct group_filter __user *kgf;
int __user *koptlen;
u32 interface, fmode, numsrc;
-diff -urNp linux-3.1.1/net/core/datagram.c linux-3.1.1/net/core/datagram.c
---- linux-3.1.1/net/core/datagram.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/core/datagram.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/core/datagram.c linux-3.1.3/net/core/datagram.c
+--- linux-3.1.3/net/core/datagram.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/core/datagram.c 2011-11-16 18:39:08.000000000 -0500
@@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, s
}
sk_mem_reclaim_partial(sk);
return err;
-diff -urNp linux-3.1.1/net/core/dev.c linux-3.1.1/net/core/dev.c
---- linux-3.1.1/net/core/dev.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/core/dev.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/core/dev.c linux-3.1.3/net/core/dev.c
+--- linux-3.1.3/net/core/dev.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/core/dev.c 2011-11-16 18:40:44.000000000 -0500
@@ -1135,10 +1135,14 @@ void dev_load(struct net *net, const cha
if (no_module && capable(CAP_NET_ADMIN))
no_module = request_module("netdev-%s", name);
{
struct softnet_data *sd = &__get_cpu_var(softnet_data);
unsigned long time_limit = jiffies + 2;
-diff -urNp linux-3.1.1/net/core/flow.c linux-3.1.1/net/core/flow.c
---- linux-3.1.1/net/core/flow.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/core/flow.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/core/flow.c linux-3.1.3/net/core/flow.c
+--- linux-3.1.3/net/core/flow.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/core/flow.c 2011-11-16 18:39:08.000000000 -0500
@@ -61,7 +61,7 @@ struct flow_cache {
struct timer_list rnd_timer;
};
if (!IS_ERR(flo))
fle->object = flo;
else
-diff -urNp linux-3.1.1/net/core/iovec.c linux-3.1.1/net/core/iovec.c
---- linux-3.1.1/net/core/iovec.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/core/iovec.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/core/iovec.c linux-3.1.3/net/core/iovec.c
+--- linux-3.1.3/net/core/iovec.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/core/iovec.c 2011-11-16 18:39:08.000000000 -0500
@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struc
if (m->msg_namelen) {
if (mode == VERIFY_READ) {
return -EFAULT;
m->msg_iov = iov;
-diff -urNp linux-3.1.1/net/core/rtnetlink.c linux-3.1.1/net/core/rtnetlink.c
---- linux-3.1.1/net/core/rtnetlink.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/core/rtnetlink.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/core/rtnetlink.c linux-3.1.3/net/core/rtnetlink.c
+--- linux-3.1.3/net/core/rtnetlink.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/core/rtnetlink.c 2011-11-16 18:39:08.000000000 -0500
@@ -57,7 +57,7 @@ struct rtnl_link {
rtnl_doit_func doit;
rtnl_dumpit_func dumpit;
static DEFINE_MUTEX(rtnl_mutex);
static u16 min_ifinfo_dump_size;
-diff -urNp linux-3.1.1/net/core/scm.c linux-3.1.1/net/core/scm.c
---- linux-3.1.1/net/core/scm.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/core/scm.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/core/scm.c linux-3.1.3/net/core/scm.c
+--- linux-3.1.3/net/core/scm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/core/scm.c 2011-11-16 18:39:08.000000000 -0500
@@ -218,7 +218,7 @@ EXPORT_SYMBOL(__scm_send);
int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
{
i++, cmfptr++)
{
int new_fd;
-diff -urNp linux-3.1.1/net/core/skbuff.c linux-3.1.1/net/core/skbuff.c
---- linux-3.1.1/net/core/skbuff.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/core/skbuff.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/core/skbuff.c linux-3.1.3/net/core/skbuff.c
+--- linux-3.1.3/net/core/skbuff.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/core/skbuff.c 2011-11-16 18:40:44.000000000 -0500
@@ -1650,6 +1650,8 @@ int skb_splice_bits(struct sk_buff *skb,
struct sock *sk = skb->sk;
int ret = 0;
if (splice_grow_spd(pipe, &spd))
return -ENOMEM;
-diff -urNp linux-3.1.1/net/core/sock.c linux-3.1.1/net/core/sock.c
---- linux-3.1.1/net/core/sock.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/core/sock.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/core/sock.c linux-3.1.3/net/core/sock.c
+--- linux-3.1.3/net/core/sock.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/core/sock.c 2011-11-16 18:40:44.000000000 -0500
@@ -293,7 +293,7 @@ int sock_queue_rcv_skb(struct sock *sk,
*/
if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
}
EXPORT_SYMBOL(sock_init_data);
-diff -urNp linux-3.1.1/net/decnet/sysctl_net_decnet.c linux-3.1.1/net/decnet/sysctl_net_decnet.c
---- linux-3.1.1/net/decnet/sysctl_net_decnet.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/decnet/sysctl_net_decnet.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/decnet/sysctl_net_decnet.c linux-3.1.3/net/decnet/sysctl_net_decnet.c
+--- linux-3.1.3/net/decnet/sysctl_net_decnet.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/decnet/sysctl_net_decnet.c 2011-11-16 18:39:08.000000000 -0500
@@ -174,7 +174,7 @@ static int dn_node_address_handler(ctl_t
if (len > *lenp) len = *lenp;
return -EFAULT;
*lenp = len;
-diff -urNp linux-3.1.1/net/econet/Kconfig linux-3.1.1/net/econet/Kconfig
---- linux-3.1.1/net/econet/Kconfig 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/econet/Kconfig 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/econet/Kconfig linux-3.1.3/net/econet/Kconfig
+--- linux-3.1.3/net/econet/Kconfig 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/econet/Kconfig 2011-11-16 18:40:44.000000000 -0500
@@ -4,7 +4,7 @@
config ECONET
---help---
Econet is a fairly old and slow networking protocol mainly used by
Acorn computers to access file and print servers. It uses native
-diff -urNp linux-3.1.1/net/ipv4/fib_frontend.c linux-3.1.1/net/ipv4/fib_frontend.c
---- linux-3.1.1/net/ipv4/fib_frontend.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv4/fib_frontend.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv4/fib_frontend.c linux-3.1.3/net/ipv4/fib_frontend.c
+--- linux-3.1.3/net/ipv4/fib_frontend.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv4/fib_frontend.c 2011-11-16 18:39:08.000000000 -0500
@@ -970,12 +970,12 @@ static int fib_inetaddr_event(struct not
#ifdef CONFIG_IP_ROUTE_MULTIPATH
fib_sync_up(dev);
rt_cache_flush(dev_net(dev), -1);
break;
case NETDEV_DOWN:
-diff -urNp linux-3.1.1/net/ipv4/fib_semantics.c linux-3.1.1/net/ipv4/fib_semantics.c
---- linux-3.1.1/net/ipv4/fib_semantics.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv4/fib_semantics.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv4/fib_semantics.c linux-3.1.3/net/ipv4/fib_semantics.c
+--- linux-3.1.3/net/ipv4/fib_semantics.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv4/fib_semantics.c 2011-11-16 18:39:08.000000000 -0500
@@ -699,7 +699,7 @@ __be32 fib_info_update_nh_saddr(struct n
nh->nh_saddr = inet_select_addr(nh->nh_dev,
nh->nh_gw,
return nh->nh_saddr;
}
-diff -urNp linux-3.1.1/net/ipv4/inet_diag.c linux-3.1.1/net/ipv4/inet_diag.c
---- linux-3.1.1/net/ipv4/inet_diag.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv4/inet_diag.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv4/inet_diag.c linux-3.1.3/net/ipv4/inet_diag.c
+--- linux-3.1.3/net/ipv4/inet_diag.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv4/inet_diag.c 2011-11-16 18:40:44.000000000 -0500
@@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc
r->idiag_retrans = 0;
tmo = req->expires - jiffies;
if (tmo < 0)
-diff -urNp linux-3.1.1/net/ipv4/inet_hashtables.c linux-3.1.1/net/ipv4/inet_hashtables.c
---- linux-3.1.1/net/ipv4/inet_hashtables.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv4/inet_hashtables.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv4/inet_hashtables.c linux-3.1.3/net/ipv4/inet_hashtables.c
+--- linux-3.1.3/net/ipv4/inet_hashtables.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv4/inet_hashtables.c 2011-11-16 18:40:44.000000000 -0500
@@ -18,12 +18,15 @@
#include <linux/sched.h>
#include <linux/slab.h>
if (tw) {
inet_twsk_deschedule(tw, death_row);
while (twrefcnt) {
-diff -urNp linux-3.1.1/net/ipv4/inetpeer.c linux-3.1.1/net/ipv4/inetpeer.c
---- linux-3.1.1/net/ipv4/inetpeer.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv4/inetpeer.c 2011-11-16 19:18:22.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv4/inetpeer.c linux-3.1.3/net/ipv4/inetpeer.c
+--- linux-3.1.3/net/ipv4/inetpeer.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv4/inetpeer.c 2011-11-16 19:18:22.000000000 -0500
@@ -400,6 +400,8 @@ struct inet_peer *inet_getpeer(const str
unsigned int sequence;
int invalidated, gccnt = 0;
(daddr->family == AF_INET) ?
secure_ip_id(daddr->addr.a4) :
secure_ipv6_id(daddr->addr.a6));
-diff -urNp linux-3.1.1/net/ipv4/ipconfig.c linux-3.1.1/net/ipv4/ipconfig.c
---- linux-3.1.1/net/ipv4/ipconfig.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv4/ipconfig.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv4/ipconfig.c linux-3.1.3/net/ipv4/ipconfig.c
+--- linux-3.1.3/net/ipv4/ipconfig.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv4/ipconfig.c 2011-11-16 18:39:08.000000000 -0500
@@ -313,7 +313,7 @@ static int __init ic_devinet_ioctl(unsig
mm_segment_t oldfs = get_fs();
set_fs(oldfs);
return res;
}
-diff -urNp linux-3.1.1/net/ipv4/ip_fragment.c linux-3.1.1/net/ipv4/ip_fragment.c
---- linux-3.1.1/net/ipv4/ip_fragment.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv4/ip_fragment.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv4/ip_fragment.c linux-3.1.3/net/ipv4/ip_fragment.c
+--- linux-3.1.3/net/ipv4/ip_fragment.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv4/ip_fragment.c 2011-11-16 18:39:08.000000000 -0500
@@ -316,7 +316,7 @@ static inline int ip_frag_too_far(struct
return 0;
qp->rid = end;
rc = qp->q.fragments && (end - start) > max;
-diff -urNp linux-3.1.1/net/ipv4/ip_sockglue.c linux-3.1.1/net/ipv4/ip_sockglue.c
---- linux-3.1.1/net/ipv4/ip_sockglue.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv4/ip_sockglue.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv4/ip_sockglue.c linux-3.1.3/net/ipv4/ip_sockglue.c
+--- linux-3.1.3/net/ipv4/ip_sockglue.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv4/ip_sockglue.c 2011-11-16 18:40:44.000000000 -0500
@@ -1073,6 +1073,8 @@ static int do_ip_getsockopt(struct sock
int val;
int len;
msg.msg_controllen = len;
msg.msg_flags = flags;
-diff -urNp linux-3.1.1/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.1.1/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-3.1.1/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.1.3/net/ipv4/netfilter/nf_nat_snmp_basic.c
+--- linux-3.1.3/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-11-16 18:39:08.000000000 -0500
@@ -399,7 +399,7 @@ static unsigned char asn1_octets_decode(
*len = 0;
if (*octets == NULL) {
if (net_ratelimit())
pr_notice("OOM in bsalg (%d)\n", __LINE__);
-diff -urNp linux-3.1.1/net/ipv4/ping.c linux-3.1.1/net/ipv4/ping.c
---- linux-3.1.1/net/ipv4/ping.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv4/ping.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv4/ping.c linux-3.1.3/net/ipv4/ping.c
+--- linux-3.1.3/net/ipv4/ping.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv4/ping.c 2011-11-16 18:39:08.000000000 -0500
@@ -837,7 +837,7 @@ static void ping_format_sock(struct sock
sk_rmem_alloc_get(sp),
0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
}
static int ping_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.1.1/net/ipv4/raw.c linux-3.1.1/net/ipv4/raw.c
---- linux-3.1.1/net/ipv4/raw.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv4/raw.c 2011-11-17 18:58:40.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv4/raw.c linux-3.1.3/net/ipv4/raw.c
+--- linux-3.1.3/net/ipv4/raw.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv4/raw.c 2011-11-17 18:58:40.000000000 -0500
@@ -302,7 +302,7 @@ static int raw_rcv_skb(struct sock * sk,
int raw_rcv(struct sock *sk, struct sk_buff *skb)
{
}
static int raw_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.1.1/net/ipv4/route.c linux-3.1.1/net/ipv4/route.c
---- linux-3.1.1/net/ipv4/route.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv4/route.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv4/route.c linux-3.1.3/net/ipv4/route.c
+--- linux-3.1.3/net/ipv4/route.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv4/route.c 2011-11-16 18:39:08.000000000 -0500
@@ -308,7 +308,7 @@ static inline unsigned int rt_hash(__be3
static inline int rt_genid(struct net *net)
if (peer->tcp_ts_stamp) {
ts = peer->tcp_ts;
tsage = get_seconds() - peer->tcp_ts_stamp;
-diff -urNp linux-3.1.1/net/ipv4/tcp.c linux-3.1.1/net/ipv4/tcp.c
---- linux-3.1.1/net/ipv4/tcp.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv4/tcp.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv4/tcp.c linux-3.1.3/net/ipv4/tcp.c
+--- linux-3.1.3/net/ipv4/tcp.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv4/tcp.c 2011-11-16 18:40:44.000000000 -0500
@@ -2122,6 +2122,8 @@ static int do_tcp_setsockopt(struct sock
int val;
int err = 0;
if (get_user(len, optlen))
return -EFAULT;
-diff -urNp linux-3.1.1/net/ipv4/tcp_ipv4.c linux-3.1.1/net/ipv4/tcp_ipv4.c
---- linux-3.1.1/net/ipv4/tcp_ipv4.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv4/tcp_ipv4.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv4/tcp_ipv4.c linux-3.1.3/net/ipv4/tcp_ipv4.c
+--- linux-3.1.3/net/ipv4/tcp_ipv4.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv4/tcp_ipv4.c 2011-11-16 18:40:44.000000000 -0500
@@ -87,6 +87,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
int sysctl_tcp_low_latency __read_mostly;
EXPORT_SYMBOL(sysctl_tcp_low_latency);
}
#define TMPSZ 150
-diff -urNp linux-3.1.1/net/ipv4/tcp_minisocks.c linux-3.1.1/net/ipv4/tcp_minisocks.c
---- linux-3.1.1/net/ipv4/tcp_minisocks.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv4/tcp_minisocks.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv4/tcp_minisocks.c linux-3.1.3/net/ipv4/tcp_minisocks.c
+--- linux-3.1.3/net/ipv4/tcp_minisocks.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv4/tcp_minisocks.c 2011-11-16 18:40:44.000000000 -0500
@@ -27,6 +27,10 @@
#include <net/inet_common.h>
#include <net/xfrm.h>
if (!(flg & TCP_FLAG_RST))
req->rsk_ops->send_reset(sk, skb);
-diff -urNp linux-3.1.1/net/ipv4/tcp_output.c linux-3.1.1/net/ipv4/tcp_output.c
---- linux-3.1.1/net/ipv4/tcp_output.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv4/tcp_output.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv4/tcp_output.c linux-3.1.3/net/ipv4/tcp_output.c
+--- linux-3.1.3/net/ipv4/tcp_output.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv4/tcp_output.c 2011-11-16 18:40:44.000000000 -0500
@@ -2421,6 +2421,8 @@ struct sk_buff *tcp_make_synack(struct s
int mss;
int s_data_desired = 0;
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-3.1.1/net/ipv4/tcp_probe.c linux-3.1.1/net/ipv4/tcp_probe.c
---- linux-3.1.1/net/ipv4/tcp_probe.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv4/tcp_probe.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv4/tcp_probe.c linux-3.1.3/net/ipv4/tcp_probe.c
+--- linux-3.1.3/net/ipv4/tcp_probe.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv4/tcp_probe.c 2011-11-16 18:39:08.000000000 -0500
@@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file
if (cnt + width >= len)
break;
return -EFAULT;
cnt += width;
}
-diff -urNp linux-3.1.1/net/ipv4/tcp_timer.c linux-3.1.1/net/ipv4/tcp_timer.c
---- linux-3.1.1/net/ipv4/tcp_timer.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv4/tcp_timer.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv4/tcp_timer.c linux-3.1.3/net/ipv4/tcp_timer.c
+--- linux-3.1.3/net/ipv4/tcp_timer.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv4/tcp_timer.c 2011-11-16 18:40:44.000000000 -0500
@@ -22,6 +22,10 @@
#include <linux/gfp.h>
#include <net/tcp.h>
if (retransmits_timed_out(sk, retry_until,
syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
/* Has it gone just too far? */
-diff -urNp linux-3.1.1/net/ipv4/udp.c linux-3.1.1/net/ipv4/udp.c
---- linux-3.1.1/net/ipv4/udp.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv4/udp.c 2011-11-16 19:17:54.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv4/udp.c linux-3.1.3/net/ipv4/udp.c
+--- linux-3.1.3/net/ipv4/udp.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv4/udp.c 2011-11-16 19:17:54.000000000 -0500
@@ -86,6 +86,7 @@
#include <linux/types.h>
#include <linux/fcntl.h>
}
int udp4_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.1.1/net/ipv6/addrconf.c linux-3.1.1/net/ipv6/addrconf.c
---- linux-3.1.1/net/ipv6/addrconf.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv6/addrconf.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv6/addrconf.c linux-3.1.3/net/ipv6/addrconf.c
+--- linux-3.1.3/net/ipv6/addrconf.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv6/addrconf.c 2011-11-16 18:39:08.000000000 -0500
@@ -2083,7 +2083,7 @@ int addrconf_set_dstaddr(struct net *net
p.iph.ihl = 5;
p.iph.protocol = IPPROTO_IPV6;
if (ops->ndo_do_ioctl) {
mm_segment_t oldfs = get_fs();
-diff -urNp linux-3.1.1/net/ipv6/inet6_connection_sock.c linux-3.1.1/net/ipv6/inet6_connection_sock.c
---- linux-3.1.1/net/ipv6/inet6_connection_sock.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv6/inet6_connection_sock.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv6/inet6_connection_sock.c linux-3.1.3/net/ipv6/inet6_connection_sock.c
+--- linux-3.1.3/net/ipv6/inet6_connection_sock.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv6/inet6_connection_sock.c 2011-11-16 18:39:08.000000000 -0500
@@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock *
#ifdef CONFIG_XFRM
{
__sk_dst_reset(sk);
dst = NULL;
}
-diff -urNp linux-3.1.1/net/ipv6/ipv6_sockglue.c linux-3.1.1/net/ipv6/ipv6_sockglue.c
---- linux-3.1.1/net/ipv6/ipv6_sockglue.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv6/ipv6_sockglue.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv6/ipv6_sockglue.c linux-3.1.3/net/ipv6/ipv6_sockglue.c
+--- linux-3.1.3/net/ipv6/ipv6_sockglue.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv6/ipv6_sockglue.c 2011-11-16 18:40:44.000000000 -0500
@@ -129,6 +129,8 @@ static int do_ipv6_setsockopt(struct soc
int val, valbool;
int retv = -ENOPROTOOPT;
msg.msg_controllen = len;
msg.msg_flags = flags;
-diff -urNp linux-3.1.1/net/ipv6/raw.c linux-3.1.1/net/ipv6/raw.c
---- linux-3.1.1/net/ipv6/raw.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv6/raw.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv6/raw.c linux-3.1.3/net/ipv6/raw.c
+--- linux-3.1.3/net/ipv6/raw.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv6/raw.c 2011-11-16 18:40:44.000000000 -0500
@@ -376,7 +376,7 @@ static inline int rawv6_rcv_skb(struct s
{
if ((raw6_sk(sk)->checksum || rcu_dereference_raw(sk->sk_filter)) &&
}
static int raw6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.1.1/net/ipv6/tcp_ipv6.c linux-3.1.1/net/ipv6/tcp_ipv6.c
---- linux-3.1.1/net/ipv6/tcp_ipv6.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv6/tcp_ipv6.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv6/tcp_ipv6.c linux-3.1.3/net/ipv6/tcp_ipv6.c
+--- linux-3.1.3/net/ipv6/tcp_ipv6.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv6/tcp_ipv6.c 2011-11-16 18:40:44.000000000 -0500
@@ -93,6 +93,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
}
#endif
}
static int tcp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.1.1/net/ipv6/udp.c linux-3.1.1/net/ipv6/udp.c
---- linux-3.1.1/net/ipv6/udp.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/ipv6/udp.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/ipv6/udp.c linux-3.1.3/net/ipv6/udp.c
+--- linux-3.1.3/net/ipv6/udp.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/ipv6/udp.c 2011-11-16 18:40:44.000000000 -0500
@@ -50,6 +50,10 @@
#include <linux/seq_file.h>
#include "udp_impl.h"
}
int udp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.1.1/net/irda/ircomm/ircomm_tty.c linux-3.1.1/net/irda/ircomm/ircomm_tty.c
---- linux-3.1.1/net/irda/ircomm/ircomm_tty.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/irda/ircomm/ircomm_tty.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/irda/ircomm/ircomm_tty.c linux-3.1.3/net/irda/ircomm/ircomm_tty.c
+--- linux-3.1.3/net/irda/ircomm/ircomm_tty.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/irda/ircomm/ircomm_tty.c 2011-11-16 18:39:08.000000000 -0500
@@ -282,16 +282,16 @@ static int ircomm_tty_block_til_ready(st
add_wait_queue(&self->open_wait, &wait);
seq_printf(m, "Max data size: %d\n", self->max_data_size);
seq_printf(m, "Max header size: %d\n", self->max_header_size);
-diff -urNp linux-3.1.1/net/iucv/af_iucv.c linux-3.1.1/net/iucv/af_iucv.c
---- linux-3.1.1/net/iucv/af_iucv.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/iucv/af_iucv.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/iucv/af_iucv.c linux-3.1.3/net/iucv/af_iucv.c
+--- linux-3.1.3/net/iucv/af_iucv.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/iucv/af_iucv.c 2011-11-16 18:39:08.000000000 -0500
@@ -648,10 +648,10 @@ static int iucv_sock_autobind(struct soc
write_lock_bh(&iucv_sk_list.lock);
}
write_unlock_bh(&iucv_sk_list.lock);
-diff -urNp linux-3.1.1/net/key/af_key.c linux-3.1.1/net/key/af_key.c
---- linux-3.1.1/net/key/af_key.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/key/af_key.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/key/af_key.c linux-3.1.3/net/key/af_key.c
+--- linux-3.1.3/net/key/af_key.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/key/af_key.c 2011-11-16 18:40:44.000000000 -0500
@@ -2481,6 +2481,8 @@ static int pfkey_migrate(struct sock *sk
struct xfrm_migrate m[XFRM_MAX_DEPTH];
struct xfrm_kmaddress k;
} while (!res);
return res;
}
-diff -urNp linux-3.1.1/net/lapb/lapb_iface.c linux-3.1.1/net/lapb/lapb_iface.c
---- linux-3.1.1/net/lapb/lapb_iface.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/lapb/lapb_iface.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/lapb/lapb_iface.c linux-3.1.3/net/lapb/lapb_iface.c
+--- linux-3.1.3/net/lapb/lapb_iface.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/lapb/lapb_iface.c 2011-11-16 18:39:08.000000000 -0500
@@ -158,7 +158,7 @@ int lapb_register(struct net_device *dev
goto out;
used = 1;
}
-diff -urNp linux-3.1.1/net/mac80211/debugfs_sta.c linux-3.1.1/net/mac80211/debugfs_sta.c
---- linux-3.1.1/net/mac80211/debugfs_sta.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/mac80211/debugfs_sta.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/mac80211/debugfs_sta.c linux-3.1.3/net/mac80211/debugfs_sta.c
+--- linux-3.1.3/net/mac80211/debugfs_sta.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/mac80211/debugfs_sta.c 2011-11-16 18:40:44.000000000 -0500
@@ -140,6 +140,8 @@ static ssize_t sta_agg_status_read(struc
struct tid_ampdu_rx *tid_rx;
struct tid_ampdu_tx *tid_tx;
p += scnprintf(p, sizeof(buf) + buf - p, "ht %ssupported\n",
htc->ht_supported ? "" : "not ");
if (htc->ht_supported) {
-diff -urNp linux-3.1.1/net/mac80211/ieee80211_i.h linux-3.1.1/net/mac80211/ieee80211_i.h
---- linux-3.1.1/net/mac80211/ieee80211_i.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/mac80211/ieee80211_i.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/mac80211/ieee80211_i.h linux-3.1.3/net/mac80211/ieee80211_i.h
+--- linux-3.1.3/net/mac80211/ieee80211_i.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/mac80211/ieee80211_i.h 2011-11-16 18:39:08.000000000 -0500
@@ -27,6 +27,7 @@
#include <net/ieee80211_radiotap.h>
#include <net/cfg80211.h>
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-3.1.1/net/mac80211/iface.c linux-3.1.1/net/mac80211/iface.c
---- linux-3.1.1/net/mac80211/iface.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/mac80211/iface.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/mac80211/iface.c linux-3.1.3/net/mac80211/iface.c
+--- linux-3.1.3/net/mac80211/iface.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/mac80211/iface.c 2011-11-16 18:39:08.000000000 -0500
@@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_
break;
}
if (local->ops->napi_poll)
napi_disable(&local->napi);
ieee80211_clear_tx_pending(local);
-diff -urNp linux-3.1.1/net/mac80211/main.c linux-3.1.1/net/mac80211/main.c
---- linux-3.1.1/net/mac80211/main.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/mac80211/main.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/mac80211/main.c linux-3.1.3/net/mac80211/main.c
+--- linux-3.1.3/net/mac80211/main.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/mac80211/main.c 2011-11-16 18:39:08.000000000 -0500
@@ -209,7 +209,7 @@ int ieee80211_hw_config(struct ieee80211
local->hw.conf.power_level = power;
}
ret = drv_config(local, changed);
/*
* Goal:
-diff -urNp linux-3.1.1/net/mac80211/mlme.c linux-3.1.1/net/mac80211/mlme.c
---- linux-3.1.1/net/mac80211/mlme.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/mac80211/mlme.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/mac80211/mlme.c linux-3.1.3/net/mac80211/mlme.c
+--- linux-3.1.3/net/mac80211/mlme.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/mac80211/mlme.c 2011-11-16 18:40:44.000000000 -0500
@@ -1464,6 +1464,8 @@ static bool ieee80211_assoc_success(stru
bool have_higher_than_11mbit = false;
u16 ap_ht_cap_flags;
/* AssocResp and ReassocResp have identical structure */
aid = le16_to_cpu(mgmt->u.assoc_resp.aid);
-diff -urNp linux-3.1.1/net/mac80211/pm.c linux-3.1.1/net/mac80211/pm.c
---- linux-3.1.1/net/mac80211/pm.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/mac80211/pm.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/mac80211/pm.c linux-3.1.3/net/mac80211/pm.c
+--- linux-3.1.3/net/mac80211/pm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/mac80211/pm.c 2011-11-16 18:39:08.000000000 -0500
@@ -34,7 +34,7 @@ int __ieee80211_suspend(struct ieee80211
struct ieee80211_sub_if_data *sdata;
struct sta_info *sta;
ieee80211_stop_device(local);
suspend:
-diff -urNp linux-3.1.1/net/mac80211/rate.c linux-3.1.1/net/mac80211/rate.c
---- linux-3.1.1/net/mac80211/rate.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/mac80211/rate.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/mac80211/rate.c linux-3.1.3/net/mac80211/rate.c
+--- linux-3.1.3/net/mac80211/rate.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/mac80211/rate.c 2011-11-16 18:39:08.000000000 -0500
@@ -371,7 +371,7 @@ int ieee80211_init_rate_ctrl_alg(struct
ASSERT_RTNL();
return -EBUSY;
if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
-diff -urNp linux-3.1.1/net/mac80211/rc80211_pid_debugfs.c linux-3.1.1/net/mac80211/rc80211_pid_debugfs.c
---- linux-3.1.1/net/mac80211/rc80211_pid_debugfs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/mac80211/rc80211_pid_debugfs.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/mac80211/rc80211_pid_debugfs.c linux-3.1.3/net/mac80211/rc80211_pid_debugfs.c
+--- linux-3.1.3/net/mac80211/rc80211_pid_debugfs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/mac80211/rc80211_pid_debugfs.c 2011-11-16 18:39:08.000000000 -0500
@@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r
spin_unlock_irqrestore(&events->lock, status);
return -EFAULT;
return p;
-diff -urNp linux-3.1.1/net/mac80211/util.c linux-3.1.1/net/mac80211/util.c
---- linux-3.1.1/net/mac80211/util.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/mac80211/util.c 2011-11-16 18:39:08.000000000 -0500
-@@ -1166,7 +1166,7 @@ int ieee80211_reconfig(struct ieee80211_
+diff -urNp linux-3.1.3/net/mac80211/util.c linux-3.1.3/net/mac80211/util.c
+--- linux-3.1.3/net/mac80211/util.c 2011-11-26 19:57:29.000000000 -0500
++++ linux-3.1.3/net/mac80211/util.c 2011-11-26 20:00:43.000000000 -0500
+@@ -1170,7 +1170,7 @@ int ieee80211_reconfig(struct ieee80211_
drv_set_coverage_class(local, hw->wiphy->coverage_class);
/* everything else happens only if HW was up & running */
goto wake_up;
/*
-diff -urNp linux-3.1.1/net/netfilter/ipvs/ip_vs_conn.c linux-3.1.1/net/netfilter/ipvs/ip_vs_conn.c
---- linux-3.1.1/net/netfilter/ipvs/ip_vs_conn.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/netfilter/ipvs/ip_vs_conn.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/netfilter/ipvs/ip_vs_conn.c linux-3.1.3/net/netfilter/ipvs/ip_vs_conn.c
+--- linux-3.1.3/net/netfilter/ipvs/ip_vs_conn.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/netfilter/ipvs/ip_vs_conn.c 2011-11-16 18:39:08.000000000 -0500
@@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, s
/* Increase the refcnt counter of the dest */
atomic_inc(&dest->refcnt);
if (i > 8 || i < 0) return 0;
if (!todrop_rate[i]) return 0;
-diff -urNp linux-3.1.1/net/netfilter/ipvs/ip_vs_core.c linux-3.1.1/net/netfilter/ipvs/ip_vs_core.c
---- linux-3.1.1/net/netfilter/ipvs/ip_vs_core.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/netfilter/ipvs/ip_vs_core.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/netfilter/ipvs/ip_vs_core.c linux-3.1.3/net/netfilter/ipvs/ip_vs_core.c
+--- linux-3.1.3/net/netfilter/ipvs/ip_vs_core.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/netfilter/ipvs/ip_vs_core.c 2011-11-16 18:39:08.000000000 -0500
@@ -563,7 +563,7 @@ int ip_vs_leave(struct ip_vs_service *sv
ret = cp->packet_xmit(skb, cp, pd->pp);
/* do not touch skb anymore */
if ((ipvs->sync_state & IP_VS_STATE_MASTER) &&
cp->protocol == IPPROTO_SCTP) {
-diff -urNp linux-3.1.1/net/netfilter/ipvs/ip_vs_ctl.c linux-3.1.1/net/netfilter/ipvs/ip_vs_ctl.c
---- linux-3.1.1/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-16 19:13:12.000000000 -0500
+diff -urNp linux-3.1.3/net/netfilter/ipvs/ip_vs_ctl.c linux-3.1.3/net/netfilter/ipvs/ip_vs_ctl.c
+--- linux-3.1.3/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-16 19:13:12.000000000 -0500
@@ -782,7 +782,7 @@ __ip_vs_update_dest(struct ip_vs_service
ip_vs_rs_hash(ipvs, dest);
write_unlock_bh(&ipvs->rs_lock);
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-3.1.1/net/netfilter/ipvs/ip_vs_sync.c linux-3.1.1/net/netfilter/ipvs/ip_vs_sync.c
---- linux-3.1.1/net/netfilter/ipvs/ip_vs_sync.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/netfilter/ipvs/ip_vs_sync.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/netfilter/ipvs/ip_vs_sync.c linux-3.1.3/net/netfilter/ipvs/ip_vs_sync.c
+--- linux-3.1.3/net/netfilter/ipvs/ip_vs_sync.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/netfilter/ipvs/ip_vs_sync.c 2011-11-16 18:39:08.000000000 -0500
@@ -649,7 +649,7 @@ control:
* i.e only increment in_pkts for Templates.
*/
cp->state = state;
cp->old_state = cp->state;
/*
-diff -urNp linux-3.1.1/net/netfilter/ipvs/ip_vs_xmit.c linux-3.1.1/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-3.1.1/net/netfilter/ipvs/ip_vs_xmit.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/netfilter/ipvs/ip_vs_xmit.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/netfilter/ipvs/ip_vs_xmit.c linux-3.1.3/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.1.3/net/netfilter/ipvs/ip_vs_xmit.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/netfilter/ipvs/ip_vs_xmit.c 2011-11-16 18:39:08.000000000 -0500
@@ -1151,7 +1151,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str
else
rc = NF_ACCEPT;
goto out;
}
-diff -urNp linux-3.1.1/net/netfilter/Kconfig linux-3.1.1/net/netfilter/Kconfig
---- linux-3.1.1/net/netfilter/Kconfig 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/netfilter/Kconfig 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/netfilter/Kconfig linux-3.1.3/net/netfilter/Kconfig
+--- linux-3.1.3/net/netfilter/Kconfig 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/netfilter/Kconfig 2011-11-16 18:40:44.000000000 -0500
@@ -781,6 +781,16 @@ config NETFILTER_XT_MATCH_ESP
To compile it as a module, choose M here. If unsure, say N.
config NETFILTER_XT_MATCH_HASHLIMIT
tristate '"hashlimit" match support'
depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
-diff -urNp linux-3.1.1/net/netfilter/Makefile linux-3.1.1/net/netfilter/Makefile
---- linux-3.1.1/net/netfilter/Makefile 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/netfilter/Makefile 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/netfilter/Makefile linux-3.1.3/net/netfilter/Makefile
+--- linux-3.1.3/net/netfilter/Makefile 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/netfilter/Makefile 2011-11-16 18:40:44.000000000 -0500
@@ -81,6 +81,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) +=
obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
obj-$(CONFIG_NETFILTER_XT_MATCH_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-3.1.1/net/netfilter/nfnetlink_log.c linux-3.1.1/net/netfilter/nfnetlink_log.c
---- linux-3.1.1/net/netfilter/nfnetlink_log.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/netfilter/nfnetlink_log.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/netfilter/nfnetlink_log.c linux-3.1.3/net/netfilter/nfnetlink_log.c
+--- linux-3.1.3/net/netfilter/nfnetlink_log.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/netfilter/nfnetlink_log.c 2011-11-16 18:39:08.000000000 -0500
@@ -70,7 +70,7 @@ struct nfulnl_instance {
};
if (data_len) {
struct nlattr *nla;
-diff -urNp linux-3.1.1/net/netfilter/xt_gradm.c linux-3.1.1/net/netfilter/xt_gradm.c
---- linux-3.1.1/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/net/netfilter/xt_gradm.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/netfilter/xt_gradm.c linux-3.1.3/net/netfilter/xt_gradm.c
+--- linux-3.1.3/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/net/netfilter/xt_gradm.c 2011-11-16 18:40:44.000000000 -0500
@@ -0,0 +1,51 @@
+/*
+ * gradm match for netfilter
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_gradm");
+MODULE_ALIAS("ip6t_gradm");
-diff -urNp linux-3.1.1/net/netfilter/xt_statistic.c linux-3.1.1/net/netfilter/xt_statistic.c
---- linux-3.1.1/net/netfilter/xt_statistic.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/netfilter/xt_statistic.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/netfilter/xt_statistic.c linux-3.1.3/net/netfilter/xt_statistic.c
+--- linux-3.1.3/net/netfilter/xt_statistic.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/netfilter/xt_statistic.c 2011-11-16 18:39:08.000000000 -0500
@@ -18,7 +18,7 @@
#include <linux/netfilter/x_tables.h>
return 0;
}
-diff -urNp linux-3.1.1/net/netlink/af_netlink.c linux-3.1.1/net/netlink/af_netlink.c
---- linux-3.1.1/net/netlink/af_netlink.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/netlink/af_netlink.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/netlink/af_netlink.c linux-3.1.3/net/netlink/af_netlink.c
+--- linux-3.1.3/net/netlink/af_netlink.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/netlink/af_netlink.c 2011-11-16 18:39:08.000000000 -0500
@@ -742,7 +742,7 @@ static void netlink_overrun(struct sock
sk->sk_error_report(sk);
}
sock_i_ino(s)
);
-diff -urNp linux-3.1.1/net/netrom/af_netrom.c linux-3.1.1/net/netrom/af_netrom.c
---- linux-3.1.1/net/netrom/af_netrom.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/netrom/af_netrom.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/netrom/af_netrom.c linux-3.1.3/net/netrom/af_netrom.c
+--- linux-3.1.3/net/netrom/af_netrom.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/netrom/af_netrom.c 2011-11-16 18:40:44.000000000 -0500
@@ -839,6 +839,7 @@ static int nr_getname(struct socket *soc
struct sock *sk = sock->sk;
struct nr_sock *nr = nr_sk(sk);
sax->fsa_ax25.sax25_call = nr->source_addr;
*uaddr_len = sizeof(struct sockaddr_ax25);
}
-diff -urNp linux-3.1.1/net/packet/af_packet.c linux-3.1.1/net/packet/af_packet.c
---- linux-3.1.1/net/packet/af_packet.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/packet/af_packet.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/packet/af_packet.c linux-3.1.3/net/packet/af_packet.c
+--- linux-3.1.3/net/packet/af_packet.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/packet/af_packet.c 2011-11-16 18:39:08.000000000 -0500
@@ -954,7 +954,7 @@ static int packet_rcv(struct sk_buff *sk
spin_lock(&sk->sk_receive_queue.lock);
return -EFAULT;
return 0;
}
-diff -urNp linux-3.1.1/net/phonet/af_phonet.c linux-3.1.1/net/phonet/af_phonet.c
---- linux-3.1.1/net/phonet/af_phonet.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/phonet/af_phonet.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/phonet/af_phonet.c linux-3.1.3/net/phonet/af_phonet.c
+--- linux-3.1.3/net/phonet/af_phonet.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/phonet/af_phonet.c 2011-11-16 18:40:44.000000000 -0500
@@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
{
struct phonet_protocol *pp;
return -EINVAL;
err = proto_register(pp->prot, 1);
-diff -urNp linux-3.1.1/net/phonet/pep.c linux-3.1.1/net/phonet/pep.c
---- linux-3.1.1/net/phonet/pep.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/phonet/pep.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/phonet/pep.c linux-3.1.3/net/phonet/pep.c
+--- linux-3.1.3/net/phonet/pep.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/phonet/pep.c 2011-11-16 18:39:08.000000000 -0500
@@ -387,7 +387,7 @@ static int pipe_do_rcv(struct sock *sk,
case PNS_PEP_CTRL_REQ:
err = NET_RX_DROP;
break;
}
-diff -urNp linux-3.1.1/net/phonet/socket.c linux-3.1.1/net/phonet/socket.c
---- linux-3.1.1/net/phonet/socket.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/phonet/socket.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/phonet/socket.c linux-3.1.3/net/phonet/socket.c
+--- linux-3.1.3/net/phonet/socket.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/phonet/socket.c 2011-11-16 18:40:44.000000000 -0500
@@ -612,8 +612,13 @@ static int pn_sock_seq_show(struct seq_f
pn->resource, sk->sk_state,
sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
}
seq_printf(seq, "%*s\n", 127 - len, "");
return 0;
-diff -urNp linux-3.1.1/net/rds/cong.c linux-3.1.1/net/rds/cong.c
---- linux-3.1.1/net/rds/cong.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rds/cong.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/rds/cong.c linux-3.1.3/net/rds/cong.c
+--- linux-3.1.3/net/rds/cong.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rds/cong.c 2011-11-16 18:39:08.000000000 -0500
@@ -77,7 +77,7 @@
* finds that the saved generation number is smaller than the global generation
* number, it wakes up the process.
if (likely(*recent == gen))
return 0;
-diff -urNp linux-3.1.1/net/rds/ib_cm.c linux-3.1.1/net/rds/ib_cm.c
---- linux-3.1.1/net/rds/ib_cm.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rds/ib_cm.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/rds/ib_cm.c linux-3.1.3/net/rds/ib_cm.c
+--- linux-3.1.3/net/rds/ib_cm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rds/ib_cm.c 2011-11-16 18:39:08.000000000 -0500
@@ -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);
#else
ic->i_ack_next = 0;
#endif
-diff -urNp linux-3.1.1/net/rds/ib.h linux-3.1.1/net/rds/ib.h
---- linux-3.1.1/net/rds/ib.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rds/ib.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/rds/ib.h linux-3.1.3/net/rds/ib.h
+--- linux-3.1.3/net/rds/ib.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rds/ib.h 2011-11-16 18:39:08.000000000 -0500
@@ -128,7 +128,7 @@ struct rds_ib_connection {
/* sending acks */
unsigned long i_ack_flags;
#else
spinlock_t i_ack_lock; /* protect i_ack_next */
u64 i_ack_next; /* next ACK to send */
-diff -urNp linux-3.1.1/net/rds/ib_recv.c linux-3.1.1/net/rds/ib_recv.c
---- linux-3.1.1/net/rds/ib_recv.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rds/ib_recv.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/rds/ib_recv.c linux-3.1.3/net/rds/ib_recv.c
+--- linux-3.1.3/net/rds/ib_recv.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rds/ib_recv.c 2011-11-16 18:39:08.000000000 -0500
@@ -592,7 +592,7 @@ static u64 rds_ib_get_ack(struct rds_ib_
static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq,
int ack_required)
}
#endif
-diff -urNp linux-3.1.1/net/rds/iw_cm.c linux-3.1.1/net/rds/iw_cm.c
---- linux-3.1.1/net/rds/iw_cm.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rds/iw_cm.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/rds/iw_cm.c linux-3.1.3/net/rds/iw_cm.c
+--- linux-3.1.3/net/rds/iw_cm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rds/iw_cm.c 2011-11-16 18:39:08.000000000 -0500
@@ -663,7 +663,7 @@ void rds_iw_conn_shutdown(struct rds_con
/* Clear the ACK state */
clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
#else
ic->i_ack_next = 0;
#endif
-diff -urNp linux-3.1.1/net/rds/iw.h linux-3.1.1/net/rds/iw.h
---- linux-3.1.1/net/rds/iw.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rds/iw.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/rds/iw.h linux-3.1.3/net/rds/iw.h
+--- linux-3.1.3/net/rds/iw.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rds/iw.h 2011-11-16 18:39:08.000000000 -0500
@@ -134,7 +134,7 @@ struct rds_iw_connection {
/* sending acks */
unsigned long i_ack_flags;
#else
spinlock_t i_ack_lock; /* protect i_ack_next */
u64 i_ack_next; /* next ACK to send */
-diff -urNp linux-3.1.1/net/rds/iw_rdma.c linux-3.1.1/net/rds/iw_rdma.c
---- linux-3.1.1/net/rds/iw_rdma.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rds/iw_rdma.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/rds/iw_rdma.c linux-3.1.3/net/rds/iw_rdma.c
+--- linux-3.1.3/net/rds/iw_rdma.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rds/iw_rdma.c 2011-11-16 18:40:44.000000000 -0500
@@ -184,6 +184,8 @@ int rds_iw_update_cm_id(struct rds_iw_de
struct rdma_cm_id *pcm_id;
int rc;
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-3.1.1/net/rds/iw_recv.c linux-3.1.1/net/rds/iw_recv.c
---- linux-3.1.1/net/rds/iw_recv.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rds/iw_recv.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/rds/iw_recv.c linux-3.1.3/net/rds/iw_recv.c
+--- linux-3.1.3/net/rds/iw_recv.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rds/iw_recv.c 2011-11-16 18:39:08.000000000 -0500
@@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_
static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq,
int ack_required)
}
#endif
-diff -urNp linux-3.1.1/net/rds/tcp.c linux-3.1.1/net/rds/tcp.c
---- linux-3.1.1/net/rds/tcp.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rds/tcp.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/rds/tcp.c linux-3.1.3/net/rds/tcp.c
+--- linux-3.1.3/net/rds/tcp.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rds/tcp.c 2011-11-16 18:39:08.000000000 -0500
@@ -58,7 +58,7 @@ void rds_tcp_nonagle(struct socket *sock
int val = 1;
sizeof(val));
set_fs(oldfs);
}
-diff -urNp linux-3.1.1/net/rds/tcp_send.c linux-3.1.1/net/rds/tcp_send.c
---- linux-3.1.1/net/rds/tcp_send.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rds/tcp_send.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/rds/tcp_send.c linux-3.1.3/net/rds/tcp_send.c
+--- linux-3.1.3/net/rds/tcp_send.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rds/tcp_send.c 2011-11-16 18:39:08.000000000 -0500
@@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket *
oldfs = get_fs();
sizeof(val));
set_fs(oldfs);
}
-diff -urNp linux-3.1.1/net/rxrpc/af_rxrpc.c linux-3.1.1/net/rxrpc/af_rxrpc.c
---- linux-3.1.1/net/rxrpc/af_rxrpc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rxrpc/af_rxrpc.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/rxrpc/af_rxrpc.c linux-3.1.3/net/rxrpc/af_rxrpc.c
+--- linux-3.1.3/net/rxrpc/af_rxrpc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rxrpc/af_rxrpc.c 2011-11-16 18:39:08.000000000 -0500
@@ -39,7 +39,7 @@ static const struct proto_ops rxrpc_rpc_
__be32 rxrpc_epoch;
/* count of skbs currently in use */
atomic_t rxrpc_n_skbs;
-diff -urNp linux-3.1.1/net/rxrpc/ar-ack.c linux-3.1.1/net/rxrpc/ar-ack.c
---- linux-3.1.1/net/rxrpc/ar-ack.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rxrpc/ar-ack.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/rxrpc/ar-ack.c linux-3.1.3/net/rxrpc/ar-ack.c
+--- linux-3.1.3/net/rxrpc/ar-ack.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rxrpc/ar-ack.c 2011-11-16 18:40:44.000000000 -0500
@@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_ca
_enter("{%d,%d,%d,%d},",
_proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
send_message_2:
-diff -urNp linux-3.1.1/net/rxrpc/ar-call.c linux-3.1.1/net/rxrpc/ar-call.c
---- linux-3.1.1/net/rxrpc/ar-call.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rxrpc/ar-call.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/rxrpc/ar-call.c linux-3.1.3/net/rxrpc/ar-call.c
+--- linux-3.1.3/net/rxrpc/ar-call.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rxrpc/ar-call.c 2011-11-16 18:39:08.000000000 -0500
@@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_ca
spin_lock_init(&call->lock);
rwlock_init(&call->state_lock);
call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
memset(&call->sock_node, 0xed, sizeof(call->sock_node));
-diff -urNp linux-3.1.1/net/rxrpc/ar-connection.c linux-3.1.1/net/rxrpc/ar-connection.c
---- linux-3.1.1/net/rxrpc/ar-connection.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rxrpc/ar-connection.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/rxrpc/ar-connection.c linux-3.1.3/net/rxrpc/ar-connection.c
+--- linux-3.1.3/net/rxrpc/ar-connection.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rxrpc/ar-connection.c 2011-11-16 18:39:08.000000000 -0500
@@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_al
rwlock_init(&conn->lock);
spin_lock_init(&conn->state_lock);
conn->avail_calls = RXRPC_MAXCALLS;
conn->size_align = 4;
conn->header_size = sizeof(struct rxrpc_header);
-diff -urNp linux-3.1.1/net/rxrpc/ar-connevent.c linux-3.1.1/net/rxrpc/ar-connevent.c
---- linux-3.1.1/net/rxrpc/ar-connevent.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rxrpc/ar-connevent.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/rxrpc/ar-connevent.c linux-3.1.3/net/rxrpc/ar-connevent.c
+--- linux-3.1.3/net/rxrpc/ar-connevent.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rxrpc/ar-connevent.c 2011-11-16 18:39:08.000000000 -0500
@@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct
len = iov[0].iov_len + iov[1].iov_len;
_proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code);
ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
-diff -urNp linux-3.1.1/net/rxrpc/ar-input.c linux-3.1.1/net/rxrpc/ar-input.c
---- linux-3.1.1/net/rxrpc/ar-input.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rxrpc/ar-input.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/rxrpc/ar-input.c linux-3.1.3/net/rxrpc/ar-input.c
+--- linux-3.1.3/net/rxrpc/ar-input.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rxrpc/ar-input.c 2011-11-16 18:39:08.000000000 -0500
@@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rx
/* track the latest serial number on this connection for ACK packet
* information */
serial);
/* request ACK generation for any ACK or DATA packet that requests
-diff -urNp linux-3.1.1/net/rxrpc/ar-internal.h linux-3.1.1/net/rxrpc/ar-internal.h
---- linux-3.1.1/net/rxrpc/ar-internal.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rxrpc/ar-internal.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/rxrpc/ar-internal.h linux-3.1.3/net/rxrpc/ar-internal.h
+--- linux-3.1.3/net/rxrpc/ar-internal.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rxrpc/ar-internal.h 2011-11-16 18:39:08.000000000 -0500
@@ -272,8 +272,8 @@ struct rxrpc_connection {
int error; /* error code for local abort */
int debug_id; /* debug ID for printks */
extern struct workqueue_struct *rxrpc_workqueue;
/*
-diff -urNp linux-3.1.1/net/rxrpc/ar-local.c linux-3.1.1/net/rxrpc/ar-local.c
---- linux-3.1.1/net/rxrpc/ar-local.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rxrpc/ar-local.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/rxrpc/ar-local.c linux-3.1.3/net/rxrpc/ar-local.c
+--- linux-3.1.3/net/rxrpc/ar-local.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rxrpc/ar-local.c 2011-11-16 18:39:08.000000000 -0500
@@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(st
spin_lock_init(&local->lock);
rwlock_init(&local->services_lock);
memcpy(&local->srx, srx, sizeof(*srx));
}
-diff -urNp linux-3.1.1/net/rxrpc/ar-output.c linux-3.1.1/net/rxrpc/ar-output.c
---- linux-3.1.1/net/rxrpc/ar-output.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rxrpc/ar-output.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/rxrpc/ar-output.c linux-3.1.3/net/rxrpc/ar-output.c
+--- linux-3.1.3/net/rxrpc/ar-output.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rxrpc/ar-output.c 2011-11-16 18:39:08.000000000 -0500
@@ -681,9 +681,9 @@ static int rxrpc_send_data(struct kiocb
sp->hdr.cid = call->cid;
sp->hdr.callNumber = call->call_id;
sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
sp->hdr.userStatus = 0;
sp->hdr.securityIndex = conn->security_ix;
-diff -urNp linux-3.1.1/net/rxrpc/ar-peer.c linux-3.1.1/net/rxrpc/ar-peer.c
---- linux-3.1.1/net/rxrpc/ar-peer.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rxrpc/ar-peer.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/rxrpc/ar-peer.c linux-3.1.3/net/rxrpc/ar-peer.c
+--- linux-3.1.3/net/rxrpc/ar-peer.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rxrpc/ar-peer.c 2011-11-16 18:39:08.000000000 -0500
@@ -72,7 +72,7 @@ static struct rxrpc_peer *rxrpc_alloc_pe
INIT_LIST_HEAD(&peer->error_targets);
spin_lock_init(&peer->lock);
memcpy(&peer->srx, srx, sizeof(*srx));
rxrpc_assess_MTU_size(peer);
-diff -urNp linux-3.1.1/net/rxrpc/ar-proc.c linux-3.1.1/net/rxrpc/ar-proc.c
---- linux-3.1.1/net/rxrpc/ar-proc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rxrpc/ar-proc.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/rxrpc/ar-proc.c linux-3.1.3/net/rxrpc/ar-proc.c
+--- linux-3.1.3/net/rxrpc/ar-proc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rxrpc/ar-proc.c 2011-11-16 18:39:08.000000000 -0500
@@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(str
atomic_read(&conn->usage),
rxrpc_conn_states[conn->state],
return 0;
}
-diff -urNp linux-3.1.1/net/rxrpc/ar-transport.c linux-3.1.1/net/rxrpc/ar-transport.c
---- linux-3.1.1/net/rxrpc/ar-transport.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rxrpc/ar-transport.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/rxrpc/ar-transport.c linux-3.1.3/net/rxrpc/ar-transport.c
+--- linux-3.1.3/net/rxrpc/ar-transport.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rxrpc/ar-transport.c 2011-11-16 18:39:08.000000000 -0500
@@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_all
spin_lock_init(&trans->client_lock);
rwlock_init(&trans->conn_lock);
if (peer->srx.transport.family == AF_INET) {
switch (peer->srx.transport_type) {
-diff -urNp linux-3.1.1/net/rxrpc/rxkad.c linux-3.1.1/net/rxrpc/rxkad.c
---- linux-3.1.1/net/rxrpc/rxkad.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/rxrpc/rxkad.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/rxrpc/rxkad.c linux-3.1.3/net/rxrpc/rxkad.c
+--- linux-3.1.3/net/rxrpc/rxkad.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/rxrpc/rxkad.c 2011-11-16 18:40:44.000000000 -0500
@@ -211,6 +211,8 @@ static int rxkad_secure_packet_encrypt(c
u16 check;
int nsg;
_proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
-diff -urNp linux-3.1.1/net/sctp/proc.c linux-3.1.1/net/sctp/proc.c
---- linux-3.1.1/net/sctp/proc.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/sctp/proc.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/sctp/proc.c linux-3.1.3/net/sctp/proc.c
+--- linux-3.1.3/net/sctp/proc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/sctp/proc.c 2011-11-16 18:40:44.000000000 -0500
@@ -318,7 +318,8 @@ static int sctp_assocs_seq_show(struct s
seq_printf(seq,
"%8pK %8pK %-3d %-3d %-2d %-4d "
assoc->state, hash,
assoc->assoc_id,
assoc->sndbuf_used,
-diff -urNp linux-3.1.1/net/sctp/socket.c linux-3.1.1/net/sctp/socket.c
---- linux-3.1.1/net/sctp/socket.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/sctp/socket.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/sctp/socket.c linux-3.1.3/net/sctp/socket.c
+--- linux-3.1.3/net/sctp/socket.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/sctp/socket.c 2011-11-16 18:39:08.000000000 -0500
@@ -4575,7 +4575,7 @@ static int sctp_getsockopt_peer_addrs(st
addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
if (space_left < addrlen)
return -EFAULT;
to += addrlen;
cnt++;
-diff -urNp linux-3.1.1/net/socket.c linux-3.1.1/net/socket.c
---- linux-3.1.1/net/socket.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/socket.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/socket.c linux-3.1.3/net/socket.c
+--- linux-3.1.3/net/socket.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/socket.c 2011-11-16 18:40:44.000000000 -0500
@@ -88,6 +88,7 @@
#include <linux/nsproxy.h>
#include <linux/magic.h>
set_fs(KERNEL_DS);
if (level == SOL_SOCKET)
-diff -urNp linux-3.1.1/net/sunrpc/sched.c linux-3.1.1/net/sunrpc/sched.c
---- linux-3.1.1/net/sunrpc/sched.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/sunrpc/sched.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/sunrpc/sched.c linux-3.1.3/net/sunrpc/sched.c
+--- linux-3.1.3/net/sunrpc/sched.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/sunrpc/sched.c 2011-11-16 18:39:08.000000000 -0500
@@ -238,9 +238,9 @@ static int rpc_wait_bit_killable(void *w
#ifdef RPC_DEBUG
static void rpc_task_set_debuginfo(struct rpc_task *task)
}
#else
static inline void rpc_task_set_debuginfo(struct rpc_task *task)
-diff -urNp linux-3.1.1/net/sunrpc/svcsock.c linux-3.1.1/net/sunrpc/svcsock.c
---- linux-3.1.1/net/sunrpc/svcsock.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/sunrpc/svcsock.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/sunrpc/svcsock.c linux-3.1.3/net/sunrpc/svcsock.c
+--- linux-3.1.3/net/sunrpc/svcsock.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/sunrpc/svcsock.c 2011-11-16 18:39:08.000000000 -0500
@@ -394,7 +394,7 @@ static int svc_partial_recvfrom(struct s
int buflen, unsigned int base)
{
unsigned int i;
int ret;
-diff -urNp linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma.c linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma.c linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma.c
+--- linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma.c 2011-11-16 18:39:08.000000000 -0500
@@ -61,15 +61,15 @@ unsigned int svcrdma_max_req_size = RPCR
static unsigned int min_max_inline = 4096;
static unsigned int max_max_inline = 65536;
.mode = 0644,
.proc_handler = read_reset_stat,
},
-diff -urNp linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
---- linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+--- linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-11-16 18:39:08.000000000 -0500
@@ -499,7 +499,7 @@ next_sge:
svc_rdma_put_context(ctxt, 0);
goto out;
/* Build up the XDR from the receive buffers. */
rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
-diff -urNp linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_sendto.c
---- linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+--- linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-11-16 18:39:08.000000000 -0500
@@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdm
write_wr.wr.rdma.remote_addr = to;
if (svc_rdma_send(xprt, &write_wr))
goto err;
return 0;
-diff -urNp linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_transport.c
---- linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_transport.c
+--- linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-11-16 18:39:08.000000000 -0500
@@ -299,7 +299,7 @@ static void rq_cq_reap(struct svcxprt_rd
return;
/* See if we can opportunistically reap SQ WR to make room */
sq_cq_reap(xprt);
-diff -urNp linux-3.1.1/net/sysctl_net.c linux-3.1.1/net/sysctl_net.c
---- linux-3.1.1/net/sysctl_net.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/sysctl_net.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/sysctl_net.c linux-3.1.3/net/sysctl_net.c
+--- linux-3.1.3/net/sysctl_net.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/sysctl_net.c 2011-11-16 18:40:44.000000000 -0500
@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
struct ctl_table *table)
{
int mode = (table->mode >> 6) & 7;
return (mode << 6) | (mode << 3) | mode;
}
-diff -urNp linux-3.1.1/net/tipc/link.c linux-3.1.1/net/tipc/link.c
---- linux-3.1.1/net/tipc/link.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/tipc/link.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/tipc/link.c linux-3.1.3/net/tipc/link.c
+--- linux-3.1.3/net/tipc/link.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/tipc/link.c 2011-11-16 18:39:08.000000000 -0500
@@ -1170,7 +1170,7 @@ static int link_send_sections_long(struc
struct tipc_msg fragm_hdr;
struct sk_buff *buf, *buf_chain, *prev;
sect_crs += sz;
sect_rest -= sz;
fragm_crs += sz;
-diff -urNp linux-3.1.1/net/tipc/msg.c linux-3.1.1/net/tipc/msg.c
---- linux-3.1.1/net/tipc/msg.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/tipc/msg.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/tipc/msg.c linux-3.1.3/net/tipc/msg.c
+--- linux-3.1.3/net/tipc/msg.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/tipc/msg.c 2011-11-16 18:39:08.000000000 -0500
@@ -99,7 +99,7 @@ int tipc_msg_build(struct tipc_msg *hdr,
msg_sect[cnt].iov_len);
else
msg_sect[cnt].iov_len);
pos += msg_sect[cnt].iov_len;
}
-diff -urNp linux-3.1.1/net/tipc/subscr.c linux-3.1.1/net/tipc/subscr.c
---- linux-3.1.1/net/tipc/subscr.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/tipc/subscr.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/tipc/subscr.c linux-3.1.3/net/tipc/subscr.c
+--- linux-3.1.3/net/tipc/subscr.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/tipc/subscr.c 2011-11-16 18:39:08.000000000 -0500
@@ -101,7 +101,7 @@ static void subscr_send_event(struct sub
{
struct iovec msg_sect;
msg_sect.iov_len = sizeof(struct tipc_event);
sub->evt.event = htohl(event, sub->swap);
-diff -urNp linux-3.1.1/net/unix/af_unix.c linux-3.1.1/net/unix/af_unix.c
---- linux-3.1.1/net/unix/af_unix.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/unix/af_unix.c 2011-11-16 19:17:17.000000000 -0500
+diff -urNp linux-3.1.3/net/unix/af_unix.c linux-3.1.3/net/unix/af_unix.c
+--- linux-3.1.3/net/unix/af_unix.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/unix/af_unix.c 2011-11-16 19:17:17.000000000 -0500
@@ -767,6 +767,12 @@ static struct sock *unix_find_other(stru
err = -ECONNREFUSED;
if (!S_ISSOCK(inode->i_mode))
mutex_unlock(&path.dentry->d_inode->i_mutex);
dput(path.dentry);
path.dentry = dentry;
-diff -urNp linux-3.1.1/net/wireless/core.h linux-3.1.1/net/wireless/core.h
---- linux-3.1.1/net/wireless/core.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/wireless/core.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/wireless/core.h linux-3.1.3/net/wireless/core.h
+--- linux-3.1.3/net/wireless/core.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/wireless/core.h 2011-11-16 18:39:08.000000000 -0500
@@ -27,7 +27,7 @@ struct cfg80211_registered_device {
struct mutex mtx;
struct rfkill *rfkill;
struct work_struct rfkill_sync;
-diff -urNp linux-3.1.1/net/wireless/wext-core.c linux-3.1.1/net/wireless/wext-core.c
---- linux-3.1.1/net/wireless/wext-core.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/wireless/wext-core.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/wireless/wext-core.c linux-3.1.3/net/wireless/wext-core.c
+--- linux-3.1.3/net/wireless/wext-core.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/wireless/wext-core.c 2011-11-16 18:39:08.000000000 -0500
@@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struc
*/
err = handler(dev, info, (union iwreq_data *) iwp, extra);
iwp->length += essid_compat;
-diff -urNp linux-3.1.1/net/xfrm/xfrm_policy.c linux-3.1.1/net/xfrm/xfrm_policy.c
---- linux-3.1.1/net/xfrm/xfrm_policy.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/xfrm/xfrm_policy.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/net/xfrm/xfrm_policy.c linux-3.1.3/net/xfrm/xfrm_policy.c
+--- linux-3.1.3/net/xfrm/xfrm_policy.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/xfrm/xfrm_policy.c 2011-11-16 18:39:08.000000000 -0500
@@ -299,7 +299,7 @@ static void xfrm_policy_kill(struct xfrm
{
policy->walk.dead = 1;
}
}
-diff -urNp linux-3.1.1/net/xfrm/xfrm_user.c linux-3.1.1/net/xfrm/xfrm_user.c
---- linux-3.1.1/net/xfrm/xfrm_user.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/net/xfrm/xfrm_user.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/net/xfrm/xfrm_user.c linux-3.1.3/net/xfrm/xfrm_user.c
+--- linux-3.1.3/net/xfrm/xfrm_user.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/net/xfrm/xfrm_user.c 2011-11-16 18:40:44.000000000 -0500
@@ -1394,6 +1394,8 @@ static int copy_to_user_tmpl(struct xfrm
struct xfrm_user_tmpl vec[XFRM_MAX_DEPTH];
int i;
if (attrs[XFRMA_MIGRATE] == NULL)
return -EINVAL;
-diff -urNp linux-3.1.1/scripts/basic/fixdep.c linux-3.1.1/scripts/basic/fixdep.c
---- linux-3.1.1/scripts/basic/fixdep.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/scripts/basic/fixdep.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/scripts/basic/fixdep.c linux-3.1.3/scripts/basic/fixdep.c
+--- linux-3.1.3/scripts/basic/fixdep.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/scripts/basic/fixdep.c 2011-11-16 18:39:08.000000000 -0500
@@ -161,7 +161,7 @@ static unsigned int strhash(const char *
/*
* Lookup a value in the configuration string.
if (*p != INT_CONF) {
fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
-diff -urNp linux-3.1.1/scripts/gcc-plugin.sh linux-3.1.1/scripts/gcc-plugin.sh
---- linux-3.1.1/scripts/gcc-plugin.sh 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/scripts/gcc-plugin.sh 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/scripts/gcc-plugin.sh linux-3.1.3/scripts/gcc-plugin.sh
+--- linux-3.1.3/scripts/gcc-plugin.sh 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/scripts/gcc-plugin.sh 2011-11-20 19:21:53.000000000 -0500
@@ -0,0 +1,2 @@
+#!/bin/sh
-+echo "#include \"gcc-plugin.h\"\n#include \"rtl.h\"" | $1 -x c -shared - -o /dev/null -I`$2 -print-file-name=plugin`/include >/dev/null 2>&1 && echo "y"
-diff -urNp linux-3.1.1/scripts/Makefile.build linux-3.1.1/scripts/Makefile.build
---- linux-3.1.1/scripts/Makefile.build 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/scripts/Makefile.build 2011-11-16 18:40:44.000000000 -0500
++echo -e "#include \"gcc-plugin.h\"\n#include \"tree.h\"\n#include \"tm.h\"\n#include \"rtl.h\"" | $1 -x c -shared - -o /dev/null -I`$2 -print-file-name=plugin`/include >/dev/null 2>&1 && echo "y"
+diff -urNp linux-3.1.3/scripts/Makefile.build linux-3.1.3/scripts/Makefile.build
+--- linux-3.1.3/scripts/Makefile.build 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/scripts/Makefile.build 2011-11-16 18:40:44.000000000 -0500
@@ -109,7 +109,7 @@ endif
endif
include scripts/Makefile.host
endif
-diff -urNp linux-3.1.1/scripts/Makefile.clean linux-3.1.1/scripts/Makefile.clean
---- linux-3.1.1/scripts/Makefile.clean 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/scripts/Makefile.clean 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/scripts/Makefile.clean linux-3.1.3/scripts/Makefile.clean
+--- linux-3.1.3/scripts/Makefile.clean 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/scripts/Makefile.clean 2011-11-16 18:39:08.000000000 -0500
@@ -43,7 +43,8 @@ subdir-ymn := $(addprefix $(obj)/,$(subd
__clean-files := $(extra-y) $(always) \
$(targets) $(clean-files) \
__clean-files := $(filter-out $(no-clean-files), $(__clean-files))
-diff -urNp linux-3.1.1/scripts/Makefile.host linux-3.1.1/scripts/Makefile.host
---- linux-3.1.1/scripts/Makefile.host 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/scripts/Makefile.host 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/scripts/Makefile.host linux-3.1.3/scripts/Makefile.host
+--- linux-3.1.3/scripts/Makefile.host 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/scripts/Makefile.host 2011-11-16 18:39:08.000000000 -0500
@@ -31,6 +31,7 @@
# Note: Shared libraries consisting of C++ files are not supported
# Remove .so files from "xxx-objs"
host-cobjs := $(filter-out %.so,$(host-cobjs))
-diff -urNp linux-3.1.1/scripts/mod/file2alias.c linux-3.1.1/scripts/mod/file2alias.c
---- linux-3.1.1/scripts/mod/file2alias.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/scripts/mod/file2alias.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/scripts/mod/file2alias.c linux-3.1.3/scripts/mod/file2alias.c
+--- linux-3.1.3/scripts/mod/file2alias.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/scripts/mod/file2alias.c 2011-11-16 18:39:08.000000000 -0500
@@ -72,7 +72,7 @@ static void device_id_check(const char *
unsigned long size, unsigned long id_size,
void *symval)
sprintf(alias, "dmi*");
-diff -urNp linux-3.1.1/scripts/mod/modpost.c linux-3.1.1/scripts/mod/modpost.c
---- linux-3.1.1/scripts/mod/modpost.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/scripts/mod/modpost.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/scripts/mod/modpost.c linux-3.1.3/scripts/mod/modpost.c
+--- linux-3.1.3/scripts/mod/modpost.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/scripts/mod/modpost.c 2011-11-16 18:39:08.000000000 -0500
@@ -919,6 +919,7 @@ enum mismatch {
ANY_INIT_TO_ANY_EXIT,
ANY_EXIT_TO_ANY_INIT,
goto close_write;
tmp = NOFAIL(malloc(b->pos));
-diff -urNp linux-3.1.1/scripts/mod/modpost.h linux-3.1.1/scripts/mod/modpost.h
---- linux-3.1.1/scripts/mod/modpost.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/scripts/mod/modpost.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/scripts/mod/modpost.h linux-3.1.3/scripts/mod/modpost.h
+--- linux-3.1.3/scripts/mod/modpost.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/scripts/mod/modpost.h 2011-11-16 18:39:08.000000000 -0500
@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
struct buffer {
struct module {
struct module *next;
-diff -urNp linux-3.1.1/scripts/mod/sumversion.c linux-3.1.1/scripts/mod/sumversion.c
---- linux-3.1.1/scripts/mod/sumversion.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/scripts/mod/sumversion.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/scripts/mod/sumversion.c linux-3.1.3/scripts/mod/sumversion.c
+--- linux-3.1.3/scripts/mod/sumversion.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/scripts/mod/sumversion.c 2011-11-16 18:39:08.000000000 -0500
@@ -470,7 +470,7 @@ static void write_version(const char *fi
goto out;
}
warn("writing sum in %s failed: %s\n",
filename, strerror(errno));
goto out;
-diff -urNp linux-3.1.1/scripts/pnmtologo.c linux-3.1.1/scripts/pnmtologo.c
---- linux-3.1.1/scripts/pnmtologo.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/scripts/pnmtologo.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/scripts/pnmtologo.c linux-3.1.3/scripts/pnmtologo.c
+--- linux-3.1.3/scripts/pnmtologo.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/scripts/pnmtologo.c 2011-11-16 18:39:08.000000000 -0500
@@ -237,14 +237,14 @@ static void write_header(void)
fprintf(out, " * Linux logo %s\n", logoname);
fputs(" */\n\n", out);
logoname);
write_hex_cnt = 0;
for (i = 0; i < logo_clutsize; i++) {
-diff -urNp linux-3.1.1/security/apparmor/lsm.c linux-3.1.1/security/apparmor/lsm.c
---- linux-3.1.1/security/apparmor/lsm.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/security/apparmor/lsm.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/security/apparmor/lsm.c linux-3.1.3/security/apparmor/lsm.c
+--- linux-3.1.3/security/apparmor/lsm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/security/apparmor/lsm.c 2011-11-16 18:40:44.000000000 -0500
@@ -621,7 +621,7 @@ static int apparmor_task_setrlimit(struc
return error;
}
.name = "apparmor",
.ptrace_access_check = apparmor_ptrace_access_check,
-diff -urNp linux-3.1.1/security/commoncap.c linux-3.1.1/security/commoncap.c
---- linux-3.1.1/security/commoncap.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/security/commoncap.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/security/commoncap.c linux-3.1.3/security/commoncap.c
+--- linux-3.1.3/security/commoncap.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/security/commoncap.c 2011-11-16 18:40:44.000000000 -0500
@@ -28,6 +28,7 @@
#include <linux/prctl.h>
#include <linux/securebits.h>
if (cred->uid != 0) {
if (bprm->cap_effective)
return 1;
-diff -urNp linux-3.1.1/security/integrity/ima/ima_api.c linux-3.1.1/security/integrity/ima/ima_api.c
---- linux-3.1.1/security/integrity/ima/ima_api.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/security/integrity/ima/ima_api.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/security/integrity/ima/ima_api.c linux-3.1.3/security/integrity/ima/ima_api.c
+--- linux-3.1.3/security/integrity/ima/ima_api.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/security/integrity/ima/ima_api.c 2011-11-16 18:39:08.000000000 -0500
@@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino
int result;
entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (!entry) {
-diff -urNp linux-3.1.1/security/integrity/ima/ima_fs.c linux-3.1.1/security/integrity/ima/ima_fs.c
---- linux-3.1.1/security/integrity/ima/ima_fs.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/security/integrity/ima/ima_fs.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/security/integrity/ima/ima_fs.c linux-3.1.3/security/integrity/ima/ima_fs.c
+--- linux-3.1.3/security/integrity/ima/ima_fs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/security/integrity/ima/ima_fs.c 2011-11-16 18:39:08.000000000 -0500
@@ -28,12 +28,12 @@
static int valid_policy = 1;
#define TMPBUFLEN 12
return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
}
-diff -urNp linux-3.1.1/security/integrity/ima/ima.h linux-3.1.1/security/integrity/ima/ima.h
---- linux-3.1.1/security/integrity/ima/ima.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/security/integrity/ima/ima.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/security/integrity/ima/ima.h linux-3.1.3/security/integrity/ima/ima.h
+--- linux-3.1.3/security/integrity/ima/ima.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/security/integrity/ima/ima.h 2011-11-16 18:39:08.000000000 -0500
@@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino
extern spinlock_t ima_queue_lock;
struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
};
extern struct ima_h_table ima_htable;
-diff -urNp linux-3.1.1/security/integrity/ima/ima_queue.c linux-3.1.1/security/integrity/ima/ima_queue.c
---- linux-3.1.1/security/integrity/ima/ima_queue.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/security/integrity/ima/ima_queue.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/security/integrity/ima/ima_queue.c linux-3.1.3/security/integrity/ima/ima_queue.c
+--- linux-3.1.3/security/integrity/ima/ima_queue.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/security/integrity/ima/ima_queue.c 2011-11-16 18:39:08.000000000 -0500
@@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct i
INIT_LIST_HEAD(&qe->later);
list_add_tail_rcu(&qe->later, &ima_measurements);
key = ima_hash_key(entry->digest);
hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
return 0;
-diff -urNp linux-3.1.1/security/Kconfig linux-3.1.1/security/Kconfig
---- linux-3.1.1/security/Kconfig 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/security/Kconfig 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/security/Kconfig linux-3.1.3/security/Kconfig
+--- linux-3.1.3/security/Kconfig 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/security/Kconfig 2011-11-16 18:40:44.000000000 -0500
@@ -4,6 +4,558 @@
menu "Security options"
default 65536
help
This is the portion of low virtual memory which should be protected
-diff -urNp linux-3.1.1/security/keys/compat.c linux-3.1.1/security/keys/compat.c
---- linux-3.1.1/security/keys/compat.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/security/keys/compat.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/security/keys/compat.c linux-3.1.3/security/keys/compat.c
+--- linux-3.1.3/security/keys/compat.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/security/keys/compat.c 2011-11-16 18:39:08.000000000 -0500
@@ -44,7 +44,7 @@ long compat_keyctl_instantiate_key_iov(
if (ret == 0)
goto no_payload_free;
if (iov != iovstack)
kfree(iov);
-diff -urNp linux-3.1.1/security/keys/keyctl.c linux-3.1.1/security/keys/keyctl.c
---- linux-3.1.1/security/keys/keyctl.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/security/keys/keyctl.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/security/keys/keyctl.c linux-3.1.3/security/keys/keyctl.c
+--- linux-3.1.3/security/keys/keyctl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/security/keys/keyctl.c 2011-11-16 18:39:08.000000000 -0500
@@ -921,7 +921,7 @@ static int keyctl_change_reqkey_auth(str
/*
* Copy the iovec data from userspace
if (iov != iovstack)
kfree(iov);
-diff -urNp linux-3.1.1/security/keys/keyring.c linux-3.1.1/security/keys/keyring.c
---- linux-3.1.1/security/keys/keyring.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/security/keys/keyring.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/security/keys/keyring.c linux-3.1.3/security/keys/keyring.c
+--- linux-3.1.3/security/keys/keyring.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/security/keys/keyring.c 2011-11-16 18:39:08.000000000 -0500
@@ -214,15 +214,15 @@ static long keyring_read(const struct ke
ret = -EFAULT;
goto error;
buflen -= tmp;
-diff -urNp linux-3.1.1/security/min_addr.c linux-3.1.1/security/min_addr.c
---- linux-3.1.1/security/min_addr.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/security/min_addr.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/security/min_addr.c linux-3.1.3/security/min_addr.c
+--- linux-3.1.3/security/min_addr.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/security/min_addr.c 2011-11-16 18:40:44.000000000 -0500
@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
*/
static void update_mmap_min_addr(void)
}
/*
-diff -urNp linux-3.1.1/security/security.c linux-3.1.1/security/security.c
---- linux-3.1.1/security/security.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/security/security.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/security/security.c linux-3.1.3/security/security.c
+--- linux-3.1.3/security/security.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/security/security.c 2011-11-16 18:40:44.000000000 -0500
@@ -25,8 +25,8 @@ static __initdata char chosen_lsm[SECURI
/* things that live in capability.c */
extern void __init security_fixup_ops(struct security_operations *ops);
}
/* Save user chosen LSM */
-diff -urNp linux-3.1.1/security/selinux/hooks.c linux-3.1.1/security/selinux/hooks.c
---- linux-3.1.1/security/selinux/hooks.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/security/selinux/hooks.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/security/selinux/hooks.c linux-3.1.3/security/selinux/hooks.c
+--- linux-3.1.3/security/selinux/hooks.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/security/selinux/hooks.c 2011-11-16 18:40:44.000000000 -0500
@@ -93,7 +93,6 @@
#define NUM_SEL_MNT_OPTS 5
.name = "selinux",
.ptrace_access_check = selinux_ptrace_access_check,
-diff -urNp linux-3.1.1/security/selinux/include/xfrm.h linux-3.1.1/security/selinux/include/xfrm.h
---- linux-3.1.1/security/selinux/include/xfrm.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/security/selinux/include/xfrm.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/security/selinux/include/xfrm.h linux-3.1.3/security/selinux/include/xfrm.h
+--- linux-3.1.3/security/selinux/include/xfrm.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/security/selinux/include/xfrm.h 2011-11-16 18:39:08.000000000 -0500
@@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct s
static inline void selinux_xfrm_notify_policyload(void)
}
#else
static inline int selinux_xfrm_enabled(void)
-diff -urNp linux-3.1.1/security/selinux/ss/services.c linux-3.1.1/security/selinux/ss/services.c
---- linux-3.1.1/security/selinux/ss/services.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/security/selinux/ss/services.c 2011-11-16 18:40:44.000000000 -0500
+diff -urNp linux-3.1.3/security/selinux/ss/services.c linux-3.1.3/security/selinux/ss/services.c
+--- linux-3.1.3/security/selinux/ss/services.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/security/selinux/ss/services.c 2011-11-16 18:40:44.000000000 -0500
@@ -1814,6 +1814,8 @@ int security_load_policy(void *data, siz
int rc = 0;
struct policy_file file = { data, len }, *fp = &file;
if (!ss_initialized) {
avtab_cache_init();
rc = policydb_read(&policydb, fp);
-diff -urNp linux-3.1.1/security/smack/smack_lsm.c linux-3.1.1/security/smack/smack_lsm.c
---- linux-3.1.1/security/smack/smack_lsm.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/security/smack/smack_lsm.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/security/smack/smack_lsm.c linux-3.1.3/security/smack/smack_lsm.c
+--- linux-3.1.3/security/smack/smack_lsm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/security/smack/smack_lsm.c 2011-11-16 18:39:08.000000000 -0500
@@ -3393,7 +3393,7 @@ static int smack_inode_getsecctx(struct
return 0;
}
.name = "smack",
.ptrace_access_check = smack_ptrace_access_check,
-diff -urNp linux-3.1.1/security/tomoyo/tomoyo.c linux-3.1.1/security/tomoyo/tomoyo.c
---- linux-3.1.1/security/tomoyo/tomoyo.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/security/tomoyo/tomoyo.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/security/tomoyo/tomoyo.c linux-3.1.3/security/tomoyo/tomoyo.c
+--- linux-3.1.3/security/tomoyo/tomoyo.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/security/tomoyo/tomoyo.c 2011-11-16 18:39:08.000000000 -0500
@@ -446,7 +446,7 @@ static int tomoyo_sb_pivotroot(struct pa
* tomoyo_security_ops is a "struct security_operations" which is used for
* registering TOMOYO.
.name = "tomoyo",
.cred_alloc_blank = tomoyo_cred_alloc_blank,
.cred_prepare = tomoyo_cred_prepare,
-diff -urNp linux-3.1.1/sound/aoa/codecs/onyx.c linux-3.1.1/sound/aoa/codecs/onyx.c
---- linux-3.1.1/sound/aoa/codecs/onyx.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/sound/aoa/codecs/onyx.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/sound/aoa/codecs/onyx.c linux-3.1.3/sound/aoa/codecs/onyx.c
+--- linux-3.1.3/sound/aoa/codecs/onyx.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/sound/aoa/codecs/onyx.c 2011-11-16 18:39:08.000000000 -0500
@@ -54,7 +54,7 @@ struct onyx {
spdif_locked:1,
analog_locked:1,
onyx->spdif_locked = onyx->analog_locked = 0;
mutex_unlock(&onyx->mutex);
-diff -urNp linux-3.1.1/sound/aoa/codecs/onyx.h linux-3.1.1/sound/aoa/codecs/onyx.h
---- linux-3.1.1/sound/aoa/codecs/onyx.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/sound/aoa/codecs/onyx.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/sound/aoa/codecs/onyx.h linux-3.1.3/sound/aoa/codecs/onyx.h
+--- linux-3.1.3/sound/aoa/codecs/onyx.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/sound/aoa/codecs/onyx.h 2011-11-16 18:39:08.000000000 -0500
@@ -11,6 +11,7 @@
#include <linux/i2c.h>
#include <asm/pmac_low_i2c.h>
/* PCM3052 register definitions */
-diff -urNp linux-3.1.1/sound/core/oss/pcm_oss.c linux-3.1.1/sound/core/oss/pcm_oss.c
---- linux-3.1.1/sound/core/oss/pcm_oss.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/sound/core/oss/pcm_oss.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/sound/core/oss/pcm_oss.c linux-3.1.3/sound/core/oss/pcm_oss.c
+--- linux-3.1.3/sound/core/oss/pcm_oss.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/sound/core/oss/pcm_oss.c 2011-11-16 18:39:08.000000000 -0500
@@ -1189,10 +1189,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(str
if (in_kernel) {
mm_segment_t fs;
snd_leave_user(fs);
}
} else if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) {
-diff -urNp linux-3.1.1/sound/core/pcm_compat.c linux-3.1.1/sound/core/pcm_compat.c
---- linux-3.1.1/sound/core/pcm_compat.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/sound/core/pcm_compat.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/sound/core/pcm_compat.c linux-3.1.3/sound/core/pcm_compat.c
+--- linux-3.1.3/sound/core/pcm_compat.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/sound/core/pcm_compat.c 2011-11-16 18:39:08.000000000 -0500
@@ -31,7 +31,7 @@ static int snd_pcm_ioctl_delay_compat(st
int err;
snd_leave_user(fs);
if (err < 0)
return err;
-diff -urNp linux-3.1.1/sound/core/pcm_native.c linux-3.1.1/sound/core/pcm_native.c
---- linux-3.1.1/sound/core/pcm_native.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/sound/core/pcm_native.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/sound/core/pcm_native.c linux-3.1.3/sound/core/pcm_native.c
+--- linux-3.1.3/sound/core/pcm_native.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/sound/core/pcm_native.c 2011-11-16 18:39:08.000000000 -0500
@@ -2770,11 +2770,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_
switch (substream->stream) {
case SNDRV_PCM_STREAM_PLAYBACK:
break;
default:
result = -EINVAL;
-diff -urNp linux-3.1.1/sound/core/seq/seq_device.c linux-3.1.1/sound/core/seq/seq_device.c
---- linux-3.1.1/sound/core/seq/seq_device.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/sound/core/seq/seq_device.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/sound/core/seq/seq_device.c linux-3.1.3/sound/core/seq/seq_device.c
+--- linux-3.1.3/sound/core/seq/seq_device.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/sound/core/seq/seq_device.c 2011-11-16 18:39:08.000000000 -0500
@@ -63,7 +63,7 @@ struct ops_list {
int argsize; /* argument size */
dev->status = SNDRV_SEQ_DEVICE_FREE;
dev->driver_data = NULL;
ops->num_init_devices--;
-diff -urNp linux-3.1.1/sound/drivers/mts64.c linux-3.1.1/sound/drivers/mts64.c
---- linux-3.1.1/sound/drivers/mts64.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/sound/drivers/mts64.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/sound/drivers/mts64.c linux-3.1.3/sound/drivers/mts64.c
+--- linux-3.1.3/sound/drivers/mts64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/sound/drivers/mts64.c 2011-11-16 18:39:08.000000000 -0500
@@ -28,6 +28,7 @@
#include <sound/initval.h>
#include <sound/rawmidi.h>
return 0;
}
-diff -urNp linux-3.1.1/sound/drivers/opl4/opl4_lib.c linux-3.1.1/sound/drivers/opl4/opl4_lib.c
---- linux-3.1.1/sound/drivers/opl4/opl4_lib.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/sound/drivers/opl4/opl4_lib.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/sound/drivers/opl4/opl4_lib.c linux-3.1.3/sound/drivers/opl4/opl4_lib.c
+--- linux-3.1.3/sound/drivers/opl4/opl4_lib.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/sound/drivers/opl4/opl4_lib.c 2011-11-16 18:39:08.000000000 -0500
@@ -28,7 +28,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@
MODULE_DESCRIPTION("OPL4 driver");
MODULE_LICENSE("GPL");
{
int timeout = 10;
while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
-diff -urNp linux-3.1.1/sound/drivers/portman2x4.c linux-3.1.1/sound/drivers/portman2x4.c
---- linux-3.1.1/sound/drivers/portman2x4.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/sound/drivers/portman2x4.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/sound/drivers/portman2x4.c linux-3.1.3/sound/drivers/portman2x4.c
+--- linux-3.1.3/sound/drivers/portman2x4.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/sound/drivers/portman2x4.c 2011-11-16 18:39:08.000000000 -0500
@@ -47,6 +47,7 @@
#include <sound/initval.h>
#include <sound/rawmidi.h>
int mode[PORTMAN_NUM_INPUT_PORTS];
struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
};
-diff -urNp linux-3.1.1/sound/firewire/amdtp.c linux-3.1.1/sound/firewire/amdtp.c
---- linux-3.1.1/sound/firewire/amdtp.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/sound/firewire/amdtp.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/sound/firewire/amdtp.c linux-3.1.3/sound/firewire/amdtp.c
+--- linux-3.1.3/sound/firewire/amdtp.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/sound/firewire/amdtp.c 2011-11-16 18:39:08.000000000 -0500
@@ -371,7 +371,7 @@ static void queue_out_packet(struct amdt
ptr = s->pcm_buffer_pointer + data_blocks;
if (ptr >= pcm->runtime->buffer_size)
(fw_parent_device(s->unit)->card->node_id & 0x3f) << 24;
}
EXPORT_SYMBOL(amdtp_out_stream_update);
-diff -urNp linux-3.1.1/sound/firewire/amdtp.h linux-3.1.1/sound/firewire/amdtp.h
---- linux-3.1.1/sound/firewire/amdtp.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/sound/firewire/amdtp.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/sound/firewire/amdtp.h linux-3.1.3/sound/firewire/amdtp.h
+--- linux-3.1.3/sound/firewire/amdtp.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/sound/firewire/amdtp.h 2011-11-16 18:39:08.000000000 -0500
@@ -146,7 +146,7 @@ static inline void amdtp_out_stream_pcm_
static inline void amdtp_out_stream_pcm_trigger(struct amdtp_out_stream *s,
struct snd_pcm_substream *pcm)
}
/**
-diff -urNp linux-3.1.1/sound/firewire/isight.c linux-3.1.1/sound/firewire/isight.c
---- linux-3.1.1/sound/firewire/isight.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/sound/firewire/isight.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/sound/firewire/isight.c linux-3.1.3/sound/firewire/isight.c
+--- linux-3.1.3/sound/firewire/isight.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/sound/firewire/isight.c 2011-11-16 18:39:08.000000000 -0500
@@ -97,7 +97,7 @@ static void isight_update_pointers(struc
ptr += count;
if (ptr >= runtime->buffer_size)
break;
default:
return -EINVAL;
-diff -urNp linux-3.1.1/sound/isa/cmi8330.c linux-3.1.1/sound/isa/cmi8330.c
---- linux-3.1.1/sound/isa/cmi8330.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/sound/isa/cmi8330.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/sound/isa/cmi8330.c linux-3.1.3/sound/isa/cmi8330.c
+--- linux-3.1.3/sound/isa/cmi8330.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/sound/isa/cmi8330.c 2011-11-16 18:39:08.000000000 -0500
@@ -172,7 +172,7 @@ struct snd_cmi8330 {
struct snd_pcm *pcm;
snd_pcm_open_callback_t open;
void *private_data; /* sb or wss */
} streams[2];
-diff -urNp linux-3.1.1/sound/oss/sb_audio.c linux-3.1.1/sound/oss/sb_audio.c
---- linux-3.1.1/sound/oss/sb_audio.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/sound/oss/sb_audio.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/sound/oss/sb_audio.c linux-3.1.3/sound/oss/sb_audio.c
+--- linux-3.1.3/sound/oss/sb_audio.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/sound/oss/sb_audio.c 2011-11-16 18:39:08.000000000 -0500
@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
buf16 = (signed short *)(localbuf + localoffs);
while (c)
if (copy_from_user(lbuf8,
userbuf+useroffs + p,
locallen))
-diff -urNp linux-3.1.1/sound/oss/swarm_cs4297a.c linux-3.1.1/sound/oss/swarm_cs4297a.c
---- linux-3.1.1/sound/oss/swarm_cs4297a.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/sound/oss/swarm_cs4297a.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/sound/oss/swarm_cs4297a.c linux-3.1.3/sound/oss/swarm_cs4297a.c
+--- linux-3.1.3/sound/oss/swarm_cs4297a.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/sound/oss/swarm_cs4297a.c 2011-11-16 18:39:08.000000000 -0500
@@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void)
{
struct cs4297a_state *s;
list_add(&s->list, &cs4297a_devs);
-diff -urNp linux-3.1.1/sound/pci/hda/hda_codec.h linux-3.1.1/sound/pci/hda/hda_codec.h
---- linux-3.1.1/sound/pci/hda/hda_codec.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/sound/pci/hda/hda_codec.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/sound/pci/hda/hda_codec.h linux-3.1.3/sound/pci/hda/hda_codec.h
+--- linux-3.1.3/sound/pci/hda/hda_codec.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/sound/pci/hda/hda_codec.h 2011-11-16 18:39:08.000000000 -0500
@@ -611,7 +611,7 @@ struct hda_bus_ops {
/* notify power-up/down from codec to controller */
void (*pm_notify)(struct hda_bus *bus);
/* PCM to create, set by patch_ops.build_pcms callback */
unsigned int num_pcms;
-diff -urNp linux-3.1.1/sound/pci/ice1712/ice1712.h linux-3.1.1/sound/pci/ice1712/ice1712.h
---- linux-3.1.1/sound/pci/ice1712/ice1712.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/sound/pci/ice1712/ice1712.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/sound/pci/ice1712/ice1712.h linux-3.1.3/sound/pci/ice1712/ice1712.h
+--- linux-3.1.3/sound/pci/ice1712/ice1712.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/sound/pci/ice1712/ice1712.h 2011-11-16 18:39:08.000000000 -0500
@@ -269,7 +269,7 @@ struct snd_ak4xxx_private {
unsigned int mask_flags; /* total mask bits */
struct snd_akm4xxx_ops {
};
-diff -urNp linux-3.1.1/sound/pci/ymfpci/ymfpci_main.c linux-3.1.1/sound/pci/ymfpci/ymfpci_main.c
---- linux-3.1.1/sound/pci/ymfpci/ymfpci_main.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/sound/pci/ymfpci/ymfpci_main.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/sound/pci/ymfpci/ymfpci_main.c linux-3.1.3/sound/pci/ymfpci/ymfpci_main.c
+--- linux-3.1.3/sound/pci/ymfpci/ymfpci_main.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/sound/pci/ymfpci/ymfpci_main.c 2011-11-16 18:39:08.000000000 -0500
@@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct sn
if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
break;
chip->card = card;
chip->pci = pci;
chip->irq = -1;
-diff -urNp linux-3.1.1/sound/soc/soc-pcm.c linux-3.1.1/sound/soc/soc-pcm.c
---- linux-3.1.1/sound/soc/soc-pcm.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/sound/soc/soc-pcm.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/sound/soc/soc-pcm.c linux-3.1.3/sound/soc/soc-pcm.c
+--- linux-3.1.3/sound/soc/soc-pcm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/sound/soc/soc-pcm.c 2011-11-16 18:39:08.000000000 -0500
@@ -568,7 +568,7 @@ static snd_pcm_uframes_t soc_pcm_pointer
}
.open = soc_pcm_open,
.close = soc_pcm_close,
.hw_params = soc_pcm_hw_params,
-diff -urNp linux-3.1.1/sound/usb/card.h linux-3.1.1/sound/usb/card.h
---- linux-3.1.1/sound/usb/card.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/sound/usb/card.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/sound/usb/card.h linux-3.1.3/sound/usb/card.h
+--- linux-3.1.3/sound/usb/card.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/sound/usb/card.h 2011-11-16 18:39:08.000000000 -0500
@@ -44,6 +44,7 @@ struct snd_urb_ops {
int (*prepare_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
int (*retire_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
};
struct snd_usb_stream {
-diff -urNp linux-3.1.1/tools/gcc/checker_plugin.c linux-3.1.1/tools/gcc/checker_plugin.c
---- linux-3.1.1/tools/gcc/checker_plugin.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/tools/gcc/checker_plugin.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/tools/gcc/checker_plugin.c linux-3.1.3/tools/gcc/checker_plugin.c
+--- linux-3.1.3/tools/gcc/checker_plugin.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/tools/gcc/checker_plugin.c 2011-11-16 18:39:08.000000000 -0500
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
+
+ return 0;
+}
-diff -urNp linux-3.1.1/tools/gcc/constify_plugin.c linux-3.1.1/tools/gcc/constify_plugin.c
---- linux-3.1.1/tools/gcc/constify_plugin.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/tools/gcc/constify_plugin.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/tools/gcc/constify_plugin.c linux-3.1.3/tools/gcc/constify_plugin.c
+--- linux-3.1.3/tools/gcc/constify_plugin.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/tools/gcc/constify_plugin.c 2011-11-16 18:39:08.000000000 -0500
@@ -0,0 +1,303 @@
+/*
+ * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
+
+ return 0;
+}
-diff -urNp linux-3.1.1/tools/gcc/kallocstat_plugin.c linux-3.1.1/tools/gcc/kallocstat_plugin.c
---- linux-3.1.1/tools/gcc/kallocstat_plugin.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/tools/gcc/kallocstat_plugin.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/tools/gcc/kallocstat_plugin.c linux-3.1.3/tools/gcc/kallocstat_plugin.c
+--- linux-3.1.3/tools/gcc/kallocstat_plugin.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/tools/gcc/kallocstat_plugin.c 2011-11-16 18:39:08.000000000 -0500
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
+
+ return 0;
+}
-diff -urNp linux-3.1.1/tools/gcc/kernexec_plugin.c linux-3.1.1/tools/gcc/kernexec_plugin.c
---- linux-3.1.1/tools/gcc/kernexec_plugin.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/tools/gcc/kernexec_plugin.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/tools/gcc/kernexec_plugin.c linux-3.1.3/tools/gcc/kernexec_plugin.c
+--- linux-3.1.3/tools/gcc/kernexec_plugin.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/tools/gcc/kernexec_plugin.c 2011-11-18 17:57:07.000000000 -0500
@@ -0,0 +1,275 @@
+/*
+ * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
+ line = expand_location(RTL_LOCATION(insn)).line;
+ btsq = gen_rtx_ASM_OPERANDS(VOIDmode, "btsq $63,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
+ MEM_VOLATILE_P(btsq) = 1;
-+ RTX_FRAME_RELATED_P(btsq) = 1;
++// RTX_FRAME_RELATED_P(btsq) = 1; // not for ASM_OPERANDS
+ emit_insn_before(btsq, insn);
+}
+
+
+ return 0;
+}
-diff -urNp linux-3.1.1/tools/gcc/Makefile linux-3.1.1/tools/gcc/Makefile
---- linux-3.1.1/tools/gcc/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/tools/gcc/Makefile 2011-11-16 20:37:08.000000000 -0500
+diff -urNp linux-3.1.3/tools/gcc/Makefile linux-3.1.3/tools/gcc/Makefile
+--- linux-3.1.3/tools/gcc/Makefile 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/tools/gcc/Makefile 2011-11-16 20:37:08.000000000 -0500
@@ -0,0 +1,21 @@
+#CC := gcc
+#PLUGIN_SOURCE_FILES := pax_plugin.c
+kallocstat_plugin-objs := kallocstat_plugin.o
+kernexec_plugin-objs := kernexec_plugin.o
+checker_plugin-objs := checker_plugin.o
-diff -urNp linux-3.1.1/tools/gcc/stackleak_plugin.c linux-3.1.1/tools/gcc/stackleak_plugin.c
---- linux-3.1.1/tools/gcc/stackleak_plugin.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.1.1/tools/gcc/stackleak_plugin.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/tools/gcc/stackleak_plugin.c linux-3.1.3/tools/gcc/stackleak_plugin.c
+--- linux-3.1.3/tools/gcc/stackleak_plugin.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.3/tools/gcc/stackleak_plugin.c 2011-11-16 18:39:08.000000000 -0500
@@ -0,0 +1,291 @@
+/*
+ * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
+
+ return 0;
+}
-diff -urNp linux-3.1.1/tools/perf/util/include/asm/alternative-asm.h linux-3.1.1/tools/perf/util/include/asm/alternative-asm.h
---- linux-3.1.1/tools/perf/util/include/asm/alternative-asm.h 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/tools/perf/util/include/asm/alternative-asm.h 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/tools/perf/util/include/asm/alternative-asm.h linux-3.1.3/tools/perf/util/include/asm/alternative-asm.h
+--- linux-3.1.3/tools/perf/util/include/asm/alternative-asm.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/tools/perf/util/include/asm/alternative-asm.h 2011-11-16 18:39:08.000000000 -0500
@@ -5,4 +5,7 @@
#define altinstruction_entry #
+ .endm
+
#endif
-diff -urNp linux-3.1.1/usr/gen_init_cpio.c linux-3.1.1/usr/gen_init_cpio.c
---- linux-3.1.1/usr/gen_init_cpio.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/usr/gen_init_cpio.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/usr/gen_init_cpio.c linux-3.1.3/usr/gen_init_cpio.c
+--- linux-3.1.3/usr/gen_init_cpio.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/usr/gen_init_cpio.c 2011-11-16 18:39:08.000000000 -0500
@@ -303,7 +303,7 @@ static int cpio_mkfile(const char *name,
int retval;
int rc = -1;
} else
break;
}
-diff -urNp linux-3.1.1/virt/kvm/kvm_main.c linux-3.1.1/virt/kvm/kvm_main.c
---- linux-3.1.1/virt/kvm/kvm_main.c 2011-11-11 15:19:27.000000000 -0500
-+++ linux-3.1.1/virt/kvm/kvm_main.c 2011-11-16 18:39:08.000000000 -0500
+diff -urNp linux-3.1.3/virt/kvm/kvm_main.c linux-3.1.3/virt/kvm/kvm_main.c
+--- linux-3.1.3/virt/kvm/kvm_main.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.3/virt/kvm/kvm_main.c 2011-11-16 18:39:08.000000000 -0500
@@ -73,7 +73,7 @@ LIST_HEAD(vm_list);
static cpumask_var_t cpus_hardware_enabled;
projects / people / arne_f / ipfire-3.x.git / commitdiff
